From 661a9d7a654c5e017e3ca7333cf8fe30e1f5931a Mon Sep 17 00:00:00 2001
From: liugl <liugl@sinata.cn>
Date: 星期五, 18 十二月 2020 17:30:04 +0800
Subject: [PATCH] 1:新增上线 6版
---
app/src/main/java/com/okgoincar/slab/cargo/CargoActivity.kt | 24 ++++++++++++++++++++----
1 files changed, 20 insertions(+), 4 deletions(-)
diff --git a/app/src/main/java/com/okgoincar/slab/cargo/CargoActivity.kt b/app/src/main/java/com/okgoincar/slab/cargo/CargoActivity.kt
index 4a494bd..58bc275 100644
--- a/app/src/main/java/com/okgoincar/slab/cargo/CargoActivity.kt
+++ b/app/src/main/java/com/okgoincar/slab/cargo/CargoActivity.kt
@@ -176,11 +176,21 @@
MyApplication.addOrderView(object : MyApplication.OrderStatueView {
override fun orderInfo(data: OrderSimpleData?) {
data?.let {
- if (it.status == 10 || it.status == 12) {
+ if (it.status == 10 || it.status == 11) {
Handler(Looper.getMainLooper()).post {
- toast("用户已取消订单")
- MyApplication.getTTsManager().setVideoText("用户已取消订单")
+ if (it.status == 10){
+ toast("用户已取消订单")
+ MyApplication.getTTsManager().setVideoText("用户已取消订单")
+ }else{
+ toast("用户已改派订单")
+ MyApplication.getTTsManager().setVideoText("用户已改派订单")
+ }
finish()
+ }
+ }
+ if (it.orderType == 4 || it.orderType == 5 && it.orderId.toString() == orderId) {
+ Handler(Looper.getMainLooper()).post {
+ initView()
}
}
}
@@ -300,6 +310,8 @@
}
}
}
+
+
private fun callNumberCargo(num: String, click: () -> Unit) {
var map = getMapByAny()
@@ -726,7 +738,11 @@
callNumberCargo(num){
dialog.dismiss()
callStartOrder(this,6){
- onBackPressed()
+ startActivity<SlabCargoOverActivity>(
+ "orderId" to orderId,
+ "orderType" to orderType
+ )
+ finish()
}
}
}
--
Gitblit v1.7.1