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

Merge branch 'oo' into dev

Browse Source
This commit is contained in:
liujing
2020-10-25 14:24:34 +08:00
parent 559131ba7d 82410c20df
commit 42e708a540
4 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
libraries/map-amap/src/main/res/drawable-xhdpi/video_loading_img.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.7 KiB

3
modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/road/V2XRoadVideoWindow.java
View File

@@ -101,8 +101,6 @@ public class V2XRoadVideoWindow extends RelativeLayout implements IV2XWindow, ID
simpleCoverVideoPlayer.getStartButton().performClick();
thumbnailImage.setVisibility(View.GONE);
playImageView.setVisibility(View.GONE);
playImageView.setImageResource(R.drawable.v2x_video_pause);
playImageView.setVisibility(View.GONE);
}
/*
@@ -123,6 +121,7 @@ public class V2XRoadVideoWindow extends RelativeLayout implements IV2XWindow, ID
* 继续
* */
private void resume() {
playImageView.setImageResource(R.drawable.v2x_video_pause);
playImageView.setVisibility(View.GONE);
thumbnailImage.setVisibility(View.GONE);
}

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

@@ -1,6 +1,7 @@
package com.mogo.module.v2x.view
import android.content.Context
import android.graphics.drawable.Drawable
import android.util.AttributeSet
import android.view.Surface
import android.view.View
@@ -55,7 +56,6 @@ class SimpleCoverVideoPlayer : StandardGSYVideoPlayer {
override fun setProgressAndTime(progress: Int, secProgress: Int, currentTime: Int, totalTime: Int, forceChange: Boolean) {
super.setProgressAndTime(progress, secProgress, currentTime, totalTime, forceChange)
if (progress != 0) {
// Log.d("liyz", "SimpleCoverVideoPlayer setProgressAndTime -----2---- $progress");
mProgressBar.progress = progress
}
}
@@ -64,7 +64,7 @@ class SimpleCoverVideoPlayer : StandardGSYVideoPlayer {
//加载图片
val requestOptions = RequestOptions()
// .placeholder(R.drawable.tanlu_normal_image)
.error(R.drawable.v2x_event_video_refresh)
// .error(R.drawable.video_loading_img)
Glide.with(mContext).asBitmap()
.load(url)
.apply(requestOptions)
@@ -81,11 +81,7 @@ class SimpleCoverVideoPlayer : StandardGSYVideoPlayer {
override fun updateStartImage() {
when (mCurrentState) {
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)
}
super.updateStartImage()
when (mCurrentState) {
GSYVideoView.CURRENT_STATE_PAUSE -> start.visibility = View.VISIBLE
@@ -93,6 +89,10 @@ class SimpleCoverVideoPlayer : StandardGSYVideoPlayer {
}
}
override fun setDialogProgressBar(drawable: Drawable?) {
// standardGSYVideoPlayer.setDialogProgressBar(mDialogProgressBarDrawable)
}
fun setFullClickListener(listener: OnClickListener) {
fullscreen.setOnClickListener(listener)
}

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

@@ -28,8 +28,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:scaleType="centerCrop"
android:src="@drawable/v2x_event_video_refresh"/>
android:scaleType="centerCrop"/>
</RelativeLayout>