From 6676d8b234bae214c663a73a68c2be6722be9803 Mon Sep 17 00:00:00 2001
From: liugl <liugl@sinata.cn>
Date: 星期一, 19 七月 2021 15:44:47 +0800
Subject: [PATCH] 1。4:处理预约单导致串单的问题 隐藏预约单
---
app/src/main/java/com/okgoincar/slab/SlabOrderOverActivity.kt | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/app/src/main/java/com/okgoincar/slab/SlabOrderOverActivity.kt b/app/src/main/java/com/okgoincar/slab/SlabOrderOverActivity.kt
index 5d589a1..488b11f 100644
--- a/app/src/main/java/com/okgoincar/slab/SlabOrderOverActivity.kt
+++ b/app/src/main/java/com/okgoincar/slab/SlabOrderOverActivity.kt
@@ -3,6 +3,7 @@
import android.os.CountDownTimer
import android.os.Handler
import android.os.Looper
+import android.view.View
import cn.sinata.xldutils.utils.*
import com.okgoincar.netUtls.callNet
import com.okgoincar.netUtls.getMapByAny
@@ -14,8 +15,10 @@
import com.okgoincar.bean.OrderStatueBean
import com.okgoincar.netUtls.Api
import com.okgoincar.netUtls.timeOver
+import com.okgoincar.slab.util.DialogUtil
import com.okgoincar.utils.MyUtils
import kotlinx.android.synthetic.main.activity_order_over.*
+import kotlinx.android.synthetic.main.dialog_sure_and_del_slab.view.*
import java.lang.Exception
class SlabOrderOverActivity : MySlabBaseActivity() {
@@ -110,7 +113,7 @@
MyApplication.getTTsManager()
.setVideoText("请确认乘客车内付款后，再点击返回首页")
time = timeOver(60000 * 6) {
- tv_title_slab.text = "已完成($it)"
+ tv_title_slab.text = "待支付($it)"
if (it == 0) {
if (time != null) {
time!!.cancel()
@@ -125,6 +128,7 @@
tv_name.text = it.data.nickName
tv_car_num.text = it.data.historyNum.toString() + "次乘车"
tv_phone.text = it.data.phone
+
tv_phone.clickDelay {
MyUtils.getInstans().CallPhone(this, it.data.phone.toString())
}
@@ -133,6 +137,7 @@
tv_time.text = it.data.travelTime
tv_start_address.text = it.data.startAddress
tv_end_address.text = it.data.endAddress
+ tv_end_address.visibility = if (it.data.endAddress.isNullOrEmpty()) View.GONE else View.VISIBLE
tv_red_money.text = it.data.tipMoney.toString() + "元小费"
// when (orderBean.data.orderState) {
// 10, 11 -> {
@@ -266,7 +271,13 @@
}
tv_complete.clickDelay {
- overOrder()
+ var pop = DialogUtil.getSlabDelAndSurePopWindow(this,"请确认是否收到乘客线下付款",{}){
+ overOrder()
+ }
+ pop.contentView.tv_close_base.text = "未收款"
+ pop.contentView.tv_sure_base.text = "已收款"
+ pop.showCenter(window.decorView)
+
}
}
--
Gitblit v1.7.1