Эх сурвалжийг харах

refactor(更新)
- 修改了作业的流程,优化了点击事件的防抖动

周文健 10 сар өмнө
parent
commit
c17984710b

+ 5 - 0
app/src/main/java/com/grkj/iscs/features/main/fragment/job_manage/EditJobFragment.kt

@@ -352,6 +352,11 @@ class EditJobFragment : BaseFormFragment<FragmentEditJobBinding>() {
                     viewModel.workstationData.find { it.workstationId == viewModel.jobTicketData?.workstationId }?.workstationName
                 selectedWorkstationId = viewModel.jobTicketData?.workstationId
                 selectedModeId = viewModel.jobTicketData?.modeId
+                viewModel.getWorkflowSteps(selectedModeId!!).observe(this) {
+                    binding.workflowRv.models = viewModel.workflowSteps
+                }
+                binding.selectColockerLayout.isVisible =
+                    viewModel.workflowModes.find { it.modeId == selectedModeId }?.isColockSupport == true
                 binding.lockModeTv.text =
                     viewModel.workflowModes.find { it.modeId == selectedModeId }
                         ?.modeTitle

+ 8 - 0
data/src/main/java/com/grkj/data/repository/impl/network/NetworkHardwareRepository.kt

@@ -319,4 +319,12 @@ class NetworkHardwareRepository  @Inject constructor() : BaseRepository(), IHard
     override fun getAllHardwareCount(): Int {
         TODO("Not yet implemented")
     }
+
+    override fun getCardByCardRfid(cardRfid: String): IsJobCard? {
+        TODO("Not yet implemented")
+    }
+
+    override fun getRfidDataByRfid(rfid: String): IsRfidToken? {
+        TODO("Not yet implemented")
+    }
 }

+ 1 - 0
data/src/main/java/com/grkj/data/repository/impl/standard/JobTicketRepository.kt

@@ -190,6 +190,7 @@ class JobTicketRepository @Inject constructor(
                 isJobTicketStep.stepIndex = workflowStep.stepIndex
                 isJobTicketStep.stepContent = workflowStep.stepTitle
                 isJobTicketStep.androidStepContent = workflowStep.stepTitleShort
+                isJobTicketStep.workflowStepId = workflowStep.stepId
                 add(isJobTicketStep)
             }
         }

+ 3 - 2
ui-base/src/main/java/com/grkj/ui_base/dialog/TipDialog.kt

@@ -8,6 +8,7 @@ import com.grkj.ui_base.utils.CommonUtils
 import com.kongzue.dialogx.dialogs.CustomDialog
 import com.kongzue.dialogx.interfaces.OnBindView
 import com.sik.sikcore.SIKCore
+import com.sik.sikcore.extension.setDebouncedClickListener
 import com.sik.sikcore.thread.ThreadUtils
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
@@ -42,13 +43,13 @@ class TipDialog : OnBindView<CustomDialog>(R.layout.dialog_tip) {
         binding = DialogTipBinding.bind(contentView)
         dialog?.setMaskColor(CommonUtils.getColor(R.color.scrim))
         // 确定按钮
-        binding.confirmBtn.setOnClickListener {
+        binding.confirmBtn.setDebouncedClickListener {
             countDownJob?.cancel()
             onConfirmClick()
             dialog?.dismiss()
         }
         // 取消按钮
-        binding.cancelBtn.setOnClickListener {
+        binding.cancelBtn.setDebouncedClickListener {
             countDownJob?.cancel()
             onCancelClick()
             dialog?.dismiss()