From eb6124e310ae8875a0150ee5d2edd52d5a579d87 Mon Sep 17 00:00:00 2001
From: 18034727885 <973609879@qq.com>
Date: 星期四, 02 七月 2026 17:08:21 +0800
Subject: [PATCH] 快件订单优化
---
app/src/main/java/com/driver/igotrip/ui/main/small_cargo/SmallOverActivity.kt | 30 +++++++++++++++++++++---------
1 files changed, 21 insertions(+), 9 deletions(-)
diff --git a/app/src/main/java/com/driver/igotrip/ui/main/small_cargo/SmallOverActivity.kt b/app/src/main/java/com/driver/igotrip/ui/main/small_cargo/SmallOverActivity.kt
index 5b4bfde..b4611ff 100644
--- a/app/src/main/java/com/driver/igotrip/ui/main/small_cargo/SmallOverActivity.kt
+++ b/app/src/main/java/com/driver/igotrip/ui/main/small_cargo/SmallOverActivity.kt
@@ -43,6 +43,12 @@
private val tv_end_address by lazy { find<TextView>(R.id.tv_end_address) }
private val tv_money_cargo by lazy { find<TextView>(R.id.tv_money_cargo) }
private val tv_remark by lazy { find<TextView>(R.id.tv_remark) }
+ private val ll_order_money by lazy { find<LinearLayout>(R.id.ll_order_money) }
+ private val tv_order_money by lazy { find<TextView>(R.id.tv_order_money) }
+ private val ll_service_money by lazy { find<LinearLayout>(R.id.ll_service_money) }
+ private val tv_service_money by lazy { find<TextView>(R.id.tv_service_money) }
+ private val ll_real_income by lazy { find<LinearLayout>(R.id.ll_real_income) }
+ private val tv_real_income by lazy { find<TextView>(R.id.tv_real_income) }
private val tv_pay_result_small_money by lazy { find<TextView>(R.id.tv_pay_result_small_money) }
private val tv_tv_num_cargo by lazy { find<TextView>(R.id.tv_tv_num_cargo) }
private val tv_people_cargo by lazy { find<TextView>(R.id.tv_people_cargo) }
@@ -100,27 +106,31 @@
getString(R.string.其中含加急费用) + it.tipMoney.toString()
setTitleText(getSmallStatue(it.orderState))
tv_pay_result_title.text = getString(R.string.订单) + getSmallStatue(it.orderState)
+ tv_order_money.text = getString(R.string.money) + it.orderMoney
+ tv_service_money.text = getString(R.string.money) + it.platformServerMoney
+ tv_real_income.text = getString(R.string.money) + it.driverServerMoney
ll_pay_result.visible()
if (it.orderState in 6..7) {
tv_pay_result_title.text = getString(R.string.待乘客支付)
- }else if (it.orderState == 8){
+ } else if (it.orderState == 8) {
tv_pay_result_title.text = getString(R.string.订单待评价)
- }else if (it.orderState == 9){
+ } else if (it.orderState == 9) {
tv_pay_result_title.text = getString(R.string.订单已完成)
- }else if (it.orderState == 10||it.orderState == 12){
+ } else if (it.orderState == 10 || it.orderState == 12) {
ll_order_cancel.visible()
iv_phone.gone()
ll_pay_result.gone()
tv_cancel_to.text = it.cancelUser
- tv_cancel_money.text = getString(R.string.money) +" "+ doubleOne(it.cancelPayMoney)
+ tv_cancel_money.text =
+ getString(R.string.money) + " " + doubleOne(it.cancelPayMoney)
tv_cancel_result.text = it.cancelReason
tv_cancel_s.text = it.cancelRemark
- if (it.cancelRemark.isNullOrEmpty()){
+ if (it.cancelRemark.isNullOrEmpty()) {
tv_cancel_s.text = ""
}
}
- if (it.orderState in 6..9){
+ if (it.orderState in 6..9) {
tv_pay_result_small_money.text = getString(R.string.查看收费明细)
tv_pay_result_small_money.visible()
view_line_money_detail.visible()
@@ -131,10 +141,12 @@
)
}
}
- if (it.isFrozen == 2){
+ if (it.isFrozen == 2) {
tv_frozen.visible()
- tv_frozen.setCompoundDrawablesRelativeWithIntrinsicBounds(0,
- UiUtil.getFrozenBitmap(),0,0)
+ tv_frozen.setCompoundDrawablesRelativeWithIntrinsicBounds(
+ 0,
+ UiUtil.getFrozenBitmap(), 0, 0
+ )
}
}
}
--
Gitblit v1.7.1