From 237bd0e7494cb73bc351b2e6002831fa593eec4c Mon Sep 17 00:00:00 2001
From: 18034727885 <973609879@qq.com>
Date: 星期五, 07 八月 2026 14:17:58 +0800
Subject: [PATCH] 修复问题
---
app/src/main/java/com/igo/user/ui/mine/VerifyPhoneForUpdatePwdActivity.kt | 69 +++++++++++++++++-----------------
1 files changed, 35 insertions(+), 34 deletions(-)
diff --git a/app/src/main/java/com/igo/user/ui/mine/VerifyPhoneForUpdatePwdActivity.kt b/app/src/main/java/com/igo/user/ui/mine/VerifyPhoneForUpdatePwdActivity.kt
index 07d6549..2a3b0f4 100644
--- a/app/src/main/java/com/igo/user/ui/mine/VerifyPhoneForUpdatePwdActivity.kt
+++ b/app/src/main/java/com/igo/user/ui/mine/VerifyPhoneForUpdatePwdActivity.kt
@@ -5,28 +5,27 @@
import android.widget.EditText
import android.widget.TextView
import androidx.activity.viewModels
-import androidx.core.os.bundleOf
import androidx.lifecycle.lifecycleScope
import cn.sinata.xldutils.utils.hidePhone
import cn.sinata.xldutils.utils.myToast
import cn.sinata.xldutils.utils.optInt
-import com.google.recaptcha.sample.RecaptchaVisual
import com.google.recaptcha.sample.RecaptchaVisualException
import com.igo.user.IGoApplication
-import com.igo.user.IGoApplication.Companion
import com.igo.user.R
-import com.igo.user.dialog.ImageCodeDialog
+import com.igo.user.extension.extIsEmptyOrNull
import com.igo.user.network.HttpManager
import com.igo.user.network.request
import com.igo.user.ui.TransparentStatusBarActivity
-import com.igo.user.ui.login.LoginActivity.Companion.BASE_URL
-import com.igo.user.ui.login.LoginActivity.Companion.WEB_SITE_KEY
import kotlinx.coroutines.launch
import org.jetbrains.anko.find
import org.jetbrains.anko.sdk27.coroutines.onClick
import org.jetbrains.anko.startActivity
class VerifyPhoneForUpdatePwdActivity : TransparentStatusBarActivity() {
+ private val title by lazy {
+ intent.getStringExtra("title")
+ }
+
override fun setContentView() = R.layout.activity_verify_phone_for_pwd
private val tv_get_code by lazy { find<TextView>(R.id.tv_get_code) }
@@ -34,7 +33,8 @@
private val tv_phone by lazy { find<TextView>(R.id.tv_phone) }
private val et_code by lazy { find<EditText>(R.id.et_code) }
private val viewModel: MainActivityViewModel by viewModels()
-// private lateinit var recaptcha: RecaptchaVisual
+
+ // private lateinit var recaptcha: RecaptchaVisual
private val countDownTimer = object : CountDownTimer(60 * 1000, 1000) {
override fun onFinish() {
tv_get_code.text = getString(R.string.重新获取)
@@ -42,11 +42,11 @@
}
override fun onTick(millisUntilFinished: Long) {
- tv_get_code.text = getString(R.string.sms_code_countdown,millisUntilFinished / 1000)
+ tv_get_code.text = getString(R.string.sms_code_countdown, millisUntilFinished / 1000)
}
}
private val phone by lazy {
- intent.getStringExtra("phone")?:""
+ intent.getStringExtra("phone") ?: ""
}
override fun initClick() {
@@ -58,21 +58,22 @@
if (s.length != 4) {
myToast(getString(R.string.验证码输入有误))
} else {
- HttpManager.checkCode(s,phone).request(this@VerifyPhoneForUpdatePwdActivity){ _, data->
- if (data?.optInt("ok") == 1){
- startActivity<ChangePwdActivity>("phone" to phone)
- finish()
- }else{
- myToast(getString(R.string.验证码输入有误))
+ HttpManager.checkCode(s, phone)
+ .request(this@VerifyPhoneForUpdatePwdActivity) { _, data ->
+ if (data?.optInt("ok") == 1) {
+ startActivity<ChangePwdActivity>("phone" to phone)
+ finish()
+ } else {
+ myToast(getString(R.string.验证码输入有误))
+ }
}
- }
}
}
}
override fun initView() {
- title = getString(R.string.set_pwd)
- tv_phone.text = getString(R.string.设置密码需先验证您的手机号,phone.hidePhone())
+ setTitle(title.extIsEmptyOrNull { getString(R.string.set_pwd) })
+ tv_phone.text = getString(R.string.设置密码需先验证您的手机号, phone.hidePhone())
// recaptcha = RecaptchaVisual(supportFragmentManager, WEB_SITE_KEY, BASE_URL)
}
@@ -83,7 +84,7 @@
val token = ""
viewModel.onLoginButtonClicked(token)
- HttpManager.sendSms(IGoApplication.phone, "", 4,token).request(
+ HttpManager.sendSms(IGoApplication.phone, "", 4, token).request(
this@VerifyPhoneForUpdatePwdActivity,
success = { _, _ ->
myToast(getString(R.string.发送成功))
@@ -97,21 +98,21 @@
}
}
- /* val imageCodeDialog = ImageCodeDialog()
- imageCodeDialog.arguments = bundleOf("phone" to phone)
+ /* val imageCodeDialog = ImageCodeDialog()
+ imageCodeDialog.arguments = bundleOf("phone" to phone)
- imageCodeDialog.setCallback(object : ImageCodeDialog.Callback{
- override fun onOk(code: String) {
- showDialog()
- tv_get_code.isEnabled = false
- HttpManager.sendSms(phone,code,4).request(this@VerifyPhoneForUpdatePwdActivity,success = { msg, _ ->
- myToast(getString(R.string.发送成功))
- countDownTimer.start()
- }){_,_->
- tv_get_code.isEnabled = true
- }
- }
- })
- imageCodeDialog.show(supportFragmentManager,"code")*/
+ imageCodeDialog.setCallback(object : ImageCodeDialog.Callback{
+ override fun onOk(code: String) {
+ showDialog()
+ tv_get_code.isEnabled = false
+ HttpManager.sendSms(phone,code,4).request(this@VerifyPhoneForUpdatePwdActivity,success = { msg, _ ->
+ myToast(getString(R.string.发送成功))
+ countDownTimer.start()
+ }){_,_->
+ tv_get_code.isEnabled = true
+ }
+ }
+ })
+ imageCodeDialog.show(supportFragmentManager,"code")*/
}
}
\ No newline at end of file
--
Gitblit v1.7.1