From 32275aa66faa5371467e291b7d19a5e782f8aade Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期三, 18 十二月 2024 16:47:18 +0800
Subject: [PATCH] 1.修改取水口坐标相关代码
---
app/src/main/res/layout/activity_issue_detail.xml | 148 ++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 127 insertions(+), 21 deletions(-)
diff --git a/app/src/main/res/layout/activity_issue_detail.xml b/app/src/main/res/layout/activity_issue_detail.xml
index 03f2b32..5ef2931 100644
--- a/app/src/main/res/layout/activity_issue_detail.xml
+++ b/app/src/main/res/layout/activity_issue_detail.xml
@@ -6,7 +6,7 @@
<variable
name="itemclidk"
- type="com.dayu.pipirrapp.activity.OrderDetailActivity" />
+ type="com.dayu.pipirrapp.activity.IssueDetailActivity" />
<variable
name="data"
@@ -31,7 +31,7 @@
android:id="@+id/ScrollView"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:layout_above="@+id/deal_button"
+ android:layout_above="@+id/delete_button"
android:layout_below="@+id/title"
android:layout_marginTop="5dp"
android:layout_marginBottom="5dp">
@@ -54,6 +54,7 @@
android:layout_width="20dp"
android:layout_height="20dp"
android:layout_centerVertical="true"
+ android:layout_marginLeft="3dp"
android:layout_marginRight="10dp"
android:src="@drawable/ic_issue" />
@@ -70,7 +71,7 @@
android:maxLines="1"
android:text="@{data.issueReportId}"
android:textColor="@color/title_color"
- android:textSize="@dimen/manage_item_text_size" />
+ android:textSize="@dimen/order_detail_text_size" />
<TextView
@@ -113,7 +114,7 @@
android:layout_height="wrap_content"
android:text="涓婃姤鏃堕棿锛�"
android:textColor="@color/manage_item_text"
- android:textSize="@dimen/manage_item_text_size" />
+ android:textSize="@dimen/order_detail_text_size" />
<TextView
android:id="@+id/xiangMuJianCheng"
@@ -123,7 +124,7 @@
android:maxLines="1"
android:text="@{data.reportTime}"
android:textColor="@color/manage_item_text"
- android:textSize="@dimen/manage_item_text_size" />
+ android:textSize="@dimen/order_detail_text_size" />
</LinearLayout>
@@ -132,47 +133,152 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
-
+ android:layout_marginTop="10dp"
android:orientation="horizontal">
- <TextView
- android:id="@+id/daiShenPiTag"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="涓婃姤鍐呭锛�"
- android:textColor="@color/manage_item_text"
- android:textSize="@dimen/manage_item_text_size" />
+ <TextView
+ android:id="@+id/daiShenPiTag"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="涓婃姤鍐呭锛�"
+ android:textColor="@color/manage_item_text"
+ android:textSize="@dimen/order_detail_text_size" />
+
+ <TextView
+ android:id="@+id/daiShenPi"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:ellipsize="end"
+ android:maxLines="1"
+ android:text="@{data.content}"
+ android:textColor="@color/manage_item_text"
+ android:textSize="@dimen/order_detail_text_size" />
+ </LinearLayout>
+
+
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:layout_marginTop="10dp"
+ android:orientation="vertical">
+
+ <TextView
+
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="涓婃姤鍥剧墖锛�"
+ android:textColor="@color/manage_item_text"
+ android:textSize="@dimen/order_detail_text_size" />
+
+ <androidx.recyclerview.widget.RecyclerView
+ android:id="@+id/recyclerView"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_centerInParent="true"
+ android:layout_marginTop="10dp"
+ android:minHeight="80dp" />
+
+
+ </LinearLayout>
+
+ <LinearLayout
+ android:id="@+id/callBackLL"
+ android:layout_width="match_parent"
+ android:orientation="vertical"
+ android:layout_height="wrap_content">
+ <LinearLayout
+ android:id="@+id/orderDealLL"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="15dp"
+ android:orientation="vertical"
+ android:visibility="visible">
+
+ <View
+ android:layout_width="match_parent"
+ android:layout_height="2dp"
+ android:background="@color/base_blue" />
+
+ <TextView
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="5dp"
+ android:gravity="center"
+ android:text="鍥炲淇℃伅"
+ android:textColor="@color/base_blue"
+ android:textSize="@dimen/order_detail_text_size" />
+ </LinearLayout>
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="10dp"
+ android:orientation="horizontal">
+
<TextView
- android:id="@+id/daiShenPi"
+
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="鍥炲鏃堕棿锛�"
+ android:textColor="@color/manage_item_text"
+ android:textSize="@dimen/order_detail_text_size" />
+
+ <TextView
+
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:ellipsize="end"
android:maxLines="1"
- android:text="@{data.content}"
+ android:text="@{data.reportTime}"
android:textColor="@color/manage_item_text"
- android:textSize="@dimen/manage_item_text_size" />
+ android:textSize="@dimen/order_detail_text_size" />
+ </LinearLayout>
+
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="10dp"
+ android:orientation="horizontal">
+
+
+ <TextView
+
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="鍥炲鍐呭锛�"
+ android:textColor="@color/manage_item_text"
+ android:textSize="@dimen/order_detail_text_size" />
+
+ <TextView
+
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:ellipsize="end"
+ android:maxLines="1"
+ android:text="@{data.replyContent}"
+ android:textColor="@color/manage_item_text"
+ android:textSize="@dimen/order_detail_text_size" />
</LinearLayout>
-
+ </LinearLayout>
</LinearLayout>
</ScrollView>
<TextView
- android:id="@+id/deal_button"
+ android:id="@+id/delete_button"
android:layout_width="match_parent"
android:layout_height="@dimen/order_detail_button_height"
android:layout_alignParentBottom="true"
android:background="@color/title_color"
android:gravity="center"
- android:onClick="@{()->itemclidk.startDealActivity()}"
- android:text="澶勭悊宸ュ崟"
+ android:onClick="@{()->itemclidk.deleteIssue()}"
+ android:text="鍒犻櫎闂"
android:textColor="@color/white"
android:textSize="@dimen/order_detail_button_size"
- android:visibility="gone" />
+ android:visibility="visible" />
</RelativeLayout>
--
Gitblit v1.8.0