Merge branch 'feat/lp/lp_aad_logout' into 'd/4.4.10'

feat: 增加声网logout

See merge request app_android_lib/YDL-Component!349

api/audioim/src/main/java/com/ydl/audioim/api/IAudioImService.kt

@@ -22,13 +22,18 @@ interface IAudioImService : IProvider{
     /**
      * rtm登录返回并登录状态
      */
-    fun loginRtm(userId:String?,event: (isSuccess: Boolean, msg: String?) -> Unit)
+    fun loginRtm(userId: String?, event: (isSuccess: Boolean, msg: String?) -> Unit)
 
 
     /**
      * rtm登录
      */
-    fun loginRtm(userId:String?)
+    fun loginRtm(userId: String?)
+
+    /**
+     * rtm退出登录
+     */
+    fun logoutRtm()
 
     /**
      * 拨打语音电话转axb弹窗

build.gradle

@@ -14,7 +14,7 @@ buildscript {
         ydlrouter_version = '1.2.3'
         constrait_support_version = '1.0.2'
 
-        componentVersion = "0.3.0.44"
+        componentVersion = "0.3.0.48.1-SNAPSHOT"
     }
     repositories {
         mavenCentral()

m-audioim/src/main/java/com/ydl/audioim/modular/AudioImServiceImp.kt

@@ -45,8 +45,13 @@ class AudioImServiceImp : IAudioImService {
         YDLavManager.instances.login(userId)
     }
 
+    override fun logoutRtm() {
+        YDLavManager.instances.logout()
+    }
+
     override fun openAxbDialog(activity: Activity?, type: Int, phoneNumber: String?) {
-        val dialog = AxbConfirmDialog(activity, type, object : AxbConfirmDialog.OnClickEnsureListener {
+        val dialog =
+            AxbConfirmDialog(activity, type, object : AxbConfirmDialog.OnClickEnsureListener {
                 override fun onClickEnsure() {
                     phoneNumber?.let {
                         val phoneIntent = Intent(Intent.ACTION_DIAL, Uri.parse("tel:$phoneNumber"))

m-im/build.gradle

@@ -77,4 +77,5 @@ dependencies {
     implementation project(":api:fm")
     implementation project(":api:consultant")
     implementation project(':api:confide')
+    implementation project(':api:audioim')
 }

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

 package com.yidianling.im.helper;
 
-import com.yidianling.uikit.api.NimUIKit;
 import com.netease.nimlib.sdk.NIMClient;
 import com.netease.nimlib.sdk.auth.AuthService;
+import com.ydl.audioim.api.IAudioImService;
+import com.ydl.ydlcommon.modular.ModularServiceManagerKt;
 import com.yidianling.im.preference.IMCache;
 import com.yidianling.nimbase.common.http.NimHttpClient;
+import com.yidianling.uikit.api.NimUIKit;
 
 /**
  * 注销帮助类
@@ -17,6 +19,7 @@ public class LogoutHelper {
         NimUIKit.logout();
         IMCache.clear();
         NIMClient.getService(AuthService.class).logout();
+        ModularServiceManagerKt.findRouteService(IAudioImService.class).logoutRtm();
     }
 
     private static LogoutHelper instance;