update C端跳转管理中心页可返回

Components/BManagerCenter/src/main/java/com/yidian/shenghuoquan/bmanagercenter/ui/auth/LifeAccountAuthActivity.kt

@@ -6,6 +6,8 @@ import androidx.core.view.isVisible
 import com.yidian.bcommon.base.BaseActivity
 import com.yidian.bcommon.constant.IntentConstants
 import com.yidian.bcommon.constant.XRouterPathConstants
+import com.yidian.bcommon.sdk.ClientType
+import com.yidian.bcommon.sdk.JudgeClientUtils
 import com.yidian.bcommon.services.ZapServiceActionConstants
 import com.yidian.bcommon.services.ZapServiceNameConstants
 import com.yidian.shenghuoquan.bmanagercenter.R
@@ -30,9 +32,6 @@ class LifeAccountAuthActivity : BaseActivity<ActivityLifeAccountAuthBinding>(),
     // 由B端管理中心跳转
     const val FROM_B_MANAGER_CENTER = "fromBManagerCenter"
 
-    // 由C端跳转
-    const val FROM_C = "fromC"
-
     // 生活号id
     const val PARAMS_LIFE_ACCOUNT_ID = "life_account_id"
   }
@@ -81,7 +80,7 @@ class LifeAccountAuthActivity : BaseActivity<ActivityLifeAccountAuthBinding>(),
         it as String
       }
     }
-    if (from == FROM_B_MANAGER_CENTER || from == FROM_C) {
+    if (from == FROM_B_MANAGER_CENTER || JudgeClientUtils.judgeClient(packageName) == ClientType.MERCHANT_C) {
       // 由B端管理中心及相关页面或C端跳转至此页面 页面可返回且隐藏退出登录按钮
       viewBind.bvTopBar.setBackVisibility(true)
       viewBind.btnLogout.isVisible = false

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

@@ -16,6 +16,7 @@ import com.yidian.bcommon.http.CommonDataSource
 import com.yidian.bcommon.http.bean.GetCommonConfigBean
 import com.yidian.bcommon.http.callback.IGetCommonConfigCallback
 import com.yidian.bcommon.sdk.BCommonManager
+import com.yidian.bcommon.sdk.ClientType
 import com.yidian.bcommon.sdk.JudgeClientUtils
 import com.yidian.bcommon.services.ZapServiceActionConstants
 import com.yidian.bcommon.services.ZapServiceNameConstants
@@ -100,8 +101,12 @@ class MerchantCenterActivity : BaseActivity<ActivityMerchantCenterBinding>(), Me
   }
 
   private fun initView() {
-    // 此页面不能返回
-    viewBind.bvTopBar.setBackVisibility(false)
+    // 由C端跳转此页面可返回
+    if (JudgeClientUtils.judgeClient(packageName) == ClientType.MERCHANT_C) {
+      viewBind.bvTopBar.setBackVisibility(true)
+    } else {
+      viewBind.bvTopBar.setBackVisibility(false)
+    }
     // 此页面默认不显示切换主体
     viewBind.bvTopBar.setActionVisibility(false)
     viewBind.bvTopBar.setOnCommonTopBarCallback(null, this)