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 | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/com/okgoincar/slab/SlabMainActivity.kt b/app/src/main/java/com/okgoincar/slab/SlabMainActivity.kt index e50b41e..92ef0e5 100644 --- a/app/src/main/java/com/okgoincar/slab/SlabMainActivity.kt +++ b/app/src/main/java/com/okgoincar/slab/SlabMainActivity.kt @@ -403,8 +403,6 @@ var map = getMapByAny() map["taxiAptitudeCard"] = identification callNet(this, Api.loginByTaxiAptitudeCard, map,{ - ok() - }) { var bean = Gson().fromJson<LoginBean>(it, LoginBean::class.java) CacheKey.putKeyStr("identification", identification) CacheKey.putKeyStr("appid", bean.data.appid) @@ -412,12 +410,14 @@ CacheKey.putKeyStr("userId", bean.data.id.toString()) 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(true, Api.loginByTaxiAptitudeCard, map) { + callNet(this, Api.loginByTaxiAptitudeCard, map,{ var bean = Gson().fromJson<LoginBean>(it, LoginBean::class.java) CacheKey.putKeyStr("identification", identification) CacheKey.putKeyStr("appid", bean.data.appid) @@ -426,6 +426,8 @@ CacheKey.putKeyStr("serverId", bean.data.serverId.toString()) CacheKey.putKeyStr("terminalName", bean.data.terminalId.toString()) ok() + }) { + ok() } } else { ok() -- Gitblit v1.7.1