feat: 合并release 发布组件

config.gradle

@@ -9,12 +9,12 @@ ext {
             "m-consultant"    : "0.0.60.25",
             "m-fm"            : "0.0.30.08",
             "m-user"          : "0.0.62.10",
-            "m-home"          : "0.0.23.49",
+            "m-home"          : "0.0.23.50",
             "m-im"            : "0.0.21.44",
             "m-dynamic"       : "0.0.7.73",
             "m-article"       : "0.0.0.10",
 
-            "m-muse"          : "0.0.28.29",
+            "m-muse"          : "0.0.28.30",
             "m-tests"         : "0.0.24.18",
             "m-course"        : "0.0.43.37",
 
@@ -35,12 +35,10 @@ ext {
             //mdt 组件
             "ydl-tuicore"   : "0.0.23",
             //第一步
-            "ydl-platform"    : "0.0.40.99",
-            "ydl-platform"    : "0.0.41.5",
+            "ydl-platform"    : "0.0.41.06",
 
             //第二步 若干
-            "ydl-webview"     : "0.0.38.62",
-            "ydl-webview"     : "0.0.38.73",
+            "ydl-webview"     : "0.0.38.75",
             "ydl-media"       : "0.0.21.44",
             "ydl-pay"         : "0.0.18.19",
             "m-audioim"       : "0.0.49.29.90",
@@ -96,12 +94,12 @@ ext {
             "m-consultant"    : "0.0.60.25",
             "m-fm"            : "0.0.30.08",
             "m-user"          : "0.0.62.10",
-            "m-home"          : "0.0.23.49",
+            "m-home"          : "0.0.23.50",
             "m-im"            : "0.0.21.44",
             "m-dynamic"       : "0.0.7.73",
             "m-article"       : "0.0.0.8",
 
-            "m-muse"          : "0.0.28.29",
+            "m-muse"          : "0.0.28.30",
             "m-tests"         : "0.0.24.18",
             "m-course"        : "0.0.43.37",
             //-------------- 业务模块 API 层 --------------
@@ -120,11 +118,10 @@ ext {
             //mdt组件
             "ydl-tuicore"   : "0.0.23",
             //第一步
-            "ydl-platform"    : "0.0.40.99",
-            "ydl-platform"    : "0.0.41.5",
+            "ydl-platform"    : "0.0.41.06",
 
             //第二步 若干
-            "ydl-webview"     : "0.0.38.62",
+            "ydl-webview"     : "0.0.38.75",
             "ydl-media"       : "0.0.21.44",
             "ydl-pay"         : "0.0.18.19",
             "m-audioim"       : "0.0.49.29.90",

m-home/build.gradle

@@ -68,7 +68,6 @@ dependencies {
     implementation 'androidx.appcompat:appcompat:1.2.0'
     implementation 'androidx.fragment:fragment-ktx:1.2.4'
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-    implementation project(path: ':m-user')
     testImplementation 'junit:junit:4.13.2'
     androidTestImplementation 'androidx.test.ext:junit:1.1.2'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
@@ -104,5 +103,6 @@ dependencies {
         }
         api rootProject.ext.dependencies["ydl-webview"]
         api rootProject.ext.dependencies["ydl-media"]
+        api rootProject.ext.dependencies["ydl-media"]
     }
 }

m-home/src/main/java/com/yidianling/home/MeditationTypeAdapter.kt

@@ -13,13 +13,9 @@ import com.alibaba.android.arouter.launcher.ARouter
 import com.bumptech.glide.Glide
 import com.ydl.webview.H5Params
 import com.ydl.webview.NewH5Activity
-import com.ydl.ydl_router.manager.YDLRouterManager
 import com.ydl.ydlcommon.utils.Utils
-import com.ydl.ydlcommon.utils.actionutil.ActionCountUtils
-import com.yidianling.common.tools.ToastUtil
-import com.yidianling.home.constants.HomeBIConstants
 import com.yidianling.home.model.bean.MeditationModuleBean
-import com.yidianling.user.ui.login.OneKeyLoginHelp
+import com.yidianling.home.router.HomeIn
 import kotlinx.android.synthetic.ydl.home_fragment.*
 
 class MeditationTypeAdapter(
@@ -66,7 +62,7 @@ class MeditationTypeAdapter(
 
                 holder.cvLayout?.setOnClickListener {
                     if (meditationType == 0){
-                        if (!OneKeyLoginHelp.startLoginByStatus(context, true)) {
+                        if (HomeIn.getUserService().loginByOneKeyLogin(context, true)) {
                             return@setOnClickListener
                         }
                         ARouter.getInstance().build("/muse/play")

m-home/src/main/java/com/yidianling/home/router/HomeIn.kt

+package com.yidianling.home.router
+
+import android.app.Activity
+import android.content.Context
+import android.content.Intent
+import androidx.appcompat.app.AppCompatActivity
+import com.ydl.ydlcommon.modular.ModularServiceManager
+import com.yidianling.im.api.service.IImService
+import com.yidianling.user.api.service.IAppService
+import com.yidianling.user.api.service.IUserService
+
+/**
+ * author : liupeng
+ */
+object HomeIn {
+
+    fun getImService(): IImService {
+        return ModularServiceManager.provide(IImService::class.java)
+    }
+
+    fun getUserService(): IUserService {
+        return ModularServiceManager.provide(IUserService::class.java)
+    }
+
+    fun isLogin(): Boolean {
+        return getUserService()?.isLogin()?:false
+    }
+
+
+    fun loginWayIntent(activity: Activity): Intent? {
+        return getUserService()?.loginWayIntent(activity)
+    }
+
+    /**
+     * 私聊
+     */
+    fun startChat(context: AppCompatActivity, toUid: String, flag: Int, canTalk: Int) {
+        getImService().startChat(context,toUid,flag,canTalk)
+    }
+
+
+    /**
+     * 调用优先使用一键登录，并返回调用时的登录状态，
+     * @param isOpenDialog true:一键登录使用弹窗展示 false:一键登录使用全屏模式
+     * @return true：已登录，不触发登录跳转，false：未登录，优先一键登录
+     * */
+    fun loginByOneKeyLogin(context: Context, isOpenDialog: Boolean) :Boolean{
+        return getUserService().loginByOneKeyLogin(context,isOpenDialog)
+    }
+}
\ No newline at end of file

m-muse/build.gradle

@@ -54,9 +54,6 @@ dependencies {
     api fileTree(dir: 'libs', include: ['*.jar', '*.aar'])
 
     implementation 'androidx.appcompat:appcompat:1.2.0'
-    implementation project(path: ':ydl-webview')
-    implementation project(path: ':ydl-platform')
-    implementation project(path: ':ydl-platform')
     testImplementation 'junit:junit:4.13.2'
     androidTestImplementation 'androidx.test.ext:junit:1.1.2'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
@@ -77,10 +74,14 @@ dependencies {
         api project(":ydl-platform")
         implementation project(':ydl-media')
         implementation project(':ydl-flutter-base')
+        implementation project(':ydl-webview')
+
     } else {
         //发布时使用
         api rootProject.ext.dependencies["ydl-media"]
-
+        api (rootProject.ext.dependencies["ydl-webview"]){
+            transitive = true
+        }
         api (rootProject.ext.dependencies["ydl-platform"]) {
             transitive = true
         }

m-user/src/main/java/com/yidianling/user/mine/MineFragment.kt

@@ -53,8 +53,6 @@ import io.reactivex.android.schedulers.AndroidSchedulers
 import io.reactivex.functions.Consumer
 import io.reactivex.schedulers.Schedulers
 import kotlinx.android.synthetic.main.user_mine_fragment_mine.*
-import java.text.SimpleDateFormat
-import java.util.*
 
 /**
  * 我的Tab
@@ -116,6 +114,9 @@ class MineFragment : BaseFragment(), SwipeRefreshLayout.OnRefreshListener, View.
         rootView.findViewById<View>(R.id.ll_my_test_log).setOnClickListener(this)
         //客服
         rootView.findViewById<View>(R.id.ll_service).setOnClickListener(this)
+        //冥想
+        rootView.findViewById<View>(R.id.ll_meditation).setOnClickListener(this)
+
         init()
         GlideApp.with(this).load("https://static.yidianling.com/banner/bottombanner@2x.png")
             .into(iv_mine_logo)
@@ -130,10 +131,14 @@ class MineFragment : BaseFragment(), SwipeRefreshLayout.OnRefreshListener, View.
                 .getGlobalInfo()?.info && null != PlatformRamImpl.getInstance()
                 .getGlobalInfo()?.info?.app_share
         ) {
-            share_title = PlatformRamImpl.getInstance().getGlobalInfo()?.info?.app_share?.title.toString()
-            share_context = PlatformRamImpl.getInstance().getGlobalInfo()?.info?.app_share?.descrip.toString()
-            share_head = PlatformRamImpl.getInstance().getGlobalInfo()?.info?.app_share?.cover_url.toString()
-            share_url = PlatformRamImpl.getInstance().getGlobalInfo()?.info?.app_share?.dl_url.toString()
+            share_title =
+                PlatformRamImpl.getInstance().getGlobalInfo()?.info?.app_share?.title.toString()
+            share_context =
+                PlatformRamImpl.getInstance().getGlobalInfo()?.info?.app_share?.descrip.toString()
+            share_head =
+                PlatformRamImpl.getInstance().getGlobalInfo()?.info?.app_share?.cover_url.toString()
+            share_url =
+                PlatformRamImpl.getInstance().getGlobalInfo()?.info?.app_share?.dl_url.toString()
         }
     }
 
@@ -388,7 +393,8 @@ class MineFragment : BaseFragment(), SwipeRefreshLayout.OnRefreshListener, View.
                     .put("mine_name", "我的动态")
                     .burryPoint("mine")
                 try {
-                    val intentm = provide(IDynamicService::class.java).getMyTrendsActivityIntent(activity)
+                    val intentm =
+                        provide(IDynamicService::class.java).getMyTrendsActivityIntent(activity)
                     startActivity(intentm)
                 } catch (e: Exception) {
                     e.printStackTrace()
@@ -415,7 +421,8 @@ class MineFragment : BaseFragment(), SwipeRefreshLayout.OnRefreshListener, View.
                 BuryPointUtils.getInstance().createMap()
                     .put("mine_name", "预约订单")
                     .burryPoint("mine")
-                val h5Params3 = H5Params(MH5_URL + "wb/user/order/list?needOrderHelperAlert=1", null)
+                val h5Params3 =
+                    H5Params(MH5_URL + "wb/user/order/list?needOrderHelperAlert=1", null)
                 NewH5Activity.start(activity, h5Params3)
             }
 
@@ -450,7 +457,7 @@ class MineFragment : BaseFragment(), SwipeRefreshLayout.OnRefreshListener, View.
             count(UserMyPageEvent.YDL_USER_MY_BOTTOM_TYPE_CLICK, "专家入驻")
             var joinDoctorUrl = PlatformRamImpl.getInstance().getGlobalInfo()?.info?.join_doctor_url
             if (joinDoctorUrl.isNullOrEmpty()) {
-                joinDoctorUrl= "http://m.yidianling.com/enter?"
+                joinDoctorUrl = "http://m.yidianling.com/enter?"
             }
             val h5Paramzhuan = H5Params(joinDoctorUrl, null)
             NewH5Activity.start(activity, h5Paramzhuan)
@@ -488,6 +495,12 @@ class MineFragment : BaseFragment(), SwipeRefreshLayout.OnRefreshListener, View.
         } else if (id == R.id.jtv_test) { //debug下任意门入口
             jtv_test?.postDelayed({ YdlBuryPointUtil.sendPv("PvEvent") }, 300)
             jtv_test?.postDelayed({ YdlBuryPointUtil.sendClick("ClickEvent") }, 500)
+        } else if (id == R.id.ll_meditation) { //冥想
+            if (!startLoginByStatus(mActivity!!, true)) {
+                return
+            }
+            val h5Params3 = H5Params(MH5_URL + "meditation?hideNavBar=1", null)
+            NewH5Activity.start(activity, h5Params3)
         }
     }
 
@@ -505,7 +518,7 @@ class MineFragment : BaseFragment(), SwipeRefreshLayout.OnRefreshListener, View.
     }
 
     private fun share() {
-        val dialog = mActivity?.let {activity ->
+        val dialog = mActivity?.let { activity ->
             style4(activity, share_title, share_url, share_context, share_head)
         }
         dialog?.show(activity?.fragmentManager, "lose")

ydl-webview/build.gradle

@@ -51,7 +51,6 @@ android {
 
 dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-    implementation project(path: ':ydl-platform')
     kapt 'com.alibaba:arouter-compiler:1.2.2'
     api rootProject.ext.dependencies["ydl-user-router"]
     api fileTree(include: ['*.jar'], dir: 'libs')