Merge remote-tracking branch 'origin/4.1.61' into 4.1.61

# Conflicts:
#	config.gradle

config.gradle

@@ -39,7 +39,7 @@ ext {
             "ydl-webview"     : "0.0.38.33",
             "ydl-media"       : "0.0.21.6",
             "ydl-pay"         : "0.0.18.13",
-            "m-audioim"       : "0.0.49.29.18",
+            "m-audioim"       : "0.0.49.29.19",
             "ydl-flutter-base": "0.0.14.20",
 
             //以下 几乎不会动
@@ -88,7 +88,7 @@ ext {
             // -------------- 业务模块 --------------
             //第三步 若干
 
-            "m-confide"       : "0.0.48.86",
+            "m-confide"       : "0.0.48.87",
             "m-consultant"    : "0.0.51.16",
             "m-fm"            : "0.0.23.5",
             "m-user"          : "0.0.60.37",
@@ -120,7 +120,7 @@ ext {
             "ydl-webview"     : "0.0.38.32",
             "ydl-media"       : "0.0.21.6",
             "ydl-pay"         : "0.0.18.11",
-            "m-audioim"       : "0.0.49.29.18",
+            "m-audioim"       : "0.0.49.29.19",
             "ydl-flutter-base": "0.0.14.20",
 
             //以下 几乎不会动

m-audioim/src/main/java/com/ydl/audioim/AudioHomeActivity.kt

@@ -790,7 +790,7 @@ class AudioHomeActivity :
     private fun showChooseDialog(type: Int) {
         val dialog = AxbConfirmDialog(mContext, type, object : AxbConfirmDialog.OnClickEnsureListener {
                 override fun onClickEnsure() {
-                    writeAgoraLog("主叫主动切换AXB")
+                    writeAgoraLog("主叫点击切换AXB按钮")
                     switchAXB()
                 }
 
@@ -812,6 +812,7 @@ class AudioHomeActivity :
         if (isConnectSuccess) {
             uploadException("", "zhu", "108", object : YDLavManager.UploadExceptionCallback {
                 override fun onSuccess() {
+                    writeAgoraLog("离开房间成功,主叫切换AXB之后")
                     mPresenter.getAXBPhone(ConnectCommand(listenId!!, "1"))
                 }
 
@@ -1224,12 +1225,6 @@ class AudioHomeActivity :
         leaveChannel()
     }
 
-    override fun onStop() {
-        writeAgoraLog("用户切到后台，可能要杀死进程")
-        uploadLog()
-        super.onStop()
-    }
-
     override fun onDestroy() {
         super.onDestroy()
         uploadLog()