diff --git a/app/src/main/java/com/casic/birmm/inspect/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/birmm/inspect/fragment/HomePageFragment.kt index 58cdafc..00cd27b 100644 --- a/app/src/main/java/com/casic/birmm/inspect/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/birmm/inspect/fragment/HomePageFragment.kt @@ -85,12 +85,7 @@ override fun handleMessage(msg: Message): Boolean { if (msg.what == LocaleConstant.BLUETOOTH_OFF) { - //防止用户开始打开蓝牙搜索,中途关闭蓝牙 - try { - bleManager.cancelScan() - } catch (e: NullPointerException) { - e.printStackTrace() - } + bluetoothOn = false bleManager.disconnectAllDevice() SaveKeyValues.removeKey(LocaleConstant.DEVICE_CODE) binding.currentValueView.text = "--" @@ -119,6 +114,7 @@ private var isGeneratingTask = false private var alarmCount = 0 private var connectedDeviceCode = "" + private var bluetoothOn = false override fun initViewBinding( inflater: LayoutInflater, container: ViewGroup? @@ -340,6 +336,8 @@ return@setOnClickListener } + bluetoothOn = true + if (bleManager.isConnected(connectedDevice)) { AlertControlDialog.Builder() .setContext(requireContext()) @@ -388,13 +386,15 @@ override fun onScanFinished(scanResultList: List) { LoadingDialogHub.dismiss() - scanResultList.forEach { - if (!it.name.isNullOrBlank()) { - bluetoothDevices.add(it) + if (bluetoothOn) { + scanResultList.forEach { + if (!it.name.isNullOrBlank()) { + bluetoothDevices.add(it) + } } - } - showScanResult(bluetoothDevices) + showScanResult(bluetoothDevices) + } } }) } diff --git a/app/src/main/java/com/casic/birmm/inspect/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/birmm/inspect/fragment/HomePageFragment.kt index 58cdafc..00cd27b 100644 --- a/app/src/main/java/com/casic/birmm/inspect/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/birmm/inspect/fragment/HomePageFragment.kt @@ -85,12 +85,7 @@ override fun handleMessage(msg: Message): Boolean { if (msg.what == LocaleConstant.BLUETOOTH_OFF) { - //防止用户开始打开蓝牙搜索,中途关闭蓝牙 - try { - bleManager.cancelScan() - } catch (e: NullPointerException) { - e.printStackTrace() - } + bluetoothOn = false bleManager.disconnectAllDevice() SaveKeyValues.removeKey(LocaleConstant.DEVICE_CODE) binding.currentValueView.text = "--" @@ -119,6 +114,7 @@ private var isGeneratingTask = false private var alarmCount = 0 private var connectedDeviceCode = "" + private var bluetoothOn = false override fun initViewBinding( inflater: LayoutInflater, container: ViewGroup? @@ -340,6 +336,8 @@ return@setOnClickListener } + bluetoothOn = true + if (bleManager.isConnected(connectedDevice)) { AlertControlDialog.Builder() .setContext(requireContext()) @@ -388,13 +386,15 @@ override fun onScanFinished(scanResultList: List) { LoadingDialogHub.dismiss() - scanResultList.forEach { - if (!it.name.isNullOrBlank()) { - bluetoothDevices.add(it) + if (bluetoothOn) { + scanResultList.forEach { + if (!it.name.isNullOrBlank()) { + bluetoothDevices.add(it) + } } - } - showScanResult(bluetoothDevices) + showScanResult(bluetoothDevices) + } } }) } 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 986aaf9..32d25fc 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 @@ -79,12 +79,7 @@ override fun handleMessage(msg: Message): Boolean { if (msg.what == LocaleConstant.BLUETOOTH_OFF) { - //防止用户开始打开蓝牙搜索,中途关闭蓝牙 - try { - bleManager.cancelScan() - } catch (e: NullPointerException) { - e.printStackTrace() - } + bluetoothOn = false bleManager.disconnectAllDevice() SaveKeyValues.removeKey(LocaleConstant.DEVICE_CODE) binding.currentValueView.text = "--" @@ -109,6 +104,7 @@ private var isGeneratingTask = false private var alarmCount = 0 private var connectedDeviceCode = "" + private var bluetoothOn = false override fun initViewBinding( inflater: LayoutInflater, container: ViewGroup? @@ -287,6 +283,8 @@ return@setOnClickListener } + bluetoothOn = true + if (bleManager.isConnected(connectedDevice)) { AlertControlDialog.Builder() .setContext(requireContext()) @@ -335,13 +333,15 @@ override fun onScanFinished(scanResultList: List) { LoadingDialogHub.dismiss() - scanResultList.forEach { - if (!it.name.isNullOrBlank()) { - bluetoothDevices.add(it) + if (bluetoothOn) { + scanResultList.forEach { + if (!it.name.isNullOrBlank()) { + bluetoothDevices.add(it) + } } - } - showScanResult(bluetoothDevices) + showScanResult(bluetoothDevices) + } } }) }