From ebff085ad82a37ce4d3fdf61e67bf47b30285443 Mon Sep 17 00:00:00 2001
From: 18034727885 <973609879@qq.com>
Date: 星期五, 17 七月 2026 11:15:13 +0800
Subject: [PATCH] 优惠券优化
---
app/src/main/res/layout/layout_confirm_special.xml | 96 ++++++++++++++++++++++++++++-------------------
1 files changed, 57 insertions(+), 39 deletions(-)
diff --git a/app/src/main/res/layout/layout_confirm_special.xml b/app/src/main/res/layout/layout_confirm_special.xml
index acbfe3f..b229d83 100644
--- a/app/src/main/res/layout/layout_confirm_special.xml
+++ b/app/src/main/res/layout/layout_confirm_special.xml
@@ -1,70 +1,72 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/cl_special"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
android:background="@drawable/bg_fd_6dp"
- tools:visibility="visible"
- android:visibility="gone">
+ android:visibility="gone"
+ tools:visibility="visible">
+
<HorizontalScrollView
- app:layout_constraintTop_toTopOf="parent"
- android:layout_width="match_parent"
- android:scrollbars="none"
android:id="@+id/sc_type"
- android:layout_height="wrap_content">
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:scrollbars="none"
+ app:layout_constraintTop_toTopOf="parent">
+
<LinearLayout
+ android:id="@+id/ll_type"
android:layout_width="wrap_content"
android:layout_height="131dp"
- android:orientation="horizontal"
- android:id="@+id/ll_type"/>
+ android:orientation="horizontal" />
</HorizontalScrollView>
<TextView
+ android:id="@+id/tv_empty"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- app:layout_constraintTop_toTopOf="parent"
- app:layout_constraintBottom_toBottomOf="@id/sc_type"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintEnd_toEndOf="parent"
android:text="@string/暂无可选类型"
android:visibility="gone"
- android:id="@+id/tv_empty"/>
+ app:layout_constraintBottom_toBottomOf="@id/sc_type"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toTopOf="parent" />
<TextView
+ android:id="@+id/tv_error"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- app:layout_constraintTop_toTopOf="parent"
android:layout_marginTop="16dp"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintEnd_toEndOf="parent"
android:text="@string/获取车辆类型失败"
android:visibility="gone"
- android:id="@+id/tv_error"/>
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toTopOf="parent" />
<TextView
+ android:id="@+id/tv_retry"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:id="@+id/tv_retry"
- android:text="@string/重新获取"
- android:background="@drawable/bg_white_4dp_line"
- app:layout_constraintTop_toBottomOf="@id/tv_error"
android:layout_marginTop="8dp"
+ android:background="@drawable/bg_white_4dp_line"
+ android:padding="8dp"
+ android:text="@string/重新获取"
android:textSize="12sp"
android:visibility="gone"
- app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
- android:padding="8dp"/>
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toBottomOf="@id/tv_error" />
<View
android:layout_width="match_parent"
android:layout_height="1px"
android:layout_marginStart="14dp"
android:layout_marginEnd="14dp"
+ android:layout_marginBottom="2dp"
android:background="@color/dividing_line_color"
- app:layout_constraintBottom_toBottomOf="@id/sc_type"
- android:layout_marginBottom="2dp"/>
+ app:layout_constraintBottom_toBottomOf="@id/sc_type" />
<TextView
@@ -82,46 +84,62 @@
app:layout_constraintBaseline_toBaselineOf="@id/tv_passenger_special"
app:layout_constraintEnd_toStartOf="@id/vertical_1_special"
app:layout_constraintStart_toStartOf="parent" />
+
<View
android:id="@+id/vertical_1_special"
android:layout_width="1dp"
android:layout_height="20dp"
- android:visibility="gone"
- app:layout_constraintTop_toTopOf="@id/tv_passenger_special"
- app:layout_constraintBottom_toBottomOf="@id/tv_passenger_special"
android:background="@color/dividing_line_color"
+ android:visibility="gone"
+ app:layout_constraintBottom_toBottomOf="@id/tv_passenger_special"
app:layout_constraintEnd_toStartOf="@id/tv_passenger_special"
- app:layout_constraintStart_toEndOf="@id/tv_time_special"/>
+ app:layout_constraintStart_toEndOf="@id/tv_time_special"
+ app:layout_constraintTop_toTopOf="@id/tv_passenger_special" />
<TextView
android:id="@+id/tv_passenger_special"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
- android:visibility="invisible"
android:drawableEnd="@mipmap/icon_more_black"
android:drawablePadding="3dp"
android:paddingTop="14dp"
- app:layout_constraintTop_toBottomOf="@id/sc_type"
android:paddingBottom="14dp"
android:text="@string/选乘车人"
android:textColor="@color/textColor"
android:textSize="12sp"
+ android:visibility="invisible"
app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintStart_toEndOf="@id/vertical_1_special" />
+ app:layout_constraintStart_toEndOf="@id/vertical_1_special"
+ app:layout_constraintTop_toBottomOf="@id/sc_type"
+ tools:visibility="gone" />
+
+ <CheckBox
+ android:id="@+id/cb_use_coupon_special"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:button="@drawable/selector_radio"
+ android:checked="true"
+ app:layout_goneMarginTop="12dp"
+ android:gravity="center_vertical"
+ android:text="@string/使用优惠券抵扣"
+ android:textColor="@color/textColor"
+ android:textSize="12sp"
+ app:layout_constraintStart_toStartOf="@id/tv_action_special"
+ app:layout_constraintTop_toBottomOf="@id/tv_passenger_special" />
<TextView
android:id="@+id/tv_action_special"
style="@style/style_tv_action"
android:layout_width="match_parent"
- android:layout_marginTop="12dp"
android:layout_height="wrap_content"
+ android:layout_marginStart="40dp"
+ android:layout_marginTop="12dp"
+ android:layout_marginEnd="40dp"
android:layout_marginBottom="14dp"
android:text="@string/呼叫司机"
- android:layout_marginStart="40dp"
- android:layout_marginEnd="40dp"
app:layout_constraintBottom_toBottomOf="parent"
- app:layout_constraintTop_toBottomOf="@id/tv_time_special"
app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintStart_toStartOf="parent"/>
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toBottomOf="@id/cb_use_coupon_special" />
</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
--
Gitblit v1.7.1