声网

config.gradle

@@ -42,7 +42,7 @@ ext {
     ydlPublishVersion = [
             // -------------- 业务模块 --------------
             //第三步 若干
-            "m-confide"       : "0.0.48.19",
+            "m-confide"       : "0.0.48.20",
             "m-consultant"    : "0.0.59.7",
             "m-fm"            : "0.0.29.3",
             "m-user"          : "0.0.60.4",
@@ -75,7 +75,7 @@ ext {
             "ydl-webview"     : "0.0.38.29",
             "ydl-media"       : "0.0.20",
             "ydl-pay"         : "0.0.17",
-            "m-audioim"       : "0.0.48.7",
+            "m-audioim"       : "0.0.48.8",
             "ydl-flutter-base": "0.0.14.12",
 
             //以下 几乎不会动
@@ -121,7 +121,7 @@ ext {
             "ydl-webview"     : "0.0.38.29",
             "ydl-media"       : "0.0.20",
             "ydl-pay"         : "0.0.17",
-            "m-audioim"       : "0.0.48.7",
+            "m-audioim"       : "0.0.48.8",
             "ydl-flutter-base": "0.0.10.9",
 
             //以下 几乎不会动

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

@@ -414,7 +414,7 @@ class AudioHomeActivity :
 
     private fun reLoginRTM() {
         writeAgoraLog("RMT状态:${YDLavManager.sdkStatus},重新登录RMT")
-        val uid=YdlCommonRouterManager.getYdlCommonRoute().getUid().toString()
+        val uid = YdlCommonRouterManager.getYdlCommonRoute().getUid().toString()
         YDLavManager.instances.login(uid) { _isSuccess, _msg ->
             writeAgoraLog("登录RTM的uid=${uid}")
             val result = if (_isSuccess) "RMT登录成功" else "RMT登录失败:$_msg"
@@ -571,9 +571,12 @@ class AudioHomeActivity :
                     writeAgoraLog("未接通挂断：60s等待倒计时结束挂断")
                     //提示切换传统线路
                     //发送消息通知专家用户已挂断
-                    YDLRTMClient.instances.cancelCall(listenerUid, channelId,object :CancelCallStatusListener{
+                    YDLRTMClient.instances.cancelCall(
+                        listenerUid,
+                        channelId,
+                        object : CancelCallStatusListener {
                             override fun onFailure(errorMsg: String?, errorCode: Int) {
-                            YDLRTMClient.instances.cancelCall(listenerUid, channelId,null)
+                                YDLRTMClient.instances.cancelCall(listenerUid, channelId, null)
                             }
 
                             override fun onSuccess() {
@@ -628,21 +631,29 @@ class AudioHomeActivity :
      */
     private fun userCloseCalling() {
         writeAgoraLog("未接听时：主叫主动挂断，取消呼叫")
+        //通话结束或挂断时，上传日志文件
+        uploadLog()
+        handler!!.postDelayed({
+            leaveChannel()
+        }, 100)
         //发送消息通知专家用户已挂断
-        YDLRTMClient.instances.cancelCall(listenerUid, channelId,object :CancelCallStatusListener{
+
+        //通话结束或挂断时，上传日志文件
+        uploadLog()
+        handler!!.postDelayed({
+            YDLRTMClient.instances.cancelCall(
+                listenerUid,
+                channelId,
+                object : CancelCallStatusListener {
                     override fun onFailure(errorMsg: String?, errorCode: Int) {
                         writeAgoraLog("未接听时：主叫主动挂断失败，msg=$errorMsg($errorCode)，再次挂断")
-                YDLRTMClient.instances.cancelCall(listenerUid, channelId,null)
+                        YDLRTMClient.instances.cancelCall(listenerUid, channelId, null)
                     }
 
                     override fun onSuccess() {
                     }
                 })
-        //通话结束或挂断时，上传日志文件
-        uploadLog()
-        handler!!.postDelayed({
-            leaveChannel()
-        }, 100)
+        }, 500)
     }
 
     /**
@@ -728,15 +739,21 @@ class AudioHomeActivity :
             //未连接成功，切换axb时：需发送消息通知专家端用户已挂断
             //发送消息通知专家用户已挂断
             //发送消息通知专家用户已挂断
-            YDLRTMClient.instances.cancelCall(listenerUid, channelId,object :CancelCallStatusListener{
+            leaveChannel()
+            handler!!.postDelayed({
+                YDLRTMClient.instances.cancelCall(
+                    listenerUid,
+                    channelId,
+                    object : CancelCallStatusListener {
                         override fun onFailure(errorMsg: String?, errorCode: Int) {
-                    YDLRTMClient.instances.cancelCall(listenerUid, channelId,null)
+                            writeAgoraLog("未接听时：主叫主动挂断失败，msg=$errorMsg($errorCode)，再次挂断")
+                            YDLRTMClient.instances.cancelCall(listenerUid, channelId, null)
                         }
 
                         override fun onSuccess() {
                         }
                     })
-            leaveChannel()
+            }, 200)
         }
     }
 
@@ -1091,9 +1108,15 @@ class AudioHomeActivity :
      * 上传错误日志
      * zhu 洪平要的，判别是移动端主动调的还是声网返的
      */
-    private fun uploadException(message: String, zhu: String = "", eventType: String = "99", callback: YDLavManager.UploadExceptionCallback?) {
+    private fun uploadException(
+        message: String,
+        zhu: String = "",
+        eventType: String = "99",
+        callback: YDLavManager.UploadExceptionCallback?
+    ) {
         var time: String = (System.currentTimeMillis() / 1000).toString()
-        var uid: String = ModularServiceManager.provide(IUserService::class.java).getUserInfo()?.uid!!
+        var uid: String =
+            ModularServiceManager.provide(IUserService::class.java).getUserInfo()?.uid!!
         var payLoad = PayLoad(channelId ?: "0", time, uid, "1", "999", message)
         var connectException = ConnectExceptionCommand(time + zhu, "2", eventType, payLoad)
         YDLavManager.instances.uploadException(connectException, callback)