From 9f61ea79464fcaef437e5a9dffe7d62adc1a4ffb Mon Sep 17 00:00:00 2001
From: 18034727885 <973609879@qq.com>
Date: 星期四, 16 七月 2026 14:31:08 +0800
Subject: [PATCH] 升级版本号
---
app/src/main/res/layout/activity_sure_money.xml | 29 +++++++++
app/src/main/res/values-fr/strings.xml | 2
app/src/main/java/com/driver/igotrip/bean/OrderBean.java | 1
app/src/main/java/com/driver/igotrip/ui/main/OrderOverActivity.kt | 5 +
app/src/main/res/values/strings.xml | 2
app/src/main/java/com/driver/igotrip/ui/main/small_cargo/SmallOverActivity.kt | 5 +
app/src/main/res/layout/activity_order_over.xml | 40 +++++++++++++
app/src/main/java/com/driver/igotrip/ui/main/major/MajorSureMoneyActivity.kt | 6 ++
app/src/main/res/values-en/strings.xml | 2
app/src/main/res/layout/activity_order_over_small.xml | 40 +++++++++++++
10 files changed, 129 insertions(+), 3 deletions(-)
diff --git a/app/src/main/java/com/driver/igotrip/bean/OrderBean.java b/app/src/main/java/com/driver/igotrip/bean/OrderBean.java
index 38f5e27..9e83a62 100644
--- a/app/src/main/java/com/driver/igotrip/bean/OrderBean.java
+++ b/app/src/main/java/com/driver/igotrip/bean/OrderBean.java
@@ -202,6 +202,7 @@
public int isFrozen; // 2已冻结
public String platformServerMoney; // 平台服务费
public String driverServerMoney; // 实际收入
+ public String couponMoney; // 优惠券
public String getSnatchOrderTime() {
return snatchOrderTime;
diff --git a/app/src/main/java/com/driver/igotrip/ui/main/OrderOverActivity.kt b/app/src/main/java/com/driver/igotrip/ui/main/OrderOverActivity.kt
index 1662fe4..67b9690 100644
--- a/app/src/main/java/com/driver/igotrip/ui/main/OrderOverActivity.kt
+++ b/app/src/main/java/com/driver/igotrip/ui/main/OrderOverActivity.kt
@@ -9,6 +9,7 @@
import android.widget.ImageView
import android.widget.LinearLayout
import android.widget.TextView
+import androidx.core.view.isVisible
import cn.sinata.xldutils.utils.clickDelay
import cn.sinata.xldutils.utils.doubleOne
import cn.sinata.xldutils.utils.gone
@@ -63,6 +64,8 @@
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_coupon_price by lazy { find<TextView>(R.id.tv_coupon_price) }
+ private val ll_coupon_price by lazy { find<LinearLayout>(R.id.ll_coupon_price) }
private val tv_real_income by lazy { find<TextView>(R.id.tv_real_income) }
private val tv_cancel_to by lazy { find<TextView>(R.id.tv_cancel_to) }
private val tv_cancel_money by lazy { find<TextView>(R.id.tv_cancel_money) }
@@ -116,6 +119,8 @@
}
tv_order_money.text = getString(R.string.money) + it.orderMoney
tv_service_money.text = getString(R.string.money) + it.platformServerMoney
+ tv_coupon_price.text = getString(R.string.money) + it.couponMoney
+ ll_coupon_price.isVisible = (it.couponMoney?.toDoubleOrNull() ?: 0.0) > 0
tv_real_income.text = getString(R.string.money) + it.driverServerMoney
when (orderBean.orderState) {
10,12-> {
diff --git a/app/src/main/java/com/driver/igotrip/ui/main/major/MajorSureMoneyActivity.kt b/app/src/main/java/com/driver/igotrip/ui/main/major/MajorSureMoneyActivity.kt
index 1a15ac8..3516c92 100644
--- a/app/src/main/java/com/driver/igotrip/ui/main/major/MajorSureMoneyActivity.kt
+++ b/app/src/main/java/com/driver/igotrip/ui/main/major/MajorSureMoneyActivity.kt
@@ -48,6 +48,8 @@
private val tv_sure by lazy { find<TextView>(R.id.tv_sure) }
private val tv_price_difference_money by lazy { find<TextView>(R.id.tv_price_difference_money) }
private val price_difference_layout by lazy { find<View>(R.id.price_difference_layout) }
+ private val tv_coupon_price by lazy { find<TextView>(R.id.tv_coupon_price) }
+ private val rl_coupon_price by lazy { find<View>(R.id.rl_coupon_price) }
private val et_long_go_money by lazy { find<EditText>(R.id.et_long_go_money) }
private val et_stop_car_money by lazy { find<EditText>(R.id.et_stop_car_money) }
@@ -93,6 +95,10 @@
if (it.data.priceDifference != null && it.data.priceDifference > 0) View.VISIBLE else View.GONE
tv_price_difference_money.text =
"${getString(R.string.money)} ${it.data.priceDifference}"
+ rl_coupon_price.visibility =
+ if (it.data.couponMoney != null && it.data.couponMoney > 0) View.VISIBLE else View.GONE
+ tv_price_difference_money.text =
+ "-${getString(R.string.money)} ${it.data.couponMoney}"
}
}
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 b4611ff..c36c750 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
@@ -4,6 +4,7 @@
import android.view.View
import android.widget.LinearLayout
import android.widget.TextView
+import androidx.core.view.isVisible
import cn.sinata.xldutils.utils.*
import com.driver.igotrip.R
import com.driver.igotrip.base.BaseEvent
@@ -46,6 +47,8 @@
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_coupon_price by lazy { find<TextView>(R.id.tv_coupon_price) }
+ private val ll_coupon_price by lazy { find<LinearLayout>(R.id.ll_coupon_price) }
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) }
@@ -108,6 +111,8 @@
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_coupon_price.text = getString(R.string.money) + it.couponMoney
+ ll_coupon_price.isVisible = (it.couponMoney?.toDoubleOrNull() ?: 0.0) > 0
tv_real_income.text = getString(R.string.money) + it.driverServerMoney
ll_pay_result.visible()
if (it.orderState in 6..7) {
diff --git a/app/src/main/res/layout/activity_order_over.xml b/app/src/main/res/layout/activity_order_over.xml
index c6421a0..688d784 100644
--- a/app/src/main/res/layout/activity_order_over.xml
+++ b/app/src/main/res/layout/activity_order_over.xml
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
@@ -90,6 +91,45 @@
</LinearLayout>
<LinearLayout
+ android:id="@+id/ll_coupon_price"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:gravity="center_vertical"
+ android:orientation="horizontal"
+ android:visibility="gone"
+ tools:visibility="visible">
+
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginVertical="11dp"
+ android:text="@string/优惠券"
+ android:textColor="#ff27282d"
+ android:textSize="14sp"
+ android:textStyle="bold" />
+
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginHorizontal="6dp"
+ android:layout_marginVertical="11dp"
+ android:text=":"
+ android:textColor="#ff27282d"
+ android:textSize="14sp"
+ android:textStyle="bold" />
+
+ <TextView
+ android:id="@+id/tv_coupon_price"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="0"
+ android:textColor="@color/color_e72c1c"
+ android:textSize="16sp"
+ android:textStyle="bold" />
+
+ </LinearLayout>
+
+ <LinearLayout
android:id="@+id/ll_real_income"
android:layout_width="match_parent"
android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/activity_order_over_small.xml b/app/src/main/res/layout/activity_order_over_small.xml
index 8e41be7..ac1b5d6 100644
--- a/app/src/main/res/layout/activity_order_over_small.xml
+++ b/app/src/main/res/layout/activity_order_over_small.xml
@@ -2,6 +2,7 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
+ xmlns:tools="http://schemas.android.com/tools"
android:orientation="vertical">
<include layout="@layout/include_order_top_cargo" />
@@ -90,6 +91,45 @@
</LinearLayout>
<LinearLayout
+ android:id="@+id/ll_coupon_price"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:gravity="center_vertical"
+ android:visibility="gone"
+ tools:visibility="visible"
+ android:orientation="horizontal">
+
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginVertical="11dp"
+ android:text="@string/优惠券"
+ android:textColor="#ff27282d"
+ android:textSize="14sp"
+ android:textStyle="bold" />
+
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginHorizontal="6dp"
+ android:layout_marginVertical="11dp"
+ android:text=":"
+ android:textColor="#ff27282d"
+ android:textSize="14sp"
+ android:textStyle="bold" />
+
+ <TextView
+ android:id="@+id/tv_coupon_price"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="0"
+ android:textColor="@color/color_e72c1c"
+ android:textSize="16sp"
+ android:textStyle="bold" />
+
+ </LinearLayout>
+
+ <LinearLayout
android:id="@+id/ll_real_income"
android:layout_width="match_parent"
android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/activity_sure_money.xml b/app/src/main/res/layout/activity_sure_money.xml
index bfa34bb..e674584 100644
--- a/app/src/main/res/layout/activity_sure_money.xml
+++ b/app/src/main/res/layout/activity_sure_money.xml
@@ -251,6 +251,35 @@
</RelativeLayout>
+ <RelativeLayout
+ android:id="@+id/rl_coupon_price"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginStart="12dp"
+ android:layout_marginTop="15dp"
+ android:layout_marginEnd="12dp"
+ android:visibility="gone"
+ tools:visibility="visible">
+
+ <TextView
+ android:layout_width="200dp"
+ android:layout_height="wrap_content"
+ android:layout_centerVertical="true"
+ android:text="@string/优惠券"
+ android:textColor="#ff000000"
+ android:textSize="12sp" />
+
+ <TextView
+ android:id="@+id/tv_coupon_price"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_alignParentEnd="true"
+ android:layout_centerVertical="true"
+ android:textColor="#ff333333"
+ android:textSize="12sp"
+ tools:text="-0.00元" />
+ </RelativeLayout>
+
<LinearLayout
android:visibility="gone"
diff --git a/app/src/main/res/values-en/strings.xml b/app/src/main/res/values-en/strings.xml
index 01fa077..48545fd 100644
--- a/app/src/main/res/values-en/strings.xml
+++ b/app/src/main/res/values-en/strings.xml
@@ -827,5 +827,5 @@
<string name="请上传图片">please upload images</string>
<string name="请在应用权限页面开启相机权限">Please enable camera permissions on the app permissions page</string>
<string name="实际收入">Real income</string>
-
+ <string name="优惠券">Coupon</string>
</resources>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 27a18e3..869b49c 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -831,5 +831,5 @@
<string name="请上传图片">Veuillez télécharger une image</string>
<string name="请在应用权限页面开启相机权限">Veuillez activer les autorisations de la caméra sur la page autorisations de l\'application</string>
<string name="实际收入">Revenus réels</string>
-
+ <string name="优惠券">Coupon</string>
</resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 884a281..df8271c 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -819,5 +819,5 @@
<string name="请上传图片">请上传图片</string>
<string name="请在应用权限页面开启相机权限">请在应用权限页面开启相机权限</string>
<string name="实际收入">实际收入</string>
-
+ <string name="优惠券">优惠券</string>
</resources>
--
Gitblit v1.7.1