Merge branch 'feat/lp/lp_confide_8' into 'd/v_confide_2.0'

feat: 支付弹窗展示逻辑优化

See merge request app_android_lib/YDL-Component!97

config.gradle

@@ -5,7 +5,7 @@ ext {
     ydlPublishVersion = [
             // -------------- 业务模块 --------------
             //第三步 若干
-            "m-confide"       : "0.0.50.01",
+            "m-confide"       : "0.0.50.02",
             "m-consultant"    : "0.0.60.27",
             "m-fm"            : "0.0.30.09",
             "m-user"          : "0.0.62.26",
@@ -90,7 +90,7 @@ ext {
             // -------------- 业务模块 --------------
             //第三步 若干
 
-            "m-confide"       : "0.0.50.01",
+            "m-confide"       : "0.0.50.02",
             "m-consultant"    : "0.0.60.27",
             "m-fm"            : "0.0.30.09",
             "m-user"          : "0.0.62.26",

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

@@ -35,7 +35,6 @@ import com.ydl.webview.ProgressWebView
 import com.ydl.webview.TellData
 import com.ydl.webview.WebModularServiceUtils
 import com.ydl.ydlcommon.modular.findRouteService
-import com.ydl.ydlcommon.utils.ScreenUtil
 import com.ydl.ydlcommon.utils.TimeUtil
 import com.ydl.ydlcommon.utils.actionutil.ActionCountUtils
 import com.ydl.ydlcommon.view.dialog.CommonDialog
@@ -238,8 +237,10 @@ class ConfideBottomSheetDialogFragment : BottomSheetDialogFragment() {
             behavior?.peekHeight = (resources.displayMetrics.heightPixels * 0.7F).roundToInt()
 
             if (jumpUrl?.contains("payPage=1")){
-                //支付70%高度
-                setMaxHeight(RxImageTool.dp2px(480f))
+                //支付高度
+                setMaxHeight(RxImageTool.dp2px(450f))
+                behavior?.isHideable = false
+                rl_title.visibility = View.GONE
             }else{
                 setMaxHeight(resources.displayMetrics.heightPixels)
             }
@@ -250,20 +251,27 @@ class ConfideBottomSheetDialogFragment : BottomSheetDialogFragment() {
                     when (newState) {
                         BottomSheetBehavior.STATE_EXPANDED -> {
                             bottomSheet.background = ColorDrawable(Color.WHITE)
-                            rl_title.visibility = View.VISIBLE
-                            close_webview_Icon.visibility = View.VISIBLE
-                            text_title.visibility = View.VISIBLE
-                            line.visibility = View.GONE
+
+                            if (!jumpUrl?.contains("payPage=1")){
+                                rl_title.visibility = View.VISIBLE
+                                text_title.visibility = View.VISIBLE
+                                close_webview_Icon.visibility = View.VISIBLE
+                                line.visibility = View.GONE
+                            }
                         }
                         BottomSheetBehavior.STATE_DRAGGING -> {
                             bottomSheet.setBackgroundResource(R.drawable.confide_bottom_webview)
-                            rl_title.visibility = View.VISIBLE
+                            if (!jumpUrl?.contains("payPage=1")) {
+                                rl_title.visibility = View.VISIBLE
+                            }
                             close_webview_Icon.visibility = View.GONE
                             text_title.visibility = View.GONE
                             line.visibility = View.VISIBLE
                         }
                         BottomSheetBehavior.STATE_COLLAPSED -> {
-                            rl_title.visibility = View.VISIBLE
+                            if (!jumpUrl?.contains("payPage=1")) {
+                                rl_title.visibility = View.VISIBLE
+                            }
                             line.visibility = View.VISIBLE
                         }
                     }
@@ -297,7 +305,9 @@ class ConfideBottomSheetDialogFragment : BottomSheetDialogFragment() {
 //            behavior?.state = BottomSheetBehavior.STATE_EXPANDED
 //        }
 
-        setMaxHeight(RxImageTool.dp2px(480f))
+        setMaxHeight(RxImageTool.dp2px(450f))
+        rl_title.visibility = View.GONE
+        behavior?.isHideable = false
         layoutCall.visibility = if (show and 0x01 == 0x01) View.VISIBLE else View.GONE
         layoutChange.visibility = if (show and 0x02 == 0x01) View.VISIBLE else View.GONE
     }

m-confide/src/main/res/layout/confide_webview.xml

 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
+    android:background="@color/white"
     android:layout_height="match_parent">
     <RelativeLayout
         android:layout_width="match_parent"