Merge remote-tracking branch 'origin/d/v4.3.99' into fix/fq/fq_fix_4.3.99

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

@@ -36,12 +36,12 @@ class JsMethod {
                 return true
             }
             "show_loading" -> {
-                val topActivity = BaseActivityMgr.INST.getTopActivity()
-                Loading.show(topActivity)
+//                val topActivity = BaseActivityMgr.INST.getTopActivity()
+//                Loading.show(topActivity)
                 return true
             }
             "close_loading" -> {
-                Loading.close()
+//                Loading.close()
                 return true
             }
             "open_app_eval_list"->{

config.gradle

@@ -5,7 +5,7 @@ ext {
     ydlPublishVersion = [
             // -------------- 业务模块 --------------
             //第三步 若干
-            "m-confide"       : "0.0.50.42",
+            "m-confide"       : "0.0.50.43",
             "m-consultant"    : "0.0.60.70",
             "m-fm"            : "0.0.30.09",
             "m-user"          : "0.0.62.55",
@@ -91,7 +91,7 @@ ext {
     ydlCompileVersion = [
             // -------------- 业务模块 --------------
             //第三步 若干
-            "m-confide"       : "0.0.50.42",
+            "m-confide"       : "0.0.50.43",
             "m-consultant"    : "0.0.60.70",
             "m-fm"            : "0.0.30.09",
             "m-user"          : "0.0.62.55",

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

@@ -145,7 +145,6 @@ class ConfideBottomSheetDialogFragment : BottomSheetDialogFragment() {
         uid = arguments?.getString(KEY_UID)
         listen_free = arguments?.getBoolean(KEY_LISTEN_FREE) ?: false
         onLoadDialStatus(doctorId)
-//        +
         wv_content = view.findViewById<ProgressWebView>(com.ydl.webview.R.id.wv_content)
         wv_content.progressbar.visibility = View.GONE
         close_webview_Icon = view.findViewById<View>(R.id.close_webview_Icon)
@@ -449,6 +448,14 @@ class ConfideBottomSheetDialogFragment : BottomSheetDialogFragment() {
 
             override fun onProgressChanged(view: WebView, newProgress: Int) {
                 if (newProgress == 100) {
+                    wv_content.progressbar.visibility = View.GONE
+                } else {
+                    if (wv_content.progressbar.visibility == View.GONE) {
+                        wv_content.progressbar.visibility = View.VISIBLE
+                    }
+                    wv_content.progressbar.progress = newProgress
+                }
+                if (newProgress == 100) {
                     callJsFun(wv_content, "setUnRead(${uid?.let { getUnReadByUid(uid = it) }})")
                 }
                 super.onProgressChanged(view, newProgress)