From 82410c20df9819fc8848390af0fba9ea500d2948 Mon Sep 17 00:00:00 2001
From: liujing <liujing@zhidaoauto.com>
Date: Sun, 25 Oct 2020 14:24:12 +0800
Subject: [PATCH] =?UTF-8?q?=E6=92=AD=E6=94=BE=E6=9A=82=E5=81=9C=E5=9B=BE?=
 =?UTF-8?q?=E6=A0=87=E4=BD=BF=E7=94=A8=E9=BB=98=E8=AE=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../res/drawable-xhdpi/video_loading_img.png     | Bin 0 -> 2807 bytes
 .../scenario/scene/road/V2XRoadVideoWindow.java  |   3 +--
 .../module/v2x/view/SimpleCoverVideoPlayer.kt    |  14 +++++++-------
 .../src/main/res/layout/window_road_video.xml    |   3 +--
 4 files changed, 9 insertions(+), 11 deletions(-)
 create mode 100644 libraries/map-amap/src/main/res/drawable-xhdpi/video_loading_img.png

diff --git a/libraries/map-amap/src/main/res/drawable-xhdpi/video_loading_img.png b/libraries/map-amap/src/main/res/drawable-xhdpi/video_loading_img.png
new file mode 100644
index 0000000000000000000000000000000000000000..48be2bdd18044648da57e9ae6767d79cdb08a8b0
GIT binary patch
literal 2807
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
JPDHLkV1jStXYv35

literal 0
HcmV?d00001

diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/road/V2XRoadVideoWindow.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/road/V2XRoadVideoWindow.java
index 898882763d..517f004b7a 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/road/V2XRoadVideoWindow.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/road/V2XRoadVideoWindow.java
@@ -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);
     }
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/view/SimpleCoverVideoPlayer.kt b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/view/SimpleCoverVideoPlayer.kt
index 4f49bc80d1..9a7dc084a0 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/view/SimpleCoverVideoPlayer.kt
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/view/SimpleCoverVideoPlayer.kt
@@ -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)
     }
diff --git a/modules/mogo-module-v2x/src/main/res/layout/window_road_video.xml b/modules/mogo-module-v2x/src/main/res/layout/window_road_video.xml
index ddbe14771b..8998b40089 100644
--- a/modules/mogo-module-v2x/src/main/res/layout/window_road_video.xml
+++ b/modules/mogo-module-v2x/src/main/res/layout/window_road_video.xml
@@ -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>