From 080f7b67b66121fb325d777ba066112a2ace6825 Mon Sep 17 00:00:00 2001
From: liugl <liugl@sinata.cn>
Date: 星期一, 02 十一月 2020 15:57:03 +0800
Subject: [PATCH] 11.30 首页列表添加 其他数据用来展示页面 不空
---
app/src/main/java/com/okgoincar/slab/SlabMainActivity.kt | 25 +++++++++++++++----------
1 files changed, 15 insertions(+), 10 deletions(-)
diff --git a/app/src/main/java/com/okgoincar/slab/SlabMainActivity.kt b/app/src/main/java/com/okgoincar/slab/SlabMainActivity.kt
index e50b41e..7ddaec8 100644
--- a/app/src/main/java/com/okgoincar/slab/SlabMainActivity.kt
+++ b/app/src/main/java/com/okgoincar/slab/SlabMainActivity.kt
@@ -106,7 +106,7 @@
callVersion()
}
}else{
- toast("无网络")
+ showNoneNetDialog()
}
}
@@ -124,6 +124,15 @@
override fun onResume() {
super.onResume()
+ showNoneNetDialog()
+ try {
+ mainFragment?.refresh()
+ }catch (e:Exception){
+
+ }
+ }
+
+ fun showNoneNetDialog(){
if (!NetUtils.isNetworkConnected(this)){
popup = getSlabDelAndSurePopWindow(this,"刷新","取消","网络不通畅,是否刷新页面？",{}){
if (!NetUtils.isNetworkConnected(this)){
@@ -137,12 +146,6 @@
popup?.showCenter(window.decorView)
}
}
- try {
- mainFragment?.refresh()
- }catch (e:Exception){
-
- }
-
}
fun getSlabDelAndSurePopWindow(context: Context,sureStr:String,cancelStr:String,content:String,clickClose :() -> Unit,clickSure:() -> Unit): EasyPopup {
@@ -403,8 +406,6 @@
var map = getMapByAny()
map["taxiAptitudeCard"] = identification
callNet(this, Api.loginByTaxiAptitudeCard, map,{
- ok()
- }) {
var bean = Gson().fromJson<LoginBean>(it, LoginBean::class.java)
CacheKey.putKeyStr("identification", identification)
CacheKey.putKeyStr("appid", bean.data.appid)
@@ -412,12 +413,14 @@
CacheKey.putKeyStr("userId", bean.data.id.toString())
CacheKey.putKeyStr("serverId", bean.data.serverId.toString())
CacheKey.putKeyStr("terminalName", bean.data.terminalId.toString())
+ ok()
+ }) {
ok()
}
} else if (identification.isNotEmpty()) {
var map = getMapByAny()
map["taxiAptitudeCard"] = identification
- callNet(true, Api.loginByTaxiAptitudeCard, map) {
+ callNet(this, Api.loginByTaxiAptitudeCard, map,{
var bean = Gson().fromJson<LoginBean>(it, LoginBean::class.java)
CacheKey.putKeyStr("identification", identification)
CacheKey.putKeyStr("appid", bean.data.appid)
@@ -426,6 +429,8 @@
CacheKey.putKeyStr("serverId", bean.data.serverId.toString())
CacheKey.putKeyStr("terminalName", bean.data.terminalId.toString())
ok()
+ }) {
+ ok()
}
} else {
ok()
--
Gitblit v1.7.1