| app/src/main/java/com/xw/yunwei/ui/work/car/detail/operations/check/CheckCarVM.kt | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| app/src/main/res/layout/activity_car_check.xml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| app/src/main/res/layout/activity_car_check_detail.xml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| app/src/main/res/layout/layout_normal_task_check_detail.xml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
app/src/main/java/com/xw/yunwei/ui/work/car/detail/operations/check/CheckCarVM.kt
@@ -26,7 +26,6 @@ import org.json.JSONObject import org.koin.core.component.inject import java.io.File import kotlin.getValue class CheckCarVM(application: Application) : BaseViewModel(application) { val workRepository: WorkRepository by inject() @@ -56,7 +55,8 @@ } val switchs = mutableListOf<SlideSwitchView>() val adaptersName = listOf("传感器清洁", "车内交互屏检查", "紧急求助按钮/应答机", "支付功能", "订单系统检查") val adaptersName = listOf("传感器清洁", "车内交互屏检查", "紧急求助按钮/应答机", "支付功能", "订单系统检查") val adapters = mutableListOf<ImageSelectAdapter>() val imageEvents = mutableListOf<ImageEventListener<FileSelectBean>>() val maxSizes = listOf(6, 6, 6, 6, 6) // 先默认每个都是最大9张 @@ -106,10 +106,22 @@ val jsob = JSONObject(GsonUtils.toJson(data)) checkResult.value = listOf( CarCheckModel("网络检测", if (jsob.optInt("networkDetection") == 1) 2 else 3), CarCheckModel("远程控制自检", if (jsob.optInt("remoteSelfCheck") == 1) 2 else 3), CarCheckModel("软件版本核对", if (jsob.optInt("versionVerification") == 1) 2 else 3), CarCheckModel("防撞激活", if (jsob.optInt("collisionAvoidanceActivation") == 1) 2 else 3), CarCheckModel("通讯自检", if (jsob.optInt("communicationSelfCheck") == 1) 2 else 3), CarCheckModel( "远程控制自检", if (jsob.optInt("remoteSelfCheck") == 1) 2 else 3 ), CarCheckModel( "软件版本核对", if (jsob.optInt("versionVerification") == 1) 2 else 3 ), CarCheckModel( "防撞激活", if (jsob.optInt("collisionAvoidanceActivation") == 1) 2 else 3 ), CarCheckModel( "通讯自检", if (jsob.optInt("communicationSelfCheck") == 1) 2 else 3 ), CarCheckModel("传感器自检", if (jsob.optInt("sensorSelfCheck") == 1) 2 else 3), ) requestModel.networkDetection = jsob.optInt("networkDetection") @@ -128,7 +140,7 @@ // return // } adapters.forEachIndexed { index, adapter -> if (adapter.data.isEmpty() && !switchs[index].isChecked()) { if ((adapter.data.isEmpty() || !switchs[index].isChecked()) && index != 3) { // ToastUtilCommon.showError("请上传${adaptersName[index]}照片或修改检测状态") ToastUtilCommon.showError("请完成所有检测项并上传图片") return app/src/main/res/layout/activity_car_check.xml
@@ -100,31 +100,31 @@ android:layout_marginStart="@dimen/dp_20" android:layout_marginTop="@dimen/dp_20" android:text="车身自检" tools:visibility="visible" android:visibility="gone" android:textColor="@color/gray_9" android:textSize="@dimen/sp_16" android:textStyle="bold" android:visibility="gone" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintTop_toTopOf="parent" tools:visibility="visible" /> <com.google.android.material.button.MaterialButton android:id="@+id/check" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginEnd="@dimen/dp_20" tools:visibility="visible" android:visibility="gone" android:backgroundTint="@{viewModel.btnEnableStatus==true?@color/blue_5:@color/gray_4}" android:onClick="@{viewModel.onClick}" android:text="@{viewModel.btnText}" android:textSize="@dimen/sp_12" android:textStyle="bold" android:visibility="gone" app:cornerRadius="@dimen/dp_4" app:layout_constraintBottom_toBottomOf="@+id/tv" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toTopOf="@+id/tv" tools:text="开始自检" /> tools:text="开始自检" tools:visibility="visible" /> <LinearLayout android:id="@+id/layout" @@ -139,11 +139,11 @@ <androidx.appcompat.widget.AppCompatTextView android:layout_width="wrap_content" android:layout_height="wrap_content" tools:visibility="visible" android:visibility="gone" android:text="请点击右上角按钮开始车辆自检" android:textColor="@color/gray_6" android:textSize="@dimen/sp_12" /> android:textSize="@dimen/sp_12" android:visibility="gone" tools:visibility="visible" /> <androidx.appcompat.widget.AppCompatImageView android:id="@+id/icon" @@ -182,9 +182,9 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginEnd="@dimen/dp_20" android:onClick="@{viewModel.onClick}" android:padding="4dp" android:text="标准说明" android:onClick="@{viewModel.onClick}" android:textColor="@color/blue_5" android:textSize="@dimen/sp_12" android:textStyle="bold" @@ -334,14 +334,17 @@ android:textColor="@color/gray_9" android:textSize="@dimen/sp_16" android:textStyle="bold" android:visibility="gone" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintTop_toBottomOf="@+id/rv3" /> app:layout_constraintTop_toBottomOf="@+id/rv3" tools:visibility="visible" /> <com.xw.common.custom.SlideSwitchView android:id="@+id/switch4" android:layout_width="@dimen/dp_110" android:layout_height="@dimen/dp_36" android:layout_marginEnd="@dimen/dp_20" android:visibility="gone" app:layout_constraintBottom_toBottomOf="@+id/tv5" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toTopOf="@+id/tv5" @@ -357,7 +360,8 @@ app:switchThumbColorChecked="@color/green_5" app:switchThumbColorUnchecked="@color/gray_6" app:switchThumbCornerRadius="@dimen/dp_4" app:switchThumbMargin="@dimen/dp_2" /> app:switchThumbMargin="@dimen/dp_2" tools:visibility="visible" /> <androidx.recyclerview.widget.RecyclerView android:id="@+id/rv4" @@ -365,8 +369,10 @@ android:layout_height="wrap_content" android:layout_marginHorizontal="@dimen/dp_20" android:layout_marginTop="@dimen/dp_14" android:visibility="gone" app:layout_constraintTop_toBottomOf="@+id/tv5" tools:layout_height="@dimen/dp_40" /> tools:layout_height="@dimen/dp_40" tools:visibility="visible" /> <androidx.appcompat.widget.AppCompatTextView android:id="@+id/tv6" @@ -431,8 +437,8 @@ android:layout_marginTop="@dimen/dp_24" android:layout_marginBottom="@dimen/dp_12" android:backgroundTint="@color/blue_5" android:text="提交检测结果" android:onClick="@{viewModel.onClick}" android:text="提交检测结果" android:textSize="@dimen/sp_16" android:textStyle="bold" app:cornerRadius="@dimen/dp_4" app/src/main/res/layout/activity_car_check_detail.xml
@@ -231,6 +231,8 @@ android:textColor="@color/gray_9" android:textSize="@dimen/sp_16" android:textStyle="bold" android:visibility="gone" tools:visibility="visible" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintTop_toBottomOf="@+id/rv3" /> @@ -240,6 +242,8 @@ android:layout_height="wrap_content" android:layout_marginHorizontal="@dimen/dp_20" android:layout_marginTop="@dimen/dp_14" android:visibility="gone" tools:visibility="visible" app:layout_constraintTop_toBottomOf="@+id/tv5" tools:layout_height="@dimen/dp_40" />
@@ -458,6 +458,8 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="支付功能：" android:visibility="gone" tools:visibility="visible" android:textColor="@color/gray_9" android:textSize="@dimen/sp_12" /> @@ -465,12 +467,16 @@ android:id="@+id/rv4" android:layout_width="match_parent" android:layout_height="wrap_content" android:visibility="gone" tools:visibility="visible" android:layout_marginTop="@dimen/dp_5" tools:layout_height="@dimen/dp_50" /> <View android:layout_width="match_parent" android:layout_height="1px" android:visibility="gone" tools:visibility="visible" android:layout_marginVertical="@dimen/dp_12" android:background="@color/gray_4" />
