From fd7255883cff7f3518a8e4efd97b1866ec38ae55 Mon Sep 17 00:00:00 2001
From: tanghao <405676538@qq.com>
Date: 星期三, 03 八月 2022 16:21:03 +0800
Subject: [PATCH] 1。4:处理预约单导致串单的问题 隐藏预约单 二次修改为测试环境
---
app/src/main/java/com/okgoincar/base/MainBroadCastReceiver.kt | 78 ++++++++++++++++++++------------------
1 files changed, 41 insertions(+), 37 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..baad814 100644
--- a/app/src/main/java/com/okgoincar/base/MainBroadCastReceiver.kt
+++ b/app/src/main/java/com/okgoincar/base/MainBroadCastReceiver.kt
@@ -23,40 +23,40 @@
class MainBroadCastReceiver : BroadcastReceiver() {
override fun onReceive(contexts: Context?, intent: Intent?) {
- if (intent == null) {
- toast("内容获取为空，广播接收消息错误")
- return
- }
- try {
- Handler(Looper.getMainLooper()).post {
- val b = intent.getBooleanExtra("isLogin", true)
- if (!b) {
- loginOut(contexts)
- CacheUtil.get().clear()
- EventBus.getDefault().post(BaseEvent(BaseEvent.OUT_APP))
- } else {
- if (getToken().isNullOrEmpty()) {
- Handler(Looper.getMainLooper()).post {
- toast("开始登录")
- }
- var driverCertificate = intent.getStringExtra("driverCertificate")
- if (driverCertificate == null) {
-// toast("身份证获取失败")
- } else {
- if (contexts == null) {
-// toast("上下文为空，使用全局跳转")
- toLoginActivity(MyApplication.getInstance(), driverCertificate)
- } else {
- toLoginActivity(MyApplication.getInstance(), driverCertificate)
- }
- }
-
- }
- }
- }
- } catch (e: Exception) {
-
- }
+// if (intent == null) {
+// toast("内容获取为空，广播接收消息错误")
+// return
+// }
+// try {
+// Handler(Looper.getMainLooper()).post {
+// val b = intent.getBooleanExtra("isLogin", true)
+// if (!b) {
+// loginOut(contexts)
+// CacheUtil.get().clear()
+// EventBus.getDefault().post(BaseEvent(BaseEvent.OUT_APP))
+// } else {
+// if (getToken().isNullOrEmpty()) {
+// Handler(Looper.getMainLooper()).post {
+//// toast("开始登录")
+// }
+// var driverCertificate = intent.getStringExtra("driverCertificate")
+// if (driverCertificate == null) {
+//// toast("身份证获取失败")
+// } else {
+// if (contexts == null) {
+//// toast("上下文为空，使用全局跳转")
+// toLoginActivity(MyApplication.getInstance(), driverCertificate)
+// } else {
+// toLoginActivity(MyApplication.getInstance(), driverCertificate)
+// }
+// }
+//
+// }
+// }
+// }
+// } catch (e: Exception) {
+//
+// }
}
@@ -69,11 +69,15 @@
private fun toLoginActivity(context: Context?, driverCertificate: String?) {
var map = getMapByAny()
- map["identification"] = driverCertificate
- callNet(context!!, Api.loginByIdentification, map) {
+ if (driverCertificate.isNullOrEmpty()){
+ toast("资格证号：空")
+ return
+ }
+ 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