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/main/MainActivity.kt | 20 ++++++++++++++------
1 files changed, 14 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 de08945..ebad2a7 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
@@ -7,6 +7,7 @@
import android.os.Looper
import android.provider.Settings
import android.util.Log
+import android.view.View
import android.widget.Toast
import cn.sinata.rxnetty.NettyClient
import cn.sinata.xldutils.utils.*
@@ -40,6 +41,7 @@
import com.tbruyelle.rxpermissions2.RxPermissions
import kotlinx.android.synthetic.main.activity_main.*
import kotlinx.android.synthetic.main.app_title.*
+import kotlinx.android.synthetic.main.dialog_sure_and_del.view.*
import org.greenrobot.eventbus.EventBus
import org.jetbrains.anko.startActivity
import org.jetbrains.anko.toast
@@ -155,12 +157,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("已经是最新版本")
}
@@ -377,18 +386,17 @@
private fun updateVoice(filePath: String) {
val ossUtil = OSSUtil(this)
ossUtil.uploadSingleWithSize(filePath, object : OSSUtil.OSSUploadCallBack() {
- override fun onFinishWithSize(url: String?, size: Long) {
+ override fun onFinishWithSize(url: String, size: Long) {
super.onFinishWithSize(url, size)
Log.e("mmp","录音保存路径：${url},大小:${size/1024}kb")
val mapByAny = getMapByAny()
mapByAny["fileFormat"] = "caf"
+ mapByAny["fileName"] = url.substring(url.lastIndexOf("/"))
mapByAny["fileLink"] = url
mapByAny["fileSize"] = size/1024
mapByAny["orderId"] = MyApplication.recordOrderId
mapByAny["orderType"] = MyApplication.recordOrderType
- callNet(false,Api.tape,mapByAny){
-
- }
+ callNet(false,Api.tape,mapByAny){}
}
override fun onFial(message: String?) {
--
Gitblit v1.7.1