update 登录失效、个人认证身份信息重复处理区分B&C端

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

@@ -144,8 +144,13 @@ class XRouterPathConstants {
     /**
      * C端页面
      */
-    // webView
+    // C端WebView容器
     const val C_WEB_VIEW = "/SimpleBorwser"
 
+    // C端个人页
+    const val C_PERSONAL = "/FixNavActivity"
+
+    // C端设置页
+    const val C_SETTING = "/SettingActivity"
   }
 }

CommonLib/BCommon/src/main/java/com/yidian/bcommon/http/HttpResultSubscriber.kt

@@ -2,9 +2,11 @@ package com.yidian.bcommon.http
 
 import android.annotation.SuppressLint
 import com.google.gson.JsonParseException
-import com.yidian.bcommon.constant.XRouterPathConstants
 import com.yidian.bcommon.app.YdBaseApplication
 import com.yidian.bcommon.constant.ResultCode
+import com.yidian.bcommon.constant.XRouterPathConstants
+import com.yidian.bcommon.sdk.ClientType
+import com.yidian.bcommon.sdk.JudgeClientUtils
 import com.yidian.utils.ToastUtil
 import com.yidian.xpage.XPageManager
 import io.reactivex.rxjava3.core.Observer
@@ -55,7 +57,12 @@ abstract class HttpResultSubscriber<T>(private var showProgress: Boolean = false
         onRequestSuccess(decodeResult)
       }
       ResultCode.INVALID -> {
-        XPageManager.push(XRouterPathConstants.LOGIN_LIFE_CIRCLE, null)
+        // 登录失效 B端跳转登录页 C端跳转个人页
+        if (JudgeClientUtils.judgeClient(YdBaseApplication.context.packageName) == ClientType.MERCHANT_B) {
+          XPageManager.push(XRouterPathConstants.LOGIN_LIFE_CIRCLE, null)
+        } else {
+          XPageManager.push(XRouterPathConstants.C_PERSONAL, null)
+        }
       }
       else -> {
         val decodeResult = HttpResult<T>()

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

@@ -9,6 +9,8 @@ import com.yidian.bcommon.constant.HawkConfig
 import com.yidian.bcommon.constant.XEventConfig
 import com.yidian.bcommon.constant.XRouterPathConstants
 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
 import com.yidian.bcommon.utils.StorageUtil
@@ -217,8 +219,12 @@ class LifeAccountPersonalAuthActivity :
   }
 
   override fun onRightOption() {
-    // 重新登录
-    requestLogout()
+    // 个人认证身份信息重复 点击重新登录 B端退出登录 C端跳转设置页
+    if (JudgeClientUtils.judgeClient(packageName) == ClientType.MERCHANT_B) {
+      requestLogout()
+    } else {
+      XPageManager.push(XRouterPathConstants.C_SETTING, null)
+    }
   }
 
   private fun requestLogout() {