From 40a8a2c243c15fe8d4eb46f4dbc42a290bd0a63a Mon Sep 17 00:00:00 2001
From: liugl <liugl@sinata.cn>
Date: 星期四, 10 九月 2020 15:34:08 +0800
Subject: [PATCH] 9.10
---
app/src/main/java/com/okgoincar/slab/SlabLoginActivity.kt | 83 +++++++++++++++++++++++++++++++----------
1 files changed, 62 insertions(+), 21 deletions(-)
diff --git a/app/src/main/java/com/okgoincar/slab/SlabLoginActivity.kt b/app/src/main/java/com/okgoincar/slab/SlabLoginActivity.kt
index 03a11c9..f3e7c5a 100644
--- a/app/src/main/java/com/okgoincar/slab/SlabLoginActivity.kt
+++ b/app/src/main/java/com/okgoincar/slab/SlabLoginActivity.kt
@@ -1,9 +1,12 @@
package com.okgoincar.slab
import android.content.Context
+import android.content.Intent
import android.os.Handler
import android.os.Looper
import android.widget.Toast
+import cn.sinata.xldutils.netstatus.NetUtils
+import cn.sinata.xldutils.utils.DialogUtils
import cn.sinata.xldutils.utils.clickDelay
import cn.sinata.xldutils.utils.getContent
import com.google.gson.Gson
@@ -11,9 +14,12 @@
import com.okgoincar.netUtls.getMapByAny
import com.okgoincar.utils.Cache.CacheKey
import com.okgoincar.R
+import com.okgoincar.base.BaseEvent
import com.okgoincar.bean.LoginBean
import com.okgoincar.netUtls.Api
+import com.okgoincar.slab.util.DialogUtil
import kotlinx.android.synthetic.main.slab_activity_login.*
+import org.greenrobot.eventbus.EventBus
import org.jetbrains.anko.startActivity
import org.jetbrains.anko.toast
@@ -25,28 +31,41 @@
override fun initView() {
showTitle(false)
showHeader(false)
+
+ }
+
+ override fun onResume() {
+ super.onResume()
+ if (!NetUtils.isNetworkConnected(this)){
+ var dialog = DialogUtil.getSlabSurePopWindow(this,"当前网络不通畅，请稍后再登录"){
+ EventBus.getDefault().post(BaseEvent(BaseEvent.OUT_APP))
+ }
+ dialog.showCenter(window.decorView)
+ }
}
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("jobNum",et_number.getContent().trim())
+// 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>()
+// }
+// 51168119911111447X 15928265276 11111q
+// toLoginActivity(this,"51168119911111447X")
}
}
@@ -77,19 +96,41 @@
}
}
+// 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){
- cn.sinata.xldutils.utils.toast("登录成功")
+ 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 {
- context.startActivity<SlabMainActivity>()
+ var intent = Intent()
+ intent.setClass(context, SlabMainActivity::class.java)
+ intent.flags = Intent.FLAG_ACTIVITY_NEW_TASK
+ context.startActivity(intent)
}
}
}
--
Gitblit v1.7.1