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/SlabLoginActivity.kt | 63 +++++++++++++++----------------
1 files changed, 31 insertions(+), 32 deletions(-)
diff --git a/app/src/main/java/com/okgoincar/slab/SlabLoginActivity.kt b/app/src/main/java/com/okgoincar/slab/SlabLoginActivity.kt
index f3e7c5a..f9604df 100644
--- a/app/src/main/java/com/okgoincar/slab/SlabLoginActivity.kt
+++ b/app/src/main/java/com/okgoincar/slab/SlabLoginActivity.kt
@@ -46,10 +46,10 @@
override fun setOnclick() {
tv_login.clickDelay {
-// if (et_number.getContent().isNullOrEmpty()) {
-// toast("请输入工号")
-// return@clickDelay
-// }
+ if (et_number.getContent().isNullOrEmpty()) {
+ toast("请输入工号")
+ return@clickDelay
+ }
// var map = getMapByAny()
// map["jobNum"] = et_number.getContent().trim()
// callNet(true, Api.loginByJobNumber, map) {
@@ -65,8 +65,7 @@
// startActivity<SlabMainActivity>()
// }
// 51168119911111447X 15928265276 11111q
-// toLoginActivity(this,"51168119911111447X")
-
+ toLoginActivity(this,et_number.getContent())
}
}
@@ -96,43 +95,43 @@
}
}
-// private fun toLoginActivity(context: Context?, driverCertificate: String?) {
-// var map = getMapByAny()
-// map["taxiAptitudeCard"] = driverCertificate
-// callNet(context!!,Api.loginByTaxiAptitudeCard,map){
-// cn.sinata.xldutils.utils.toast("登录成功")
-// var bean = Gson().fromJson<LoginBean>(it, LoginBean::class.java)
-// 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 {
-// context.startActivity<SlabMainActivity>()
-// }
-// }
-// }
-
-
private fun toLoginActivity(context: Context?, driverCertificate: String?) {
var map = getMapByAny()
- map["identification"] = driverCertificate
- callNet(context!!, Api.loginByIdentification, map) {
- toast("登录成功")
+ map["taxiAptitudeCard"] = driverCertificate
+ callNet(context!!,Api.loginByTaxiAptitudeCard,map){
+ cn.sinata.xldutils.utils.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)
+ context.startActivity<SlabMainActivity>()
}
}
}
+
+// 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)
+// }
+// }
+// }
+
}
\ No newline at end of file
--
Gitblit v1.7.1