将项目拆分为两个子项目，监管和督察

riku

2022-01-20 5a0fff8095cd5356f57c181b7e7b820e0f7efacf

 appDucha/src/main/res/layout/dc_activity_new_temp_task.xml

@@ -41,7 +41,7 @@
                        android:id="@+id/edt_sub_task_name"
                        android:layout_width="0dp"
                        android:layout_height="wrap_content"
                        style="@style/TextStyle.EditText"
                        style="@style/TextStyle.Content.Time"
                        android:textSize="@dimen/textSize_14"
                        tools:text="dddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddd"
                        app:layout_constraintStart_toStartOf="parent"
@@ -112,7 +112,7 @@
                        android:layout_width="0dp"
                        android:layout_height="wrap_content"
                        style="@style/SpinnerStyle"
                        tools:listitem="@layout/item_spinner_drop_down_2"
                        tools:listitem="@layout/dc_item_spinner_drop_down_2"
                        android:layout_marginEnd="@dimen/dimen2"
                        app:layout_constraintStart_toEndOf="@id/sp_province"
                        app:layout_constraintEnd_toStartOf="@id/sp_district"
@@ -123,7 +123,7 @@
                        android:layout_width="0dp"
                        android:layout_height="wrap_content"
                        style="@style/SpinnerStyle"
                        tools:listitem="@layout/item_spinner_drop_down_2"
                        tools:listitem="@layout/dc_item_spinner_drop_down_2"
                        app:layout_constraintStart_toEndOf="@id/sp_city"
                        app:layout_constraintEnd_toEndOf="parent"
                        app:layout_constraintTop_toTopOf="@id/sp_province"/>
@@ -136,7 +136,7 @@
                android:id="@+id/cd_2"
                android:layout_width="match_parent"
                android:layout_height="wrap_content"
                android:layout_marginTop="@dimen/dimen16"
                android:layout_marginTop="@dimen/dimen8"
                app:layout_constraintTop_toBottomOf="@id/cd_1">

                <android.support.constraint.ConstraintLayout
@@ -158,7 +158,7 @@
                        android:layout_width="0dp"
                        android:layout_height="wrap_content"
                        style="@style/SpinnerStyle"
                        tools:listitem="@layout/item_spinner_drop_down_2"
                        tools:listitem="@layout/dc_item_spinner_drop_down_2"
                        android:layout_marginEnd="@dimen/dimen8"
                        app:layout_constraintStart_toStartOf="parent"
                        app:layout_constraintEnd_toStartOf="@id/sp_scene_type"
@@ -185,7 +185,7 @@
                        android:layout_width="0dp"
                        android:layout_height="wrap_content"
                        style="@style/SpinnerStyle"
                        tools:listitem="@layout/item_spinner_drop_down_2"
                        tools:listitem="@layout/dc_item_spinner_drop_down_2"
                        app:layout_constraintStart_toEndOf="@id/sp_task_type"
                        app:layout_constraintEnd_toEndOf="parent"
                        app:layout_constraintTop_toBottomOf="@id/txt_scene_type" />
@@ -197,7 +197,8 @@
                        android:src="@drawable/ic_location_on_red_700_36dp"
                        app:layout_constraintStart_toEndOf="@id/edt_scene_name"
                        app:layout_constraintEnd_toEndOf="parent"
                        app:layout_constraintTop_toTopOf="@id/edt_scene_name"/>
                        app:layout_constraintTop_toTopOf="@id/edt_scene_name"
                        app:layout_constraintBottom_toBottomOf="@id/edt_scene_name"/>

                    <android.support.constraint.Barrier
                        android:id="@+id/barrier_1"
@@ -210,7 +211,7 @@
                        android:id="@+id/edt_scene_name"
                        android:layout_width="0dp"
                        android:layout_height="wrap_content"
                        style="@style/TextStyle.EditText"
                        style="@style/TextStyle.Content.Time"
                        android:visibility="visible"
                        android:hint="场景名称"
                        android:layout_marginTop="@dimen/dimen8"
@@ -223,9 +224,10 @@
                        android:id="@+id/edt_scene_address"
                        android:layout_width="0dp"
                        android:layout_height="wrap_content"
                        style="@style/TextStyle.EditText"
                        style="@style/TextStyle.Content.Time"
                        android:visibility="visible"
                        android:hint="场景地址"
                        android:layout_marginTop="@dimen/dimen8"
                        app:layout_constraintStart_toStartOf="parent"
                        app:layout_constraintEnd_toEndOf="parent"
                        app:layout_constraintTop_toBottomOf="@id/edt_scene_name"
@@ -241,7 +243,7 @@
                android:layout_height="wrap_content"
                app:layout_constraintTop_toBottomOf="@id/cd_2"
                app:layout_constraintBottom_toBottomOf="parent"
                android:layout_marginTop="@dimen/dimen16">
                android:layout_marginTop="@dimen/dimen8">

                <android.support.constraint.ConstraintLayout
                    android:layout_width="match_parent"