From 4aa19f7eede397f8e0b862a0aab15d9a14e88ce5 Mon Sep 17 00:00:00 2001
From: liugl <liugl@sinata.cn>
Date: 星期四, 31 十二月 2020 17:10:55 +0800
Subject: [PATCH] 1:新增上线
---
app/src/main/java/com/okgoincar/slab/cargo/CargoActivity.kt | 57 +++++++++++++++++++++++++++++++++++++--------------------
1 files changed, 37 insertions(+), 20 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 4c73626..d9a471f 100644
--- a/app/src/main/java/com/okgoincar/slab/cargo/CargoActivity.kt
+++ b/app/src/main/java/com/okgoincar/slab/cargo/CargoActivity.kt
@@ -173,29 +173,36 @@
}
private fun addSockectCancel() {
- MyApplication.addOrderView(object : MyApplication.OrderStatueView {
- override fun orderInfo(data: OrderSimpleData?) {
- data?.let {
- if (it.status == 10 || it.status == 11) {
- Handler(Looper.getMainLooper()).post {
- if (it.status == 10){
- toast("用户已取消订单")
- MyApplication.getTTsManager().setVideoText("用户已取消订单")
- }else{
- toast("用户已改派订单")
- MyApplication.getTTsManager().setVideoText("用户已改派订单")
- }
- finish()
+ MyApplication.addOrderView(orderView)
+ }
+
+ var orderView = object : MyApplication.OrderStatueView {
+ override fun orderInfo(data: OrderSimpleData?) {
+ data?.let {
+ if (it.status == 10 || it.status == 11) {
+ Handler(Looper.getMainLooper()).post {
+ 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()
- }
+ }
+ if (it.orderType == 4 || it.orderType == 5 && it.orderId.toString() == orderId) {
+ Handler(Looper.getMainLooper()).post {
+ initView()
}
}
}
- })
+ }
+ }
+
+ override fun finish() {
+ MyApplication.removeOrderView(orderView)
+ super.finish()
}
override fun onBackPressed() {
@@ -285,8 +292,11 @@
showStatueMapUI(it)
}
5, 6 -> {
- it.data.orderState = 6
- showChangeCargoDialog()
+ sendCode {
+ it.data.orderState = 6
+ showChangeCargoDialog()
+ }
+
}
12 -> {
it.data.orderState = 5
@@ -315,6 +325,13 @@
}
}
+ private fun sendCode(function: () -> Unit) {
+ var map = getMapByAny()
+ map["orderId"] = orderId
+ callNet(true,Api.sendVerificationCode, map) {
+ function()
+ }
+ }
private fun callNumberCargo(num: String, click: () -> Unit) {
--
Gitblit v1.7.1