From b0f715433a54c4bc897dd2bc86fa8ab70727b008 Mon Sep 17 00:00:00 2001
From: liugl <liugl@sinata.cn>
Date: 星期二, 15 十二月 2020 18:05:13 +0800
Subject: [PATCH] 1:新增上线 6版
---
app/src/main/java/com/okgoincar/slab/cargo/CargoActivity.kt | 19 +++++++++++--------
1 files changed, 11 insertions(+), 8 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 af9d752..4a494bd 100644
--- a/app/src/main/java/com/okgoincar/slab/cargo/CargoActivity.kt
+++ b/app/src/main/java/com/okgoincar/slab/cargo/CargoActivity.kt
@@ -180,8 +180,6 @@
Handler(Looper.getMainLooper()).post {
toast("用户已取消订单")
MyApplication.getTTsManager().setVideoText("用户已取消订单")
- MyApplication.currentOrderType = ""
- MyApplication.currentOrderId = ""
finish()
}
}
@@ -469,8 +467,6 @@
private fun callOrder() {
- MyApplication.currentOrderId = orderId
- MyApplication.currentOrderType = orderType
var map = getMapByAny()
map["orderId"] = orderId
map["orderType"] = orderType
@@ -524,13 +520,16 @@
private fun showUi(orderBean: OrderBean?) {
orderBean?.let {
tv_name.text = orderBean.data.nickName
- tv_car_num.text = it.data.historyNum.toString() + "次乘车"
+ tv_car_num.text = it.data.historyNum.toString() + "次寄物"
tv_time.text = it.data.travelTime
tv_start_address.text = it.data.startAddress
tv_end_address.text = it.data.endAddress
tv_name_phone.text = orderBean.data.nickName + "-" + orderBean.data.phone
tv_type_cargo.text = "普通小件X" + orderBean.data.peopleNumber
tv_red_money.text = doubleTwo(orderBean.data.tipMoney) + "元加急费"
+ if (orderBean.data.tipMoney == null || orderBean.data.tipMoney <= 0.0){
+ tv_red_money.gone()
+ }
tv_phone.text = orderBean.data.phone
showStatueMapUI(it)
}
@@ -586,6 +585,10 @@
// 流程操作状态（3=开始出发预约点，4=到达预约点，5=开始服务，6=服务结束）
private fun showStatueMapUI(it: OrderBean) {
getAllMark(it)
+ tv_gap_money.gone()
+ if (it.data.orderState == 4 || it.data.orderState == 8 || it.data.orderState == 12){
+ tv_gap_money.visible()
+ }
when (it.data.orderState) {
2, 3 -> {
clickBroad()
@@ -602,7 +605,7 @@
setTitleText("去取货物")
}
}
- 4,8-> {
+ 4,8,12-> {
clickBroad()
iv_to_gd.gone()
closeLine()
@@ -731,8 +734,8 @@
fun callStartOrder(contexts: Context, i: Int,func:() -> Unit) {
var map = getMapByAny()
- map["orderId"] = MyApplication.currentOrderId
- map["orderType"] = MyApplication.currentOrderType
+ map["orderId"] = orderId
+ map["orderType"] = orderType
map["state"] = i
map["lat"] = MyApplication.getLocation().latitude
map["lon"] = MyApplication.getLocation().longitude
--
Gitblit v1.7.1