From 7804ce8edeba51418b5fde2d306e5f476dfb5993 Mon Sep 17 00:00:00 2001
From: 18034727885 <973609879@qq.com>
Date: 星期三, 18 三月 2026 10:03:22 +0800
Subject: [PATCH] 合并最新代码
---
app/src/main/java/com/driver/igotrip/ui/pub/ForgetPwdActivity.kt | 21 +++++++++++++++++++--
1 files changed, 19 insertions(+), 2 deletions(-)
diff --git a/app/src/main/java/com/driver/igotrip/ui/pub/ForgetPwdActivity.kt b/app/src/main/java/com/driver/igotrip/ui/pub/ForgetPwdActivity.kt
index df653c5..0381009 100644
--- a/app/src/main/java/com/driver/igotrip/ui/pub/ForgetPwdActivity.kt
+++ b/app/src/main/java/com/driver/igotrip/ui/pub/ForgetPwdActivity.kt
@@ -1,9 +1,12 @@
package com.driver.igotrip.ui.pub
+import android.app.Activity
+import android.content.Intent
import android.widget.EditText
import android.widget.ImageView
import android.widget.TextView
import cn.sinata.xldutils.utils.clickDelay
+import cn.sinata.xldutils.utils.getAreaCode
import cn.sinata.xldutils.utils.getString
import com.driver.emanagercar.ui.base.Local.BaseLoginActivity
import com.driver.igotrip.R
@@ -15,11 +18,13 @@
import com.driver.igotrip.netUtls.getMapByAny
import com.driver.igotrip.utils.PhoneCheckUtil
import org.jetbrains.anko.find
+import org.jetbrains.anko.startActivityForResult
import org.jetbrains.anko.toast
class ForgetPwdActivity: BaseLoginActivity() {
var first = false
+ private val areaCode by lazy { find<TextView>(R.id.areaCode) }
private val et_login_code_send by lazy { find<TextView>(R.id.et_login_code_send) }
private val tv_hint_phone by lazy { find<TextView>(R.id.tv_hint_phone) }
private val et_login_pwd by lazy { find<EditText>(R.id.et_login_pwd) }
@@ -73,6 +78,9 @@
}
override fun setOnclick() {
+ areaCode.setOnClickListener {
+ startActivityForResult<AreaCodeActivity>(10086)
+ }
et_login_code_send.clickDelay {
if (et_login_phone.getString().isEmpty()){
toast(getString(R.string.请输入手机号))
@@ -83,7 +91,7 @@
return@clickDelay
}
var map = getMapByAny()
- map["phone"] = et_login_phone.getString()
+ map["phone"] = areaCode.getAreaCode() + et_login_phone.getString()
map["type"] =4
callNet(Api.queryCaptcha,map){
toast(getString(R.string.发送成功))
@@ -119,7 +127,7 @@
var map = getMapByAny()
map["code"] = et_login_code.getString()
- map["phone"] = et_login_phone.getString()
+ map["phone"] = areaCode.getAreaCode() + et_login_phone.getString()
callNet(Api.checkCaptcha,map){
map["password"] = et_login_pwd.getString()
callNet(Api.resetPassword,map){
@@ -129,4 +137,13 @@
}
}
}
+
+ override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
+ super.onActivityResult(requestCode, resultCode, data)
+ if (resultCode == Activity.RESULT_OK && requestCode == 10086) {
+ data?.getStringExtra("code")?.let {
+ areaCode.text = it
+ }
+ }
+ }
}
\ No newline at end of file
--
Gitblit v1.7.1