任务详情页车门开锁，后备箱开锁接口更改 巡游打卡打卡完成弹窗交互优化 登录页协议查看接口更改

18034727885

2026-04-22 8d63565cf40e9979f64fcbfd793883aecf07fdbc

任务详情页车门开锁，后备箱开锁接口更改
巡游打卡打卡完成弹窗交互优化
登录页协议查看接口更改

 app/build.gradle.kts

@@ -82,7 +82,7 @@
            manifestPlaceholders["APP_NAME"] = "@string/app_name_dev"
            manifestPlaceholders["icon"] = "@mipmap/ic_launcher"

            buildConfigField("String", "API_HOST", "\"http://192.168.110.111:8000/\"")
            buildConfigField("String", "API_HOST", "\"http://221.182.45.100:8000/\"")
            buildConfigField("String", "WS_URL", "\"ws://192.168.110.34:8888/websocket\"")
        }
        create("local") { // 本地环境

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

@@ -5,6 +5,5 @@
    val id: String,
    val content: String,
    val type: Int,
    val webType: Int = 1,
    val version: String
)

 app/src/main/java/com/xw/yunwei/net/UserApi.kt

@@ -87,4 +87,8 @@
    /*获取协议配置 */
    @GET("operation/maintenance-app/base/v1/loginAgreement/getLoginAgreementList")
    fun getAgreeConfig(): Call<HttpResponse<List<AgreeInfo>>>

    /*获取登录协议*/
    @GET("operation/maintenance-app/base/v1/privacy/getAppContentById/{id}")
    fun getLoginProtocol(@Path("id") id: Int): Call<HttpResponse<WebContentModel>>
}

 app/src/main/java/com/xw/yunwei/net/UserRepository.kt

@@ -41,5 +41,6 @@

    fun getUserInfo() = flow { emit(api.getUserInfo().interceptAwait()) }


    /*获取登录协议*/
    suspend fun getLoginProtocol(id: Int) = api.getLoginProtocol(id).interceptAwait()
}

 app/src/main/java/com/xw/yunwei/net/WorkApi.kt

@@ -55,7 +55,7 @@
    fun vehicleDispatchDeparture(@Body body: RequestBody): Call<HttpResponse<CarModel>>

    /* 车辆运维-车门解锁/后备箱解锁 */
    @POST("vehicleConvoy/maintenance-app/api/v1/vehicle/unlockByType")
    @POST("vehicleConvoy/maintenance-app/api/v1/vehicle/unlockDoor")
    fun unlockByType(@Body body: RequestBody): Call<HttpResponse<CarModel>>

    /* 车辆运维-车辆运维-车辆整备 */
@@ -151,6 +151,6 @@
    fun getCheckInMissionPointsList(@Path("id") id: String): Call<HttpResponse<List<CheckInMissionPointInfo>>>

    /* 巡游打卡操作 */
    @GET("maintenance/maintenance-app/api/v1/cruiseCheckInRule/saveCruiseCheckInRecord")
    @POST("maintenance/maintenance-app/api/v1/cruiseCheckInRule/saveCruiseCheckInRecord")
    fun saveCruiseCheckInRecord(@Body params: RequestBody): Call<HttpResponse<List<CheckInMissionPointInfo>>>
}

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

@@ -17,7 +17,7 @@
    fun show(
        context: Context,
        result: CruiseCheckInOperationResult
    ) {
    ): MaterialDialog {
        val dialog = MaterialDialog(context).apply {
            customView(
                R.layout.dialog_cruise_check_in_success,
@@ -76,5 +76,6 @@
        dialog.show()
        dialog.window?.setGravity(Gravity.CENTER)
        dialog.window?.setWindowAnimations(com.xw.common.R.style.AnimLeft)
        return dialog
    }
}

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

@@ -108,7 +108,9 @@
        }) {
            val map = mutableMapOf<String, Any?>()
            map["vehicleId"] = taskDetail.value?.vehicleId // 车辆ID
            map["unlockType"] = type // 解锁类型 1车门 2后备箱
            map["latitude"] = com.xw.common.Constants.latitude
            map["longitude"] = com.xw.common.Constants.longitude
            map["doorType"] = if (type == 1) "door" else "trunk" // 解锁类型 1车门 2后备箱
            workRepository.unlockByType(map)
            val tips = if (type == 1) "车门已解锁" else "后备箱已解锁"
            ToastUtilCommon.showSuc(tips)

 app/src/main/java/com/xw/yunwei/ui/user/login/LoginActivity.kt

@@ -4,6 +4,7 @@
import android.text.TextPaint
import android.text.method.LinkMovementMethod
import android.text.style.ClickableSpan
import android.view.Gravity
import android.view.View
import androidx.core.os.bundleOf
import androidx.lifecycle.Observer
@@ -66,7 +67,7 @@
                    override fun onClick(widget: View) {
                        startActivity(
                            StandardDescriptionActivity::class.java,
                            bundleOf("type" to it.type, "webType" to it.webType)
                            bundleOf("type" to it.id.toInt(), "webType" to 1)
                        )
                    }

@@ -104,6 +105,7 @@
                        agreeBold = false,
                        agreeTextColor = R.color.gray_9
                    ),
                    contentTextGravity = Gravity.START,
                    leftOperationText = "不同意",
                    rightOperationText = "同意",
                    rightOperationBlock = {

 app/src/main/java/com/xw/yunwei/ui/work/car/detail/CarDetailVM.kt

@@ -87,7 +87,9 @@
        }) {
            val map = mutableMapOf<String, Any?>()
            map["vehicleId"] = carInfo.value?.id // 车辆ID
            map["unlockType"] = type // 解锁类型 1车门 2后备箱
            map["latitude"] = com.xw.common.Constants.latitude
            map["longitude"] = com.xw.common.Constants.longitude
            map["doorType"] = if (type == 1) "door" else "trunk" // 解锁类型 1车门 2后备箱
            workRepository.unlockByType(map)
            val tips = if (type == 1) "车门已解锁" else "后备箱已解锁"
            ToastUtilCommon.showSuc(tips)

 app/src/main/java/com/xw/yunwei/ui/work/car/detail/StandardDescriptionActivity.kt

@@ -27,7 +27,7 @@
            viewModel.getDesc(type)
        } else {
            binding.title.text = "协议内容"
            viewModel.getProtocol(type)
            viewModel.getLoginProtocol(type)
        }
        initWeb(binding.web)
        binding.back.setOnClickListener { onBackPressedHandel() }

 app/src/main/java/com/xw/yunwei/ui/work/car/detail/StandardDescriptionVM.kt

@@ -30,4 +30,11 @@
        }
    }

    fun getLoginProtocol(type: Int) {
        launchRequest(showLoading = false) {
            userRepository.getLoginProtocol(type)?.let {
                data.postValue(it.content?:"")
            }
        }
    }
}

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

@@ -569,6 +569,12 @@

    //显示巡游打卡成功弹窗
    private fun showCruiseCheckInSuccessDialog(event: CruiseCheckInOperationResult) {
        CruiseCheckInSuccessDialog.show(this, event)
        CruiseCheckInSuccessDialog.show(this, event).apply {
            setOnDismissListener {
                if (viewModel.getNextPoint() == null) {
                    finish()
                }
            }
        }
    }
}

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

@@ -48,7 +48,7 @@
    val countNotice: MutableLiveData<String> =
        MutableLiveData("${desc.value?.length ?: 0}/${maxLength.value}")
    val noticeLabel: MutableLiveData<String> = MutableLiveData("最多输入${maxLength.value}字")
    val pictureMax = MutableLiveData(9)
    val pictureMax = MutableLiveData(6)

    //操作图片
    val operationPictures: MutableLiveData<MutableList<String>> = MutableLiveData(mutableListOf(""))

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

@@ -424,8 +424,6 @@
<!--                        show="@{viewModel.taskDetail.status == 1}"-->
                        <LinearLayout
                            android:baselineAligned="false"
                            android:visibility="gone"
                            tools:visibility="visible"
                            android:layout_width="match_parent"
                            android:layout_height="wrap_content"
                            android:orientation="horizontal">

 common/src/main/java/com/xw/common/CommonDialog.kt

@@ -122,6 +122,7 @@
        content: CharSequence,
        contentTextSize: Float = 14f,
        contentTextColor: Int = R.color.gray_9,
        contentTextGravity: Int = Gravity.CENTER,
        leftOperationText: String? = "取消",
        leftOperationTextSize: Float = 16f,
        leftOperationTextColor: Int = R.color.gray_10,
@@ -152,6 +153,7 @@
                tvContent.movementMethod = LinkMovementMethod.getInstance()
                tvContent.setTextSize(TypedValue.COMPLEX_UNIT_SP, contentTextSize)
                tvContent.setTextColor(ContextCompat.getColor(context, contentTextColor))
                tvContent.gravity = contentTextGravity
                btnLeft.text = leftOperationText ?: ""
                btnLeft.setTextSize(TypedValue.COMPLEX_UNIT_SP, leftOperationTextSize)
                btnLeft.setTextColor(ContextCompat.getColor(context, leftOperationTextColor))