supervision-android.git

			@@ -47,104 +47,90 @@
			android:layout_marginTop="@dimen/dimen8"
			android:layout_marginBottom="@dimen/dimen8">
			<LinearLayout
			android:layout_width="match_parent"
			android:layout_height="match_parent"
			android:orientation="vertical"
			android:paddingBottom="30dp"
			android:paddingLeft="18dp"
			android:paddingRight="18dp"
			android:paddingTop="12dp">
			android:layout_width="match_parent"
			android:layout_height="match_parent"
			android:orientation="vertical"
			android:paddingBottom="30dp"
			android:paddingLeft="18dp"
			android:paddingRight="18dp"
			android:paddingTop="12dp">

			<LinearLayout
			android:layout_width="wrap_content"
			android:layout_height="wrap_content"

			android:orientation="horizontal">

			<TextView
			android:id="@+id/tv_dialog_take_evidence_title"
			<LinearLayout
			android:layout_width="wrap_content"
			android:layout_height="wrap_content"
			android:text="问题取证"
			android:textColor="@color/primary_text"
			android:textSize="18sp" />
			</LinearLayout>

			<TextView
			android:id="@+id/tv_type"
			android:layout_width="wrap_content"
			android:layout_height="wrap_content"
			android:layout_marginTop="10dp"
			android:text="问题类型" />
			android:orientation="horizontal">

			<Spinner
			android:id="@+id/sp_take_evidence_select_problem_type"
			android:layout_width="match_parent"
			android:layout_height="wrap_content"
			android:layout_marginTop="@dimen/dimen4"
			style="@style/SpinnerStyle.Black"
			tools:listitem="@layout/item_spinner_drop_down" />
			<TextView
			android:id="@+id/tv_dialog_take_evidence_title"
			android:layout_width="wrap_content"
			android:layout_height="wrap_content"
			android:text="问题取证"
			android:textColor="@color/primary_text"
			android:textSize="18sp" />
			</LinearLayout>

			<TextView
			android:id="@+id/tv_chose"
			android:layout_width="wrap_content"
			android:layout_height="wrap_content"
			android:layout_marginTop="10dp"
			android:text="选择一个问题" />

			<Spinner
			android:id="@+id/sp_take_evidence_select_problem"
			android:layout_width="match_parent"
			android:layout_height="wrap_content"
			android:layout_marginTop="@dimen/dimen4"
			style="@style/SpinnerStyle.Black"
			tools:listitem="@layout/item_spinner_drop_down"/>

			<EditText
			android:id="@+id/et_take_evidence_problem_des"
			android:layout_width="match_parent"
			android:layout_height="wrap_content"
			android:hint="问题描述(可选)"
			android:textSize="@dimen/textSize_14"
			android:visibility="visible" />

			<TextView
			android:id="@+id/tv_location"
			android:layout_width="wrap_content"
			android:layout_height="wrap_content"
			android:layout_marginTop="8dp"
			android:text="位置" />

			<Spinner
			android:id="@+id/sp_take_evidence_select_location"
			android:layout_width="match_parent"
			android:layout_height="wrap_content"
			android:layout_marginTop="@dimen/dimen4"
			style="@style/SpinnerStyle.Black"
			tools:listitem="@layout/item_spinner_drop_down"/>

			<EditText
			android:id="@+id/et_take_evidence_location"
			android:layout_width="match_parent"
			android:layout_height="wrap_content"
			android:hint="位置备注(可选)"
			android:textSize="@dimen/textSize_14"/>

			<LinearLayout
			android:id="@+id/ll_change_suggestion"
			android:layout_width="match_parent"
			android:layout_height="wrap_content"
			android:orientation="vertical"
			android:visibility="visible">
			<TextView
			android:id="@+id/tv_suggestion"
			android:id="@+id/tv_type"
			android:layout_width="wrap_content"
			android:layout_height="wrap_content"
			android:layout_marginTop="10dp"
			android:text="问题类型" />

			<Spinner
			android:id="@+id/sp_take_evidence_select_problem_type"
			android:layout_width="match_parent"
			android:layout_height="wrap_content"
			android:layout_marginTop="@dimen/dimen4"
			style="@style/SpinnerStyle.Black"
			tools:listitem="@layout/item_spinner_drop_down" />

			<TextView
			android:id="@+id/tv_chose"
			android:layout_width="wrap_content"
			android:layout_height="wrap_content"
			android:layout_marginTop="10dp"
			android:text="选择一个问题" />

			<Spinner
			android:id="@+id/sp_take_evidence_select_problem"
			android:layout_width="match_parent"
			android:layout_height="wrap_content"
			android:layout_marginTop="@dimen/dimen4"
			style="@style/SpinnerStyle.Black"
			tools:listitem="@layout/item_spinner_drop_down"/>

			<android.support.constraint.ConstraintLayout
			android:layout_width="match_parent"
			android:layout_height="wrap_content">
			<EditText
			android:id="@+id/et_take_evidence_problem_des"
			android:layout_width="0dp"
			android:layout_height="wrap_content"
			android:hint="问题描述(可选)"
			android:textSize="@dimen/textSize_14"
			app:layout_constraintStart_toStartOf="parent"
			app:layout_constraintEnd_toStartOf="@id/btn_copy_problem_des"/>
			<ImageView
			android:id="@+id/btn_copy_problem_des"
			android:layout_width="wrap_content"
			android:layout_height="wrap_content"
			android:padding="@dimen/dimen8"
			app:layout_constraintEnd_toEndOf="parent"
			app:layout_constraintTop_toTopOf="@id/et_take_evidence_problem_des"
			app:layout_constraintBottom_toBottomOf="@id/et_take_evidence_problem_des"
			android:src="@drawable/selector_btn_copy_delete" />
			</android.support.constraint.ConstraintLayout>

			<TextView
			android:id="@+id/tv_location"
			android:layout_width="wrap_content"
			android:layout_height="wrap_content"
			android:layout_marginTop="8dp"
			android:text="@string/change_suggestion" />
			android:text="位置" />

			<Spinner
			android:id="@+id/sp_take_evidence_select_suggestion"
			android:id="@+id/sp_take_evidence_select_location"
			android:layout_width="match_parent"
			android:layout_height="wrap_content"
			android:layout_marginTop="@dimen/dimen4"
			@@ -152,12 +138,40 @@
			tools:listitem="@layout/item_spinner_drop_down"/>

			<EditText
			android:id="@+id/et_take_evidence_suggestion"
			android:id="@+id/et_take_evidence_location"
			android:layout_width="match_parent"
			android:layout_height="wrap_content"
			android:hint="整改建议(可选)"
			android:hint="位置备注(可选)"
			android:textSize="@dimen/textSize_14"/>
			</LinearLayout>

			<LinearLayout
			android:id="@+id/ll_change_suggestion"
			android:layout_width="match_parent"
			android:layout_height="wrap_content"
			android:orientation="vertical"
			android:visibility="visible">
			<TextView
			android:id="@+id/tv_suggestion"
			android:layout_width="wrap_content"
			android:layout_height="wrap_content"
			android:layout_marginTop="8dp"
			android:text="@string/change_suggestion" />

			<Spinner
			android:id="@+id/sp_take_evidence_select_suggestion"
			android:layout_width="match_parent"
			android:layout_height="wrap_content"
			android:layout_marginTop="@dimen/dimen4"
			style="@style/SpinnerStyle.Black"
			tools:listitem="@layout/item_spinner_drop_down"/>

			<EditText
			android:id="@+id/et_take_evidence_suggestion"
			android:layout_width="match_parent"
			android:layout_height="wrap_content"
			android:hint="整改建议(可选)"
			android:textSize="@dimen/textSize_14"/>
			</LinearLayout>

			<android.support.constraint.ConstraintLayout
			android:layout_width="match_parent"
			@@ -204,7 +218,7 @@
			app:layout_constraintTop_toTopOf="parent"/>
			</android.support.constraint.ConstraintLayout>

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