refactor(data):

- 包名修改

refactor(can):
- 初始化的代码无效的问题

app/src/main/java/com/grkj/iscs/ISCSApplication.kt

@@ -13,7 +13,7 @@ import coil.memory.MemoryCache
 import com.drake.statelayout.StateConfig
 import com.grkj.data.config.ISCSConfig
 import com.grkj.data.data.EventConstants
-import com.grkj.data.database.DbReadyGate
+import com.grkj.data.local.database.DbReadyGate
 import com.grkj.data.di.LogicManager
 import com.grkj.data.hardware.ble.BleUtil
 import com.grkj.data.hardware.modbus.ModBusController

app/src/main/java/com/grkj/iscs/features/init/fragment/InitDeviceRegistrationKeyAndLockFragment.kt

@@ -144,6 +144,7 @@ class InitDeviceRegistrationKeyAndLockFragment :
             }
         }
         ISCSConfig.needDeviceName = true
+        viewModel.isInDeviceInit = false
     }
 
     override fun onPause() {

app/src/main/java/com/grkj/iscs/features/init/fragment/InitWelcomeFragment.kt

@@ -3,7 +3,7 @@ package com.grkj.iscs.features.init.fragment
 import androidx.core.view.isVisible
 import androidx.fragment.app.viewModels
 import com.grkj.data.data.MMKVConstants
-import com.grkj.data.database.PresetData
+import com.grkj.data.local.database.PresetData
 import com.grkj.data.enums.HardwareMode
 import com.grkj.iscs.R
 import com.grkj.iscs.databinding.FragmentInitWelcomeBinding
@@ -59,9 +59,20 @@ class InitWelcomeFragment : BaseFragment<FragmentInitWelcomeBinding>() {
             binding.startBtn.setDebouncedClickListener {
                 MMKVConstants.KEY_HARDWARE_MODE.saveMMKVData(hardwareMode)
                 HardwareMode.getCurrentHardwareMode().connectAndAddListener()
-                binding.startBtn.text = CommonUtils.getStr("detect_port")
-                binding.hardwareMode.setDebouncedClickListener {}
-                binding.startBtn.setDebouncedClickListener {}
+                if (hardwareMode == HardwareMode.CAN.name) {
+                    binding.hardwareModeLayout.isVisible = false
+                    viewModel.createLockCabinetData().observe(this) {
+
+                    }
+                    binding.startBtn.text = CommonUtils.getStr("start")
+                    binding.startBtn.setDebouncedClickListener {
+                        navController.navigate(R.id.action_initWelcomeFragment_to_initSetAdminAccountFragment)
+                    }
+                } else {
+                    binding.startBtn.text = CommonUtils.getStr("detect_port")
+                    binding.hardwareMode.setDebouncedClickListener {}
+                    binding.startBtn.setDebouncedClickListener {}
+                }
             }
         } else {
             viewModel.createLockCabinetData().observe(this) {
@@ -84,7 +95,7 @@ class InitWelcomeFragment : BaseFragment<FragmentInitWelcomeBinding>() {
                 // 切换并持久化（MMKV），I18nManager 会热更新
                 LanguageStore.setExplicit(Locale.forLanguageTag(selected.tag))
                 PresetData.targetRegion = selected.region ?: PresetData.targetRegion
-                viewModel.checkPresetData().observe(this){}
+                viewModel.checkPresetData().observe(this) {}
                 // 芯片文本友好化（可选）
                 binding.chipLang.text = I18nManager.locale.value.toLanguageTag()
                 requireActivity().recreate()

app/src/main/java/com/grkj/iscs/features/init/viewmodel/InitDeviceRegistrationKeyAndLockViewModel.kt

@@ -5,17 +5,15 @@ import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.liveData
 import com.grkj.data.config.ISCSConfig
 import com.grkj.data.data.MMKVConstants
-import com.grkj.data.database.PresetData
+import com.grkj.data.local.database.PresetData
 import com.grkj.data.enums.HardwareMode
 import com.grkj.data.hardware.DockData
 import com.grkj.data.hardware.ble.BleConnectionManager
 import com.grkj.data.hardware.modbus.DeviceConst
-import com.grkj.data.hardware.modbus.DockBean
-import com.grkj.data.logic.IHardwareLogic
-import com.grkj.data.logic.IRoleLogic
-import com.grkj.data.logic.IWorkflowLogic
-import com.grkj.data.logic.impl.standard.RoleLogic
-import com.grkj.data.model.dos.IsLockCabinetSlots
+import com.grkj.data.domain.logic.IHardwareLogic
+import com.grkj.data.domain.logic.IRoleLogic
+import com.grkj.data.domain.logic.IWorkflowLogic
+import com.grkj.data.local.dos.IsLockCabinetSlots
 import com.grkj.ui_base.base.BaseViewModel
 import com.grkj.ui_base.business.HardwareBusinessManager
 import com.sik.sikcore.extension.getMMKVData
@@ -56,9 +54,10 @@ class InitDeviceRegistrationKeyAndLockViewModel @Inject constructor(
             HardwareMode.getCurrentHardwareMode().controlAllKeyBuckleOpen {
                 HardwareBusinessManager.registerInitListener {
                     if (!ISCSConfig.canInitDevice || isInDeviceInit) {
-                        logger.info("设备录入-正在初始化设备:${ISCSConfig.canInitDevice},${isInDeviceInit}")
+                        logger.info("设备录入-正在初始化设备:${!ISCSConfig.canInitDevice},${isInDeviceInit}")
                         return@registerInitListener
                     }
+                    logger.info("设备录入-正在初始化设备:${!ISCSConfig.canInitDevice},${isInDeviceInit}")
                     isInDeviceInit = true
                     if (HardwareMode.getCurrentHardwareMode().checkDock()) {
                         isInDeviceInit = true
@@ -143,7 +142,7 @@ class InitDeviceRegistrationKeyAndLockViewModel @Inject constructor(
                     delay(800)
                     logger.info("设备录入-打开充电:${addr},${keyBean.idx}")
                     HardwareMode.getCurrentHardwareMode()
-                        .controlKeyLockAndCharge(true, keyBean.idx, addr) {
+                        .controlKeyLockAndCharge(false, keyBean.idx, addr) {
                             ThreadUtils.runOnIO {
                                 delay(3000)
                                 logger.info("设备录入-开始扫描在线蓝牙Mac")

app/src/main/java/com/grkj/iscs/features/init/viewmodel/InitViewModel.kt

@@ -2,8 +2,8 @@ package com.grkj.iscs.features.init.viewmodel
 
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.liveData
-import com.grkj.data.logic.IHardwareLogic
-import com.grkj.data.logic.IUserLogic
+import com.grkj.data.domain.logic.IHardwareLogic
+import com.grkj.data.domain.logic.IUserLogic
 import com.grkj.ui_base.base.BaseViewModel
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.Dispatchers

app/src/main/java/com/grkj/iscs/features/login/activity/LoginActivity.kt

@@ -19,10 +19,9 @@ import com.drake.brv.utils.linear
 import com.drake.brv.utils.models
 import com.drake.brv.utils.setup
 import com.grkj.data.data.MainDomainData
-import com.grkj.data.database.PresetData
+import com.grkj.data.local.database.PresetData
 import com.grkj.data.enums.LoginResultEnum
-import com.grkj.data.model.local.LoginMenuEntity
-import com.grkj.iscs.ISCSApplication
+import com.grkj.data.entity.local.LoginMenuEntity
 import com.grkj.iscs.R
 import com.grkj.iscs.databinding.ActivityLoginBinding
 import com.grkj.iscs.databinding.ItemLoginMethodBinding
@@ -44,11 +43,9 @@ import com.grkj.ui_base.skin.loadSkinIcon
 import com.grkj.ui_base.utils.CommonUtils
 import com.grkj.ui_base.utils.changeBgTint
 import com.grkj.data.utils.event.LoadingEvent
-import com.grkj.shared.utils.ArcSoftUtil
 import com.grkj.ui_base.utils.extension.getAppVersionName
 import com.grkj.ui_base.utils.extension.serialNo
 import com.grkj.ui_base.utils.fingerprint.FingerprintUtil
-import com.sik.sikcore.SIKCore
 import com.sik.sikcore.extension.setDebouncedClickListener
 import com.sik.sikcore.shell.ShellUtils
 import com.sik.sikimage.ImageConvertUtils

app/src/main/java/com/grkj/iscs/features/login/viewmodel/LoginViewModel.kt

@@ -2,14 +2,11 @@ package com.grkj.iscs.features.login.viewmodel
 
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.liveData
-import com.grkj.data.database.PresetData
+import com.grkj.data.local.database.PresetData
 import com.grkj.data.enums.LoginResultEnum
-import com.grkj.data.logic.IJobTicketLogic
-import com.grkj.data.logic.IRoleLogic
-import com.grkj.data.logic.IUserLogic
-import com.grkj.data.logic.IWorkflowLogic
-import com.grkj.data.logic.impl.standard.JobTicketLogic
-import com.grkj.data.logic.impl.standard.WorkflowLogic
+import com.grkj.data.domain.logic.IRoleLogic
+import com.grkj.data.domain.logic.IUserLogic
+import com.grkj.data.domain.logic.IWorkflowLogic
 import com.grkj.shared.config.AESConfig
 import com.grkj.shared.utils.ArcSoftUtil
 import com.grkj.ui_base.base.BaseViewModel

app/src/main/java/com/grkj/iscs/features/main/activity/MainActivity.kt

@@ -17,7 +17,7 @@ import com.grkj.data.data.EventConstants
 import com.grkj.data.data.MMKVConstants
 import com.grkj.data.data.MainDomainData
 import com.grkj.data.enums.RoleFunctionalPermissionsEnum
-import com.grkj.data.model.local.TabConfig
+import com.grkj.data.entity.local.TabConfig
 import com.grkj.iscs.R
 import com.grkj.iscs.databinding.ActivityMainBinding
 import com.grkj.iscs.features.login.activity.LoginActivity

app/src/main/java/com/grkj/iscs/features/main/dialog/CheckFaceDialog.kt

@@ -49,7 +49,7 @@ class CheckFaceDialog(
     override fun onBind(customDialog: CustomDialog, contentView: View) {
         mBinding = DialogCheckFaceBinding.bind(contentView)
         dialog = customDialog
-        customdialog.setMaskColor(CommonUtils.getColor(com.grkj.ui_base.R.attr.scrim))
+        customDialog.setMaskColor(CommonUtils.getColor(com.grkj.ui_base.R.attr.scrim))
         customDialog.setDialogLifecycleCallback(object : DialogLifecycleCallback<CustomDialog>() {
             override fun onDismiss(dialog: CustomDialog) {
                 ArcSoftUtil.stop()
@@ -168,12 +168,12 @@ class CheckFaceDialog(
                         LoadingEvent.sendLoadingEvent()
                         if (it == LoginResultEnum.FACE_VERIFY_FAILED) {
                             ArcSoftUtil.stop()
-                            dialog.dismiss()
+                            dialog?.dismiss()
                             callBack?.invoke(it)
                             PopTip.tip(CommonUtils.getStr("face_login_failed"))
                         } else {
                             ArcSoftUtil.stop()
-                            dialog.dismiss()
+                            dialog?.dismiss()
                             callBack?.invoke(it)
                         }
                     }

app/src/main/java/com/grkj/iscs/features/main/dialog/SwipCardOperationTipDialog.kt

@@ -25,7 +25,7 @@ class SwipCardOperationTipDialog() :
 
     override fun onBind(customDialog: CustomDialog, contentView: View) {
         mBinding = DialogSwipCardOperationTipBinding.bind(contentView)
-        customdialog.setMaskColor(CommonUtils.getColor(com.grkj.ui_base.R.attr.scrim))
+        customDialog.setMaskColor(CommonUtils.getColor(com.grkj.ui_base.R.attr.scrim))
         mBinding.closeIv.setDebouncedClickListener {
             customDialog.dismiss()
         }

app/src/main/java/com/grkj/iscs/features/main/dialog/data_manage/AddPointDialog.kt

@@ -2,11 +2,10 @@ package com.grkj.iscs.features.main.dialog.data_manage
 
 import android.view.View
 import com.grkj.data.enums.IsolationPointPowerTypeEnum
-import com.grkj.data.model.vo.AddPointManageVo
+import com.grkj.data.domain.vo.AddPointManageVo
 import com.grkj.iscs.R
 import com.grkj.iscs.databinding.DialogAddPointBinding
 import com.grkj.iscs.features.main.dialog.TextDropDownDialog
-import com.grkj.shared.utils.ArcSoftUtil
 import com.grkj.shared.utils.i18n.I18nManager
 import com.grkj.ui_base.skin.loadSkinIcon
 import com.grkj.ui_base.utils.CommonUtils

app/src/main/java/com/grkj/iscs/features/main/dialog/data_manage/AddPointToMapDialog.kt

@@ -1,8 +1,8 @@
 package com.grkj.iscs.features.main.dialog.data_manage
 
 import android.view.View
-import com.grkj.data.model.vo.MapInfoRespVO
-import com.grkj.data.model.vo.PointToMapVo
+import com.grkj.data.domain.vo.MapInfoRespVO
+import com.grkj.data.domain.vo.PointToMapVo
 import com.grkj.iscs.R
 import com.grkj.iscs.databinding.DialogAddPointToMapBinding
 import com.grkj.ui_base.utils.CommonUtils

app/src/main/java/com/grkj/iscs/features/main/dialog/data_manage/AddUserDialog.kt

@@ -1,10 +1,8 @@
 package com.grkj.iscs.features.main.dialog.data_manage
 
 import android.annotation.SuppressLint
-import android.util.Printer
 import android.view.View
 import android.widget.LinearLayout
-import android.widget.TextView
 import androidx.core.view.isVisible
 import com.drake.brv.annotaion.DividerOrientation
 import com.drake.brv.utils.dividerSpace
@@ -13,7 +11,7 @@ import com.drake.brv.utils.setup
 import com.grkj.data.config.ISCSConfig
 import com.grkj.data.data.CommonConstants
 import com.grkj.data.data.MMKVConstants
-import com.grkj.data.model.vo.AddUserDataVo
+import com.grkj.data.domain.vo.AddUserDataVo
 import com.grkj.iscs.R
 import com.grkj.iscs.databinding.DialogAddUserBinding
 import com.grkj.iscs.databinding.ItemDeleteBtnBinding

app/src/main/java/com/grkj/iscs/features/main/dialog/data_manage/FilterPointDialog.kt

@@ -1,16 +1,14 @@
 package com.grkj.iscs.features.main.dialog.data_manage
 
 import android.view.View
-import androidx.core.view.isVisible
 import com.grkj.data.enums.IsolationPointPowerTypeEnum
-import com.grkj.data.model.vo.PointManageFilterVo
+import com.grkj.data.domain.vo.PointManageFilterVo
 import com.grkj.iscs.R
 import com.grkj.iscs.databinding.DialogFilterPointBinding
 import com.grkj.iscs.features.main.dialog.TextDropDownDialog
 import com.grkj.shared.utils.i18n.I18nManager
 import com.grkj.ui_base.utils.CommonUtils
 import com.kongzue.dialogx.dialogs.CustomDialog
-import com.kongzue.dialogx.dialogs.PopTip
 import com.kongzue.dialogx.interfaces.OnBindView
 import com.sik.sikcore.extension.setDebouncedClickListener
 

app/src/main/java/com/grkj/iscs/features/main/dialog/data_manage/FilterRoleDialog.kt

@@ -1,12 +1,11 @@
 package com.grkj.iscs.features.main.dialog.data_manage
 
 import android.view.View
-import com.grkj.data.model.vo.RoleManageFilterVo
+import com.grkj.data.domain.vo.RoleManageFilterVo
 import com.grkj.iscs.R
 import com.grkj.iscs.databinding.DialogFilterRoleBinding
 import com.grkj.ui_base.utils.CommonUtils
 import com.kongzue.dialogx.dialogs.CustomDialog
-import com.kongzue.dialogx.dialogs.PopTip
 import com.kongzue.dialogx.interfaces.OnBindView
 import com.sik.sikcore.extension.setDebouncedClickListener
 

app/src/main/java/com/grkj/iscs/features/main/dialog/data_manage/FilterUserDialog.kt

@@ -2,7 +2,7 @@ package com.grkj.iscs.features.main.dialog.data_manage
 
 import android.view.View
 import androidx.core.view.isVisible
-import com.grkj.data.model.vo.UserManageFilterVo
+import com.grkj.data.domain.vo.UserManageFilterVo
 import com.grkj.iscs.R
 import com.grkj.iscs.databinding.DialogFilterUserBinding
 import com.grkj.data.config.ISCSConfig

app/src/main/java/com/grkj/iscs/features/main/dialog/data_manage/UpdatePointDialog.kt

@@ -2,8 +2,8 @@ package com.grkj.iscs.features.main.dialog.data_manage
 
 import android.view.View
 import com.grkj.data.enums.IsolationPointPowerTypeEnum
-import com.grkj.data.model.vo.PointManageVo
-import com.grkj.data.model.vo.UpdatePointManageVo
+import com.grkj.data.domain.vo.PointManageVo
+import com.grkj.data.domain.vo.UpdatePointManageVo
 import com.grkj.iscs.R
 import com.grkj.iscs.databinding.DialogUpdatePointBinding
 import com.grkj.iscs.features.main.dialog.TextDropDownDialog

app/src/main/java/com/grkj/iscs/features/main/dialog/data_manage/UpdatePointToMapDialog.kt

@@ -1,10 +1,9 @@
 package com.grkj.iscs.features.main.dialog.data_manage
 
 import android.view.View
-import com.grkj.data.model.vo.MapInfoRespVO
-import com.grkj.data.model.vo.PointToMapVo
+import com.grkj.data.domain.vo.MapInfoRespVO
+import com.grkj.data.domain.vo.PointToMapVo
 import com.grkj.iscs.R
-import com.grkj.iscs.databinding.DialogAddPointToMapBinding
 import com.grkj.iscs.databinding.DialogUpdatePointToMapBinding
 import com.grkj.ui_base.utils.CommonUtils
 import com.grkj.ui_base.utils.extension.tip

app/src/main/java/com/grkj/iscs/features/main/dialog/data_manage/UpdateUserDialog.kt

@@ -10,8 +10,8 @@ import com.drake.brv.utils.setup
 import com.grkj.data.config.ISCSConfig
 import com.grkj.data.data.CommonConstants
 import com.grkj.data.data.MMKVConstants
-import com.grkj.data.model.vo.UpdateUserDataVo
-import com.grkj.data.model.vo.UserManageVo
+import com.grkj.data.domain.vo.UpdateUserDataVo
+import com.grkj.data.domain.vo.UserManageVo
 import com.grkj.iscs.R
 import com.grkj.iscs.databinding.DialogUpdateUserBinding
 import com.grkj.iscs.databinding.ItemDeleteBtnBinding

app/src/main/java/com/grkj/iscs/features/main/dialog/hardware_manage/AddCardDialog.kt

@@ -2,7 +2,7 @@ package com.grkj.iscs.features.main.dialog.hardware_manage
 
 import android.view.View
 import com.grkj.data.data.EventConstants
-import com.grkj.data.model.vo.AddCardDataVo
+import com.grkj.data.domain.vo.AddCardDataVo
 import com.grkj.iscs.R
 import com.grkj.iscs.databinding.DialogAddCardBinding
 import com.grkj.iscs.features.main.dialog.TextDropDownDialog

app/src/main/java/com/grkj/iscs/features/main/dialog/hardware_manage/AddKeyDialog.kt

@@ -1,7 +1,7 @@
 package com.grkj.iscs.features.main.dialog.hardware_manage
 
 import android.view.View
-import com.grkj.data.model.vo.AddKeyDataVo
+import com.grkj.data.domain.vo.AddKeyDataVo
 import com.grkj.iscs.R
 import com.grkj.iscs.databinding.DialogAddKeyBinding
 import com.grkj.ui_base.utils.CommonUtils

app/src/main/java/com/grkj/iscs/features/main/dialog/hardware_manage/AddLockDialog.kt

@@ -1,7 +1,7 @@
 package com.grkj.iscs.features.main.dialog.hardware_manage
 
 import android.view.View
-import com.grkj.data.model.vo.AddLockDataVo
+import com.grkj.data.domain.vo.AddLockDataVo
 import com.grkj.iscs.R
 import com.grkj.iscs.databinding.DialogAddLockBinding
 import com.grkj.ui_base.utils.CommonUtils

app/src/main/java/com/grkj/iscs/features/main/dialog/hardware_manage/AddRfidTokenDialog.kt

@@ -2,7 +2,7 @@ package com.grkj.iscs.features.main.dialog.hardware_manage
 
 import android.view.View
 import com.grkj.data.data.EventConstants
-import com.grkj.data.model.vo.AddRfidTokenDataVo
+import com.grkj.data.domain.vo.AddRfidTokenDataVo
 import com.grkj.iscs.R
 import com.grkj.iscs.databinding.DialogAddRfidTokenBinding
 import com.grkj.shared.model.EventBean

app/src/main/java/com/grkj/iscs/features/main/dialog/hardware_manage/FilterCardDialog.kt

@@ -2,7 +2,7 @@ package com.grkj.iscs.features.main.dialog.hardware_manage
 
 import android.view.View
 import androidx.core.view.isVisible
-import com.grkj.data.model.vo.CardManageFilterVo
+import com.grkj.data.domain.vo.CardManageFilterVo
 import com.grkj.iscs.R
 import com.grkj.iscs.databinding.DialogFilterCardBinding
 import com.grkj.iscs.features.main.dialog.TextDropDownDialog

app/src/main/java/com/grkj/iscs/features/main/dialog/hardware_manage/FilterKeyDialog.kt

@@ -1,7 +1,7 @@
 package com.grkj.iscs.features.main.dialog.hardware_manage
 
 import android.view.View
-import com.grkj.data.model.vo.KeyManageFilterVo
+import com.grkj.data.domain.vo.KeyManageFilterVo
 import com.grkj.iscs.R
 import com.grkj.iscs.databinding.DialogFilterKeyBinding
 import com.grkj.ui_base.utils.CommonUtils

app/src/main/java/com/grkj/iscs/features/main/dialog/hardware_manage/FilterLockDialog.kt

@@ -1,7 +1,7 @@
 package com.grkj.iscs.features.main.dialog.hardware_manage
 
 import android.view.View
-import com.grkj.data.model.vo.LockManageFilterVo
+import com.grkj.data.domain.vo.LockManageFilterVo
 import com.grkj.iscs.R
 import com.grkj.iscs.databinding.DialogFilterLockBinding
 import com.grkj.ui_base.utils.CommonUtils

app/src/main/java/com/grkj/iscs/features/main/dialog/hardware_manage/FilterRfidTokenDialog.kt

@@ -1,7 +1,7 @@
 package com.grkj.iscs.features.main.dialog.hardware_manage
 
 import android.view.View
-import com.grkj.data.model.vo.RfidTokenManageFilterVo
+import com.grkj.data.domain.vo.RfidTokenManageFilterVo
 import com.grkj.iscs.R
 import com.grkj.iscs.databinding.DialogFilterRfidTokenBinding
 import com.grkj.ui_base.utils.CommonUtils

app/src/main/java/com/grkj/iscs/features/main/dialog/hardware_manage/UpdateCardDialog.kt

@@ -4,8 +4,8 @@ import android.view.View
 import androidx.core.view.isVisible
 import com.grkj.data.data.EventConstants
 import com.grkj.data.enums.CommonDictDataEnum
-import com.grkj.data.model.dos.IsJobCard
-import com.grkj.data.model.vo.UpdateCardDataVo
+import com.grkj.data.local.dos.IsJobCard
+import com.grkj.data.domain.vo.UpdateCardDataVo
 import com.grkj.iscs.R
 import com.grkj.iscs.databinding.DialogUpdateCardBinding
 import com.grkj.iscs.features.main.dialog.TextDropDownDialog

app/src/main/java/com/grkj/iscs/features/main/dialog/hardware_manage/UpdateKeyDialog.kt

@@ -2,8 +2,8 @@ package com.grkj.iscs.features.main.dialog.hardware_manage
 
 import android.view.View
 import com.grkj.data.enums.CommonDictDataEnum
-import com.grkj.data.model.dos.IsKey
-import com.grkj.data.model.vo.UpdateKeyDataVo
+import com.grkj.data.local.dos.IsKey
+import com.grkj.data.domain.vo.UpdateKeyDataVo
 import com.grkj.iscs.R
 import com.grkj.iscs.databinding.DialogUpdateKeyBinding
 import com.grkj.shared.utils.i18n.I18nManager

app/src/main/java/com/grkj/iscs/features/main/dialog/hardware_manage/UpdateLockDialog.kt

@@ -2,8 +2,8 @@ package com.grkj.iscs.features.main.dialog.hardware_manage
 
 import android.view.View
 import com.grkj.data.enums.CommonDictDataEnum
-import com.grkj.data.model.dos.IsLock
-import com.grkj.data.model.vo.UpdateLockDataVo
+import com.grkj.data.local.dos.IsLock
+import com.grkj.data.domain.vo.UpdateLockDataVo
 import com.grkj.iscs.R
 import com.grkj.iscs.databinding.DialogUpdateLockBinding
 import com.grkj.shared.utils.i18n.I18nManager

app/src/main/java/com/grkj/iscs/features/main/dialog/hardware_manage/UpdateRfidTokenDialog.kt

@@ -3,8 +3,8 @@ package com.grkj.iscs.features.main.dialog.hardware_manage
 import android.view.View
 import com.grkj.data.data.EventConstants
 import com.grkj.data.enums.CommonDictDataEnum
-import com.grkj.data.model.dos.IsRfidToken
-import com.grkj.data.model.vo.UpdateRfidTokenDataVo
+import com.grkj.data.local.dos.IsRfidToken
+import com.grkj.data.domain.vo.UpdateRfidTokenDataVo
 import com.grkj.iscs.R
 import com.grkj.iscs.databinding.DialogUpdateRfidTokenBinding
 import com.grkj.shared.model.EventBean

app/src/main/java/com/grkj/iscs/features/main/dialog/job_manage/TodoPointDetailDialog.kt

@@ -2,12 +2,11 @@ package com.grkj.iscs.features.main.dialog.job_manage
 
 import android.graphics.Color
 import android.view.View
-import androidx.core.content.ContextCompat
 import androidx.core.view.isVisible
 import com.drake.brv.BindingAdapter
 import com.drake.brv.utils.linear
 import com.drake.brv.utils.setup
-import com.grkj.data.model.vo.IsJobTicketPointsDataVo
+import com.grkj.data.domain.vo.IsJobTicketPointsDataVo
 import com.grkj.iscs.R
 import com.grkj.iscs.databinding.DialogTodoPointDetailBinding
 import com.grkj.iscs.databinding.ItemJobExecutePointBinding

app/src/main/java/com/grkj/iscs/features/main/entity/WorkflowDataBundle.kt

@@ -1,7 +1,7 @@
 package com.grkj.iscs.features.main.entity
 
-import com.grkj.data.model.dos.WorkflowMode
-import com.grkj.data.model.dos.WorkflowStep
+import com.grkj.data.local.dos.WorkflowMode
+import com.grkj.data.local.dos.WorkflowStep
 
 /**
  * 流程模式数据包装

app/src/main/java/com/grkj/iscs/features/main/fragment/common/EditJobWorkflowSettingFragment.kt

@@ -9,9 +9,7 @@ import com.drake.brv.utils.linear
 import com.drake.brv.utils.models
 import com.drake.brv.utils.setup
 import com.grkj.data.enums.WorkflowStepConfirmTypeEnum
-import com.grkj.data.model.dos.IsJobTicketStep
-import com.grkj.data.model.dos.WorkflowStep
-import com.grkj.data.model.vo.IsJobTicketStepDataVo
+import com.grkj.data.local.dos.IsJobTicketStep
 import com.grkj.iscs.R
 import com.grkj.iscs.common.DataTransferConstants
 import com.grkj.iscs.databinding.FragmentWorkflowSettingBinding
@@ -19,13 +17,11 @@ import com.grkj.iscs.databinding.ItemJobExecuteStepBinding
 import com.grkj.iscs.databinding.ItemWorkFlowStepFunctionBinding
 import com.grkj.iscs.features.main.dialog.TextDropDownDialog
 import com.grkj.iscs.features.main.viewmodel.common.EditJobWorkflowSettingViewModel
-import com.grkj.iscs.features.main.viewmodel.common.WorkflowSettingViewModel
 import com.grkj.shared.utils.i18n.I18nManager
 import com.grkj.ui_base.base.BaseFormFragment
 import com.grkj.ui_base.skin.loadSkinIcon
 import com.grkj.ui_base.utils.CommonUtils
 import com.grkj.ui_base.utils.extension.smoothScrollToSmartPosition
-import com.kongzue.dialogx.dialogs.PopTip
 import com.sik.sikcore.data.GlobalDataTempStore
 import com.sik.sikcore.extension.isNullOrEmpty
 import com.sik.sikcore.extension.setDebouncedClickListener

app/src/main/java/com/grkj/iscs/features/main/fragment/common/EditSopWorkflowSettingFragment.kt

@@ -9,9 +9,7 @@ import com.drake.brv.utils.linear
 import com.drake.brv.utils.models
 import com.drake.brv.utils.setup
 import com.grkj.data.enums.WorkflowStepConfirmTypeEnum
-import com.grkj.data.model.dos.IsSopWorkflowStep
-import com.grkj.data.model.dos.WorkflowStep
-import com.grkj.data.model.vo.IsJobTicketStepDataVo
+import com.grkj.data.local.dos.IsSopWorkflowStep
 import com.grkj.iscs.R
 import com.grkj.iscs.common.DataTransferConstants
 import com.grkj.iscs.databinding.FragmentWorkflowSettingBinding
@@ -19,13 +17,11 @@ import com.grkj.iscs.databinding.ItemJobExecuteStepBinding
 import com.grkj.iscs.databinding.ItemWorkFlowStepFunctionBinding
 import com.grkj.iscs.features.main.dialog.TextDropDownDialog
 import com.grkj.iscs.features.main.viewmodel.common.EditSopWorkflowSettingViewModel
-import com.grkj.iscs.features.main.viewmodel.common.WorkflowSettingViewModel
 import com.grkj.shared.utils.i18n.I18nManager
 import com.grkj.ui_base.base.BaseFormFragment
 import com.grkj.ui_base.skin.loadSkinIcon
 import com.grkj.ui_base.utils.CommonUtils
 import com.grkj.ui_base.utils.extension.smoothScrollToSmartPosition
-import com.kongzue.dialogx.dialogs.PopTip
 import com.sik.sikcore.data.GlobalDataTempStore
 import com.sik.sikcore.extension.isNullOrEmpty
 import com.sik.sikcore.extension.setDebouncedClickListener

app/src/main/java/com/grkj/iscs/features/main/fragment/common/SelectMemberFragment.kt

@@ -18,9 +18,9 @@ import com.grkj.iscs.databinding.FragmentSelectMemeberBinding
 import com.grkj.iscs.databinding.ItemSelectAllMemberBinding
 import com.grkj.iscs.databinding.ItemSelectMemberBinding
 import com.grkj.data.enums.RoleEnum
-import com.grkj.data.model.vo.JobTicketGroupDataVo
-import com.grkj.data.model.vo.JobTicketGroupInfoVo
-import com.grkj.data.model.vo.JobUserVo
+import com.grkj.data.domain.vo.JobTicketGroupDataVo
+import com.grkj.data.domain.vo.JobTicketGroupInfoVo
+import com.grkj.data.domain.vo.JobUserVo
 import com.grkj.iscs.databinding.ItemLockerGroupBinding
 import com.grkj.iscs.databinding.ItemSelectColockerMemberBinding
 import com.grkj.iscs.features.main.viewmodel.common.SelectMemberViewModel

app/src/main/java/com/grkj/iscs/features/main/fragment/common/SelectPointFragment.kt

@@ -12,9 +12,9 @@ import com.drake.brv.utils.models
 import com.drake.brv.utils.setup
 import com.grkj.data.data.Type
 import com.grkj.data.enums.IsolationPointPowerTypeEnum
-import com.grkj.data.model.vo.JobPointVo
-import com.grkj.data.model.vo.JobTicketGroupDataVo
-import com.grkj.data.model.vo.JobTicketGroupInfoVo
+import com.grkj.data.domain.vo.JobPointVo
+import com.grkj.data.domain.vo.JobTicketGroupDataVo
+import com.grkj.data.domain.vo.JobTicketGroupInfoVo
 import com.grkj.iscs.R
 import com.grkj.iscs.common.DataTransferConstants
 import com.grkj.iscs.databinding.FragmentSelectPointBinding

app/src/main/java/com/grkj/iscs/features/main/fragment/common/WorkflowSettingFragment.kt

@@ -9,8 +9,7 @@ import com.drake.brv.utils.linear
 import com.drake.brv.utils.models
 import com.drake.brv.utils.setup
 import com.grkj.data.enums.WorkflowStepConfirmTypeEnum
-import com.grkj.data.model.dos.WorkflowStep
-import com.grkj.data.model.vo.IsJobTicketStepDataVo
+import com.grkj.data.local.dos.WorkflowStep
 import com.grkj.iscs.R
 import com.grkj.iscs.common.DataTransferConstants
 import com.grkj.iscs.databinding.FragmentWorkflowSettingBinding
@@ -23,7 +22,6 @@ import com.grkj.ui_base.base.BaseFormFragment
 import com.grkj.ui_base.skin.loadSkinIcon
 import com.grkj.ui_base.utils.CommonUtils
 import com.grkj.ui_base.utils.extension.smoothScrollToSmartPosition
-import com.kongzue.dialogx.dialogs.PopTip
 import com.sik.sikcore.data.GlobalDataTempStore
 import com.sik.sikcore.extension.isNullOrEmpty
 import com.sik.sikcore.extension.setDebouncedClickListener

app/src/main/java/com/grkj/iscs/features/main/fragment/data_manage/BackupAndRestoreFragment.kt

@@ -6,8 +6,8 @@ import com.drake.brv.utils.linear
 import com.drake.brv.utils.models
 import com.drake.brv.utils.setup
 import com.grkj.data.data.EventConstants
-import com.grkj.data.database.BackupScheduler
-import com.grkj.data.database.RoomBackupManager
+import com.grkj.data.local.database.BackupScheduler
+import com.grkj.data.local.database.RoomBackupManager
 import com.grkj.data.enums.BackupFrequencyWeekEnum
 import com.grkj.data.utils.event.BackupCompleteEvent
 import com.grkj.iscs.R
@@ -18,7 +18,6 @@ import com.grkj.iscs.features.main.viewmodel.data_manage.BackupAndRestoreViewMod
 import com.grkj.shared.model.EventBean
 import com.grkj.shared.utils.FilePickerUtils
 import com.grkj.shared.utils.SAFHelper.copyFileToDir
-import com.grkj.shared.utils.SAFHelper.moveFileToDir
 import com.grkj.shared.utils.i18n.I18nManager
 import com.grkj.ui_base.base.BaseFragment
 import com.grkj.ui_base.dialog.TipDialog

app/src/main/java/com/grkj/iscs/features/main/fragment/data_manage/DataExportFragment.kt

@@ -4,8 +4,7 @@ import androidx.fragment.app.viewModels
 import com.drake.brv.utils.linear
 import com.drake.brv.utils.models
 import com.drake.brv.utils.setup
-import com.grkj.data.enums.DataExportTableEnum
-import com.grkj.data.model.vo.DataExportVo
+import com.grkj.data.domain.vo.DataExportVo
 import com.grkj.iscs.R
 import com.grkj.iscs.databinding.FragmentDataExportBinding
 import com.grkj.iscs.databinding.ItemDataExportBinding

app/src/main/java/com/grkj/iscs/features/main/fragment/data_manage/PointMangeFragment.kt

@@ -1,6 +1,5 @@
 package com.grkj.iscs.features.main.fragment.data_manage
 
-import android.app.Dialog
 import android.graphics.Color
 import androidx.fragment.app.viewModels
 import com.drake.brv.BindingAdapter
@@ -10,7 +9,7 @@ import com.drake.brv.utils.linear
 import com.drake.brv.utils.models
 import com.drake.brv.utils.setup
 import com.grkj.data.data.EventConstants
-import com.grkj.data.model.vo.PointManageVo
+import com.grkj.data.domain.vo.PointManageVo
 import com.grkj.iscs.R
 import com.grkj.iscs.databinding.FragmentPointManageBinding
 import com.grkj.iscs.databinding.ItemPointManagePointBinding
@@ -25,9 +24,7 @@ import com.grkj.ui_base.base.BaseFragment
 import com.grkj.ui_base.dialog.TipDialog
 import com.grkj.ui_base.utils.CommonUtils
 import com.grkj.ui_base.utils.event.RFIDCardReadEvent
-import com.grkj.ui_base.utils.extension.tip
 import com.kongzue.dialogx.dialogs.CustomDialog
-import com.kongzue.dialogx.dialogs.PopTip
 import com.kongzue.dialogx.interfaces.DialogLifecycleCallback
 import com.sik.sikcore.extension.setDebouncedClickListener
 import dagger.hilt.android.AndroidEntryPoint

app/src/main/java/com/grkj/iscs/features/main/fragment/data_manage/RoleManageFragment.kt

@@ -9,7 +9,7 @@ import com.drake.brv.utils.linear
 import com.drake.brv.utils.models
 import com.drake.brv.utils.setup
 import com.grkj.data.enums.RoleEnum
-import com.grkj.data.model.vo.RoleManageVo
+import com.grkj.data.domain.vo.RoleManageVo
 import com.grkj.iscs.R
 import com.grkj.iscs.databinding.FragmentRoleManageBinding
 import com.grkj.iscs.databinding.ItemRoleManageRoleBinding
@@ -18,7 +18,6 @@ import com.grkj.iscs.features.main.dialog.data_manage.FilterRoleDialog
 import com.grkj.iscs.features.main.dialog.data_manage.UpdateRoleDialog
 import com.grkj.iscs.features.main.entity.UpdateRoleDataEntity
 import com.grkj.iscs.features.main.viewmodel.data_manage.RoleManageViewModel
-import com.grkj.shared.utils.i18n.I18nManager
 import com.grkj.ui_base.base.BaseFragment
 import com.grkj.ui_base.dialog.TipDialog
 import com.grkj.ui_base.utils.CommonUtils

app/src/main/java/com/grkj/iscs/features/main/fragment/data_manage/SwitchLayoutFragment.kt

@@ -15,8 +15,8 @@ import com.drake.brv.utils.models
 import com.drake.brv.utils.setup
 import com.grkj.data.data.EventConstants
 import com.grkj.data.data.MMKVConstants
-import com.grkj.data.model.vo.MapInfoRespVO
-import com.grkj.data.model.vo.WorkstationManageVo
+import com.grkj.data.domain.vo.MapInfoRespVO
+import com.grkj.data.domain.vo.WorkstationManageVo
 import com.grkj.iscs.R
 import com.grkj.iscs.common.DataTransferConstants
 import com.grkj.iscs.databinding.FragmentSwitchLayoutBinding

app/src/main/java/com/grkj/iscs/features/main/fragment/data_manage/UserManageFragment.kt

@@ -10,11 +10,10 @@ import com.drake.brv.utils.divider
 import com.drake.brv.utils.linear
 import com.drake.brv.utils.models
 import com.drake.brv.utils.setup
-import com.google.gson.annotations.Until
 import com.grkj.data.data.CommonConstants
 import com.grkj.data.data.EventConstants
 import com.grkj.data.data.MMKVConstants
-import com.grkj.data.model.vo.UserManageVo
+import com.grkj.data.domain.vo.UserManageVo
 import com.grkj.iscs.R
 import com.grkj.iscs.databinding.FragmentUserManageBinding
 import com.grkj.iscs.databinding.ItemUserManageUserBinding

app/src/main/java/com/grkj/iscs/features/main/fragment/data_manage/WorkstationManageFragment.kt

@@ -1,17 +1,13 @@
 package com.grkj.iscs.features.main.fragment.data_manage
 
-import android.view.Gravity
 import android.view.ViewGroup
 import androidx.core.view.isInvisible
-import androidx.core.view.isVisible
 import androidx.fragment.app.viewModels
-import androidx.lifecycle.ViewModelProvider
 import com.drake.brv.utils.linear
 import com.drake.brv.utils.models
 import com.drake.brv.utils.setup
-import com.grkj.data.data.MMKVConstants
 import com.grkj.data.data.MainDomainData
-import com.grkj.data.model.vo.WorkstationManageVo
+import com.grkj.data.domain.vo.WorkstationManageVo
 import com.grkj.iscs.R
 import com.grkj.iscs.databinding.FragmentWorkstationManageBinding
 import com.grkj.iscs.databinding.ItemWorkstationBinding
@@ -21,8 +17,6 @@ import com.grkj.iscs.features.main.viewmodel.data_manage.WorkstationManageViewMo
 import com.grkj.ui_base.base.BaseFragment
 import com.grkj.ui_base.dialog.TipDialog
 import com.grkj.ui_base.utils.CommonUtils
-import com.grkj.ui_base.utils.extension.tip
-import com.kongzue.dialogx.dialogs.PopTip
 import com.sik.sikcore.extension.saveMMKVData
 import com.sik.sikcore.extension.setDebouncedClickListener
 import dagger.hilt.android.AndroidEntryPoint

app/src/main/java/com/grkj/iscs/features/main/fragment/exception_manage/ExceptionDetailFragment.kt

@@ -2,9 +2,7 @@ package com.grkj.iscs.features.main.fragment.exception_manage
 
 import androidx.core.view.isVisible
 import androidx.fragment.app.viewModels
-import com.drake.brv.utils.models
 import com.grkj.data.enums.NextJobPrompt
-import com.grkj.data.model.vo.IsExceptionStandardVo
 import com.grkj.iscs.R
 import com.grkj.iscs.common.DataTransferConstants
 import com.grkj.iscs.databinding.FragmentExceptionDetailBinding
@@ -17,7 +15,6 @@ import com.grkj.ui_base.utils.CommonUtils
 import com.sik.sikcore.data.GlobalDataTempStore
 import com.sik.sikcore.extension.setDebouncedClickListener
 import dagger.hilt.android.AndroidEntryPoint
-import kotlin.math.log
 
 /**
  * 异常详情

app/src/main/java/com/grkj/iscs/features/main/fragment/exception_manage/ExceptionJobFragment.kt

@@ -14,9 +14,9 @@ import com.drake.brv.utils.models
 import com.drake.brv.utils.setup
 import com.grkj.data.enums.NextJobPrompt
 import com.grkj.data.enums.RoleEnum
-import com.grkj.data.model.vo.IsJobTicketPointsDataVo
-import com.grkj.data.model.vo.IsJobTicketStepDataVo
-import com.grkj.data.model.vo.IsJobTicketUserDataVo
+import com.grkj.data.domain.vo.IsJobTicketPointsDataVo
+import com.grkj.data.domain.vo.IsJobTicketStepDataVo
+import com.grkj.data.domain.vo.IsJobTicketUserDataVo
 import com.grkj.iscs.R
 import com.grkj.iscs.common.DataTransferConstants
 import com.grkj.iscs.databinding.FragmentExceptionJobBinding

app/src/main/java/com/grkj/iscs/features/main/fragment/exception_manage/ExceptionManageFragment.kt

@@ -8,7 +8,7 @@ import com.drake.brv.utils.divider
 import com.drake.brv.utils.linear
 import com.drake.brv.utils.models
 import com.drake.brv.utils.setup
-import com.grkj.data.model.vo.IsExceptionStandardVo
+import com.grkj.data.domain.vo.IsExceptionStandardVo
 import com.grkj.iscs.R
 import com.grkj.iscs.common.DataTransferConstants
 import com.grkj.iscs.databinding.FragmentExceptionManageBinding

app/src/main/java/com/grkj/iscs/features/main/fragment/hardware_manage/CardManageFragment.kt

@@ -1,8 +1,6 @@
 package com.grkj.iscs.features.main.fragment.hardware_manage
 
 import android.graphics.Color
-import android.view.Gravity
-import androidx.annotation.StringRes
 import androidx.fragment.app.viewModels
 import com.drake.brv.BindingAdapter
 import com.drake.brv.annotaion.DividerOrientation
@@ -10,7 +8,7 @@ import com.drake.brv.utils.divider
 import com.drake.brv.utils.linear
 import com.drake.brv.utils.models
 import com.drake.brv.utils.setup
-import com.grkj.data.model.dos.IsJobCard
+import com.grkj.data.local.dos.IsJobCard
 import com.grkj.iscs.R
 import com.grkj.iscs.databinding.FragmentCardManageBinding
 import com.grkj.iscs.databinding.ItemCardManageBinding
@@ -21,7 +19,6 @@ import com.grkj.iscs.features.main.viewmodel.hardware_manage.CardManageViewModel
 import com.grkj.ui_base.base.BaseFragment
 import com.grkj.ui_base.dialog.TipDialog
 import com.grkj.ui_base.utils.CommonUtils
-import com.kongzue.dialogx.dialogs.PopTip
 import com.sik.sikcore.extension.setDebouncedClickListener
 import dagger.hilt.android.AndroidEntryPoint
 

app/src/main/java/com/grkj/iscs/features/main/fragment/hardware_manage/KeyManageFragment.kt

@@ -8,7 +8,7 @@ import com.drake.brv.utils.divider
 import com.drake.brv.utils.linear
 import com.drake.brv.utils.models
 import com.drake.brv.utils.setup
-import com.grkj.data.model.dos.IsKey
+import com.grkj.data.local.dos.IsKey
 import com.grkj.iscs.R
 import com.grkj.iscs.databinding.FragmentKeyManageBinding
 import com.grkj.iscs.databinding.ItemKeyManageBinding
@@ -19,7 +19,6 @@ import com.grkj.iscs.features.main.viewmodel.hardware_manage.KeyManageViewModel
 import com.grkj.ui_base.base.BaseFragment
 import com.grkj.ui_base.dialog.TipDialog
 import com.grkj.ui_base.utils.CommonUtils
-import com.kongzue.dialogx.dialogs.PopTip
 import com.sik.sikcore.extension.setDebouncedClickListener
 import dagger.hilt.android.AndroidEntryPoint
 

app/src/main/java/com/grkj/iscs/features/main/fragment/hardware_manage/LockManageFragment.kt

@@ -1,7 +1,6 @@
 package com.grkj.iscs.features.main.fragment.hardware_manage
 
 import android.graphics.Color
-import androidx.annotation.StringRes
 import androidx.fragment.app.viewModels
 import com.drake.brv.BindingAdapter
 import com.drake.brv.annotaion.DividerOrientation
@@ -10,7 +9,7 @@ import com.drake.brv.utils.linear
 import com.drake.brv.utils.models
 import com.drake.brv.utils.setup
 import com.grkj.data.enums.CommonDictDataEnum
-import com.grkj.data.model.dos.IsLock
+import com.grkj.data.local.dos.IsLock
 import com.grkj.iscs.R
 import com.grkj.iscs.databinding.FragmentLockManageBinding
 import com.grkj.iscs.databinding.ItemLockManageBinding
@@ -22,7 +21,6 @@ import com.grkj.shared.utils.i18n.I18nManager
 import com.grkj.ui_base.base.BaseFragment
 import com.grkj.ui_base.dialog.TipDialog
 import com.grkj.ui_base.utils.CommonUtils
-import com.kongzue.dialogx.dialogs.PopTip
 import com.sik.sikcore.extension.setDebouncedClickListener
 import dagger.hilt.android.AndroidEntryPoint
 

app/src/main/java/com/grkj/iscs/features/main/fragment/hardware_manage/RfidTokenManageFragment.kt

@@ -1,7 +1,6 @@
 package com.grkj.iscs.features.main.fragment.hardware_manage
 
 import android.graphics.Color
-import androidx.annotation.StringRes
 import androidx.fragment.app.viewModels
 import com.drake.brv.BindingAdapter
 import com.drake.brv.annotaion.DividerOrientation
@@ -10,7 +9,7 @@ import com.drake.brv.utils.linear
 import com.drake.brv.utils.models
 import com.drake.brv.utils.setup
 import com.grkj.data.enums.CommonDictDataEnum
-import com.grkj.data.model.dos.IsRfidToken
+import com.grkj.data.local.dos.IsRfidToken
 import com.grkj.iscs.R
 import com.grkj.iscs.databinding.FragmentRfidTokenManageBinding
 import com.grkj.iscs.databinding.ItemRfidTokenManageBinding
@@ -22,7 +21,6 @@ import com.grkj.shared.utils.i18n.I18nManager
 import com.grkj.ui_base.base.BaseFragment
 import com.grkj.ui_base.dialog.TipDialog
 import com.grkj.ui_base.utils.CommonUtils
-import com.kongzue.dialogx.dialogs.PopTip
 import com.sik.sikcore.extension.setDebouncedClickListener
 import dagger.hilt.android.AndroidEntryPoint
 

app/src/main/java/com/grkj/iscs/features/main/fragment/job_manage/CreateJobFragment.kt

@@ -14,15 +14,14 @@ import com.google.android.flexbox.AlignItems
 import com.google.android.flexbox.FlexDirection
 import com.google.android.flexbox.FlexboxLayoutManager
 import com.google.android.flexbox.JustifyContent
-import com.grkj.data.data.MMKVConstants
 import com.grkj.data.data.MainDomainData
 import com.grkj.data.data.Type
 import com.grkj.data.enums.IsolationPointPowerTypeEnum
-import com.grkj.data.model.dos.WorkflowStep
-import com.grkj.data.model.vo.JobPointVo
-import com.grkj.data.model.vo.JobTicketGroupDataVo
-import com.grkj.data.model.vo.JobUserVo
-import com.grkj.data.model.vo.WorkstationManageVo
+import com.grkj.data.local.dos.WorkflowStep
+import com.grkj.data.domain.vo.JobPointVo
+import com.grkj.data.domain.vo.JobTicketGroupDataVo
+import com.grkj.data.domain.vo.JobUserVo
+import com.grkj.data.domain.vo.WorkstationManageVo
 import com.grkj.iscs.R
 import com.grkj.iscs.common.DataTransferConstants
 import com.grkj.iscs.databinding.FragmentCreateJobBinding
@@ -38,7 +37,6 @@ import com.grkj.ui_base.base.BaseFormFragment
 import com.grkj.ui_base.dialog.TipDialog
 import com.grkj.ui_base.skin.loadSkinIcon
 import com.grkj.ui_base.utils.CommonUtils
-import com.kongzue.dialogx.dialogs.PopTip
 import com.sik.sikcore.data.GlobalDataTempStore
 import com.sik.sikcore.extension.file
 import com.sik.sikcore.extension.getMMKVData

app/src/main/java/com/grkj/iscs/features/main/fragment/job_manage/CreateSopFragment.kt

@@ -14,15 +14,14 @@ import com.google.android.flexbox.AlignItems
 import com.google.android.flexbox.FlexDirection
 import com.google.android.flexbox.FlexboxLayoutManager
 import com.google.android.flexbox.JustifyContent
-import com.grkj.data.data.MMKVConstants
 import com.grkj.data.data.MainDomainData
 import com.grkj.data.data.Type
 import com.grkj.data.enums.IsolationPointPowerTypeEnum
-import com.grkj.data.model.dos.WorkflowStep
-import com.grkj.data.model.vo.JobPointVo
-import com.grkj.data.model.vo.JobTicketGroupDataVo
-import com.grkj.data.model.vo.JobUserVo
-import com.grkj.data.model.vo.WorkstationManageVo
+import com.grkj.data.local.dos.WorkflowStep
+import com.grkj.data.domain.vo.JobPointVo
+import com.grkj.data.domain.vo.JobTicketGroupDataVo
+import com.grkj.data.domain.vo.JobUserVo
+import com.grkj.data.domain.vo.WorkstationManageVo
 import com.grkj.iscs.R
 import com.grkj.iscs.common.DataTransferConstants
 import com.grkj.iscs.databinding.FragmentCreateSopBinding
@@ -38,7 +37,6 @@ import com.grkj.ui_base.base.BaseFormFragment
 import com.grkj.ui_base.dialog.TipDialog
 import com.grkj.ui_base.skin.loadSkinIcon
 import com.grkj.ui_base.utils.CommonUtils
-import com.kongzue.dialogx.dialogs.PopTip
 import com.sik.sikcore.data.GlobalDataTempStore
 import com.sik.sikcore.extension.file
 import com.sik.sikcore.extension.getMMKVData

app/src/main/java/com/grkj/iscs/features/main/fragment/job_manage/CreateSopJobFragment.kt

@@ -16,11 +16,11 @@ import com.google.android.flexbox.FlexboxLayoutManager
 import com.google.android.flexbox.JustifyContent
 import com.grkj.data.data.Type
 import com.grkj.data.enums.IsolationPointPowerTypeEnum
-import com.grkj.data.model.dos.WorkflowStep
-import com.grkj.data.model.vo.JobPointVo
-import com.grkj.data.model.vo.JobTicketGroupDataVo
-import com.grkj.data.model.vo.JobUserVo
-import com.grkj.data.model.vo.SopManageVo
+import com.grkj.data.local.dos.WorkflowStep
+import com.grkj.data.domain.vo.JobPointVo
+import com.grkj.data.domain.vo.JobTicketGroupDataVo
+import com.grkj.data.domain.vo.JobUserVo
+import com.grkj.data.domain.vo.SopManageVo
 import com.grkj.iscs.R
 import com.grkj.iscs.common.DataTransferConstants
 import com.grkj.iscs.databinding.FragmentCreateSopJobBinding
@@ -36,7 +36,6 @@ import com.grkj.ui_base.base.BaseFormFragment
 import com.grkj.ui_base.dialog.TipDialog
 import com.grkj.ui_base.skin.loadSkinIcon
 import com.grkj.ui_base.utils.CommonUtils
-import com.kongzue.dialogx.dialogs.PopTip
 import com.sik.sikcore.data.GlobalDataTempStore
 import com.sik.sikcore.extension.file
 import com.sik.sikcore.extension.setDebouncedClickListener

app/src/main/java/com/grkj/iscs/features/main/fragment/job_manage/EditJobFragment.kt

@@ -16,11 +16,11 @@ import com.google.android.flexbox.FlexboxLayoutManager
 import com.google.android.flexbox.JustifyContent
 import com.grkj.data.data.Type
 import com.grkj.data.enums.IsolationPointPowerTypeEnum
-import com.grkj.data.model.dos.WorkflowStep
-import com.grkj.data.model.vo.JobPointVo
-import com.grkj.data.model.vo.JobTicketGroupDataVo
-import com.grkj.data.model.vo.JobTicketGroupInfoVo
-import com.grkj.data.model.vo.JobUserVo
+import com.grkj.data.local.dos.WorkflowStep
+import com.grkj.data.domain.vo.JobPointVo
+import com.grkj.data.domain.vo.JobTicketGroupDataVo
+import com.grkj.data.domain.vo.JobTicketGroupInfoVo
+import com.grkj.data.domain.vo.JobUserVo
 import com.grkj.iscs.R
 import com.grkj.iscs.common.DataTransferConstants
 import com.grkj.iscs.databinding.FragmentEditJobBinding
@@ -36,8 +36,6 @@ import com.grkj.ui_base.base.BaseFormFragment
 import com.grkj.ui_base.dialog.TipDialog
 import com.grkj.ui_base.skin.loadSkinIcon
 import com.grkj.ui_base.utils.CommonUtils
-import com.grkj.ui_base.utils.extension.tip
-import com.kongzue.dialogx.dialogs.PopTip
 import com.sik.sikcore.data.GlobalDataTempStore
 import com.sik.sikcore.extension.file
 import com.sik.sikcore.extension.setDebouncedClickListener

app/src/main/java/com/grkj/iscs/features/main/fragment/job_manage/EditSopFragment.kt

@@ -17,11 +17,11 @@ import com.google.android.flexbox.JustifyContent
 import com.grkj.data.data.Type
 import com.grkj.data.enums.IsolationPointPowerTypeEnum
 import com.grkj.data.enums.RoleEnum
-import com.grkj.data.model.dos.WorkflowStep
-import com.grkj.data.model.vo.JobPointVo
-import com.grkj.data.model.vo.JobTicketGroupDataVo
-import com.grkj.data.model.vo.JobTicketGroupInfoVo
-import com.grkj.data.model.vo.JobUserVo
+import com.grkj.data.local.dos.WorkflowStep
+import com.grkj.data.domain.vo.JobPointVo
+import com.grkj.data.domain.vo.JobTicketGroupDataVo
+import com.grkj.data.domain.vo.JobTicketGroupInfoVo
+import com.grkj.data.domain.vo.JobUserVo
 import com.grkj.iscs.R
 import com.grkj.iscs.common.DataTransferConstants
 import com.grkj.iscs.databinding.FragmentEditSopBinding

app/src/main/java/com/grkj/iscs/features/main/fragment/job_manage/EditSopJobFragment.kt

@@ -16,11 +16,11 @@ import com.google.android.flexbox.FlexboxLayoutManager
 import com.google.android.flexbox.JustifyContent
 import com.grkj.data.data.Type
 import com.grkj.data.enums.IsolationPointPowerTypeEnum
-import com.grkj.data.model.dos.WorkflowStep
-import com.grkj.data.model.vo.JobPointVo
-import com.grkj.data.model.vo.JobTicketGroupDataVo
-import com.grkj.data.model.vo.JobUserVo
-import com.grkj.data.model.vo.SopManageVo
+import com.grkj.data.local.dos.WorkflowStep
+import com.grkj.data.domain.vo.JobPointVo
+import com.grkj.data.domain.vo.JobTicketGroupDataVo
+import com.grkj.data.domain.vo.JobUserVo
+import com.grkj.data.domain.vo.SopManageVo
 import com.grkj.iscs.R
 import com.grkj.iscs.common.DataTransferConstants
 import com.grkj.iscs.databinding.FragmentEditSopJobBinding
@@ -36,8 +36,6 @@ import com.grkj.ui_base.base.BaseFormFragment
 import com.grkj.ui_base.dialog.TipDialog
 import com.grkj.ui_base.skin.loadSkinIcon
 import com.grkj.ui_base.utils.CommonUtils
-import com.grkj.ui_base.utils.extension.tip
-import com.kongzue.dialogx.dialogs.PopTip
 import com.sik.sikcore.data.GlobalDataTempStore
 import com.sik.sikcore.extension.file
 import com.sik.sikcore.extension.setDebouncedClickListener

app/src/main/java/com/grkj/iscs/features/main/fragment/job_manage/ExceptionJobManageFragment.kt

@@ -8,7 +8,7 @@ import com.drake.brv.utils.divider
 import com.drake.brv.utils.linear
 import com.drake.brv.utils.models
 import com.drake.brv.utils.setup
-import com.grkj.data.model.vo.IsExceptionStandardVo
+import com.grkj.data.domain.vo.IsExceptionStandardVo
 import com.grkj.iscs.R
 import com.grkj.iscs.common.DataTransferConstants
 import com.grkj.iscs.databinding.FragmentExceptionJobManageBinding
@@ -19,7 +19,6 @@ import com.grkj.ui_base.base.BaseFragment
 import com.sik.sikcore.data.GlobalDataTempStore
 import com.sik.sikcore.extension.setDebouncedClickListener
 import dagger.hilt.android.AndroidEntryPoint
-import kotlin.collections.filter
 
 /**
  * 异常作业

app/src/main/java/com/grkj/iscs/features/main/fragment/job_manage/InProgressJobManageFragment.kt

@@ -10,7 +10,7 @@ import com.drake.brv.utils.linear
 import com.drake.brv.utils.models
 import com.drake.brv.utils.setup
 import com.grkj.data.enums.JobTicketStatusEnum
-import com.grkj.data.model.vo.JobTicketManageVo
+import com.grkj.data.domain.vo.JobTicketManageVo
 import com.grkj.iscs.R
 import com.grkj.iscs.common.DataTransferConstants
 import com.grkj.iscs.databinding.FragmentInProgressJobManageBinding

app/src/main/java/com/grkj/iscs/features/main/fragment/job_manage/JobExecuteFragment.kt

@@ -20,10 +20,10 @@ import com.grkj.data.data.MainDomainData
 import com.grkj.data.data.Type
 import com.grkj.data.enums.LoginResultEnum
 import com.grkj.data.enums.RoleEnum
-import com.grkj.data.model.vo.IsJobTicketPointsDataVo
-import com.grkj.data.model.vo.IsJobTicketStepDataVo
-import com.grkj.data.model.vo.IsJobTicketUserDataVo
-import com.grkj.data.model.vo.JobTicketGroupInfoVo
+import com.grkj.data.domain.vo.IsJobTicketPointsDataVo
+import com.grkj.data.domain.vo.IsJobTicketStepDataVo
+import com.grkj.data.domain.vo.IsJobTicketUserDataVo
+import com.grkj.data.domain.vo.JobTicketGroupInfoVo
 import com.grkj.iscs.R
 import com.grkj.iscs.common.DataTransferConstants
 import com.grkj.iscs.databinding.FragmentJobExecuteBinding

app/src/main/java/com/grkj/iscs/features/main/fragment/job_manage/JobManageFragment.kt

@@ -9,7 +9,7 @@ import com.drake.brv.utils.linear
 import com.drake.brv.utils.models
 import com.drake.brv.utils.setup
 import com.grkj.data.enums.JobTicketStatusEnum
-import com.grkj.data.model.vo.JobTicketManageVo
+import com.grkj.data.domain.vo.JobTicketManageVo
 import com.grkj.iscs.R
 import com.grkj.iscs.common.DataTransferConstants
 import com.grkj.iscs.databinding.FragmentJobManageBinding
@@ -19,8 +19,6 @@ import com.grkj.shared.utils.i18n.I18nManager
 import com.grkj.ui_base.base.BaseFragment
 import com.grkj.ui_base.dialog.TipDialog
 import com.grkj.ui_base.utils.CommonUtils
-import com.grkj.ui_base.utils.extension.tip
-import com.kongzue.dialogx.dialogs.PopTip
 import com.sik.sikcore.data.GlobalDataTempStore
 import com.sik.sikcore.extension.setDebouncedClickListener
 import dagger.hilt.android.AndroidEntryPoint

app/src/main/java/com/grkj/iscs/features/main/fragment/job_manage/LockedPointsFragment.kt

@@ -9,7 +9,7 @@ import com.drake.brv.utils.linear
 import com.drake.brv.utils.models
 import com.drake.brv.utils.setup
 import com.grkj.data.enums.JobTicketStatusEnum
-import com.grkj.data.model.vo.LockedPointVo
+import com.grkj.data.domain.vo.LockedPointVo
 import com.grkj.iscs.R
 import com.grkj.iscs.common.DataTransferConstants
 import com.grkj.iscs.databinding.FragmentLockedPointBinding

app/src/main/java/com/grkj/iscs/features/main/fragment/job_manage/MyTodoListFragment.kt

@@ -17,8 +17,8 @@ import com.grkj.data.data.Type
 import com.grkj.data.enums.OperationTypeEnum
 import com.grkj.data.enums.RoleEnum
 import com.grkj.data.enums.TodoStatusEnum
-import com.grkj.data.model.vo.IsJobTicketStepDataVo
-import com.grkj.data.model.vo.TodoItemVo
+import com.grkj.data.domain.vo.IsJobTicketStepDataVo
+import com.grkj.data.domain.vo.TodoItemVo
 import com.grkj.iscs.R
 import com.grkj.iscs.common.DataTransferConstants
 import com.grkj.iscs.databinding.FragmentMyTodoListBinding

app/src/main/java/com/grkj/iscs/features/main/fragment/job_manage/SopManageFragment.kt

@@ -2,25 +2,21 @@ package com.grkj.iscs.features.main.fragment.job_manage
 
 import android.graphics.Color
 import androidx.fragment.app.viewModels
-import androidx.lifecycle.ViewModelProvider
 import com.drake.brv.BindingAdapter
 import com.drake.brv.annotaion.DividerOrientation
 import com.drake.brv.utils.divider
 import com.drake.brv.utils.linear
 import com.drake.brv.utils.models
 import com.drake.brv.utils.setup
-import com.grkj.data.model.vo.SopManageVo
-import com.grkj.data.model.vo.UserManageVo
+import com.grkj.data.domain.vo.SopManageVo
 import com.grkj.iscs.R
 import com.grkj.iscs.common.DataTransferConstants
 import com.grkj.iscs.databinding.FragmentSopManageBinding
 import com.grkj.iscs.databinding.ItemSopManageBinding
-import com.grkj.iscs.databinding.ItemUserManageUserBinding
 import com.grkj.iscs.features.main.viewmodel.job_manage.SopManageViewModel
 import com.grkj.ui_base.base.BaseFragment
 import com.grkj.ui_base.dialog.TipDialog
 import com.grkj.ui_base.utils.CommonUtils
-import com.kongzue.dialogx.dialogs.PopTip
 import com.sik.sikcore.data.GlobalDataTempStore
 import com.sik.sikcore.extension.setDebouncedClickListener
 import dagger.hilt.android.AndroidEntryPoint

app/src/main/java/com/grkj/iscs/features/main/fragment/job_manage/WorkflowManageFragment.kt

@@ -8,9 +8,8 @@ import com.drake.brv.utils.divider
 import com.drake.brv.utils.linear
 import com.drake.brv.utils.models
 import com.drake.brv.utils.setup
-import com.grkj.data.data.MMKVConstants
 import com.grkj.data.data.MainDomainData
-import com.grkj.data.model.vo.WorkflowModeVo
+import com.grkj.data.domain.vo.WorkflowModeVo
 import com.grkj.iscs.R
 import com.grkj.iscs.common.DataTransferConstants
 import com.grkj.iscs.databinding.FragmentWorkflowManageBinding

app/src/main/java/com/grkj/iscs/features/main/fragment/user_info/SetFingerprintFragment.kt

@@ -11,8 +11,7 @@ import com.drake.brv.utils.models
 import com.drake.brv.utils.setup
 import com.grkj.data.data.CommonConstants
 import com.grkj.data.data.MMKVConstants
-import com.grkj.data.model.vo.FingerprintDataVo
-import com.grkj.data.model.vo.SysBiometricDataVo
+import com.grkj.data.domain.vo.FingerprintDataVo
 import com.grkj.iscs.R
 import com.grkj.iscs.databinding.FragmentSetFingerprintBinding
 import com.grkj.iscs.databinding.ItemSetFingerprintBinding
@@ -23,7 +22,6 @@ import com.grkj.ui_base.dialog.TipDialog
 import com.grkj.ui_base.utils.CommonUtils
 import com.grkj.ui_base.utils.fingerprint.FingerprintUtil
 import com.kongzue.dialogx.dialogs.CustomDialog
-import com.sik.sikcore.extension.deleteIfExists
 import com.sik.sikcore.extension.getMMKVData
 import com.sik.sikcore.extension.setDebouncedClickListener
 import com.sik.sikimage.ImageConvertUtils

app/src/main/java/com/grkj/iscs/features/main/viewmodel/MainViewModel.kt

@@ -16,7 +16,7 @@ import com.grkj.data.hardware.can.CanDeviceConst
 import com.grkj.data.hardware.can.CanHelper
 import com.grkj.data.hardware.can.DeviceModel
 import com.grkj.data.hardware.modbus.DeviceConst
-import com.grkj.data.logic.IJobTicketLogic
+import com.grkj.data.domain.logic.IJobTicketLogic
 import com.grkj.data.utils.event.LoadingEvent
 import com.grkj.ui_base.base.BaseViewModel
 import com.grkj.ui_base.business.BleBusinessManager
@@ -165,7 +165,8 @@ class MainViewModel @Inject constructor(
                 deviceDatas.filterIsInstance<DeviceModel.DeviceKey>().forEach { deviceModel ->
                     when (deviceModel.deviceType) {
                         CanDeviceConst.DEVICE_KEY_DOCK -> {
-                            if (deviceModel.isExist) {
+                            if (deviceModel.isExist && deviceModel.deviceChange) {
+                                deviceModel.deviceChange = false
                                 deviceModel.mac.let { mac ->
                                     ThreadUtils.runOnIO {
                                         @SuppressLint("MissingPermission")

app/src/main/java/com/grkj/iscs/features/main/viewmodel/WorkflowViewModel.kt

@@ -5,11 +5,10 @@ import androidx.lifecycle.liveData
 import com.google.common.reflect.TypeToken
 import com.google.gson.Gson
 import com.grkj.data.data.CommonConstants
-import com.grkj.data.model.dos.WorkflowMode
-import com.grkj.data.model.dos.WorkflowStep
-import com.grkj.data.model.vo.WorkflowModeVo
-import com.grkj.data.logic.IWorkflowLogic
-import com.grkj.iscs.R
+import com.grkj.data.local.dos.WorkflowMode
+import com.grkj.data.local.dos.WorkflowStep
+import com.grkj.data.domain.vo.WorkflowModeVo
+import com.grkj.data.domain.logic.IWorkflowLogic
 import com.grkj.iscs.features.main.entity.WorkflowModeImport
 import com.grkj.shared.config.AESConfig
 import com.grkj.ui_base.base.BaseViewModel

app/src/main/java/com/grkj/iscs/features/main/viewmodel/common/EditJobWorkflowSettingViewModel.kt

@@ -3,17 +3,15 @@ package com.grkj.iscs.features.main.viewmodel.common
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.liveData
 import com.grkj.data.enums.WorkflowStepConfirmTypeEnum
-import com.grkj.data.model.dos.IsJobTicketStep
-import com.grkj.data.model.dos.SysRole
-import com.grkj.data.model.vo.SysUserVo
-import com.grkj.data.logic.IJobTicketLogic
-import com.grkj.data.logic.IRoleLogic
-import com.grkj.data.logic.IUserLogic
-import com.grkj.data.logic.IWorkflowLogic
-import com.grkj.iscs.R
+import com.grkj.data.local.dos.IsJobTicketStep
+import com.grkj.data.local.dos.SysRole
+import com.grkj.data.domain.vo.SysUserVo
+import com.grkj.data.domain.logic.IJobTicketLogic
+import com.grkj.data.domain.logic.IRoleLogic
+import com.grkj.data.domain.logic.IUserLogic
+import com.grkj.data.domain.logic.IWorkflowLogic
 import com.grkj.ui_base.base.BaseViewModel
 import com.grkj.ui_base.utils.CommonUtils
-import com.sik.sikcore.SIKCore
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.Dispatchers
 import javax.inject.Inject

app/src/main/java/com/grkj/iscs/features/main/viewmodel/common/EditSopWorkflowSettingViewModel.kt

@@ -3,17 +3,15 @@ package com.grkj.iscs.features.main.viewmodel.common
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.liveData
 import com.grkj.data.enums.WorkflowStepConfirmTypeEnum
-import com.grkj.data.model.dos.IsSopWorkflowStep
-import com.grkj.data.model.dos.SysRole
-import com.grkj.data.model.vo.SysUserVo
-import com.grkj.data.logic.IRoleLogic
-import com.grkj.data.logic.ISopLogic
-import com.grkj.data.logic.IUserLogic
-import com.grkj.data.logic.IWorkflowLogic
-import com.grkj.iscs.R
+import com.grkj.data.local.dos.IsSopWorkflowStep
+import com.grkj.data.local.dos.SysRole
+import com.grkj.data.domain.vo.SysUserVo
+import com.grkj.data.domain.logic.IRoleLogic
+import com.grkj.data.domain.logic.ISopLogic
+import com.grkj.data.domain.logic.IUserLogic
+import com.grkj.data.domain.logic.IWorkflowLogic
 import com.grkj.ui_base.base.BaseViewModel
 import com.grkj.ui_base.utils.CommonUtils
-import com.sik.sikcore.SIKCore
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.Dispatchers
 import javax.inject.Inject

app/src/main/java/com/grkj/iscs/features/main/viewmodel/common/SelectMemberViewModel.kt

@@ -2,13 +2,13 @@ package com.grkj.iscs.features.main.viewmodel.common
 
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.liveData
-import com.grkj.data.model.vo.IsJobTicketDataVo
-import com.grkj.data.model.vo.IsJobTicketUserDataVo
-import com.grkj.data.model.vo.JobTicketGroupInfoVo
-import com.grkj.data.model.vo.JobUserVo
-import com.grkj.data.model.vo.SysBiometricDataVo
-import com.grkj.data.logic.IJobTicketLogic
-import com.grkj.data.logic.IUserLogic
+import com.grkj.data.domain.vo.IsJobTicketDataVo
+import com.grkj.data.domain.vo.IsJobTicketUserDataVo
+import com.grkj.data.domain.vo.JobTicketGroupInfoVo
+import com.grkj.data.domain.vo.JobUserVo
+import com.grkj.data.domain.vo.SysBiometricDataVo
+import com.grkj.data.domain.logic.IJobTicketLogic
+import com.grkj.data.domain.logic.IUserLogic
 import com.grkj.ui_base.base.BaseViewModel
 import com.sik.sikcore.data.BeanUtils
 import dagger.hilt.android.lifecycle.HiltViewModel

app/src/main/java/com/grkj/iscs/features/main/viewmodel/common/SelectPointViewModel.kt

@@ -2,9 +2,9 @@ package com.grkj.iscs.features.main.viewmodel.common
 
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.liveData
-import com.grkj.data.model.vo.JobPointVo
-import com.grkj.data.model.vo.JobTicketGroupDataVo
-import com.grkj.data.logic.IIsolationPointLogic
+import com.grkj.data.domain.vo.JobPointVo
+import com.grkj.data.domain.vo.JobTicketGroupDataVo
+import com.grkj.data.domain.logic.IIsolationPointLogic
 import com.grkj.ui_base.base.BaseViewModel
 import com.sik.sikcore.data.BeanUtils
 import dagger.hilt.android.lifecycle.HiltViewModel

app/src/main/java/com/grkj/iscs/features/main/viewmodel/common/WorkflowSettingViewModel.kt

@@ -3,16 +3,14 @@ package com.grkj.iscs.features.main.viewmodel.common
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.liveData
 import com.grkj.data.enums.WorkflowStepConfirmTypeEnum
-import com.grkj.data.model.dos.SysRole
-import com.grkj.data.model.dos.WorkflowStep
-import com.grkj.data.model.vo.SysUserVo
-import com.grkj.data.logic.IRoleLogic
-import com.grkj.data.logic.IUserLogic
-import com.grkj.data.logic.IWorkflowLogic
-import com.grkj.iscs.R
+import com.grkj.data.local.dos.SysRole
+import com.grkj.data.local.dos.WorkflowStep
+import com.grkj.data.domain.vo.SysUserVo
+import com.grkj.data.domain.logic.IRoleLogic
+import com.grkj.data.domain.logic.IUserLogic
+import com.grkj.data.domain.logic.IWorkflowLogic
 import com.grkj.ui_base.base.BaseViewModel
 import com.grkj.ui_base.utils.CommonUtils
-import com.sik.sikcore.SIKCore
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.Dispatchers
 import javax.inject.Inject

app/src/main/java/com/grkj/iscs/features/main/viewmodel/data_manage/BackupAndRestoreViewModel.kt

@@ -2,10 +2,10 @@ package com.grkj.iscs.features.main.viewmodel.data_manage
 
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.liveData
-import com.grkj.data.database.BackupScheduler
-import com.grkj.data.database.RoomBackupManager
-import com.grkj.data.database.SimpleBackupConfig
-import com.grkj.data.database.SimpleBackupPrefs
+import com.grkj.data.local.database.BackupScheduler
+import com.grkj.data.local.database.RoomBackupManager
+import com.grkj.data.local.database.SimpleBackupConfig
+import com.grkj.data.local.database.SimpleBackupPrefs
 import com.grkj.data.enums.BackupFrequencyWeekEnum
 import com.grkj.iscs.features.main.dialog.TextDropDownDialog
 import com.grkj.shared.utils.i18n.I18nManager

app/src/main/java/com/grkj/iscs/features/main/viewmodel/data_manage/DataExportViewModel.kt

@@ -1,17 +1,14 @@
 package com.grkj.iscs.features.main.viewmodel.data_manage
 
-import androidx.annotation.ReturnThis
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.liveData
 import com.grkj.data.enums.DataExportTableEnum
 import com.grkj.data.enums.getLastExportTime
 import com.grkj.data.enums.getTableName
 import com.grkj.data.enums.setLastExportTime
-import com.grkj.data.logic.IDataExportLogic
-import com.grkj.data.logic.impl.standard.DataExportLogic
-import com.grkj.data.model.vo.DataExportVo
+import com.grkj.data.domain.logic.IDataExportLogic
+import com.grkj.data.domain.vo.DataExportVo
 import com.grkj.ui_base.base.BaseViewModel
-import com.sik.sikcore.date.TimeUtils
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.Dispatchers
 import java.io.File

app/src/main/java/com/grkj/iscs/features/main/viewmodel/data_manage/PointManageViewModel.kt

@@ -3,16 +3,16 @@ package com.grkj.iscs.features.main.viewmodel.data_manage
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.liveData
 import com.grkj.data.enums.CommonDictDataEnum
-import com.grkj.data.logic.IHardwareLogic
-import com.grkj.data.model.dos.IsRfidToken
-import com.grkj.data.model.vo.AddPointManageVo
-import com.grkj.data.model.vo.PointManageFilterVo
-import com.grkj.data.model.vo.PointManageVo
-import com.grkj.data.model.vo.UpdatePointManageVo
-import com.grkj.data.model.vo.WorkstationManageVo
-import com.grkj.data.logic.IIsolationPointLogic
-import com.grkj.data.logic.IJobTicketLogic
-import com.grkj.data.logic.IWorkstationLogic
+import com.grkj.data.domain.logic.IHardwareLogic
+import com.grkj.data.local.dos.IsRfidToken
+import com.grkj.data.domain.vo.AddPointManageVo
+import com.grkj.data.domain.vo.PointManageFilterVo
+import com.grkj.data.domain.vo.PointManageVo
+import com.grkj.data.domain.vo.UpdatePointManageVo
+import com.grkj.data.domain.vo.WorkstationManageVo
+import com.grkj.data.domain.logic.IIsolationPointLogic
+import com.grkj.data.domain.logic.IJobTicketLogic
+import com.grkj.data.domain.logic.IWorkstationLogic
 import com.grkj.shared.utils.i18n.I18nManager
 import com.grkj.ui_base.base.BaseViewModel
 import com.grkj.ui_base.utils.CommonUtils

app/src/main/java/com/grkj/iscs/features/main/viewmodel/data_manage/RoleManageViewModel.kt

@@ -2,13 +2,13 @@ package com.grkj.iscs.features.main.viewmodel.data_manage
 
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.liveData
-import com.grkj.data.model.vo.AddRoleDo
-import com.grkj.data.model.vo.RoleManageFilterVo
-import com.grkj.data.model.vo.RoleManageVo
-import com.grkj.data.model.vo.UpdateRoleDo
-import com.grkj.data.logic.IJobTicketLogic
-import com.grkj.data.logic.IRoleLogic
-import com.grkj.data.logic.ISysMenuLogic
+import com.grkj.data.domain.vo.AddRoleDo
+import com.grkj.data.domain.vo.RoleManageFilterVo
+import com.grkj.data.domain.vo.RoleManageVo
+import com.grkj.data.domain.vo.UpdateRoleDo
+import com.grkj.data.domain.logic.IJobTicketLogic
+import com.grkj.data.domain.logic.IRoleLogic
+import com.grkj.data.domain.logic.ISysMenuLogic
 import com.grkj.iscs.features.main.entity.AddRoleDataEntity
 import com.grkj.iscs.features.main.entity.RoleManageFunctionalPermissionsEntity
 import com.grkj.iscs.features.main.entity.UpdateRoleDataEntity

app/src/main/java/com/grkj/iscs/features/main/viewmodel/data_manage/SwitchLayoutViewModel.kt

@@ -3,16 +3,15 @@ package com.grkj.iscs.features.main.viewmodel.data_manage
 import android.content.Context
 import android.graphics.Bitmap
 import android.graphics.PointF
-import android.view.View
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.liveData
 import com.grkj.data.data.MMKVConstants
-import com.grkj.data.logic.IHardwareLogic
-import com.grkj.data.logic.IWorkstationLogic
-import com.grkj.data.logic.impl.standard.JobTicketLogic
-import com.grkj.data.model.vo.MapInfoRespVO
-import com.grkj.data.model.vo.PointToMapVo
-import com.grkj.data.model.vo.WorkstationManageVo
+import com.grkj.data.domain.logic.IHardwareLogic
+import com.grkj.data.domain.logic.IWorkstationLogic
+import com.grkj.data.domain.logic.impl.JobTicketLogic
+import com.grkj.data.domain.vo.MapInfoRespVO
+import com.grkj.data.domain.vo.PointToMapVo
+import com.grkj.data.domain.vo.WorkstationManageVo
 import com.grkj.shared.config.Constants
 import com.grkj.shared.utils.i18n.I18nManager
 import com.grkj.ui_base.R

app/src/main/java/com/grkj/iscs/features/main/viewmodel/data_manage/UserManageViewModel.kt

@@ -2,18 +2,18 @@ package com.grkj.iscs.features.main.viewmodel.data_manage
 
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.liveData
-import com.grkj.data.model.dos.SysRole
-import com.grkj.data.model.vo.AddUserDataVo
-import com.grkj.data.model.vo.UpdateUserDataVo
-import com.grkj.data.model.vo.UserManageFilterVo
-import com.grkj.data.model.vo.UserManageVo
-import com.grkj.data.model.vo.WorkstationManageVo
-import com.grkj.data.logic.IHardwareLogic
-import com.grkj.data.logic.IJobTicketLogic
-import com.grkj.data.logic.IRoleLogic
-import com.grkj.data.logic.IUserLogic
-import com.grkj.data.logic.IWorkstationLogic
-import com.grkj.data.model.dos.SysUserCharacteristicDo
+import com.grkj.data.local.dos.SysRole
+import com.grkj.data.domain.vo.AddUserDataVo
+import com.grkj.data.domain.vo.UpdateUserDataVo
+import com.grkj.data.domain.vo.UserManageFilterVo
+import com.grkj.data.domain.vo.UserManageVo
+import com.grkj.data.domain.vo.WorkstationManageVo
+import com.grkj.data.domain.logic.IHardwareLogic
+import com.grkj.data.domain.logic.IJobTicketLogic
+import com.grkj.data.domain.logic.IRoleLogic
+import com.grkj.data.domain.logic.IUserLogic
+import com.grkj.data.domain.logic.IWorkstationLogic
+import com.grkj.data.local.dos.SysUserCharacteristicDo
 import com.grkj.ui_base.base.BaseViewModel
 import com.grkj.ui_base.utils.CommonUtils
 import dagger.hilt.android.lifecycle.HiltViewModel

app/src/main/java/com/grkj/iscs/features/main/viewmodel/data_manage/WorkstationManageViewModel.kt

@@ -2,8 +2,8 @@ package com.grkj.iscs.features.main.viewmodel.data_manage
 
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.liveData
-import com.grkj.data.model.vo.WorkstationManageVo
-import com.grkj.data.logic.IWorkstationLogic
+import com.grkj.data.domain.vo.WorkstationManageVo
+import com.grkj.data.domain.logic.IWorkstationLogic
 import com.grkj.ui_base.base.BaseViewModel
 import com.grkj.ui_base.utils.CommonUtils
 import dagger.hilt.android.lifecycle.HiltViewModel

app/src/main/java/com/grkj/iscs/features/main/viewmodel/exception_manage/ExceptionJobViewModel.kt

@@ -6,21 +6,21 @@ import com.grkj.data.data.DictConstants
 import com.grkj.data.enums.JobTicketStatusEnum
 import com.grkj.data.enums.NextJobPrompt
 import com.grkj.data.enums.RoleEnum
-import com.grkj.data.logic.IExceptionLogic
-import com.grkj.data.logic.IJobTicketLogic
-import com.grkj.data.logic.IUserLogic
-import com.grkj.data.model.dos.IsJobTicketStep
-import com.grkj.data.model.res.CommonDictRes
-import com.grkj.data.model.vo.IsExceptionStandardVo
-import com.grkj.data.model.vo.IsJobTicketDataVo
-import com.grkj.data.model.vo.IsJobTicketKeyDataVo
-import com.grkj.data.model.vo.IsJobTicketLockDataVo
-import com.grkj.data.model.vo.IsJobTicketPointsDataVo
-import com.grkj.data.model.vo.IsJobTicketStepDataVo
-import com.grkj.data.model.vo.IsJobTicketUserDataVo
-import com.grkj.data.model.vo.JobTicketGroupDataVo
-import com.grkj.data.model.vo.JobTicketGroupInfoVo
-import com.grkj.data.model.vo.JobUserVo
+import com.grkj.data.domain.logic.IExceptionLogic
+import com.grkj.data.domain.logic.IJobTicketLogic
+import com.grkj.data.domain.logic.IUserLogic
+import com.grkj.data.local.dos.IsJobTicketStep
+import com.grkj.data.net.res.CommonDictRes
+import com.grkj.data.domain.vo.IsExceptionStandardVo
+import com.grkj.data.domain.vo.IsJobTicketDataVo
+import com.grkj.data.domain.vo.IsJobTicketKeyDataVo
+import com.grkj.data.domain.vo.IsJobTicketLockDataVo
+import com.grkj.data.domain.vo.IsJobTicketPointsDataVo
+import com.grkj.data.domain.vo.IsJobTicketStepDataVo
+import com.grkj.data.domain.vo.IsJobTicketUserDataVo
+import com.grkj.data.domain.vo.JobTicketGroupDataVo
+import com.grkj.data.domain.vo.JobTicketGroupInfoVo
+import com.grkj.data.domain.vo.JobUserVo
 import com.grkj.shared.utils.i18n.I18nManager
 import com.grkj.ui_base.base.BaseViewModel
 import com.grkj.ui_base.business.DataBusiness

app/src/main/java/com/grkj/iscs/features/main/viewmodel/exception_manage/ExceptionViewModel.kt

@@ -3,13 +3,13 @@ package com.grkj.iscs.features.main.viewmodel.exception_manage
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.liveData
 import com.grkj.data.data.DictConstants
-import com.grkj.data.model.dos.IsExceptionSourceStandard
-import com.grkj.data.model.dos.IsExceptionStandard
-import com.grkj.data.model.res.CommonDictRes
-import com.grkj.data.model.vo.IsExceptionStandardVo
-import com.grkj.data.logic.IExceptionLogic
-import com.grkj.data.logic.IHardwareLogic
-import com.grkj.data.logic.IJobTicketLogic
+import com.grkj.data.local.dos.IsExceptionSourceStandard
+import com.grkj.data.local.dos.IsExceptionStandard
+import com.grkj.data.net.res.CommonDictRes
+import com.grkj.data.domain.vo.IsExceptionStandardVo
+import com.grkj.data.domain.logic.IExceptionLogic
+import com.grkj.data.domain.logic.IHardwareLogic
+import com.grkj.data.domain.logic.IJobTicketLogic
 import com.grkj.iscs.features.main.entity.ExceptionSourceDataEntity
 import com.grkj.shared.utils.i18n.I18nManager
 import com.grkj.ui_base.base.BaseViewModel

app/src/main/java/com/grkj/iscs/features/main/viewmodel/hardware_manage/CardManageViewModel.kt

@@ -3,12 +3,12 @@ package com.grkj.iscs.features.main.viewmodel.hardware_manage
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.liveData
 import com.grkj.data.enums.CommonDictDataEnum
-import com.grkj.data.model.dos.IsJobCard
-import com.grkj.data.model.vo.AddCardDataVo
-import com.grkj.data.model.vo.CardManageFilterVo
-import com.grkj.data.model.vo.UpdateCardDataVo
-import com.grkj.data.logic.IHardwareLogic
-import com.grkj.data.logic.IUserLogic
+import com.grkj.data.local.dos.IsJobCard
+import com.grkj.data.domain.vo.AddCardDataVo
+import com.grkj.data.domain.vo.CardManageFilterVo
+import com.grkj.data.domain.vo.UpdateCardDataVo
+import com.grkj.data.domain.logic.IHardwareLogic
+import com.grkj.data.domain.logic.IUserLogic
 import com.grkj.iscs.features.main.dialog.TextDropDownDialog
 import com.grkj.shared.utils.i18n.I18nManager
 import com.grkj.ui_base.base.BaseViewModel

app/src/main/java/com/grkj/iscs/features/main/viewmodel/hardware_manage/KeyManageViewModel.kt

@@ -3,12 +3,12 @@ package com.grkj.iscs.features.main.viewmodel.hardware_manage
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.liveData
 import com.grkj.data.enums.CommonDictDataEnum
-import com.grkj.data.model.dos.IsKey
-import com.grkj.data.model.vo.AddKeyDataVo
-import com.grkj.data.model.vo.KeyManageFilterVo
-import com.grkj.data.model.vo.UpdateKeyDataVo
-import com.grkj.data.logic.IHardwareLogic
-import com.grkj.data.logic.IJobTicketLogic
+import com.grkj.data.local.dos.IsKey
+import com.grkj.data.domain.vo.AddKeyDataVo
+import com.grkj.data.domain.vo.KeyManageFilterVo
+import com.grkj.data.domain.vo.UpdateKeyDataVo
+import com.grkj.data.domain.logic.IHardwareLogic
+import com.grkj.data.domain.logic.IJobTicketLogic
 import com.grkj.shared.utils.i18n.I18nManager
 import com.grkj.ui_base.base.BaseViewModel
 import com.grkj.ui_base.utils.CommonUtils

app/src/main/java/com/grkj/iscs/features/main/viewmodel/hardware_manage/LockManageViewModel.kt

@@ -3,12 +3,12 @@ package com.grkj.iscs.features.main.viewmodel.hardware_manage
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.liveData
 import com.grkj.data.enums.CommonDictDataEnum
-import com.grkj.data.model.dos.IsLock
-import com.grkj.data.model.vo.AddLockDataVo
-import com.grkj.data.model.vo.LockManageFilterVo
-import com.grkj.data.model.vo.UpdateLockDataVo
-import com.grkj.data.logic.IHardwareLogic
-import com.grkj.data.logic.IJobTicketLogic
+import com.grkj.data.local.dos.IsLock
+import com.grkj.data.domain.vo.AddLockDataVo
+import com.grkj.data.domain.vo.LockManageFilterVo
+import com.grkj.data.domain.vo.UpdateLockDataVo
+import com.grkj.data.domain.logic.IHardwareLogic
+import com.grkj.data.domain.logic.IJobTicketLogic
 import com.grkj.shared.utils.i18n.I18nManager
 import com.grkj.ui_base.base.BaseViewModel
 import com.grkj.ui_base.utils.CommonUtils

app/src/main/java/com/grkj/iscs/features/main/viewmodel/hardware_manage/RfidTokenManageViewModel.kt

@@ -3,12 +3,12 @@ package com.grkj.iscs.features.main.viewmodel.hardware_manage
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.liveData
 import com.grkj.data.enums.CommonDictDataEnum
-import com.grkj.data.model.dos.IsRfidToken
-import com.grkj.data.model.vo.AddRfidTokenDataVo
-import com.grkj.data.model.vo.RfidTokenManageFilterVo
-import com.grkj.data.model.vo.UpdateRfidTokenDataVo
-import com.grkj.data.logic.IHardwareLogic
-import com.grkj.data.logic.IJobTicketLogic
+import com.grkj.data.local.dos.IsRfidToken
+import com.grkj.data.domain.vo.AddRfidTokenDataVo
+import com.grkj.data.domain.vo.RfidTokenManageFilterVo
+import com.grkj.data.domain.vo.UpdateRfidTokenDataVo
+import com.grkj.data.domain.logic.IHardwareLogic
+import com.grkj.data.domain.logic.IJobTicketLogic
 import com.grkj.shared.utils.i18n.I18nManager
 import com.grkj.ui_base.base.BaseViewModel
 import com.grkj.ui_base.utils.CommonUtils

app/src/main/java/com/grkj/iscs/features/main/viewmodel/hardware_manage/SlotsManageViewModel.kt

@@ -4,10 +4,10 @@ import androidx.lifecycle.LiveData
 import androidx.lifecycle.liveData
 import com.grkj.data.data.MMKVConstants
 import com.grkj.data.enums.HardwareMode
-import com.grkj.data.model.dos.IsKey
-import com.grkj.data.model.dos.IsLock
-import com.grkj.data.model.dos.IsLockCabinetSlots
-import com.grkj.data.logic.IHardwareLogic
+import com.grkj.data.local.dos.IsKey
+import com.grkj.data.local.dos.IsLock
+import com.grkj.data.local.dos.IsLockCabinetSlots
+import com.grkj.data.domain.logic.IHardwareLogic
 import com.grkj.data.hardware.DockData
 import com.grkj.ui_base.base.BaseViewModel
 import com.grkj.ui_base.business.HardwareBusinessManager
@@ -209,7 +209,7 @@ class SlotsManageViewModel @Inject constructor(
      * 检测新钥匙mac地址
      */
     private suspend fun detectNewKeyMac(keyBean: DockData.KeyDock.KeyBean): String {
-        val mac = suspendCancellableCoroutine { cont ->
+        val mac = suspendCancellableCoroutine<String> { cont ->
             val existsKeyMac =
                 hardwareRepository.getAllKeyInfo().mapNotNull { it.macAddress }.toList()
             logger.info("设备检测-打开充电:${keyBean.addr},${keyBean.idx}")

app/src/main/java/com/grkj/iscs/features/main/viewmodel/home/HomeViewModel.kt

@@ -3,17 +3,17 @@ package com.grkj.iscs.features.main.viewmodel.home
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.liveData
 import com.grkj.data.data.MainDomainData
-import com.grkj.data.logic.IHardwareLogic
-import com.grkj.data.logic.IJobTicketLogic
-import com.grkj.data.logic.IUserLogic
-import com.grkj.data.logic.IWorkflowLogic
-import com.grkj.data.logic.IWorkstationLogic
-import com.grkj.data.model.dos.WorkflowMode
-import com.grkj.data.model.extension.splitTodoSteps
-import com.grkj.data.model.extension.toTodoVo
-import com.grkj.data.model.local.isMyTodo
-import com.grkj.data.model.vo.TodoItemVo
-import com.grkj.data.model.vo.WorkstationManageVo
+import com.grkj.data.domain.logic.IHardwareLogic
+import com.grkj.data.domain.logic.IJobTicketLogic
+import com.grkj.data.domain.logic.IUserLogic
+import com.grkj.data.domain.logic.IWorkflowLogic
+import com.grkj.data.domain.logic.IWorkstationLogic
+import com.grkj.data.local.dos.WorkflowMode
+import com.grkj.data.entity.extension.splitTodoSteps
+import com.grkj.data.entity.extension.toTodoVo
+import com.grkj.data.entity.local.isMyTodo
+import com.grkj.data.domain.vo.TodoItemVo
+import com.grkj.data.domain.vo.WorkstationManageVo
 import com.grkj.ui_base.base.BaseViewModel
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.Dispatchers

app/src/main/java/com/grkj/iscs/features/main/viewmodel/job_manage/JobExecuteViewModel.kt

@@ -8,22 +8,22 @@ import com.grkj.data.enums.HardwareMode
 import com.grkj.data.enums.JobTicketStatusEnum
 import com.grkj.data.enums.RoleEnum
 import com.grkj.data.hardware.modbus.DeviceConst
-import com.grkj.data.logic.IJobTicketLogic
-import com.grkj.data.logic.IUserLogic
-import com.grkj.data.logic.IWorkflowLogic
-import com.grkj.data.model.dos.IsJobTicketStep
-import com.grkj.data.model.dos.WorkflowMode
-import com.grkj.data.model.local.DeviceTakeUpdate
-import com.grkj.data.model.vo.IsJobTicketDataVo
-import com.grkj.data.model.vo.IsJobTicketKeyDataVo
-import com.grkj.data.model.vo.IsJobTicketLockDataVo
-import com.grkj.data.model.vo.IsJobTicketPointsDataVo
-import com.grkj.data.model.vo.IsJobTicketStepDataVo
-import com.grkj.data.model.vo.IsJobTicketUserDataVo
-import com.grkj.data.model.vo.JobTicketGroupDataVo
-import com.grkj.data.model.vo.JobTicketGroupInfoVo
-import com.grkj.data.model.vo.JobUserVo
-import com.grkj.data.model.vo.SysBiometricDataVo
+import com.grkj.data.domain.logic.IJobTicketLogic
+import com.grkj.data.domain.logic.IUserLogic
+import com.grkj.data.domain.logic.IWorkflowLogic
+import com.grkj.data.local.dos.IsJobTicketStep
+import com.grkj.data.local.dos.WorkflowMode
+import com.grkj.data.entity.local.DeviceTakeUpdate
+import com.grkj.data.domain.vo.IsJobTicketDataVo
+import com.grkj.data.domain.vo.IsJobTicketKeyDataVo
+import com.grkj.data.domain.vo.IsJobTicketLockDataVo
+import com.grkj.data.domain.vo.IsJobTicketPointsDataVo
+import com.grkj.data.domain.vo.IsJobTicketStepDataVo
+import com.grkj.data.domain.vo.IsJobTicketUserDataVo
+import com.grkj.data.domain.vo.JobTicketGroupDataVo
+import com.grkj.data.domain.vo.JobTicketGroupInfoVo
+import com.grkj.data.domain.vo.JobUserVo
+import com.grkj.data.domain.vo.SysBiometricDataVo
 import com.grkj.data.utils.event.LoadingEvent
 import com.grkj.ui_base.base.BaseViewModel
 import com.grkj.ui_base.business.BleBusinessManager

app/src/main/java/com/grkj/iscs/features/main/viewmodel/job_manage/JobManageHomeViewModel.kt

@@ -4,13 +4,13 @@ import androidx.lifecycle.LiveData
 import androidx.lifecycle.liveData
 import com.grkj.data.data.DictConstants
 import com.grkj.data.data.MainDomainData
-import com.grkj.data.logic.IExceptionLogic
-import com.grkj.data.logic.IJobTicketLogic
-import com.grkj.data.model.extension.splitTodoSteps
-import com.grkj.data.model.extension.toTodoVo
-import com.grkj.data.model.local.isMyTodo
-import com.grkj.data.model.res.CommonDictRes
-import com.grkj.data.model.vo.TodoItemVo
+import com.grkj.data.domain.logic.IExceptionLogic
+import com.grkj.data.domain.logic.IJobTicketLogic
+import com.grkj.data.entity.extension.splitTodoSteps
+import com.grkj.data.entity.extension.toTodoVo
+import com.grkj.data.entity.local.isMyTodo
+import com.grkj.data.net.res.CommonDictRes
+import com.grkj.data.domain.vo.TodoItemVo
 import com.grkj.shared.utils.i18n.I18nManager
 import com.grkj.ui_base.base.BaseViewModel
 import com.grkj.ui_base.business.DataBusiness

app/src/main/java/com/grkj/iscs/features/main/viewmodel/job_manage/JobManageViewModel.kt

@@ -3,10 +3,10 @@ package com.grkj.iscs.features.main.viewmodel.job_manage
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.liveData
 import com.grkj.data.data.DictConstants
-import com.grkj.data.model.res.CommonDictRes
-import com.grkj.data.model.vo.JobTicketManageVo
-import com.grkj.data.logic.IExceptionLogic
-import com.grkj.data.logic.IJobTicketLogic
+import com.grkj.data.net.res.CommonDictRes
+import com.grkj.data.domain.vo.JobTicketManageVo
+import com.grkj.data.domain.logic.IExceptionLogic
+import com.grkj.data.domain.logic.IJobTicketLogic
 import com.grkj.ui_base.base.BaseViewModel
 import com.grkj.ui_base.business.DataBusiness
 import dagger.hilt.android.lifecycle.HiltViewModel

app/src/main/java/com/grkj/iscs/features/main/viewmodel/job_manage/JobViewModel.kt

@@ -3,20 +3,20 @@ package com.grkj.iscs.features.main.viewmodel.job_manage
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.liveData
 import com.grkj.data.enums.RoleEnum
-import com.grkj.data.model.dos.IsSopGroup
-import com.grkj.data.model.dos.WorkflowMode
-import com.grkj.data.model.dos.WorkflowStep
-import com.grkj.data.model.vo.JobPointVo
-import com.grkj.data.model.vo.JobTicketGroupDataVo
-import com.grkj.data.model.vo.JobTicketManageVo
-import com.grkj.data.model.vo.JobUserVo
-import com.grkj.data.model.vo.SysBiometricDataVo
-import com.grkj.data.model.vo.WorkstationManageVo
-import com.grkj.data.logic.IJobTicketLogic
-import com.grkj.data.logic.ISopLogic
-import com.grkj.data.logic.IWorkflowLogic
-import com.grkj.data.logic.IWorkstationLogic
-import com.grkj.data.logic.impl.standard.UserLogic
+import com.grkj.data.local.dos.IsSopGroup
+import com.grkj.data.local.dos.WorkflowMode
+import com.grkj.data.local.dos.WorkflowStep
+import com.grkj.data.domain.vo.JobPointVo
+import com.grkj.data.domain.vo.JobTicketGroupDataVo
+import com.grkj.data.domain.vo.JobTicketManageVo
+import com.grkj.data.domain.vo.JobUserVo
+import com.grkj.data.domain.vo.SysBiometricDataVo
+import com.grkj.data.domain.vo.WorkstationManageVo
+import com.grkj.data.domain.logic.IJobTicketLogic
+import com.grkj.data.domain.logic.ISopLogic
+import com.grkj.data.domain.logic.IWorkflowLogic
+import com.grkj.data.domain.logic.IWorkstationLogic
+import com.grkj.data.domain.logic.impl.UserLogic
 import com.grkj.ui_base.base.BaseViewModel
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.Dispatchers

app/src/main/java/com/grkj/iscs/features/main/viewmodel/job_manage/LockedPointsViewModel.kt

@@ -2,8 +2,8 @@ package com.grkj.iscs.features.main.viewmodel.job_manage
 
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.liveData
-import com.grkj.data.model.vo.LockedPointVo
-import com.grkj.data.logic.IJobTicketLogic
+import com.grkj.data.domain.vo.LockedPointVo
+import com.grkj.data.domain.logic.IJobTicketLogic
 import com.grkj.ui_base.base.BaseViewModel
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.Dispatchers

app/src/main/java/com/grkj/iscs/features/main/viewmodel/job_manage/MyTodoViewModel.kt

@@ -7,20 +7,18 @@ import com.grkj.data.data.MainDomainData
 import com.grkj.data.enums.JobTicketStatusEnum
 import com.grkj.data.enums.OperationTypeEnum
 import com.grkj.data.enums.TodoStatusEnum
-import com.grkj.data.logic.IJobTicketLogic
-import com.grkj.data.logic.IUserLogic
-import com.grkj.data.model.extension.actionKey
-import com.grkj.data.model.extension.findPredecessors
-import com.grkj.data.model.extension.toTodoVo
-import com.grkj.data.model.local.isMyTodo
-import com.grkj.data.model.res.CommonDictRes
-import com.grkj.data.model.vo.IsJobTicketPointsDataVo
-import com.grkj.data.model.vo.TodoItemVo
-import com.grkj.iscs.R
+import com.grkj.data.domain.logic.IJobTicketLogic
+import com.grkj.data.domain.logic.IUserLogic
+import com.grkj.data.entity.extension.actionKey
+import com.grkj.data.entity.extension.findPredecessors
+import com.grkj.data.entity.extension.toTodoVo
+import com.grkj.data.entity.local.isMyTodo
+import com.grkj.data.net.res.CommonDictRes
+import com.grkj.data.domain.vo.IsJobTicketPointsDataVo
+import com.grkj.data.domain.vo.TodoItemVo
 import com.grkj.ui_base.base.BaseViewModel
 import com.grkj.ui_base.business.DataBusiness
 import com.grkj.ui_base.utils.CommonUtils
-import com.kongzue.dialogx.dialogs.CustomDialog
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.Dispatchers
 import javax.inject.Inject

app/src/main/java/com/grkj/iscs/features/main/viewmodel/job_manage/SopJobViewModel.kt

@@ -3,21 +3,21 @@ package com.grkj.iscs.features.main.viewmodel.job_manage
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.liveData
 import com.grkj.data.enums.RoleEnum
-import com.grkj.data.model.dos.WorkflowMode
-import com.grkj.data.model.dos.WorkflowStep
-import com.grkj.data.model.vo.JobPointVo
-import com.grkj.data.model.vo.JobTicketGroupDataVo
-import com.grkj.data.model.vo.JobTicketGroupInfoVo
-import com.grkj.data.model.vo.JobTicketManageVo
-import com.grkj.data.model.vo.JobUserVo
-import com.grkj.data.model.vo.SopManageVo
-import com.grkj.data.model.vo.SysBiometricDataVo
-import com.grkj.data.model.vo.WorkstationManageVo
-import com.grkj.data.logic.IJobTicketLogic
-import com.grkj.data.logic.ISopLogic
-import com.grkj.data.logic.IUserLogic
-import com.grkj.data.logic.IWorkflowLogic
-import com.grkj.data.logic.IWorkstationLogic
+import com.grkj.data.local.dos.WorkflowMode
+import com.grkj.data.local.dos.WorkflowStep
+import com.grkj.data.domain.vo.JobPointVo
+import com.grkj.data.domain.vo.JobTicketGroupDataVo
+import com.grkj.data.domain.vo.JobTicketGroupInfoVo
+import com.grkj.data.domain.vo.JobTicketManageVo
+import com.grkj.data.domain.vo.JobUserVo
+import com.grkj.data.domain.vo.SopManageVo
+import com.grkj.data.domain.vo.SysBiometricDataVo
+import com.grkj.data.domain.vo.WorkstationManageVo
+import com.grkj.data.domain.logic.IJobTicketLogic
+import com.grkj.data.domain.logic.ISopLogic
+import com.grkj.data.domain.logic.IUserLogic
+import com.grkj.data.domain.logic.IWorkflowLogic
+import com.grkj.data.domain.logic.IWorkstationLogic
 import com.grkj.ui_base.base.BaseViewModel
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.Dispatchers

app/src/main/java/com/grkj/iscs/features/main/viewmodel/job_manage/SopManageViewModel.kt

@@ -3,9 +3,9 @@ package com.grkj.iscs.features.main.viewmodel.job_manage
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.liveData
 import com.grkj.data.enums.JobTicketStatusEnum
-import com.grkj.data.model.vo.SopManageVo
-import com.grkj.data.logic.IJobTicketLogic
-import com.grkj.data.logic.ISopLogic
+import com.grkj.data.domain.vo.SopManageVo
+import com.grkj.data.domain.logic.IJobTicketLogic
+import com.grkj.data.domain.logic.ISopLogic
 import com.grkj.ui_base.base.BaseViewModel
 import dagger.hilt.android.lifecycle.HiltViewModel
 import javax.inject.Inject

app/src/main/java/com/grkj/iscs/features/main/viewmodel/job_manage/SopViewModel.kt

@@ -2,19 +2,19 @@ package com.grkj.iscs.features.main.viewmodel.job_manage
 
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.liveData
-import com.grkj.data.model.dos.IsSopGroup
-import com.grkj.data.model.dos.WorkflowMode
-import com.grkj.data.model.dos.WorkflowStep
-import com.grkj.data.model.vo.JobPointVo
-import com.grkj.data.model.vo.JobTicketGroupDataVo
-import com.grkj.data.model.vo.JobUserVo
-import com.grkj.data.model.vo.SopManageVo
-import com.grkj.data.model.vo.SysBiometricDataVo
-import com.grkj.data.model.vo.WorkstationManageVo
-import com.grkj.data.logic.ISopLogic
-import com.grkj.data.logic.IWorkflowLogic
-import com.grkj.data.logic.IWorkstationLogic
-import com.grkj.data.logic.impl.standard.UserLogic
+import com.grkj.data.local.dos.IsSopGroup
+import com.grkj.data.local.dos.WorkflowMode
+import com.grkj.data.local.dos.WorkflowStep
+import com.grkj.data.domain.vo.JobPointVo
+import com.grkj.data.domain.vo.JobTicketGroupDataVo
+import com.grkj.data.domain.vo.JobUserVo
+import com.grkj.data.domain.vo.SopManageVo
+import com.grkj.data.domain.vo.SysBiometricDataVo
+import com.grkj.data.domain.vo.WorkstationManageVo
+import com.grkj.data.domain.logic.ISopLogic
+import com.grkj.data.domain.logic.IWorkflowLogic
+import com.grkj.data.domain.logic.IWorkstationLogic
+import com.grkj.data.domain.logic.impl.UserLogic
 import com.grkj.ui_base.base.BaseViewModel
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.Dispatchers

app/src/main/java/com/grkj/iscs/features/main/viewmodel/user_info/UserInfoViewModel.kt

@@ -3,12 +3,12 @@ package com.grkj.iscs.features.main.viewmodel.user_info
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.liveData
 import com.grkj.data.data.MainDomainData
-import com.grkj.data.model.dos.IsJobCard
-import com.grkj.data.model.dos.SysUserCharacteristicDo
-import com.grkj.data.model.vo.FingerprintDataVo
-import com.grkj.data.model.vo.SysBiometricDataVo
-import com.grkj.data.logic.IHardwareLogic
-import com.grkj.data.logic.IUserLogic
+import com.grkj.data.local.dos.IsJobCard
+import com.grkj.data.local.dos.SysUserCharacteristicDo
+import com.grkj.data.domain.vo.FingerprintDataVo
+import com.grkj.data.domain.vo.SysBiometricDataVo
+import com.grkj.data.domain.logic.IHardwareLogic
+import com.grkj.data.domain.logic.IUserLogic
 import com.grkj.shared.utils.ArcSoftUtil
 import com.grkj.shared.utils.BCryptUtils
 import com.grkj.ui_base.base.BaseViewModel

app/src/main/java/com/grkj/iscs/features/splash/activity/SplashActivity.kt

@@ -3,13 +3,12 @@ package com.grkj.iscs.features.splash.activity
 import android.content.Intent
 import android.view.Gravity
 import androidx.activity.viewModels
-import androidx.compose.ui.text.toUpperCase
 import androidx.lifecycle.lifecycleScope
 import com.grkj.data.data.MMKVConstants
-import com.grkj.data.database.BackupScheduler
-import com.grkj.data.database.DbReadyGate
-import com.grkj.data.database.ISCSDatabase
-import com.grkj.data.database.PresetData
+import com.grkj.data.local.database.BackupScheduler
+import com.grkj.data.local.database.DbReadyGate
+import com.grkj.data.local.database.ISCSDatabase
+import com.grkj.data.local.database.PresetData
 import com.grkj.data.enums.HardwareMode
 import com.grkj.data.utils.event.StartListenerEvent
 import com.grkj.iscs.R
@@ -34,7 +33,6 @@ import dagger.hilt.android.AndroidEntryPoint
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
-import kotlinx.coroutines.withContext
 import java.util.Locale
 
 @AndroidEntryPoint