From 5d672686f3a251ae1fe1d809f8020db9f1f676c0 Mon Sep 17 00:00:00 2001
From: lixiaopeng <lixiaopeng@zhidaoauto.com>
Date: Tue, 11 Feb 2020 20:40:47 +0800
Subject: [PATCH] fixed player not seek progress

---
 config.gradle                                       |  7 +++++++
 modules/mogo-module-tanlu/build.gradle              |  8 ++++----
 .../module/tanlu/video/MediaCoverVideoPlayer.kt     |  9 ++-------
 .../module/tanlu/video/SimpleCoverVideoPlayer.kt    | 13 ++++---------
 .../main/res/drawable/small_video_seekbar_style.xml |  5 ++---
 .../src/main/res/values-xhdpi/dimens.xml            |  2 +-
 .../src/main/res/values/dimens.xml                  |  2 +-
 7 files changed, 21 insertions(+), 25 deletions(-)

diff --git a/config.gradle b/config.gradle
index 322d7a1834..760a137607 100644
--- a/config.gradle
+++ b/config.gradle
@@ -122,5 +122,12 @@ ext {
             accountsdk               : "com.zhidao.accountservice:account-sdk:1.0.5",
             // crash
             crashSdk                 : "com.zhidaoauto.crash.log:library:1.0.5",
+
+            //探路
+            videoarmv7               : "com.shuyu:gsyVideoPlayer-armv7a:7.1.2",
+            videoarm64               : "com.shuyu:gsyVideoPlayer-arm64:7.1.2",
+            videojava                : "com.shuyu:gsyVideoPlayer-java:7.1.2",
+            eventbus                 : "org.greenrobot:eventbus:3.1.1",
+
     ]
 }
\ No newline at end of file
diff --git a/modules/mogo-module-tanlu/build.gradle b/modules/mogo-module-tanlu/build.gradle
index 0b8129adce..8a280b205d 100644
--- a/modules/mogo-module-tanlu/build.gradle
+++ b/modules/mogo-module-tanlu/build.gradle
@@ -64,10 +64,10 @@ dependencies {
         implementation project(':modules:mogo-module-share')
     }
 
-    implementation 'com.shuyu:gsyVideoPlayer-armv7a:7.1.1'
-    implementation 'com.shuyu:gsyVideoPlayer-arm64:7.1.1'
-    implementation 'com.shuyu:gsyVideoPlayer-java:7.1.1'
-    implementation 'org.greenrobot:eventbus:3.1.1'
+    implementation rootProject.ext.dependencies.videoarmv7
+    implementation rootProject.ext.dependencies.videoarm64
+    implementation rootProject.ext.dependencies.videojava
+    implementation rootProject.ext.dependencies.eventbus
 
 }
 apply from: new File(rootProject.rootDir, "gradle/upload.gradle").toString()
diff --git a/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/video/MediaCoverVideoPlayer.kt b/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/video/MediaCoverVideoPlayer.kt
index b07cd17667..6beb5337d1 100644
--- a/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/video/MediaCoverVideoPlayer.kt
+++ b/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/video/MediaCoverVideoPlayer.kt
@@ -66,13 +66,8 @@ class MediaCoverVideoPlayer : StandardGSYVideoPlayer {
         return GSYVideoManager.instance()
     }
 
-    override fun setProgressAndTime(
-        progress: Int,
-        secProgress: Int,
-        currentTime: Int,
-        totalTime: Int
-    ) {
-        super.setProgressAndTime(progress, secProgress, currentTime, totalTime)
+    override fun setProgressAndTime(progress: Int, secProgress: Int, currentTime: Int, totalTime: Int, forceChange: Boolean) {
+        super.setProgressAndTime(progress, secProgress, currentTime, totalTime, forceChange)
         if (progress != 0) {
             mProgressBar.progress = progress
         }
diff --git a/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/video/SimpleCoverVideoPlayer.kt b/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/video/SimpleCoverVideoPlayer.kt
index 0a4ce844fd..ffce64b4e6 100644
--- a/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/video/SimpleCoverVideoPlayer.kt
+++ b/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/video/SimpleCoverVideoPlayer.kt
@@ -45,14 +45,9 @@ class SimpleCoverVideoPlayer : StandardGSYVideoPlayer {
         return GSYVideoManager.instance()
     }
 
-    override fun setProgressAndTime(
-        progress: Int,
-        secProgress: Int,
-        currentTime: Int,
-        totalTime: Int
-    ) {
-        super.setProgressAndTime(progress, secProgress, currentTime, totalTime)
-        Log.e("liyz", "setProgressAndTime  progress  = $progress --->currentTime = $currentTime --->totalTime = $totalTime")
+    override fun setProgressAndTime(progress: Int, secProgress: Int, currentTime: Int, totalTime: Int, forceChange: Boolean) {
+        super.setProgressAndTime(progress, secProgress, currentTime, totalTime, forceChange)
+//        Log.e("liyz", "setProgressAndTime  progress  = $progress --->currentTime = $currentTime --->totalTime = $totalTime")
         if (progress != 0) {
             mProgressBar.progress = progress
         }
@@ -79,12 +74,12 @@ class SimpleCoverVideoPlayer : StandardGSYVideoPlayer {
     override fun changeUiToCompleteShow() {
         super.changeUiToCompleteShow()
 //        setViewShowState(mBottomContainer, View.INVISIBLE)
+        mBottomContainer.visibility = View.INVISIBLE
         Log.d("liyz", "changeUiToCompleteShow ------------>")
     }
 
     override fun hideAllWidget() {
         super.hideAllWidget()
-        Log.d("liyz", "hideAllWidget ------------>")
         mBottomContainer.visibility = View.VISIBLE
     }
 
diff --git a/modules/mogo-module-tanlu/src/main/res/drawable/small_video_seekbar_style.xml b/modules/mogo-module-tanlu/src/main/res/drawable/small_video_seekbar_style.xml
index 7d1914a68b..88ba22746d 100644
--- a/modules/mogo-module-tanlu/src/main/res/drawable/small_video_seekbar_style.xml
+++ b/modules/mogo-module-tanlu/src/main/res/drawable/small_video_seekbar_style.xml
@@ -3,6 +3,7 @@
     <item android:id="@android:id/background">
         <shape>
             <solid android:color="#59000000"/>
+            <corners android:radius="4dp" />
         </shape>
     </item>
     <item android:id="@android:id/secondaryProgress">
@@ -15,9 +16,7 @@
     <item android:id="@android:id/progress">
         <clip>
             <shape>
-<!--                <solid android:color="#66FFFFFF"/>-->
-                <corners android:radius="5dp" />
-                <!--在gradient这里设置不同的颜色就会产生渐变的效果-->
+                <corners android:radius="4dp" />
                 <gradient
                     android:startColor="#1AFFFFFF"
                     android:endColor="#CCFFFFFF"/>
diff --git a/modules/mogo-module-tanlu/src/main/res/values-xhdpi/dimens.xml b/modules/mogo-module-tanlu/src/main/res/values-xhdpi/dimens.xml
index f198f8152e..c0a49c55c2 100644
--- a/modules/mogo-module-tanlu/src/main/res/values-xhdpi/dimens.xml
+++ b/modules/mogo-module-tanlu/src/main/res/values-xhdpi/dimens.xml
@@ -15,7 +15,7 @@
     <dimen name="tanlu_module_full_loading_height">96px</dimen>
     <dimen name="tanlu_module_full_bottom_height">100px</dimen>
     <dimen name="tanlu_module_full_bottom_width">700px</dimen>
-    <dimen name="tanlu_module_full_bottom_margin">5px</dimen>
+    <dimen name="tanlu_module_full_bottom_margin">7px</dimen>
 
     <dimen name="tanlu_module_full_top_height">135px</dimen>
     <dimen name="tanlu_module_full_back_width">50px</dimen>
diff --git a/modules/mogo-module-tanlu/src/main/res/values/dimens.xml b/modules/mogo-module-tanlu/src/main/res/values/dimens.xml
index a2953cf57c..438de99179 100644
--- a/modules/mogo-module-tanlu/src/main/res/values/dimens.xml
+++ b/modules/mogo-module-tanlu/src/main/res/values/dimens.xml
@@ -15,7 +15,7 @@
     <dimen name="tanlu_module_full_loading_height">96px</dimen>
     <dimen name="tanlu_module_full_bottom_height">144px</dimen>
     <dimen name="tanlu_module_full_bottom_width">760px</dimen>
-    <dimen name="tanlu_module_full_bottom_margin">5px</dimen>
+    <dimen name="tanlu_module_full_bottom_margin">7px</dimen>
 
     <dimen name="tanlu_module_full_top_height">135px</dimen>
     <dimen name="tanlu_module_full_back_width">50px</dimen>