From 75612bfbb092c7dd96d034a0db32662e6fd62dc2 Mon Sep 17 00:00:00 2001
From: 18034727885 <973609879@qq.com>
Date: 星期四, 20 八月 2026 13:52:41 +0800
Subject: [PATCH] 优化检测升级逻辑和接口证书验证
---
app/src/main/java/com/driver/igotrip/ui/main/MainActivity.kt | 58 +++++++++++++++++++++++++++++++++-------------------------
1 files changed, 33 insertions(+), 25 deletions(-)
diff --git a/app/src/main/java/com/driver/igotrip/ui/main/MainActivity.kt b/app/src/main/java/com/driver/igotrip/ui/main/MainActivity.kt
index 861dc44..33fb4ff 100644
--- a/app/src/main/java/com/driver/igotrip/ui/main/MainActivity.kt
+++ b/app/src/main/java/com/driver/igotrip/ui/main/MainActivity.kt
@@ -335,37 +335,45 @@
}
private fun callVersion() {
- var map = getMapByAny()
+ val map = getMapByAny()
// map["id"] = CacheKey.getUserId()
- callNet(Api.queryNewData, map) {
- var data = gson.fromJson<VersionBean>(it, VersionBean::class.java)
+ callNet(isUseAllTrustService = true, showDialog = true, api = Api.queryNewData, map = map, clickAction = {
+ val data = gson.fromJson<VersionBean>(it, VersionBean::class.java)
if (data.data.version != "" && data.data.version != getVersionName()) {
- if (data.data.mandatory == 2) {
- DialogUtil.getDelAndSureDialog(
- this,
- getString(R.string.新版本更新),
- data.data.content,
- {},
- {
- browse(data.data.url)
- })
- } else if (data.data.mandatory == 1) {
- DialogUtil.getDelAndSureDialog(
- this,
- getString(R.string.新版本更新),
- data.data.content,
- {
- EventBus.getDefault().post(BaseEvent(BaseEvent.OUT_APP))
- },
- {
- browse(data.data.url)
- })
- } else {
-// toast("已经是最新版本")
+ when (data.data.mandatory) {
+ 2 -> {
+ DialogUtil.getDelAndSureDialog(
+ this,
+ getString(R.string.新版本更新),
+ data.data.content,
+ {},
+ {
+ browse(data.data.url)
+ })
+ }
+
+ 1 -> {
+ DialogUtil.getDelAndSureDialog(
+ this,
+ getString(R.string.新版本更新),
+ data.data.content,
+ {
+ EventBus.getDefault().post(BaseEvent(BaseEvent.OUT_APP))
+ },
+ {
+ browse(data.data.url)
+ })
+ }
+
+ else -> {
+ // toast("已经是最新版本")
+ }
}
} else {
// toast("已经是最新版本")
}
+ }) { _, _ ->
+
}
}
--
Gitblit v1.7.1