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/slab/SlabMainActivity.kt | 34 +++++++++++++++++++---------------
1 files changed, 19 insertions(+), 15 deletions(-)
diff --git a/app/src/main/java/com/okgoincar/slab/SlabMainActivity.kt b/app/src/main/java/com/okgoincar/slab/SlabMainActivity.kt
index 6809a4f..92ef0e5 100644
--- a/app/src/main/java/com/okgoincar/slab/SlabMainActivity.kt
+++ b/app/src/main/java/com/okgoincar/slab/SlabMainActivity.kt
@@ -401,21 +401,8 @@
var identification = CacheKey.getKeyStr("identification")
if (jobNum.isNotEmpty()) {
var map = getMapByAny()
- map["jobNum"] = jobNum
- callNet(true, Api.loginByJobNumber, map) {
- var bean = gson.fromJson<LoginBean>(it, LoginBean::class.java)
- CacheKey.putKeyStr("jobNum", jobNum)
- 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())
- ok()
- }
- } else if (identification.isNotEmpty()) {
- var map = getMapByAny()
- map["identification"] = identification
- callNet(true, Api.loginByIdentification, map) {
+ map["taxiAptitudeCard"] = identification
+ callNet(this, Api.loginByTaxiAptitudeCard, map,{
var bean = Gson().fromJson<LoginBean>(it, LoginBean::class.java)
CacheKey.putKeyStr("identification", identification)
CacheKey.putKeyStr("appid", bean.data.appid)
@@ -424,6 +411,23 @@
CacheKey.putKeyStr("serverId", bean.data.serverId.toString())
CacheKey.putKeyStr("terminalName", bean.data.terminalId.toString())
ok()
+ }) {
+ ok()
+ }
+ } else if (identification.isNotEmpty()) {
+ var map = getMapByAny()
+ map["taxiAptitudeCard"] = identification
+ callNet(this, Api.loginByTaxiAptitudeCard, map,{
+ var bean = Gson().fromJson<LoginBean>(it, LoginBean::class.java)
+ CacheKey.putKeyStr("identification", identification)
+ 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())
+ ok()
+ }) {
+ ok()
}
} else {
ok()
--
Gitblit v1.7.1