From 710c5ca67b1c2e658ec5495c01136540fcfd21c3 Mon Sep 17 00:00:00 2001
From: lmw <125975490@qq.com>
Date: 星期五, 21 四月 2023 10:07:22 +0800
Subject: [PATCH] 登录添加用户协议
---
app/src/main/java/com/fuban/driver/ui/pub/LoginActivity.kt | 17 +++++++++++------
1 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/app/src/main/java/com/fuban/driver/ui/pub/LoginActivity.kt b/app/src/main/java/com/fuban/driver/ui/pub/LoginActivity.kt
index dd8f20c..0b6ef57 100644
--- a/app/src/main/java/com/fuban/driver/ui/pub/LoginActivity.kt
+++ b/app/src/main/java/com/fuban/driver/ui/pub/LoginActivity.kt
@@ -6,6 +6,7 @@
import android.widget.TextView
import android.widget.Toast
import androidx.core.app.NotificationManagerCompat
+import cn.sinata.xldutils.utils.clickDelay
import cn.sinata.xldutils.utils.getString
import cn.sinata.xldutils.utils.gone
import com.kuaiyun.emanagercar.ui.base.Local.BaseLoginActivity
@@ -19,6 +20,7 @@
import com.fuban.driver.ui.main.MainActivity
import com.fuban.driver.utils.Cache.CacheKey
import com.fuban.driver.utils.PhoneCheckUtil
+import com.kuaiyun.emanagercar.ui.base.BaseWebActivity
import kotlinx.android.synthetic.main.activity_login.*
import kotlinx.android.synthetic.main.include_login_phone.*
import kotlinx.android.synthetic.main.include_login_pwd.*
@@ -62,7 +64,7 @@
}
fun callHtml(click: (s: String) -> Unit) {
var map = getMapByAny()
- map["type"] = 9
+ map["type"] = 2
callNet(Api.queryByType, map) {
var data = gson.fromJson<AgreeBean>(it, AgreeBean::class.java)
click(data.data.content)
@@ -71,8 +73,6 @@
override fun setOnclick() {
-
-
tv_driver.setOnClickListener {
startActivity<BecomeDriverActivity>()
}
@@ -81,13 +81,19 @@
startActivity<ForgetPwdActivity>()
}
- iv_eye.setOnClickListener {
+ tv_rule.clickDelay {
callHtml {
-
+ BaseWebActivity.to(this, it, "用户协议", "1")
}
+ }
+ iv_eye.setOnClickListener {
showEye(iv_eye,et_login_pwd)
}
tv_login.setOnClickListener {
+ if (!cb_rule.isChecked){
+ toast("请阅读并同意《福伴司机用户服务协议》")
+ return@setOnClickListener
+ }
if (et_login_phone.getString().isEmpty()){
toast("请输入手机号")
return@setOnClickListener
@@ -116,7 +122,6 @@
CacheKey.putKeyStr("terminalName",bean.data.terminalId.toString())
toast("登录成功")
- MyApplication.getInstance()!!.setAlisa()
startActivity<MainActivity>()
}
}
--
Gitblit v1.7.1