合并最新代码

18034727885

2026-03-18 7804ce8edeba51418b5fde2d306e5f476dfb5993

 app/src/main/java/com/driver/igotrip/ui/pub/LoginActivity.kt

@@ -1,5 +1,8 @@
package com.driver.igotrip.ui.pub

import android.annotation.SuppressLint
import android.app.Activity
import android.content.Intent
import android.util.Log
import android.view.Gravity
import android.view.View
@@ -9,6 +12,7 @@
import android.widget.Toast
import cn.sinata.xldutils.utils.SPUtils
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
@@ -31,14 +35,16 @@
import org.jetbrains.anko.dip
import org.jetbrains.anko.find
import org.jetbrains.anko.startActivity
import org.jetbrains.anko.startActivityForResult
import org.jetbrains.anko.toast
import java.util.*

class LoginActivity: BaseLoginActivity() {
class LoginActivity : BaseLoginActivity() {
    override fun setContentView() {
        setContentView(R.layout.activity_login)
    }

    private val areaCode by lazy { find<TextView>(R.id.areaCode) }
    private val et_login_phone by lazy { find<EditText>(R.id.et_login_phone) }
    private val iv_logo by lazy { find<View>(R.id.iv_logo) }
    private val tv_driver by lazy { find<View>(R.id.tv_driver) }
@@ -78,8 +84,9 @@


    override fun setOnclick() {


        areaCode.setOnClickListener {
            startActivityForResult<AreaCodeActivity>(10086)
        }
        tv_driver.setOnClickListener {
            startActivity<BecomeDriverActivity>()
        }
@@ -92,36 +99,36 @@
            callHtml {

            }
            showEye(iv_eye,et_login_pwd)
            showEye(iv_eye, et_login_pwd)
        }
        tv_login.setOnClickListener {
            if (et_login_phone.getString().isEmpty()){
            if (et_login_phone.getString().isEmpty()) {
                toast(getString(R.string.请输入手机号))
                return@setOnClickListener
            }
            if (!PhoneCheckUtil.phoneCheck(et_login_phone.getString())){
            if (!PhoneCheckUtil.phoneCheck(et_login_phone.getString())) {
                toast(getString(R.string.手机号格式错误))
                return@setOnClickListener
            }
            if (et_login_pwd.getString().isEmpty()){
            if (et_login_pwd.getString().isEmpty()) {
                toast(getString(R.string.请输入密码))
                return@setOnClickListener
            }
            if (et_login_pwd.getString().length < 6){
            if (et_login_pwd.getString().length < 6) {
                toast(getString(R.string.密码不能小于6位))
                return@setOnClickListener
            }
            var map = getMapByAny()
            map["password"] = et_login_pwd.getString()
            map["phone"] = et_login_phone.getString()
            callNet(Api.loginPhone,map) {
                var bean = gson.fromJson<LoginBean>(it,LoginBean::class.java)
                CacheKey.putKeyStr("appid",bean.data.appid)
                CacheKey.putKeyStr("token",bean.data.token)
                CacheKey.putKeyStr("vehicleId",bean.data.vehicleId)
                CacheKey.putKeyStr("userId",bean.data.id.toString())
                CacheKey.putKeyStr("serverId",bean.data.serverId.toString())
                CacheKey.putKeyStr("terminalName",bean.data.terminalId.toString())
            map["phone"] = areaCode.getAreaCode() + et_login_phone.getString()
            callNet(Api.loginPhone, map) {
                var bean = gson.fromJson<LoginBean>(it, LoginBean::class.java)
                CacheKey.putKeyStr("appid", bean.data.appid)
                CacheKey.putKeyStr("token", bean.data.token)
                CacheKey.putKeyStr("vehicleId", bean.data.vehicleId)
                CacheKey.putKeyStr("userId", bean.data.id.toString())
                CacheKey.putKeyStr("serverId", bean.data.serverId.toString())
                CacheKey.putKeyStr("terminalName", bean.data.terminalId.toString())
//                CacheKey.putKeyStr("jumpCode",bean.data.jumpCode.toString())
                toast(getString(R.string.登录成功))
                MyApplication.getInstance()!!.setAlisa()
@@ -138,6 +145,8 @@
    }

    private var mBackAppTime: Long = 0

    @SuppressLint("MissingSuperCall")
    override fun onBackPressed() {
        if (System.currentTimeMillis() - mBackAppTime > 2000) {
            Toast.makeText(this, getString(R.string.再按一次退出程序), Toast.LENGTH_SHORT)
@@ -150,7 +159,7 @@

    override fun onStop() {
        super.onStop()
       // showFloater()
        // showFloater()
        //EasyFloat.show("EasyFloatTag")
    }

@@ -177,4 +186,14 @@
            floater?.show()
        }
    }

    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
            }
        }
    }

}