From 4d4ea99692f385ee01ac1b86c48735c8825e737f Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期一, 18 八月 2025 16:40:05 +0800
Subject: [PATCH] fix(net): 更新基础 URL 地址
---
app/src/main/res/layout/activity_order_deal.xml | 69 ++++++++++++++++++++++++++++++++--
1 files changed, 65 insertions(+), 4 deletions(-)
diff --git a/app/src/main/res/layout/activity_order_deal.xml b/app/src/main/res/layout/activity_order_deal.xml
index cd2e5e8..a254f14 100644
--- a/app/src/main/res/layout/activity_order_deal.xml
+++ b/app/src/main/res/layout/activity_order_deal.xml
@@ -10,7 +10,7 @@
<variable
name="data"
- type="com.dayu.pipirrapp.bean.net.OrderListResult.Data" />
+ type="com.dayu.pipirrapp.bean.net.OrderDetailResult" />
</data>
<RelativeLayout
@@ -31,11 +31,66 @@
android:layout_above="@+id/deal_button"
android:layout_below="@+id/title"
android:orientation="vertical"
- android:padding="20dp">
+ >
+
+
+ <RelativeLayout
+ android:id="@+id/timeLL"
+ android:layout_width="match_parent"
+ android:layout_height="40dp"
+ android:gravity="center"
+ android:layout_marginRight="20dp"
+ android:layout_marginLeft="20dp"
+ android:layout_marginTop="20dp"
+ android:background="@drawable/my_item_ripple"
+ android:orientation="horizontal">
+
+ <TextView
+ android:id="@+id/leftiocn"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="* "
+ android:gravity="center"
+
+ android:layout_centerVertical="true"
+ android:textColor="@color/base_red"
+ android:textSize="@dimen/order_detail_button_size" />
+
+ <TextView
+ android:id="@+id/timeTV"
+ android:layout_width="wrap_content"
+
+ android:layout_height="wrap_content"
+ android:layout_centerVertical="true"
+ android:layout_toEndOf="@+id/leftiocn"
+ android:text="鍙嶉鏃堕棿锛�"
+ android:textColor="@color/black"
+ android:textSize="@dimen/order_detail_button_size" />
+ <TextView
+ android:id="@+id/timeData"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_centerVertical="true"
+ android:layout_toEndOf="@+id/timeTV"
+ android:layout_marginLeft="10dp"
+ android:textColor="@color/black"
+ android:textSize="@dimen/order_detail_button_size" />
+ <ImageView
+ android:layout_width="25dp"
+ android:layout_height="25dp"
+ android:layout_alignParentRight="true"
+ android:layout_centerVertical="true"
+
+ android:src="@drawable/ic_right" />
+ </RelativeLayout>
+
<LinearLayout
android:layout_width="match_parent"
+ android:layout_marginTop="10dp"
android:layout_height="wrap_content"
+ android:layout_marginRight="20dp"
+ android:layout_marginLeft="20dp"
android:orientation="horizontal">
<TextView
@@ -63,12 +118,16 @@
android:gravity="start"
android:maxHeight="200dp"
android:minHeight="100dp"
+ android:layout_marginRight="20dp"
+ android:layout_marginLeft="20dp"
android:text="" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
+ android:layout_marginRight="20dp"
+ android:layout_marginLeft="20dp"
android:orientation="horizontal">
<TextView
@@ -82,7 +141,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:text="鎻愪氦鍥剧墖锛�"
+ android:text="鎻愪氦鍥剧墖鎴栬棰戯細"
android:textColor="@color/black"
android:textSize="@dimen/order_detail_button_size" />
</LinearLayout>
@@ -91,6 +150,8 @@
android:id="@+id/recycler"
android:layout_width="match_parent"
android:layout_height="wrap_content"
+ android:layout_marginRight="20dp"
+ android:layout_marginLeft="20dp"
android:layout_marginTop="10dp"
android:background="@color/white"
android:overScrollMode="never"
@@ -102,8 +163,8 @@
android:id="@+id/deal_button"
android:layout_width="match_parent"
android:layout_height="@dimen/order_detail_button_height"
+ android:background="@drawable/bottom_butten_blue_ripple"
android:layout_alignParentBottom="true"
- android:background="@color/title_color"
android:gravity="center"
android:text="鎻� 浜�"
android:textColor="@color/white"
--
Gitblit v1.8.0