Merge branch 'feat/qj/netease3' into 'd/v4.4.08'

呼叫组件回滚

See merge request app_android_lib/YDL-Component!344

m-im/build.gradle

@@ -60,7 +60,7 @@ dependencies {
     api rootProject.ext.dependencies["ydl-user-router"]
     implementation rootProject.ext.dependencies["BaseRecyclerViewAdapterHelper"]
 
-    implementation('com.netease.yunxin.kit:call-ui:1.6.1') {
+    implementation('com.netease.yunxin.kit:call-ui:1.5.9-SNAPSHOT') {
         exclude group: "com.netease.nimlib", module: "avsignalling"
         exclude group: "com.netease.nimlib", module: "basesdk"
     }

m-im/src/main/java/com/yidianling/im/helper/NimUICallInit.java

@@ -47,7 +47,6 @@ public class NimUICallInit {
         CallKitUIOptions options = new CallKitUIOptions.Builder()
                 // 必要：音视频通话 sdk appKey，用于通话中使用
                 .rtcAppKey(appKey)
-                .audio2VideoConfirm(true)
                 .logRootPath(NimSDKOptionConfig.getAppCacheDir(context) + "/yidianling")
                 // 必要：当前用户 AccId
                 .currentUserAccId(userId)
@@ -81,7 +80,7 @@ public class NimUICallInit {
 //                .p2pAudioActivity(TestActivity.class)
 //                .p2pVideoActivity(TestActivity.class)
                 // 请求 rtc token 服务，若非安全模式则不需设置
-                .rtcTokenService((uid, channelName, callback) -> requestRtcToken(uid, channelName, callback)) // 自己实现的 token 请求方法
+                .rtcTokenService((uid, callback) -> requestRtcToken(uid, callback)) // 自己实现的 token 请求方法
                 // 设置初始化 rtc sdk 相关配置，按照所需进行配置
                 .rtcSdkOption(new NERtcOption())
                 // 呼叫组件初始化 rtc 范围，true-全局初始化，false-每次通话进行初始化以及销毁
@@ -93,10 +92,10 @@ public class NimUICallInit {
     }
 
     @SuppressLint("CheckResult")
-    private static void requestRtcToken(long uid, String channelName, RequestCallback<String> callback) {
+    private static void requestRtcToken(long uid, RequestCallback<String> callback) {
         Map<String, String> body = new HashMap<>();
-        if (channelName != null) {
-            body.put("channelName", channelName);
+        if (curChannelName != null) {
+            body.put("channelName", curChannelName);
         }
         body.put("uid", String.valueOf(uid));
         ImHttpImpl.Companion.getInstance().getImApi().nim2Token(body)