Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
S
ShenghuoquanBusiness
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
bp
ShenghuoquanBusiness
Commits
91957321
Commit
91957321
authored
Jul 30, 2021
by
yinjiacheng
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
update 管理中心页启动flag兼容B&C端
parent
ef8d5d3d
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
2 deletions
+9
-2
AndroidManifest.xml
Components/BManagerCenter/src/main/AndroidManifest.xml
+0
-1
BManagerCenterApplication.kt
...nghuoquan/bmanagercenter/app/BManagerCenterApplication.kt
+9
-1
No files found.
Components/BManagerCenter/src/main/AndroidManifest.xml
View file @
91957321
...
...
@@ -61,7 +61,6 @@
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
View file @
91957321
...
...
@@ -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_MANAGE
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.news.util.ProcessUtil
import
com.yidian.nightmode.util.NightModeUtil
...
...
@@ -253,7 +255,13 @@ class BManagerCenterApplication : YdBaseApplication() {
intent
.
putExtra
(
XRouterPathConstants
.
ParamsKey
,
params
as
HashMap
)
}
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
)
}
}),
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment