From 43815208e13dbafaebfdc3d1780c692d0b0397f2 Mon Sep 17 00:00:00 2001
From: 18034727885 <973609879@qq.com>
Date: 星期五, 28 八月 2026 14:07:25 +0800
Subject: [PATCH] 修复问题 升级版本号

---
 app/src/main/java/com/driver/igotrip/ui/main/small_cargo/SmallCargoActivity.kt |    4 ++--
 app/build.gradle                                                               |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index f6a20c5..8753863 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -29,8 +29,8 @@
         applicationId "com.driver.goposttrip"
         minSdkVersion 23
         targetSdkVersion 35
-        versionCode 55
-        versionName "1.7.6"
+        versionCode 56
+        versionName "1.7.7"
         multiDexEnabled true
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
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 7eefe9c..d2c6d73 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
@@ -443,7 +443,7 @@
             if (it.data.driverPay == "1") {
                 tv_money.visible()
                 tv_money.text =
-                    getString(R.string.确认现金金额).format(if (orderType == "4") it.data.expressPayAllMoney else if (it.data.payMoney.isNullOrEmpty()) it.data.orderMoney else it.data.payMoney)
+                    getString(R.string.确认现金金额).format(if (orderType == "4") it.data.payMoney else if (it.data.payMoney.isNullOrEmpty()) it.data.orderMoney else it.data.payMoney)
                         .replace(",", ".").extClearInvalidZero()
             }
             tv_sure_car_num.setOnClickListener {
@@ -468,7 +468,7 @@
         orderBean?.let {
             DialogUtil.getDelAndSureDialog(
                 this,
-                getString(R.string.确认现金金额).format(it.data.expressPayAllMoney)
+                getString(R.string.确认现金金额).format(it.data.payMoney.toFloat())
                     .replace(",", ".").extClearInvalidZero(),
                 {},
                 {

--
Gitblit v1.7.1