Merge remote-tracking branch 'origin/release' into aaaaaaaaaaa

# Conflicts:
#	api/consultant/src/main/java/com/yidianling/consultant/OnBottomWordListener.kt
#	api/consultant/src/main/java/com/yidianling/consultant/bean/FunctionWordConsultBean.kt
#	config.gradle
#	m-consultant/src/main/java/com/yidianling/consultant/ExpertSearchFragment.kt
#	m-consultant/src/main/java/com/yidianling/consultant/HotSearchActivity.kt
#	m-home/src/ydl/java/com/yidianling/home/ui/fragment/YdlHomeFragment.kt

api/confide/build.gradle

@@ -2,7 +2,7 @@ apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
 apply from: "../../maven_push_api.gradle"
 
-version = '1.0.0'
+version = '1.0.4'
 
 android {
     compileSdkVersion rootProject.ext.android["compileSdkVersion"]

api/confide/src/main/java/com/ydl/confide/api/IConfideService.kt

@@ -20,6 +20,9 @@ interface IConfideService : IProvider {
 
     fun connectionJava(id: Int, type: Int, activity: Activity, tellData: String?, callType:String?)
 
+    //直接拨打倾诉或者axb电话
+    fun confideDial(id: Int, data: String, activity: Activity)
+
     fun ydlAvManagerLogin(uid: String?)
 
     fun startCondifeHomePage(context: Context, isSplash: Boolean)
@@ -34,4 +37,8 @@ interface IConfideService : IProvider {
         doctorId: String,
         uid: String
     )
+
+    fun isOnlineRtm():Boolean
+
+    fun requestConfidePermission(activity: FragmentActivity, call: ((Boolean) -> Unit)?)
 }
\ No newline at end of file

api/consultant/.gitignore

+/build
\ No newline at end of file

api/consultant/build.gradle

+apply plugin: 'com.android.library'
+apply plugin: 'kotlin-android'
+apply from: "../../maven_push_api.gradle"
+
+version = '1.0.0'
+
+android {
+    compileSdkVersion rootProject.ext.android["compileSdkVersion"]
+    buildToolsVersion rootProject.ext.android["buildToolsVersion"]
+
+    defaultConfig {
+        minSdkVersion rootProject.ext.android["minSdkVersion"]
+        targetSdkVersion rootProject.ext.android["targetSdkVersion"]
+
+    }
+
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+        }
+    }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+    kotlinOptions {
+        jvmTarget = '1.8'
+    }
+}
+
+dependencies {
+    implementation "com.alibaba:arouter-api:$arouter_api"
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+}
\ No newline at end of file

api/consultant/proguard-rules.pro

+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile
\ No newline at end of file

api/consultant/src/main/AndroidManifest.xml

+<?xml version="1.0" encoding="utf-8"?>
+<manifest package="com.ydl.consultant.api">
+
+</manifest>
\ No newline at end of file

api/course/.gitignore

+/build
\ No newline at end of file

api/course/build.gradle

+apply plugin: 'com.android.library'
+apply plugin: 'kotlin-android'
+apply from: "../../maven_push_api.gradle"
+
+version = '1.0.0'
+
+android {
+    compileSdkVersion rootProject.ext.android["compileSdkVersion"]
+    buildToolsVersion rootProject.ext.android["buildToolsVersion"]
+
+    defaultConfig {
+        minSdkVersion rootProject.ext.android["minSdkVersion"]
+        targetSdkVersion rootProject.ext.android["targetSdkVersion"]
+
+    }
+
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+        }
+    }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+    kotlinOptions {
+        jvmTarget = '1.8'
+    }
+}
+
+dependencies {
+    implementation "com.alibaba:arouter-api:$arouter_api"
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+}
\ No newline at end of file

api/course/proguard-rules.pro

+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile
\ No newline at end of file

api/course/src/main/AndroidManifest.xml

+<?xml version="1.0" encoding="utf-8"?>
+<manifest package="com.ydl.course.api">
+
+</manifest>
\ No newline at end of file

api/dynamic/.gitignore

+/build
\ No newline at end of file

api/dynamic/build.gradle

+apply plugin: 'com.android.library'
+apply plugin: 'kotlin-android'
+apply from: "../../maven_push_api.gradle"
+
+version = '1.0.0'
+
+android {
+    compileSdkVersion rootProject.ext.android["compileSdkVersion"]
+    buildToolsVersion rootProject.ext.android["buildToolsVersion"]
+
+    defaultConfig {
+        minSdkVersion rootProject.ext.android["minSdkVersion"]
+        targetSdkVersion rootProject.ext.android["targetSdkVersion"]
+
+    }
+
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+        }
+    }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+    kotlinOptions {
+        jvmTarget = '1.8'
+    }
+}
+
+dependencies {
+    implementation "com.alibaba:arouter-api:$arouter_api"
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+}
\ No newline at end of file

api/dynamic/proguard-rules.pro

+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile
\ No newline at end of file

api/dynamic/src/main/AndroidManifest.xml

+<?xml version="1.0" encoding="utf-8"?>
+<manifest package="com.ydl.dynamic.api">
+
+</manifest>
\ No newline at end of file

m-dynamic/src/main/modular_api/com/yidianling/dynamic/api/IDynamicService.kt → api/dynamic/src/main/java/com/yidianling/dynamic/api/IDynamicService.kt

 package com.yidianling.dynamic.api
 
 import android.app.Activity
-import android.content.Context
 import android.content.Intent
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentActivity

api/fm/.gitignore

+/build
\ No newline at end of file

api/fm/build.gradle

+apply plugin: 'com.android.library'
+apply plugin: 'kotlin-android'
+apply from: "../../maven_push_api.gradle"
+
+version = '1.0.0'
+
+android {
+    compileSdkVersion rootProject.ext.android["compileSdkVersion"]
+    buildToolsVersion rootProject.ext.android["buildToolsVersion"]
+
+    defaultConfig {
+        minSdkVersion rootProject.ext.android["minSdkVersion"]
+        targetSdkVersion rootProject.ext.android["targetSdkVersion"]
+
+    }
+
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+        }
+    }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+    kotlinOptions {
+        jvmTarget = '1.8'
+    }
+}
+
+dependencies {
+    implementation "com.alibaba:arouter-api:$arouter_api"
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+}
\ No newline at end of file

api/fm/proguard-rules.pro

+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile
\ No newline at end of file

api/fm/src/main/AndroidManifest.xml

+<?xml version="1.0" encoding="utf-8"?>
+<manifest package="com.ydl.fm.api">
+
+</manifest>
\ No newline at end of file

api/im/.gitignore

+/build
\ No newline at end of file

api/im/build.gradle

+apply plugin: 'com.android.library'
+apply plugin: 'kotlin-android'
+apply from: "../../maven_push_api.gradle"
+
+version = '1.0.2'
+
+android {
+    compileSdkVersion rootProject.ext.android["compileSdkVersion"]
+    buildToolsVersion rootProject.ext.android["buildToolsVersion"]
+
+    defaultConfig {
+        minSdkVersion rootProject.ext.android["minSdkVersion"]
+        targetSdkVersion rootProject.ext.android["targetSdkVersion"]
+
+    }
+
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+        }
+    }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+    kotlinOptions {
+        jvmTarget = '1.8'
+    }
+}
+
+dependencies {
+    implementation "com.alibaba:arouter-api:$arouter_api"
+    implementation "com.google.code.gson:gson:2.8.5"
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+}
\ No newline at end of file

api/im/proguard-rules.pro

+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile
\ No newline at end of file

api/im/src/main/AndroidManifest.xml

+<?xml version="1.0" encoding="utf-8"?>
+<manifest package="com.ydl.im.api">
+
+</manifest>
\ No newline at end of file

m-im/src/main/modular_api/com/yidianling/im/api/bean/IMInitConfigBean.java → api/im/src/main/java/com/yidianling/im/api/bean/IMInitConfigBean.java

 package com.yidianling.im.api.bean;
 
+import androidx.annotation.DrawableRes;
+
 /**
  * Created by haorui on 2020/3/6.
  * Des:
  */
 public class IMInitConfigBean {
+    @DrawableRes public int notificationIconRes;
     /**
      * 测试环境AppKey
      */

m-im/src/main/modular_api/com/yidianling/im/api/service/IImService.kt → api/im/src/main/java/com/yidianling/im/api/service/IImService.kt

@@ -110,6 +110,8 @@ interface IImService : IProvider {
      */
     fun registerObserveCustomNotification(callback: IMRegisterObserverCustomNotificationCallBack)
 
+    fun unregisterObserveCustomNotification(callback: IMRegisterObserverCustomNotificationCallBack)
+
 
     fun getMultiMessageFragment(): Fragment
 
@@ -178,8 +180,6 @@ interface IImService : IProvider {
         toUid: Int
     )
 
-    fun initIm(app: Application, activity: Class<out Activity>)
-
     fun initIm(app: Application, activity: Class<out Activity>, imInitBean: IMInitConfigBean)
 
     fun isWifiOr3G(activity: Activity): Boolean

api/tests/.gitignore

+/build
\ No newline at end of file

api/tests/build.gradle

+apply plugin: 'com.android.library'
+apply plugin: 'kotlin-android'
+apply from: "../../maven_push_api.gradle"
+
+version = '1.0.0'
+
+android {
+    compileSdkVersion rootProject.ext.android["compileSdkVersion"]
+    buildToolsVersion rootProject.ext.android["buildToolsVersion"]
+
+    defaultConfig {
+        minSdkVersion rootProject.ext.android["minSdkVersion"]
+        targetSdkVersion rootProject.ext.android["targetSdkVersion"]
+
+    }
+
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+        }
+    }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+    kotlinOptions {
+        jvmTarget = '1.8'
+    }
+}
+
+dependencies {
+    implementation "com.alibaba:arouter-api:$arouter_api"
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+}
\ No newline at end of file

api/tests/proguard-rules.pro

+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile
\ No newline at end of file

api/tests/src/main/AndroidManifest.xml

+<?xml version="1.0" encoding="utf-8"?>
+<manifest package="com.ydl.tests.api">
+
+</manifest>
\ No newline at end of file

api/user/.gitignore

+/build
\ No newline at end of file

api/user/build.gradle

+apply plugin: 'com.android.library'
+apply plugin: 'kotlin-android'
+apply from: "../../maven_push_api.gradle"
+
+version = '1.0.0'
+
+android {
+    compileSdkVersion rootProject.ext.android["compileSdkVersion"]
+    buildToolsVersion rootProject.ext.android["buildToolsVersion"]
+
+    defaultConfig {
+        minSdkVersion rootProject.ext.android["minSdkVersion"]
+        targetSdkVersion rootProject.ext.android["targetSdkVersion"]
+
+    }
+
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+        }
+    }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+    kotlinOptions {
+        jvmTarget = '1.8'
+    }
+}
+
+dependencies {
+    implementation "com.google.code.gson:gson:2.8.5"
+    implementation "com.alibaba:arouter-api:$arouter_api"
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+}
\ No newline at end of file

api/user/proguard-rules.pro

+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile
\ No newline at end of file

api/user/src/main/AndroidManifest.xml

+<?xml version="1.0" encoding="utf-8"?>
+<manifest package="com.ydl.user.api">
+
+</manifest>
\ No newline at end of file

app/build.gradle

@@ -182,6 +182,7 @@ dependencies {
     implementation(rootProject.ext.dependencies["appcompat-v7"])
     testImplementation 'junit:junit:4.13.2'
     androidTestImplementation 'androidx.test.ext:junit:1.1.2'
+    implementation "com.ydl.aar:resource:0.0.1-ydl"
 //    kapt rootProject.ext.dependencies["dagger2-compiler"]
 
     implementation(rootProject.ext.dependencies["design"])
@@ -192,12 +193,14 @@ dependencies {
 
 
     implementation fileTree(dir: 'aars', include: ['*.aar'])
-    implementation project(':m-user')
-    implementation modularPublication('com.ydl:m-user-api')
+    implementation(project(':m-user')){
+        exclude group: "com.ydl.aar", module: 'resource'
+    }
+    implementation project(":api:user")
     implementation project(':m-confide')
     implementation project(':api:confide')
     api project(':m-consultant')
-    implementation modularPublication('com.ydl:m-consultant-api')
+    implementation project(":api:consultant")
     api project(':m-tests')
     api project(':m-home')
     api project(':m-confide')
@@ -209,14 +212,13 @@ dependencies {
     implementation project(':ydl-media')
     implementation project(':m-muse')
     implementation project(':m-im')
-    implementation modularPublication('com.ydl:m-im-api')
+    implementation project(":api:im")
     implementation project(':m-dynamic')
     implementation project(':m-course')
     implementation project(':m-article')
     implementation project(':m-audioim')
-    implementation modularPublication('com.ydl:m-audioim-api')
     implementation project(':m-fm')
-    implementation modularPublication('com.ydl:m-fm-api')
+    implementation project(":api:fm")
     implementation project(':ydl-tuicore')
 
 

app/src/main/AndroidManifest.xml

@@ -12,6 +12,7 @@
     <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
     <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
     <uses-permission android:name="android.permission.READ_PHONE_STATE" />
+    <uses-permission android:name="android.permission.USE_BIOMETRIC" />
 
     <application
         android:name=".base.ComponentTestApp"

app/src/main/java/com/ydl/component/MainActivity.kt

@@ -9,11 +9,15 @@ import android.content.ServiceConnection
 import android.net.Uri
 import android.os.IBinder
 import android.provider.Settings
+import android.text.TextUtils
 import android.util.Log
 import com.alibaba.android.arouter.facade.annotation.Route
 import com.alibaba.android.arouter.launcher.ARouter
 import com.mobile.auth.gatewayauth.PhoneNumberAuthHelper
 import com.tbruyelle.rxpermissions2.RxPermissions
+import com.tencent.qcloud.tuicore.calling.trtccalling.model.TRTCCalling
+import com.tencent.qcloud.tuicore.calling.videocall.Constant
+import com.tencent.qcloud.tuicore.calling.videocall.YDLInvitionActivity
 import com.umeng.analytics.MobclickAgent
 import com.ydl.audioim.YDLavManager
 import com.ydl.component.music.FragmentContainerActivity
@@ -34,7 +38,6 @@ import com.yidianling.muse.event.MeditationFloatEvent
 import com.yidianling.muse.helper.MediaPlayerManager
 import com.yidianling.muse.service.MeditationWindowService
 import com.yidianling.tests.home.NewTestHomeActivity
-import com.yidianling.user.StatusUtils
 import com.yidianling.user.api.service.IUserService
 import com.yidianling.user.ui.collect.CollectSexAndBirthActivity
 import com.yidianling.user.ui.login.OneKeyLoginHelp
@@ -52,15 +55,15 @@ import kotlinx.android.synthetic.main.activity_main.*
 @Route(path = "/main/main")
 class MainActivity : BaseLceActivity<DemoContract.View, DemoContract.Presenter>(),
     DemoContract.View {
-    private var secretDescriptionDialog: SecretDescriptionDialog? = null
+    //    private var secretDescriptionDialog: SecretDescriptionDialog? = null
     private var serviceConnection: ServiceConnection? = null
 
-    private var meditationServiceConnection:ServiceConnection? = null
+    private var meditationServiceConnection: ServiceConnection? = null
 
     private var secretDialog: SecretDialog? = null
     protected var playService: PlayService? = null
 
-    protected var meditationService:MeditationWindowService?=null
+    protected var meditationService: MeditationWindowService? = null
 
     override fun getContentViewId(): Int {
         return R.id.lce_content_view
@@ -92,7 +95,11 @@ class MainActivity : BaseLceActivity<DemoContract.View, DemoContract.Presenter>(
 
         YdlCommonRouterManager.initYdlCommonRoute(PlatformTempCommonRouteImpl())
         // 初始化一键登录sdk
-        OneKeyLoginHelp.sdkInit(this, OneKeyLoginHelp.YDL_USER_APP, PhoneNumberAuthHelper.SERVICE_TYPE_LOGIN)
+        OneKeyLoginHelp.sdkInit(
+            this,
+            OneKeyLoginHelp.YDL_USER_APP,
+            PhoneNumberAuthHelper.SERVICE_TYPE_LOGIN
+        )
         bindService()
         bindMeditationService()
 
@@ -116,7 +123,7 @@ class MainActivity : BaseLceActivity<DemoContract.View, DemoContract.Presenter>(
 //                .withBoolean("bind_phone", false)
 //                .withBoolean("isFromGuide", true)
 //                .navigation()
-            OneKeyLoginHelp.startLogin(this,false)
+            OneKeyLoginHelp.startLogin(this, false)
         }
         bt_to_consultant.setOnClickListener {
             //            ARouter.getInstance()
@@ -161,7 +168,9 @@ class MainActivity : BaseLceActivity<DemoContract.View, DemoContract.Presenter>(
             startActivity(Intent(this, CollectSexAndBirthActivity::class.java))
         }
         bt_to_confide.setOnClickListener {
-            YDLavManager.instances.login(ModularServiceManager.provide(IUserService::class.java).getUserInfo()?.uid)
+            YDLavManager.instances.login(
+                ModularServiceManager.provide(IUserService::class.java).getUserInfo()?.uid
+            )
             startActivity(Intent(this, ConfideHomeActivity::class.java))
         }
 
@@ -227,7 +236,6 @@ class MainActivity : BaseLceActivity<DemoContract.View, DemoContract.Presenter>(
         bt_to_privacy.setOnClickListener {
             startActivity(Intent(this@MainActivity, TestAppActivity::class.java))
         }
-
     }
 
 
@@ -241,11 +249,14 @@ class MainActivity : BaseLceActivity<DemoContract.View, DemoContract.Presenter>(
         val rxPermissions = RxPermissions(this)
         rxPermissions.requestEach(Manifest.permission.WRITE_EXTERNAL_STORAGE)
             .subscribe { permission ->
-                if (permission.granted) {
+                when {
+                    permission.granted -> {
                         ToastUtil.toastShort("Permission Success")
-                } else if (permission.shouldShowRequestPermissionRationale) {
+                    }
+                    permission.shouldShowRequestPermissionRationale -> {
                         requestPermission()
-                } else {
+                    }
+                    else -> {
                         ToastUtil.toastLong(
                             this,
                             getString(R.string.platform_need_storage_permission_hint)
@@ -257,6 +268,7 @@ class MainActivity : BaseLceActivity<DemoContract.View, DemoContract.Presenter>(
                         finish()
                     }
                 }
+            }
 
     }
 
@@ -267,11 +279,11 @@ class MainActivity : BaseLceActivity<DemoContract.View, DemoContract.Presenter>(
         bindService(intent, serviceConnection, Context.BIND_AUTO_CREATE)
     }
 
-    private fun bindMeditationService(){
+    private fun bindMeditationService() {
         val intent = Intent()
-        intent.setClass(this,MeditationWindowService::class.java)
+        intent.setClass(this, MeditationWindowService::class.java)
         meditationServiceConnection = MeditationServiceConnection()
-        bindService(intent,meditationServiceConnection,Context.BIND_AUTO_CREATE)
+        bindService(intent, meditationServiceConnection, Context.BIND_AUTO_CREATE)
     }
 
     override fun onResume() {
@@ -281,6 +293,16 @@ class MainActivity : BaseLceActivity<DemoContract.View, DemoContract.Presenter>(
 //        ModularServiceManager.provide(IConsultantService::class.java)
 //            .
 //            (this)
+
+        val trtcCalling = TRTCCalling.sharedInstance(this)
+        if (!TextUtils.isEmpty(trtcCalling.mRoomId) && !TextUtils.isEmpty(trtcCalling.mUserId)) {
+            val intent = Intent(mContext, YDLInvitionActivity::class.java)
+            intent.putExtra(Constant.ROOM_ID, trtcCalling.mRoomId)
+            intent.putExtra(Constant.USER_ID, trtcCalling.mUserId)
+            intent.putExtra(Constant.INVITE_ID, trtcCalling.mInviteId)
+            intent.flags = Intent.FLAG_ACTIVITY_NEW_TASK
+            mContext.startActivity(intent)
+        }
     }
 
     override fun onPause() {
@@ -289,7 +311,7 @@ class MainActivity : BaseLceActivity<DemoContract.View, DemoContract.Presenter>(
 //        ModularServiceManager.provide(IConsultantService::class.java).hideConsultAssistantDialog()
     }
 
-    fun onEvent(event:MeditationFloatEvent){
+    fun onEvent(event: MeditationFloatEvent) {
 
     }
 
@@ -298,12 +320,12 @@ class MainActivity : BaseLceActivity<DemoContract.View, DemoContract.Presenter>(
         if (serviceConnection != null) {
             unbindService(serviceConnection)
         }
-        if(meditationServiceConnection!=null){
+        if (meditationServiceConnection != null) {
             EventBus.getDefault().post(MeditationFloatEvent(false))
             MediaPlayerManager.getInstance(this)?.stop()
             unbindService(meditationServiceConnection)
         }
-        if(EventBus.getDefault().isRegistered(this)){
+        if (EventBus.getDefault().isRegistered(this)) {
             EventBus.getDefault().unregister(this)
         }
         super.onDestroy()
@@ -319,7 +341,7 @@ class MainActivity : BaseLceActivity<DemoContract.View, DemoContract.Presenter>(
         }
     }
 
-    private inner class MeditationServiceConnection:ServiceConnection {
+    private inner class MeditationServiceConnection : ServiceConnection {
         override fun onServiceConnected(name: ComponentName?, service: IBinder?) {
             meditationService = (service as MeditationWindowService.MeditationBinder).service
         }

app/src/main/java/com/ydl/component/base/DemoAppLifecycles.kt

@@ -7,10 +7,9 @@ import android.content.Intent
 import android.os.Build
 import android.os.Looper
 import android.os.Process
-import androidx.annotation.RequiresApi
 import android.util.Log
+import androidx.annotation.RequiresApi
 import com.channel.ydl_flutter_base.plugin.YDLCommonPlugin
-import com.facebook.stetho.Stetho
 import com.meituan.android.walle.WalleChannelReader
 import com.tencent.bugly.crashreport.CrashReport
 import com.tencent.smtt.sdk.QbSdk
@@ -20,6 +19,7 @@ import com.umeng.socialize.PlatformConfig
 import com.umeng.socialize.UMShareAPI
 import com.ydl.component.BuildConfig
 import com.ydl.component.MainActivity
+import com.ydl.component.R
 import com.ydl.media.audio.PlayService
 import com.ydl.ydlcommon.actions.crash.Cockroach
 import com.ydl.ydlcommon.actions.crash.ExceptionHandler
@@ -31,6 +31,7 @@ import com.ydl.ydlcommon.utils.LogUtil
 import com.ydl.ydlcommon.utils.YdlBuryPointUtil
 import com.ydl.ydlcommon.utils.log.LogHelper
 import com.yidianling.common.tools.ToastUtil
+import com.yidianling.im.api.bean.IMInitConfigBean
 import com.yidianling.im.config.NimApplication
 import io.flutter.view.FlutterMain
 import io.reactivex.functions.Action
@@ -86,14 +87,15 @@ class DemoAppLifecycles : IAppLifecycles {
             }
             //            application.registerActivityLifecycleCallbacks(new CoursePlayLifecycle());
 
-            Stetho.initializeWithDefaults(application)
         }
     }
 
     override fun onTerminate(application: Application) {}
 
     private fun moduleInit(application: Application) {
-        NimApplication.getInstance().initIm(application, MainActivity::class.java)
+        val imInitConfigBean = IMInitConfigBean()
+        imInitConfigBean.notificationIconRes = R.drawable.im_ic_launcher
+        NimApplication.getInstance().initIm(application, MainActivity::class.java, imInitConfigBean)
     }
 
 

app/src/main/java/com/ydl/component/service/WebServiceImpl.java

@@ -2,13 +2,17 @@ package com.ydl.component.service;
 
 import android.app.Activity;
 import android.content.Context;
+
 import com.alibaba.android.arouter.facade.annotation.Route;
-import com.ydl.component.service.web.WebJavascriptHandler;
+import com.tencent.smtt.sdk.WebView;
 import com.ydl.component.service.web.WVClickAbstractListener;
+import com.ydl.component.service.web.WebJavascriptHandler;
 import com.ydl.webview.IJavascriptHandler;
 import com.ydl.webview.IWebService;
 import com.ydl.webview.TellData;
+
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Created by haorui on 2019-10-10.
@@ -24,7 +28,7 @@ public class WebServiceImpl implements IWebService {
 
     @NotNull
     @Override
-    public IJavascriptHandler getJavascripHandler(@NotNull Activity activity, @NotNull TellData tellData) {
-        return new WebJavascriptHandler(new WVClickAbstractListener(activity));
+    public IJavascriptHandler getJavascripHandler(@NotNull Activity activity, @Nullable WebView webView, @NotNull TellData tellData) {
+        return new WebJavascriptHandler(webView, new WVClickAbstractListener(activity));
     }
 }

app/src/main/java/com/ydl/component/service/web/JsMethod.kt

 package com.ydl.component.service.web
 
+import android.Manifest
+import com.blankj.utilcode.util.PermissionUtils
 import com.google.gson.JsonObject
 import com.google.gson.JsonParser
+import com.tencent.smtt.sdk.WebView
+import com.ydl.audioim.YDLavManager
+import com.ydl.confide.api.IConfideService
 import com.ydl.confide.home.event.ConfideDialogEvent
 import com.ydl.webview.H5Params
 import com.ydl.webview.NewH5Activity
 import com.ydl.ydlcommon.base.BaseActivityMgr
+import com.ydl.ydlcommon.modular.findRouteService
 import com.ydl.ydlcommon.ui.Loading
 import com.yidianling.common.tools.ToastUtil
+import com.yidianling.common.tools.asFragmentActivity
+import com.yidianling.user.UserHelper
 import de.greenrobot.event.EventBus
 
 
-class JsMethod {
+class JsMethod(private val webView: WebView?) {
 
 
     fun handle(param: String): Boolean {
@@ -36,15 +44,15 @@ class JsMethod {
                 return true
             }
             "show_loading" -> {
-                val topActivity = BaseActivityMgr.INST.getTopActivity()
-                Loading.show(topActivity)
+//                val topActivity = BaseActivityMgr.INST.getTopActivity()
+//                Loading.show(topActivity)
                 return true
             }
             "close_loading" -> {
-                Loading.close()
+//                Loading.close()
                 return true
             }
-            "open_app_eval_list"->{
+            "open_app_eval_list" -> {
                 val url = param.getAsJsonPrimitive("url").asString
                 val topActivity = BaseActivityMgr.INST.getTopActivity()
                 NewH5Activity.start(topActivity, H5Params(url, ""))
@@ -57,6 +65,61 @@ class JsMethod {
                 }
                 return true
             }
+            "has_audio_permission" -> {
+                val callback = param.getAsJsonPrimitive("callback").asString
+                if (callback.isNullOrBlank()) return true
+                if (PermissionUtils.isGranted(Manifest.permission.RECORD_AUDIO)) {
+                    webView?.post {
+                        webView.loadUrl("javascript:$callback(1)")
+                    }
+                    return true
+                }
+                (webView?.context?.asFragmentActivity())?.let {
+                    findRouteService(IConfideService::class.java).requestConfidePermission(it) { granted ->
+                        webView.post {
+                            webView.loadUrl("javascript:$callback(${if (granted) 1 else 0})")
+                        }
+                    }
+                }
+                return true
+            }
+
+            "confide_dial" -> {
+                //倾诉链接 java接口，支持axb和声网
+                val id = param.getAsJsonPrimitive("id").asInt
+                val data = param.getAsJsonObject("data").toString()
+                val topActivity = BaseActivityMgr.INST.topActivity
+
+                if (!YDLavManager.isOnlineRtm) {
+                    //异常退出或者账号被顶掉，重新登录并拨打
+                    YDLavManager.instances.login(UserHelper.getUserInfo()?.uid) { isSuccess: Boolean, _ ->
+                        if (isSuccess) {
+                            findRouteService(IConfideService::class.java).confideDial(id, data, topActivity)
+                        } else {
+                            ToastUtil.toastShort("请重新拨打")
+                        }
+                    }
+                } else {
+                    findRouteService(IConfideService::class.java).confideDial(id, data, topActivity)
+                }
+                return true
+            }
+            "check_app_support" -> {
+                val callback = param.getAsJsonPrimitive("callback").asString
+                val type = param.getAsJsonPrimitive("type").asInt
+                if (callback.isNullOrBlank()) return true
+                webView?.post {
+                    when (type) {
+                        1 -> {//检查音频权限能力
+                            webView.loadUrl("javascript:$callback(1)")
+                        }
+                        else -> {
+                            webView.loadUrl("javascript:$callback(0)")
+                        }
+                    }
+                }
+                return true
+            }
             else -> {
                 return false
             }

app/src/main/java/com/ydl/component/service/web/WebJavascriptHandler.kt

@@ -3,6 +3,7 @@ package com.ydl.component.service.web
 import android.webkit.JavascriptInterface
 import androidx.fragment.app.FragmentActivity
 import com.google.gson.Gson
+import com.tencent.smtt.sdk.WebView
 import com.ydl.confide.api.ConfideRoute
 import com.ydl.confide.api.IConfideService
 import com.ydl.js_module.manager.WebViewRouterManager
@@ -21,18 +22,13 @@ import com.yidianling.user.UserHelper
  * update by harvie on 2017/7/04
  */
 
-class WebJavascriptHandler : IJavascriptHandler{
+class WebJavascriptHandler(private val webView: WebView?, private val wvEnventPro: WebViewClientClickListener?) : IJavascriptHandler() {
 
-    private val js = JsMethod()
+    private val js = JsMethod(webView)
 
     override fun getUriAppendSuffix(): String {
         return "platform_main_theme=00C9E2&platform_main_theme_light=00D4DF&platform_main_theme_bright=EAFAFC"
     }
-    var wvEnventPro: WebViewClientClickListener? = null
-
-    constructor(listener: WebViewClientClickListener) : super() {
-        this.wvEnventPro = listener
-    }
 
     @JavascriptInterface
     fun sendDataToOC(params: String) {

app/src/main/res/layout/activity_main.xml

 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
@@ -231,6 +230,7 @@
     <com.ydl.ydlcommon.mvp.lce.view.YDLStateView
         android:id="@+id/lce_state_view"
         android:layout_width="match_parent"
-            android:layout_height="30dp" />
+        android:layout_height="30dp"
+        android:visibility="gone" />
 
 </LinearLayout>
\ No newline at end of file

app/src/main/res/values/colors.xml

 <?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:tools="http://schemas.android.com/tools">
-    <color name="text_user" tools:ignore="MissingDefaultResource">#5195cb</color>
-
-    <color name="black" tools:ignore="MissingDefaultResource">#FF000000</color>
-    <color name="white">@android:color/white</color>
+<resources>
     <color name="white_24p">#3DFFFFFF</color>
     <color name="white_50p">#80FFFFFF</color>
     <color name="black_50p">#80000000</color>
-    <color name="red">#F44336</color>
     <color name="red_30p">#4CF44336</color>
-    <color name="blue">#2196F3</color>
     <color name="grey">#9E9E9E</color>
 
     <color name="color_white">#ffffff</color>
@@ -24,42 +18,4 @@
     <color name="color_main_bg">#F1F3F8</color>
     <color name="color_main_text">#333333</color>
 
-    <!--  ============ 标准颜色 ============ -->
-    <!--主题色 - 用于TabBar、突出文字、按钮和icon-->
-    <color name="platform_main_theme">#fdbd00</color>
-    <!--辅助色 1 - 主色系浅色-->
-    <color name="platform_main_theme_light">#FFEC8C</color>
-    <!--辅助色 2 - 主色系亮色-->
-    <color name="platform_main_theme_bright">#fffae0</color>
-
-    <!--  ============ 背景颜色 ============ -->
-    <!--    标签背景色-->
-    <color name="platform_tag_bg_color">#F7F7F7</color>
-    <!--    大面积背景颜色-->
-    <color name="platform_big_bg_color">#F0F0F0</color>
-    <!--    分割线颜色-->
-    <color name="platform_dividing_line_color">#EBEBEB</color>
-    <!--    主题色渐变背景颜色 -->
-    <color name="platform_main_gradient_start_color">#fdbd00</color>
-    <color name="platform_main_gradient_end_color">#FFD814</color>
-    <!--    主题色渐变未选中背景颜色 -->
-    <color name="platform_main_gradient_start_color_un">#66fdbd00</color>
-    <color name="platform_main_gradient_end_color_un">#66FFD814</color>
-    <!--  ============ 文字颜色 ============ -->
-    <!--    一级类目，标题、点缀文字颜色-->
-    <color name="platform_text_dark_color">#242424</color>
-    <!--    二级类目文字颜色-->
-    <color name="platform_text_light_color">#666666</color>
-    <!--    三级次要文字颜色-->
-    <color name="platform_text_bright_color">#999999</color>
-    <!--    四级编辑框提示文字颜色-->
-    <color name="platform_text_hint_color">#BFBFBF</color>
-
-    <!--  ============ 按钮颜色 ============ -->
-    <!--确认文字按钮颜色  - 亮色模式下与深色模式相反-->
-    <color name="platform_but_text_color">#242424</color>
-    <!--按钮字体颜色 - 亮色模式下与深色模式近似-->
-    <color name="platform_but_text_color_unselected">#555555</color>
-    <color name="platform_but_text_color_selected">#242424</color>
-
 </resources>

app/src/main/res/values/dimens.xml

 <resources>
-    <!-- Default screen margins, per the Android Design guidelines. -->
-    <dimen name="activity_horizontal_margin">16dp</dimen>
-    <dimen name="activity_vertical_margin">16dp</dimen>
     <dimen name="text_size_common">16sp</dimen>
 </resources>

build.gradle

@@ -33,7 +33,6 @@ buildscript {
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath 'com.ydl.plugins:modular:1.0.3'
         classpath 'com.ydl:notracepoint-gradle-plugin:0.0.3'
-        classpath 'com.ydl.plugins:restools:1.0.1'
     }
 }
 
@@ -57,7 +56,26 @@ allprojects {
 task clean(type: Delete) {
     delete rootProject.buildDir
 }
-
+task packYdl1 {
+    doLast {
+        println("doLast packYdl1!!!!")
+    }
+}
+task packYdl2 {
+    doLast {
+        println("doLast packYdl2!!!!")
+    }
+}
+task packYdl {
+    doLast {
+        println("doLast packYdl!!!!")
+    }
+}
+task packM{
+    doLast {
+        println("doLast packM!!!!")
+    }
+}
 
 subprojects {
     project.configurations.all {

m-article/build.gradle

@@ -2,13 +2,7 @@ apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-android-extensions'
 apply plugin: 'kotlin-kapt'
-apply plugin: 'resTools' // 资源重命名插件
-
-// 配置资源重命名插件
-resConfig {
-    new_prefix = 'article_'  // 资源前缀
-    old_prefix = ''         // 老前缀，可为''空字符串
-}
+apply from : '../maven_push.gradle'
 
 kapt {
     arguments {
@@ -34,9 +28,6 @@ android {
                 arguments = [AROUTER_MODULE_NAME: "article"]
             }
         }
-
-        flavorDimensions "versionCode"//Flavor 维度信息
-
     }
 
     buildTypes {
@@ -46,25 +37,6 @@ android {
         }
     }
 
-    //前缀的名字
-//    resourcePrefix "article_"
-
-    //Flavor 信息
-    publishNonDefault true
-    productFlavors {
-        ydl {}
-        xlzx {}
-    }
-
-    sourceSets {
-        main {
-            manifest.srcFile 'src/main/AndroidManifest.xml'
-            res.srcDirs = [
-                    'src/main/res'
-            ]
-        }
-    }
-
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8

m-article/gradle.properties

-isApplicaiton = false

m-article/modular.gradle

-modular {
-    //模块包名
-    packageName "com.yidianling.article"
-    // 模块发布需要的参数
-    publish {
-        modules {
-            xlzx {
-                groupId = "com.ydl"
-                artifactId = "m-article-module-xlzx"
-                // 上报的 心理咨询 业务模块 aar 包的版本号
-                version = rootProject.ext.ydlPublishVersion[childProject.getName()]
-            }
-
-            ydl{
-                groupId = "com.ydl"
-                artifactId = "m-article-module-ydl"
-                // 上报的 壹点灵 业务模块 aar 包的版本号
-                version = rootProject.ext.ydlPublishVersion[childProject.getName()]
-            }
-        }
-
-        api {
-            //壹点灵/心理咨询 业务模块 API层 jar包的发布信息
-            groupId = "com.ydl"
-            artifactId = "m-article-api"
-            //开发时注释掉版本号，发布api时打开
-            version = rootProject.ext.ydlPublishVersion[childProject.getName()+"-api"]
-            // API 层打包时需要引入的依赖
-            apiDependencies {
-                implementation "com.google.code.gson:gson:2.8.2"
-                implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-                implementation 'com.alibaba:arouter-api:1.4.1'
-                implementation 'de.greenrobot:eventbus:2.4.0'
-            }
-        }
-    }
-}
\ No newline at end of file

m-audioim/build.gradle

@@ -3,13 +3,6 @@ apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-android-extensions'
 apply plugin: 'kotlin-kapt'
 apply from: "../maven_push.gradle"
-apply plugin: 'resTools' // 资源重命名插件
-
-// 配置资源重命名插件
-resConfig {
-    new_prefix = 'audioim_'  // 资源前缀
-    old_prefix = ''         // 老前缀，可为''空字符串
-}
 
 kapt {
     arguments {
@@ -82,14 +75,12 @@ dependencies {
         //开发时使用
         api project(':ydl-platform')
         api project(':ydl-webview')
-        implementation modularPublication('com.ydl:m-user-api')
-        implementation modularPublication('com.ydl:m-audioim-api')
-        implementation modularPublication('com.ydl:m-im-api')
+        implementation project(":api:user")
+        implementation project(":api:im")
     }else {
         //发布时使用
         api rootProject.ext.dependencies["ydl-webview"]
         compileOnly rootProject.ext.dependencies["ydl-m-user-api"]
-        compileOnly rootProject.ext.dependencies["ydl-m-audioim-api"]
         compileOnly rootProject.ext.dependencies["ydl-m-im-api"]
         api(rootProject.ext.dependencies["ydl-platform"]) {
             transitive = true

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

@@ -25,6 +25,7 @@ import com.alibaba.android.arouter.launcher.ARouter
 import com.google.gson.Gson
 import com.hjq.permissions.OnPermissionCallback
 import com.hjq.permissions.XXPermissions
+import com.ydl.audioim.bean.AgoraInvitationBean
 import com.ydl.audioim.bean.AgoraLogInfoBean
 import com.ydl.audioim.contract.IAudioHomeActivityContract
 import com.ydl.audioim.http.command.ConnectCommand
@@ -49,6 +50,7 @@ import com.ydl.ydl_image.config.SimpleImageOpConfiger
 import com.ydl.ydl_image.manager.YDLImageCacheManager
 import com.ydl.ydlcommon.base.BaseMvpActivity
 import com.ydl.ydlcommon.modular.ModularServiceManager
+import com.ydl.ydlcommon.modular.findRouteService
 import com.ydl.ydlcommon.router.YdlCommonRouterManager
 import com.ydl.ydlcommon.utils.LogUtil
 import com.ydl.ydlcommon.utils.StatusBarUtils
@@ -58,6 +60,8 @@ import com.ydl.ydlcommon.utils.log.AliYunLogConfig
 import com.ydl.ydlcommon.utils.log.AliYunRichLogsHelper
 import com.ydl.ydlcommon.utils.log.LogHelper
 import com.ydl.ydlcommon.utils.remind.ToastHelper
+import com.yidianling.common.tools.ToastUtil
+import com.yidianling.im.api.bean.IMRegisterObserverCustomNotificationCallBack
 import com.yidianling.im.api.service.IImService
 import com.yidianling.user.api.service.IUserService
 import de.greenrobot.event.EventBus
@@ -227,6 +231,44 @@ class AudioHomeActivity :
 
     private var canChangeRoute: Boolean = false
 
+    private var hasHandleRefused = false
+
+    private val notificationCallback = object : IMRegisterObserverCustomNotificationCallBack {
+        override fun onObserverCustomNotification(fromUid: String, toUid: String, content: String) {
+            if (fromUid == listenerUid) {
+                try {
+                    val bean = Gson().fromJson(content, AgoraInvitationBean::class.java)
+                    when (bean.callType) {
+                        "2" -> {//接受
+                            runOnUiThread {
+                                joinChannel()
+                            }
+                        }
+                        "4" -> {//拒绝
+                            onCallRefused()
+                        }
+                    }
+                } catch (throwable: Throwable) {
+                    LogUtil.e(throwable.message)
+                }
+            }
+        }
+    }
+
+    fun onCallRefused() {
+        runOnUiThread {
+            if (hasHandleRefused) return@runOnUiThread
+            hasHandleRefused = true
+            YDLavManager.instances.callEndStatusUpdate(channelId ?: "", 2, "被叫拒绝")
+            ToastUtil.toastShort("对方已挂断")
+            writeAgoraLog("被叫（专家）拒绝了通话邀请")
+            //通话结束或挂断时，上传日志文件
+            uploadLog()
+            leaveChannel()
+            uploadExceptionStatus("对方已拒绝", 2)
+        }
+    }
+
     /**
      * 声网事件回调 （SDK 通过指定的事件通知应用程序 SDK 的运行事件，如: 加入或离开频道，新用户加入频道等）
      */
@@ -484,6 +526,7 @@ class AudioHomeActivity :
         setClickEvent()
         //权限申请
         requestPermission()
+        findRouteService(IImService::class.java).registerObserveCustomNotification(notificationCallback)
 
         ActionCountUtils.record("call_phone_page", "call_phone_page_visit", listenerUid ?: "0", "1")
     }
@@ -1545,6 +1588,7 @@ class AudioHomeActivity :
 
     override fun onDestroy() {
         super.onDestroy()
+        findRouteService(IImService::class.java).unregisterObserveCustomNotification(notificationCallback)
         uploadLog()
         phoneHandler?.removeCallbacksAndMessages(null)
         if (isConnectSuccess) {

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

@@ -30,8 +30,6 @@ import com.ydl.ydlcommon.utils.LogUtil
 import com.ydl.ydlcommon.utils.log.AliYunLogConfig
 import com.ydl.ydlcommon.utils.log.AliYunRichLogsHelper
 import com.ydl.ydlcommon.utils.log.LogHelper
-import com.yidianling.common.tools.ToastUtil
-import com.yidianling.im.api.bean.IMRegisterObserverCustomNotificationCallBack
 import com.yidianling.im.api.bean.IMSendCustomNotificationResultCallBack
 import com.yidianling.user.api.event.UserLoginEvent
 import com.yidianling.user.api.event.UserLogoutEvent
@@ -139,15 +137,7 @@ class YDLavManager {
                 onConfideEvent(dimension, response?.ChannelId)
                 val act = ActivityManager.getInstance().getTopTaskActivity()
                 if (act is AudioHomeActivity) {
-                    act.runOnUiThread {
-                        callEndStatusUpdate(response?.ChannelId!!, 2, "被叫拒绝")
-                        ToastUtil.toastShort("对方已挂断")
-                        act.writeAgoraLog("被叫（专家）拒绝了通话邀请")
-                        //通话结束或挂断时，上传日志文件
-                        act.uploadLog()
-                        act.leaveChannel()
-                        act.uploadExceptionStatus("对方已拒绝", 2)
-                    }
+                    act.onCallRefused()
                 }
             }
 
@@ -316,16 +306,6 @@ class YDLavManager {
                 }
             }
         })
-
-        AudioImIn.registerObserveCustomNotification(object :
-            IMRegisterObserverCustomNotificationCallBack {
-            override fun onObserverCustomNotification(
-                fromUid: String,
-                toUid: String,
-                content: String
-            ) {
-            }
-        })
     }
 
     fun rtcCall(listenerUid: String?, channelId: String?, sendDoctocrMsg: String?) {
@@ -682,10 +662,8 @@ class YDLavManager {
             * 如果正在通话中，则不进行退出操作
             * */
             if (reason == CONNECTION_CHANGE_REASON_REMOTE_LOGIN) {
-                if (!activityIsExists(ConsultantAudioHomeActivity::class.java) && !activityIsExists(
-                        AudioHomeActivity::class.java
-                    )
-                ) {
+                if (!activityIsExists(ConsultantAudioHomeActivity::class.java) &&
+                    !activityIsExists(AudioHomeActivity::class.java)) {
                     isOnlineRtm = false
                     logout()
                 } else {
@@ -708,9 +686,13 @@ class YDLavManager {
         session: String?,
         line: String
     ) {
-        AudioApiRequestUtil.callEventSave(session, line, status, "用户端：${res}")
+        //保证session有值
+       session?.let { sessionLet ->
+           AudioApiRequestUtil.callEventSave(sessionLet, line, status, "用户端：${res}")
                .subscribeOn(Schedulers.io())
                .observeOn(AndroidSchedulers.mainThread())
                .subscribe()
        }
+
+    }
 }
\ No newline at end of file