修复问题

18034727885

2026-06-26 f7f4c9bb5d60a03ab95ee9184a6dc6d44029a8ee

修复问题

 app/src/main/java/com/xw/yunwei/model/CruiseCheckInOperationResult.kt

@@ -45,7 +45,7 @@
    }

    //获取显示工作状态
    fun getShowWorkStatus() = if (fieldSituation == "1") "正常" else "拥堵"
    fun getShowWorkStatus() = if (fieldSituation == "1") "正常" else "异常"

    //获取上传结果
    fun getUploadInfoList(): List<UploadModel>? {

 app/src/main/java/com/xw/yunwei/ui/dialog/CruiseCheckInSuccessDialog.kt

@@ -58,7 +58,7 @@
                getResColor(
                    when (result.fieldSituation) {
                        "1" -> com.xw.common.R.color.green_5
                        "2" -> com.xw.common.R.color.red_5
                        "2" -> com.xw.common.R.color.orange_5
                        else -> com.xw.common.R.color.gray_9
                    }
                )
@@ -66,7 +66,7 @@
            tvWorkStatus.setBackgroundResource(
                when (result.fieldSituation) {
                    "1" -> R.drawable.shape_green_1_bg_2
                    "2" -> R.drawable.shape_fdedeb_bg_2
                    "2" -> R.drawable.shape_orange_1_bg_2
                    else -> 0
                }
            )

 app/src/main/java/com/xw/yunwei/ui/work/checkInMission/CruiseCheckInMissionCompleteActivity.kt

@@ -71,7 +71,7 @@
                getResColor(
                    when (it.fieldSituation) {
                        "1" -> com.xw.common.R.color.green_5
                        "2" -> com.xw.common.R.color.red_5
                        "2" -> com.xw.common.R.color.orange_5
                        else -> com.xw.common.R.color.gray_9
                    }
                )
@@ -79,7 +79,7 @@
            binding.tvWorkStatus.setBackgroundResource(
                when (it.fieldSituation) {
                    "1" -> R.drawable.shape_green_1_bg_2
                    "2" -> R.drawable.shape_fdedeb_bg_2
                    "2" -> R.drawable.shape_orange_1_bg_2
                    else -> 0
                }
            )

 app/src/main/java/com/xw/yunwei/ui/work/checkInMission/CruiseCheckInOperationActivity.kt

@@ -2,6 +2,7 @@

import android.os.Bundle
import android.view.View
import androidx.constraintlayout.widget.ConstraintLayout
import androidx.core.content.ContextCompat
import androidx.core.os.bundleOf
import androidx.core.widget.addTextChangedListener
@@ -11,6 +12,8 @@
import com.xw.yunwei.R
import com.xw.yunwei.constants.Key
import com.xw.yunwei.databinding.ActivityCruiseCheckInOperationBinding
import com.xw.yunwei.extension.dpToPx
import com.xw.yunwei.extension.drawableIdToColorValue
import com.xw.yunwei.model.CheckInMissionPointInfo
import com.xw.yunwei.ui.work.checkInMission.viewmodel.CruiseCheckInOperationViewModel
import com.xw.yunwei.ui.work.site.adapter.PictureOperationAdapter
@@ -103,6 +106,28 @@
                R.drawable.shape_gray11_bg_4
            }
        )
        binding.tvLabel2.setCompoundDrawables(
            if (viewModel.working.value != true) com.xw.common.R.drawable.svg_must.drawableIdToColorValue(
                this
            )?.apply {
                setBounds(
                    0,
                    0,
                    8.dpToPx(this@CruiseCheckInOperationActivity),
                    15.dpToPx(this@CruiseCheckInOperationActivity)
                )
            } else null,
            null,
            null,
            null
        )
        binding.flInput.layoutParams =
            (binding.flInput.layoutParams as ConstraintLayout.LayoutParams).apply {
                marginStart =
                    (if (viewModel.working.value == false) 28 else 20).dpToPx(this@CruiseCheckInOperationActivity)
                marginEnd =
                    (if (viewModel.working.value == false) 28 else 20).dpToPx(this@CruiseCheckInOperationActivity)
            }
    }

    override fun setObservable() {

 app/src/main/java/com/xw/yunwei/ui/work/checkInMission/RoutePlanningActivity.kt

@@ -185,11 +185,11 @@
                if (viewModel.naviPaths.value?.get(if (it) 0 else 1)?.naviPaths?.isNotEmpty() == true) R.drawable.shape_blue_5_bg_4 else R.drawable.shape_gray_5_bg_4
            )
        }
        viewModel.couldNavi.observe(this) {
            binding.btnPlan.setBackgroundResource(
                if (it) R.drawable.shape_blue_5_bg_4 else R.drawable.shape_gray_5_bg_4
            )
        }
//        viewModel.couldNavi.observe(this) {
//            binding.btnPlan.setBackgroundResource(
//                if (it) R.drawable.shape_blue_5_bg_4 else R.drawable.shape_gray_5_bg_4
//            )
//        }
    }

    override fun setListener() {
@@ -267,6 +267,7 @@
                    it.stopNavi()
                    AMapNavi.destroy()
                }
                viewModel.checkWalk.postValue(true)
                viewModel.couldNavi.postValue(true)
            }
        }

 app/src/main/java/com/xw/yunwei/ui/work/checkInMission/viewmodel/CruiseCheckInOperationViewModel.kt

@@ -115,7 +115,7 @@

    // 拍照
    private fun takeAPhotograph(context: Context) {
        PictureSelectorFactory.takeAPhotograph(context,this)
        PictureSelectorFactory.takeAPhotograph(context, this)
    }

    override fun onResult(result: ArrayList<LocalMedia>?) {
@@ -168,7 +168,7 @@
            ToastUtilCommon.showError("请选择现场情况")
            return
        }
        if (TextUtils.isEmpty(desc.value)) {
        if (TextUtils.isEmpty(desc.value) && working.value != true) {
            ToastUtilCommon.showError("请输入现场情况描述")
            return
        }

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

@@ -160,7 +160,7 @@
                    android:layout_marginEnd="@dimen/dp_28"
                    android:background="@drawable/shape_gray11_bg_4"
                    android:gravity="center"
                    android:text="拥堵"
                    android:text="异常"
                    android:textColor="@color/gray_9"
                    android:textSize="@dimen/sp_14"
                    android:textStyle="bold"