From d19fdba76572d8261c9b9013a1fc2798c436a1ba Mon Sep 17 00:00:00 2001
From: liugl <liugl@sinata.cn>
Date: 星期一, 14 十二月 2020 19:18:16 +0800
Subject: [PATCH] 1:新增版本号
---
app/src/main/java/com/okgoincar/slab/SlabOrderOverActivity.kt | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/app/src/main/java/com/okgoincar/slab/SlabOrderOverActivity.kt b/app/src/main/java/com/okgoincar/slab/SlabOrderOverActivity.kt
index 0334f5e..41bc491 100644
--- a/app/src/main/java/com/okgoincar/slab/SlabOrderOverActivity.kt
+++ b/app/src/main/java/com/okgoincar/slab/SlabOrderOverActivity.kt
@@ -14,8 +14,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 +112,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()
@@ -266,7 +268,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)
+
}
}
@@ -281,7 +289,7 @@
callNet(Api.completeOrder,map,{
function()
}){
-
+ function()
}
}
--
Gitblit v1.7.1