android/pipIrrApp.git

			@@ -40,179 +40,206 @@
			<LinearLayout
			android:layout_width="match_parent"
			android:layout_height="match_parent"
			android:orientation="vertical"
			android:padding="20dp">

			<RelativeLayout
			android:layout_width="match_parent"
			android:layout_height="wrap_content"
			android:minHeight="30dp"
			android:orientation="horizontal">

			<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: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.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>
			android:orientation="vertical">

			<LinearLayout
			android:layout_width="match_parent"
			android:layout_height="wrap_content"
			android:layout_marginTop="5dp"
			android:gravity="center_vertical"
			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">

			<LinearLayout
			android:layout_width="0dp"
			<RelativeLayout
			android:layout_width="match_parent"
			android:layout_height="wrap_content"
			android:layout_weight="1"
			android:gravity="center_vertical"
			android:orientation="horizontal"
			android:paddingRight="5dp">
			android:minHeight="30dp"
			android:orientation="horizontal">

			<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: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.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:text="上报时间："
			android:textColor="@color/manage_item_text"
			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
			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/item_name_text_color"
			android:textSize="@dimen/order_detail_text_size" />

			<TextView
			android:id="@+id/xiangMuJianCheng"
			android:layout_width="match_parent"
			android:id="@+id/daiShenPi"
			android:layout_width="wrap_content"
			android:layout_height="wrap_content"
			android:ellipsize="end"
			android:maxLines="1"
			android:text="@{data.reportTime}"
			android:text="@{data.content}"
			android:textColor="@color/manage_item_text"
			android:textSize="@dimen/order_detail_text_size" />
			</LinearLayout>


			</LinearLayout>

			<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/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"
			<LinearLayout
			android:layout_width="match_parent"
			android:layout_height="wrap_content"
			android:layout_centerInParent="true"
			android:layout_height="match_parent"
			android:layout_marginTop="10dp"
			android:minHeight="80dp" />
			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:orientation="vertical"
			android:layout_height="wrap_content">
			<LinearLayout
			android:id="@+id/orderDealLL"
			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:visibility="visible">
			android:paddingLeft="10dp"
			android:paddingTop="15dp"
			android:paddingRight="10dp"
			android:paddingBottom="20dp">

			<View
			android:layout_width="match_parent"
			android:layout_height="2dp"
			android:background="@color/base_blue" />

			<TextView
			<LinearLayout
			android:id="@+id/orderDealLL"
			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>

			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="10dp"
			android:layout_marginTop="15dp"
			android:orientation="horizontal">


			@@ -221,7 +248,7 @@
			android:layout_width="wrap_content"
			android:layout_height="wrap_content"
			android:text="回复时间："
			android:textColor="@color/manage_item_text"
			android:textColor="@color/item_name_text_color"
			android:textSize="@dimen/order_detail_text_size" />

			<TextView
			@@ -239,6 +266,7 @@
			android:layout_width="match_parent"
			android:layout_height="wrap_content"
			android:layout_marginTop="10dp"
			android:layout_marginBottom="10dp"
			android:orientation="horizontal">


			@@ -247,7 +275,7 @@
			android:layout_width="wrap_content"
			android:layout_height="wrap_content"
			android:text="回复内容："
			android:textColor="@color/manage_item_text"
			android:textColor="@color/item_name_text_color"
			android:textSize="@dimen/order_detail_text_size" />

			<TextView