Pārlūkot izejas kodu

refactor(更新) :
- 开机先关闭充电

周文健 5 mēneši atpakaļ
vecāks
revīzija
9641734e8c

+ 5 - 4
app/src/main/java/com/grkj/iscs/BusinessManager.kt

@@ -1225,10 +1225,11 @@ object BusinessManager {
                         MSG_EVENT_LOADING, LoadingMsg(true, "切换钥匙为工作模式", null)
                     )
                 )
-
-                Executor.delayOnIO(800) {
-                    //切换到工作模式
-                    switchWorkMode(bleBean.bleDevice, isNeedLoading)
+                ModBusController.controlKeyCharge(false, bleBean.bleDevice.mac) {
+                    Executor.delayOnIO(800) {
+                        //切换到工作模式
+                        switchWorkMode(bleBean.bleDevice, isNeedLoading)
+                    }
                 }
             } else {
                 sendLoadingEventMsg(null, false)

+ 7 - 1
app/src/main/java/com/grkj/iscs/modbus/ModBusController.kt

@@ -216,6 +216,10 @@ object ModBusController {
                             val rfid =
                                 res.copyOfRange(3, 11).toHexStrings(false).removeLeadingZeros()
                             LogUtil.i("初始化钥匙 RFID : $rfid")
+                            controlKeyCharge(false, key.isLeft, dockBean.addr) {
+                                LogUtil.i("关闭充电:${it.toHexStrings()}")
+                                LogUtil.i("关闭充电: $rfid")
+                            }
                             // 更新rfid
                             updateKeyRfid(dockBean.addr, isLeft, rfid)
                             // 蓝牙准备操作
@@ -253,7 +257,9 @@ object ModBusController {
                             false,
                             key.isLeft,
                             dockBean.addr
-                        )
+                        ) {
+                            LogUtil.i("关闭充电:${it.toHexStrings()}")
+                        }
                     }
                 }
             }

+ 9 - 0
app/src/main/java/com/grkj/iscs/view/fragment/DockTestFragment.kt

@@ -8,10 +8,12 @@ import com.grkj.iscs.databinding.FragmentDockTestBinding
 import com.grkj.iscs.extentions.removeLeadingZeros
 import com.grkj.iscs.extentions.toHexStrings
 import com.grkj.iscs.modbus.ModBusController
+import com.grkj.iscs.modbus.ModBusController.controlKeyCharge
 import com.grkj.iscs.model.DeviceConst.DOCK_TYPE_KEY
 import com.grkj.iscs.model.DeviceConst.DOCK_TYPE_LOCK
 import com.grkj.iscs.util.SPUtils
 import com.grkj.iscs.util.ToastUtils
+import com.grkj.iscs.util.log.LogUtil
 import com.grkj.iscs.view.base.BaseFragment
 import com.zhy.adapter.recyclerview.CommonAdapter
 import com.zhy.adapter.recyclerview.base.ViewHolder
@@ -70,6 +72,13 @@ class DockTestFragment : BaseFragment<FragmentDockTestBinding>() {
                         holder.setText(R.id.tv_name, getString(R.string.device_index, deviceIndex))
                         holder.setOnClickListener(R.id.tv_turn_on) {
                             ModBusController.controlKeyBuckle(true, deviceIndex == 1, dock.address)
+                            ModBusController.controlKeyCharge(
+                                false,
+                                deviceIndex == 1,
+                                dock.address
+                            ) {
+                                LogUtil.i("关闭充电:${it.toHexStrings()}")
+                            }
                         }
                         holder.setOnClickListener(R.id.tv_turn_off) {
                             ModBusController.controlKeyBuckle(false, deviceIndex == 1, dock.address)