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 04b55c9..14fd662 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 @@ -87,6 +87,8 @@ binding.deviceModelView.text = "产品型号:未连接" binding.deviceCodeView.text = "设备编号:未连接" "设备已断开连接".show(requireContext()) + //防止用户开始打开蓝牙搜索,中途关闭蓝牙 + bleManager.cancelScan() } return true } @@ -132,6 +134,8 @@ val scanConfig = BleScanRuleConfig.Builder().setScanTimeOut(3000).build() bleManager.enableLog(true).initScanRule(scanConfig) + binding.stopInspectButton.isEnabled = false + //Map binding.mapView.onCreate(savedInstanceState) aMap = binding.mapView.map @@ -313,7 +317,8 @@ //蓝牙按钮 binding.bluetoothButton.setOnClickListener { if (!bleManager.isBlueEnable) { - bleManager.enableBluetooth() + "蓝牙未打开,无法搜索设备".show(requireContext()) + return@setOnClickListener } if (bleManager.isConnected(connectedDevice)) { 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 04b55c9..14fd662 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 @@ -87,6 +87,8 @@ binding.deviceModelView.text = "产品型号:未连接" binding.deviceCodeView.text = "设备编号:未连接" "设备已断开连接".show(requireContext()) + //防止用户开始打开蓝牙搜索,中途关闭蓝牙 + bleManager.cancelScan() } return true } @@ -132,6 +134,8 @@ val scanConfig = BleScanRuleConfig.Builder().setScanTimeOut(3000).build() bleManager.enableLog(true).initScanRule(scanConfig) + binding.stopInspectButton.isEnabled = false + //Map binding.mapView.onCreate(savedInstanceState) aMap = binding.mapView.map @@ -313,7 +317,8 @@ //蓝牙按钮 binding.bluetoothButton.setOnClickListener { if (!bleManager.isBlueEnable) { - bleManager.enableBluetooth() + "蓝牙未打开,无法搜索设备".show(requireContext()) + return@setOnClickListener } if (bleManager.isConnected(connectedDevice)) { 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 a0ef149..72b72dc 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,8 @@ binding.deviceModelView.text = "产品型号:未连接" binding.deviceCodeView.text = "设备编号:未连接" "设备已断开连接".show(requireContext()) + //防止用户开始打开蓝牙搜索,中途关闭蓝牙 + bleManager.cancelScan() } return true } @@ -122,6 +124,8 @@ val scanConfig = BleScanRuleConfig.Builder().setScanTimeOut(3000).build() bleManager.enableLog(true).initScanRule(scanConfig) + binding.stopInspectButton.isEnabled = false + binding.mapView.onCreate(savedInstanceState) aMap = binding.mapView.map @@ -264,7 +268,8 @@ //蓝牙按钮 binding.bluetoothButton.setOnClickListener { if (!bleManager.isBlueEnable) { - bleManager.enableBluetooth() + "蓝牙未打开,无法搜索设备".show(requireContext()) + return@setOnClickListener } if (bleManager.isConnected(connectedDevice)) {