Merge remote-tracking branch 'origin/release' into feat/fq/fq_consulttant_revision_release

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.3'
+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)
@@ -36,4 +39,6 @@ interface IConfideService : IProvider {
     )
 
     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/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 {
@@ -44,7 +52,7 @@ class JsMethod {
 //                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"
-        android:orientation="vertical"
-        tools:context=".MainActivity">
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    tools:context=".MainActivity">
 
 
     <LinearLayout
@@ -229,8 +228,9 @@
     </LinearLayout>
 
     <com.ydl.ydlcommon.mvp.lce.view.YDLStateView
-            android:id="@+id/lce_state_view"
-            android:layout_width="match_parent"
-            android:layout_height="30dp" />
+        android:id="@+id/lce_state_view"
+        android:layout_width="match_parent"
+        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 {

config.gradle

 ext {
-    kotlin_version = "1.3.21"
-    dev_mode = false   //组件发布的时候需要设置为false
-
+    dev_mode = false //组件发布的时候需要设置为false
+    ydl2PublishVersion = "0.2.0.7"
     ydlPublishVersion = [
             // -------------- 业务模块 --------------
             //第三步 若干
             "m-confide"       : "0.0.50.50",
-            "m-consultant"    : "0.0.60.74",
+            "m-consultant"    : "0.0.60.78",
             "m-fm"            : "0.0.30.09",
             "m-user"          : "0.0.62.72",
             "m-home"          : "0.0.24.00",
-            "m-im"            : "0.0.21.67",
+            "m-im"            : "0.0.21.69",
             "m-dynamic"       : "0.0.7.80",
             "m-article"       : "0.0.0.10",
             "m-muse"          : "0.0.28.87",
@@ -20,7 +19,7 @@ ext {
             //mdt 组件
             "ydl-tuicore"   : "0.0.25",
             //第一步
-            "ydl-platform"    : "0.0.41.51",
+            "ydl-platform"    : "0.0.41.54",
 
             //第二步 若干
             "ydl-webview"     : "0.0.39.03",
@@ -29,24 +28,12 @@ ext {
             "m-audioim"       : "0.0.49.30.23",
 
             "ydl-flutter-base": "0.0.14.44",
-
             //以下 几乎不会动
             "router"          : "0.0.1",
             "ydl-net"         : "0.0.3.94",
             "ydl-utils"       : "0.0.3.12",
-
-
             //-------------- 业务模块 API 层 --------------
-            "m-audioim-api"   : "0.0.6",
-            "m-consultant-api": "0.0.5.63",
-            "m-course-api"    : "0.0.3.6",
-            "m-fm-api"        : "0.0.3",
-            "m-muse-api"      : "0.0.1",
-            "m-tests-api"     : "0.0.2",
-            "m-user-api"      : "0.0.10.24",
             "m-home-api"      : "0.0.4.4",
-            "m-im-api"        : "0.0.12.24",
-            "m-dynamic-api"   : "0.0.3.71",
     ]
     ydl_app = [
             appName      : "壹点灵心理咨询",
@@ -84,55 +71,6 @@ ext {
             canarySdkVersion        : "1.5.4"
     ]
 
-
-    ydlCompileVersion = [
-            // -------------- 业务模块 --------------
-            //第三步 若干
-            "m-confide"       : "0.0.50.50",
-            "m-consultant"    : "0.0.60.74",
-            "m-fm"            : "0.0.30.09",
-            "m-user"          : "0.0.62.72",
-            "m-home"          : "0.0.24.00",
-            "m-im"            : "0.0.21.67",
-            "m-dynamic"       : "0.0.7.80",
-            "m-article"       : "0.0.0.10",
-            "m-muse"          : "0.0.28.87",
-            "m-tests"         : "0.0.24.24",
-            "m-course"        : "0.0.43.39",
-            //-------------- 功能组件 --------------
-
-            //mdt 组件
-            "ydl-tuicore"   : "0.0.25",
-            //第一步
-            "ydl-platform"    : "0.0.41.51",
-
-
-            //第二步 若干
-            "ydl-webview"     : "0.0.39.03",
-            "ydl-media"       : "0.0.21.52",
-            "ydl-pay"         : "0.0.18.21",
-            "m-audioim"       : "0.0.49.30.23",
-            "ydl-flutter-base": "0.0.14.44",
-
-            //以下 几乎不会动
-            "router"          : "0.0.1",
-            "ydl-net"         : "0.0.3.94",
-            "ydl-utils"       : "0.0.3.12",
-
-            //-------------- 业务模块 API 层 --------------
-            "m-audioim-api"   : "0.0.6",
-            "m-confide-api"   : "1.0.3",
-            "m-consultant-api": "0.0.5.63",
-            "m-course-api"    : "0.0.3.6",
-            "m-fm-api"        : "0.0.3",
-            "m-muse-api"      : "0.0.1",
-            "m-tests-api"     : "0.0.2",
-            "m-user-api"      : "0.0.10.24",
-            "m-home-api"      : "0.0.4.4",
-            "m-im-api"        : "0.0.12.24",
-            "m-dynamic-api"   : "0.0.3.71",
-    ]
-
     dependencies = [
             //support
             "appcompat-v7"                 : 'androidx.appcompat:appcompat:1.2.0',
@@ -227,7 +165,6 @@ ext {
             "cube"                         : "in.srain.cube:cube-sdk:1.0.44@aar",
             "support-multidex"             : 'androidx.multidex:multidex:2.0.0',
             "ydl-ijkplayer-jjdxm"          : "com.ydl:jjdxm-ijkplayer:0.0.33",
-            "robust"                       : "com.meituan.robust:robust:0.4.87",
             "walle"                        : "com.meituan.android.walle:library:1.1.5",
             "jpush"                        : "cn.jiguang.sdk:jpush:3.3.6",
             "jcore"                        : "cn.jiguang.sdk:jcore:2.1.4",
@@ -250,8 +187,6 @@ ext {
             //删除集成调试库，其功能合并到umeng基础组件库。
             //"umeng-debug"                  : "com.umeng.sdk:debug:1.0.0",
             "tablayout"                    : "com.flyco.tablayout:FlycoTabLayout_Lib:2.1.2@aar",
-            "stetho"                       : "com.facebook.stetho:stetho:1.5.0",
-            "stetho-okhttp3"               : "com.facebook.stetho:stetho-okhttp3:1.4.1",
             "aspectjrt"                    : "org.aspectj:aspectjrt:1.8.9",
             "bugly-crashreport"            : "com.tencent.bugly:crashreport:2.8.6.0",
             "bugly-nativecrashreport"      : "com.tencent.bugly:nativecrashreport:3.6.0.1",
@@ -272,36 +207,34 @@ ext {
             "blankUtil"                    : "com.blankj:utilcode:1.25.9",
             "ydl-hnet"                     : "com.ydl:h-net:0.0.8",
             "ydl-user-router"              : "com.ydl:router:1.0.0-SNAPSHOT@aar",
-            "ydl-device"                   : "com.ydl:device-id:0.0.30@aar",
-            "ydl-net"                      : "com.ydl:ydl-net:${ydlCompileVersion["ydl-net"]}",
-            "ydl-utils"                    : "com.ydl:ydl-utils:${ydlCompileVersion["ydl-utils"]}",
+            "ydl-device"                   : "com.ydl:device-id:0.0.31",
+            "ydl-net"                      : "com.ydl:ydl-net:${ydl2PublishVersion}",
+            "ydl-utils"                    : "com.ydl:ydl-utils:${ydl2PublishVersion}",
 
             //flutter功能组件升级===>发布ydl-flutter组件===>引用flutter相关的业务模块
-            "ydl-flutter-base"             : "com.ydl:ydl-flutter-base:${ydlCompileVersion["ydl-flutter-base"]}", //组件化项目中的flutter base模块
+            "ydl-flutter-base"             : "com.ydl:ydl-flutter-base:${ydl2PublishVersion}", //组件化项目中的flutter base模块
             "ydl-flutter"                  : "com.ydl:ydl-flutter:0.0.51@aar", //flutter aar
 //            "ydl-flutter-sp"               : "com.ydl:ydl-flutter-sp:0.0.2@aar", //flutter 缓存 aar
 
             //基础组件 <<--- 先发这个，发完改这里的版本号
-            "ydl-platform"                 : "com.ydl:ydl-platform:${ydlCompileVersion["ydl-platform"]}@aar",
-            "ydl-tuicore"                 : "com.ydl:ydl-tuicore:${ydlCompileVersion["ydl-tuicore"]}@aar",
+            "ydl-platform"                 : "com.ydl:ydl-platform:${ydl2PublishVersion}",
+            "ydl-tuicore"                 : "com.ydl:ydl-tuicore:${ydlPublishVersion["ydl-tuicore"]}",
             //功能组件 <<--- 再发这些，发完改这里的版本号
-            "ydl-webview"                  : "com.ydl:ydl-webview:${ydlCompileVersion["ydl-webview"]}@aar",
-            "ydl-media"                    : "com.ydl:ydl-media:${ydlCompileVersion["ydl-media"]}@aar",
-            "ydl-pay"                      : "com.ydl:ydl-pay:${ydlCompileVersion["ydl-pay"]}@aar",
-            "m-audioim"                    : "com.ydl:m-audioim:${ydlCompileVersion["m-audioim"]}@aar",
+            "ydl-webview"                  : "com.ydl:ydl-webview:${ydl2PublishVersion}",
+            "ydl-media"                    : "com.ydl:ydl-media:${ydl2PublishVersion}",
+            "ydl-pay"                      : "com.ydl:ydl-pay:${ydl2PublishVersion}",
+            "m-audioim"                    : "com.ydl:m-audioim:${ydl2PublishVersion}",
 
             //业务组件 <<--- 最后发这些(只发改过的)
-            "ydl-m-user-api"               : "com.ydl:m-user-api:${ydlCompileVersion["m-user-api"]}",
-            "ydl-m-muse-api"               : "com.ydl:m-muse-api:${ydlCompileVersion["m-muse-api"]}",
-            "ydl-m-fm-api"                 : "com.ydl:m-fm-api:${ydlCompileVersion["m-fm-api"]}",
-            "ydl-m-tests-api"              : "com.ydl:m-tests-api:${ydlCompileVersion["m-tests-api"]}",
-            "ydl-m-audioim-api"            : "com.ydl:m-audioim-api:${ydlCompileVersion["m-audioim-api"]}",
-            "ydl-m-im-api"                 : "com.ydl:m-im-api:${ydlCompileVersion["m-im-api"]}",
-            "ydl-m-home-api"               : "com.ydl:m-home-api:${ydlCompileVersion["m-home-api"]}",
-            "ydl-m-consultant-api"         : "com.ydl:m-consultant-api:${ydlCompileVersion["m-consultant-api"]}",
-            "ydl-m-dynamic-api"            : "com.ydl:m-dynamic-api:${ydlCompileVersion["m-dynamic-api"]}",
-            "ydl-m-confide-api"            : "com.ydl:m-confide-api:${ydlCompileVersion["m-confide-api"]}",
-            "ydl-m-course-api"             : "com.ydl:m-course-api:${ydlCompileVersion["m-course-api"]}",
+            "ydl-m-user-api"               : "com.ydl:m-user-api:1.0.0",
+            "ydl-m-fm-api"                 : "com.ydl:m-fm-api:1.0.0",
+            "ydl-m-tests-api"              : "com.ydl:m-tests-api:1.0.0",
+            "ydl-m-im-api"                 : "com.ydl:m-im-api:1.0.2",
+            "ydl-m-home-api"               : "com.ydl:m-home-api:${ydlPublishVersion["m-home-api"]}",
+            "ydl-m-consultant-api"         : "com.ydl:m-consultant-api:1.0.0",
+            "ydl-m-dynamic-api"            : "com.ydl:m-dynamic-api:1.0.0",
+            "ydl-m-confide-api"            : "com.ydl:m-confide-api:1.0.4",
+            "ydl-m-course-api"             : "com.ydl:m-course-api:1.0.0",
     ]
 
 }

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

@@ -5,6 +5,7 @@ import android.content.Context
 import android.os.Handler
 import android.text.TextUtils
 import com.alibaba.android.arouter.launcher.ARouter
+import com.apm.insight.log.VLog
 import com.google.gson.Gson
 import com.ydl.audioim.bean.AgoraInvitationBean
 import com.ydl.audioim.http.AudioApiRequestUtil
@@ -30,8 +31,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
@@ -54,6 +53,7 @@ class YDLavManager {
 
     companion object {
         const val FILE_NAME = "consult.log"
+        private const val TAG = "YDLavManager"
 
         //当前sdk的登录状态
         var sdkStatus = -1
@@ -139,15 +139,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 +308,6 @@ class YDLavManager {
                 }
             }
         })
-
-        AudioImIn.registerObserveCustomNotification(object :
-            IMRegisterObserverCustomNotificationCallBack {
-            override fun onObserverCustomNotification(
-                fromUid: String,
-                toUid: String,
-                content: String
-            ) {
-            }
-        })
     }
 
     fun rtcCall(listenerUid: String?, channelId: String?, sendDoctocrMsg: String?) {
@@ -449,7 +431,9 @@ class YDLavManager {
                             }
 
                             override fun onFailure(msg: String?) {
-                                Apm.reportCustom("agora_login_error", msg ?: "", Exception(msg))
+                                if (msg != "LOGIN_ERR_ALREADY_LOGGED_IN") {
+                                    Apm.reportCustom("agora_login_error", msg ?: "", Exception(msg))
+                                }
                                 LogUtil.e("[agora]实时消息登录失败：$msg")
                                 writeAgoraLog(
                                     "声网rtm登录失败:$msg-------Time:${
@@ -667,7 +651,7 @@ class YDLavManager {
          * */
         override fun onConnectionStateChanged(state: Int, reason: Int) {
             val msg = "state:${state},reason:${reason}"
-            Apm.reportCustom("agora_connectionstate_error", msg, Exception(msg))
+            VLog.i(TAG, msg)
             sdkStatus = state
             writeAgoraLog(
                 "声网rtm登录状态：${state}-------Time:${AudioLogUtils.format.format(Calendar.getInstance().time)}",
@@ -682,10 +666,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 {

m-audioim/src/main/java/com/ydl/audioim/http/command/NoticePushCommand.java

@@ -15,6 +15,6 @@ public class NoticePushCommand extends BaseCommand {
     public AudioMessageBean data;//AudioMessageBean的字符串
     public String pushId;//专家uid
     public String status;//CALL 呼叫    CALL_OFF 取消呼叫
-    public String title = "您有一条倾诉消息";
+    public String title = "用户正向您发起呼叫，请接听……";
     public String sound = "专家响铃3.mp3";//用于ios设备接到通知响铃
 }

m-confide/build.gradle

@@ -76,9 +76,9 @@ dependencies {
         api project(":ydl-pay")
         api project(':ydl-webview')
         api project(':ydl-utils')
-        implementation modularPublication('com.ydl:m-im-api')
-        implementation modularPublication('com.ydl:m-user-api')
-        implementation modularPublication('com.ydl:m-consultant-api')
+        implementation project(":api:im")
+        implementation project(":api:user")
+        implementation project(":api:consultant")
         implementation project(':api:confide')
     }else {
         //发布时使用

m-confide/src/androidTest/java/com/ydl/confide/ExampleInstrumentedTest.kt

-package com.ydl.confide
-
-import androidx.test.platform.app.InstrumentationRegistry
-import androidx.test.ext.junit.runners.AndroidJUnit4
-
-import org.junit.Test
-import org.junit.runner.RunWith
-
-import org.junit.Assert.*
-
-/**
- * Instrumented test, which will execute on an Android device.
- *
- * See [testing documentation](http://d.android.com/tools/testing).
- */
-@RunWith(AndroidJUnit4::class)
-class ExampleInstrumentedTest {
-    @Test
-    fun useAppContext() {
-        // Context of the app under test.
-        val appContext = InstrumentationRegistry.getInstrumentation().targetContext
-        assertEquals("com.example.m_confide.test", appContext.packageName)
-    }
-}