|
@@ -153,16 +153,18 @@ class bleManager {
|
|
|
|
|
|
// 开始搜索蓝牙设备
|
|
|
async startScan(connectWillDevice, boolean, callBackConnect) {
|
|
|
-
|
|
|
-
|
|
|
var that = this;
|
|
|
+ const route_util = require('../utils/route_util');
|
|
|
const route_constant = require('../utils/route_constant');
|
|
|
+ const indexRoot = route_constant.indexRoot;
|
|
|
const connectBleRoot = route_constant.connectBleRoot;
|
|
|
- const route_util = require('../utils/route_util');
|
|
|
var lastPageRoute = route_util.getLastPageRoute();
|
|
|
+ if (lastPageRoute != indexRoot && lastPageRoute != connectBleRoot) {
|
|
|
+ return;
|
|
|
+ }
|
|
|
|
|
|
///蓝牙连接 做限制
|
|
|
- if (callBackConnect == null && lastPageRoute != connectBleRoot) {
|
|
|
+ if (lastPageRoute == indexRoot) {
|
|
|
if (that.doStartScaning == true) {
|
|
|
return;
|
|
|
}
|
|
@@ -177,15 +179,12 @@ class bleManager {
|
|
|
waitMills = delayMiliis - reduce;
|
|
|
}
|
|
|
|
|
|
- if (callBackConnect == null && lastPageRoute == connectBleRoot) {
|
|
|
- return;
|
|
|
- }
|
|
|
-
|
|
|
if (waitMills > 0) {
|
|
|
await that.delay(waitMills);
|
|
|
}
|
|
|
|
|
|
if (callBackConnect == null && lastPageRoute == connectBleRoot) {
|
|
|
+ that.doStartScaning = false;
|
|
|
return;
|
|
|
}
|
|
|
|