From 6521ab0f203b66b589e9990f090f04c16ea36320 Mon Sep 17 00:00:00 2001
From: 唐浩 <15928265276@163.com>
Date: 星期一, 20 七月 2020 19:17:04 +0800
Subject: [PATCH] commit

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

diff --git a/app/src/main/java/com/okgoincar/slab/SlabLoginActivity.kt b/app/src/main/java/com/okgoincar/slab/SlabLoginActivity.kt
index 4ca3595..c86c654 100644
--- a/app/src/main/java/com/okgoincar/slab/SlabLoginActivity.kt
+++ b/app/src/main/java/com/okgoincar/slab/SlabLoginActivity.kt
@@ -1,8 +1,12 @@
 package com.okgoincar.slab
 
+import android.content.Context
+import android.os.Handler
+import android.os.Looper
 import android.widget.Toast
 import cn.sinata.xldutils.utils.clickDelay
 import cn.sinata.xldutils.utils.getContent
+import com.google.gson.Gson
 import com.okgoincar.netUtls.callNet
 import com.okgoincar.netUtls.getMapByAny
 import com.okgoincar.utils.Cache.CacheKey
@@ -25,23 +29,25 @@
 
     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>()
-            }
+//            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")
+
         }
     }
 
@@ -71,4 +77,21 @@
         }
     }
 
+    private fun toLoginActivity(context: Context?, driverCertificate: String?) {
+        var map = getMapByAny()
+        map["identification"] = driverCertificate
+        callNet(context!!,Api.loginByIdentification,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>()
+            }
+        }
+    }
+
 }
\ No newline at end of file

--
Gitblit v1.7.1