声网

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

@@ -571,17 +571,14 @@ class AudioHomeActivity :
                     writeAgoraLog("未接通挂断：60s等待倒计时结束挂断")
                     //提示切换传统线路
                     //发送消息通知专家用户已挂断
-                    YDLRTMClient.instances.cancelCall(
-                        listenerUid,
-                        channelId,
-                        object : CancelCallStatusListener {
-                            override fun onFailure(errorMsg: String?, errorCode: Int) {
-                                YDLRTMClient.instances.cancelCall(listenerUid, channelId, null)
-                            }
-
-                            override fun onSuccess() {
-                            }
-                        })
+                    YDLRTMClient.instances.cancelCall(listenerUid, channelId,object :CancelCallStatusListener{
+                        override fun onFailure(errorMsg: String?, errorCode: Int) {
+                            YDLRTMClient.instances.cancelCall(listenerUid, channelId,null)
+                        }
+
+                        override fun onSuccess() {
+                        }
+                    })
                     //通话结束或挂断时，上传日志文件
                     uploadLog()
 
@@ -631,29 +628,21 @@ class AudioHomeActivity :
      */
     private fun userCloseCalling() {
         writeAgoraLog("未接听时：主叫主动挂断，取消呼叫")
-        //通话结束或挂断时，上传日志文件
-        uploadLog()
-        handler!!.postDelayed({
-            leaveChannel()
-        }, 100)
         //发送消息通知专家用户已挂断
+        YDLRTMClient.instances.cancelCall(listenerUid, channelId,object :CancelCallStatusListener{
+            override fun onFailure(errorMsg: String?, errorCode: Int) {
+                writeAgoraLog("未接听时：主叫主动挂断失败，msg=$errorMsg($errorCode)，再次挂断")
+                YDLRTMClient.instances.cancelCall(listenerUid, channelId,null)
+            }
 
+            override fun onSuccess() {
+            }
+        })
         //通话结束或挂断时，上传日志文件
         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)
-                    }
-
-                    override fun onSuccess() {
-                    }
-                })
-        }, 500)
+            leaveChannel()
+        }, 100)
     }
 
     /**
@@ -739,21 +728,15 @@ class AudioHomeActivity :
             //未连接成功，切换axb时：需发送消息通知专家端用户已挂断
             //发送消息通知专家用户已挂断
             //发送消息通知专家用户已挂断
-            leaveChannel()
-            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,object :CancelCallStatusListener{
+                override fun onFailure(errorMsg: String?, errorCode: Int) {
+                    YDLRTMClient.instances.cancelCall(listenerUid, channelId,null)
+                }
 
-                        override fun onSuccess() {
-                        }
-                    })
-            }, 200)
+                override fun onSuccess() {
+                }
+            })
+            leaveChannel()
         }
     }