Commit 6f73ad44 authored by yinjiacheng's avatar yinjiacheng

fix SHQBD-237 生活号标签具体区分普通企业和个体工商户

parent bc88061e
...@@ -52,9 +52,10 @@ class MerchantSwitchAdapter( ...@@ -52,9 +52,10 @@ class MerchantSwitchAdapter(
// 已认证 // 已认证
setBackgroundResource(R.drawable.shape_life_account_status_auth) setBackgroundResource(R.drawable.shape_life_account_status_auth)
setTextColor(ContextCompat.getColor(context, R.color.color_FF1852F1)) setTextColor(ContextCompat.getColor(context, R.color.color_FF1852F1))
text = when (data.life_account_type) { text = when (data.tag.tag_key) {
Constant.TYPE_LIFE_ACCOUNT_PERSONAL -> resources.getString(R.string.personal_auth) Constant.LIFE_ACCOUNT_TAG_COMMON_ENTERPRISE_AUTH -> resources.getString(R.string.common_enterprise)
Constant.TYPE_LIFE_ACCOUNT_ENTERPRISE -> resources.getString(R.string.enterprise_auth) Constant.LIFE_ACCOUNT_TAG_INDIVIDUAL_BUSINESS_AUTH -> resources.getString(R.string.individual_business)
Constant.LIFE_ACCOUNT_TAG_PERSONAL_AUTH -> resources.getString(R.string.personal_auth)
else -> "" else -> ""
} }
} }
......
...@@ -194,7 +194,6 @@ class MerchantCenterActivity : BaseActivity<ActivityMerchantCenterBinding>(), ...@@ -194,7 +194,6 @@ class MerchantCenterActivity : BaseActivity<ActivityMerchantCenterBinding>(),
/** /**
* 对应生活号权限下的功能集 * 对应生活号权限下的功能集
* @param tagKey 生活号认证类型/状态
* todo 优化逻辑 * todo 优化逻辑
*/ */
private fun generateFunctionPermissionMap(data: List<GetConfigListBean.Item>) { private fun generateFunctionPermissionMap(data: List<GetConfigListBean.Item>) {
......
...@@ -60,9 +60,10 @@ class LifeAccountLabelView @JvmOverloads constructor( ...@@ -60,9 +60,10 @@ class LifeAccountLabelView @JvmOverloads constructor(
// 已认证 // 已认证
setBackgroundResource(R.drawable.shape_life_account_status_auth) setBackgroundResource(R.drawable.shape_life_account_status_auth)
setTextColor(ContextCompat.getColor(context, R.color.color_FF1852F1)) setTextColor(ContextCompat.getColor(context, R.color.color_FF1852F1))
text = when (data.life_account_type) { text = when (data.tag.tag_key) {
Constant.TYPE_LIFE_ACCOUNT_PERSONAL -> resources.getString(R.string.personal_auth) Constant.LIFE_ACCOUNT_TAG_COMMON_ENTERPRISE_AUTH -> resources.getString(R.string.common_enterprise)
Constant.TYPE_LIFE_ACCOUNT_ENTERPRISE -> resources.getString(R.string.enterprise_auth) Constant.LIFE_ACCOUNT_TAG_INDIVIDUAL_BUSINESS_AUTH -> resources.getString(R.string.individual_business)
Constant.LIFE_ACCOUNT_TAG_PERSONAL_AUTH -> resources.getString(R.string.personal_auth)
else -> "" else -> ""
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment