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 @@
-
+
-
@@ -15,9 +16,7 @@
-
-
-
-
+
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 @@
96px
100px
700px
- 5px
+ 7px
135px
50px
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 @@
96px
144px
760px
- 5px
+ 7px
135px
50px