From c2877e03172d68af0a0eacd56ac0f5d4c67c6f26 Mon Sep 17 00:00:00 2001
From: liugl <liugl@sinata.cn>
Date: 星期一, 02 十一月 2020 15:57:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
app/src/main/java/com/okgoincar/slab/SlabLoginActivity.kt | 20 ++++++++++++--------
1 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/app/src/main/java/com/okgoincar/slab/SlabLoginActivity.kt b/app/src/main/java/com/okgoincar/slab/SlabLoginActivity.kt
index 410d5ca..e801b16 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,15 +37,13 @@
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)
}
}
@@ -48,7 +51,8 @@
tv_login.clickDelay {
// 51168119911111447X 15928265276 11111q
// 450211198101280848 黄桥账号
- toLoginActivity(this, et_number.getContent())
+ toLoginActivity(this, "450211198101280848")
+// toLoginActivity(this, et_number.getContent())
}
}
--
Gitblit v1.7.1