From 3f55faa0a1298bc2320d1e749f0b08b25b85d671 Mon Sep 17 00:00:00 2001
From: liugl <liugl@sinata.cn>
Date: 星期四, 06 八月 2020 11:00:02 +0800
Subject: [PATCH] 8.6
---
app/src/main/java/com/okgoincar/slab/SlabMainActivity.kt | 15 +++++++++++----
1 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/app/src/main/java/com/okgoincar/slab/SlabMainActivity.kt b/app/src/main/java/com/okgoincar/slab/SlabMainActivity.kt
index cef0b9c..533aa97 100644
--- a/app/src/main/java/com/okgoincar/slab/SlabMainActivity.kt
+++ b/app/src/main/java/com/okgoincar/slab/SlabMainActivity.kt
@@ -1,5 +1,6 @@
package com.okgoincar.slab
+import android.content.Context
import android.content.Intent
import android.content.IntentFilter
import android.os.Bundle
@@ -26,6 +27,7 @@
import com.okgoincar.base.MyApplication
import com.okgoincar.bean.*
import com.okgoincar.netUtls.Api
+import com.okgoincar.netUtls.sendAudio
import com.okgoincar.slab.event.SlabMineEventActivity
import com.okgoincar.slab.util.DialogUtil
import com.okgoincar.utils.DateUtil
@@ -94,7 +96,7 @@
initCall()
NettyClient.getInstance().startService()
callPersion()
- showOrder("2221", "2", 100, 2)
+// showOrder("2221", "2", 100, 2)
callVersion()
}
@@ -213,8 +215,11 @@
startActivity<SlabMineEventActivity>()
}
+ tv_title_top.clickDelay {
+ }
tv_car.clickDelay {
+
// if (homeDataBean?.data?.work == 1) {
// callNet(true, Api.work2, getMapByAny()) {
// homeDataBean?.data?.work = 2
@@ -235,6 +240,8 @@
}
+
+
private
var mBackAppTime: Long = 0
@@ -244,7 +251,7 @@
.show()
mBackAppTime = System.currentTimeMillis()
} else {
- closeAll()
+ moveTaskToBack(true)
}
}
@@ -284,12 +291,12 @@
var bean = gson.fromJson<VersionBean>(it, VersionBean::class.java)
if (bean.data.version != "" && bean.data.version != Utils.getAppVersion(this)) {
if (bean.data.mandatory == 0) {
- var pop = DialogUtil.getSlabDelAndSurePopWindow(this, "有新版本是否更新", {}) {
+ var pop = DialogUtil.getSlabDelAndSurePopWindow(this, "确定" ,"取消","有新版本是否更新", {}) {
DownloadUtil(this).downloadAPK(bean.data.url, "ok出行车载端")
}
pop.showCenter(window.decorView)
} else {
- var pop = DialogUtil.getSlabDelAndSurePopWindow(this, "版本已过时，是否强制升级?", {}) {
+ var pop = DialogUtil.getSlabDelAndSurePopWindow(this,"确定" ,"取消","版本已过时，是否强制升级?", {}) {
DownloadUtil(this).downloadAPK(bean.data.url, "ok出行车载端")
toast("后台开始下载，请等待")
}
--
Gitblit v1.7.1