android/pipIrrApp.git

			@@ -20,6 +20,7 @@
			<RelativeLayout
			android:layout_width="match_parent"
			android:layout_height="match_parent"
			android:background="@color/item_bg_color"
			android:orientation="vertical">

			<include
			@@ -40,267 +41,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_marginRight="15dp"
			android:src="@mipmap/icon_project" />

			<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.taskType}"
			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.processingState}"
			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:orientation="horizontal">


			<TextView
			android:id="@+id/jinduTag"
			android:layout_width="wrap_content"
			android:layout_height="wrap_content"
			android:text="工单ID："
			android:textColor="@color/manage_item_text"
			android:textSize="@dimen/order_detail_text_size" />

			<TextView
			android:id="@+id/jindu"
			android:layout_width="match_parent"
			android:layout_height="wrap_content"
			android:text="@{data.workOrderId}"
			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="5dp"
			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:text="@{data.dispatcher}"
			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="5dp"
			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="match_parent"
			android:layout_height="wrap_content"
			android:text="@{data.dispatchTime}"
			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="5dp"
			android:gravity="center_vertical"
			android:orientation="horizontal">


			<TextView
			android:layout_width="wrap_content"
			android:layout_height="wrap_content"
			android:gravity="center_vertical"
			android:text="任务类型："
			android:textColor="@color/manage_item_text"
			android:textSize="@dimen/order_detail_text_size" />

			<TextView
			android:id="@+id/startTime"
			android:layout_width="match_parent"
			android:layout_height="wrap_content"
			android:text="@{data.taskType}"
			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="5dp"
			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="match_parent"
			android:layout_height="wrap_content"
			android:text="@{data.deadLine}"
			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="5dp"
			android:gravity="center_vertical"
			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:id="@+id/xiangMuJianCheng"
			android:layout_width="match_parent"
			android:layout_height="wrap_content"

			android:text="@{data.completeCriteria}"
			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="5dp"
			android:gravity="center_vertical"
			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:id="@+id/xiangMuType"
			android:layout_width="match_parent"
			android:layout_height="wrap_content"
			android:text="@{data.taskContent}"
			android:textColor="@color/manage_item_text"
			android:textSize="@dimen/order_detail_text_size" />


			</LinearLayout>


			<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

			<RelativeLayout
			android:layout_width="match_parent"
			android:layout_height="2dp"
			android:background="@color/base_blue" />
			android:layout_height="wrap_content"
			android:minHeight="30dp"
			android:orientation="horizontal">

			<TextView
			<ImageView
			android:id="@+id/ic_project"
			android:layout_width="20dp"
			android:layout_height="20dp"
			android:layout_centerVertical="true"
			android:layout_marginLeft="10dp"
			android:layout_marginRight="15dp"
			android:src="@mipmap/icon_project" />

			<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.taskType}"
			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.processingState}"
			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"
			android:text="处理结果"
			android:textColor="@color/base_blue"
			android:textSize="@dimen/order_detail_text_size" />
			android:orientation="horizontal">


			<TextView
			android:id="@+id/jinduTag"
			android:layout_width="120dp"
			android:layout_height="wrap_content"
			android:gravity="right"
			android:text="工单ID："
			android:textColor="@color/item_name_text_color"
			android:textSize="@dimen/order_detail_text_size" />

			<TextView
			android:id="@+id/jindu"
			android:layout_width="match_parent"
			android:layout_height="wrap_content"
			android:text="@{data.workOrderId}"
			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="5dp"
			android:orientation="horizontal">


			<TextView

			android:layout_width="120dp"
			android:layout_height="wrap_content"
			android:gravity="right"
			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:text="@{data.dispatcher}"
			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="5dp"
			android:orientation="horizontal">


			<TextView
			android:layout_width="120dp"
			android:layout_height="wrap_content"
			android:gravity="right"
			android:text="派单时间："
			android:textColor="@color/item_name_text_color"
			android:textSize="@dimen/order_detail_text_size" />

			<TextView

			android:layout_width="match_parent"
			android:layout_height="wrap_content"
			android:text="@{data.dispatchTime}"
			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="5dp"
			android:gravity="center_vertical"
			android:orientation="horizontal">


			<TextView
			android:layout_width="120dp"
			android:layout_height="wrap_content"
			android:gravity="right"
			android:text="任务类型："
			android:textColor="@color/item_name_text_color"
			android:textSize="@dimen/order_detail_text_size" />

			<TextView
			android:id="@+id/startTime"
			android:layout_width="match_parent"
			android:layout_height="wrap_content"
			android:text="@{data.taskType}"
			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="5dp"
			android:orientation="horizontal">


			<TextView
			android:id="@+id/daiShenPiTag"
			android:layout_width="120dp"
			android:layout_height="wrap_content"
			android:gravity="right"
			android:text="要求完成时间："
			android:textColor="@color/item_name_text_color"
			android:textSize="@dimen/order_detail_text_size" />

			<TextView
			android:id="@+id/daiShenPi"
			android:layout_width="match_parent"
			android:layout_height="wrap_content"
			android:text="@{data.deadLine}"
			android:textColor="@color/manage_item_text"
			android:textSize="@dimen/order_detail_text_size" />


			</LinearLayout>

			<LinearLayout
			android:layout_width="match_parent"
			@@ -312,10 +252,101 @@

			<TextView

			android:layout_width="120dp"
			android:layout_height="wrap_content"
			android:gravity="right"
			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:text="@{data.completeCriteria}"
			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="5dp"
			android:gravity="center_vertical"
			android:orientation="horizontal">


			<TextView
			android:layout_width="120dp"
			android:layout_height="wrap_content"
			android:gravity="right"
			android:text="任务内容："
			android:textColor="@color/item_name_text_color"
			android:textSize="@dimen/order_detail_text_size" />

			<TextView
			android:id="@+id/xiangMuType"
			android:layout_width="match_parent"
			android:layout_height="wrap_content"
			android:text="@{data.taskContent}"
			android:textColor="@color/manage_item_text"
			android:textSize="@dimen/order_detail_text_size" />


			</LinearLayout>

			</LinearLayout>

			<LinearLayout
			android:id="@+id/orderDealLL"
			android:layout_width="match_parent"
			android:layout_height="wrap_content"
			android:layout_marginLeft="10dp"
			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">


			<TextView
			android:layout_width="match_parent"
			android:layout_height="wrap_content"

			android:layout_marginBottom="5dp"
			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:background="@color/base_blue" />


			<LinearLayout
			android:layout_width="match_parent"
			android:layout_height="wrap_content"
			android:layout_marginTop="10dp"
			android:gravity="center_vertical"
			android:orientation="horizontal">


			<TextView

			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
			@@ -341,7 +372,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
			@@ -364,8 +395,8 @@

			android:layout_width="wrap_content"
			android:layout_height="wrap_content"
			android:text="反馈图片："
			android:textColor="@color/manage_item_text"
			android:text="反馈图片或视频："
			android:textColor="@color/item_name_text_color"
			android:textSize="@dimen/order_detail_text_size" />

			<androidx.recyclerview.widget.RecyclerView
			@@ -389,12 +420,13 @@
			android:layout_width="match_parent"
			android:layout_height="@dimen/order_detail_button_height"
			android:layout_alignParentBottom="true"
			android:background="@color/title_color"
			android:background="@drawable/bottom_butten_blue_ripple"
			android:gravity="center"
			android:onClick="@{()->itemclidk.startDealActivity()}"
			android:text="处理工单"
			android:textColor="@color/white"
			android:textSize="@dimen/order_detail_button_size" />
			android:textSize="@dimen/order_detail_button_size"
			android:visibility="gone" />


			</RelativeLayout>