refactor(更新) :

- 包名修改

app/build.gradle

@@ -6,7 +6,7 @@ plugins {
 }
 
 android {
-    namespace 'com.grkj.iscs'
+    namespace 'com.grkj.iscs_mars'
     compileSdk 34
     viewBinding.enabled = true
 
@@ -15,7 +15,7 @@ android {
     }
 
     defaultConfig {
-        applicationId "com.grkj.iscs"
+        applicationId "com.grkj.iscs_mars"
         minSdk 24
         targetSdk 34
         versionCode 1

app/src/androidTest/java/com/grkj/iscs/ExampleInstrumentedTest.kt → app/src/androidTest/java/com/grkj/iscs_mars/ExampleInstrumentedTest.kt

@@ -1,4 +1,4 @@
-package com.grkj.iscs
+package com.grkj.iscs_mars
 
 import androidx.test.platform.app.InstrumentationRegistry
 import androidx.test.ext.junit.runners.AndroidJUnit4

app/src/main/java/com/grkj/iscs/model/bo/DockStatusBO.kt

@@ -1,8 +0,0 @@
-package com.grkj.iscs.model.bo
-
-import com.grkj.iscs.view.fragment.DockTestFragment.DockTestBean
-
-data class DockStatusBO(
-    val row: Int,
-    val dockList: MutableList<DockTestBean>
-)

app/src/main/java/com/grkj/iscs/model/eventmsg/CurrentModeMsg.kt

@@ -1,8 +0,0 @@
-package com.grkj.iscs.model.eventmsg
-
-import com.grkj.iscs.ble.BleBean
-
-data class CurrentModeMsg(
-    val bleBean: BleBean,
-    val mode: Byte
-)

app/src/main/java/com/grkj/iscs/model/eventmsg/DeviceExceptionMsg.kt

@@ -1,9 +0,0 @@
-package com.grkj.iscs.model.eventmsg
-
-/**
- * @param type {@link [com.grkj.iscs.model.DeviceConst]<class>#[deviceType]}
- */
-data class DeviceExceptionMsg(
-    val type: Int,
-    val rfid: String
-)

app/src/main/java/com/grkj/iscs/presentation/ILockerTogetherView.kt

@@ -1,6 +0,0 @@
-package com.grkj.iscs.presentation
-
-import com.grkj.iscs.view.base.IView
-
-interface ILockerTogetherView : IView {
-}

app/src/main/java/com/grkj/iscs/presentation/IPresentationView.kt

@@ -1,5 +0,0 @@
-package com.grkj.iscs.presentation
-
-import com.grkj.iscs.view.base.IView
-
-interface IPresentationView : IView {}

app/src/main/java/com/grkj/iscs/presentation/LockerTogetherPresenter.kt

@@ -1,6 +0,0 @@
-package com.grkj.iscs.presentation
-
-import com.grkj.iscs.view.base.BasePresenter
-
-class LockerTogetherPresenter : BasePresenter<ILockerTogetherView>() {
-}

app/src/main/java/com/grkj/iscs/view/iview/IDeviceStatusView.kt

@@ -1,5 +0,0 @@
-package com.grkj.iscs.view.iview
-
-import com.grkj.iscs.view.base.IView
-
-interface IDeviceStatusView : IView {}

app/src/main/java/com/grkj/iscs/view/iview/IExceptionReportView.kt

@@ -1,6 +0,0 @@
-package com.grkj.iscs.view.iview
-
-import com.grkj.iscs.view.base.IView
-
-interface IExceptionReportView : IView {
-}

app/src/main/java/com/grkj/iscs/view/iview/IFaceConfigView.kt

@@ -1,6 +0,0 @@
-package com.grkj.iscs.view.iview
-
-import com.grkj.iscs.view.base.IView
-
-interface IFaceConfigView : IView {
-}

app/src/main/java/com/grkj/iscs/view/iview/IFingerprintConfigView.kt

@@ -1,6 +0,0 @@
-package com.grkj.iscs.view.iview
-
-import com.grkj.iscs.view.base.IView
-
-interface IFingerprintConfigView : IView {
-}

app/src/main/java/com/grkj/iscs/view/iview/IHomeView.kt

@@ -1,6 +0,0 @@
-package com.grkj.iscs.view.iview
-
-import com.grkj.iscs.view.base.IView
-
-interface IHomeView : IView {
-}

app/src/main/java/com/grkj/iscs/view/iview/IJobExecutionView.kt

@@ -1,6 +0,0 @@
-package com.grkj.iscs.view.iview
-
-import com.grkj.iscs.view.base.IView
-
-interface IJobExecutionView : IView {
-}

app/src/main/java/com/grkj/iscs/view/iview/IJobManagementView.kt

@@ -1,6 +0,0 @@
-package com.grkj.iscs.view.iview
-
-import com.grkj.iscs.view.base.IView
-
-interface IJobManagementView : IView {
-}

app/src/main/java/com/grkj/iscs/view/iview/IJobProgressView.kt

@@ -1,6 +0,0 @@
-package com.grkj.iscs.view.iview
-
-import com.grkj.iscs.view.base.IView
-
-interface IJobProgressView : IView {
-}

app/src/main/java/com/grkj/iscs/view/iview/ILoginView.kt

@@ -1,5 +0,0 @@
-package com.grkj.iscs.view.iview
-
-import com.grkj.iscs.view.base.IView
-
-interface ILoginView : IView {}

app/src/main/java/com/grkj/iscs/view/iview/IModbusView.kt

@@ -1,5 +0,0 @@
-package com.grkj.iscs.view.iview
-
-import com.grkj.iscs.view.base.IView
-
-interface IModbusView : IView

app/src/main/java/com/grkj/iscs/view/iview/IStepView.kt

@@ -1,6 +0,0 @@
-package com.grkj.iscs.view.iview
-
-import com.grkj.iscs.view.base.IView
-
-interface IStepView : IView {
-}

app/src/main/java/com/grkj/iscs/view/iview/ISwitchStatusView.kt

@@ -1,6 +0,0 @@
-package com.grkj.iscs.view.iview
-
-import com.grkj.iscs.view.base.IView
-
-interface ISwitchStatusView:IView {
-}

app/src/main/java/com/grkj/iscs/view/iview/ISystemSettingView.kt

@@ -1,6 +0,0 @@
-package com.grkj.iscs.view.iview
-
-import com.grkj.iscs.view.base.IView
-
-interface ISystemSettingView : IView {
-}

app/src/main/java/com/grkj/iscs/view/iview/ITechnologySopView.kt

@@ -1,6 +0,0 @@
-package com.grkj.iscs.view.iview
-
-import com.grkj.iscs.view.base.IView
-
-interface ITechnologySopView : IView {
-}

app/src/main/java/com/grkj/iscs/view/iview/ITicketDetailView.kt

@@ -1,5 +0,0 @@
-package com.grkj.iscs.view.iview
-
-import com.grkj.iscs.view.base.IView
-
-interface ITicketDetailView : IView {}

app/src/main/java/com/grkj/iscs/view/iview/IWorkerView.kt

@@ -1,6 +0,0 @@
-package com.grkj.iscs.view.iview
-
-import com.grkj.iscs.view.base.IView
-
-interface IWorkerView : IView {
-}

app/src/main/java/com/grkj/iscs/view/iview/IWorkshopView.kt

@@ -1,6 +0,0 @@
-package com.grkj.iscs.view.iview
-
-import com.grkj.iscs.view.base.IView
-
-interface IWorkshopView : IView {
-}

app/src/main/java/com/grkj/iscs/view/presenter/DeviceRegistrationHomePresenter.kt

@@ -1,7 +0,0 @@
-package com.grkj.iscs.view.presenter
-
-import com.grkj.iscs.view.base.BasePresenter
-import com.grkj.iscs.view.iview.IDeviceRegistrationHomeView
-
-class DeviceRegistrationHomePresenter : BasePresenter<IDeviceRegistrationHomeView>() {
-}

app/src/main/java/com/grkj/iscs/view/presenter/JobExecutionPresenter.kt

@@ -1,7 +0,0 @@
-package com.grkj.iscs.view.presenter
-
-import com.grkj.iscs.view.base.BasePresenter
-import com.grkj.iscs.view.iview.IJobExecutionView
-
-class JobExecutionPresenter : BasePresenter<IJobExecutionView>() {
-}

app/src/main/java/com/grkj/iscs/view/presenter/JobManagementPresenter.kt

@@ -1,7 +0,0 @@
-package com.grkj.iscs.view.presenter
-
-import com.grkj.iscs.view.base.BasePresenter
-import com.grkj.iscs.view.iview.IJobManagementView
-
-class JobManagementPresenter : BasePresenter<IJobManagementView>() {
-}

app/src/main/java/com/grkj/iscs/view/presenter/ModBusPresenter.kt

@@ -1,8 +0,0 @@
-package com.grkj.iscs.view.presenter
-
-import com.grkj.iscs.view.base.BasePresenter
-import com.grkj.iscs.view.iview.IModbusView
-
-class ModBusPresenter: BasePresenter<IModbusView>() {
-
-}

app/src/main/java/com/grkj/iscs/BusinessManager.kt → app/src/main/java/com/grkj/iscs_mars/BusinessManager.kt

@@ -1,4 +1,4 @@
-package com.grkj.iscs
+package com.grkj.iscs_mars
 //todo 所有蓝牙包替换com.clj. -> com.clj.
 import android.content.Context
 import android.content.Intent
@@ -8,71 +8,71 @@ import com.clj.fastble.BleManager
 import com.clj.fastble.data.BleDevice
 import com.clj.fastble.exception.BleException
 import com.google.gson.Gson
-import com.grkj.iscs.ble.BleBean
-import com.grkj.iscs.ble.BleCmdManager
-import com.grkj.iscs.ble.BleConnectionManager
-import com.grkj.iscs.ble.BleConst
-import com.grkj.iscs.ble.BleConst.STATUS_READY
-import com.grkj.iscs.ble.BleConst.STATUS_WORK
-import com.grkj.iscs.ble.BleUtil
-import com.grkj.iscs.ble.CustomBleWriteCallback
-import com.grkj.iscs.extentions.removeLeadingZeros
-import com.grkj.iscs.extentions.serialNo
-import com.grkj.iscs.extentions.startsWith
-import com.grkj.iscs.extentions.toHexStrings
-import com.grkj.iscs.modbus.DockBean
-import com.grkj.iscs.modbus.ModBusController
-import com.grkj.iscs.modbus.ModBusController.dockList
-import com.grkj.iscs.modbus.ModBusController.getOneKey
-import com.grkj.iscs.model.Constants.USER_TYPE_LOCKER
-import com.grkj.iscs.model.DeviceConst.DEVICE_TYPE_CARD
-import com.grkj.iscs.model.DeviceConst.DEVICE_TYPE_FINGERPRINT
-import com.grkj.iscs.model.DeviceConst.DEVICE_TYPE_KEY
-import com.grkj.iscs.model.DeviceConst.DEVICE_TYPE_LOCK
-import com.grkj.iscs.model.DeviceConst.DOCK_TYPE_ELEC_LOCK_BOARD
-import com.grkj.iscs.model.DeviceConst.DOCK_TYPE_KEY
-import com.grkj.iscs.model.DeviceConst.DOCK_TYPE_LOCK
-import com.grkj.iscs.model.DeviceConst.DOCK_TYPE_PORTABLE
-import com.grkj.iscs.model.DictAndSystemConstants
-import com.grkj.iscs.model.ISCSDomainData
-import com.grkj.iscs.model.bo.DeviceTakeUpdateBO
-import com.grkj.iscs.model.bo.UpdateKeyReturnBO
-import com.grkj.iscs.model.bo.WorkTicketGetBO
-import com.grkj.iscs.model.bo.WorkTicketSendBO
-import com.grkj.iscs.model.bo.WorkTicketSendBO.LockListBO
-import com.grkj.iscs.model.eventmsg.CurrentModeMsg
-import com.grkj.iscs.model.eventmsg.DeviceExceptionMsg
-import com.grkj.iscs.model.eventmsg.DeviceTakeUpdateMsg
-import com.grkj.iscs.model.eventmsg.LoadingMsg
-import com.grkj.iscs.model.eventmsg.MsgEvent
-import com.grkj.iscs.model.eventmsg.MsgEventConstants
-import com.grkj.iscs.model.eventmsg.MsgEventConstants.MSG_EVENT_CURRENT_MODE
-import com.grkj.iscs.model.eventmsg.MsgEventConstants.MSG_EVENT_DEVICE_EXCEPTION
-import com.grkj.iscs.model.eventmsg.MsgEventConstants.MSG_EVENT_DEVICE_TAKE_UPDATE
-import com.grkj.iscs.model.eventmsg.MsgEventConstants.MSG_EVENT_LOADING
-import com.grkj.iscs.model.eventmsg.MsgEventConstants.MSG_EVENT_SWITCH_COLLECTION_UPDATE
-import com.grkj.iscs.model.eventmsg.MsgEventConstants.MSG_EVENT_SWITCH_MODE
-import com.grkj.iscs.model.eventmsg.MsgEventConstants.MSG_EVENT_UPDATE_TICKET_PROGRESS
-import com.grkj.iscs.model.eventmsg.SwitchModeMsg
-import com.grkj.iscs.model.eventmsg.UpdateTicketProgressMsg
-import com.grkj.iscs.model.vo.dict.CommonDictRespVO
-import com.grkj.iscs.model.vo.hardware.CabinetSlotsRespVo
-import com.grkj.iscs.model.vo.hardware.SwitchListReqVO
-import com.grkj.iscs.model.vo.key.KeyPageRespVO
-import com.grkj.iscs.model.vo.lock.LockPageRespVO
-import com.grkj.iscs.model.vo.lock.LockTakeUpdateReqVO
-import com.grkj.iscs.model.vo.ticket.LockPointUpdateReqVO
-import com.grkj.iscs.model.vo.ticket.TicketDetailRespVO
-import com.grkj.iscs.util.ActivityUtils
-import com.grkj.iscs.util.CommonUtils
-import com.grkj.iscs.util.Executor
-import com.grkj.iscs.util.NetApi
-import com.grkj.iscs.util.SPUtils
-import com.grkj.iscs.util.ToastUtils
-import com.grkj.iscs.util.log.LogUtil
-import com.grkj.iscs.view.activity.LoginActivity
-import com.grkj.iscs.view.base.BaseActivity
-import com.grkj.iscs.view.dialog.TipDialog
+import com.grkj.iscs_mars.ble.BleBean
+import com.grkj.iscs_mars.ble.BleCmdManager
+import com.grkj.iscs_mars.ble.BleConnectionManager
+import com.grkj.iscs_mars.ble.BleConst
+import com.grkj.iscs_mars.ble.BleConst.STATUS_READY
+import com.grkj.iscs_mars.ble.BleConst.STATUS_WORK
+import com.grkj.iscs_mars.ble.BleUtil
+import com.grkj.iscs_mars.ble.CustomBleWriteCallback
+import com.grkj.iscs_mars.extentions.removeLeadingZeros
+import com.grkj.iscs_mars.extentions.serialNo
+import com.grkj.iscs_mars.extentions.startsWith
+import com.grkj.iscs_mars.extentions.toHexStrings
+import com.grkj.iscs_mars.modbus.DockBean
+import com.grkj.iscs_mars.modbus.ModBusController
+import com.grkj.iscs_mars.modbus.ModBusController.dockList
+import com.grkj.iscs_mars.modbus.ModBusController.getOneKey
+import com.grkj.iscs_mars.model.Constants.USER_TYPE_LOCKER
+import com.grkj.iscs_mars.model.DeviceConst.DEVICE_TYPE_CARD
+import com.grkj.iscs_mars.model.DeviceConst.DEVICE_TYPE_FINGERPRINT
+import com.grkj.iscs_mars.model.DeviceConst.DEVICE_TYPE_KEY
+import com.grkj.iscs_mars.model.DeviceConst.DEVICE_TYPE_LOCK
+import com.grkj.iscs_mars.model.DeviceConst.DOCK_TYPE_ELEC_LOCK_BOARD
+import com.grkj.iscs_mars.model.DeviceConst.DOCK_TYPE_KEY
+import com.grkj.iscs_mars.model.DeviceConst.DOCK_TYPE_LOCK
+import com.grkj.iscs_mars.model.DeviceConst.DOCK_TYPE_PORTABLE
+import com.grkj.iscs_mars.model.DictAndSystemConstants
+import com.grkj.iscs_mars.model.ISCSDomainData
+import com.grkj.iscs_mars.model.bo.DeviceTakeUpdateBO
+import com.grkj.iscs_mars.model.bo.UpdateKeyReturnBO
+import com.grkj.iscs_mars.model.bo.WorkTicketGetBO
+import com.grkj.iscs_mars.model.bo.WorkTicketSendBO
+import com.grkj.iscs_mars.model.bo.WorkTicketSendBO.LockListBO
+import com.grkj.iscs_mars.model.eventmsg.CurrentModeMsg
+import com.grkj.iscs_mars.model.eventmsg.DeviceExceptionMsg
+import com.grkj.iscs_mars.model.eventmsg.DeviceTakeUpdateMsg
+import com.grkj.iscs_mars.model.eventmsg.LoadingMsg
+import com.grkj.iscs_mars.model.eventmsg.MsgEvent
+import com.grkj.iscs_mars.model.eventmsg.MsgEventConstants
+import com.grkj.iscs_mars.model.eventmsg.MsgEventConstants.MSG_EVENT_CURRENT_MODE
+import com.grkj.iscs_mars.model.eventmsg.MsgEventConstants.MSG_EVENT_DEVICE_EXCEPTION
+import com.grkj.iscs_mars.model.eventmsg.MsgEventConstants.MSG_EVENT_DEVICE_TAKE_UPDATE
+import com.grkj.iscs_mars.model.eventmsg.MsgEventConstants.MSG_EVENT_LOADING
+import com.grkj.iscs_mars.model.eventmsg.MsgEventConstants.MSG_EVENT_SWITCH_COLLECTION_UPDATE
+import com.grkj.iscs_mars.model.eventmsg.MsgEventConstants.MSG_EVENT_SWITCH_MODE
+import com.grkj.iscs_mars.model.eventmsg.MsgEventConstants.MSG_EVENT_UPDATE_TICKET_PROGRESS
+import com.grkj.iscs_mars.model.eventmsg.SwitchModeMsg
+import com.grkj.iscs_mars.model.eventmsg.UpdateTicketProgressMsg
+import com.grkj.iscs_mars.model.vo.dict.CommonDictRespVO
+import com.grkj.iscs_mars.model.vo.hardware.CabinetSlotsRespVo
+import com.grkj.iscs_mars.model.vo.hardware.SwitchListReqVO
+import com.grkj.iscs_mars.model.vo.key.KeyPageRespVO
+import com.grkj.iscs_mars.model.vo.lock.LockPageRespVO
+import com.grkj.iscs_mars.model.vo.lock.LockTakeUpdateReqVO
+import com.grkj.iscs_mars.model.vo.ticket.LockPointUpdateReqVO
+import com.grkj.iscs_mars.model.vo.ticket.TicketDetailRespVO
+import com.grkj.iscs_mars.util.ActivityUtils
+import com.grkj.iscs_mars.util.CommonUtils
+import com.grkj.iscs_mars.util.Executor
+import com.grkj.iscs_mars.util.NetApi
+import com.grkj.iscs_mars.util.SPUtils
+import com.grkj.iscs_mars.util.ToastUtils
+import com.grkj.iscs_mars.util.log.LogUtil
+import com.grkj.iscs_mars.view.activity.LoginActivity
+import com.grkj.iscs_mars.view.base.BaseActivity
+import com.grkj.iscs_mars.view.dialog.TipDialog
 import com.sik.sikcore.SIKCore
 import com.sik.sikcore.date.TimeUtils
 import com.sik.sikcore.thread.ThreadUtils

app/src/main/java/com/grkj/iscs/MyApplication.kt → app/src/main/java/com/grkj/iscs_mars/MyApplication.kt

@@ -1,20 +1,20 @@
-package com.grkj.iscs
+package com.grkj.iscs_mars
 
 import android.app.Application
 import android.content.Context
 import androidx.multidex.MultiDex
-import com.grkj.iscs.ble.BleUtil
-import com.grkj.iscs.extentions.serialNo
-import com.grkj.iscs.model.Token
-import com.grkj.iscs.util.ArcSoftUtil
-import com.grkj.iscs.util.Executor
-import com.grkj.iscs.util.FileUtil
-import com.grkj.iscs.util.FileUtil.LOG_DIR
-import com.grkj.iscs.util.MyCrashHandler
-import com.grkj.iscs.util.NetApi
-import com.grkj.iscs.util.NetHttpManager
-import com.grkj.iscs.util.SPUtils
-import com.grkj.iscs.util.log.LogUtil
+import com.grkj.iscs_mars.ble.BleUtil
+import com.grkj.iscs_mars.extentions.serialNo
+import com.grkj.iscs_mars.model.Token
+import com.grkj.iscs_mars.util.ArcSoftUtil
+import com.grkj.iscs_mars.util.Executor
+import com.grkj.iscs_mars.util.FileUtil
+import com.grkj.iscs_mars.util.FileUtil.LOG_DIR
+import com.grkj.iscs_mars.util.MyCrashHandler
+import com.grkj.iscs_mars.util.NetApi
+import com.grkj.iscs_mars.util.NetHttpManager
+import com.grkj.iscs_mars.util.SPUtils
+import com.grkj.iscs_mars.util.log.LogUtil
 import com.sik.sikcore.SIKCore
 
 class MyApplication : Application() {

app/src/main/java/com/grkj/iscs/ble/BleBean.kt → app/src/main/java/com/grkj/iscs_mars/ble/BleBean.kt

@@ -1,4 +1,4 @@
-package com.grkj.iscs.ble
+package com.grkj.iscs_mars.ble
 
 import com.clj.fastble.data.BleDevice
 import java.io.File

app/src/main/java/com/grkj/iscs/ble/BleCmdManager.kt → app/src/main/java/com/grkj/iscs_mars/ble/BleCmdManager.kt

@@ -1,27 +1,27 @@
-package com.grkj.iscs.ble
+package com.grkj.iscs_mars.ble
 
 import com.clj.fastble.data.BleDevice
 import com.clj.fastble.exception.BleException
-import com.grkj.iscs.BusinessManager
-import com.grkj.iscs.ble.BleConst.REQ_CURRENT_STATUS
-import com.grkj.iscs.ble.BleConst.REQ_GET_TOKEN
-import com.grkj.iscs.ble.BleConst.REQ_GET_VERSION
-import com.grkj.iscs.ble.BleConst.REQ_POWER_STATUS
-import com.grkj.iscs.ble.BleConst.REQ_SEND_WORK_TICKET
-import com.grkj.iscs.ble.BleConst.REQ_SWITCH_MODE
-import com.grkj.iscs.ble.BleConst.REQ_TRANSFER_FILE
-import com.grkj.iscs.ble.BleConst.REQ_WORK_TICKET_RESULT
-import com.grkj.iscs.ble.BleConst.REQ_WORK_TICKET_RESULT_PART
-import com.grkj.iscs.ble.BleConst.WRITE_UUID
-import com.grkj.iscs.extentions.crc16
-import com.grkj.iscs.extentions.startsWith
-import com.grkj.iscs.extentions.toByteArray
-import com.grkj.iscs.extentions.toHexStrings
-import com.grkj.iscs.model.eventmsg.GetTicketStatusMsg
-import com.grkj.iscs.model.eventmsg.MsgEvent
-import com.grkj.iscs.model.eventmsg.MsgEventConstants.MSG_EVENT_GET_TICKET_STATUS
-import com.grkj.iscs.util.Executor
-import com.grkj.iscs.util.log.LogUtil
+import com.grkj.iscs_mars.BusinessManager
+import com.grkj.iscs_mars.ble.BleConst.REQ_CURRENT_STATUS
+import com.grkj.iscs_mars.ble.BleConst.REQ_GET_TOKEN
+import com.grkj.iscs_mars.ble.BleConst.REQ_GET_VERSION
+import com.grkj.iscs_mars.ble.BleConst.REQ_POWER_STATUS
+import com.grkj.iscs_mars.ble.BleConst.REQ_SEND_WORK_TICKET
+import com.grkj.iscs_mars.ble.BleConst.REQ_SWITCH_MODE
+import com.grkj.iscs_mars.ble.BleConst.REQ_TRANSFER_FILE
+import com.grkj.iscs_mars.ble.BleConst.REQ_WORK_TICKET_RESULT
+import com.grkj.iscs_mars.ble.BleConst.REQ_WORK_TICKET_RESULT_PART
+import com.grkj.iscs_mars.ble.BleConst.WRITE_UUID
+import com.grkj.iscs_mars.extentions.crc16
+import com.grkj.iscs_mars.extentions.startsWith
+import com.grkj.iscs_mars.extentions.toByteArray
+import com.grkj.iscs_mars.extentions.toHexStrings
+import com.grkj.iscs_mars.model.eventmsg.GetTicketStatusMsg
+import com.grkj.iscs_mars.model.eventmsg.MsgEvent
+import com.grkj.iscs_mars.model.eventmsg.MsgEventConstants.MSG_EVENT_GET_TICKET_STATUS
+import com.grkj.iscs_mars.util.Executor
+import com.grkj.iscs_mars.util.log.LogUtil
 import java.io.File
 
 /**

app/src/main/java/com/grkj/iscs/ble/BleConnectionManager.kt → app/src/main/java/com/grkj/iscs_mars/ble/BleConnectionManager.kt

@@ -1,30 +1,30 @@
-package com.grkj.iscs.ble
+package com.grkj.iscs_mars.ble
 
 import android.bluetooth.BluetoothGatt
 import androidx.appcompat.app.AppCompatActivity
 import com.clj.fastble.BleManager
 import com.clj.fastble.data.BleDevice
 import com.clj.fastble.exception.BleException
-import com.grkj.iscs.BusinessManager
-import com.grkj.iscs.BusinessManager.deviceList
-import com.grkj.iscs.BusinessManager.getBleDeviceByMac
-import com.grkj.iscs.BusinessManager.isTestMode
-import com.grkj.iscs.BusinessManager.removeExceptionKey
-import com.grkj.iscs.BusinessManager.sendEventMsg
-import com.grkj.iscs.BusinessManager.sendLoadingEventMsg
-import com.grkj.iscs.R
-import com.grkj.iscs.extentions.toHexStrings
-import com.grkj.iscs.modbus.ModBusController
-import com.grkj.iscs.modbus.ModBusController.controlKeyCharge
-import com.grkj.iscs.model.Constants.PERMISSION_REQUEST_CODE
-import com.grkj.iscs.model.eventmsg.LoadingMsg
-import com.grkj.iscs.model.eventmsg.MsgEvent
-import com.grkj.iscs.model.eventmsg.MsgEventConstants.MSG_EVENT_LOADING
-import com.grkj.iscs.util.ActivityUtils
-import com.grkj.iscs.util.CommonUtils
-import com.grkj.iscs.util.Executor
-import com.grkj.iscs.util.log.LogUtil
-import com.grkj.iscs.view.base.BaseActivity
+import com.grkj.iscs_mars.BusinessManager
+import com.grkj.iscs_mars.BusinessManager.deviceList
+import com.grkj.iscs_mars.BusinessManager.getBleDeviceByMac
+import com.grkj.iscs_mars.BusinessManager.isTestMode
+import com.grkj.iscs_mars.BusinessManager.removeExceptionKey
+import com.grkj.iscs_mars.BusinessManager.sendEventMsg
+import com.grkj.iscs_mars.BusinessManager.sendLoadingEventMsg
+import com.grkj.iscs_mars.R
+import com.grkj.iscs_mars.extentions.toHexStrings
+import com.grkj.iscs_mars.modbus.ModBusController
+import com.grkj.iscs_mars.modbus.ModBusController.controlKeyCharge
+import com.grkj.iscs_mars.model.Constants.PERMISSION_REQUEST_CODE
+import com.grkj.iscs_mars.model.eventmsg.LoadingMsg
+import com.grkj.iscs_mars.model.eventmsg.MsgEvent
+import com.grkj.iscs_mars.model.eventmsg.MsgEventConstants.MSG_EVENT_LOADING
+import com.grkj.iscs_mars.util.ActivityUtils
+import com.grkj.iscs_mars.util.CommonUtils
+import com.grkj.iscs_mars.util.Executor
+import com.grkj.iscs_mars.util.log.LogUtil
+import com.grkj.iscs_mars.view.base.BaseActivity
 import com.sik.sikcore.activity.ActivityTracker
 import com.sik.sikcore.thread.ThreadUtils
 import kotlinx.coroutines.Dispatchers

app/src/main/java/com/grkj/iscs/ble/BleConst.kt → app/src/main/java/com/grkj/iscs_mars/ble/BleConst.kt

@@ -1,4 +1,4 @@
-package com.grkj.iscs.ble
+package com.grkj.iscs_mars.ble
 
 /**
  * 指令，均为未加密或解密后的

app/src/main/java/com/grkj/iscs/ble/BleUtil.kt → app/src/main/java/com/grkj/iscs_mars/ble/BleUtil.kt

@@ -1,4 +1,4 @@
-package com.grkj.iscs.ble
+package com.grkj.iscs_mars.ble
 
 import android.app.Application
 import android.bluetooth.BluetoothGatt
@@ -10,12 +10,12 @@ import com.clj.fastble.callback.BleMtuChangedCallback
 import com.clj.fastble.data.BleDevice
 import com.clj.fastble.exception.BleException
 import com.clj.fastble.scan.BleScanRuleConfig
-import com.grkj.iscs.model.Constants.BLE_LOCAL_NAME
-import com.grkj.iscs.ble.BleConst.INDICATE_UUID
-import com.grkj.iscs.ble.BleConst.MTU
-import com.grkj.iscs.ble.BleConst.SERVICE_UUID
-import com.grkj.iscs.extentions.toHexStrings
-import com.grkj.iscs.util.log.LogUtil
+import com.grkj.iscs_mars.model.Constants.BLE_LOCAL_NAME
+import com.grkj.iscs_mars.ble.BleConst.INDICATE_UUID
+import com.grkj.iscs_mars.ble.BleConst.MTU
+import com.grkj.iscs_mars.ble.BleConst.SERVICE_UUID
+import com.grkj.iscs_mars.extentions.toHexStrings
+import com.grkj.iscs_mars.util.log.LogUtil
 
 /**
  * 蓝牙工具类

app/src/main/java/com/grkj/iscs/ble/CustomBleGattCallback.kt → app/src/main/java/com/grkj/iscs_mars/ble/CustomBleGattCallback.kt

@@ -1,4 +1,4 @@
-package com.grkj.iscs.ble
+package com.grkj.iscs_mars.ble
 
 import com.clj.fastble.callback.BleGattCallback
 

app/src/main/java/com/grkj/iscs/ble/CustomBleIndicateCallback.kt → app/src/main/java/com/grkj/iscs_mars/ble/CustomBleIndicateCallback.kt

@@ -1,4 +1,4 @@
-package com.grkj.iscs.ble
+package com.grkj.iscs_mars.ble
 
 import com.clj.fastble.callback.BleIndicateCallback
 

app/src/main/java/com/grkj/iscs/ble/CustomBleScanCallback.kt → app/src/main/java/com/grkj/iscs_mars/ble/CustomBleScanCallback.kt

@@ -1,4 +1,4 @@
-package com.grkj.iscs.ble
+package com.grkj.iscs_mars.ble
 
 import com.clj.fastble.callback.BleScanCallback
 

app/src/main/java/com/grkj/iscs/ble/CustomBleWriteCallback.kt → app/src/main/java/com/grkj/iscs_mars/ble/CustomBleWriteCallback.kt

@@ -1,4 +1,4 @@
-package com.grkj.iscs.ble
+package com.grkj.iscs_mars.ble
 
 import com.clj.fastble.callback.BleWriteCallback
 

app/src/main/java/com/grkj/iscs/ble/KeyGenerator.java → app/src/main/java/com/grkj/iscs_mars/ble/KeyGenerator.java

@@ -1,4 +1,4 @@
-package com.grkj.iscs.ble;
+package com.grkj.iscs_mars.ble;
 
 /**
  * 蓝牙 章节 4.1

app/src/main/java/com/grkj/iscs/enums/DeviceInputTypeEnum.kt → app/src/main/java/com/grkj/iscs_mars/enums/DeviceInputTypeEnum.kt

@@ -1,4 +1,4 @@
-package com.grkj.iscs.enums
+package com.grkj.iscs_mars.enums
 
 /**
  * 设备录入类型

app/src/main/java/com/grkj/iscs/extentions/ByteArray.kt → app/src/main/java/com/grkj/iscs_mars/extentions/ByteArray.kt

@@ -1,7 +1,7 @@
-package com.grkj.iscs.extentions
+package com.grkj.iscs_mars.extentions
 
 import android.util.Base64
-import com.grkj.iscs.util.CRC16
+import com.grkj.iscs_mars.util.CRC16
 import java.io.ByteArrayOutputStream
 import kotlin.experimental.xor
 

app/src/main/java/com/grkj/iscs/extentions/Context.kt → app/src/main/java/com/grkj/iscs_mars/extentions/Context.kt

@@ -1,16 +1,14 @@
-package com.grkj.iscs.extentions
+package com.grkj.iscs_mars.extentions
 
 import android.Manifest
 import android.annotation.SuppressLint
 import android.content.Context
 import android.content.pm.PackageManager
 import android.os.Build
-import androidx.annotation.RequiresPermission
 import androidx.core.app.ActivityCompat
 import androidx.core.content.ContextCompat
 import androidx.lifecycle.Observer
-import com.grkj.iscs.util.NetManager
-import com.sik.sikcore.device.DeviceUtils
+import com.grkj.iscs_mars.util.NetManager
 import java.util.Locale
 
 /**

app/src/main/java/com/grkj/iscs/extentions/Int.kt → app/src/main/java/com/grkj/iscs_mars/extentions/Int.kt

@@ -1,4 +1,4 @@
-package com.grkj.iscs.extentions
+package com.grkj.iscs_mars.extentions
 
 //fun Int.toByteArray(capability: Int = 2): ByteArray {
 //    return ByteBuffer.allocate(capability)

app/src/main/java/com/grkj/iscs/extentions/Long.kt → app/src/main/java/com/grkj/iscs_mars/extentions/Long.kt

@@ -1,4 +1,4 @@
-package com.grkj.iscs.extentions
+package com.grkj.iscs_mars.extentions
 
 import java.nio.ByteBuffer
 import java.nio.ByteOrder

app/src/main/java/com/grkj/iscs/extentions/Rect.kt → app/src/main/java/com/grkj/iscs_mars/extentions/Rect.kt

@@ -1,4 +1,4 @@
-package com.grkj.iscs.extentions
+package com.grkj.iscs_mars.extentions
 
 import android.graphics.Rect
 

app/src/main/java/com/grkj/iscs/extentions/String.kt → app/src/main/java/com/grkj/iscs_mars/extentions/String.kt

@@ -1,4 +1,4 @@
-package com.grkj.iscs.extentions
+package com.grkj.iscs_mars.extentions
 
 /**
  * 长度不足默认补0

app/src/main/java/com/grkj/iscs/extentions/View.kt → app/src/main/java/com/grkj/iscs_mars/extentions/View.kt

@@ -1,4 +1,4 @@
-package com.grkj.iscs.extentions
+package com.grkj.iscs_mars.extentions
 
 import android.view.View
 

app/src/main/java/com/grkj/iscs/extentions/ViewHolder.kt → app/src/main/java/com/grkj/iscs_mars/extentions/ViewHolder.kt

@@ -1,4 +1,4 @@
-package com.grkj.iscs.extentions
+package com.grkj.iscs_mars.extentions
 
 import android.view.View
 import com.zhy.adapter.recyclerview.base.ViewHolder

app/src/main/java/com/grkj/iscs/modbus/DockBean.kt → app/src/main/java/com/grkj/iscs_mars/modbus/DockBean.kt

@@ -1,24 +1,24 @@
-package com.grkj.iscs.modbus
+package com.grkj.iscs_mars.modbus
 
 import com.google.gson.Gson
 import com.google.gson.reflect.TypeToken
-import com.grkj.iscs.BusinessManager
-import com.grkj.iscs.MyApplication
-import com.grkj.iscs.model.DeviceConst.DEVICE_TYPE_CARD
-import com.grkj.iscs.model.DeviceConst.DEVICE_TYPE_FINGERPRINT
-import com.grkj.iscs.model.DeviceConst.DEVICE_TYPE_KEY
-import com.grkj.iscs.model.DeviceConst.DEVICE_TYPE_LOCK
-import com.grkj.iscs.model.DeviceConst.DEVICE_TYPE_SWITCH
-import com.grkj.iscs.model.DeviceConst.DOCK_TYPE_COLLECT
-import com.grkj.iscs.model.DeviceConst.DOCK_TYPE_ELEC_LOCK_BOARD
-import com.grkj.iscs.model.DeviceConst.DOCK_TYPE_KEY
-import com.grkj.iscs.model.DeviceConst.DOCK_TYPE_LOCK
-import com.grkj.iscs.model.DeviceConst.DOCK_TYPE_PORTABLE
-import com.grkj.iscs.model.eventmsg.MsgEvent
-import com.grkj.iscs.model.eventmsg.MsgEventConstants.MSG_EVENT_SWITCH_COLLECTION_UPDATE
-import com.grkj.iscs.util.SPUtils
-import com.grkj.iscs.util.log.LogUtil
-import com.grkj.iscs.view.fragment.DockTestFragment
+import com.grkj.iscs_mars.BusinessManager
+import com.grkj.iscs_mars.MyApplication
+import com.grkj.iscs_mars.model.DeviceConst.DEVICE_TYPE_CARD
+import com.grkj.iscs_mars.model.DeviceConst.DEVICE_TYPE_FINGERPRINT
+import com.grkj.iscs_mars.model.DeviceConst.DEVICE_TYPE_KEY
+import com.grkj.iscs_mars.model.DeviceConst.DEVICE_TYPE_LOCK
+import com.grkj.iscs_mars.model.DeviceConst.DEVICE_TYPE_SWITCH
+import com.grkj.iscs_mars.model.DeviceConst.DOCK_TYPE_COLLECT
+import com.grkj.iscs_mars.model.DeviceConst.DOCK_TYPE_ELEC_LOCK_BOARD
+import com.grkj.iscs_mars.model.DeviceConst.DOCK_TYPE_KEY
+import com.grkj.iscs_mars.model.DeviceConst.DOCK_TYPE_LOCK
+import com.grkj.iscs_mars.model.DeviceConst.DOCK_TYPE_PORTABLE
+import com.grkj.iscs_mars.model.eventmsg.MsgEvent
+import com.grkj.iscs_mars.model.eventmsg.MsgEventConstants.MSG_EVENT_SWITCH_COLLECTION_UPDATE
+import com.grkj.iscs_mars.util.SPUtils
+import com.grkj.iscs_mars.util.log.LogUtil
+import com.grkj.iscs_mars.view.fragment.DockTestFragment
 import java.util.concurrent.atomic.AtomicInteger
 
 /**

app/src/main/java/com/grkj/iscs/modbus/FrameTask.kt → app/src/main/java/com/grkj/iscs_mars/modbus/FrameTask.kt

@@ -1,6 +1,6 @@
-package com.grkj.iscs.modbus
+package com.grkj.iscs_mars.modbus
 
-import com.grkj.iscs.extentions.crc16
+import com.grkj.iscs_mars.extentions.crc16
 
 class FrameTask(
     val req: ByteArray,

app/src/main/java/com/grkj/iscs/modbus/MBFrame.kt → app/src/main/java/com/grkj/iscs_mars/modbus/MBFrame.kt

@@ -1,6 +1,6 @@
-package com.grkj.iscs.modbus
+package com.grkj.iscs_mars.modbus
 
-import com.grkj.iscs.extentions.crc16
+import com.grkj.iscs_mars.extentions.crc16
 
 /**
  * ModBus 数据帧

app/src/main/java/com/grkj/iscs/modbus/ModBusCMDHelper.kt → app/src/main/java/com/grkj/iscs_mars/modbus/ModBusCMDHelper.kt

@@ -1,6 +1,6 @@
-package com.grkj.iscs.modbus
+package com.grkj.iscs_mars.modbus
 
-import com.grkj.iscs.model.DeviceConst
+import com.grkj.iscs_mars.model.DeviceConst
 
 /**
  * 通信指令帮助工具

app/src/main/java/com/grkj/iscs/modbus/ModBusConstants.kt → app/src/main/java/com/grkj/iscs_mars/modbus/ModBusConstants.kt

@@ -1,4 +1,4 @@
-package com.grkj.iscs.modbus
+package com.grkj.iscs_mars.modbus
 
 /**
  * modbus 最小发送间隔（150豪秒）

app/src/main/java/com/grkj/iscs/modbus/ModBusController.kt → app/src/main/java/com/grkj/iscs_mars/modbus/ModBusController.kt

@@ -1,28 +1,28 @@
-package com.grkj.iscs.modbus
+package com.grkj.iscs_mars.modbus
 
 import android.content.Context
 import com.clj.fastble.BleManager
-import com.grkj.iscs.BusinessManager
-import com.grkj.iscs.BusinessManager.CAN_RETURN
-import com.grkj.iscs.R
-import com.grkj.iscs.ble.BleConnectionManager
-import com.grkj.iscs.extentions.removeLeadingZeros
-import com.grkj.iscs.extentions.toHexStrings
-import com.grkj.iscs.model.DeviceConst.DEVICE_TYPE_CARD
-import com.grkj.iscs.model.DeviceConst.DEVICE_TYPE_FINGERPRINT
-import com.grkj.iscs.model.DeviceConst.DEVICE_TYPE_KEY
-import com.grkj.iscs.model.DeviceConst.DEVICE_TYPE_LOCK
-import com.grkj.iscs.model.DeviceConst.DOCK_TYPE_COLLECT
-import com.grkj.iscs.model.DeviceConst.DOCK_TYPE_ELEC_LOCK_BOARD
-import com.grkj.iscs.model.DeviceConst.DOCK_TYPE_KEY
-import com.grkj.iscs.model.DeviceConst.DOCK_TYPE_LOCK
-import com.grkj.iscs.model.DeviceConst.DOCK_TYPE_PORTABLE
-import com.grkj.iscs.model.vo.hardware.CabinetSlotsRecord
-import com.grkj.iscs.util.CommonUtils
-import com.grkj.iscs.util.Executor
-import com.grkj.iscs.util.NetApi
-import com.grkj.iscs.util.ToastUtils
-import com.grkj.iscs.util.log.LogUtil
+import com.grkj.iscs_mars.BusinessManager
+import com.grkj.iscs_mars.BusinessManager.CAN_RETURN
+import com.grkj.iscs_mars.R
+import com.grkj.iscs_mars.ble.BleConnectionManager
+import com.grkj.iscs_mars.extentions.removeLeadingZeros
+import com.grkj.iscs_mars.extentions.toHexStrings
+import com.grkj.iscs_mars.model.DeviceConst.DEVICE_TYPE_CARD
+import com.grkj.iscs_mars.model.DeviceConst.DEVICE_TYPE_FINGERPRINT
+import com.grkj.iscs_mars.model.DeviceConst.DEVICE_TYPE_KEY
+import com.grkj.iscs_mars.model.DeviceConst.DEVICE_TYPE_LOCK
+import com.grkj.iscs_mars.model.DeviceConst.DOCK_TYPE_COLLECT
+import com.grkj.iscs_mars.model.DeviceConst.DOCK_TYPE_ELEC_LOCK_BOARD
+import com.grkj.iscs_mars.model.DeviceConst.DOCK_TYPE_KEY
+import com.grkj.iscs_mars.model.DeviceConst.DOCK_TYPE_LOCK
+import com.grkj.iscs_mars.model.DeviceConst.DOCK_TYPE_PORTABLE
+import com.grkj.iscs_mars.model.vo.hardware.CabinetSlotsRecord
+import com.grkj.iscs_mars.util.CommonUtils
+import com.grkj.iscs_mars.util.Executor
+import com.grkj.iscs_mars.util.NetApi
+import com.grkj.iscs_mars.util.ToastUtils
+import com.grkj.iscs_mars.util.log.LogUtil
 import com.sik.sikcore.thread.ThreadUtils
 import java.util.concurrent.atomic.AtomicInteger
 import java.util.stream.Collectors

app/src/main/java/com/grkj/iscs/modbus/ModBusManager.kt → app/src/main/java/com/grkj/iscs_mars/modbus/ModBusManager.kt

@@ -1,18 +1,15 @@
-package com.grkj.iscs.modbus
+package com.grkj.iscs_mars.modbus
 
-import android.util.Log
 import com.google.gson.Gson
 import com.google.gson.reflect.TypeToken
-import com.grkj.iscs.MyApplication
-import com.grkj.iscs.extentions.crc16
-import com.grkj.iscs.extentions.toHexStrings
-import com.grkj.iscs.util.Executor
-import com.grkj.iscs.util.SPUtils
-import com.grkj.iscs.util.log.LogUtil
-import com.grkj.iscs.view.fragment.DockTestFragment
+import com.grkj.iscs_mars.MyApplication
+import com.grkj.iscs_mars.extentions.toHexStrings
+import com.grkj.iscs_mars.util.Executor
+import com.grkj.iscs_mars.util.SPUtils
+import com.grkj.iscs_mars.util.log.LogUtil
+import com.grkj.iscs_mars.view.fragment.DockTestFragment
 import kotlinx.coroutines.*
 import kotlinx.coroutines.channels.Channel
-import kotlin.random.Random
 
 /**
  * ModBus 协议管理器（协程版）

app/src/main/java/com/grkj/iscs/modbus/PortManager.kt → app/src/main/java/com/grkj/iscs_mars/modbus/PortManager.kt

@@ -1,13 +1,12 @@
-package com.grkj.iscs.modbus
+package com.grkj.iscs_mars.modbus
 
 import android.content.Context
 import androidx.annotation.WorkerThread
 import com.epton.sdk.SerialPort
-import com.google.android.datatransport.runtime.dagger.Reusable
-import com.grkj.iscs.util.Executor
-import com.grkj.iscs.util.SPUtils
-import com.grkj.iscs.util.ToastUtils
-import com.grkj.iscs.util.log.LogUtil
+import com.grkj.iscs_mars.util.Executor
+import com.grkj.iscs_mars.util.SPUtils
+import com.grkj.iscs_mars.util.ToastUtils
+import com.grkj.iscs_mars.util.log.LogUtil
 import java.io.File
 import java.io.IOException
 import java.io.InputStream

app/src/main/java/com/grkj/iscs/modbus/StatusListener.kt → app/src/main/java/com/grkj/iscs_mars/modbus/StatusListener.kt

@@ -1,4 +1,4 @@
-package com.grkj.iscs.modbus
+package com.grkj.iscs_mars.modbus
 
 /**
  * 状态监听器

app/src/main/java/com/grkj/iscs/model/Constants.kt → app/src/main/java/com/grkj/iscs_mars/model/Constants.kt

@@ -1,9 +1,9 @@
-package com.grkj.iscs.model
+package com.grkj.iscs_mars.model
 
 import android.content.Context
-import com.grkj.iscs.R
-import com.grkj.iscs.util.CommonUtils
-import com.grkj.iscs.util.SPUtils
+import com.grkj.iscs_mars.R
+import com.grkj.iscs_mars.util.CommonUtils
+import com.grkj.iscs_mars.util.SPUtils
 
 object Constants {
     const val DEVICE_TYPE = 1 // 1.机柜 2.物料柜 3.手提柜 4.混合柜

app/src/main/java/com/grkj/iscs/model/DeviceConst.kt → app/src/main/java/com/grkj/iscs_mars/model/DeviceConst.kt

@@ -1,4 +1,4 @@
-package com.grkj.iscs.model
+package com.grkj.iscs_mars.model
 
 object DeviceConst {
 

app/src/main/java/com/grkj/iscs/model/DictAndSystemConstants.kt → app/src/main/java/com/grkj/iscs_mars/model/DictAndSystemConstants.kt

@@ -1,4 +1,4 @@
-package com.grkj.iscs.model
+package com.grkj.iscs_mars.model
 
 /**
  * 字典参数

app/src/main/java/com/grkj/iscs/model/FileBean.kt → app/src/main/java/com/grkj/iscs_mars/model/FileBean.kt

@@ -1,3 +1,3 @@
-package com.grkj.iscs.model
+package com.grkj.iscs_mars.model
 
 data class FileBean(var fileName: String?, var pathStr: String, var isAssets: Boolean)

app/src/main/java/com/grkj/iscs/model/ISCSDomainData.kt → app/src/main/java/com/grkj/iscs_mars/model/ISCSDomainData.kt

@@ -1,6 +1,6 @@
-package com.grkj.iscs.model
+package com.grkj.iscs_mars.model
 
-import com.grkj.iscs.enums.DeviceInputTypeEnum
+import com.grkj.iscs_mars.enums.DeviceInputTypeEnum
 
 /**
  * 业务数据

app/src/main/java/com/grkj/iscs/model/Token.kt → app/src/main/java/com/grkj/iscs_mars/model/Token.kt

@@ -1,8 +1,7 @@
-package com.grkj.iscs.model
+package com.grkj.iscs_mars.model
 
 import android.content.Context
 import android.content.SharedPreferences
-import java.util.concurrent.TimeUnit
 
 class Token(
     val token: String,

app/src/main/java/com/grkj/iscs/model/UrlConsts.kt → app/src/main/java/com/grkj/iscs_mars/model/UrlConsts.kt

@@ -1,4 +1,4 @@
-package com.grkj.iscs.model
+package com.grkj.iscs_mars.model
 
 object UrlConsts {
     //    const val BASE_URL = "http://192.168.28.82:9190"  // 本地

app/src/main/java/com/grkj/iscs/model/bo/DeviceTakeUpdateBO.kt → app/src/main/java/com/grkj/iscs_mars/model/bo/DeviceTakeUpdateBO.kt

@@ -1,7 +1,7 @@
-package com.grkj.iscs.model.bo
+package com.grkj.iscs_mars.model.bo
 
 /**
- * @param deviceType {@link [com.grkj.iscs.model.bo.DeviceTakeUpdateBO]<class>#[deviceType]}
+ * @param deviceType {@link [com.grkj.iscs_mars.model.bo.DeviceTakeUpdateBO]<class>#[deviceType]}
  */
 data class DeviceTakeUpdateBO(
     val deviceType: Int,    // DeviceConst.DEVICE_TYPE_KEY or DeviceConst.DEVICE_TYPE_LOCK

app/src/main/java/com/grkj/iscs_mars/model/bo/DockStatusBO.kt

@@ -0,0 +1,8 @@
+package com.grkj.iscs_mars.model.bo
+
+import com.grkj.iscs_mars.view.fragment.DockTestFragment.DockTestBean
+
+data class DockStatusBO(
+    val row: Int,
+    val dockList: MutableList<DockTestBean>
+)

app/src/main/java/com/grkj/iscs/model/bo/LoginUserBO.kt → app/src/main/java/com/grkj/iscs_mars/model/bo/LoginUserBO.kt

@@ -1,4 +1,4 @@
-package com.grkj.iscs.model.bo
+package com.grkj.iscs_mars.model.bo
 
 data class LoginUserBO(
     val userId: Long?,

app/src/main/java/com/grkj/iscs/model/bo/PageChangeBO.kt → app/src/main/java/com/grkj/iscs_mars/model/bo/PageChangeBO.kt

@@ -1,4 +1,4 @@
-package com.grkj.iscs.model.bo
+package com.grkj.iscs_mars.model.bo
 
 data class PageChangeBO(
     val pageIdx: Int,   // -1为回首页，连续跳转，即车间岗位页

app/src/main/java/com/grkj/iscs/model/bo/UpdateKeyReturnBO.kt → app/src/main/java/com/grkj/iscs_mars/model/bo/UpdateKeyReturnBO.kt

@@ -1,4 +1,4 @@
-package com.grkj.iscs.model.bo
+package com.grkj.iscs_mars.model.bo
 
 data class UpdateKeyReturnBO(
     val ticketId: Long,

app/src/main/java/com/grkj/iscs/model/bo/WorkTicketGetBO.kt → app/src/main/java/com/grkj/iscs_mars/model/bo/WorkTicketGetBO.kt

@@ -1,10 +1,8 @@
-package com.grkj.iscs.model.bo
+package com.grkj.iscs_mars.model.bo
 
-import com.grkj.iscs.BusinessManager.CAN_RETURN
-import com.grkj.iscs.MyApplication
-import com.grkj.iscs.R
-import com.grkj.iscs.util.NetApi
-import com.grkj.iscs.util.log.LogUtil
+import com.grkj.iscs_mars.BusinessManager.CAN_RETURN
+import com.grkj.iscs_mars.util.NetApi
+import com.grkj.iscs_mars.util.log.LogUtil
 import kotlin.coroutines.resume
 import kotlin.coroutines.suspendCoroutine
 

app/src/main/java/com/grkj/iscs/model/bo/WorkTicketSendBO.kt → app/src/main/java/com/grkj/iscs_mars/model/bo/WorkTicketSendBO.kt

@@ -1,4 +1,4 @@
-package com.grkj.iscs.model.bo
+package com.grkj.iscs_mars.model.bo
 
 /**
  * 工作票下发BO

app/src/main/java/com/grkj/iscs_mars/model/eventmsg/CurrentModeMsg.kt

@@ -0,0 +1,8 @@
+package com.grkj.iscs_mars.model.eventmsg
+
+import com.grkj.iscs_mars.ble.BleBean
+
+data class CurrentModeMsg(
+    val bleBean: BleBean,
+    val mode: Byte
+)

app/src/main/java/com/grkj/iscs_mars/model/eventmsg/DeviceExceptionMsg.kt

@@ -0,0 +1,9 @@
+package com.grkj.iscs_mars.model.eventmsg
+
+/**
+ * @param type {@link [com.grkj.iscs_mars.model.DeviceConst]<class>#[deviceType]}
+ */
+data class DeviceExceptionMsg(
+    val type: Int,
+    val rfid: String
+)

app/src/main/java/com/grkj/iscs/model/eventmsg/DeviceTakeUpdateMsg.kt → app/src/main/java/com/grkj/iscs_mars/model/eventmsg/DeviceTakeUpdateMsg.kt

@@ -1,4 +1,4 @@
-package com.grkj.iscs.model.eventmsg
+package com.grkj.iscs_mars.model.eventmsg
 
 data class DeviceTakeUpdateMsg(
     val deviceType: Int,    // 0：钥匙 1：挂锁

app/src/main/java/com/grkj/iscs/model/eventmsg/GetTicketStatusMsg.kt → app/src/main/java/com/grkj/iscs_mars/model/eventmsg/GetTicketStatusMsg.kt

@@ -1,4 +1,4 @@
-package com.grkj.iscs.model.eventmsg
+package com.grkj.iscs_mars.model.eventmsg
 
 import com.clj.fastble.data.BleDevice
 

app/src/main/java/com/grkj/iscs/model/eventmsg/LoadingMsg.kt → app/src/main/java/com/grkj/iscs_mars/model/eventmsg/LoadingMsg.kt

@@ -1,4 +1,4 @@
-package com.grkj.iscs.model.eventmsg
+package com.grkj.iscs_mars.model.eventmsg
 
 data class LoadingMsg(
     val isShow: Boolean,                    // 是否显示loading

app/src/main/java/com/grkj/iscs/model/eventmsg/MsgEvent.kt → app/src/main/java/com/grkj/iscs_mars/model/eventmsg/MsgEvent.kt

@@ -1,4 +1,4 @@
-package com.grkj.iscs.model.eventmsg
+package com.grkj.iscs_mars.model.eventmsg
 
 data class MsgEvent(
     val code: Int,

app/src/main/java/com/grkj/iscs/model/eventmsg/MsgEventConstants.kt → app/src/main/java/com/grkj/iscs_mars/model/eventmsg/MsgEventConstants.kt

@@ -1,4 +1,4 @@
-package com.grkj.iscs.model.eventmsg
+package com.grkj.iscs_mars.model.eventmsg
 
 object MsgEventConstants {
 

app/src/main/java/com/grkj/iscs/model/eventmsg/SwitchModeMsg.kt → app/src/main/java/com/grkj/iscs_mars/model/eventmsg/SwitchModeMsg.kt

@@ -1,6 +1,6 @@
-package com.grkj.iscs.model.eventmsg
+package com.grkj.iscs_mars.model.eventmsg
 
-import com.grkj.iscs.ble.BleBean
+import com.grkj.iscs_mars.ble.BleBean
 
 /**
  * job : 0x01：工作模式 0x02：待机模式

app/src/main/java/com/grkj/iscs/model/eventmsg/UpdateTicketProgressMsg.kt → app/src/main/java/com/grkj/iscs_mars/model/eventmsg/UpdateTicketProgressMsg.kt

@@ -1,4 +1,4 @@
-package com.grkj.iscs.model.eventmsg
+package com.grkj.iscs_mars.model.eventmsg
 
 data class UpdateTicketProgressMsg(
     val ticketId: Long

app/src/main/java/com/grkj/iscs/model/presentation/WorkTicketBean.kt → app/src/main/java/com/grkj/iscs_mars/model/presentation/WorkTicketBean.kt

@@ -1,4 +1,4 @@
-package com.grkj.iscs.model.presentation
+package com.grkj.iscs_mars.model.presentation
 
 class WorkTicketBean {
     /**

app/src/main/java/com/grkj/iscs/model/presentation/WorkTicketStatusBean.kt → app/src/main/java/com/grkj/iscs_mars/model/presentation/WorkTicketStatusBean.kt

@@ -1,4 +1,4 @@
-package com.grkj.iscs.model.presentation
+package com.grkj.iscs_mars.model.presentation
 
 class WorkTicketStatusBean {
     /**

app/src/main/java/com/grkj/iscs/model/vo/BaseVO.kt → app/src/main/java/com/grkj/iscs_mars/model/vo/BaseVO.kt

@@ -1,4 +1,4 @@
-package com.grkj.iscs.model.vo
+package com.grkj.iscs_mars.model.vo
 
 open class BaseVO<T> {
     val code = 0

app/src/main/java/com/grkj/iscs/model/vo/FileStreamReqParam.kt → app/src/main/java/com/grkj/iscs_mars/model/vo/FileStreamReqParam.kt

@@ -1,4 +1,4 @@
-package com.grkj.iscs.model.vo
+package com.grkj.iscs_mars.model.vo
 
 data class FileStreamReqParam(
     val name: String,

app/src/main/java/com/grkj/iscs/model/vo/cabinet/LockCabinetPageRespVO.kt → app/src/main/java/com/grkj/iscs_mars/model/vo/cabinet/LockCabinetPageRespVO.kt

@@ -1,4 +1,4 @@
-package com.grkj.iscs.model.vo.cabinet
+package com.grkj.iscs_mars.model.vo.cabinet
 
 /**
  * 锁柜列表实体

app/src/main/java/com/grkj/iscs/model/vo/card/CardInfoRespVO.kt → app/src/main/java/com/grkj/iscs_mars/model/vo/card/CardInfoRespVO.kt

@@ -1,4 +1,4 @@
-package com.grkj.iscs.model.vo.card
+package com.grkj.iscs_mars.model.vo.card
 
 import java.io.Serializable
 

app/src/main/java/com/grkj/iscs/model/vo/characteristic/CharacteristicPageRespVO.kt → app/src/main/java/com/grkj/iscs_mars/model/vo/characteristic/CharacteristicPageRespVO.kt

@@ -1,4 +1,4 @@
-package com.grkj.iscs.model.vo.characteristic
+package com.grkj.iscs_mars.model.vo.characteristic
 
 data class CharacteristicPageRespVO(
     val countId: Any,

app/src/main/java/com/grkj/iscs/model/vo/dept/DeptListRespVO.kt → app/src/main/java/com/grkj/iscs_mars/model/vo/dept/DeptListRespVO.kt

@@ -1,4 +1,4 @@
-package com.grkj.iscs.model.vo.dept
+package com.grkj.iscs_mars.model.vo.dept
 
 data class DeptListRespVO(
     /** 部门ID */

app/src/main/java/com/grkj/iscs/model/vo/dict/CommonDictRespVO.kt → app/src/main/java/com/grkj/iscs_mars/model/vo/dict/CommonDictRespVO.kt

@@ -1,6 +1,6 @@
-package com.grkj.iscs.model.vo.dict
+package com.grkj.iscs_mars.model.vo.dict
 
-import com.grkj.iscs.model.vo.ticket.TicketTypeRespVO.Params
+import com.grkj.iscs_mars.model.vo.ticket.TicketTypeRespVO.Params
 
 data class CommonDictRespVO(
     val createBy: String?,

app/src/main/java/com/grkj/iscs/model/vo/finger/LoginCharacteristicRespVO.kt → app/src/main/java/com/grkj/iscs_mars/model/vo/finger/LoginCharacteristicRespVO.kt

@@ -1,4 +1,4 @@
-package com.grkj.iscs.model.vo.finger
+package com.grkj.iscs_mars.model.vo.finger
 
 data class LoginCharacteristicRespVO(
     val msg: String?,

app/src/main/java/com/grkj/iscs/model/vo/hardware/CabinetSlotsRespVo.kt → app/src/main/java/com/grkj/iscs_mars/model/vo/hardware/CabinetSlotsRespVo.kt

@@ -1,4 +1,4 @@
-package com.grkj.iscs.model.vo.hardware
+package com.grkj.iscs_mars.model.vo.hardware
 
 /**
  * 锁柜-仓位返回实体

app/src/main/java/com/grkj/iscs/model/vo/hardware/JobCardPageRespVO.kt → app/src/main/java/com/grkj/iscs_mars/model/vo/hardware/JobCardPageRespVO.kt

@@ -1,4 +1,4 @@
-package com.grkj.iscs.model.vo.hardware
+package com.grkj.iscs_mars.model.vo.hardware
 
 data class JobCardPageRespVO(
     val total: Int,

app/src/main/java/com/grkj/iscs/model/vo/hardware/RfidTokenPageRespVO.kt → app/src/main/java/com/grkj/iscs_mars/model/vo/hardware/RfidTokenPageRespVO.kt

@@ -1,4 +1,4 @@
-package com.grkj.iscs.model.vo.hardware
+package com.grkj.iscs_mars.model.vo.hardware
 
 data class RfidTokenPageRespVO(
     val total: Int,

app/src/main/java/com/grkj/iscs/model/vo/hardware/SwitchListReqVO.kt → app/src/main/java/com/grkj/iscs_mars/model/vo/hardware/SwitchListReqVO.kt

@@ -1,4 +1,4 @@
-package com.grkj.iscs.model.vo.hardware
+package com.grkj.iscs_mars.model.vo.hardware
 
 /**
  * 开关状态请求实体

app/src/main/java/com/grkj/iscs/model/vo/hardware/UpdateHardwareEsStatusReqVO.kt → app/src/main/java/com/grkj/iscs_mars/model/vo/hardware/UpdateHardwareEsStatusReqVO.kt

@@ -1,4 +1,4 @@
-package com.grkj.iscs.model.vo.hardware
+package com.grkj.iscs_mars.model.vo.hardware
 
 /**
  * 工卡异常数据

app/src/main/java/com/grkj/iscs/model/vo/key/KeyInfoRespVO.kt → app/src/main/java/com/grkj/iscs_mars/model/vo/key/KeyInfoRespVO.kt

@@ -1,4 +1,4 @@
-package com.grkj.iscs.model.vo.key
+package com.grkj.iscs_mars.model.vo.key
 
 data class KeyInfoRespVO(
     val keyId: Long?,

app/src/main/java/com/grkj/iscs/model/vo/key/KeyPageRespVO.kt → app/src/main/java/com/grkj/iscs_mars/model/vo/key/KeyPageRespVO.kt

@@ -1,4 +1,4 @@
-package com.grkj.iscs.model.vo.key
+package com.grkj.iscs_mars.model.vo.key
 
 data class KeyPageRespVO(
     val total: Int,

app/src/main/java/com/grkj/iscs/model/vo/lock/LockInfoRespVO.kt → app/src/main/java/com/grkj/iscs_mars/model/vo/lock/LockInfoRespVO.kt

@@ -1,4 +1,4 @@
-package com.grkj.iscs.model.vo.lock
+package com.grkj.iscs_mars.model.vo.lock
 
 data class LockInfoRespVO(
     val lockId: Long?,