update 认证首页跳转区分B&C端

CommonLib/BCommon/src/main/java/com/yidian/bcommon/constant/IntentConstants.kt

@@ -9,4 +9,7 @@ object IntentConstants {
 
   // 生活号id
   const val KEY_EXTRA_LIFE_ACCOUNT_ID = "lifeAccountId"
+
+  // 认证首页跳转来源
+  const val KEY_EXTRA_LIFE_ACCOUNT_AUTH_FROM = "lifeAccountAuthFrom"
 }

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

@@ -4,9 +4,8 @@ import android.os.Bundle
 import android.view.View
 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
@@ -28,21 +27,22 @@ class LifeAccountAuthActivity : BaseActivity<ActivityLifeAccountAuthBinding>(),
   IAuthMerchantCheckCallback {
 
   companion object {
-    // 从哪个页面跳转
-    const val EXTRA_PAGE_FROM = "from"
+    // 由B端管理中心跳转
+    const val FROM_B_MANAGER_CENTER = "fromBManagerCenter"
 
-    const val FROM_AUTH = "auth"
+    // 由C端跳转
+    const val FROM_C = "fromC"
 
     // 生活号id
-    const val EXTRA_LIFE_ACCOUNT_ID = "life_account_id"
+    const val PARAMS_LIFE_ACCOUNT_ID = "life_account_id"
   }
 
   /**
-   * 生活号id
+   * 生活号id 个人认证升级企业认证、企业认证审核驳回修改、未认证生活号进行认证
    */
   private val lifeAccountId by lazy {
     intent.getSerializableExtra(XRouterPathConstants.ParamsKey)?.let { params ->
-      (params as HashMap<*, *>)[EXTRA_LIFE_ACCOUNT_ID]?.let {
+      (params as HashMap<*, *>)[IntentConstants.KEY_EXTRA_LIFE_ACCOUNT_ID]?.let {
         it as String
       }
     }
@@ -76,20 +76,15 @@ class LifeAccountAuthActivity : BaseActivity<ActivityLifeAccountAuthBinding>(),
       resources.getString(R.string.enterprise_auth_description),
       false
     )
-    if (JudgeClientUtils.judgeClient(packageName) == ClientType.MERCHANT_C) {
-      // C端进入此页面可返回且隐藏退出登录按钮
+    val from = intent.getSerializableExtra(XRouterPathConstants.ParamsKey)?.let { params ->
+      (params as HashMap<*, *>)[IntentConstants.KEY_EXTRA_LIFE_ACCOUNT_AUTH_FROM]?.let {
+        it as String
+      }
+    }
+    if (from == FROM_B_MANAGER_CENTER || from == FROM_C) {
+      // 由B端管理中心及相关页面或C端跳转至此页面 页面可返回且隐藏退出登录按钮
       viewBind.bvTopBar.setBackVisibility(true)
       viewBind.btnLogout.isVisible = false
-      return
-    }
-    if (intent.getSerializableExtra(XRouterPathConstants.ParamsKey) != null) {
-      val paramsMap = intent.getSerializableExtra(XRouterPathConstants.ParamsKey) as HashMap<*, *>
-      if (paramsMap[EXTRA_PAGE_FROM] as String == FROM_AUTH) {
-        // 如果由商户基本信息跳转至此页面 则此页面可返回
-        viewBind.bvTopBar.setBackVisibility(true)
-        // 退出登录按钮隐藏
-        viewBind.btnLogout.isVisible = false
-      }
     }
   }
 
@@ -108,7 +103,7 @@ class LifeAccountAuthActivity : BaseActivity<ActivityLifeAccountAuthBinding>(),
       }
       R.id.view_enterprise_auth -> {
         // 请求企业认证信息 用于回显已填入的信息
-        ApiService.authMerchantCheck(this, lifeAccountId?.let { hashMapOf(Pair(EXTRA_LIFE_ACCOUNT_ID, it)) } ?: hashMapOf())
+        ApiService.authMerchantCheck(this, lifeAccountId?.let { hashMapOf(Pair(PARAMS_LIFE_ACCOUNT_ID, it)) } ?: hashMapOf())
       }
       R.id.btn_logout -> {
         // 退出登录

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

@@ -2,6 +2,7 @@ package com.yidian.shenghuoquan.bmanagercenter.ui.center
 
 import android.app.Activity
 import android.os.Bundle
+import com.yidian.bcommon.constant.IntentConstants
 import com.yidian.bcommon.constant.XRouterPathConstants
 import com.yidian.shenghuoquan.bmanagercenter.constant.Constant
 import com.yidian.shenghuoquan.bmanagercenter.http.ApiService
@@ -56,8 +57,8 @@ class MerchantAuthManagementActivity : Activity(), XPageViewProtocol, IGetLifeAc
         XPageManager.push(
           XRouterPathConstants.LIFE_ACCOUNT_AUTH,
           hashMapOf(
-            Pair(LifeAccountAuthActivity.EXTRA_PAGE_FROM, LifeAccountAuthActivity.FROM_AUTH),
-            Pair(LifeAccountAuthActivity.EXTRA_LIFE_ACCOUNT_ID, lifeAccountId)
+            Pair(IntentConstants.KEY_EXTRA_LIFE_ACCOUNT_AUTH_FROM, LifeAccountAuthActivity.FROM_B_MANAGER_CENTER),
+            Pair(IntentConstants.KEY_EXTRA_LIFE_ACCOUNT_ID, lifeAccountId)
           )
         )
         finish()
@@ -80,7 +81,10 @@ class MerchantAuthManagementActivity : Activity(), XPageViewProtocol, IGetLifeAc
 
   override fun getLifeAccountInfoByIdSuccess(result: GetLifeAccountInfoByIdBean.Response?) {
     // 跳转认证信息详情页
-    XPageManager.push(XRouterPathConstants.LIFE_ACCOUNT_AUTH_INFO, hashMapOf(Pair(MerchantAuthInfoActivity.EXTRA_LIFE_ACCOUNT_INFO, result)))
+    XPageManager.push(
+      XRouterPathConstants.LIFE_ACCOUNT_AUTH_INFO,
+      hashMapOf(Pair(MerchantAuthInfoActivity.EXTRA_LIFE_ACCOUNT_INFO, result))
+    )
     finish()
   }
 

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

@@ -259,8 +259,8 @@ class MerchantCenterActivity : BaseActivity<ActivityMerchantCenterBinding>(), Me
     XPageManager.push(
       XRouterPathConstants.LIFE_ACCOUNT_AUTH,
       hashMapOf(
-        Pair(LifeAccountAuthActivity.EXTRA_PAGE_FROM, LifeAccountAuthActivity.FROM_AUTH),
-        Pair(LifeAccountAuthActivity.EXTRA_LIFE_ACCOUNT_ID, curLifeAccount?.life_account_id)
+        Pair(IntentConstants.KEY_EXTRA_LIFE_ACCOUNT_AUTH_FROM, LifeAccountAuthActivity.FROM_B_MANAGER_CENTER),
+        Pair(IntentConstants.KEY_EXTRA_LIFE_ACCOUNT_ID, curLifeAccount?.life_account_id)
       )
     )
   }
@@ -346,8 +346,8 @@ class MerchantCenterActivity : BaseActivity<ActivityMerchantCenterBinding>(), Me
               XPageManager.push(
                 XRouterPathConstants.LIFE_ACCOUNT_AUTH,
                 hashMapOf(
-                  Pair(LifeAccountAuthActivity.EXTRA_PAGE_FROM, LifeAccountAuthActivity.FROM_AUTH),
-                  Pair(LifeAccountAuthActivity.EXTRA_LIFE_ACCOUNT_ID, curLifeAccount?.life_account_id)
+                  Pair(IntentConstants.KEY_EXTRA_LIFE_ACCOUNT_AUTH_FROM, LifeAccountAuthActivity.FROM_B_MANAGER_CENTER),
+                  Pair(IntentConstants.KEY_EXTRA_LIFE_ACCOUNT_ID, curLifeAccount?.life_account_id)
                 )
               )
             }

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

@@ -127,8 +127,8 @@ class MerchantInfoActivity : BaseActivity<ActivityMerchantInfoBinding>(), Mercha
         XPageManager.push(
           XRouterPathConstants.LIFE_ACCOUNT_AUTH,
           hashMapOf(
-            LifeAccountAuthActivity.EXTRA_PAGE_FROM to LifeAccountAuthActivity.FROM_AUTH,
-            LifeAccountAuthActivity.EXTRA_LIFE_ACCOUNT_ID to lifeAccountInfo.life_account_id
+            IntentConstants.KEY_EXTRA_LIFE_ACCOUNT_AUTH_FROM to LifeAccountAuthActivity.FROM_B_MANAGER_CENTER,
+            IntentConstants.KEY_EXTRA_LIFE_ACCOUNT_ID to lifeAccountInfo.life_account_id
           )
         )
       } else if (lifeAccountInfo.audit_status == Constant.STATUS_AUDIT_REJECT) {