Commit 91957321 authored by yinjiacheng's avatar yinjiacheng

update 管理中心页启动flag兼容B&C端

parent ef8d5d3d
...@@ -61,7 +61,6 @@ ...@@ -61,7 +61,6 @@
android:theme="@style/Transparent" /> android:theme="@style/Transparent" />
<activity <activity
android:name="com.yidian.shenghuoquan.bmanagercenter.ui.center.MerchantCenterActivity" android:name="com.yidian.shenghuoquan.bmanagercenter.ui.center.MerchantCenterActivity"
android:launchMode="singleTask"
android:theme="@style/Transparent" /> android:theme="@style/Transparent" />
<activity <activity
android:name="com.yidian.shenghuoquan.bmanagercenter.ui.center.MerchantInfoActivity" android:name="com.yidian.shenghuoquan.bmanagercenter.ui.center.MerchantInfoActivity"
......
...@@ -24,6 +24,8 @@ import com.yidian.bcommon.constant.XRouterPathConstants.Companion.PERSONAL_MY_ST ...@@ -24,6 +24,8 @@ import com.yidian.bcommon.constant.XRouterPathConstants.Companion.PERSONAL_MY_ST
import com.yidian.bcommon.constant.XRouterPathConstants.Companion.PERSONAL_STAFF_INFO import com.yidian.bcommon.constant.XRouterPathConstants.Companion.PERSONAL_STAFF_INFO
import com.yidian.bcommon.constant.XRouterPathConstants.Companion.PERSONAL_STAFF_MANAGE import com.yidian.bcommon.constant.XRouterPathConstants.Companion.PERSONAL_STAFF_MANAGE
import com.yidian.bcommon.constant.XRouterPathConstants.Companion.STORE_MANAGEMENT import com.yidian.bcommon.constant.XRouterPathConstants.Companion.STORE_MANAGEMENT
import com.yidian.bcommon.sdk.ClientType
import com.yidian.bcommon.sdk.JudgeClientUtils
import com.yidian.bcommon.services.ZapServiceNameConstants import com.yidian.bcommon.services.ZapServiceNameConstants
import com.yidian.news.util.ProcessUtil import com.yidian.news.util.ProcessUtil
import com.yidian.nightmode.util.NightModeUtil import com.yidian.nightmode.util.NightModeUtil
...@@ -253,7 +255,13 @@ class BManagerCenterApplication : YdBaseApplication() { ...@@ -253,7 +255,13 @@ class BManagerCenterApplication : YdBaseApplication() {
intent.putExtra(XRouterPathConstants.ParamsKey, params as HashMap) intent.putExtra(XRouterPathConstants.ParamsKey, params as HashMap)
} }
intent.setClass(context, MerchantCenterActivity::class.java) intent.setClass(context, MerchantCenterActivity::class.java)
intent.flags = Intent.FLAG_ACTIVITY_NEW_TASK // 兼容B&C端
if (JudgeClientUtils.judgeClient(packageName) == ClientType.MERCHANT_B) {
intent.flags = Intent.FLAG_ACTIVITY_CLEAR_TASK or Intent.FLAG_ACTIVITY_NEW_TASK
} else {
// 同SingleTask
intent.flags = Intent.FLAG_ACTIVITY_CLEAR_TOP or Intent.FLAG_ACTIVITY_SINGLE_TOP or Intent.FLAG_ACTIVITY_NEW_TASK
}
context.startActivity(intent) context.startActivity(intent)
} }
}), }),
......
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