From a0b3598842d57f5dfb5736e8a4fff5a9d70191a5 Mon Sep 17 00:00:00 2001
From: liugl <liugl@sinata.cn>
Date: 星期四, 06 八月 2020 20:55:52 +0800
Subject: [PATCH] 8.6

---
 app/src/main/java/com/okgoincar/slab/SlabLoginActivity.kt |   38 +++++++++++++++++++-------------------
 1 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/app/src/main/java/com/okgoincar/slab/SlabLoginActivity.kt b/app/src/main/java/com/okgoincar/slab/SlabLoginActivity.kt
index c86c654..03a11c9 100644
--- a/app/src/main/java/com/okgoincar/slab/SlabLoginActivity.kt
+++ b/app/src/main/java/com/okgoincar/slab/SlabLoginActivity.kt
@@ -29,24 +29,24 @@
 
     override fun setOnclick() {
         tv_login.clickDelay {
-//            if (et_number.getContent().isNullOrEmpty()) {
-//                toast("请输入工号")
-//                return@clickDelay
-//            }
-//            var map = getMapByAny()
-//            map["jobNum"] = et_number.getContent().trim()
-//            callNet(true, Api.loginByJobNumber, map) {
-//                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())
-//                finish()
-//                startActivity<SlabMainActivity>()
-//            }
-            toLoginActivity(this,"452229198204010012")
+            if (et_number.getContent().isNullOrEmpty()) {
+                toast("请输入工号")
+                return@clickDelay
+            }
+            var map = getMapByAny()
+            map["jobNum"] = et_number.getContent().trim()
+            callNet(true, Api.loginByJobNumber, map) {
+                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())
+                finish()
+                startActivity<SlabMainActivity>()
+            }
+//            toLoginActivity(this,"452229198204010012")
 
         }
     }
@@ -73,7 +73,7 @@
                 .show()
             mBackAppTime = System.currentTimeMillis()
         } else {
-            closeAll()
+            moveTaskToBack(true)
         }
     }
 

--
Gitblit v1.7.1