From c2c902a3bf998632ffffa9c1508aceba7b5a7b45 Mon Sep 17 00:00:00 2001 From: zuoxiao <470321431@qq.com> Date: 星期五, 10 一月 2025 11:14:09 +0800 Subject: [PATCH] 1.添加网络视频的显示功能相关 --- app/src/main/res/layout/activity_issue_detail.xml | 310 +++++++++++++++++++++++++++++++++++++-------------- 1 files changed, 222 insertions(+), 88 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..f99b998 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"> @@ -40,100 +40,114 @@ <LinearLayout android:layout_width="match_parent" android:layout_height="match_parent" - android:orientation="vertical" - android:padding="20dp"> + android:orientation="vertical"> - <RelativeLayout + <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" - android:minHeight="30dp" - android:orientation="horizontal"> + android:layout_marginLeft="10dp" + android:layout_marginTop="15dp" + android:layout_marginRight="10dp" + android:layout_marginBottom="20dp" + android:background="@drawable/bg_detail_wite" + android:orientation="vertical" + android:paddingLeft="10dp" + android:paddingTop="15dp" + android:paddingRight="10dp" + android:paddingBottom="20dp"> - <ImageView - android:id="@+id/ic_project" - android:layout_width="20dp" - android:layout_height="20dp" - android:layout_centerVertical="true" - android:layout_marginRight="10dp" - android:src="@drawable/ic_issue" /> - - <TextView - android:id="@+id/projectName" + <RelativeLayout android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_centerVertical="true" + android:minHeight="30dp" + android:orientation="horizontal"> - android:layout_marginEnd="15dp" - android:layout_toStartOf="@+id/stateText" - android:layout_toEndOf="@+id/ic_project" - android:ellipsize="end" - android:maxLines="1" - android:text="@{data.issueReportId}" - android:textColor="@color/title_color" - android:textSize="@dimen/manage_item_text_size" /> - - - <TextView - android:id="@+id/stateText" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_alignParentRight="true" - android:layout_centerVertical="true" - android:background="@drawable/ic_edt_gray_bg" - android:gravity="center" - android:paddingLeft="10dp" - android:paddingTop="5dp" - android:paddingRight="10dp" - android:paddingBottom="5dp" - android:text="@{data.state}" - android:textColor="@color/black" - android:textSize="@dimen/manage_item_text_state_size" /> - - - </RelativeLayout> - - <LinearLayout - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_marginTop="5dp" - android:gravity="center_vertical" - android:orientation="horizontal"> - - <LinearLayout - android:layout_width="0dp" - android:layout_height="wrap_content" - android:layout_weight="1" - android:gravity="center_vertical" - android:orientation="horizontal" - android:paddingRight="5dp"> + <ImageView + android:id="@+id/ic_project" + 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" /> <TextView - - 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/xiangMuJianCheng" + android:id="@+id/projectName" android:layout_width="match_parent" android:layout_height="wrap_content" + android:layout_centerVertical="true" + + android:layout_marginEnd="15dp" + android:layout_toStartOf="@+id/stateText" + android:layout_toEndOf="@+id/ic_project" android:ellipsize="end" android:maxLines="1" - android:text="@{data.reportTime}" - android:textColor="@color/manage_item_text" - android:textSize="@dimen/manage_item_text_size" /> + android:text="@{data.issueReportId}" + android:textColor="@color/title_color" + android:textSize="@dimen/order_detail_text_size" /> + + + <TextView + android:id="@+id/stateText" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_alignParentRight="true" + android:layout_centerVertical="true" + android:background="@drawable/ic_edt_gray_bg" + android:gravity="center" + android:paddingLeft="10dp" + android:paddingTop="5dp" + android:paddingRight="10dp" + android:paddingBottom="5dp" + android:text="@{data.state}" + android:textColor="@color/black" + android:textSize="@dimen/manage_item_text_state_size" /> + + + </RelativeLayout> + + <LinearLayout + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginTop="5dp" + android:gravity="center_vertical" + android:orientation="horizontal"> + + <LinearLayout + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_weight="1" + android:gravity="center_vertical" + android:orientation="horizontal" + android:paddingRight="5dp"> + + <TextView + + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="涓婃姤鏃堕棿锛�" + android:textColor="@color/item_name_text_color" + android:textSize="@dimen/order_detail_text_size" /> + + <TextView + android:id="@+id/xiangMuJianCheng" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:ellipsize="end" + android:maxLines="1" + android:text="@{data.reportTime}" + android:textColor="@color/manage_item_text" + android:textSize="@dimen/order_detail_text_size" /> + </LinearLayout> + + </LinearLayout> - - </LinearLayout> - - <LinearLayout - android:layout_width="match_parent" - android:layout_height="wrap_content" - - android:orientation="horizontal"> + <LinearLayout + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginTop="10dp" + android:orientation="horizontal"> <TextView @@ -141,8 +155,8 @@ 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" /> + android:textColor="@color/item_name_text_color" + android:textSize="@dimen/order_detail_text_size" /> <TextView android:id="@+id/daiShenPi" @@ -152,27 +166,147 @@ android:maxLines="1" android:text="@{data.content}" 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="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/item_name_text_color" + 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> + + <LinearLayout + android:id="@+id/callBackLL" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginLeft="10dp" + android:layout_marginTop="15dp" + android:layout_marginRight="10dp" + android:layout_marginBottom="20dp" + android:background="@drawable/bg_detail_wite" + android:orientation="vertical" + android:paddingLeft="10dp" + android:paddingTop="15dp" + android:paddingRight="10dp" + android:paddingBottom="20dp"> + + <LinearLayout + android:id="@+id/orderDealLL" + android:layout_width="match_parent" + android:layout_height="wrap_content" + + android:orientation="vertical" + android:visibility="visible"> + + + <TextView + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:gravity="center" + android:text="鍥炲淇℃伅" + android:textColor="@color/base_blue" + android:textSize="@dimen/order_detail_text_size" + android:textStyle="bold" /> + + <View + android:layout_width="match_parent" + android:layout_height="2dp" + android:layout_marginTop="5dp" + android:background="@color/base_blue" /> + </LinearLayout> + + <LinearLayout + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginTop="15dp" + android:orientation="horizontal"> + + + <TextView + + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="鍥炲鏃堕棿锛�" + android:textColor="@color/item_name_text_color" + 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.reportTime}" + android:textColor="@color/manage_item_text" + android:textSize="@dimen/order_detail_text_size" /> + </LinearLayout> + + <LinearLayout + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginTop="10dp" + android:layout_marginBottom="10dp" + android:orientation="horizontal"> + + + <TextView + + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="鍥炲鍐呭锛�" + android:textColor="@color/item_name_text_color" + 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