Merge branch 'dev' of ssh://gitlab.yidianling.com:2224/app_android_lib/YDL-Component into dev

# Conflicts:
#	config.gradle
#	m-confide/modular.gradle
#	m-consultant/modular.gradle
#	m-course/modular.gradle
#	m-fm/modular.gradle
#	ydl-flutter-base/gradle.properties

config.gradle

@@ -48,7 +48,7 @@ ext {
             "m-fm"            : "0.0.10",
             "m-muse"          : "0.0.6",
             "m-tests"         : "0.0.3",
-            "m-user"          : "0.0.24",
+            "m-user"          : "0.0.23",
             //-------------- 业务模块 API 层 --------------
             "m-audioim-api"   : "0.0.1",
             "m-confide-api"   : "0.0.1",
@@ -57,7 +57,7 @@ ext {
             "m-fm-api"        : "0.0.2",
             "m-muse-api"      : "0.0.1",
             "m-tests-api"     : "0.0.1",
-            "m-user-api"      : "0.0.6",
+            "m-user-api"      : "0.0.5",
             //-------------- 功能组件 --------------
             "ydl-flutter-base": "0.0.3",
             "ydl-media"       : "0.0.8",
@@ -234,7 +234,7 @@ ext {
             "ydl-device"                   : "com.ydl:device-id:0.0.7@aar",
 
             //flutter功能组件升级===>发布ydl-flutter-base组件===>引用flutter相关的业务模块
-            "ydl-flutter"                  : "com.ydl:ydl-flutter:0.0.6@aar",
+            "ydl-flutter"                  : "com.ydl:ydl-flutter:0.0.7@aar",
             "ydl-flutter-base"             : "com.ydl:ydl-flutter-base:${ydlCompileVersion["ydl-flutter-base"]}@aar",
 
             //基础组件 <<--- 先发这个，发完改这里的版本号

m-course/src/main/java/com/yidianling/course/bean/ScrollStatusChangeEvent.java

+package com.yidianling.course.bean;
+
+/**
+ * 黑名单更新通知
+ * Created by xiongyu on 2017/3/7.
+ */
+
+public class ScrollStatusChangeEvent {
+    public boolean canScroll ;
+
+    public ScrollStatusChangeEvent(boolean canScroll) {
+        this.canScroll = canScroll;
+    }
+}

m-course/src/main/java/com/yidianling/course/flutterPlugin/CoursePlugin.kt

@@ -18,10 +18,12 @@ import com.yidianling.common.tools.LogUtil
 import com.yidianling.common.tools.RxDeviceTool
 import com.yidianling.course.BuildConfig
 import com.yidianling.course.CourseConstants
+import com.yidianling.course.bean.ScrollStatusChangeEvent
 import com.yidianling.course.courseNew.mine.MyCourseActivity
 import com.yidianling.course.course_special_list.activity.CourseSpecialListActivity
 import com.yidianling.course.flutterPlugin.CourseSendPlugin
 import com.yidianling.course.router.CourseIn
+import de.greenrobot.event.EventBus
 import io.flutter.plugin.common.MethodCall
 import io.flutter.plugin.common.MethodChannel
 import io.flutter.view.FlutterView
@@ -47,6 +49,11 @@ class CoursePlugin : MethodChannel.MethodCallHandler {
         const val JUMPURL: String = "jumpUrl"
         const val PLAYCOURSEFILE: String = "playCourseFile"
         const val PAUSECOURSEPLAY: String = "pauseCoursePlay"
+        const val REQUESTDATACOMPLETE: String = "requestDataComplete"
+        const val REQUESTDATAERROR: String = "requestDataError"
+        const val REQUESTSCROLLFOCUS: String = "requestScrollFocus"
+        const val RELEASESCROLLFOCUS: String = "releaseScrollFocus"
+        const val IOSPOP: String = "iosPop"
 
         fun register(fragment: BaseFlutterFragment, flutterView: FlutterView) {
             MethodChannel(flutterView, CHANNEL).setMethodCallHandler(CoursePlugin(fragment))
@@ -58,8 +65,9 @@ class CoursePlugin : MethodChannel.MethodCallHandler {
             GETPUBLICPARAMAS -> {
                 val loginBean = ModularServiceManager.getPlatformUserService()?.getUser()
                 val mMap = mutableMapOf<String, Any>()
+                var uid = loginBean?.userId ?: ""
                 mMap["isDevelopment"] = BuildConfig.DEBUG
-                mMap["uid"] = loginBean?.userId ?: 0
+                mMap["uid"] = if (TextUtils.isEmpty(uid)) "0" else uid
                 mMap["accessToken"] = loginBean?.token ?: ""
                         ?: ""
                 mMap["isFromApp"] = "1"
@@ -77,6 +85,10 @@ class CoursePlugin : MethodChannel.MethodCallHandler {
                     if (jumpUrl!!.startsWith("http")) {
                         val h5Params = H5Params(jumpUrl, "")
                         NewH5Activity.start(mFragment!!.activity, h5Params)
+                        PlayerFloatHelper.hide()
+                        PlayerFloatHelper.removeView(mFragment!!.activity!!)
+                        AudioPlayer.get().stopPlayer()
+                        CourseSendPlugin.sendMsg(false)
                         return
                     }
                     when {
@@ -97,11 +109,18 @@ class CoursePlugin : MethodChannel.MethodCallHandler {
                             var uri = Uri.parse(jumpUrl)
                             var resultParams = uri.getQueryParameter("params")
                             val jsonObject = JSONObject(resultParams)
-                            val h5Params = H5Params(CourseConstants.COURSE_DETAIL_H5 + jsonObject.getString("id"), "课程详情")
+                            val h5Params = H5Params(
+                                CourseConstants.COURSE_DETAIL_H5 + jsonObject.getString("id"),
+                                "课程详情"
+                            )
                             NewH5Activity.start(mFragment!!.activity, h5Params)
                         }
                         else -> YDLRouterManager.router(jumpUrl)
                     }
+                    PlayerFloatHelper.hide()
+                    PlayerFloatHelper.removeView(mFragment!!.activity!!)
+                    AudioPlayer.get().stopPlayer()
+                    CourseSendPlugin.sendMsg(false)
                 }
             }
             PLAYCOURSEFILE -> {
@@ -115,6 +134,25 @@ class CoursePlugin : MethodChannel.MethodCallHandler {
                     PlayerFloatHelper.updatePlayState()
                 }
             }
+            REQUESTDATACOMPLETE -> {
+                LogUtil.e("数据加载完成了")
+            }
+            REQUESTDATAERROR -> {
+                LogUtil.e("接口数据请求失败")
+            }
+            REQUESTSCROLLFOCUS -> {
+                EventBus.getDefault().post(ScrollStatusChangeEvent(false))
+            }
+            RELEASESCROLLFOCUS -> {
+                EventBus.getDefault().post(ScrollStatusChangeEvent(true))
+            }
+            IOSPOP -> {
+                PlayerFloatHelper.hide()
+                PlayerFloatHelper.removeView(mFragment!!.activity!!)
+                AudioPlayer.get().stopPlayer()
+                CourseSendPlugin.sendMsg(false)
+                mFragment!!.activity.finish()
+            }
         }
     }
 
@@ -140,8 +178,12 @@ class CoursePlugin : MethodChannel.MethodCallHandler {
         if (demoType == 1) {
             music.path = url
 
-            PlayerFloatHelper.show(mFragment!!.activity,playTypeEnum=PlayTypeEnum.PLAY_TYPE_COURSE)
             AudioPlayer.get().singlePlay(music)
+            PlayerFloatHelper.show(
+                mFragment!!.activity,
+                playTypeEnum = PlayTypeEnum.PLAY_TYPE_COURSE
+            )
+
         }
         if (demoType == 2) {
             //todo   视屏播放
@@ -163,6 +205,7 @@ class CoursePlugin : MethodChannel.MethodCallHandler {
             override fun onPlayFinish() {
                 PlayerFloatHelper.hide()
                 AudioPlayer.get().stopPlayer()
+                CourseSendPlugin.sendMsg(false)
             }
 
             override fun onPauseClick() {

m-course/src/main/java/com/yidianling/course/modular_service/CourseServiceImp.kt

@@ -2,9 +2,10 @@ package com.yidianling.course.modular_service
 
 import android.app.Activity
 import android.content.Context
+import com.alibaba.android.arouter.facade.annotation.Route
 import com.ydl.media.audio.AudioPlayer
 import com.ydl.media.view.PlayerFloatHelper
-import com.yidianling.course.api.service.ICourseService
+import com.ydl.course.api.ICourseService
 import com.yidianling.course.courseNew.CourseTopicActivity
 import com.yidianling.course.flutterPlugin.CourseSendPlugin
 
@@ -15,7 +16,8 @@ import com.yidianling.course.flutterPlugin.CourseSendPlugin
  * @Company 壹点灵
  * @date 2019/11/12
  */
-class CourseServiceImp :ICourseService {
+@Route(path = "/course/CourseService")
+class CourseServiceImp : ICourseService {
     override fun courseTopic(activity: Activity, id: String) {
         CourseTopicActivity.start(activity, id)
     }

m-course/src/main/modular_api/com/yidianling/course/api/service/ICourseService.kt → m-course/src/main/modular_api/com/ydl/course/api/ICourseService.kt

-package com.yidianling.course.api.service
+package com.ydl.course.api
 
 import android.app.Activity
 import com.alibaba.android.arouter.facade.template.IProvider

ydl-flutter-base/gradle.properties

+IS_PUBLISH=true
+VERSION_NAME=0.0.3
\ No newline at end of file