Commit 95cd07bc by YKai

feat:m-user组件升级,强绑手机号

parent dc95577d
...@@ -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.15", "m-user" : "0.0.61.16",
"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.15", "m-user" : "0.0.61.16",
"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",
......
...@@ -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;
......
...@@ -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)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment