Merge remote-tracking branch 'origin/feat/qj/new_nim2' into feat/lp/lp_nim2

# Conflicts:
#	app/src/main/java/com/ydl/component/MainActivity.kt
#	build.gradle
#	m-im/build.gradle
#	m-im/src/main/java/com/yidianling/im/helper/NimUICallInit.java
#	m-muse/build.gradle
#	settings.gradle
#	ydl-media/build.gradle

app/build.gradle

@@ -177,6 +177,7 @@ android {
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
+    implementation 'com.github.feeeei:CircleSeekbar:v1.1.2'
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
     implementation(rootProject.ext.dependencies["appcompat-v7"])
     testImplementation 'junit:junit:4.13.2'

build.gradle

@@ -14,7 +14,7 @@ buildscript {
         ydlrouter_version = '1.2.3'
         constrait_support_version = '1.0.2'
 
-        componentVersion = "0.3.0.4-SNAPSHOT"
+        componentVersion = "0.3.0.5-SNAPSHOT"
     }
     repositories {
         mavenCentral()
@@ -51,6 +51,7 @@ allprojects { p ->
             url 'http://maven.aliyun.com/nexus/content/groups/public/'
             allowInsecureProtocol true
         }
+        maven { url 'https://oss.sonatype.org/content/repositories/snapshots/' }
         mavenLocal()
     }
 }

m-im/build.gradle

@@ -63,7 +63,11 @@ dependencies {
     implementation rootProject.ext.dependencies["BaseRecyclerViewAdapterHelper"]
     api 'com.tencent.tbs.tbssdk:sdk:43903'
 
-    implementation('com.netease.yunxin.kit:call-ui:1.5.6')
+    implementation('com.netease.yunxin.kit:call-ui:1.5.9-SNAPSHOT') {
+        exclude group: "com.netease.nimlib", module: "avsignalling"
+        exclude group: "com.netease.nimlib", module: "basesdk"
+    }
+    implementation "com.netease.nimlib:avsignalling:9.1.1"
 
     api project(':ydl-webview')
     api project(':ydl-platform')

m-im/src/main/java/com/yidianling/im/config/NimSDKOptionConfig.java

@@ -31,7 +31,7 @@ import java.io.IOException;
  * 云信sdk 自定义的SDK选项设置
  */
 
-class NimSDKOptionConfig {
+public class NimSDKOptionConfig {
 
     static SDKOptions prepareSDKOptions(Context context, Class activity, IMInitConfigBean configBean) {
         SDKOptions options  = new SDKOptions();
@@ -93,7 +93,7 @@ class NimSDKOptionConfig {
      * 配置 APP 保存图片/语音/文件/log等数据的目录
      * 这里示例用SD卡的应用扩展存储目录
      */
-    static String getAppCacheDir(Context context) {
+    public static String getAppCacheDir(Context context) {
         String storageRootPath = null;
         try {
             // SD卡应用扩展存储区(APP卸载后，该目录下被清除，用户也可以在设置界面中手动清除)，请根据APP对数据缓存的重要性及生命周期来决定是否采用此缓存目录.

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

@@ -19,6 +19,7 @@ import com.ydl.ydlcommon.modular.ModularServiceManagerKt;
 import com.ydl.ydlcommon.utils.log.XLog;
 import com.yidianling.im.R;
 import com.yidianling.im.config.NimApplication;
+import com.yidianling.im.config.NimSDKOptionConfig;
 import com.yidianling.im.http.ImHttpImpl;
 import com.yidianling.user.api.bean.UserResponseBean;
 import com.yidianling.user.api.service.IUserService;
@@ -46,6 +47,7 @@ public class NimUICallInit {
         CallKitUIOptions options = new CallKitUIOptions.Builder()
                 // 必要：音视频通话 sdk appKey，用于通话中使用
                 .rtcAppKey(appKey)
+                .logRootPath(NimSDKOptionConfig.getAppCacheDir(context) + "/yidianling")
                 // 必要：当前用户 AccId
                 .currentUserAccId(userId)
                 .currentUserRtcUId(Long.parseLong(userId))

m-muse/src/main/AndroidManifest.xml

@@ -26,7 +26,5 @@
                 android:screenOrientation="portrait"
                 android:theme="@style/un_full_screen_activity"/>
 
-        <service android:name=".service.MeditationWindowService"/>
-
     </application>
 </manifest>

m-muse/src/main/java/com/yidianling/muse/activity/PlayMeditationActivity.kt

@@ -453,7 +453,7 @@ class PlayMeditationActivity : BaseActivity() {
                 meditation = currentMeditation?.copy(
                     meditationType = mMeditationType, meditationId =
                     mMeditationId ?: 0
-                )
+                ),meditations = meditations
             )
             EventBus.getDefault().post(event)
 
@@ -1070,7 +1070,7 @@ class PlayMeditationActivity : BaseActivity() {
     }
 
     override fun onBackPressed() {
-        val event = MeditationFloatEvent(true, meditation = currentMeditation)
+        val event = MeditationFloatEvent(true, meditation = currentMeditation,meditations = meditations)
         EventBus.getDefault().post(event)
         super.onBackPressed()
     }

m-muse/src/main/java/com/yidianling/muse/event/MeditationFloatEvent.kt

@@ -7,6 +7,6 @@ class MeditationFloatEvent(
     val stop: Boolean? = null,
     val time: Long? = null,
     val meditation: MeditationPlayModuleBean.MeditationDetail? = null,
-    val meditations: ArrayList<MeditationPlayModuleBean.MeditationDetail>? = null
+    val meditations: MutableList<MeditationPlayModuleBean.MeditationDetail>? = null
 )