app/src/main/java/com/xw/yunwei/ui/task/accident/handle/AccidentProcessVM.kt
@@ -58,14 +58,14 @@ } private fun submit() { if (selectZrpd.isEmpty()) { ToastUtilCommon.showWarn("请选择责任判断") return } if(adapters[0].data.isEmpty()){ ToastUtilCommon.showWarn("请上传交警判责照片") return } // if (selectZrpd.isEmpty()) { // ToastUtilCommon.showWarn("请选择责任判断") // return // } // if(adapters[0].data.isEmpty()){ // ToastUtilCommon.showWarn("请上传交警判责照片") // return // } if (siteDesc.value.isNullOrEmpty() && adapters[1].data.isEmpty()) { ToastUtilCommon.showWarn("请填写现场情况或上传现场情况照片") return app/src/main/java/com/xw/yunwei/ui/task/create/CreateTaskVM.kt
@@ -42,7 +42,7 @@ // it?.address ?: "定位中..." // } // 0 = P0（最紧急）, 1 = P1 , 2 = P2 , 3 = P3（最不紧急） val taskLevel: MutableLiveData<Int> = MutableLiveData(3) val taskLevel: MutableLiveData<Int> = MutableLiveData(2) val taskDesc = MutableLiveData("") //车辆实时位置信息 @@ -61,7 +61,6 @@ R.id.level0 -> taskLevel.value = 0 R.id.level1 -> taskLevel.value = 1 R.id.level2 -> taskLevel.value = 2 R.id.level3 -> taskLevel.value = 3 R.id.submit -> submit() } } @@ -78,22 +77,22 @@ ToastUtilCommon.showWarn("未获取到定位") return } if (getSelectType().isEmpty()) { ToastUtilCommon.showWarn("请选择事故类型") return } // if (getSelectType().isEmpty()) { // ToastUtilCommon.showWarn("请选择事故类型") // return // } if (taskLevel.value !in arrayOf(0, 1, 2, 3)) { ToastUtilCommon.showWarn("请选择任务等级") return } if (taskDesc.value.isNullOrEmpty()) { ToastUtilCommon.showWarn("请填写任务描述") return } if (adapter.data.isEmpty()) { ToastUtilCommon.showWarn("请上传相关照片") return } // if (taskDesc.value.isNullOrEmpty()) { // ToastUtilCommon.showWarn("请填写任务描述") // return // } // if (adapter.data.isEmpty()) { // ToastUtilCommon.showWarn("请上传相关照片") // return // } showDialog("上传中...") uploadFile(adapter.data) { app/src/main/java/com/xw/yunwei/ui/work/car/detail/operations/maintain/MaintainCarActivity.kt
@@ -111,11 +111,11 @@ binding.rv2.adapter = viewModel.adapters[1] binding.rv2.layoutManager = GridLayoutManager(this, 2) binding.rv3.adapter = viewModel.adapters[2] binding.rv3.layoutManager = GridLayoutManager(this, 2) // binding.rv3.adapter = viewModel.adapters[2] // binding.rv3.layoutManager = GridLayoutManager(this, 2) binding.rv4.adapter = viewModel.adapters[3] binding.rv4.layoutManager = GridLayoutManager(this, 2) // binding.rv4.adapter = viewModel.adapters[3] // binding.rv4.layoutManager = GridLayoutManager(this, 2) binding.rv5.adapter = viewModel.adapters[4] binding.rv5.layoutManager = GridLayoutManager(this, 5) app/src/main/java/com/xw/yunwei/ui/work/car/detail/operations/maintain/MaintainCarVM.kt
@@ -81,7 +81,7 @@ fun submit() { adapters.forEachIndexed { index, adapter -> if (adapter.data.isEmpty()) { if (adapter.data.isEmpty() && index != 2 && index != 3) { ToastUtilCommon.showError("请上传${adaptersName[index]}照片") return } app/src/main/res/layout/activity_accident_process.xml
@@ -282,7 +282,6 @@ android:layout_marginHorizontal="@dimen/dp_20" android:layout_marginTop="@dimen/dp_8" android:text="初版(交警)责任判断" android:drawableStart="@drawable/svg_must" android:textColor="@color/gray_9" android:textSize="@dimen/sp_16" /> @@ -309,7 +308,6 @@ android:layout_height="wrap_content" android:layout_marginHorizontal="@dimen/dp_20" android:layout_marginTop="@dimen/dp_12" android:drawableStart="@drawable/svg_must" android:text="交警判责照片" android:textColor="@color/gray_9" android:textSize="@dimen/sp_16" /> app/src/main/res/layout/activity_car_maintain.xml
@@ -437,6 +437,8 @@ android:text="刹车灯情况" android:textColor="@color/gray_9" android:textSize="@dimen/sp_14" android:visibility="gone" tools:visibility="visible" android:textStyle="bold" app:layout_constraintLeft_toLeftOf="@+id/tv2" app:layout_constraintRight_toRightOf="@+id/tv2" @@ -451,6 +453,8 @@ android:textColor="@color/gray_9" android:textSize="@dimen/sp_14" android:textStyle="bold" android:visibility="gone" tools:visibility="visible" app:layout_constraintLeft_toLeftOf="@+id/tv3" app:layout_constraintRight_toRightOf="@+id/tv3" app:layout_constraintTop_toBottomOf="@+id/rv2" /> @@ -460,6 +464,8 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginTop="@dimen/dp_10" android:visibility="gone" tools:visibility="visible" app:layout_constraintLeft_toLeftOf="@+id/tv2" app:layout_constraintRight_toRightOf="@+id/tv2" app:layout_constraintTop_toBottomOf="@+id/tv4" @@ -470,6 +476,8 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginTop="@dimen/dp_10" android:visibility="gone" tools:visibility="visible" app:layout_constraintLeft_toLeftOf="@+id/tv3" app:layout_constraintRight_toRightOf="@+id/tv3" app:layout_constraintTop_toBottomOf="@+id/tv5" app/src/main/res/layout/activity_create_task.xml
@@ -139,11 +139,11 @@ android:background="@mipmap/img_map"> <androidx.appcompat.widget.AppCompatTextView android:id="@+id/tv_address" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center_vertical" android:layout_marginStart="@dimen/dp_12" android:id="@+id/tv_address" android:textColor="@color/gray_9" android:textSize="@dimen/sp_14" android:textStyle="bold" @@ -174,10 +174,10 @@ android:layout_marginStart="@dimen/dp_20" android:layout_weight="1" android:gravity="end" android:paddingVertical="@dimen/dp_3" android:hint="请选择" android:textColorHint="@color/gray_6" android:paddingVertical="@dimen/dp_3" android:textColor="@color/gray_9" android:textColorHint="@color/gray_6" android:textSize="@dimen/sp_14" /> <androidx.appcompat.widget.AppCompatImageView @@ -214,44 +214,8 @@ <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="@dimen/dp_8" android:layout_marginVertical="@dimen/dp_8" android:orientation="horizontal"> <RelativeLayout android:id="@+id/level3" android:layout_width="0dp" android:layout_height="@dimen/dp_36" android:layout_weight="1" android:background="@{viewModel.taskLevel==3?@drawable/shape_blue_5_bg_4:@drawable/shape_gray_3_bg_4}" android:onClick="@{viewModel.onClick}" android:paddingHorizontal="@dimen/dp_16" tools:background="@drawable/shape_blue_5_bg_4"> <androidx.appcompat.widget.AppCompatTextView android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" android:text="四级" android:textColor="@{viewModel.taskLevel==3?@color/white:@color/gray_9}" android:textSize="@dimen/sp_14" tools:textColor="@color/white" /> <androidx.appcompat.widget.AppCompatTextView android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_alignParentEnd="true" android:layout_centerVertical="true" android:layout_marginStart="@dimen/dp_16" android:text="一般" android:textColor="@{viewModel.taskLevel==3?@color/gray_2:@color/gray_7}" android:textSize="@dimen/sp_12" tools:textColor="@color/gray_2" /> </RelativeLayout> <View android:layout_width="@dimen/dp_8" android:layout_height="@dimen/dp_8" /> <RelativeLayout android:id="@+id/level2" @@ -260,7 +224,7 @@ android:layout_weight="1" android:background="@{viewModel.taskLevel==2?@drawable/shape_blue_5_bg_4:@drawable/shape_gray_3_bg_4}" android:onClick="@{viewModel.onClick}" android:paddingHorizontal="@dimen/dp_16" android:paddingHorizontal="@dimen/dp_12" tools:background="@drawable/shape_gray_3_bg_4"> <androidx.appcompat.widget.AppCompatTextView @@ -277,7 +241,6 @@ android:layout_height="wrap_content" android:layout_alignParentEnd="true" android:layout_centerVertical="true" android:layout_marginStart="@dimen/dp_16" android:text="较大" android:textColor="@{viewModel.taskLevel==2?@color/gray_2:@color/gray_7}" android:textSize="@dimen/sp_12" @@ -285,13 +248,9 @@ </RelativeLayout> </LinearLayout> <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="@dimen/dp_8" android:orientation="horizontal"> <View android:layout_width="@dimen/dp_8" android:layout_height="@dimen/dp_8" /> <RelativeLayout android:id="@+id/level1" @@ -300,7 +259,7 @@ android:layout_weight="1" android:background="@{viewModel.taskLevel==1?@drawable/shape_blue_5_bg_4:@drawable/shape_gray_3_bg_4}" android:onClick="@{viewModel.onClick}" android:paddingHorizontal="@dimen/dp_16" android:paddingHorizontal="@dimen/dp_12" tools:background="@drawable/shape_gray_3_bg_4"> <androidx.appcompat.widget.AppCompatTextView @@ -317,7 +276,6 @@ android:layout_height="wrap_content" android:layout_alignParentEnd="true" android:layout_centerVertical="true" android:layout_marginStart="@dimen/dp_16" android:text="重大" android:textColor="@{viewModel.taskLevel==1?@color/gray_2:@color/gray_7}" android:textSize="@dimen/sp_12" @@ -336,7 +294,7 @@ android:layout_weight="1" android:background="@{viewModel.taskLevel==0?@drawable/shape_blue_5_bg_4:@drawable/shape_gray_3_bg_4}" android:onClick="@{viewModel.onClick}" android:paddingHorizontal="@dimen/dp_16" android:paddingHorizontal="@dimen/dp_12" tools:background="@drawable/shape_gray_3_bg_4"> <androidx.appcompat.widget.AppCompatTextView @@ -353,7 +311,6 @@ android:layout_height="wrap_content" android:layout_alignParentEnd="true" android:layout_centerVertical="true" android:layout_marginStart="@dimen/dp_16" android:text="特别重大" android:textColor="@{viewModel.taskLevel==0?@color/gray_2:@color/gray_7}" android:textSize="@dimen/sp_12" @@ -362,7 +319,6 @@ </RelativeLayout> </LinearLayout> </LinearLayout> <androidx.appcompat.widget.AppCompatTextView @@ -383,8 +339,8 @@ android:background="@drawable/shape_gray_3_bg_4" android:gravity="top" android:hint="请输入任务描述" android:minHeight="@dimen/dp_100" android:maxLength="600" android:minHeight="@dimen/dp_100" android:padding="@dimen/dp_12" android:text="@={viewModel.taskDesc}" android:textColor="@color/gray_9"
