fix bug

lmw

2024-07-09 b13afc751dbbce24753d008f1f87d2c5e133a4ad

 app/src/main/java/com/dollearn/student/ui/login/RegisterActivity.kt

@@ -4,7 +4,6 @@
import android.app.Activity
import android.content.Intent
import android.os.CountDownTimer
import android.text.Editable
import android.text.method.HideReturnsTransformationMethod
import android.text.method.PasswordTransformationMethod
import androidx.core.os.bundleOf
@@ -13,18 +12,15 @@
import cn.sinata.xldutils.visible
import com.amap.api.location.AMapLocationListener
import com.dollearn.student.R
import com.dollearn.student.WeparkApplication
import com.dollearn.student.DollearnApplication
import com.dollearn.student.dialog.TipDialog
import com.dollearn.student.network.HttpManager
import com.dollearn.student.network.request
import com.dollearn.student.ui.H5Activity
import com.dollearn.student.ui.TransparentStatusBarActivity
import com.dollearn.student.utils.AMapKit
import com.dollearn.student.utils.SimpleTextWatcher
import com.tbruyelle.rxpermissions2.RxPermissions
import kotlinx.android.synthetic.main.activity_register.*
import org.jetbrains.anko.sdk27.coroutines.onClick
import org.jetbrains.anko.startActivity

class RegisterActivity : TransparentStatusBarActivity() {
    override fun setContentView() = R.layout.activity_register
@@ -116,17 +112,17 @@
     * 有权限的情况获取定位
     */
    private fun getLocation(phone:String,pwd:String,code:String,invitePhone:String){
        if (WeparkApplication.lat!=null)
        if (DollearnApplication.lat!=null)
            next(phone, pwd, code, invitePhone)
        else{
            showDialog("正在获取定位...")
            AMapKit.initLocation(this, AMapLocationListener {
                WeparkApplication.lat = it.latitude
                WeparkApplication.lon = it.longitude
                WeparkApplication.province = it.province
                WeparkApplication.provinceCode = "${it.adCode.substring(0, 3)}000"
                WeparkApplication.cityName = it.city
                WeparkApplication.cityCode = "${it.adCode.substring(0, 4)}00"
                DollearnApplication.lat = it.latitude
                DollearnApplication.lon = it.longitude
                DollearnApplication.province = it.province
                DollearnApplication.provinceCode = "${it.adCode.substring(0, 3)}000"
                DollearnApplication.cityName = it.city
                DollearnApplication.cityCode = "${it.adCode.substring(0, 4)}00"
                dismissDialog()
                next(phone, pwd, code, invitePhone)
            })
@@ -136,7 +132,7 @@
    private fun next(phone:String,pwd:String,code:String,invitePhone:String){
        tv_action.isEnabled = false
        if (type == TYPE_BIND){
            HttpManager.bindPhone(phone, code,if (invitePhone.isNullOrEmpty()) null else invitePhone,openid , WeparkApplication.lat,WeparkApplication.lon)
            HttpManager.bindPhone(phone, code,if (invitePhone.isNullOrEmpty()) null else invitePhone,openid , DollearnApplication.lat,DollearnApplication.lon)
                .request(this@RegisterActivity,success = {_,data->
                    val intent = Intent()
                    intent.putExtra("token",data?.optString("token"))
@@ -148,7 +144,7 @@
                }
        }else{
            HttpManager.register(type,phone, pwd.md5(), code,if (invitePhone.isNullOrEmpty()) null else invitePhone,if (type == TYPE_BIND) openid else null,
                WeparkApplication.lat,WeparkApplication.lon)
                DollearnApplication.lat,DollearnApplication.lon)
                .request(this@RegisterActivity,success = {_,_->
                    myToast(if (type == TYPE_REGISTER)"注册成功" else "密码修改成功")
                    finish()