Merge remote-tracking branch 'origin/d/v4.3.96' into d/v4.3.97

# Conflicts:
#	config.gradle

config.gradle

@@ -5,7 +5,7 @@ ext {
     ydlPublishVersion = [
             // -------------- 业务模块 --------------
             //第三步 若干
-            "m-confide"       : "0.0.50.21",
+            "m-confide"       : "0.0.50.24",
             "m-consultant"    : "0.0.60.67",
             "m-fm"            : "0.0.30.09",
             "m-user"          : "0.0.62.48",
@@ -14,7 +14,7 @@ ext {
             "m-dynamic"       : "0.0.7.74",
             "m-article"       : "0.0.0.10",
 
-            "m-muse"          : "0.0.28.76",
+            "m-muse"          : "0.0.28.78",
             "m-tests"         : "0.0.24.18",
             "m-course"        : "0.0.43.39",
 
@@ -42,7 +42,8 @@ ext {
             "ydl-webview"     : "0.0.38.92",
             "ydl-media"       : "0.0.21.52",
             "ydl-pay"         : "0.0.18.19",
-            "m-audioim"       : "0.0.49.30.15",
+            "m-audioim"       : "0.0.49.30.18",
+
 
 
 
@@ -93,7 +94,7 @@ ext {
     ydlCompileVersion = [
             // -------------- 业务模块 --------------
             //第三步 若干
-            "m-confide"       : "0.0.50.21",
+            "m-confide"       : "0.0.50.24",
             "m-consultant"    : "0.0.60.67",
             "m-fm"            : "0.0.30.09",
             "m-user"          : "0.0.62.48",
@@ -102,7 +103,7 @@ ext {
             "m-dynamic"       : "0.0.7.74",
             "m-article"       : "0.0.0.10",
 
-            "m-muse"          : "0.0.28.76",
+            "m-muse"          : "0.0.28.78",
             "m-tests"         : "0.0.24.18",
             "m-course"        : "0.0.43.39",
 
@@ -129,7 +130,7 @@ ext {
             "ydl-webview"     : "0.0.38.92",
             "ydl-media"       : "0.0.21.52",
             "ydl-pay"         : "0.0.18.19",
-            "m-audioim"       : "0.0.49.30.15",
+            "m-audioim"       : "0.0.49.30.18",
             "ydl-flutter-base": "0.0.14.38",
 
             //以下 几乎不会动

m-muse/src/main/java/com/yidianling/muse/helper/MediaPlayerManager.kt

@@ -45,7 +45,7 @@ class MediaPlayerManager private constructor() {
         mTime = time
     }
 
-    fun setAudioPath(path: String,isLoop:Boolean = false){
+    fun setAudioPath(path: String){
 
         val attrs = AudioAttributes.Builder()
             .setContentType(AudioAttributes.CONTENT_TYPE_MUSIC)
@@ -60,9 +60,6 @@ class MediaPlayerManager private constructor() {
         mMediaPlayer?.prepareAsync()
         mMediaPlayer?.setOnPreparedListener {
             listener?.onPrepared(it)
-            if (isLoop){
-                mMediaPlayer?.seekTo(0)
-            }
         }
     }
 

m-muse/src/main/java/com/yidianling/muse/utils/MediaPlayerTimeUtil.kt

@@ -28,7 +28,7 @@ class MediaPlayerTimeUtil {
                         "$minute:$second"
                     }
                 }
-            }else if (time in 1..59){
+            }else if (time in 0..59){
                 second = time
                 return if (second in 0..9){
                     "00:0$second"