修复蓝牙配对时，连接成功马上断开，再次连接提示正在连接中的问题

pages/008A/HBY008A.vue

@@ -215,7 +215,7 @@
 					sta_leftFan: null,
 					sta_rightFan: null,
 					sta_channel: null,
-					sta_Ms: null,
+					sta_Ms: 'S',
 					sta_PowerPercent: null,
 					sta_PowerTime: null,
 					sta_system: null,
@@ -1010,10 +1010,11 @@
 		border-width: 5rpx;
 		border-color: #00000000;
 		padding: 5rpx;
+		height:130rpx !important;
 	}
 
 	.lampMode .type .txt {
-		color: rgba(255, 255, 255, 0.2);
+		color: rgba(255, 255, 255, 0.5);
 		background-color: #00000000;
 		font-family: "PingFang SC";
 		font-size: 50rpx;

pages/6075J/BJQ6075J.vue

@@ -624,6 +624,9 @@
 
 				this.$watch("formData.sta_PowerPercent", (newVal, oldVal) => {
 					console.log("电量发生变化");
+					if(!newVal){
+						return;
+					}
 					if (newVal <= 20 && (this.formData.sta_system === 2 || this.formData.sta_system === 0)) {
 						//电量在20%及以及下，且是未充电状态提醒
 						showPop({

pages/common/addBLE/addEquip.vue

@@ -35,8 +35,8 @@
 						</view>
 						<view class="centertxt ">
 							<view class="name" v-text="item.name"></view>
-							
-							
+
+
 						</view>
 						<view class="rightIco center">
 							<image src="/static/images/BLEAdd/linked.png" class="img" mode="aspectFit">
@@ -49,8 +49,8 @@
 				</view>
 
 				<view class="lblTitle">
-					<text>发现设备:{{EquipMents.length}}  筛选设备:{{deviceCnt}}</text>
-					
+					<text>发现设备:{{EquipMents.length}} 筛选设备:{{deviceCnt}}</text>
+
 					<view @click="refreshBleList()">刷新</view>
 				</view>
 				<view class="">
@@ -68,7 +68,7 @@
 							<view class="name">
 								<text>{{item.name?item.name:'Unnamed'}}</text>
 
-							</view>							
+							</view>
 							<view class="id">
 								<text>信号:{{item.RSSI}}dBm</text>
 							</view>
@@ -131,7 +131,7 @@
 	var ble = null;
 	var these = null;
 	var eventChannel = null;
-	var sortTime=null;
+	var sortTime = null;
 	export default {
 		data() {
 			return {
@@ -276,7 +276,7 @@
 					}
 					console.log("处理蓝牙不可用");
 					hideLoading(these);
-
+					clearInterval(these.Status.intval);
 					these.PairEquip = [];
 					these.EquipMents = [];
 					uni.showToast({
@@ -310,14 +310,12 @@
 					if (these.Status.isPageHidden) {
 						return;
 					}
-					// console.log("处理蓝牙断开连接");
-
-
-					these.refreshLinked();
-
-					setTimeout(() => {
-						hideLoading(these);
-					}, 1500);
+					console.log("处理蓝牙断开连接");
+					if(res.deviceId==this.item.deviceId){
+						these.item.deviceId = null;
+						these.refreshLinked();						
+						clearInterval(these.Status.intval);
+					}
 
 				}, pagePath);
 
@@ -348,7 +346,7 @@
 						});
 
 						if (!f) {
-							
+
 							if (these.device && these.device.bluetoothName && device.name) {
 								const bn = these.device.bluetoothName;
 								if (bn === device.name ||
@@ -370,10 +368,10 @@
 
 					}
 					clearTimeout(sortTime);
-					sortTime=setTimeout(()=>{
-						these.EquipMents.sort((a, b) => b.RSSI - a.RSSI); 
-					},500);
-					
+					sortTime = setTimeout(() => {
+						these.EquipMents.sort((a, b) => b.RSSI - a.RSSI);
+					}, 500);
+
 
 				}, pagePath);
 
@@ -409,23 +407,27 @@
 							return;
 						}
 
-						if ((receivData.str && (receivData.str.indexOf('mac address:') > -1 || receivData.str.indexOf(
-								'sta_address') > -1)) ||
-							(receivData.bytes && receivData.bytes[0] === 0xFC && receivData.bytes.length >= 7)) {
+						if (f.deviceId == this.item.deviceId) {//只处理本次连接的设备消息
+							if ((receivData.str && (receivData.str.indexOf('mac address:') > -1 || receivData
+									.str.indexOf(
+										'sta_address') > -1)) ||
+								(receivData.bytes && receivData.bytes[0] === 0xFC && receivData.bytes.length >=
+									7)) {
 
-							if (f.macAddress && these.device) {
+								if (f.macAddress && these.device) {
 
-								clearInterval(this.Status.intval);
-								this.Status.intval = null;
-								this.Status.time = null;
+									clearInterval(this.Status.intval);
+									this.Status.intval = null;
+									this.Status.time = null;
 
-								showLoading(these, {
-									text: '正在验证设备'
-								});
+									showLoading(these, {
+										text: '正在验证设备'
+									});
 
-								setTimeout(() => {
-									these.DeviceVerdict(f.deviceId);
-								}, 0);
+									setTimeout(() => {
+										these.DeviceVerdict(f.deviceId);
+									}, 0);
+								}
 							}
 						}
 					}, pagePath);
@@ -634,8 +636,8 @@
 							return;
 						}
 						hideLoading(these);
-						these.device.bleId=deviceId;
-						
+						these.device.bleId = deviceId;
+
 						ble.updateCache();
 						eventChannel.emit('BindOver', these.device);
 						uni.navigateBack();
@@ -721,9 +723,9 @@
 				return false;
 			},
 			Link: function(item) {
-				this.item.deviceId = item.deviceId;
+				
 				showLoading(this, {
-					text: "正在连接:第1次"
+					text: "正在连接..."
 				});
 
 				let index = 1;
@@ -761,15 +763,18 @@
 						ble.LinkBlue(item.deviceId).then((res) => {
 							this.tmpLink = [item];
 							console.log("连接成功");
-							ble.StopSearch();
+							these.item.deviceId = item.deviceId;
+							ble.StopSearch().catch(ex=>{});
 							resolve(res);
+							
 						}).catch((ex) => {
 							if (index == total) {
 								console.log("连接了N次都没连上");
 								reject(ex);
 								updateLoading(this, {
 									text: ex.msg
-								})
+								});
+								this.item.deviceId =null;
 								return;
 							}
 							index++;

utils/BleHelper.js

@@ -946,7 +946,9 @@ class BleHelper {
 						return false;
 					});
 					this.updateCache();
+					
 					if (f && f.device && f.device.id && this.data.available) {
+						//已绑定过的设备尝试重连
 						let fdis = this.data.Disconnect.find(dis => {
 							return dis === res.deviceId
 						}); //用户主动断开的，不再重连
@@ -967,6 +969,9 @@ class BleHelper {
 
 						}
 
+					}else{
+						//未绑定过的设备播放连接锁
+						delete this.data.connectingDevices[res.deviceId];
 					}
 
 					if (this.cfg.bleDisposeCallback.length > 0) {
@@ -1626,7 +1631,6 @@ class BleHelper {
 			}
 		}
 
-
 		if (this.data.platform == 'web') {
 			LinkedCallback();
 			return Promise.resolve(true);