Merge branch 'feat/qj/fix_2axb' into 'release'

切换axb埋点与leave埋点desc

See merge request app_android_lib/YDL-Component!368

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

@@ -1253,7 +1253,6 @@ class AudioHomeActivity :
                 }
 
             })
-            YDLavManager.instances.callEndStatusUpdate(channelId!!, 51, "接通中：主叫主动切换AXB")
 
         } else {
             mPresenter.getAXBPhone(ConnectCommand(listenId!!, "1"))
@@ -1271,6 +1270,7 @@ class AudioHomeActivity :
             //通话结束或挂断时，上传日志文件
             uploadLog()
             //已经连接成功，切换axb时需要更新专家状态
+            YDLavManager.instances.callEndStatusUpdate(channelId!!, 51, "接通中：主叫主动切换AXB")
             updateExpertStatus(true, 1)
         } else {
             //未连接成功，切换axb时：需发送消息通知专家端用户已挂断
@@ -1535,7 +1535,14 @@ class AudioHomeActivity :
             //  声网离开房间
             if (reason in 0..11) {
                 val from = LeaveChannelReason.getFrom(reason)
-                AudioApiRequestUtil.reportCallEvent(channelId, RtcEvent(RtcEvent.Event.leave), retCode = from, errorCode = reason)
+                val desc = LeaveChannelReason.getDesc(reason)
+                AudioApiRequestUtil.reportCallEvent(
+                    channelId,
+                    RtcEvent(RtcEvent.Event.leave),
+                    retCode = from,
+                    errorCode = reason,
+                    errorReason = desc
+                )
             } else {
                 XLog.e("audiohomeActivity", "leaveChannel$reason")
             }

m-audioim/src/main/java/com/ydl/audioim/http/AudioApiRequestUtil.kt

@@ -255,5 +255,47 @@ object LeaveChannelReason {
             else -> 1
         }
     }
+
+    fun getDesc(reason: Int): String {
+        return when (reason) {
+            0 -> {
+                "正常leave"
+            }
+            1 -> {
+                "拒绝"
+            }
+            2 -> {
+                "取消呼叫"
+            }
+            3 -> {
+                "对方已掉线"
+            }
+            4 -> {
+                "对方已离开"
+            }
+            5 -> {
+                "转axb"
+            }
+            6 -> {
+                "被叫接听超时"
+            }
+            7 -> {
+                "通话时间用完"
+            }
+            8 -> {
+                "加入通道超时"
+            }
+            9 -> {
+                "声网Error"
+            }
+            10 -> {
+                "网络连接被服务器禁止"
+            }
+            else -> {
+                ""
+            }
+        }
+    }
+
 }
 

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

@@ -1108,7 +1108,14 @@ class ConsultantAudioHomeActivity :
         connectingStatusDisposable?.dispose()
         if (reason in 0..11) {
             val from = LeaveChannelReason.getFrom(reason)
-            AudioApiRequestUtil.reportCallEvent(mAudioMessageBean?.channelId, RtcEvent(RtcEvent.Event.leave), retCode = from, errorCode = reason)
+            val desc = LeaveChannelReason.getDesc(reason)
+            AudioApiRequestUtil.reportCallEvent(
+                mAudioMessageBean?.channelId,
+                RtcEvent(RtcEvent.Event.leave),
+                retCode = from,
+                errorCode = reason,
+                errorReason = desc
+            )
         } else {
             XLog.e("audiohomeActivity", "leaveChannel$reason")
         }