From 778b6d9b76c4ddb417a173eba231bc8179580f1f Mon Sep 17 00:00:00 2001
From: MTing <mate163@163.com>
Date: Wed, 10 Sep 2025 16:37:57 +0800
Subject: [PATCH] fix ui

---
 .../com/ouxuan/oxface/orderOX/adapter/OrderSelectionAdapter.java  | 7 ++++---
 app/src/main/res/drawable/verify_button_background.xml            | 6 +++---
 app/src/main/res/layout/item_order_selection.xml                  | 8 +++++---
 3 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/app/src/main/java/com/ouxuan/oxface/orderOX/adapter/OrderSelectionAdapter.java b/app/src/main/java/com/ouxuan/oxface/orderOX/adapter/OrderSelectionAdapter.java
index c77c9c1..6cdd833 100644
--- a/app/src/main/java/com/ouxuan/oxface/orderOX/adapter/OrderSelectionAdapter.java
+++ b/app/src/main/java/com/ouxuan/oxface/orderOX/adapter/OrderSelectionAdapter.java
@@ -267,9 +267,10 @@ public class OrderSelectionAdapter extends RecyclerView.Adapter<OrderSelectionAd
         valueView.setText(value);
         valueView.setTextColor(0xFF1B1B1B);
         valueView.setTextSize(11); // 略微减小字体
-        valueView.setSingleLine(false); // 允许换行但优化显示
-        valueView.setMaxLines(2); // 最多两行
-        valueView.setEllipsize(android.text.TextUtils.TruncateAt.END); // 超出显示省略号
+        // 修改这里：允许单行显示，并使用滚动效果处理超长文本
+        valueView.setSingleLine(true); // 强制单行显示
+        valueView.setEllipsize(android.text.TextUtils.TruncateAt.MARQUEE); // 滚动效果
+        valueView.setSelected(true); // 启用滚动效果
         LinearLayout.LayoutParams valueParams = new LinearLayout.LayoutParams(
             0, 
             LinearLayout.LayoutParams.WRAP_CONTENT,
diff --git a/app/src/main/res/drawable/verify_button_background.xml b/app/src/main/res/drawable/verify_button_background.xml
index f9c5f43..0a17bab 100644
--- a/app/src/main/res/drawable/verify_button_background.xml
+++ b/app/src/main/res/drawable/verify_button_background.xml
@@ -3,8 +3,8 @@
     android:shape="rectangle">
     <solid android:color="#FF6B35" />
     <corners
-        android:topLeftRadius="0dp"
+        android:topLeftRadius="8dp"
         android:topRightRadius="0dp"
-        android:bottomLeftRadius="38dp"
-        android:bottomRightRadius="0dp" />
+        android:bottomLeftRadius="0dp"
+        android:bottomRightRadius="4dp" />
 </shape>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_order_selection.xml b/app/src/main/res/layout/item_order_selection.xml
index 0b24e38..18034f5 100644
--- a/app/src/main/res/layout/item_order_selection.xml
+++ b/app/src/main/res/layout/item_order_selection.xml
@@ -55,7 +55,7 @@
         android:layout_toRightOf="@id/divider_line"
         android:layout_marginLeft="15dp"
         android:layout_marginTop="16dp"
-        android:layout_marginRight="100dp"
+        android:layout_marginRight="15dp"
         android:layout_marginBottom="16dp"
         android:orientation="vertical">
 
@@ -198,13 +198,15 @@
 
     </LinearLayout>
 
-    <!-- 右上角核销按钮 -->
+    <!-- 放置在整个布局右下角的核销按钮，与背景圆角融合 -->
     <TextView
         android:id="@+id/tv_verify_button"
         android:layout_width="80dp"
         android:layout_height="36dp"
-        android:layout_alignParentTop="true"
         android:layout_alignParentRight="true"
+        android:layout_alignParentBottom="true"
+        android:layout_marginRight="0dp"
+        android:layout_marginBottom="0dp"
         android:background="@drawable/verify_button_background"
         android:clickable="true"
         android:focusable="true"