From 16d807930e47fcab5a7e773046daad78e04849e2 Mon Sep 17 00:00:00 2001
From: liugl <liugl@sinata.cn>
Date: 星期三, 18 十一月 2020 14:52:43 +0800
Subject: [PATCH] 11.11 修改bug2个
---
app/src/main/java/com/okgoincar/slab/SlabLoginActivity.kt | 68 +++++++++-------------------------
1 files changed, 18 insertions(+), 50 deletions(-)
diff --git a/app/src/main/java/com/okgoincar/slab/SlabLoginActivity.kt b/app/src/main/java/com/okgoincar/slab/SlabLoginActivity.kt
index d196e32..79dab30 100644
--- a/app/src/main/java/com/okgoincar/slab/SlabLoginActivity.kt
+++ b/app/src/main/java/com/okgoincar/slab/SlabLoginActivity.kt
@@ -24,6 +24,11 @@
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)
}
@@ -32,46 +37,32 @@
showTitle(false)
showHeader(false)
- }
+ if (isMoreLogin){
+ window.decorView.post {
+ var pop = DialogUtil.getSlabDelAndSurePopWindow(false,this,"确定","取消","您的账号在其他车载端登录，或者在本机长时间未登录，需要重新登签！",{}){
- override fun onResume() {
- super.onResume()
- if (!NetUtils.isNetworkConnected(this)){
- var dialog = DialogUtil.getSlabSurePopWindow(this,"当前网络不通畅，请稍后再登录"){
- EventBus.getDefault().post(BaseEvent(BaseEvent.OUT_APP))
+ }
+ pop.showCenter(window.decorView)
}
- dialog.showCenter(window.decorView)
}
}
override fun setOnclick() {
tv_login.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,"450211198101280848")
+ // 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)
@@ -94,7 +85,7 @@
private fun toLoginActivity(context: Context?, driverCertificate: String?) {
var map = getMapByAny()
map["taxiAptitudeCard"] = driverCertificate
- callNet(context!!,Api.loginByTaxiAptitudeCard,map){
+ 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)
@@ -107,27 +98,4 @@
}
}
}
-
-
-// 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