update 商户管理中心和商户主体切换只区分个人认证和企业认证

Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/adapter/MerchantSwitchAdapter.kt

@@ -53,9 +53,8 @@ class MerchantSwitchAdapter(
                     setBackgroundResource(R.drawable.shape_life_account_status_auth)
                     setTextColor(ContextCompat.getColor(context, R.color.color_FF1852F1))
                     text = when (data.life_account_type) {
-                        Constant.TYPE_AUTH_INDIVIDUAL_BUSINESS -> resources.getString(R.string.individual_business)
-                        Constant.TYPE_AUTH_COMMON_ENTERPRISE -> resources.getString(R.string.common_enterprise)
-                        Constant.TYPE_AUTH_PERSONAL -> resources.getString(R.string.personal_auth)
+                        Constant.TYPE_LIFE_ACCOUNT_PERSONAL -> resources.getString(R.string.personal_auth)
+                        Constant.TYPE_LIFE_ACCOUNT_ENTERPRISE -> resources.getString(R.string.enterprise_auth)
                         else -> ""
                     }
                 }

Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/constant/Constant.kt

@@ -30,6 +30,10 @@ object Constant {
     const val TYPE_INDIVIDUAL_BUSINESS = 1
     const val TYPE_COMMON_ENTERPRISE = 2
 
+    // 生活号类型
+    const val TYPE_LIFE_ACCOUNT_PERSONAL = 1 // 个人生活号
+    const val TYPE_LIFE_ACCOUNT_ENTERPRISE = 2 // 企业生活号
+
     // 身份证、营业执照上传方式
     const val ITEM_TAKE_PHOTO = "拍照"
     const val ITEM_OPEN_ALBUM = "相册"

Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/widget/LifeAccountLabelView.kt

@@ -62,9 +62,8 @@ class LifeAccountLabelView @JvmOverloads constructor(
                     setBackgroundResource(R.drawable.shape_life_account_status_auth)
                     setTextColor(ContextCompat.getColor(context, R.color.color_FF1852F1))
                     text = when (data.life_account_type) {
-                        Constant.TYPE_AUTH_INDIVIDUAL_BUSINESS -> resources.getString(R.string.individual_business)
-                        Constant.TYPE_AUTH_COMMON_ENTERPRISE -> resources.getString(R.string.common_enterprise)
-                        Constant.TYPE_AUTH_PERSONAL -> resources.getString(R.string.personal_auth)
+                        Constant.TYPE_LIFE_ACCOUNT_PERSONAL -> resources.getString(R.string.personal_auth)
+                        Constant.TYPE_LIFE_ACCOUNT_ENTERPRISE -> resources.getString(R.string.enterprise_auth)
                         else -> ""
                     }
                 }

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

@@ -3,7 +3,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="#66000000">
+    android:background="@color/color_66000000">
 
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/rv_life_account"

Components/newscontent/src/main/res/values/colors.xml

@@ -60,4 +60,5 @@
     <color name="color_FFFFF3EE">#FFFFF3EE</color>
     <color name="color_FFE8F9D8">#FFE8F9D8</color>
     <color name="color_FF6BB81F">#FF6BB81F</color>
+    <color name="color_66000000">#66000000</color>
 </resources>
\ No newline at end of file