发版

config.gradle

@@ -5,7 +5,7 @@ ext {
     ydlPublishVersion = [
             // -------------- 业务模块 --------------
             //第三步 若干
-            "m-confide"       : "0.0.48.71",
+            "m-confide"       : "0.0.48.73",
             "m-consultant"    : "0.0.59.23",
             "m-fm"            : "0.0.30.00",
             "m-user"          : "0.0.60.20",
@@ -33,13 +33,13 @@ ext {
             //-------------- 功能组件 --------------
 
             //第一步
-            "ydl-platform"    : "0.0.39.40",
+            "ydl-platform"    : "0.0.39.41",
 
             //第二步 若干
             "ydl-webview"     : "0.0.38.32",
             "ydl-media"       : "0.0.21.6",
             "ydl-pay"         : "0.0.18.9",
-            "m-audioim"       : "0.0.49.29.4",
+            "m-audioim"       : "0.0.49.29.6",
             "ydl-flutter-base": "0.0.14.16",
 
             //以下 几乎不会动
@@ -114,13 +114,13 @@ ext {
             //-------------- 功能组件 --------------
 
             //第一步
-            "ydl-platform"    : "0.0.39.40",
+            "ydl-platform"    : "0.0.39.41",
 
             //第二步 若干
             "ydl-webview"     : "0.0.38.31",
             "ydl-media"       : "0.0.21.6",
             "ydl-pay"         : "0.0.18.9",
-            "m-audioim"       : "0.0.49.29.4",
+            "m-audioim"       : "0.0.49.29.6",
             "ydl-flutter-base": "0.0.14.14",
 
             //以下 几乎不会动

m-audioim/src/main/java/com/ydl/consultantim/ConsultantAudioHomeActivity.kt

@@ -773,6 +773,8 @@ class ConsultantAudioHomeActivity : BaseMvpActivity<IConsultantAudioHomeActivity
                 uploadException("主叫取消", zhu = "")
                 showToast("对方已挂断")
             }
+            ActivityManager.getInstance().removeStack(activity = this)
+            LogUtil.e("[agora]页面移除")
             finish()
         }
     }

ydl-platform/src/main/java/com/ydl/ydlcommon/utils/ActivityManager.kt

@@ -20,7 +20,7 @@ class ActivityManager {
         }
 
         fun finishAll() {
-            for(a in getInstance().activates) {
+            for (a in getInstance().activates) {
                 a.finish()
             }
             getInstance().activates.clear()
@@ -38,16 +38,16 @@ class ActivityManager {
          */
         fun finishOtherActivity(activity: Activity) {
 
-            for (act in getInstance().activates){
-                if (act == activity)continue
+            for (act in getInstance().activates) {
+                if (act == activity) continue
                 act.finish()
             }
         }
 
         fun finishActivity(cls: Class<*>) {
             getInstance().activates
-                    .filter { it::class.java == cls }
-                    .forEach { finishActivity(it) }
+                .filter { it::class.java == cls }
+                .forEach { finishActivity(it) }
         }
     }
 
@@ -56,12 +56,12 @@ class ActivityManager {
     }
 
     // 添加到栈中
-     fun addStack(activity: Activity) {
+    fun addStack(activity: Activity) {
         activates.add(activity)
     }
 
     // 从栈中移除
-    internal fun removeStack(activity: Activity) {
+    fun removeStack(activity: Activity) {
         if (activates.contains(activity)) {
             activates.remove(activity)
         }
@@ -100,7 +100,7 @@ class ActivityManager {
 
     fun finishActivity(cls: Class<out Activity>) {
         activates.filter { it::class.java == cls }
-                .forEach { finishActivity(it) }
+            .forEach { finishActivity(it) }
     }
 
     private object Holder {