From b386de74c74a4431b2b735eb77c383b71b3ee5b2 Mon Sep 17 00:00:00 2001
From: 18034727885 <973609879@qq.com>
Date: 星期五, 31 七月 2026 14:50:06 +0800
Subject: [PATCH] 修复问题
---
app/src/main/java/com/driver/igotrip/ui/main/small_cargo/SmallCargoActivity.kt | 42 +++++++++++++++++++++++-------------------
1 files changed, 23 insertions(+), 19 deletions(-)
diff --git a/app/src/main/java/com/driver/igotrip/ui/main/small_cargo/SmallCargoActivity.kt b/app/src/main/java/com/driver/igotrip/ui/main/small_cargo/SmallCargoActivity.kt
index b23669e..fd91a33 100644
--- a/app/src/main/java/com/driver/igotrip/ui/main/small_cargo/SmallCargoActivity.kt
+++ b/app/src/main/java/com/driver/igotrip/ui/main/small_cargo/SmallCargoActivity.kt
@@ -27,6 +27,7 @@
import com.driver.igotrip.base.gaode.AMapKit.initMap
import com.driver.igotrip.base.gaode.AMapKit.moveCamera
import com.driver.igotrip.bean.*
+import com.driver.igotrip.extension.extClearInvalidZero
import com.driver.igotrip.netUtls.*
import com.driver.igotrip.ui.DialogUtil
import com.driver.igotrip.ui.UiUtil
@@ -155,26 +156,27 @@
private fun addSockectCancel() {
checkOrderStatue()
- MyApplication.addOrderView(object : MyApplication.OrderStatueView {
- override fun orderInfo(data: OrderSimpleData?) {
- data?.let {
- if (it.status == 10 || it.status == 11 || it.status == 12) {
- MyApplication.currentOrderType = ""
- MyApplication.currentOrderId = ""
- Handler(Looper.getMainLooper()).post {
- finish()
- }
+ MyApplication.addOrderView(listener)
+ }
+
+ private val listener = object : MyApplication.OrderStatueView {
+ override fun orderInfo(data: OrderSimpleData?) {
+ data?.let {
+ if (it.status == 10 || it.status == 11 || it.status == 12) {
+ MyApplication.currentOrderType = ""
+ MyApplication.currentOrderId = ""
+ Handler(Looper.getMainLooper()).post {
+ finish()
}
- if ((it.orderType == 4 || it.orderType == 5) && it.orderId.toString() == orderId && (it.status != 10 && it.status != 11 && it.status != 12)) {
- Handler(Looper.getMainLooper()).post {
- callOrder() {}
- }
+ }
+ if ((it.orderType == 4 || it.orderType == 5) && it.orderId.toString() == orderId && (it.status != 10 && it.status != 11 && it.status != 12)) {
+ Handler(Looper.getMainLooper()).post {
+ callOrder() {}
}
}
}
- })
+ }
}
-
var handler: Handler? = null
fun checkOrderStatue() {
var map = getMapByAny()
@@ -278,7 +280,8 @@
}
callseatmoney(num) {
dialog.dismiss()
- btn_gap_money.text = getString(R.string.差价待确认).format(num.toDouble())
+ btn_gap_money.text =
+ getString(R.string.差价待确认).format(num.extClearInvalidZero())
btn_gap_money.setCompoundDrawablesRelativeWithIntrinsicBounds(0, 0, 0, 0)
// toast(getString(R.string.set_success))
}
@@ -441,7 +444,7 @@
tv_money.visible()
tv_money.text =
getString(R.string.确认现金金额).format(if (orderType == "4") it.data.expressPayAllMoney else if (it.data.payMoney == 0.0) it.data.orderMoney else it.data.payMoney)
- .replace(",", ".")
+ .replace(",", ".").extClearInvalidZero()
}
tv_sure_car_num.setOnClickListener {
val num = et_num_zg.getContent()
@@ -463,7 +466,7 @@
DialogUtil.getDelAndSureDialog(
this,
getString(R.string.确认现金金额).format(it.data.expressPayAllMoney)
- .replace(",", "."),
+ .replace(",", ".").extClearInvalidZero(),
{},
{
confirmPickUp(url, 5) {
@@ -737,7 +740,7 @@
// }
if (!it.data.differenceMoney.isNullOrEmpty() && it.data.differenceMoney.toDouble() > 0) {
btn_gap_money.text =
- getString(R.string.差价点击修改).format(it.data.differenceMoney.toDouble())
+ getString(R.string.差价点击修改).format(it.data.differenceMoney.extClearInvalidZero())
btn_gap_money.setCompoundDrawablesRelativeWithIntrinsicBounds(0, 0, 0, 0)
}
var latLngList = mutableListOf<LatLng>()
@@ -965,6 +968,7 @@
override fun onDestroy() {
super.onDestroy()
+ MyApplication.removeOrderView(listener)
if (handler != null) {
handler?.removeCallbacksAndMessages(null)
}
--
Gitblit v1.7.1