Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
A
android_goodmoney
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
android
android_goodmoney
Commits
646724d8
Commit
646724d8
authored
Dec 04, 2020
by
mengcuiguang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
账号合并优化
parent
9eb48dbe
Changes
6
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
12 additions
and
11 deletions
+12
-11
AccountMsgBean.java
...in/java/com/mints/goodmoney/mvp/model/AccountMsgBean.java
+2
-2
AccountMergePresenter.kt
...m/mints/goodmoney/mvp/presenters/AccountMergePresenter.kt
+7
-4
AccountMergeView.kt
...in/java/com/mints/goodmoney/mvp/views/AccountMergeView.kt
+1
-1
LoanService.java
...pp/src/main/java/com/mints/goodmoney/net/LoanService.java
+1
-1
AccountMergeActivity.kt
.../com/mints/goodmoney/ui/activitys/AccountMergeActivity.kt
+1
-1
BindWxDialog.kt
.../main/java/com/mints/goodmoney/ui/widgets/BindWxDialog.kt
+0
-2
No files found.
GoodMoney/app/src/main/java/com/mints/goodmoney/mvp/model/AccountMsgBean.java
View file @
646724d8
...
@@ -38,7 +38,7 @@ public class AccountMsgBean implements Serializable {
...
@@ -38,7 +38,7 @@ public class AccountMsgBean implements Serializable {
this
.
wxUser
=
wxUser
;
this
.
wxUser
=
wxUser
;
}
}
public
static
class
MobileUserBean
implements
Serializable
{
public
class
MobileUserBean
implements
Serializable
{
/**
/**
* head : null
* head : null
* contribution : 0
* contribution : 0
...
@@ -94,7 +94,7 @@ public class AccountMsgBean implements Serializable {
...
@@ -94,7 +94,7 @@ public class AccountMsgBean implements Serializable {
}
}
}
}
public
static
class
WxUserBean
implements
Serializable
{
public
class
WxUserBean
implements
Serializable
{
/**
/**
* head : https://thirdwx.qlogo.cn/mmopen/vi_32/zo9QSE4Hgv2M2zGLTyTHyyaM6SKxKkIeJJhU0nxNZxXGAQV0SnBKwqfXkspujZjI23tvgWBJMqlziaq5Cw7r0vg/132
* head : https://thirdwx.qlogo.cn/mmopen/vi_32/zo9QSE4Hgv2M2zGLTyTHyyaM6SKxKkIeJJhU0nxNZxXGAQV0SnBKwqfXkspujZjI23tvgWBJMqlziaq5Cw7r0vg/132
* contribution : 0
* contribution : 0
...
...
GoodMoney/app/src/main/java/com/mints/goodmoney/mvp/presenters/AccountMergePresenter.kt
View file @
646724d8
...
@@ -2,8 +2,10 @@ package com.mints.goodmoney.mvp.presenters
...
@@ -2,8 +2,10 @@ package com.mints.goodmoney.mvp.presenters
import
com.google.gson.JsonObject
import
com.google.gson.JsonObject
import
com.mints.goodmoney.manager.AppHttpManager
import
com.mints.goodmoney.manager.AppHttpManager
import
com.mints.goodmoney.manager.UserManager
import
com.mints.goodmoney.mvp.model.AccountMsgBean
import
com.mints.goodmoney.mvp.model.AccountMsgBean
import
com.mints.goodmoney.mvp.model.BaseResponse
import
com.mints.goodmoney.mvp.model.BaseResponse
import
com.mints.goodmoney.mvp.model.UserBean
import
com.mints.goodmoney.mvp.views.AccountMergeView
import
com.mints.goodmoney.mvp.views.AccountMergeView
import
com.mints.library.net.neterror.BaseSubscriber
import
com.mints.library.net.neterror.BaseSubscriber
import
com.mints.library.net.neterror.Throwable
import
com.mints.library.net.neterror.Throwable
...
@@ -51,19 +53,20 @@ class AccountMergePresenter : BasePresenter<AccountMergeView>() {
...
@@ -51,19 +53,20 @@ class AccountMergePresenter : BasePresenter<AccountMergeView>() {
vo
[
"saveType"
]
=
saveType
vo
[
"saveType"
]
=
saveType
AppHttpManager
.
getInstance
(
loanApplication
)
AppHttpManager
.
getInstance
(
loanApplication
)
.
call
(
loanService
.
toKeepAccount
(
vo
),
.
call
(
loanService
.
toKeepAccount
(
vo
),
object
:
BaseSubscriber
<
BaseResponse
<
JsonObject
>>()
{
object
:
BaseSubscriber
<
BaseResponse
<
UserBean
>>()
{
override
fun
onCompleted
()
{
override
fun
onCompleted
()
{
}
}
override
fun
onError
(
e
:
Throwable
)
{
override
fun
onError
(
e
:
Throwable
)
{
}
}
override
fun
onNext
(
baseResponse
:
BaseResponse
<
JsonObject
>)
{
override
fun
onNext
(
baseResponse
:
BaseResponse
<
UserBean
>)
{
val
code
=
baseResponse
.
status
val
code
=
baseResponse
.
status
val
message
=
baseResponse
.
message
val
message
=
baseResponse
.
message
when
(
code
)
{
when
(
code
)
{
200
->
{
200
->
if
(
baseResponse
.
data
!=
null
)
{
view
.
toKeepAccountSuc
(
saveType
)
UserManager
.
getInstance
().
saveUserInfo
(
baseResponse
.
data
)
view
.
toKeepAccountSuc
()
}
}
else
->
{
else
->
{
view
.
showToast
(
message
)
view
.
showToast
(
message
)
...
...
GoodMoney/app/src/main/java/com/mints/goodmoney/mvp/views/AccountMergeView.kt
View file @
646724d8
...
@@ -7,7 +7,7 @@ interface AccountMergeView : BaseView {
...
@@ -7,7 +7,7 @@ interface AccountMergeView : BaseView {
fun
getKeepAccountMsgSuc
(
data
:
AccountMsgBean
)
fun
getKeepAccountMsgSuc
(
data
:
AccountMsgBean
)
fun
getKeepAccountMsgFail
()
fun
getKeepAccountMsgFail
()
fun
toKeepAccountSuc
(
saveType
:
Int
)
fun
toKeepAccountSuc
()
fun
toKeepAccountFail
()
fun
toKeepAccountFail
()
}
}
\ No newline at end of file
GoodMoney/app/src/main/java/com/mints/goodmoney/net/LoanService.java
View file @
646724d8
...
@@ -426,7 +426,7 @@ public interface LoanService {
...
@@ -426,7 +426,7 @@ public interface LoanService {
* @return
* @return
*/
*/
@POST
(
"api/toKeepAccount"
)
@POST
(
"api/toKeepAccount"
)
Observable
<
BaseResponse
<
Object
>>
toKeepAccount
(
@Body
Map
<
String
,
Object
>
vo
);
Observable
<
BaseResponse
<
UserBean
>>
toKeepAccount
(
@Body
Map
<
String
,
Object
>
vo
);
/**
/**
...
...
GoodMoney/app/src/main/java/com/mints/goodmoney/ui/activitys/AccountMergeActivity.kt
View file @
646724d8
...
@@ -138,7 +138,7 @@ class AccountMergeActivity : BaseActivity(), View.OnClickListener, AccountMergeV
...
@@ -138,7 +138,7 @@ class AccountMergeActivity : BaseActivity(), View.OnClickListener, AccountMergeV
override
fun
getKeepAccountMsgFail
()
{}
override
fun
getKeepAccountMsgFail
()
{}
override
fun
toKeepAccountSuc
(
saveType
:
Int
)
{
override
fun
toKeepAccountSuc
()
{
showToast
(
"账号合并成功!"
)
showToast
(
"账号合并成功!"
)
...
...
GoodMoney/app/src/main/java/com/mints/goodmoney/ui/widgets/BindWxDialog.kt
View file @
646724d8
...
@@ -113,8 +113,6 @@ class BindWxDialog(context: Activity) :
...
@@ -113,8 +113,6 @@ class BindWxDialog(context: Activity) :
bundle
.
putString
(
Constant
.
MERGE_WXOPENID
,
wxOpenId
)
bundle
.
putString
(
Constant
.
MERGE_WXOPENID
,
wxOpenId
)
bundle
.
putString
(
Constant
.
MERGE_KEY
,
key
)
bundle
.
putString
(
Constant
.
MERGE_KEY
,
key
)
readyGo
(
AccountMergeActivity
::
class
.
java
,
bundle
)
readyGo
(
AccountMergeActivity
::
class
.
java
,
bundle
)
dismiss
()
}
}
protected
fun
readyGo
(
clazz
:
Class
<
*
>?,
bundle
:
Bundle
?)
{
protected
fun
readyGo
(
clazz
:
Class
<
*
>?,
bundle
:
Bundle
?)
{
...
...
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