feat(inspection): 添加检查结果状态传递功能
- 在 InspectionCompleteActivity 中新增 EXTRA_QUALIFIED 和 EXTRA_REASON 常量 - 修改 InspectionCompleteActivity 的 UI 显示逻辑以展示检查结果状态 - 在 InspectionResultActivity 中传递检查结果到完成页面 - 在 InspectionResultVM 中添加 qualifiedResult LiveData 存储检查结果对 - 更新数据加载逻辑以获取并存储检查合格状态和原因信息
这个提交包含在:
父节点
462e5b59a3
当前提交
0756be50d4
@ -18,6 +18,8 @@ class InspectionCompleteActivity : BaseActivity<ActivityInspectionCompleteBindin
|
||||
companion object {
|
||||
const val EXTRA_PHOTO_COUNT = "extra_photo_count"
|
||||
const val EXTRA_TASK_NO = "extra_task_no"
|
||||
const val EXTRA_QUALIFIED = "extra_qualified"
|
||||
const val EXTRA_REASON = "extra_reason"
|
||||
}
|
||||
|
||||
private val viewModel: InspectionCompleteVM by lazy {
|
||||
@ -38,7 +40,10 @@ class InspectionCompleteActivity : BaseActivity<ActivityInspectionCompleteBindin
|
||||
override fun initData() {
|
||||
super.initData()
|
||||
val count = intent.getIntExtra(EXTRA_PHOTO_COUNT, 0)
|
||||
binding.subtitle.text = "本次成功提交并归档${count}张单证!"
|
||||
val qualified = intent.getBooleanExtra(EXTRA_QUALIFIED, true)
|
||||
val reason = intent.getStringExtra(EXTRA_REASON).orEmpty()
|
||||
binding.title.text = if (qualified) "本次任务:单证齐全" else "本次任务:单证不全"
|
||||
binding.subtitle.text = reason
|
||||
binding.btnFinish.setOnClickListener { triggerFinish() }
|
||||
|
||||
viewModel.submitState.observe(this) { state ->
|
||||
|
||||
@ -159,9 +159,12 @@ class InspectionResultActivity :
|
||||
private fun goComplete() {
|
||||
val photoCount = SprayingPhotoManager.getPhotoCount()
|
||||
SprayingPhotoManager.clear()
|
||||
val result = viewModel.qualifiedResult.value
|
||||
startActivity(Intent(this, InspectionCompleteActivity::class.java).apply {
|
||||
putExtra(InspectionCompleteActivity.EXTRA_PHOTO_COUNT, photoCount)
|
||||
putExtra(InspectionCompleteActivity.EXTRA_TASK_NO, taskNo)
|
||||
putExtra(InspectionCompleteActivity.EXTRA_QUALIFIED, result?.first ?: true)
|
||||
putExtra(InspectionCompleteActivity.EXTRA_REASON, result?.second ?: "")
|
||||
})
|
||||
finish()
|
||||
}
|
||||
|
||||
@ -23,6 +23,7 @@ class InspectionResultVM : BaseListViewModel<ItemItem>() {
|
||||
val action = MutableLiveData(InspectionResultAction.IDLE)
|
||||
val validateResult = MutableLiveData<ValidateResultItem?>()
|
||||
val errorMsg = MutableLiveData<String>()
|
||||
val qualifiedResult = MutableLiveData<Pair<Boolean, String>?>()
|
||||
|
||||
override fun loadData(page: Int, onResponse: Response<ItemItem>) {
|
||||
onResponse.onResponse(arrayListOf<ItemItem>().apply {
|
||||
@ -70,6 +71,8 @@ class InspectionResultVM : BaseListViewModel<ItemItem>() {
|
||||
.subscribe({ response ->
|
||||
if (response.success) {
|
||||
val qualified = response.data?.qualified ?: false
|
||||
val reason = response.data?.reason ?: ""
|
||||
qualifiedResult.value = Pair(qualified, reason)
|
||||
action.value = if (qualified) {
|
||||
InspectionResultAction.CHECK_QUALIFIED_COMPLETE
|
||||
} else {
|
||||
|
||||
正在加载...
在新工单中引用
屏蔽一个用户