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
ea6c823d
Commit
ea6c823d
authored
Jul 21, 2021
by
yinjiacheng
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
update 页面路由名称修改
parent
de378f93
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
16 additions
and
16 deletions
+16
-16
XRouterPathConstants.kt
.../src/main/java/com/yidian/bcommon/XRouterPathConstants.kt
+4
-4
NewsContentApplication.kt
...an/shenghuoquan/newscontent/app/NewsContentApplication.kt
+5
-5
MerchantAuthInfoActivity.kt
...huoquan/newscontent/ui/center/MerchantAuthInfoActivity.kt
+1
-1
MerchantAuthManagementActivity.kt
...n/newscontent/ui/center/MerchantAuthManagementActivity.kt
+2
-2
MerchantCenterActivity.kt
...nghuoquan/newscontent/ui/center/MerchantCenterActivity.kt
+2
-2
MerchantInfoActivity.kt
...henghuoquan/newscontent/ui/center/MerchantInfoActivity.kt
+2
-2
No files found.
CommonLib/BCommon/src/main/java/com/yidian/bcommon/XRouterPathConstants.kt
View file @
ea6c823d
...
...
@@ -44,9 +44,9 @@ class XRouterPathConstants {
const
val
LIFE_ACCOUNT_IDENTITY
=
"/b/manager_center/life_account_identity"
// 管理中心 - 认证管理
const
val
MERCHANT_AUTH_MANAGEMENT
=
"/b/manager_center/merchantAuthM
anagement"
const
val
AUTH_MANAGEMENT
=
"/b/manager_center/auth_m
anagement"
// 管理中心 - 生活号认证
// 管理中心 - 生活号认证
选择
const
val
LIFE_ACCOUNT_AUTH
=
"/b/manager_center/life_account_auth"
// 管理中心 - 生活号个人认证
...
...
@@ -89,13 +89,13 @@ class XRouterPathConstants {
const
val
PERSONAL_ADD_STAFF
=
"/b/manager_center/add_staff"
// 商户基本信息
const
val
MERCHANT_INFO
=
"/b/manager_center/mercha
nt_info"
const
val
LIFE_ACCOUNT_INFO
=
"/b/manager_center/life_accou
nt_info"
// 生活号修改名称
const
val
LIFE_ACCOUNT_MODIFY_NAME
=
"/b/manager_center/life_account_modify_name"
// 商户认证信息
const
val
MERCHANT_AUTH_INFO
=
"/b/manager_center/mercha
nt_auth_info"
const
val
LIFE_ACCOUNT_AUTH_INFO
=
"/b/manager_center/life_accou
nt_auth_info"
// 钱包 —— 我的钱包
const
val
MY_WALLET
=
"/b/manager_center/my_wallet"
...
...
Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/app/NewsContentApplication.kt
View file @
ea6c823d
...
...
@@ -7,19 +7,19 @@ import com.yidian.bcommon.XRouterPathConstants.Companion.CHOOSE_STORE_ACTIVITY
import
com.yidian.bcommon.XRouterPathConstants.Companion.FLASH
import
com.yidian.bcommon.XRouterPathConstants.Companion.ID_CARD_TEST
import
com.yidian.bcommon.XRouterPathConstants.Companion.LIFE_ACCOUNT_AUTH
import
com.yidian.bcommon.XRouterPathConstants.Companion.LIFE_ACCOUNT_AUTH_INFO
import
com.yidian.bcommon.XRouterPathConstants.Companion.LIFE_ACCOUNT_CREATE
import
com.yidian.bcommon.XRouterPathConstants.Companion.LIFE_ACCOUNT_CREATE_COMPLETE
import
com.yidian.bcommon.XRouterPathConstants.Companion.LIFE_ACCOUNT_ENTERPRISE_AUTH
import
com.yidian.bcommon.XRouterPathConstants.Companion.LIFE_ACCOUNT_ENTERPRISE_AUTH_COMPLETE
import
com.yidian.bcommon.XRouterPathConstants.Companion.LIFE_ACCOUNT_ENTERPRISE_CERTIFICATION
import
com.yidian.bcommon.XRouterPathConstants.Companion.LIFE_ACCOUNT_IDENTITY
import
com.yidian.bcommon.XRouterPathConstants.Companion.LIFE_ACCOUNT_INFO
import
com.yidian.bcommon.XRouterPathConstants.Companion.LIFE_ACCOUNT_MODIFY_NAME
import
com.yidian.bcommon.XRouterPathConstants.Companion.LIFE_ACCOUNT_PERSONAL_AUTH
import
com.yidian.bcommon.XRouterPathConstants.Companion.LIFE_ACCOUNT_PERSONAL_AUTH_COMPLETE
import
com.yidian.bcommon.XRouterPathConstants.Companion.LOGIN_LIFE_CIRCLE
import
com.yidian.bcommon.XRouterPathConstants.Companion.MERCHANT_AUTH_INFO
import
com.yidian.bcommon.XRouterPathConstants.Companion.MERCHANT_CENTER
import
com.yidian.bcommon.XRouterPathConstants.Companion.MERCHANT_INFO
import
com.yidian.bcommon.XRouterPathConstants.Companion.NEWS_CONTENT
import
com.yidian.bcommon.XRouterPathConstants.Companion.PERSONAL_ADD_STAFF
import
com.yidian.bcommon.XRouterPathConstants.Companion.PERSONAL_MANAGER_CHANGE
...
...
@@ -371,7 +371,7 @@ class NewsContentApplication : YdBaseApplication() {
context
.
startActivity
(
intent
)
}
}),
XPageNode
(
MERCHA
NT_INFO
,
XPageNodePageType
.
NATIVE
,
object
:
XPageHandler
{
XPageNode
(
LIFE_ACCOU
NT_INFO
,
XPageNodePageType
.
NATIVE
,
object
:
XPageHandler
{
override
fun
handler
(
params
:
Map
<
String
,
Any
?
>?)
{
val
intent
=
Intent
()
if
(
params
!=
null
)
{
...
...
@@ -393,7 +393,7 @@ class NewsContentApplication : YdBaseApplication() {
context
.
startActivity
(
intent
)
}
}),
XPageNode
(
MERCHA
NT_AUTH_INFO
,
XPageNodePageType
.
NATIVE
,
object
:
XPageHandler
{
XPageNode
(
LIFE_ACCOU
NT_AUTH_INFO
,
XPageNodePageType
.
NATIVE
,
object
:
XPageHandler
{
override
fun
handler
(
params
:
Map
<
String
,
Any
?
>?)
{
val
intent
=
Intent
()
if
(
params
!=
null
)
{
...
...
@@ -470,7 +470,7 @@ class NewsContentApplication : YdBaseApplication() {
context
.
startActivity
(
intent
)
}
}),
XPageNode
(
XRouterPathConstants
.
Companion
.
MERCHANT_
AUTH_MANAGEMENT
,
XPageNodePageType
.
NATIVE
,
object
:
XPageHandler
{
XPageNode
(
XRouterPathConstants
.
Companion
.
AUTH_MANAGEMENT
,
XPageNodePageType
.
NATIVE
,
object
:
XPageHandler
{
override
fun
handler
(
params
:
Map
<
String
,
Any
?
>?)
{
val
intent
=
Intent
()
if
(
params
!=
null
)
{
...
...
Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/ui/center/MerchantAuthInfoActivity.kt
View file @
ea6c823d
...
...
@@ -37,7 +37,7 @@ class MerchantAuthInfoActivity : BaseActivity<ActivityMerchantAuthInfoBinding>()
}
override
fun
getXPageName
():
String
{
return
XRouterPathConstants
.
MERCHA
NT_AUTH_INFO
return
XRouterPathConstants
.
LIFE_ACCOU
NT_AUTH_INFO
}
override
fun
init
(
savedInstanceState
:
Bundle
?)
{
...
...
Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/ui/center/MerchantAuthManagementActivity.kt
View file @
ea6c823d
...
...
@@ -72,12 +72,12 @@ class MerchantAuthManagementActivity : Activity(), XPageViewProtocol, IGetLifeAc
}
override
fun
getXPageName
():
String
{
return
XRouterPathConstants
.
MERCHANT_
AUTH_MANAGEMENT
return
XRouterPathConstants
.
AUTH_MANAGEMENT
}
override
fun
getLifeAccountInfoByIdSuccess
(
result
:
GetLifeAccountInfoByIdBean
.
Response
?)
{
// 跳转认证信息详情页
XPageManager
.
push
(
XRouterPathConstants
.
MERCHA
NT_AUTH_INFO
,
hashMapOf
(
Pair
(
MerchantAuthInfoActivity
.
EXTRA_LIFE_ACCOUNT_INFO
,
result
)))
XPageManager
.
push
(
XRouterPathConstants
.
LIFE_ACCOU
NT_AUTH_INFO
,
hashMapOf
(
Pair
(
MerchantAuthInfoActivity
.
EXTRA_LIFE_ACCOUNT_INFO
,
result
)))
finish
()
}
...
...
Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/ui/center/MerchantCenterActivity.kt
View file @
ea6c823d
...
...
@@ -214,7 +214,7 @@ class MerchantCenterActivity : BaseActivity<ActivityMerchantCenterBinding>(), Me
// 其他服务-系统设置
functionPageMap
[
data
[
2
].
functions
[
3
].
functionId
]
=
XRouterPathConstants
.
SYSTEM_SETTING
// 其他服务-认证管理
functionPageMap
[
data
[
2
].
functions
[
4
].
functionId
]
=
XRouterPathConstants
.
MERCHANT_
AUTH_MANAGEMENT
functionPageMap
[
data
[
2
].
functions
[
4
].
functionId
]
=
XRouterPathConstants
.
AUTH_MANAGEMENT
}
/**
...
...
@@ -391,7 +391,7 @@ class MerchantCenterActivity : BaseActivity<ActivityMerchantCenterBinding>(), Me
override
fun
getLifeAccountInfoByIdSuccess
(
result
:
GetLifeAccountInfoByIdBean
.
Response
?)
{
// 跳转生活号基本信息
XPageManager
.
push
(
XRouterPathConstants
.
MERCHA
NT_INFO
,
XRouterPathConstants
.
LIFE_ACCOU
NT_INFO
,
hashMapOf
(
Pair
(
MerchantInfoActivity
.
EXTRA_LIFE_ACCOUNT_INFO
,
result
))
)
}
...
...
Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/ui/center/MerchantInfoActivity.kt
View file @
ea6c823d
...
...
@@ -55,7 +55,7 @@ class MerchantInfoActivity : BaseActivity<ActivityMerchantInfoBinding>(), Mercha
}
override
fun
getXPageName
():
String
{
return
XRouterPathConstants
.
MERCHA
NT_INFO
return
XRouterPathConstants
.
LIFE_ACCOU
NT_INFO
}
override
fun
onDestroy
()
{
...
...
@@ -149,7 +149,7 @@ class MerchantInfoActivity : BaseActivity<ActivityMerchantInfoBinding>(), Mercha
}
else
if
(
from
==
viewBind
.
ivLifeAccountAuth
)
{
// 跳转认证详情页
XPageManager
.
push
(
XRouterPathConstants
.
MERCHA
NT_AUTH_INFO
,
XRouterPathConstants
.
LIFE_ACCOU
NT_AUTH_INFO
,
hashMapOf
(
Pair
(
MerchantAuthInfoActivity
.
EXTRA_LIFE_ACCOUNT_INFO
,
lifeAccountInfo
))
)
}
...
...
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