腾讯云错误码映射

gradle/libs.versions.toml

@@ -159,9 +159,9 @@ tencentIMSDK = "8.4.6667"
 tencnetUiCore = "8.4.6667"
 tencnetUiCommon = "2.8.0.634"
 tencentLiteavSDK = "12.3.0.17115"
-tencnetRoommEngine = "2.9.3.575"
-tencnetTimpush = "latest.release"
-tencnetTimpushFcm = "latest.release"
+tencnetRoommEngine = "3.0.0.685"
+tencnetTimpush = "8.5.6864"
+tencnetTimpushFcm = "8.5.6864"
 
 # rong cloud
 rongcloud = "5.14.0"

module/call/src/main/java/com/adealink/weparty/call/constant/Error.kt

@@ -8,4 +8,15 @@ package com.adealink.weparty.call.constant
 const val CALL_ERROR_CALL_FAIL_FOR_CALLING = 100001
 const val CALL_ERROR_CALL_YOURSELF = 100002
 const val CALL_ERROR_MEDIA_CONFLICT_CANCEL = 100003
-const val CALL_ERROR_GET_USERINFO_FAIL = 100004
+const val CALL_ERROR_GET_USERINFO_FAIL = 100004
+
+
+/**
+ * Callkit 服务端错误码
+ * https://cloud.tencent.com/document/product/647/101604
+ */
+const val CALL_KIT_ERROR_101001 = 101001 //服务器内部错误，请重试
+const val CALL_KIT_ERROR_101002 = 101002 //参数无效，请检查参数是否符合要求，具体可查看错误信息进一步定义哪个字段
+const val CALL_KIT_ERROR_101004 = 101004 //通话不存在，或者曾经存在过，但是目前已经结束
+const val CALL_KIT_ERROR_101008 = 101008 //当前正在通话中
+const val CALL_KIT_ERROR_101050 = 101050 //通话记录不存在

module/call/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/manager/EngineManager.kt

@@ -7,6 +7,11 @@ import com.adealink.frame.data.json.froJsonErrorNull
 import com.adealink.frame.log.Log
 import com.adealink.weparty.call.CallActivity
 import com.adealink.weparty.call.R
+import com.adealink.weparty.call.constant.CALL_KIT_ERROR_101001
+import com.adealink.weparty.call.constant.CALL_KIT_ERROR_101002
+import com.adealink.weparty.call.constant.CALL_KIT_ERROR_101004
+import com.adealink.weparty.call.constant.CALL_KIT_ERROR_101008
+import com.adealink.weparty.call.constant.CALL_KIT_ERROR_101050
 import com.adealink.weparty.call.constant.TAG_CALL_ENGINE
 import com.adealink.weparty.call.data.CallUserData
 import com.tencent.cloud.tuikit.engine.call.TUICallDefine
@@ -363,16 +368,21 @@ class EngineManager private constructor(context: Context) {
         }
     }
 
-    private fun getCommonErrorMap(): Map<Int, String> {
-        val map = HashMap<Int, String>()
-//        map[TUICallDefine.ERROR_PACKAGE_NOT_PURCHASED] = context.getString(R.string.call_package_not_purchased)
-//        map[TUICallDefine.ERROR_PACKAGE_NOT_SUPPORTED] = context.getString(R.string.tuicallkit_package_not_support)
-        map[TUICallDefine.ERROR_INIT_FAIL] = context.getString(R.string.call_error_invalid_login)
-        map[TUICallDefine.ERROR_PARAM_INVALID] = context.getString(R.string.call_error_parameter_invalid)
-        map[TUICallDefine.ERROR_REQUEST_REFUSED] = context.getString(R.string.call_error_request_refused)
-        map[TUICallDefine.ERROR_REQUEST_REPEATED] = context.getString(R.string.call_error_request_repeated)
-        map[TUICallDefine.ERROR_SCENE_NOT_SUPPORTED] = context.getString(R.string.call_error_scene_not_support)
-        return map
+    private fun getCommonErrorMsg(errorCode: Int): String? {
+        return when (errorCode) {
+            TUICallDefine.ERROR_INIT_FAIL -> getCompatString(R.string.call_error_invalid_login)
+            TUICallDefine.ERROR_PARAM_INVALID -> getCompatString(R.string.call_error_parameter_invalid)
+            TUICallDefine.ERROR_REQUEST_REFUSED -> getCompatString(R.string.call_error_request_refused)
+            TUICallDefine.ERROR_REQUEST_REPEATED -> getCompatString(R.string.call_error_request_repeated)
+            TUICallDefine.ERROR_SCENE_NOT_SUPPORTED -> getCompatString(R.string.call_error_scene_not_support)
+
+            CALL_KIT_ERROR_101001,
+            CALL_KIT_ERROR_101002,
+            CALL_KIT_ERROR_101004,
+            CALL_KIT_ERROR_101050 -> getCompatString(R.string.call_kit_error, errorCode.toString())
+            CALL_KIT_ERROR_101008 -> getCompatString(R.string.call_kit_error_already_in_call)
+            else -> null
+        }
     }
 
     private fun convertErrorMsg(errorCode: Int, msg: String): String {
@@ -380,9 +390,9 @@ class EngineManager private constructor(context: Context) {
             return context.getString(R.string.call_error_in_peer_blacklist)
         }
 
-        val commonErrorMap = getCommonErrorMap()
-        if (commonErrorMap.containsKey(errorCode)) {
-            return commonErrorMap[errorCode]!!
+        val commonErrorMsg = getCommonErrorMsg(errorCode)
+        if (!commonErrorMsg.isNullOrEmpty()) {
+            return commonErrorMsg
         }
 
         return ErrorMessageConverter.convertIMError(errorCode, msg)

module/call/src/main/res/values-ar/strings.xml

@@ -61,4 +61,6 @@
     <string name="call_fail_for_calling_now">حاليا في مكالمة</string>
     <string name="call_permissoin_float_window">تتطلب هذه الميزة تمكين النافذة العائمة وأذونات بدء التشغيل في الخلفية</string>
     <string name="call_permission_grant_fail">فشل منح الإذن</string>
+    <string name="call_kit_error">خطأ الخادم(%s)</string>
+    <string name="call_kit_error_already_in_call">لا يمكن بدء المكالمة، وهي قيد المكالمة بالفعل</string>
 </resources>

module/call/src/main/res/values-zh/strings.xml

@@ -61,4 +61,6 @@
     <string name="call_fail_for_calling_now">正在通话中</string>
     <string name="call_permissoin_float_window">该功能需要开启悬浮窗和后台启动权限</string>
     <string name="call_permission_grant_fail">权限授予失败</string>
+    <string name="call_kit_error">服务错误(%s)</string>
+    <string name="call_kit_error_already_in_call">呼叫失败,已经在呼叫中</string>
 </resources>

module/call/src/main/res/values/strings.xml

@@ -61,4 +61,6 @@
     <string name="call_fail_for_calling_now">Currently on a call</string>
     <string name="call_permissoin_float_window">This feature requires enabling floating window and background startup permissions</string>
     <string name="call_permission_grant_fail">Permission grant failed</string>
+    <string name="call_kit_error">Server Error(%s)</string>
+    <string name="call_kit_error_already_in_call">Can not start call, already in call</string>
 </resources>