From f638c659402a91b2db5555e00a241feb4b57e16c Mon Sep 17 00:00:00 2001
From: liugl <liugl@sinata.cn>
Date: 星期三, 11 十一月 2020 14:28:05 +0800
Subject: [PATCH] 11.11 修改bug2个
---
app/src/main/java/com/okgoincar/slab/SlabMainActivity.kt | 23 ++++++++++++++---------
1 files changed, 14 insertions(+), 9 deletions(-)
diff --git a/app/src/main/java/com/okgoincar/slab/SlabMainActivity.kt b/app/src/main/java/com/okgoincar/slab/SlabMainActivity.kt
index 92ef0e5..3cc44bc 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,16 @@
override fun onResume() {
super.onResume()
+ showNoneNetDialog()
+ try {
+ mainFragment?.refresh()
+ callPersion()
+ }catch (e:Exception){
+
+ }
+ }
+
+ fun showNoneNetDialog(){
if (!NetUtils.isNetworkConnected(this)){
popup = getSlabDelAndSurePopWindow(this,"刷新","取消","网络不通畅,是否刷新页面？",{}){
if (!NetUtils.isNetworkConnected(this)){
@@ -137,12 +147,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 {
@@ -374,16 +378,17 @@
if (bean.data.version != "" && bean.data.version != Utils.getAppVersion(this)) {
if (bean.data.mandatory == 0) {
var pop =
- DialogUtil.getSlabDelAndSurePopWindow(this, "确定", "取消", "有新版本是否更新", {}) {
+ DialogUtil.getSlabDelAndSurePopWindow(true,this, "确定", "取消", "有新版本是否更新", {}) {
DownloadUtil(this).downloadAPK(bean.data.url, "ok出行车载端")
}
pop.showCenter(window.decorView)
} else {
var pop = DialogUtil.getSlabDelAndSurePopWindow(
+ false,
this,
"确定",
"取消",
- "版本已过时，是否强制升级?",
+ "版本已过时，强制升级!",
{}) {
DownloadUtil(this).downloadAPK(bean.data.url, "ok出行车载端")
toast("后台开始下载，请等待")
--
Gitblit v1.7.1