From 1128afd3a9e45d09d8c345d2ed901a1e585a4393 Mon Sep 17 00:00:00 2001
From: lmw <125975490@qq.com>
Date: 星期四, 13 六月 2024 15:44:43 +0800
Subject: [PATCH] 简化代客下单

---
 app/src/main/java/com/future/driver/ui/mine/setting/SettingActivity.kt |   13 +++++++++++--
 1 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/com/future/driver/ui/mine/setting/SettingActivity.kt b/app/src/main/java/com/future/driver/ui/mine/setting/SettingActivity.kt
index cce43ea..3145a7c 100644
--- a/app/src/main/java/com/future/driver/ui/mine/setting/SettingActivity.kt
+++ b/app/src/main/java/com/future/driver/ui/mine/setting/SettingActivity.kt
@@ -1,5 +1,6 @@
 package com.future.driver.ui.mine.setting
 
+import android.view.View
 import cn.sinata.xldutils.utils.Utils
 import com.kuaiyun.emanagercar.ui.base.BaseWebActivity
 import com.future.driver.R
@@ -19,6 +20,7 @@
 import com.tencent.mm.opensdk.modelbase.BaseResp
 import com.tencent.mm.opensdk.openapi.IWXAPIEventHandler
 import kotlinx.android.synthetic.main.activity_setting.*
+import kotlinx.android.synthetic.main.dialog_sure_and_del.view.*
 import org.greenrobot.eventbus.EventBus
 import org.jetbrains.anko.toast
 
@@ -111,12 +113,19 @@
                         DownloadUtil(this).downloadAPK(data.data.url, "未来出行司机端")
                     })
                 } else if (data.data.mandatory == 1) {
-                    DialogUtil.getDelAndSureDialog(this, "版本已过时,是否强制升级?", {
-                        EventBus.getDefault().post(BaseEvent(BaseEvent.OUT_APP))
+                    var isOk = false
+                    val delAndSureDialog = DialogUtil.getDelAndSureDialog(this, "版本已过时,是否强制升级?", {
                     }, {
+                        isOk = true
                         DownloadUtil(this).downloadAPK(data.data.url, "未来出行司机端")
                         ToastUtils.showShortToast(this, "后台开始下载,请等待")
                     })
+                    val view = DialogUtil.getView(delAndSureDialog)
+                    view.view_hint_close_base.visibility = View.INVISIBLE
+                    delAndSureDialog.setOnDismissListener {
+                        if (!isOk)
+                            EventBus.getDefault().post(BaseEvent(BaseEvent.OUT_APP))
+                    }
                 }else{
 //                    toast("已经是最新版本")
                 }

--
Gitblit v1.7.1