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

riku

2022-01-20 5a0fff8095cd5356f57c181b7e7b820e0f7efacf

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

@@ -191,7 +191,7 @@
        app:layout_constraintStart_toStartOf="parent"
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintTop_toBottomOf="@id/card_view"
        app:layout_constraintBottom_toTopOf="@id/rl_add_task">
        app:layout_constraintBottom_toTopOf="@id/ll_btns">

        <LinearLayout
            android:id="@+id/day_task"
@@ -276,33 +276,50 @@
        </LinearLayout>
    </android.support.constraint.ConstraintLayout>

    <LinearLayout
        android:id="@+id/ll_btns"
        android:layout_width="match_parent"
        android:layout_height="0dp"
        android:orientation="horizontal"
        android:layout_marginStart="20dp"
        android:layout_marginEnd="20dp"
        app:layout_constraintStart_toStartOf="parent"
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintTop_toBottomOf="@id/task_progress_llcontainer"
        app:layout_constraintBottom_toBottomOf="parent"
        app:layout_constraintHeight_percent="0.25"
        android:baselineAligned="false"
        android:gravity="center">

    <android.support.constraint.ConstraintLayout
        android:id="@+id/rl_add_task"
        android:layout_width="0dp"
        android:layout_height="wrap_content"
        android:layout_margin="20dp"
        android:paddingTop="@dimen/dimen8"
        android:paddingStart="@dimen/dimen16"
        android:paddingEnd="@dimen/dimen16"
        android:paddingBottom="@dimen/dimen16"
            android:layout_weight="1"
            android:visibility="visible"
            android:padding="@dimen/dimen4"
            android:layout_marginEnd="@dimen/dimen8"
            android:foreground="?attr/selectableItemBackgroundBorderless"
        app:layout_constraintStart_toStartOf="parent"
        app:layout_constraintEnd_toStartOf="@id/cl_add_subTask"
        app:layout_constraintTop_toBottomOf="@id/task_progress_llcontainer"
        app:layout_constraintBottom_toBottomOf="parent"
        app:layout_constraintVertical_bias="1"
        android:background="@mipmap/ic_bg_blue">
            android:background="@drawable/ic_bg_blue">

        <ImageView
            android:id="@+id/iv_add_task"
            android:layout_width="0dp"
                android:layout_width="wrap_content"
            android:layout_height="0dp"
            android:background="@mipmap/ic_top_task"
            app:layout_constraintDimensionRatio="w,1:1"
            app:layout_constraintStart_toStartOf="parent"
            app:layout_constraintEnd_toEndOf="parent"
            app:layout_constraintTop_toTopOf="parent"/>
                app:layout_constraintTop_toTopOf="parent"
                app:layout_constraintBottom_toTopOf="@id/txt_add_task"/>

        <TextView
                android:id="@+id/txt_add_task"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            android:text="总任务管理"
@@ -310,6 +327,7 @@
            android:textSize="12sp"
            android:textStyle="bold"
            app:layout_constraintTop_toBottomOf="@id/iv_add_task"
                app:layout_constraintBottom_toBottomOf="parent"
            app:layout_constraintStart_toStartOf="parent"
            app:layout_constraintEnd_toEndOf="parent"/>
    </android.support.constraint.ConstraintLayout>
@@ -318,29 +336,28 @@
        android:id="@+id/cl_add_subTask"
        android:layout_width="0dp"
        android:layout_height="wrap_content"
        android:layout_marginEnd="20dp"
        android:paddingTop="@dimen/dimen8"
        android:paddingStart="@dimen/dimen16"
        android:paddingEnd="@dimen/dimen16"
        android:paddingBottom="@dimen/dimen16"
        app:layout_constraintTop_toTopOf="@id/rl_add_task"
            android:layout_weight="1"
            android:padding="@dimen/dimen4"
            android:foreground="?attr/selectableItemBackgroundBorderless"
            app:layout_constraintTop_toBottomOf="@id/task_progress_llcontainer"
        app:layout_constraintStart_toEndOf="@id/rl_add_task"
        app:layout_constraintEnd_toStartOf="@id/rl_add_scense"
        android:layout_centerHorizontal="true"
        android:background="@mipmap/ic_bg_green"
        android:orientation="vertical">
            app:layout_constraintBottom_toBottomOf="parent"
            android:background="@drawable/ic_bg_green">

        <ImageView
            android:id="@+id/iv_add_subTask"
            android:layout_width="0dp"
                android:layout_width="wrap_content"
            android:layout_height="0dp"
            app:layout_constraintDimensionRatio="w,1:1"
                app:layout_constraintDimensionRatio="h,1:1"
            android:background="@mipmap/ic_new_subtask"
            app:layout_constraintStart_toStartOf="parent"
            app:layout_constraintEnd_toEndOf="parent"
            app:layout_constraintTop_toTopOf="parent"/>
                app:layout_constraintTop_toTopOf="parent"
                app:layout_constraintBottom_toTopOf="@id/txt_add_subTask"/>

        <TextView
                android:id="@+id/txt_add_subTask"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            android:text="制定任务"
@@ -348,6 +365,7 @@
            android:textSize="12sp"
            android:textStyle="bold"
            app:layout_constraintTop_toBottomOf="@id/iv_add_subTask"
                app:layout_constraintBottom_toBottomOf="parent"
            app:layout_constraintStart_toStartOf="parent"
            app:layout_constraintEnd_toEndOf="parent"/>
    </android.support.constraint.ConstraintLayout>
@@ -356,27 +374,29 @@
        android:id="@+id/rl_add_scense"
        android:layout_width="0dp"
        android:layout_height="wrap_content"
        android:background="@mipmap/ic_bg_red"
        android:layout_marginEnd="20dp"
        android:paddingTop="@dimen/dimen8"
        android:paddingStart="@dimen/dimen16"
        android:paddingEnd="@dimen/dimen16"
        android:paddingBottom="@dimen/dimen16"
            android:background="@drawable/ic_bg_red"
            android:visibility="visible"
            android:layout_weight="1"
            android:padding="@dimen/dimen4"
            android:layout_marginStart="@dimen/dimen8"
            android:foreground="?attr/selectableItemBackgroundBorderless"
        app:layout_constraintStart_toEndOf="@id/cl_add_subTask"
        app:layout_constraintEnd_toStartOf="@id/rl_scense_map"
        app:layout_constraintTop_toTopOf="@id/rl_add_task">
            app:layout_constraintTop_toTopOf="@id/cl_add_subTask">

        <ImageView
            android:id="@+id/iv_task_check"
            android:layout_width="0dp"
                android:layout_width="wrap_content"
            android:layout_height="0dp"
            app:layout_constraintDimensionRatio="w,1:1"
                app:layout_constraintDimensionRatio="h,1:1"
            android:background="@mipmap/ic_new_scene"
            app:layout_constraintStart_toStartOf="parent"
            app:layout_constraintEnd_toEndOf="parent"
            app:layout_constraintTop_toTopOf="parent"/>
                app:layout_constraintTop_toTopOf="parent"
                app:layout_constraintBottom_toTopOf="@id/txt_task_check"/>

        <TextView
                android:id="@+id/txt_task_check"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            android:text="新增场景"
@@ -384,6 +404,7 @@
            android:textSize="12sp"
            android:textStyle="bold"
            app:layout_constraintTop_toBottomOf="@id/iv_task_check"
                app:layout_constraintBottom_toBottomOf="parent"
            app:layout_constraintStart_toStartOf="parent"
            app:layout_constraintEnd_toEndOf="parent"/>
    </android.support.constraint.ConstraintLayout>
@@ -392,14 +413,13 @@
        android:id="@+id/rl_scense_map"
        android:layout_width="0dp"
        android:layout_height="wrap_content"
        android:layout_marginEnd="20dp"
            android:layout_weight="1"
        android:paddingStart="@dimen/dimen16"
        android:paddingEnd="@dimen/dimen16"
        android:paddingBottom="@dimen/dimen16"
        app:layout_constraintTop_toTopOf="@id/rl_add_scense"
        app:layout_constraintStart_toEndOf="@id/rl_add_scense"
        app:layout_constraintEnd_toEndOf="parent"
        android:layout_centerHorizontal="true"
        android:background="@drawable/shape_green_task_follow"
        android:orientation="vertical"
        android:visibility="gone">
@@ -426,4 +446,6 @@
            app:layout_constraintEnd_toEndOf="parent"/>
    </android.support.constraint.ConstraintLayout>

    </LinearLayout>

</android.support.constraint.ConstraintLayout>