From 777737e598c9b56034c42a3d26a3ed46a5b10b26 Mon Sep 17 00:00:00 2001
From: liugl <liugl@sinata.cn>
Date: 星期二, 22 十二月 2020 10:04:42 +0800
Subject: [PATCH] 1:新增上线 6版
---
app/src/main/java/com/okgoincar/slab/SlabLoginActivity.kt | 54 +++++++++++++++++++++++++++++-------------------------
1 files changed, 29 insertions(+), 25 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..79dab30 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,13 +14,21 @@
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
class SlabLoginActivity : MySlabBaseActivity() {
+
+ val isMoreLogin by lazy {
+ intent.getBooleanExtra("IsMoreLogin",false)
+ }
+
override fun setContentView() {
setContentView(R.layout.slab_activity_login)
}
@@ -25,39 +36,33 @@
override fun initView() {
showTitle(false)
showHeader(false)
+
+ if (isMoreLogin){
+ window.decorView.post {
+ var pop = DialogUtil.getSlabDelAndSurePopWindow(false,this,"确定","取消","您的账号在其他车载端登录，或者在本机长时间未登录，需要重新登签！",{}){
+
+ }
+ pop.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")
-
+ // 51168119911111447X 15928265276 11111q
+// 450211198101280848 黄桥账号
+// toLoginActivity(this, "450211198101280848")
+ toLoginActivity(this, et_number.getContent())
}
}
- override fun setBlackMode(b:Boolean) {
+ override fun setBlackMode(b: Boolean) {
super.setBlackMode(b)
- if (b){
+ if (b) {
iv_back_login.setBackgroundResource(R.mipmap.bg_black)
ll_center.setBackgroundResource(R.color.black_mode_383838)
et_number.setBackgroundResource(R.drawable.bg_gray_4_line_black)
- }else{
+ } else {
iv_back_login.setBackgroundResource(R.mipmap.bg_lab_login)
ll_center.setBackgroundResource(R.color.write)
et_number.setBackgroundResource(R.drawable.bg_gray_4_line)
@@ -79,8 +84,8 @@
private fun toLoginActivity(context: Context?, driverCertificate: String?) {
var map = getMapByAny()
- map["identification"] = driverCertificate
- callNet(context!!,Api.loginByIdentification,map){
+ 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)
@@ -93,5 +98,4 @@
}
}
}
-
}
\ No newline at end of file
--
Gitblit v1.7.1