yangyakun921/MoGoEagleEye
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'lk' into dev

Browse Source
This commit is contained in:
liujing
2020-10-23 20:51:18 +08:00
parent 2159c073a4 390deeba22
commit 08d96c50ff
5 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/view/SimpleCoverVideoPlayer.kt
View File

@@ -64,7 +64,7 @@ class SimpleCoverVideoPlayer : StandardGSYVideoPlayer {
//加载图片
val requestOptions = RequestOptions()
// .placeholder(R.drawable.tanlu_normal_image)
.error(R.drawable.video_loading_img)
.error(R.drawable.v2x_event_video_refresh)
Glide.with(mContext).asBitmap()
.load(url)
.apply(requestOptions)
@@ -75,16 +75,22 @@ class SimpleCoverVideoPlayer : StandardGSYVideoPlayer {
/*
* 默认双击暂停
* */
override fun onClickUiToggle(){
override fun onClickUiToggle() {
super.touchDoubleUp()
}
override fun updateStartImage() {
when (mCurrentState) {
GSYVideoView.CURRENT_STATE_PLAYING -> start.setImageResource(R.drawable.v2x_video_pause)
// GSYVideoView.CURRENT_STATE_ERROR -> start.setImageResource(R.drawable.live_error)
else -> start.setImageResource(R.drawable.v2x_icon_event_play)
// GSYVideoView.CURRENT_STATE_PLAYING -> start.setImageResource(R.drawable.v2x_video_pause)
GSYVideoView.CURRENT_STATE_ERROR -> start.setImageResource(R.drawable.v2x_event_video_refresh)
else -> start.setImageResource(R.drawable.v2x_icon_event_play)
}
when (mCurrentState) {
GSYVideoView.CURRENT_STATE_PAUSE -> start.setImageResource(R.drawable.v2x_video_pause)
GSYVideoView.CURRENT_STATE_PAUSE -> start.visibility = View.VISIBLE
else -> start.visibility = View.INVISIBLE
}
}

BIN
modules/mogo-module-v2x/src/main/res/drawable-ldpi/v2x_event_video_refresh.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.5 KiB

BIN
modules/mogo-module-v2x/src/main/res/drawable-mdpi/v2x_event_video_refresh.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.5 KiB

BIN
modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v2x_event_video_refresh.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.5 KiB

5
modules/mogo-module-v2x/src/main/res/layout/window_road_video.xml
View File

@@ -28,7 +28,8 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:scaleType="centerCrop" />
android:scaleType="centerCrop"
android:src="@drawable/v2x_event_video_refresh"/>
</RelativeLayout>
@@ -75,7 +76,7 @@
android:layout_height="@dimen/dp_56"
android:layout_centerHorizontal="true"
android:layout_centerVertical="true"
android:indeterminateDrawable="@drawable/video_loading_bg"
android:indeterminateDrawable="@drawable/video_loading_img"
android:visibility="gone" />
</RelativeLayout>