Merge branch 'feat/fq/confide_expert_page' into 'release'

feat: 离线可预约跳专家主页

See merge request app_android_lib/YDL-Component!184

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

@@ -481,8 +481,8 @@ public class WVClickAbstractListener implements WebViewClientClickListener {
     }
 
     @Override
-    public void getNextExpertStatus(String doctorID, String title, String uid) {
-        EventBus.getDefault().post(new ChangeAnotherExpertEvent(doctorID,title,uid));
+    public void getNextExpertStatus(String doctorID, String title, String uid, String linkUrl) {
+        EventBus.getDefault().post(new ChangeAnotherExpertEvent(doctorID, title, uid, linkUrl));
     }
 
     @Override

app/src/main/java/com/ydl/component/service/web/WebJavascriptHandler.kt

@@ -50,6 +50,7 @@ class WebJavascriptHandler : IJavascriptHandler{
         if (YDLRouterManager.router(params)) {
             return
         }
+
         if (js.handle(params)) return
         val jsData = Gson().fromJson(params, H5JsBean::class.java)
         //是否登录
@@ -447,7 +448,7 @@ class WebJavascriptHandler : IJavascriptHandler{
 
             //再换一位
             "get_next_doctor"->{
-                wvEnventPro?.getNextExpertStatus(jsData.cmd?.params?.doctorId.toString(),jsData.cmd?.params?.title,jsData.cmd?.params?.uid.toString())
+                wvEnventPro?.getNextExpertStatus(jsData.cmd?.params?.doctorId.toString(),jsData.cmd?.params?.title,jsData.cmd?.params?.uid.toString(),jsData.cmd?.params?.linkUrl)
             }
             "show_popup_window" -> {
                 val doctorId = jsData.cmd?.params?.doctorId?.toString()

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

@@ -199,6 +199,6 @@ public interface WebViewClientClickListener {
     default void setWebViewBG(String rgb,String alpha){}
 
 
-    void getNextExpertStatus(String doctorID,String title,String uid);
+    void getNextExpertStatus(String doctorID, String title, String uid, String linkUrl);
 
 }

config.gradle

@@ -264,7 +264,7 @@ ext {
             "ydl-pushagent"                : "com.ydl:pushagent:0.1.1",
             "ydl-notracepoint"             : "com.ydl:notracepoint-lib:0.2.3.3@aar",
             "ydl-js"                       : "com.ydl:ydl-js:1.0.7-SNAPSHOT@aar",
-            "ydl-router"                   : "com.ydl:ydl-router:1.4.1-SNAPSHOT@aar",
+            "ydl-router"                   : "com.ydl:ydl-router:1.4.2",
             "xrecyclerview"                : "com.ydl:xrecyclerview:1.0.0-SNAPSHOT@aar",
             "mmkv"                         : "com.tencent:mmkv-static:1.2.6",
             "arouter-api"                  : "com.alibaba:arouter-api:1.4.1",

m-confide/src/main/java/com/ydl/confide/home/ConfideBottomSheetDialogFragment.kt

@@ -378,10 +378,10 @@ class ConfideBottomSheetDialogFragment : BottomSheetDialogFragment() {
     }
 
     fun onEventMainThread(event: ChangeAnotherExpertEvent) {
-        updateChange(event.doctorID, event.title, event.uid)
+        updateChange(event.doctorID, event.title, event.uid, event.linkUrl)
     }
 
-    private fun updateChange(doctorId: String, title: String, uid: String) {
+    private fun updateChange(doctorId: String, title: String, uid: String, linkUrl: String) {
         if (doctorId == "0") {//没有下一位了
             layoutChange.visibility = View.GONE
             return
@@ -392,11 +392,7 @@ class ConfideBottomSheetDialogFragment : BottomSheetDialogFragment() {
         layout_change_text.visibility = View.VISIBLE
         this.doctorId = doctorId
         onLoadDialStatus(doctorId)
-
-        if (activity is ConfideHomeActivity) {
-            val confideHomeActivity = activity as ConfideHomeActivity
-            expertUrl = confideHomeActivity?.searchLinkUrlByUid(uid) ?: ""
-        }
+        this.expertUrl = linkUrl
         callJsFun(wv_content, "setUnRead(${getUnReadByUid(uid = uid)})")
     }
 

m-confide/src/main/java/com/ydl/confide/home/event/ChangeAnotherExpertEvent.kt

@@ -3,7 +3,8 @@ package com.ydl.confide.home.event
 data class ChangeAnotherExpertEvent(
     var doctorID: String,
     var title: String,
-    var uid: String
+    var uid: String,
+    var linkUrl: String
 )
 
 class ConfideDialogEvent(val show: Int)
\ No newline at end of file

ydl-webview/src/main/java/com/ydl/webview/H5JsBean.kt

@@ -102,6 +102,7 @@ class H5JsBean {
             var cate_id = 0 //搜索主题id
             var imageBase64: String? = null//图片base64编码数据
             var sourceUrl: String? = null//登录完成后跳转地址
+            var linkUrl: String? = null //专家主页地址
 
             override fun toString(): String {
                 return "Params(url=$url, search_name='$search_name', id=$id, uid=$uid, toName=$toName, toUid=$toUid, docHead=$docHead, doctorId=$doctorId, listenerId=$listenerId, " +