Merge branch 'dev' into 代运营项目

# Conflicts:
#	config.gradle

config.gradle

@@ -42,7 +42,7 @@ ext {
     ydlPublishVersion = [
             // -------------- 业务模块 --------------
             //第三步 若干
-            "m-confide"       : "0.0.47.7",
+            "m-confide"       : "0.0.48.3",
             "m-consultant"    : "0.0.57.4",
             "m-fm"            : "0.0.28",
             "m-user"          : "0.0.58.2",
@@ -75,7 +75,7 @@ ext {
             "ydl-webview"     : "0.0.37.1",
             "ydl-media"       : "0.0.20",
             "ydl-pay"         : "0.0.17",
-            "m-audioim"       : "0.0.46.5",
+            "m-audioim"       : "0.0.47.7",
             "ydl-flutter-base": "0.0.10.4",
 
             //以下 几乎不会动
@@ -121,7 +121,7 @@ ext {
             "ydl-webview"     : "0.0.37.1",
             "ydl-media"       : "0.0.20",
             "ydl-pay"         : "0.0.17",
-            "m-audioim"       : "0.0.46.5",
+            "m-audioim"       : "0.0.47.7",
             "ydl-flutter-base": "0.0.10",
 
             //以下 几乎不会动

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

@@ -329,12 +329,13 @@ class AudioHomeActivity : BaseMvpActivity<IAudioHomeActivityContract.View, IAudi
 
     /**
      * 上传错误日志
+     * zhu 洪平要的，判别是移动端主动调的还是声网返的
      */
-    private fun uploadException(message: String) {
+    private fun uploadException(message: String, zhu: String = "") {
         var time: String = (System.currentTimeMillis() / 1000).toString()
         var uid: String = ModularServiceManager.provide(IUserService::class.java).getUserInfo()?.uid!!
         var payLoad = PayLoad(channelId ?: "0", time, uid, "1", "999", message)
-        var connectException = ConnectExceptionCommand(time, "2", "99", payLoad)
+        var connectException = ConnectExceptionCommand(time + zhu, "2", "99", payLoad)
         getPresenter().connectException(connectException)
     }
 
@@ -718,6 +719,10 @@ class AudioHomeActivity : BaseMvpActivity<IAudioHomeActivityContract.View, IAudi
 
         val dialog = AxbConfirmDialog(mContext, type, object : AxbConfirmDialog.OnClickEnsureListener {
             override fun onClickEnsure() {
+                //是手动切换且连接成功
+                if (type == 1 && isConnectSuccess) {
+                    uploadException("", "zhu")
+                }
                 switchAXB()
             }