Commit 9cd6b5c6 authored by 王雪伟's avatar 王雪伟

[提交人]:王雪伟

[提交简述] :修改测试登录方式
[实现方案] :
parent d2cec167
...@@ -49,6 +49,8 @@ class LoginBeforeActivity : BaseActivity() { ...@@ -49,6 +49,8 @@ class LoginBeforeActivity : BaseActivity() {
id_tv_google_login?.setOnClickListener { id_tv_google_login?.setOnClickListener {
imLogin()
return@setOnClickListener
EventUtils.onEvent("googleLoginClick") EventUtils.onEvent("googleLoginClick")
mLoading?.setLoading(getString(R.string.wait_ing)) mLoading?.setLoading(getString(R.string.wait_ing))
mLoading?.show() mLoading?.show()
...@@ -70,6 +72,8 @@ class LoginBeforeActivity : BaseActivity() { ...@@ -70,6 +72,8 @@ class LoginBeforeActivity : BaseActivity() {
} }
id_tv_facebook_login?.setOnClickListener { id_tv_facebook_login?.setOnClickListener {
imLogin()
return@setOnClickListener
EventUtils.onEvent("facebookLoginClick") EventUtils.onEvent("facebookLoginClick")
mLoading?.setLoading(getString(R.string.wait_ing)) mLoading?.setLoading(getString(R.string.wait_ing))
mLoading?.show() mLoading?.show()
...@@ -172,31 +176,31 @@ class LoginBeforeActivity : BaseActivity() { ...@@ -172,31 +176,31 @@ class LoginBeforeActivity : BaseActivity() {
} }
private fun imLogin(){ private fun imLogin(){
UserDataUtils.updateUserInfo(AdCallback { _, _ -> // UserDataUtils.updateUserInfo(AdCallback { _, _ ->
JumpUtils.activityJump( // JumpUtils.activityJump(
RounterBus.getRounter(RounterApi::class.java).getIntentActivityMain() // RounterBus.getRounter(RounterApi::class.java).getIntentActivityMain()
) // )
finish() // finish()
}) // })
// ApiClient.userInfoAPi.deviceLogin().compose(RxSchedulers.observableIO2Main()) ApiClient.userInfoAPi.deviceLogin().compose(RxSchedulers.observableIO2Main())
// .subscribe(object : BaseObserver<UserInfo>() { .subscribe(object : BaseObserver<UserInfo>() {
// override fun onSuccess(result: UserInfo) { override fun onSuccess(result: UserInfo) {
// val token = result.token val token = result.token
// SettingPreference.saveToken(token) SettingPreference.saveToken(token)
// UserDataUtils.updateUserInfo(AdCallback { _, _ -> UserDataUtils.updateUserInfo(AdCallback { _, _ ->
// JumpUtils.activityJump( JumpUtils.activityJump(
// RounterBus.getRounter(RounterApi::class.java).getIntentActivityMain() RounterBus.getRounter(RounterApi::class.java).getIntentActivityMain()
// ) )
// finish() finish()
// }) })
// } }
//
// override fun onFailure(e: Throwable, code: String, errorMsg: String) { override fun onFailure(e: Throwable, code: String, errorMsg: String) {
// SettingPreference.saveToken("") SettingPreference.saveToken("")
// SettingPreference.saveUserInfo(null) SettingPreference.saveUserInfo(null)
//
// } }
// }) })
} }
} }
\ No newline at end of file
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