From b1d822d6272dc33928586ffa18b9ed3247f32522 Mon Sep 17 00:00:00 2001
From: lmw <125975490@qq.com>
Date: 星期五, 07 六月 2024 14:48:20 +0800
Subject: [PATCH] 修改部分bug
---
app/src/main/java/com/future/driver/ui/main/MainActivity.kt | 18 ++++++++++++------
1 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/app/src/main/java/com/future/driver/ui/main/MainActivity.kt b/app/src/main/java/com/future/driver/ui/main/MainActivity.kt
index ac6d2b0..de08945 100644
--- a/app/src/main/java/com/future/driver/ui/main/MainActivity.kt
+++ b/app/src/main/java/com/future/driver/ui/main/MainActivity.kt
@@ -118,7 +118,6 @@
}
}
}
-
}
}
}
@@ -150,7 +149,7 @@
// map["id"] = CacheKey.getUserId()
callNet(Api.queryNewData, map) {
var data = gson.fromJson<VersionBean>(it, VersionBean::class.java)
- if (data.data.version != "" && data.data.version != Utils.getAppVersion(this)) {
+ if (data.data.version != "" && data.data.version > Utils.getAppVersion(this)) {
if (data.data.mandatory == 2) {
DialogUtil.getDelAndSureDialog(this, "有新版本是否更新？", {}, {
DownloadUtil(this).downloadAPK(data.data.url, "未来出行司机端")
@@ -187,7 +186,7 @@
}
- private fun initCall() {
+ private fun initCall(playVoice:Boolean = true) {
var map = getMapByAny()
callNet(Api.queryHomeData, map) {
var data = gson.fromJson<HomeDataBean>(it, HomeDataBean::class.java)
@@ -200,10 +199,12 @@
tv_lien_name.text = data.data.brand.toString()
tv_car.text = if (data.data.work == 1) "收车" else "出车"
if (data.data.work == 1){
- MyApplication.getTTsManager().setVideoText("您正在上班中")
+ if (playVoice)
+ MyApplication.getTTsManager().setVideoText("您正在上班中")
beOnDuty(true)
}else{
- MyApplication.getTTsManager().setVideoText("您已收车")
+ if (playVoice)
+ MyApplication.getTTsManager().setVideoText("您已收车")
beOnDuty(false)
}
tv_time.text = DateUtil.getTime(
@@ -287,10 +288,14 @@
}else{
var map= getMapByAny()
map["type"] = bean[0].id
- callNet(Api.work, map) {
+ callNet(Api.work, map,{
toast("上班成功")
beOnDuty(true)
EventBus.getDefault().post(BaseEvent(BaseEvent.START_CAR))
+ }){
+ if (it?.contains("人脸") == true){
+ tv_face.visible()
+ }
}
}
}
@@ -337,6 +342,7 @@
}
BaseEvent.FACE_FAILED -> {
tv_face.visible()
+ initCall(false)
}
BaseEvent.START_RECORD -> {
if (!MyApplication.isRecording)
--
Gitblit v1.7.1