合并最新代码

18034727885

2026-03-18 7804ce8edeba51418b5fde2d306e5f476dfb5993

 app/src/main/java/com/driver/igotrip/ui/mine/ChangePhoneOneActivity.kt

@@ -1,12 +1,15 @@
package com.driver.igotrip.ui.mine

import android.annotation.SuppressLint
import android.app.Activity
import android.content.Intent
import android.util.TypedValue
import android.view.View
import android.widget.EditText
import android.widget.TextView
import cn.sinata.xldutils.utils.SPUtils
import cn.sinata.xldutils.utils.clickDelay
import cn.sinata.xldutils.utils.getAreaCode
import cn.sinata.xldutils.utils.getContent
import cn.sinata.xldutils.utils.textColor
import com.driver.igotrip.R
@@ -18,6 +21,7 @@
import com.driver.igotrip.netUtls.getMapByAny
import com.driver.igotrip.ui.DialogUtil
import com.driver.igotrip.ui.main.ChangPhoneActivity
import com.driver.igotrip.ui.pub.AreaCodeActivity
import com.driver.igotrip.ui.pub.LoginActivity
import com.driver.igotrip.utils.Cache.CacheKey
import com.driver.igotrip.utils.Cache.CacheUtil
@@ -30,6 +34,7 @@
import org.greenrobot.eventbus.EventBus
import org.jetbrains.anko.find
import org.jetbrains.anko.startActivity
import org.jetbrains.anko.startActivityForResult
import org.jetbrains.anko.toast
import java.util.concurrent.TimeUnit

@@ -40,7 +45,7 @@

    private val tv_phone by lazy { find<TextView>(R.id.tv_phone) }
    private val tv_change_phone by lazy { find<TextView>(R.id.tv_change_phone) }

    private var areaCode: TextView? = null

    override fun initView() {
        setTitleText(getString(R.string.修改手机号))
@@ -70,6 +75,7 @@
            )
            var view = DialogUtil.getView(dialog)
            val lang = SPUtils.getString(Const.language)
            areaCode = view.find<TextView>(R.id.areaCode)
            val et_login_code_send = view.find<TextView>(R.id.et_login_code_send)
            val et_login_code = view.find<EditText>(R.id.et_login_code)
            val et_login_phone = view.find<EditText>(R.id.et_login_phone)
@@ -83,13 +89,16 @@
                et_login_phone.setTextSize(TypedValue.COMPLEX_UNIT_SP,11f)
            }
            et_login_code_send.textColor(this,R.color.color_F02807)
            areaCode!!.setOnClickListener {
                startActivityForResult<AreaCodeActivity>(10086)
            }
            et_login_code_send.clickDelay {
                if (et_login_phone.getContent().isEmpty()){
                    toast(getString(R.string.请输入手机号))
                    return@clickDelay
                }
                var maps = getMapByAny()
                maps["phone"] = et_login_phone.getContent().trim()
                maps["phone"] = areaCode!!.getAreaCode() + et_login_phone.getContent().trim()
                maps["type"] = 1
                callNet(Api.queryCaptcha, maps){
                    toast(getString(R.string.发送成功))
@@ -135,13 +144,13 @@
                }
                var map = getMapByAny()
                map["code"] = et_login_code.getContent()
                map["phone"] = et_login_phone.getContent()
                map["phone"] = areaCode!!.getAreaCode() + et_login_phone.getContent()
                map["phoneOperator"] = tv_operator.text.toString()
                callNet(Api.checkCaptcha, map){
                    callNet(Api.updatePhone1, map){
                        toast(getString(R.string.修改成功))
                        var user = CacheKey.getUserInfo()
                        user.phone = et_login_phone.getContent()
                        user.phone = areaCode!!.getAreaCode() + et_login_phone.getContent()
                        CacheKey.saveUserInfo(user)
                        showPhone()
                        dialog.dismiss()
@@ -185,4 +194,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
            }
        }
    }
}