Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
Y
YDL-Component-Medical
Overview
Overview
Details
Activity
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
杨凯
YDL-Component-Medical
Commits
95cd07bc
Commit
95cd07bc
authored
Mar 17, 2021
by
YKai
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat:m-user组件升级,强绑手机号
parent
dc95577d
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
12 additions
and
6 deletions
+12
-6
config.gradle
config.gradle
+2
-2
MineFragment.java
m-user/src/main/java/com/yidianling/user/mine/MineFragment.java
+0
-1
BindPhoneActivity.kt
m-user/src/main/java/com/yidianling/user/ui/login/BindPhoneActivity.kt
+10
-3
No files found.
config.gradle
View file @
95cd07bc
...
@@ -8,7 +8,7 @@ ext {
...
@@ -8,7 +8,7 @@ ext {
"m-confide"
:
"0.0.48.92"
,
"m-confide"
:
"0.0.48.92"
,
"m-consultant"
:
"0.0.59.65"
,
"m-consultant"
:
"0.0.59.65"
,
"m-fm"
:
"0.0.30.01"
,
"m-fm"
:
"0.0.30.01"
,
"m-user"
:
"0.0.61.1
5
"
,
"m-user"
:
"0.0.61.1
6
"
,
"m-home"
:
"0.0.22.53"
,
"m-home"
:
"0.0.22.53"
,
"m-im"
:
"0.0.18.39"
,
"m-im"
:
"0.0.18.39"
,
"m-dynamic"
:
"0.0.7.19"
,
"m-dynamic"
:
"0.0.7.19"
,
...
@@ -91,7 +91,7 @@ ext {
...
@@ -91,7 +91,7 @@ ext {
"m-confide"
:
"0.0.48.92"
,
"m-confide"
:
"0.0.48.92"
,
"m-consultant"
:
"0.0.59.65"
,
"m-consultant"
:
"0.0.59.65"
,
"m-fm"
:
"0.0.30.01"
,
"m-fm"
:
"0.0.30.01"
,
"m-user"
:
"0.0.61.1
5
"
,
"m-user"
:
"0.0.61.1
6
"
,
"m-home"
:
"0.0.22.54"
,
"m-home"
:
"0.0.22.54"
,
"m-im"
:
"0.0.18.39"
,
"m-im"
:
"0.0.18.39"
,
"m-dynamic"
:
"0.0.7.19"
,
"m-dynamic"
:
"0.0.7.19"
,
...
...
m-user/src/main/java/com/yidianling/user/mine/MineFragment.java
View file @
95cd07bc
...
@@ -45,7 +45,6 @@ import com.yidianling.user.mine.data.AppDataManager;
...
@@ -45,7 +45,6 @@ import com.yidianling.user.mine.data.AppDataManager;
import
com.yidianling.user.mine.http.MineHttpImpl
;
import
com.yidianling.user.mine.http.MineHttpImpl
;
import
com.yidianling.user.safePrivate.PrivacyActivity
;
import
com.yidianling.user.safePrivate.PrivacyActivity
;
import
com.yidianling.user.ui.login.OneKeyLoginHelp
;
import
com.yidianling.user.ui.login.OneKeyLoginHelp
;
import
com.yidianling.user.ui.login.RegisterAndLoginActivity
;
import
org.jetbrains.annotations.NotNull
;
import
org.jetbrains.annotations.NotNull
;
import
org.jetbrains.annotations.Nullable
;
import
org.jetbrains.annotations.Nullable
;
...
...
m-user/src/main/java/com/yidianling/user/ui/login/BindPhoneActivity.kt
View file @
95cd07bc
...
@@ -12,22 +12,25 @@ import android.view.View
...
@@ -12,22 +12,25 @@ import android.view.View
import
com.ydl.ydlcommon.base.BaseActivity
import
com.ydl.ydlcommon.base.BaseActivity
import
com.ydl.ydlcommon.router.YdlCommonOut
import
com.ydl.ydlcommon.router.YdlCommonOut
import
com.ydl.ydlcommon.utils.StatusBarUtils
import
com.ydl.ydlcommon.utils.StatusBarUtils
import
com.ydl.ydlcommon.utils.YDLCacheUtils
import
com.yidianling.common.tools.RxKeyboardTool
import
com.yidianling.common.tools.RxKeyboardTool
import
com.yidianling.common.tools.ToastUtil
import
com.yidianling.common.tools.ToastUtil
import
com.yidianling.user.LoginUtils
import
com.yidianling.user.LoginUtils
import
com.yidianling.user.LoginUtils.logout
import
com.yidianling.user.R
import
com.yidianling.user.R
import
com.yidianling.user.UserHelper
import
com.yidianling.user.UserHelper
import
com.yidianling.user.UserHelper.setUserinfo
import
com.yidianling.user.api.event.RefreshRecentContactListEvent
import
com.yidianling.user.http.LoginApiRequestUtil
import
com.yidianling.user.http.LoginApiRequestUtil
import
com.yidianling.user.http.request.BindPhoneJavaParam
import
com.yidianling.user.http.request.BindPhoneJavaParam
import
com.yidianling.user.route.UserIn.clearImData
import
com.yidianling.user.ui.CountryListActivity
import
com.yidianling.user.ui.CountryListActivity
import
com.yidianling.user.widget.ZDialog
import
com.yidianling.user.widget.ZDialog
import
de.greenrobot.event.EventBus
import
io.reactivex.Observable
import
io.reactivex.Observable
import
io.reactivex.android.schedulers.AndroidSchedulers
import
io.reactivex.android.schedulers.AndroidSchedulers
import
io.reactivex.disposables.Disposable
import
io.reactivex.disposables.Disposable
import
io.reactivex.schedulers.Schedulers
import
io.reactivex.schedulers.Schedulers
import
kotlinx.android.synthetic.main.activity_bind_phone.*
import
kotlinx.android.synthetic.main.activity_bind_phone.*
import
kotlinx.android.synthetic.main.user_activity_verification_code_new.*
import
java.util.concurrent.TimeUnit
import
java.util.concurrent.TimeUnit
class
BindPhoneActivity
:
BaseActivity
()
{
class
BindPhoneActivity
:
BaseActivity
()
{
...
@@ -60,7 +63,11 @@ class BindPhoneActivity : BaseActivity() {
...
@@ -60,7 +63,11 @@ class BindPhoneActivity : BaseActivity() {
iv_back
.
setOnClickListener
{
iv_back
.
setOnClickListener
{
if
(
isForceBindPhone
){
if
(
isForceBindPhone
){
LoginUtils
.
logout
()
//清除UserInfo
setUserinfo
(
null
)
clearImData
()
logout
()
EventBus
.
getDefault
().
post
(
RefreshRecentContactListEvent
())
finish
()
finish
()
}
else
{
}
else
{
LoginUtils
.
loginSuccessOperate
(
this
)
LoginUtils
.
loginSuccessOperate
(
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