Merge branch 'd/lancet/4.3.93_muse' into 'd/4.3.93_muse'

revert   route  method

See merge request app_android_lib/YDL-Component!75

app/src/main/java/com/ydl/component/service/web/WVClickAbstractListener.java

@@ -15,7 +15,7 @@ import com.yidianling.common.tools.LogUtil;
 import com.yidianling.im.api.service.IImService;
 import com.yidianling.muse.activity.ChooseMusicActivity;
 
-import static com.ydl.ydlcommon.router.IYDLRouterConstant.ROUTER_MUSE_PLAY;
+//import static com.ydl.ydlcommon.router.IYDLRouterConstant.ROUTER_MUSE_PLAY;
 
 /**
  * webview 点击事件监听 抽象类
@@ -457,11 +457,18 @@ public class WVClickAbstractListener implements WebViewClientClickListener {
     public void playMeditation(int mediaId, long meditationId, int meditationType, String mediaCoverUrl) {
 
         if (mContext instanceof NewH5Activity) {
-            YDLRouterManager.Companion.router(ROUTER_MUSE_PLAY,
-                    new YDLRouterParams().putExtra("MEDITATION_ID", String.valueOf(meditationId))
-                            .putExtra("MEDIA_ID", String.valueOf(mediaId))
-                            .putExtra("MEDITATION_TYPE", String.valueOf(meditationType))
-                            .putExtra("MEDIA_COVER_URL", mediaCoverUrl));
+//            YDLRouterManager.Companion.router(ROUTER_MUSE_PLAY,
+//                    new YDLRouterParams().putExtra("MEDITATION_ID", String.valueOf(meditationId))
+//                            .putExtra("MEDIA_ID", String.valueOf(mediaId))
+//                            .putExtra("MEDITATION_TYPE", String.valueOf(meditationType))
+//                            .putExtra("MEDIA_COVER_URL", mediaCoverUrl));
+
+            ARouter.getInstance().build("/muse/play")
+                    .withLong("MEDITATION_ID", meditationId)
+                    .withLong("MEDIA_ID", mediaId)
+                    .withInt("MEDITATION_TYPE", meditationType)
+                    .withString("MEDIA_COVER_URL", mediaCoverUrl)
+                    .navigation();
 
         }
     }

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

@@ -9,6 +9,7 @@ import android.widget.LinearLayout
 import android.widget.TextView
 import androidx.cardview.widget.CardView
 import androidx.recyclerview.widget.RecyclerView
+import com.alibaba.android.arouter.launcher.ARouter
 import com.bumptech.glide.Glide
 import com.bumptech.glide.load.resource.drawable.DrawableTransitionOptions
 import com.ydl.webview.H5Params
@@ -16,7 +17,7 @@ import com.ydl.webview.NewH5Activity
 import com.ydl.ydl_router.manager.YDLRouterManager
 import com.ydl.ydl_router.manager.YDLRouterParams
 import com.ydl.ydlcommon.modular.ModularServiceManager
-import com.ydl.ydlcommon.router.IYDLRouterConstant.Companion.ROUTER_MUSE_PLAY
+//import com.ydl.ydlcommon.router.IYDLRouterConstant.Companion.ROUTER_MUSE_PLAY
 import com.ydl.ydlcommon.utils.Utils
 import com.ydl.ydlcommon.utils.actionutil.ActionCountUtils
 import com.yidianling.home.constants.HomeBIConstants
@@ -89,21 +90,21 @@ class MeditationTypeAdapter(
                         if (data == null) {
                             return@setOnClickListener
                         }
-//                        ARouter.getInstance().build("/muse/play")
-//                            .withLong("MEDITATION_ID", data[position]?.meditationId)
-//                            .withInt("MEDITATION_TYPE", meditationType)
-//                            .withFloat("MEDIA_DURATION", data[position].duration ?: 0.0f)
-//                            .withString("MEDIA_URL", data[position].mediaIdCoverImageUrl)
-//                            .withString("MEDIA_COVER_URL", data[position].mediaIdCoverImageUrl)
-//                            .navigation()
-
-
-                        YDLRouterManager.router(ROUTER_MUSE_PLAY,
-                            YDLRouterParams().putExtra("MEDITATION_ID" , data[position]?.meditationId.toString())
-                                .putExtra("MEDITATION_TYPE", meditationType.toString())
-                                .putExtra("MEDIA_DURATION", (data[position].duration?:0).toString())
-                                .putExtra("MEDIA_URL", data[position].mediaIdCoverImageUrl.toString())
-                                .putExtra("MEDIA_COVER_URL", data[position].mediaIdCoverImageUrl.toString()))
+                        ARouter.getInstance().build("/muse/play")
+                            .withLong("MEDITATION_ID", data[position]?.meditationId)
+                            .withInt("MEDITATION_TYPE", meditationType)
+                            .withFloat("MEDIA_DURATION", data[position].duration ?: 0.0f)
+                            .withString("MEDIA_URL", data[position].mediaIdCoverImageUrl)
+                            .withString("MEDIA_COVER_URL", data[position].mediaIdCoverImageUrl)
+                            .navigation()
+
+
+//                        YDLRouterManager.router(ROUTER_MUSE_PLAY,
+//                            YDLRouterParams().putExtra("MEDITATION_ID" , data[position]?.meditationId.toString())
+//                                .putExtra("MEDITATION_TYPE", meditationType.toString())
+//                                .putExtra("MEDIA_DURATION", (data[position].duration?:0).toString())
+//                                .putExtra("MEDIA_URL", data[position].mediaIdCoverImageUrl.toString())
+//                                .putExtra("MEDIA_COVER_URL", data[position].mediaIdCoverImageUrl.toString()))
 
                     } else {
                         if (Utils.isFastClick()) {