同步代码

18034727885

2026-06-24 f06c19fada1688f265d42900c9bd0c32a0aba6af

同步代码

 app/src/main/java/com/xw/yunwei/ui/task/accident/detail/AccidentDetailVM.kt

@@ -165,7 +165,6 @@
                            it.vehicleLocation
                        )
                    )
                    loopRefreshCarLocation()
                } else if (it.status == 1) {
                    stopCountdown()
                    carLocation.postValue(
@@ -175,8 +174,8 @@
                            it.vehicleLocation
                        )
                    )
                    loopRefreshCarLocation()
                }
                loopRefreshCarLocation()
                checkTrunkStatus(it.vehicleId.toString()) {
                    taskDetail.postValue(taskDetail.value?.copy(hadTrunkOpened = it.toString()))
                }

 app/src/main/res/layout/activity_accident_process.xml

@@ -387,7 +387,7 @@
                    android:textColor="@color/gray_9"
                    android:textSize="@dimen/sp_16" />

                <androidx.constraintlayout.widget.ConstraintLayout
                <FrameLayout
                    android:layout_width="match_parent"
                    android:layout_height="wrap_content"
                    android:layout_marginHorizontal="@dimen/dp_28"
@@ -402,25 +402,27 @@
                        android:gravity="top"
                        android:hint="请输入现场描述，最多可输入200字"
                        android:maxLength="200"
                        android:padding="@dimen/dp_12"
                        android:paddingLeft="@dimen/dp_12"
                        android:paddingRight="@dimen/dp_12"
                        android:paddingTop="@dimen/dp_12"
                        android:paddingBottom="@dimen/dp_18"
                        android:text="@={viewModel.siteDesc}"
                        android:textColor="@color/gray_9"
                        android:textColorHint="@color/gray_6"
                        android:textSize="@dimen/sp_14"
                        app:layout_constraintTop_toTopOf="parent" />
                        android:textSize="@dimen/sp_14" />

                    <androidx.appcompat.widget.AppCompatTextView
                        android:layout_width="wrap_content"
                        android:layout_height="wrap_content"
                        android:layout_margin="@dimen/dp_12"
                        android:layout_gravity="bottom|end"
                        android:layout_marginEnd="@dimen/dp_12"
                        android:layout_marginBottom="@dimen/dp_2"
                        android:text="@{viewModel.siteNums}"
                        android:textColor="@color/gray_6"
                        android:textSize="@dimen/sp_14"
                        app:layout_constraintBottom_toBottomOf="parent"
                        app:layout_constraintRight_toRightOf="parent"
                        android:textSize="@dimen/sp_11"
                        tools:text="1/200" />

                </androidx.constraintlayout.widget.ConstraintLayout>
                </FrameLayout>

                <androidx.appcompat.widget.AppCompatTextView
                    android:layout_width="wrap_content"
@@ -455,7 +457,7 @@
                    android:textColor="@color/gray_9"
                    android:textSize="@dimen/sp_16" />

                <androidx.constraintlayout.widget.ConstraintLayout
                <FrameLayout
                    android:layout_width="match_parent"
                    android:layout_height="wrap_content"
                    android:layout_marginHorizontal="@dimen/dp_28"
@@ -470,25 +472,27 @@
                        android:gravity="top"
                        android:hint="请输入处置描述，最多可输入200字"
                        android:maxLength="200"
                        android:padding="@dimen/dp_12"
                        android:paddingLeft="@dimen/dp_12"
                        android:paddingRight="@dimen/dp_12"
                        android:paddingTop="@dimen/dp_12"
                        android:paddingBottom="@dimen/dp_18"
                        android:text="@={viewModel.disposalDesc}"
                        android:textColor="@color/gray_9"
                        android:textColorHint="@color/gray_6"
                        android:textSize="@dimen/sp_14"
                        app:layout_constraintTop_toTopOf="parent" />
                        android:textSize="@dimen/sp_14" />

                    <androidx.appcompat.widget.AppCompatTextView
                        android:layout_width="wrap_content"
                        android:layout_height="wrap_content"
                        android:layout_margin="@dimen/dp_12"
                        android:layout_gravity="bottom|end"
                        android:layout_marginEnd="@dimen/dp_12"
                        android:layout_marginBottom="@dimen/dp_2"
                        android:text="@{viewModel.disposalNums}"
                        android:textColor="@color/gray_6"
                        android:textSize="@dimen/sp_14"
                        app:layout_constraintBottom_toBottomOf="parent"
                        app:layout_constraintRight_toRightOf="parent"
                        android:textSize="@dimen/sp_11"
                        tools:text="1/200" />

                </androidx.constraintlayout.widget.ConstraintLayout>
                </FrameLayout>

                <androidx.appcompat.widget.AppCompatTextView
                    android:layout_width="wrap_content"

 app/src/main/res/layout/activity_create_task.xml

@@ -356,7 +356,10 @@
                        android:hint="请输入任务描述"
                        android:maxLength="600"
                        android:minHeight="@dimen/dp_100"
                        android:padding="@dimen/dp_12"
                        android:paddingLeft="@dimen/dp_12"
                        android:paddingRight="@dimen/dp_12"
                        android:paddingTop="@dimen/dp_12"
                        android:paddingBottom="@dimen/dp_18"
                        android:text="@={viewModel.taskDesc}"
                        android:textColor="@color/gray_9"
                        android:textColorHint="@color/gray_6"
@@ -368,7 +371,7 @@
                        android:layout_height="wrap_content"
                        android:layout_gravity="bottom|end"
                        android:layout_marginEnd="@dimen/dp_12"
                        android:layout_marginBottom="@dimen/dp_12"
                        android:layout_marginBottom="@dimen/dp_2"
                        android:text='@{viewModel.taskDesc.length()+"/600"}'
                        android:textColor="@color/gray_6"
                        android:textSize="@dimen/sp_11" />

 app/src/main/res/layout/activity_cruise_check_in_operation.xml

@@ -181,36 +181,46 @@
                    app:layout_constraintStart_toStartOf="parent"
                    app:layout_constraintTop_toBottomOf="@id/tv_work" />

                <EditText
                    android:id="@+id/et_input"
                <FrameLayout
                    android:id="@+id/fl_input"
                    android:layout_width="match_parent"
                    android:layout_height="wrap_content"
                    android:layout_marginHorizontal="@dimen/dp_28"
                    android:layout_marginTop="@dimen/dp_12"
                    android:background="@drawable/shape_gray_3_bg_4"
                    android:gravity="top|start"
                    android:hint="请输入现场情况描述，最多可输入200字"
                    android:minHeight="@dimen/dp_91"
                    android:padding="@dimen/dp_12"
                    android:text="@={viewModel.desc}"
                    android:textColor="@color/gray_9"
                    android:textColorHint="@color/gray_6"
                    android:textSize="@dimen/sp_14"
                    app:layout_constraintEnd_toEndOf="parent"
                    app:layout_constraintStart_toStartOf="parent"
                    app:layout_constraintTop_toBottomOf="@id/tv_label2" />
                    app:layout_constraintTop_toBottomOf="@id/tv_label2">

                <TextView
                    android:id="@+id/tv_count"
                    android:layout_width="wrap_content"
                    android:layout_height="wrap_content"
                    android:layout_marginEnd="@dimen/dp_12"
                    android:layout_marginBottom="@dimen/dp_12"
                    android:text="@{viewModel.countNotice}"
                    android:textColor="@color/gray_6"
                    android:textSize="@dimen/sp_11"
                    app:layout_constraintBottom_toBottomOf="@id/et_input"
                    app:layout_constraintEnd_toEndOf="@id/et_input" />
                    <EditText
                        android:id="@+id/et_input"
                        android:layout_width="match_parent"
                        android:layout_height="wrap_content"
                        android:background="@drawable/shape_gray_3_bg_4"
                        android:gravity="top|start"
                        android:hint="请输入现场情况描述，最多可输入200字"
                        android:maxLength="200"
                        android:minHeight="@dimen/dp_91"
                        android:paddingLeft="@dimen/dp_12"
                        android:paddingRight="@dimen/dp_12"
                        android:paddingTop="@dimen/dp_12"
                        android:paddingBottom="@dimen/dp_18"
                        android:text="@={viewModel.desc}"
                        android:textColor="@color/gray_9"
                        android:textColorHint="@color/gray_6"
                        android:textSize="@dimen/sp_14" />

                    <TextView
                        android:id="@+id/tv_count"
                        android:layout_width="wrap_content"
                        android:layout_height="wrap_content"
                        android:layout_gravity="bottom|end"
                        android:layout_marginEnd="@dimen/dp_12"
                        android:layout_marginBottom="@dimen/dp_2"
                        android:text="@{viewModel.countNotice}"
                        android:textColor="@color/gray_6"
                        android:textSize="@dimen/sp_11" />

                </FrameLayout>

                <TextView
                    android:id="@+id/tv_notice"
@@ -221,8 +231,8 @@
                    android:textColor="@color/red_5"
                    android:textSize="@dimen/sp_11"
                    android:visibility="gone"
                    app:layout_constraintStart_toStartOf="@id/et_input"
                    app:layout_constraintTop_toBottomOf="@id/et_input"
                    app:layout_constraintStart_toStartOf="@id/fl_input"
                    app:layout_constraintTop_toBottomOf="@id/fl_input"
                    tools:visibility="visible" />

                <TextView

 app/src/main/res/layout/activity_site_error_upload.xml

@@ -144,36 +144,46 @@
                    app:layout_constraintStart_toStartOf="parent"
                    app:layout_constraintTop_toBottomOf="@id/tv_work" />

                <EditText
                    android:id="@+id/et_input"
                <FrameLayout
                    android:id="@+id/fl_input"
                    android:layout_width="match_parent"
                    android:layout_height="wrap_content"
                    android:layout_marginHorizontal="@dimen/dp_20"
                    android:layout_marginTop="@dimen/dp_12"
                    app:layout_constraintEnd_toEndOf="parent"
                    app:layout_constraintStart_toStartOf="parent"
                    app:layout_constraintTop_toBottomOf="@id/tv_label2">

                <EditText
                    android:id="@+id/et_input"
                    android:layout_width="match_parent"
                    android:layout_height="wrap_content"
                    android:background="@drawable/shape_gray_3_bg_4"
                    android:gravity="top|start"
                    android:hint="请输入现场情况描述，最多可输入200字"
                    android:maxLength="200"
                    android:minHeight="@dimen/dp_91"
                    android:padding="@dimen/dp_12"
                    android:paddingLeft="@dimen/dp_12"
                    android:paddingRight="@dimen/dp_12"
                    android:paddingTop="@dimen/dp_12"
                    android:paddingBottom="@dimen/dp_18"
                    android:text="@={viewModel.desc}"
                    android:textColor="@color/gray_9"
                    android:textColorHint="@color/gray_6"
                    android:textSize="@dimen/sp_14"
                    app:layout_constraintEnd_toEndOf="parent"
                    app:layout_constraintStart_toStartOf="parent"
                    app:layout_constraintTop_toBottomOf="@id/tv_label2" />
                    android:textSize="@dimen/sp_14" />

                <TextView
                    android:id="@+id/tv_count"
                    android:layout_width="wrap_content"
                    android:layout_height="wrap_content"
                    android:layout_gravity="bottom|end"
                    android:layout_marginEnd="@dimen/dp_12"
                    android:layout_marginBottom="@dimen/dp_12"
                    android:layout_marginBottom="@dimen/dp_2"
                    android:text="@{viewModel.countNotice}"
                    android:textColor="@color/gray_6"
                    android:textSize="@dimen/sp_11"
                    app:layout_constraintBottom_toBottomOf="@id/et_input"
                    app:layout_constraintEnd_toEndOf="@id/et_input" />
                    android:textSize="@dimen/sp_11" />

                </FrameLayout>

                <TextView
                    android:id="@+id/tv_notice"
@@ -184,8 +194,8 @@
                    android:textColor="@color/red_5"
                    android:textSize="@dimen/sp_11"
                    android:visibility="gone"
                    app:layout_constraintStart_toStartOf="@id/et_input"
                    app:layout_constraintTop_toBottomOf="@id/et_input"
                    app:layout_constraintStart_toStartOf="@id/fl_input"
                    app:layout_constraintTop_toBottomOf="@id/fl_input"
                    tools:visibility="visible" />

                <TextView

 app/src/main/res/layout/layout_normal_task_car_nj_or_by_or_bx.xml

@@ -28,21 +28,40 @@
            android:textColor="@color/gray_9"
            android:textSize="@dimen/sp_16" />

        <androidx.appcompat.widget.AppCompatEditText
        <FrameLayout
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
            android:layout_marginTop="@dimen/dp_8"
            android:layout_marginHorizontal="@dimen/dp_8"
            android:background="@drawable/shape_f9f9f9_bg_4"
            android:gravity="top"
            android:hint="请录入完成任务情况说明"
            android:maxLength="600"
            android:minHeight="@dimen/dp_100"
            android:padding="@dimen/dp_12"
            android:text="@={viewModel.taskDescription}"
            android:textColor="@color/gray_9"
            android:textColorHint="@color/gray_6"
            android:textSize="@dimen/sp_14" />
            android:layout_marginHorizontal="@dimen/dp_8">

            <androidx.appcompat.widget.AppCompatEditText
                android:layout_width="match_parent"
                android:layout_height="wrap_content"
                android:background="@drawable/shape_f9f9f9_bg_4"
                android:gravity="top"
                android:hint="请录入完成任务情况说明"
                android:maxLength="600"
                android:minHeight="@dimen/dp_100"
                android:paddingLeft="@dimen/dp_12"
                android:paddingRight="@dimen/dp_12"
                android:paddingTop="@dimen/dp_12"
                android:paddingBottom="@dimen/dp_18"
                android:text="@={viewModel.taskDescription}"
                android:textColor="@color/gray_9"
                android:textColorHint="@color/gray_6"
                android:textSize="@dimen/sp_14" />

            <androidx.appcompat.widget.AppCompatTextView
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
                android:layout_gravity="bottom|end"
                android:layout_marginEnd="@dimen/dp_12"
                android:layout_marginBottom="@dimen/dp_2"
                android:text='@{viewModel.taskDescription.length()+"/600"}'
                android:textColor="@color/gray_6"
                android:textSize="@dimen/sp_11" />

        </FrameLayout>

        <androidx.appcompat.widget.AppCompatTextView
            android:layout_width="wrap_content"