Merge branch 'feat/qj/confide_optimize' into 'd/v_confide_optimized'

没权限走axb处理

See merge request app_android_lib/YDL-Component!226

m-confide/src/main/java/com/ydl/confide/home/modular/service/ConfideWebServiceImpl.kt

@@ -154,7 +154,7 @@ class ConfideWebServiceImpl {
         callType: String?
     ) {
         ConfideHomeDataManager.getHttp()
-            .submitOrderAndPay(ConnectParamJava("" + id, "" , ""))
+            .submitOrderAndPay(ConnectParamJava("" + id, "" + type, callType ?: ""))
             .subscribeOn(Schedulers.io())
             .observeOn(AndroidSchedulers.mainThread())
             .subscribe({
@@ -166,7 +166,7 @@ class ConfideWebServiceImpl {
                                 checkPermission(id, type, activity, callType)
                             } else {
                                 //axb
-                                listenDial(id, type, activity,"1")
+                                listenDial(id, type, activity, callType ?: "")
                             }
                         }
                         100007 -> {
@@ -186,6 +186,7 @@ class ConfideWebServiceImpl {
                 ToastHelper.show(it.message ?: "连接失败")
             })
     }
+
     /**
      * 检查权限
      * */
@@ -195,11 +196,11 @@ class ConfideWebServiceImpl {
             ConfidePermissionDialog().apply {
                 callback = { granted ->
                     if (granted) {
-                        listenDial(id, type, activity, callType)
+                        listenDial(id, type, activity, callType ?: "")
                         AliYunRichLogsHelper.getInstance()
                             .sendRichLog(AliYunLogConfig.AGORA, "请求音频权限通过")
                     } else {
-                        listenDial(id, type, activity, "1")
+                        listenDial(id, 1, activity, callType ?: "")
                         AliYunRichLogsHelper.getInstance()
                             .sendRichLog(AliYunLogConfig.AGORA, "权限拒绝 转axb")
                     }
@@ -215,7 +216,7 @@ class ConfideWebServiceImpl {
         id: Int,
         type: Int,
         activity: Activity,
-        callType: String?
+        callType: String
     ) {
         ConfideHomeDataManager.getHttp()
             .connectionJava(ConnectParamJava("" + id, "" + type, callType))
@@ -253,7 +254,7 @@ class ConfideWebServiceImpl {
     ): Disposable {
         Loading.show(activity)
         return ConfideHomeDataManager.getHttp()
-            .submitOrderAndPay(ConnectParamJava("" + id, "" , ""))
+            .submitOrderAndPay(ConnectParamJava("" + id, "" + type, callType ?: ""))
             .subscribeOn(Schedulers.io())
             .observeOn(AndroidSchedulers.mainThread())
             .subscribe({
@@ -263,10 +264,10 @@ class ConfideWebServiceImpl {
                         0 -> {//连接成功
                             if (type == 3) {
                                 //检查音频权限
-                                checkPermission(id, type, activity as Activity,callType)
-                            }else{
+                                checkPermission(id, type, activity as Activity, callType)
+                            } else {
                                 //axb
-                                listenDial(id, type, activity as Activity,"1");
+                                listenDial(id, type, activity as Activity, callType ?: "")
                             }
                         }
                         100007 -> {