From aceb6d9a4d844427ae974b639be14d6058abfaf9 Mon Sep 17 00:00:00 2001
From: liugl <liugl@sinata.cn>
Date: 星期一, 14 九月 2020 15:45:54 +0800
Subject: [PATCH] 9.14
---
app/src/main/java/com/okgoincar/base/MainBroadCastReceiver.kt | 35 +++++++++++++++++++++++++++++++----
1 files changed, 31 insertions(+), 4 deletions(-)
diff --git a/app/src/main/java/com/okgoincar/base/MainBroadCastReceiver.kt b/app/src/main/java/com/okgoincar/base/MainBroadCastReceiver.kt
index f24f73a..711e4cf 100644
--- a/app/src/main/java/com/okgoincar/base/MainBroadCastReceiver.kt
+++ b/app/src/main/java/com/okgoincar/base/MainBroadCastReceiver.kt
@@ -37,7 +37,7 @@
} else {
if (getToken().isNullOrEmpty()) {
Handler(Looper.getMainLooper()).post {
- toast("开始登录")
+// toast("开始登录")
}
var driverCertificate = intent.getStringExtra("driverCertificate")
if (driverCertificate == null) {
@@ -67,13 +67,40 @@
}
}
+// private fun toLoginActivity(context: Context?, driverCertificate: String?) {
+// var map = getMapByAny()
+// map["identification"] = driverCertificate
+// callNet(context!!, Api.loginByIdentification, map) {
+// toast("登录成功")
+// var bean = Gson().fromJson<LoginBean>(it, LoginBean::class.java)
+// CacheKey.putKeyStr("identification", driverCertificate!!)
+// CacheKey.putKeyStr("appid", bean.data.appid)
+// CacheKey.putKeyStr("token", bean.data.token)
+// CacheKey.putKeyStr("userId", bean.data.id.toString())
+// CacheKey.putKeyStr("serverId", bean.data.serverId.toString())
+// CacheKey.putKeyStr("terminalName", bean.data.terminalId.toString())
+// Handler(Looper.getMainLooper()).post {
+// var intent = Intent()
+// intent.setClass(context, SlabMainActivity::class.java)
+// intent.flags = Intent.FLAG_ACTIVITY_NEW_TASK
+// context.startActivity(intent)
+// }
+// }
+// }
+
private fun toLoginActivity(context: Context?, driverCertificate: String?) {
var map = getMapByAny()
- map["identification"] = driverCertificate
- callNet(context!!, Api.loginByIdentification, map) {
+ if (driverCertificate.isNullOrEmpty()){
+// toast("资格证号：空")
+ return
+ }else{
+// toast("资格证号："+driverCertificate)
+ }
+ map["taxiAptitudeCard"] = driverCertificate
+ callNet(context!!, Api.loginByTaxiAptitudeCard, map) {
toast("登录成功")
var bean = Gson().fromJson<LoginBean>(it, LoginBean::class.java)
- CacheKey.putKeyStr("identification", driverCertificate!!)
+ CacheKey.putKeyStr("identification", driverCertificate)
CacheKey.putKeyStr("appid", bean.data.appid)
CacheKey.putKeyStr("token", bean.data.token)
CacheKey.putKeyStr("userId", bean.data.id.toString())
--
Gitblit v1.7.1