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/SlabMainActivity.kt |   13 ++++++++++---
 1 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/com/okgoincar/slab/SlabMainActivity.kt b/app/src/main/java/com/okgoincar/slab/SlabMainActivity.kt
index 7ddaec8..bb0d39a 100644
--- a/app/src/main/java/com/okgoincar/slab/SlabMainActivity.kt
+++ b/app/src/main/java/com/okgoincar/slab/SlabMainActivity.kt
@@ -127,6 +127,7 @@
         showNoneNetDialog()
         try {
             mainFragment?.refresh()
+            callPersion()
         }catch (e:Exception){
 
         }
@@ -344,11 +345,16 @@
                     toast("收到显示屏信息")
                 }
             }
+            BaseEvent.UPDATA_MAIN_CAR->{
+                try {
+                    mainFragment.refresh()
+                }catch (e:Exception){
+                }
+            }
             BaseEvent.ERROR_INFO -> {
                 try {
                     mainFragment.refresh()
                 }catch (e:Exception){
-
                 }
             }
         }
@@ -377,16 +383,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