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
ec83efc6
Commit
ec83efc6
authored
Jul 19, 2021
by
yinjiacheng
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix 商户认证管理页面XPageManager.pop异常
parent
30f60a44
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
4 deletions
+3
-4
MerchantAuthManagementActivity.kt
...n/newscontent/ui/center/MerchantAuthManagementActivity.kt
+3
-3
FeedbackActivity.kt
...n/shenghuoquan/newscontent/ui/setting/FeedbackActivity.kt
+0
-1
No files found.
Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/ui/center/MerchantAuthManagementActivity.kt
View file @
ec83efc6
...
@@ -57,7 +57,7 @@ class MerchantAuthManagementActivity : Activity(), XPageViewProtocol, IGetLifeAc
...
@@ -57,7 +57,7 @@ class MerchantAuthManagementActivity : Activity(), XPageViewProtocol, IGetLifeAc
XRouterPathConstants
.
LIFE_ACCOUNT_AUTH
,
XRouterPathConstants
.
LIFE_ACCOUNT_AUTH
,
hashMapOf
(
Pair
(
LifeAccountAuthActivity
.
EXTRA_PAGE_FROM
,
LifeAccountAuthActivity
.
FROM_AUTH
))
hashMapOf
(
Pair
(
LifeAccountAuthActivity
.
EXTRA_PAGE_FROM
,
LifeAccountAuthActivity
.
FROM_AUTH
))
)
)
XPageManager
.
pop
(
null
)
finish
(
)
}
}
Constant
.
LIFE_ACCOUNT_TAG_AUTH_REJECT
->
{
Constant
.
LIFE_ACCOUNT_TAG_AUTH_REJECT
->
{
// 认证驳回 请求企业认证信息
// 认证驳回 请求企业认证信息
...
@@ -78,7 +78,7 @@ class MerchantAuthManagementActivity : Activity(), XPageViewProtocol, IGetLifeAc
...
@@ -78,7 +78,7 @@ class MerchantAuthManagementActivity : Activity(), XPageViewProtocol, IGetLifeAc
override
fun
getLifeAccountInfoByIdSuccess
(
result
:
GetLifeAccountInfoByIdBean
.
Response
?)
{
override
fun
getLifeAccountInfoByIdSuccess
(
result
:
GetLifeAccountInfoByIdBean
.
Response
?)
{
// 跳转认证信息详情页
// 跳转认证信息详情页
XPageManager
.
push
(
XRouterPathConstants
.
MERCHANT_AUTH_INFO
,
hashMapOf
(
Pair
(
MerchantAuthInfoActivity
.
EXTRA_LIFE_ACCOUNT_INFO
,
result
)))
XPageManager
.
push
(
XRouterPathConstants
.
MERCHANT_AUTH_INFO
,
hashMapOf
(
Pair
(
MerchantAuthInfoActivity
.
EXTRA_LIFE_ACCOUNT_INFO
,
result
)))
XPageManager
.
pop
(
null
)
finish
(
)
}
}
override
fun
getLifeAccountInfoByIdFailure
(
message
:
String
?)
{
override
fun
getLifeAccountInfoByIdFailure
(
message
:
String
?)
{
...
@@ -95,7 +95,7 @@ class MerchantAuthManagementActivity : Activity(), XPageViewProtocol, IGetLifeAc
...
@@ -95,7 +95,7 @@ class MerchantAuthManagementActivity : Activity(), XPageViewProtocol, IGetLifeAc
Pair
(
LifeAccountEnterpriseAuthActivity
.
EXTRA_IS_AUTH_MODIFY
,
true
)
Pair
(
LifeAccountEnterpriseAuthActivity
.
EXTRA_IS_AUTH_MODIFY
,
true
)
)
)
)
)
XPageManager
.
pop
(
null
)
finish
(
)
}
}
override
fun
authMerchantCheckFailure
(
message
:
String
?)
{
override
fun
authMerchantCheckFailure
(
message
:
String
?)
{
...
...
Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/ui/setting/FeedbackActivity.kt
View file @
ec83efc6
...
@@ -42,7 +42,6 @@ class FeedbackActivity : BaseMvvmActivity<ActivityFeedbackBinding, FeedbackViewM
...
@@ -42,7 +42,6 @@ class FeedbackActivity : BaseMvvmActivity<ActivityFeedbackBinding, FeedbackViewM
private
fun
subscribeData
()
{
private
fun
subscribeData
()
{
vm
.
commitSuccessEvent
.
observe
(
this
,
{
vm
.
commitSuccessEvent
.
observe
(
this
,
{
ToastUtils
.
showShort
(
"提交成功"
)
ToastUtils
.
showShort
(
"提交成功"
)
// TODO: 7/17/21 排查XPageManager.pop(null)存在失效情况
finish
()
finish
()
})
})
vm
.
commitFailureEvent
.
observe
(
this
,
{
vm
.
commitFailureEvent
.
observe
(
this
,
{
...
...
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