diff --git a/app/src/main/java/com/casic/birmm/inspect/single/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/birmm/inspect/single/fragment/HomePageFragment.kt index 8113c49..e31924a 100644 --- a/app/src/main/java/com/casic/birmm/inspect/single/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/birmm/inspect/single/fragment/HomePageFragment.kt @@ -81,6 +81,7 @@ private var currentDevice: BluetoothDevice? = null// 当前蓝牙设备 private var isGeneratingTask = false private var alarmCount = 0 + private var connectedDeviceName = "" override fun onCreateView( inflater: LayoutInflater, @@ -386,11 +387,12 @@ //[51, 51, 50, 48, 48, 48, 48, 49, 48, 48, 48, 50, 13, 10] homeView.deviceStatusView.text = "设备编号: ${bytes.toDeviceCode()}" SaveKeyValues.putValue(LocaleConstant.DEVICE_CODE, bytes.toDeviceCode()) -// BLEManager.sendCommand(LocaleConstant.OPEN_TRANSFER_COMMAND) - } else if (bytes.size == 14) { + BLEManager.sendCommand(LocaleConstant.OPEN_TRANSFER_COMMAND) + } else if (bytes.first() == (-86).toByte() && bytes.size == 14) { handleMethaneData(bytes) } else { - "甲烷数据格式异常".show(requireContext()) + //如果收到错误数据,就保存设备编号 + SaveKeyValues.putValue(LocaleConstant.DEVICE_CODE, connectedDeviceName) } } @@ -415,7 +417,7 @@ //清除缓存 blueToothBeans.clear() latLngs.clear() - SaveKeyValues.putValue(LocaleConstant.DEVICE_CODE, "") + SaveKeyValues.removeKey(LocaleConstant.DEVICE_CODE) LoadingDialogHub.dismiss() "巡检记录保存成功".show(requireContext()) @@ -427,7 +429,8 @@ private fun startConnectDevice(device: BluetoothDevice) { this.currentDevice = device if (!curConnectState) { - LoadingDialogHub.show(requireActivity(), "正在连接[${currentDevice!!.name}]...") + connectedDeviceName = currentDevice!!.name + LoadingDialogHub.show(requireActivity(), "正在连接[${connectedDeviceName}]...") BLEManager.connectBleDevice( requireContext(), currentDevice!!, 10000, LocaleConstant.SERVICE_UUID,