Selaa lähdekoodia

refactor(开关和设备异常)
- 蓝牙设备

周文健 5 kuukautta sitten
vanhempi
sitoutus
b12e819612

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

@@ -222,8 +222,7 @@ object ModBusController {
                                     // 更新mac
                                     updateKeyMac(dockBean.addr, key.isLeft, it.macAddress)
                                     BusinessManager.registerConnectListener(
-                                        it.macAddress,
-                                        false
+                                        it.macAddress
                                     ) { isDone, bleBean ->
                                         if (isDone && bleBean?.bleDevice != null) {
                                             Executor.delayOnMain(500) {

+ 1 - 1
app/src/main/java/com/grkj/iscs/view/presenter/DeviceStatusPresenter.kt

@@ -104,7 +104,7 @@ class DeviceStatusPresenter : BasePresenter<IDeviceStatusView>() {
                     BleManager.getInstance().disconnect(it)
                 }
                 Executor.delayOnMain(2000) {
-                    BusinessManager.registerConnectListener(mac, false) { isDone, bleBean ->
+                    BusinessManager.registerConnectListener(mac) { isDone, bleBean ->
                         if (isDone && bleBean != null) {
                             Executor.delayOnMain(300) {
                                 getCurrentStatus(7, bleBean.bleDevice)

+ 1 - 2
app/src/main/java/com/grkj/iscs/view/presenter/HomePresenter.kt

@@ -26,8 +26,7 @@ class HomePresenter : BasePresenter<IHomeView>() {
                                 keyBean.mac?.let {
                                     BusinessManager.sendLoadingEventMsg(mContext?.getString(R.string.loading_msg_return_key_start))
                                     BusinessManager.registerConnectListener(
-                                        it,
-                                        true
+                                        it
                                     ) { isDone, bleBean ->
                                         if (isDone && bleBean != null) {
                                             Executor.delayOnMain(300) {