Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
R
RvApp
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
1
Merge Requests
1
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
lify
RvApp
Commits
fb94a19c
Commit
fb94a19c
authored
Dec 04, 2019
by
linfeng
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
短视频优化
parent
22b5c6cc
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
20 additions
and
13 deletions
+20
-13
MainActivity.java
RvClient/src/main/java/com/xxfc/rv/MainActivity.java
+0
-1
DiscoveryFragment.java
...y/src/main/java/com/xxfc/discovery/DiscoveryFragment.java
+8
-5
AddDiscoveryContentPw.java
...com/xxfc/discovery/popupwindow/AddDiscoveryContentPw.java
+4
-3
strings.xml
module_mine/src/main/res/values/strings.xml
+1
-1
SelectVideoActivity.java
...ain/java/com/xxrv/video/activity/SelectVideoActivity.java
+7
-3
No files found.
RvClient/src/main/java/com/xxfc/rv/MainActivity.java
View file @
fb94a19c
...
...
@@ -207,7 +207,6 @@ public class MainActivity extends BaseActivity<CommonPresenter> implements DownL
dialogInterface
.
dismiss
();
}).
setCancelable
(
false
).
show
();
}
}
private
void
initCopy
()
{
...
...
module_discovery/src/main/java/com/xxfc/discovery/DiscoveryFragment.java
View file @
fb94a19c
...
...
@@ -26,6 +26,7 @@ import com.ruiwenliu.wrapper.util.ViewHolder;
import
com.ruiwenliu.wrapper.util.permission.RxPermission
;
import
com.ruiwenliu.wrapper.weight.horizontal.GallerySnapHelper
;
import
com.ruiwenliu.wrapper.weight.horizontal.SpaceItemDecoration
;
import
com.rv.component.utils.DisplayUtil
;
import
com.xxfc.discovery.adapter.DiscoveryMenuAdapter
;
import
com.xxfc.discovery.event.PostPatEvent
;
import
com.xxfc.discovery.event.PostVideoEvent
;
...
...
@@ -276,11 +277,13 @@ public class DiscoveryFragment extends BaseFragment<DiscoveryPresenter> {
mPop
.
setOutsideTouchable
(
true
);
mPop
.
update
();
if
(
isShow
)
{
mPop
.
showPopupWindow
(
view
);
}
else
{
mPop
.
dismiss
();
}
// if (isShow) {
mPop
.
getContentView
().
measure
(
View
.
MeasureSpec
.
UNSPECIFIED
,
View
.
MeasureSpec
.
UNSPECIFIED
);
//这句代码必须要才能获得正确的popupwindow的宽度
int
popupwindowWidth
=
mPop
.
getContentView
().
getMeasuredWidth
()
/
2
+
(
int
)
DisplayUtil
.
dpToPx
(
_mActivity
,
18
);
mPop
.
showPopupWindow
(
view
,
popupwindowWidth
);
// } else {
// mPop.dismiss();
// }
isShow
=
!
isShow
;
...
...
module_discovery/src/main/java/com/xxfc/discovery/popupwindow/AddDiscoveryContentPw.java
View file @
fb94a19c
...
...
@@ -61,15 +61,16 @@ public class AddDiscoveryContentPw extends BasePopupWindow {
/**
* @param anchor v
*/
public
void
showPopupWindow
(
final
View
anchor
)
{
public
void
showPopupWindow
(
final
View
anchor
,
int
popupwindowWidth
)
{
if
(
Build
.
VERSION
.
SDK_INT
>=
24
)
{
Rect
visibleFrame
=
new
Rect
();
anchor
.
getGlobalVisibleRect
(
visibleFrame
);
// int height = anchor.getResources().getDisplayMetrics().heightPixels - visibleFrame.bottom;
// this.setHeight(height);
this
.
showAsDropDown
(
anchor
,
-
170
,
0
);
this
.
showAsDropDown
(
anchor
,
-
popupwindowWidth
,
0
);
}
else
{
this
.
showAsDropDown
(
anchor
,
-
170
,
0
);
this
.
showAsDropDown
(
anchor
,
-
popupwindowWidth
,
0
);
}
}
...
...
module_mine/src/main/res/values/strings.xml
View file @
fb94a19c
...
...
@@ -22,7 +22,7 @@
<string
name=
"tv_point"
>
请拍摄/上传身份证
</string>
<string
name=
"tv_front"
>
正面
</string>
<string
name=
"tv_negative"
>
反面
</string>
<string
name=
"tv_id_card_photo_hint"
>
*您所上传的身份证信息,仅用于
欣新
房车验证
</string>
<string
name=
"tv_id_card_photo_hint"
>
*您所上传的身份证信息,仅用于
滴
房车验证
</string>
<string
name=
"tv_id_card_certrfication_title"
>
身份证认证
</string>
<string
name=
"setting_title"
>
设置
</string>
<string
name=
"et_traveler_name_hint"
>
请输入出游人姓名
</string>
...
...
plugin_video/src/main/java/com/xxrv/video/activity/SelectVideoActivity.java
View file @
fb94a19c
...
...
@@ -60,9 +60,13 @@ public class SelectVideoActivity extends BaseStatusActivity<VideoPresenter> {
@Override
public
void
onItemClick
(
BaseQuickAdapter
adapter
,
View
view
,
int
position
)
{
VideoFile
item
=
(
VideoFile
)
adapter
.
getItem
(
position
);
getIntent
().
putExtra
(
"videofile"
,
item
);
setResult
(
201
,
getIntent
());
finish
();
if
(
item
.
getFileLength
()
<=
25
)
{
getIntent
().
putExtra
(
"videofile"
,
item
);
setResult
(
201
,
getIntent
());
finish
();
}
else
{
showToast
(
"亲!发布的视频不能超过25秒喔"
);
}
}
});
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment