update 跳转商户管理中心页改为页内请求

Components/BManagerCenter/src/main/AndroidManifest.xml

@@ -61,6 +61,7 @@
             android:theme="@style/Transparent" />
         <activity
             android:name="com.yidian.shenghuoquan.bmanagercenter.ui.center.MerchantCenterActivity"
+            android:launchMode="singleTask"
             android:theme="@style/Transparent" />
         <activity
             android:name="com.yidian.shenghuoquan.bmanagercenter.ui.center.MerchantInfoActivity"

Components/BManagerCenter/src/main/java/com/yidian/shenghuoquan/bmanagercenter/app/BManagerCenterApplication.kt

@@ -253,7 +253,7 @@ class BManagerCenterApplication : YdBaseApplication() {
               intent.putExtra(XRouterPathConstants.ParamsKey, params as HashMap)
             }
             intent.setClass(context, MerchantCenterActivity::class.java)
-            intent.flags = Intent.FLAG_ACTIVITY_CLEAR_TASK or Intent.FLAG_ACTIVITY_NEW_TASK
+            intent.flags = Intent.FLAG_ACTIVITY_NEW_TASK
             context.startActivity(intent)
           }
         }),

Components/BManagerCenter/src/main/java/com/yidian/shenghuoquan/bmanagercenter/config/ManagerCenterConfig.kt

@@ -66,10 +66,10 @@ object ManagerCenterConfig {
    */
   fun getFunctionParamsMap(
     data: GetCommonConfigBean.Data,
-    lifeAccount: LifeAccountItemBean.Response,
+    lifeAccount: LifeAccountItemBean.Response?,
     client: ClientType
   ): HashMap<Int, HashMap<String, Any>>? {
-    if (data.merchantManagerCenter.items.isEmpty()) return null
+    if (data.merchantManagerCenter.items.isEmpty() || lifeAccount == null) return null
     when (client) {
       ClientType.MERCHANT_B -> {
         return hashMapOf(

Components/BManagerCenter/src/main/java/com/yidian/shenghuoquan/bmanagercenter/service/LifeNumberListService.kt

@@ -10,7 +10,6 @@ import com.yidian.shenghuoquan.bmanagercenter.http.ApiService
 import com.yidian.shenghuoquan.bmanagercenter.http.callback.IGetLifeAccountListCallback
 import com.yidian.shenghuoquan.bmanagercenter.ui.auth.LifeAccountAuthDataManagerV2
 import com.yidian.shenghuoquan.bmanagercenter.ui.auth.LifeAccountIdentityActivity
-import com.yidian.shenghuoquan.bmanagercenter.ui.center.MerchantCenterActivity
 import com.yidian.xarc.xrouter.ResultResolver
 import com.yidian.xpage.XPageManager
 import com.yidian.yac.core.zap.ZapService
@@ -59,13 +58,7 @@ class LifeNumberListService : ZapService() {
             // 此处处理用户已经关联一个生活号但本地无存储/app数据被清除的情况
             StorageUtil.putLifeAccountId(result[0].life_account_id)
             // 关联一个生活号 进入商户管理中心
-            XPageManager.push(
-              XRouterPathConstants.MERCHANT_CENTER,
-              hashMapOf(
-                Pair(MerchantCenterActivity.EXTRA_LIFE_ACCOUNT_INFO, result[0]),
-                Pair(MerchantCenterActivity.EXTRA_IS_MULTI, false)
-              )
-            )
+            XPageManager.push(XRouterPathConstants.MERCHANT_CENTER, null)
           }
           else -> {
             // 关联多个生活号
@@ -73,13 +66,7 @@ class LifeNumberListService : ZapService() {
               // 如果本地有上次操作的生活号则遍历生活号列表进入对应生活号的管理中心
               result?.forEach {
                 if (it.life_account_id == this) {
-                  XPageManager.push(
-                    XRouterPathConstants.MERCHANT_CENTER,
-                    hashMapOf(
-                      Pair(MerchantCenterActivity.EXTRA_LIFE_ACCOUNT_INFO, it),
-                      Pair(MerchantCenterActivity.EXTRA_IS_MULTI, result.size > 1)
-                    )
-                  )
+                  XPageManager.push(XRouterPathConstants.MERCHANT_CENTER, null)
                 }
               }
             } ?: let {

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

@@ -3,15 +3,14 @@ package com.yidian.shenghuoquan.bmanagercenter.ui.auth
 import android.os.Bundle
 import android.view.View
 import com.orhanobut.hawk.Hawk
+import com.yidian.bcommon.base.BaseActivity
+import com.yidian.bcommon.bean.LifeAccountItemBean
 import com.yidian.bcommon.constant.HawkConfig
 import com.yidian.bcommon.constant.XRouterPathConstants
-import com.yidian.bcommon.base.BaseActivity
 import com.yidian.shenghuoquan.bmanagercenter.R
 import com.yidian.shenghuoquan.bmanagercenter.databinding.ActivityLifeAccountCreateCompleteBinding
 import com.yidian.shenghuoquan.bmanagercenter.http.ApiService
 import com.yidian.shenghuoquan.bmanagercenter.http.callback.IGetLifeAccountListCallback
-import com.yidian.bcommon.bean.LifeAccountItemBean
-import com.yidian.shenghuoquan.bmanagercenter.ui.center.MerchantCenterActivity
 import com.yidian.xpage.XPageManager
 
 /**
@@ -73,13 +72,7 @@ class LifeAccountCreateCompleteActivity : BaseActivity<ActivityLifeAccountCreate
     val curLifeAccountId = params?.get(EXTRA_LIFE_ACCOUNT_ID)?.let { it as String }
     result?.forEach {
       if (it.life_account_id == curLifeAccountId) {
-        XPageManager.push(
-          XRouterPathConstants.MERCHANT_CENTER,
-          hashMapOf(
-            Pair(MerchantCenterActivity.EXTRA_IS_MULTI, result.size > 1),
-            Pair(MerchantCenterActivity.EXTRA_LIFE_ACCOUNT_INFO, it)
-          )
-        )
+        XPageManager.push(XRouterPathConstants.MERCHANT_CENTER, null)
         XPageManager.pop(null)
       }
     }

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

@@ -2,14 +2,13 @@ package com.yidian.shenghuoquan.bmanagercenter.ui.auth
 
 import android.os.Bundle
 import android.view.View
-import com.yidian.bcommon.constant.XRouterPathConstants
 import com.yidian.bcommon.base.BaseActivity
+import com.yidian.bcommon.bean.LifeAccountItemBean
+import com.yidian.bcommon.constant.XRouterPathConstants
 import com.yidian.shenghuoquan.bmanagercenter.R
 import com.yidian.shenghuoquan.bmanagercenter.databinding.ActivityLifeAccountEnterpriseAuthCompleteBinding
 import com.yidian.shenghuoquan.bmanagercenter.http.ApiService
 import com.yidian.shenghuoquan.bmanagercenter.http.callback.IGetLifeAccountListCallback
-import com.yidian.bcommon.bean.LifeAccountItemBean
-import com.yidian.shenghuoquan.bmanagercenter.ui.center.MerchantCenterActivity
 import com.yidian.xpage.XPageManager
 
 /**
@@ -108,13 +107,7 @@ class LifeAccountEnterpriseAuthCompleteActivity :
     val curLifeAccountId = params?.get(EXTRA_LIFE_ACCOUNT_ID)
     result?.forEach {
       if (it.life_account_id == curLifeAccountId) {
-        XPageManager.push(
-          XRouterPathConstants.MERCHANT_CENTER,
-          hashMapOf(
-            Pair(MerchantCenterActivity.EXTRA_IS_MULTI, result.size > 1),
-            Pair(MerchantCenterActivity.EXTRA_LIFE_ACCOUNT_INFO, it)
-          )
-        )
+        XPageManager.push(XRouterPathConstants.MERCHANT_CENTER, null)
         XPageManager.pop(null)
       }
     }

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

@@ -4,14 +4,13 @@ import android.os.Bundle
 import android.view.View
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
-import com.yidian.bcommon.constant.XRouterPathConstants
 import com.yidian.bcommon.base.BaseActivity
+import com.yidian.bcommon.bean.LifeAccountItemBean
 import com.yidian.bcommon.cardutils.adapter.OnItemClickListener
+import com.yidian.bcommon.constant.XRouterPathConstants
+import com.yidian.bcommon.utils.StorageUtil
 import com.yidian.shenghuoquan.bmanagercenter.adapter.LifeAccountIdentityAdapter
 import com.yidian.shenghuoquan.bmanagercenter.databinding.ActivityLifeAccountIdentityBinding
-import com.yidian.bcommon.bean.LifeAccountItemBean
-import com.yidian.shenghuoquan.bmanagercenter.ui.center.MerchantCenterActivity
-import com.yidian.bcommon.utils.StorageUtil
 import com.yidian.xpage.XPageManager
 
 /**
@@ -75,13 +74,7 @@ class LifeAccountIdentityActivity : BaseActivity<ActivityLifeAccountIdentityBind
     viewBind.tvEnterLifeAccount.setOnClickListener {
       StorageUtil.putLifeAccountId(curSelectedItem.life_account_id)
       // 进入商户管理中心页
-      XPageManager.push(
-        XRouterPathConstants.MERCHANT_CENTER,
-        hashMapOf(
-          Pair(MerchantCenterActivity.EXTRA_LIFE_ACCOUNT_INFO, curSelectedItem),
-          Pair(MerchantCenterActivity.EXTRA_IS_MULTI, true)
-        )
-      )
+      XPageManager.push(XRouterPathConstants.MERCHANT_CENTER, null)
       XPageManager.pop(null)
     }
   }

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

@@ -2,14 +2,13 @@ package com.yidian.shenghuoquan.bmanagercenter.ui.auth
 
 import android.os.Bundle
 import android.view.View
-import com.yidian.bcommon.constant.XRouterPathConstants
 import com.yidian.bcommon.base.BaseActivity
+import com.yidian.bcommon.bean.LifeAccountItemBean
+import com.yidian.bcommon.constant.XRouterPathConstants
 import com.yidian.shenghuoquan.bmanagercenter.R
 import com.yidian.shenghuoquan.bmanagercenter.databinding.ActivityLifeAccountPersonalAuthCompleteBinding
 import com.yidian.shenghuoquan.bmanagercenter.http.ApiService
 import com.yidian.shenghuoquan.bmanagercenter.http.callback.IGetLifeAccountListCallback
-import com.yidian.bcommon.bean.LifeAccountItemBean
-import com.yidian.shenghuoquan.bmanagercenter.ui.center.MerchantCenterActivity
 import com.yidian.xpage.XPageManager
 
 /**
@@ -76,13 +75,7 @@ class LifeAccountPersonalAuthCompleteActivity :
     // 生活号列表请求成功 跳转商户管理中心
     result?.forEach {
       if (it.life_account_id == params?.get(EXTRA_LIFE_ACCOUNT_ID)) {
-        XPageManager.push(
-          XRouterPathConstants.MERCHANT_CENTER,
-          hashMapOf(
-            Pair(MerchantCenterActivity.EXTRA_IS_MULTI, result.size > 1),
-            Pair(MerchantCenterActivity.EXTRA_LIFE_ACCOUNT_INFO, it)
-          )
-        )
+        XPageManager.push(XRouterPathConstants.MERCHANT_CENTER, null)
         XPageManager.pop(null)
       }
     }

Components/BManagerCenter/src/main/manifest/AndroidManifest.xml

@@ -61,6 +61,7 @@
             android:theme="@style/Transparent" />
         <activity
             android:name=".ui.center.MerchantCenterActivity"
+            android:launchMode="singleTask"
             android:theme="@style/Transparent" />
         <activity
             android:name=".ui.center.MerchantInfoActivity"