From 6d95b784f6594b49f103330479f98ab38489946a Mon Sep 17 00:00:00 2001
From: liugl <liugl@sinata.cn>
Date: 星期三, 30 十二月 2020 10:39:18 +0800
Subject: [PATCH] 1:新增上线
---
app/src/main/java/com/okgoincar/slab/cargo/CargoActivity.kt | 38 +++++++++++++++++++++++++++++++++-----
1 files changed, 33 insertions(+), 5 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..4c73626 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()
}
}
}
@@ -259,6 +269,10 @@
}
tv_gap_money.clickDelay {
+ if (orderBean.data.orderState == 12){
+ toast("用户已支付差价，不能修改")
+ return@clickDelay
+ }
showGaoMoneyDialog()
}
@@ -301,6 +315,8 @@
}
}
+
+
private fun callNumberCargo(num: String, click: () -> Unit) {
var map = getMapByAny()
map["orderId"] = orderId
@@ -314,7 +330,7 @@
private fun callseatmoney(num: String, click: () -> Unit) {
var map = getMapByAny()
map["orderId"] = orderId
- map["difference"] = num
+ map["difference"] = doubleTwo(num.toDouble())
callNet(true,Api.makeUpTheDifference, map) {
click()
}
@@ -531,6 +547,9 @@
tv_red_money.gone()
}
tv_phone.text = orderBean.data.phone
+ if (!it.data.differenceMoney.isNullOrEmpty() && it.data.differenceMoney.toDouble() > 0){
+ tv_gap_money.text = "￥"+doubleTwo(it.data.differenceMoney.toDouble())+"差价(点击修改)"
+ }
showStatueMapUI(it)
}
}
@@ -726,7 +745,11 @@
callNumberCargo(num){
dialog.dismiss()
callStartOrder(this,6){
- onBackPressed()
+ startActivity<SlabCargoOverActivity>(
+ "orderId" to orderId,
+ "orderType" to orderType
+ )
+ finish()
}
}
}
@@ -759,8 +782,13 @@
toast("请输入金额")
return@setOnClickListener
}
+ if (num.toDouble() > 9999) {
+ toast("金额不能大于9999元")
+ return@setOnClickListener
+ }
callseatmoney(num){
dialog.dismiss()
+ tv_gap_money.text = "￥"+doubleTwo(num.toDouble())+"差价(点击修改)"
toast("设置成功")
}
}
--
Gitblit v1.7.1