supervision-android.git

			@@ -1,167 +1,186 @@
			<?xml version="1.0" encoding="utf-8"?>
			<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
			<layout xmlns:android="http://schemas.android.com/apk/res/android"
			xmlns:app="http://schemas.android.com/apk/res-auto"
			xmlns:tools="http://schemas.android.com/tools"
			android:layout_width="match_parent"
			android:layout_height="match_parent"
			android:orientation="vertical">
			xmlns:tools="http://schemas.android.com/tools">

			<android.support.v7.widget.CardView
			android:id="@+id/cv_dialog_main"
			<data >
			<import type="android.view.View" alias="View"/>
			<variable
			name="viewModel"
			type="cn.flightfeather.thirdappmodule.databinding.SceneHistoryViewModel" />
			</data>

			<android.support.design.widget.CoordinatorLayout
			android:layout_width="match_parent"
			android:layout_height="match_parent"
			android:layout_marginLeft="12dp"
			android:layout_marginTop="30dp"
			android:layout_marginRight="12dp"
			android:layout_marginBottom="40dp"
			app:cardCornerRadius="6dp"
			app:cardElevation="7dp">
			android:orientation="vertical">

			<ScrollView
			<android.support.v7.widget.CardView
			android:id="@+id/cv_dialog_main"
			android:layout_width="match_parent"
			android:layout_height="match_parent"
			android:layout_marginBottom="30dp">
			<LinearLayout
			android:layout_marginLeft="12dp"
			android:layout_marginTop="30dp"
			android:layout_marginRight="12dp"
			android:layout_marginBottom="40dp"
			app:cardCornerRadius="6dp"
			app:cardElevation="7dp">

			<ScrollView
			android:layout_width="match_parent"
			android:layout_height="wrap_content"
			android:orientation="vertical">
			android:layout_height="match_parent"
			android:layout_marginBottom="30dp">



			<android.support.constraint.ConstraintLayout
			android:layout_width="match_parent"
			android:layout_height="wrap_content"
			android:padding="@dimen/dimen16">
			<ImageView
			android:id="@+id/img_risk_warn"
			android:layout_width="20dp"
			android:layout_height="20dp"
			android:src="@drawable/icon_task_alert"
			android:layout_marginBottom="@dimen/dimen4"
			app:layout_constraintStart_toStartOf="parent"
			app:layout_constraintTop_toTopOf="@id/tv_risk_warn"
			app:layout_constraintBottom_toBottomOf="@id/tv_risk_warn"
			android:contentDescription="风险提示" />

			<TextView
			android:id="@+id/tv_risk_warn"
			android:layout_width="0dp"
			android:layout_height="30dp"
			android:textColor="@color/red_btn_bg_color"
			android:textSize="@dimen/textSize_18"
			android:textStyle="bold"
			app:layout_constraintStart_toEndOf="@id/img_risk_warn"
			app:layout_constraintTop_toTopOf="parent"
			android:text="风险提示" />

			<TextView
			android:id="@+id/tv_change_rate"
			<LinearLayout
			android:layout_width="match_parent"
			android:layout_height="wrap_content"
			android:textColor="@color/main_color_1"
			android:textSize="@dimen/textSize_16"
			android:paddingStart="20dp"
			android:paddingEnd="0dp"
			tools:text="整改率情况，如果整改率较低，则作为风险提示展示"
			app:layout_constraintTop_toBottomOf="@id/tv_risk_warn"/>
			<TextView
			android:id="@+id/tv_change_efficiency"
			android:layout_width="match_parent"
			android:layout_height="wrap_content"
			android:textColor="@color/main_color_1"
			android:textSize="@dimen/textSize_16"
			android:paddingStart="20dp"
			android:paddingEnd="0dp"
			tools:text="整改效率情况，整改效率为要求整改的期限（天数）除以实际整改的用时（天数），如果效率低于60%，则作为风险提示展示"
			app:layout_constraintTop_toBottomOf="@id/tv_change_rate"/>
			<TextView
			android:id="@+id/tv_problem_recurrence"
			android:layout_width="match_parent"
			android:layout_height="wrap_content"
			android:textColor="@color/main_color_1"
			android:textSize="@dimen/textSize_16"
			android:paddingStart="20dp"
			android:paddingEnd="0dp"
			tools:text="问题复发情况，若前三个月内有相同类型的问题出现两次及以上时，提醒展示，并给出对应的整改率"
			app:layout_constraintTop_toBottomOf="@id/tv_change_efficiency"/>
			android:orientation="vertical">

			</android.support.constraint.ConstraintLayout>
			<android.support.constraint.ConstraintLayout
			android:layout_width="match_parent"
			android:layout_height="wrap_content"
			android:padding="@dimen/dimen16">
			<ImageView
			android:id="@+id/img_inspection_key_point"
			android:layout_width="20dp"
			android:layout_height="20dp"
			android:src="@drawable/icon_consult"
			android:layout_marginBottom="@dimen/dimen4"
			app:layout_constraintStart_toStartOf="parent"
			app:layout_constraintTop_toTopOf="@id/tv_risk_warn"
			app:layout_constraintBottom_toBottomOf="@id/tv_inspection_key_point"
			android:contentDescription="巡查要点" />

			<TextView
			android:id="@+id/tv_inspection_key_point"
			android:layout_width="0dp"
			android:layout_height="30dp"
			android:textColor="@color/primary_text"
			android:textSize="@dimen/textSize_18"
			app:layout_constraintStart_toEndOf="@id/img_inspection_key_point"
			app:layout_constraintTop_toTopOf="parent"
			android:text="巡查要点" />
			<android.support.constraint.ConstraintLayout
			android:layout_width="match_parent"
			android:layout_height="wrap_content"
			android:visibility="@{viewModel.worstChangeInfo == null ? View.GONE : View.VISIBLE}"
			android:padding="@dimen/dimen16">

			<TextView
			android:id="@+id/tv_change_rate"
			android:layout_width="match_parent"
			android:layout_height="wrap_content"
			android:textColor="@color/main_color_1"
			android:textSize="@dimen/textSize_16"
			android:paddingStart="20dp"
			android:paddingEnd="0dp"
			tools:text="巡查要点，注意需要检查的位置、设备和问题等"
			app:layout_constraintTop_toBottomOf="@id/img_inspection_key_point"/>
			<ImageView
			android:id="@+id/img_risk_warn"
			android:layout_width="20dp"
			android:layout_height="20dp"
			android:layout_marginBottom="@dimen/dimen4"
			android:contentDescription="风险提示"
			android:src="@drawable/icon_task_alert"
			app:layout_constraintBottom_toBottomOf="@id/tv_risk_warn"
			app:layout_constraintStart_toStartOf="parent"
			app:layout_constraintTop_toTopOf="@id/tv_risk_warn" />

			</android.support.constraint.ConstraintLayout>
			<android.support.constraint.ConstraintLayout
			android:layout_width="match_parent"
			android:layout_height="wrap_content"
			android:padding="@dimen/dimen16">
			<ImageView
			android:id="@+id/img_risk_warn"
			android:layout_width="20dp"
			android:layout_height="20dp"
			android:src="@drawable/ic_emergency"
			android:layout_marginBottom="@dimen/dimen4"
			app:layout_constraintStart_toStartOf="parent"
			app:layout_constraintTop_toTopOf="@id/tv_risk_warn"
			app:layout_constraintBottom_toBottomOf="@id/tv_risk_warn"
			android:contentDescription="应急巡查" />
			<TextView
			android:id="@+id/tv_risk_warn"
			android:layout_width="0dp"
			android:layout_height="30dp"
			android:text="风险提示"
			android:textColor="@color/red_btn_bg_color"
			android:textSize="@dimen/textSize_18"
			android:textStyle="bold"
			app:layout_constraintStart_toEndOf="@id/img_risk_warn"
			app:layout_constraintTop_toTopOf="parent" />

			<TextView
			android:id="@+id/tv_risk_warn"
			android:layout_width="0dp"
			android:layout_height="30dp"
			android:textColor="@color/primary_text"
			android:textSize="@dimen/textSize_18"
			app:layout_constraintStart_toEndOf="@id/img_risk_warn"
			app:layout_constraintTop_toTopOf="parent"
			android:text="应急巡查" />
			<TextView
			android:id="@+id/tv_change_rate"
			android:layout_width="match_parent"
			android:layout_height="wrap_content"
			android:paddingStart="20dp"
			android:paddingEnd="0dp"
			android:textColor="@color/main_color_1"
			android:textSize="@dimen/textSize_16"
			app:layout_constraintTop_toBottomOf="@id/tv_risk_warn"
			android:text="@{viewModel.changeInfoTxt}"
			tools:text="整改率情况，如果整改率较低，则作为风险提示展示" />

			</android.support.constraint.ConstraintLayout>
			</LinearLayout>
			</ScrollView>
			</android.support.v7.widget.CardView>
			<TextView
			android:id="@+id/tv_change_efficiency"
			android:layout_width="match_parent"
			android:layout_height="wrap_content"
			android:paddingStart="20dp"
			android:paddingEnd="0dp"
			android:textColor="@color/main_color_1"
			android:textSize="@dimen/textSize_16"
			app:layout_constraintTop_toBottomOf="@id/tv_change_rate"
			tools:text="整改效率情况，整改效率为要求整改的期限（天数）除以实际整改的用时（天数），如果效率低于60%，则作为风险提示展示" />

			<android.support.design.widget.FloatingActionButton
			android:id="@+id/fab_close"
			android:layout_width="wrap_content"
			android:layout_height="wrap_content"
			android:contentDescription="@string/cancel"
			android:src="@drawable/icon_close_white"
			app:elevation="8dp"
			app:fabSize="normal"
			app:layout_anchor="@id/cv_dialog_main"
			app:layout_anchorGravity="bottom\|center" />
			<TextView
			android:id="@+id/tv_problem_recurrence"
			android:layout_width="match_parent"
			android:layout_height="wrap_content"
			android:paddingStart="20dp"
			android:paddingEnd="0dp"
			android:textColor="@color/main_color_1"
			android:textSize="@dimen/textSize_16"
			app:layout_constraintTop_toBottomOf="@id/tv_change_efficiency"
			tools:text="问题复发情况，若前三个月内有相同类型的问题出现两次及以上时，提醒展示，并给出对应的整改率" />

			</android.support.design.widget.CoordinatorLayout>
			</android.support.constraint.ConstraintLayout>

			<android.support.constraint.ConstraintLayout
			android:layout_width="match_parent"
			android:layout_height="wrap_content"
			android:padding="@dimen/dimen16">

			<ImageView
			android:id="@+id/img_inspection_key_point"
			android:layout_width="20dp"
			android:layout_height="20dp"
			android:layout_marginBottom="@dimen/dimen4"
			android:contentDescription="巡查要点"
			android:src="@drawable/icon_consult"
			app:layout_constraintBottom_toBottomOf="@id/tv_inspection_key_point"
			app:layout_constraintStart_toStartOf="parent"
			app:layout_constraintTop_toTopOf="@id/tv_risk_warn" />

			<TextView
			android:id="@+id/tv_inspection_key_point"
			android:layout_width="0dp"
			android:layout_height="30dp"
			android:text="巡查要点"
			android:textColor="@color/primary_text"
			android:textSize="@dimen/textSize_18"
			app:layout_constraintStart_toEndOf="@id/img_inspection_key_point"
			app:layout_constraintTop_toTopOf="parent" />

			<TextView
			android:id="@+id/tv_key_point"
			android:layout_width="match_parent"
			android:layout_height="wrap_content"
			android:paddingStart="20dp"
			android:paddingEnd="0dp"
			android:textColor="@color/main_color_1"
			android:textSize="@dimen/textSize_16"
			app:layout_constraintTop_toBottomOf="@id/img_inspection_key_point"
			tools:text="巡查要点，注意需要检查的位置、设备和问题等" />

			</android.support.constraint.ConstraintLayout>

			<android.support.constraint.ConstraintLayout
			android:layout_width="match_parent"
			android:layout_height="wrap_content"
			android:padding="@dimen/dimen16">

			<ImageView
			android:id="@+id/img_temp_inspection"
			android:layout_width="20dp"
			android:layout_height="20dp"
			android:layout_marginBottom="@dimen/dimen4"
			android:contentDescription="应急巡查"
			android:src="@drawable/ic_emergency"
			app:layout_constraintBottom_toBottomOf="@id/tv_risk_warn"
			app:layout_constraintStart_toStartOf="parent"
			app:layout_constraintTop_toTopOf="@id/tv_risk_warn" />

			<TextView
			android:id="@+id/tv_temp_inspection"
			android:layout_width="0dp"
			android:layout_height="30dp"
			android:text="应急巡查"
			android:textColor="@color/primary_text"
			android:textSize="@dimen/textSize_18"
			app:layout_constraintStart_toEndOf="@id/img_temp_inspection"
			app:layout_constraintTop_toTopOf="parent" />

			</android.support.constraint.ConstraintLayout>
			</LinearLayout>
			</ScrollView>
			</android.support.v7.widget.CardView>

			<android.support.design.widget.FloatingActionButton
			android:id="@+id/fab_close"
			android:layout_width="wrap_content"
			android:layout_height="wrap_content"
			android:contentDescription="@string/cancel"
			android:src="@drawable/icon_close_white"
			app:elevation="8dp"
			app:fabSize="normal"
			app:layout_anchor="@id/cv_dialog_main"
			app:layout_anchorGravity="bottom\|center" />

			</android.support.design.widget.CoordinatorLayout>
			</layout>