fix UI走查 管理中心-切换主体弹窗

Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/ui/center/MerchantCenterActivity.kt

 package com.yidian.shenghuoquan.newscontent.ui.center
 
+import android.content.DialogInterface
 import android.os.Bundle
 import android.view.View
 import androidx.core.content.ContextCompat
@@ -45,7 +46,7 @@ class MerchantCenterActivity : BaseActivity<ActivityMerchantCenterBinding>(),
   LifeAccountLabelView.OnLifeAccountLabelCallback, IGetLifeAccountInfoByIdCallback,
   MerchantCenterBottomHintDialog.OnMerchantCenterBottomHintCallback, IAuthMerchantCheckCallback,
   MerchantServiceFunctionAdapter.OnItemClickListener, CommonTopBarView.OnCommonTopBarActionCallback, OnRefreshListener,
-  IUserLogoutCallBack {
+  IUserLogoutCallBack, DialogInterface.OnShowListener, DialogInterface.OnDismissListener {
 
   companion object {
     // 传递的生活号信息
@@ -480,7 +481,10 @@ class MerchantCenterActivity : BaseActivity<ActivityMerchantCenterBinding>(),
       override fun getLifeAccountListSuccess(result: ArrayList<LifeAccountItemBean.Response>?) {
         // 生活号列表请求成功 弹出切换主体弹窗
         result?.let {
-          MerchantSwitchDialog(this@MerchantCenterActivity, curLifeAccount.life_account_id, it, this@MerchantCenterActivity).show()
+          val dialog = MerchantSwitchDialog(this@MerchantCenterActivity, curLifeAccount.life_account_id, it, this@MerchantCenterActivity)
+          dialog.setOnShowListener(this@MerchantCenterActivity)
+          dialog.setOnDismissListener(this@MerchantCenterActivity)
+          dialog.show()
         }
       }
 
@@ -547,4 +551,16 @@ class MerchantCenterActivity : BaseActivity<ActivityMerchantCenterBinding>(),
   override fun userLogoutSuccess() {
     XPageManager.push(XRouterPathConstants.LOGIN_LIFE_CIRCLE, null)
   }
+
+  override fun onShow(dialog: DialogInterface?) {
+    // 切换主体弹窗显示
+    // 更改页面标题背景色
+    viewBind.bvTopBar.setBackgroundColor(ContextCompat.getColor(this, R.color.white))
+  }
+
+  override fun onDismiss(dialog: DialogInterface?) {
+    // 切换主体弹窗消失
+    // 更改页面标题背景色
+    viewBind.bvTopBar.setBackgroundColor(ContextCompat.getColor(this, R.color.transparent))
+  }
 }

Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/ui/center/MerchantSwitchDialog.kt

@@ -4,6 +4,8 @@ import android.content.Context
 import android.view.Gravity
 import android.view.View
 import android.view.WindowManager
+import androidx.core.content.ContextCompat
+import androidx.recyclerview.widget.DividerItemDecoration
 import androidx.recyclerview.widget.LinearLayoutManager
 import com.yidian.common.base.BaseDialog
 import com.yidian.shenghuoquan.newscontent.R
@@ -33,6 +35,10 @@ class MerchantSwitchDialog(
   override fun initView() {
     viewBinding.rvLifeAccount.layoutManager = LinearLayoutManager(context)
     viewBinding.rvLifeAccount.adapter = MerchantSwitchAdapter(curLifeAccountId, data, this)
+    // 分割线
+    val decoration = DividerItemDecoration(context, DividerItemDecoration.VERTICAL)
+    ContextCompat.getDrawable(context, R.drawable.shape_recycler_view_item_divider)?.let { decoration.setDrawable(it) }
+    viewBinding.rvLifeAccount.addItemDecoration(decoration)
   }
 
   override fun initListener() {
@@ -52,9 +58,12 @@ class MerchantSwitchDialog(
     window?.setGravity(Gravity.TOP)
     val params = window?.attributes
     params?.width = WindowManager.LayoutParams.MATCH_PARENT
-    params?.height = DensityUtil.getScreenHeight() - DensityUtil.dp2px(42f)
-    params?.y = DensityUtil.dp2px(42f)
+    params?.height = DensityUtil.getScreenHeight()
+    params?.y = DensityUtil.dp2px(44f)
     window?.attributes = params
+    // 隐藏导航栏
+    /*window?.decorView?.systemUiVisibility =
+      View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY or View.SYSTEM_UI_FLAG_FULLSCREEN or View.SYSTEM_UI_FLAG_HIDE_NAVIGATION*/
   }
 
   override fun onClick(v: View?) {

Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/ui/dialog/BottomSelectDialog.kt

@@ -36,7 +36,7 @@ class BottomSelectDialog<T : BottomSelectBean> @JvmOverloads constructor(
     viewBinding.rvSelectItems.adapter = BottomSelectAdapter(data, this)
     // 分割线
     val decoration = DividerItemDecoration(context, DividerItemDecoration.VERTICAL)
-    ContextCompat.getDrawable(context, R.drawable.shape_bottom_select_item_divider)?.let { decoration.setDrawable(it) }
+    ContextCompat.getDrawable(context, R.drawable.shape_recycler_view_item_divider)?.let { decoration.setDrawable(it) }
     viewBinding.rvSelectItems.addItemDecoration(decoration)
   }
 

Components/newscontent/src/main/res/layout/dialog_merchant_switch.xml

@@ -10,6 +10,8 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:background="@drawable/shape_bg_merchant_switch"
+        android:paddingStart="@dimen/dp20"
+        android:paddingEnd="@dimen/dp20"
         app:layout_constraintTop_toTopOf="parent" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file

Components/newscontent/src/main/res/layout/item_merchant_switch.xml

@@ -3,10 +3,8 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:paddingStart="@dimen/dp19"
-    android:paddingTop="@dimen/dp17"
-    android:paddingEnd="@dimen/dp19"
-    android:paddingBottom="@dimen/dp17">
+    android:paddingTop="@dimen/dp18"
+    android:paddingBottom="@dimen/dp18">
 
     <TextView
         android:id="@+id/tv_life_account_name"
@@ -17,7 +15,8 @@
         android:maxWidth="@dimen/dp214"
         android:maxLines="2"
         android:textColor="@color/color_333333"
-        android:textSize="@dimen/sp17"
+        android:textSize="@dimen/sp16"
+        android:textStyle="bold"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
@@ -41,8 +40,8 @@
 
     <ImageView
         android:id="@+id/iv_life_account_select"
-        android:layout_width="@dimen/dp23"
-        android:layout_height="@dimen/dp23"
+        android:layout_width="@dimen/dp24"
+        android:layout_height="@dimen/dp24"
         android:src="@drawable/icon_life_account_select"
         android:visibility="gone"
         app:layout_constraintBottom_toBottomOf="parent"