diff --git a/App.vue b/App.vue
index a21853c..7861e4d 100644
--- a/App.vue
+++ b/App.vue
@@ -1,6 +1,7 @@
 <script>
-	import bleTool from '@/utils/BleHelper.js'
-	import upgrade from '@/utils/update.js'
+	import bleTool from '@/utils/BleHelper.js';
+	import upgrade from '@/utils/update.js';
+	
 	export default {
 
 		onLaunch: function() {
@@ -30,11 +31,9 @@
 			//以上代码仅在开发时使用,否则会出现不可预知的问题。
 
 			// #ifdef APP|APP-PLUS
-			if (plus.runtime.isAgreePrivacy()) {
+			let initOS = () => {
+				let ble = bleTool.getBleTool();
 
-
-				bleTool.getBleTool();
-		
 				uni.getPushClientId({
 					success(res) {
 						console.log("推送信息:", res);
@@ -62,8 +61,13 @@
 					});
 
 				});
-
-
+			}
+			if (plus.os.name == 'Android') {
+				if(plus.runtime.isAgreePrivacy()){
+					initOS();	
+				}
+			}else{
+				initOS();
 			}
 
 			// #endif
@@ -76,14 +80,23 @@
 
 			let appid = plus.runtime.appid;
 			console.log("appid=", appid);
-			
-			if (appid !== 'HBuilder') {				
+
+			if (appid !== 'HBuilder') {
 				upgrade.checkAndUpdateWgt();
 			}
 			// #endif
+
+
 		},
 		onHide: function() {
 			console.log('App Hide');
+			// #ifdef APP|APP-PLUS
+			let ble = bleTool.getBleTool();
+			if (ble) {
+				console.log("断开所有蓝牙设备");
+				ble.disconnectDevice();
+			}
+			// #endif
 		},
 		onError(ex) {
 			console.error("出现了未知的异常", ex);
diff --git a/components/BottomSlideMenuPlus/BottomSlideMenuPlus.vue b/components/BottomSlideMenuPlus/BottomSlideMenuPlus.vue
index dc38f7b..8b8d1b9 100644
--- a/components/BottomSlideMenuPlus/BottomSlideMenuPlus.vue
+++ b/components/BottomSlideMenuPlus/BottomSlideMenuPlus.vue
@@ -23,7 +23,7 @@
 				paddingRight: config.dividerMargin
 				}" @click="handleItemClick(item, index)">
 
-					<view class="p100" :style="{backgroundColor:(config.activeIndex==index || item[config.valueMember]==config.value) ?config.itemBgColor:'',
+					<view class="p100" :data-acIdx="config.activeIndex" :data-ac="config.activeIndex==index" :style="{backgroundColor:(config.activeIndex==index || (item[config.valueMember]==config.value && config.value)  ) ?config.itemBgColor:'',
 				justifyContent:config.textAlign
 				}">
 						<view class="imgContent" v-if="item.icon" :style="{ 					
diff --git a/manifest.json b/manifest.json
index 864842f..a4ca526 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,7 +2,7 @@
     "name" : "星汉物联",
     "appid" : "__UNI__A21EF43",
     "description" : "设备管控",
-    "versionName" : "1.0.19",
+    "versionName" : "1.0.22",
     "versionCode" : 101,
     "transformPx" : false,
     /* 5+App特有相关 */
diff --git a/pages/018A/HBY018A.vue b/pages/018A/HBY018A.vue
index 3d5fb41..36fa6c6 100644
--- a/pages/018A/HBY018A.vue
+++ b/pages/018A/HBY018A.vue
@@ -95,7 +95,7 @@
 
 
 
-		<view  style="padding-bottom: 20rpx;">
+		<view style="padding-bottom: 20rpx;">
 
 
 			<view class="proinfo lamp">
@@ -355,6 +355,15 @@
 		},
 		onShow() {
 			this.Status.pageHide = false;
+
+			let f = this.getDevice();
+			if (f) {
+				these.formData.bleStatu = 'connecting';
+				ble.LinkBlue(f.deviceId, f.writeServiceId, f.wirteCharactId, f.notifyCharactId).then(res => {
+					console.log("连接成功")
+					these.formData.bleStatu = true;
+				});
+			}
 		},
 		computed: {
 
@@ -363,14 +372,14 @@
 		methods: {
 
 			LighSetting(item, index) {
-				let val=item.key;
+				let val = item.key;
 				if (item.key === this.formData.sta_LedType) {
-					val='led_off';
-					
+					val = 'led_off';
+
 				}
-				
+
 				let f = this.getDevice();
-				
+
 				// #ifdef  APP-PLUS											
 				if (!f) {
 					this.showBleUnConnect();
@@ -382,7 +391,7 @@
 					deviceId: '12345'
 				}
 				// #endif
-				
+
 				let json = {
 					ins_LedType: val
 				}
@@ -390,10 +399,10 @@
 				ble.sendString(f.deviceId, json, f.writeServiceId, f.wirteCharactId, 30).then(res => {
 					this.formData.sta_LedType = val;
 					these.setBleFormData();
-					
+
 				}).catch(ex => {
 					this.showMsg(ex.msg);
-					
+
 				});
 			},
 
@@ -501,13 +510,13 @@
 
 			},
 			deviceDispose(res) {
-				if (this.Status.pageHide) {
-					return;
-				}
+				// if (this.Status.pageHide) {
+				// 	return;
+				// }
 				if (res.deviceId == these.formData.deviceId) {
-					if(res.device){
+					if (res.device) {
 						these.formData.bleStatu = 'connecting';
-					}else{
+					} else {
 						this.formData.bleStatu = false;
 					}
 					setTimeout(() => {
diff --git a/pages/100/HBY100.vue b/pages/100/HBY100.vue
index b9cdbf4..d1c6fd3 100644
--- a/pages/100/HBY100.vue
+++ b/pages/100/HBY100.vue
@@ -519,7 +519,7 @@
 			ble = BleTool.getBleTool();
 
 			this.$watch("formData.sta_battery", (newVal, oldVal) => {
-				if (newVal <= 20 && this.formData.sta_system==2) {
+				if (newVal <= 20 && this.formData.sta_system == 2) {
 					this.showMsg("设备电量低");
 				}
 			});
@@ -595,6 +595,15 @@
 		},
 		onShow() {
 			this.Status.pageHide = false;
+
+			let f = this.getDevice();
+			if (f) {
+				these.formData.bleStatu = 'connecting';
+				ble.LinkBlue(f.deviceId, f.writeServiceId, f.wirteCharactId, f.notifyCharactId).then(res => {
+					console.log("连接成功")
+					these.formData.bleStatu = true;
+				});
+			}
 		},
 		computed: {
 			getbleStatu() {
@@ -1197,9 +1206,9 @@
 
 			},
 			deviceDispose(res) {
-				if (this.Status.pageHide) {
-					return;
-				}
+				// if (this.Status.pageHide) {
+				// 	return;
+				// }
 				if (res.deviceId == these.formData.deviceId) {
 					if (res.device) {
 						these.formData.bleStatu = 'connecting';
diff --git a/pages/102/HBY102.vue b/pages/102/HBY102.vue
index 8a89368..4f74e42 100644
--- a/pages/102/HBY102.vue
+++ b/pages/102/HBY102.vue
@@ -509,6 +509,16 @@
 		},
 		onShow() {
 			this.Status.pageHide = false;
+
+			let f = this.getDevice();
+			if (f) {
+				these.formData.bleStatu = 'connecting';
+				ble.LinkBlue(f.deviceId, f.writeServiceId, f.wirteCharactId, f.notifyCharactId).then(res => {
+					console.log("连接成功")
+					these.formData.bleStatu = true;
+				});
+			}
+
 			this.getLinkedCnt();
 		},
 		computed: {
@@ -975,13 +985,13 @@
 
 			},
 			deviceDispose(res) {
-				if (this.Status.pageHide) {
-					return;
-				}
+				// if (this.Status.pageHide) {
+				// 	return;
+				// }
 				if (res.deviceId == these.formData.deviceId) {
-					if(res.device){
+					if (res.device) {
 						these.formData.bleStatu = 'connecting';
-					}else{
+					} else {
 						this.formData.bleStatu = false;
 					}
 					setTimeout(() => {
diff --git a/pages/4877/BJQ4877.vue b/pages/4877/BJQ4877.vue
index d1de357..9cd023d 100644
--- a/pages/4877/BJQ4877.vue
+++ b/pages/4877/BJQ4877.vue
@@ -574,6 +574,15 @@
 		},
 		onShow() {
 			this.Status.pageHide = false;
+			
+			let f=this.getDevice();
+						if(f){
+			                these.formData.bleStatu = 'connecting';
+							ble.LinkBlue(f.deviceId, f.writeServiceId, f.wirteCharactId, f.notifyCharactId).then(res => {
+								console.log("连接成功")
+								these.formData.bleStatu = true;
+							});
+						}
 		},
 		computed: {
 			getbleStatu() {
@@ -1083,9 +1092,9 @@
 
 			},
 			deviceDispose(res) {
-				if (this.Status.pageHide) {
-					return;
-				}
+				// if (this.Status.pageHide) {
+				// 	return;
+				// }
 				if (res.deviceId == these.formData.deviceId) {
 					if(res.device){
 						these.formData.bleStatu = 'connecting';
diff --git a/pages/4877/BJQ4877V1.vue b/pages/4877/BJQ4877V1.vue
index ab6d45c..5e71f6e 100644
--- a/pages/4877/BJQ4877V1.vue
+++ b/pages/4877/BJQ4877V1.vue
@@ -599,9 +599,9 @@ import request, { baseURL } from '@/utils/request.js';
 
 			},
 			deviceDispose(res) {
-				if (this.Status.pageHide) {
-					return;
-				}
+				//if (this.Status.pageHide) {
+				//	return;
+				//}
 				if (res.deviceId == these.formData.deviceId) {
 					if(res.device){
 						these.formData.bleStatu = 'connecting';
diff --git a/pages/6075/BJQ6075.vue b/pages/6075/BJQ6075.vue
index 3e4d8dc..f609c34 100644
--- a/pages/6075/BJQ6075.vue
+++ b/pages/6075/BJQ6075.vue
@@ -679,7 +679,7 @@
 						}
 						let that = this;
 						uni.navigateTo({
-							url: "/pages/ImgCrop/ImgCrop",
+							url: "/pages/common/ImgCrop/ImgCrop",
 							events: {
 								ImgCutOverPath: function(data) {
 									that.selectedImage = data.picPath;
diff --git a/pages/6075J/BJQ6075J.vue b/pages/6075J/BJQ6075J.vue
index 8115957..6864f48 100644
--- a/pages/6075J/BJQ6075J.vue
+++ b/pages/6075J/BJQ6075J.vue
@@ -486,6 +486,15 @@
 		},
 		onShow() {
 			this.Status.pageHide = false;
+			
+			let f=this.getDevice();
+						if(f){
+			                these.formData.bleStatu = 'connecting';
+							ble.LinkBlue(f.deviceId, f.writeServiceId, f.wirteCharactId, f.notifyCharactId).then(res => {
+								console.log("连接成功")
+								these.formData.bleStatu = true;
+							});
+						}
 		},
 		onHide: function() {
 			this.Status.pageHide = true;
@@ -1145,7 +1154,7 @@
 					sourceType: ['album'],
 					success: function(res) {
 						uni.navigateTo({
-							url: "/pages/ImgCrop/ImgCrop",
+							url: "/pages/common/ImgCrop/ImgCrop",
 							events: {
 								ImgCutOver: function(data) {
 
@@ -2012,9 +2021,9 @@
 
 			},
 			deviceDispose(res) {
-				if (this.Status.pageHide) {
-					return;
-				}
+				// if (this.Status.pageHide) {
+				// 	return;
+				// }
 				if (res.deviceId == these.formData.deviceId) {
 					if (res.device) {
 						these.formData.bleStatu = 'connecting';
diff --git a/pages/6107/BJQ6107.vue b/pages/6107/BJQ6107.vue
index ce0f426..4735442 100644
--- a/pages/6107/BJQ6107.vue
+++ b/pages/6107/BJQ6107.vue
@@ -433,6 +433,14 @@
 		},
 		onShow() {
 			this.Status.pageHide = false;
+            let f = this.getDevice();
+            if (f) {
+                these.formData.bleStatu = 'connecting';
+                ble.LinkBlue(f.deviceId, f.writeServiceId, f.wirteCharactId, f.notifyCharactId).then(res => {
+                    console.log("连接成功")
+                    these.formData.bleStatu = true;
+                });
+            }
 		},
 		computed: {
 
@@ -689,9 +697,9 @@
 
 			},
 			deviceDispose(res) {
-				if (this.Status.pageHide) {
-					return;
-				}
+				//if (this.Status.pageHide) {
+				//	return;
+				//}
 				if (res.deviceId == these.formData.deviceId) {
 					this.formData.bleStatu = false;
 					setTimeout(() => {
diff --git a/pages/6155/BJQ6155.vue b/pages/6155/BJQ6155.vue
index 72f80b0..5cab1a7 100644
--- a/pages/6155/BJQ6155.vue
+++ b/pages/6155/BJQ6155.vue
@@ -426,6 +426,15 @@
 		},
 		onShow() {
 			this.Status.pageHide = false;
+			
+			let f=this.getDevice();
+						if(f){
+			                these.formData.bleStatu = 'connecting';
+							ble.LinkBlue(f.deviceId, f.writeServiceId, f.wirteCharactId, f.notifyCharactId).then(res => {
+								console.log("连接成功")
+								these.formData.bleStatu = true;
+							});
+						}
 		},
 		onBackPress(e) {
 
@@ -581,9 +590,9 @@
 
 			},
 			deviceDispose(res) {
-				if (this.Status.pageHide) {
-					return;
-				}
+				// if (this.Status.pageHide) {
+				// 	return;
+				// }
 				if (res.deviceId == these.formData.deviceId) {
 					if(res.device){
 						these.formData.bleStatu = 'connecting';
@@ -909,7 +918,7 @@
 					sourceType: ['album'],
 					success: function(res) {
 						uni.navigateTo({
-							url: "/pages/ImgCrop/ImgCrop",
+							url: "/pages/common/ImgCrop/ImgCrop",
 							events: {
 								ImgCutOver: function(data) {
 
diff --git a/pages/6155/deviceDetail.vue b/pages/6155/deviceDetail.vue
index 1170edb..0d33723 100644
--- a/pages/6155/deviceDetail.vue
+++ b/pages/6155/deviceDetail.vue
@@ -396,6 +396,15 @@
 		},
 		onShow() {
 			this.Status.pageHide = false;
+			
+			let f=this.getDevice();
+						if(f){
+			                these.formData.bleStatu = 'connecting';
+							ble.LinkBlue(f.deviceId, f.writeServiceId, f.wirteCharactId, f.notifyCharactId).then(res => {
+								console.log("连接成功")
+								these.formData.bleStatu = true;
+							});
+						}
 		},
 		onBackPress(e) {
 
@@ -562,9 +571,9 @@
 
 			},
 			deviceDispose(res) {
-				if (this.Status.pageHide) {
-					return;
-				}
+				// if (this.Status.pageHide) {
+				// 	return;
+				// }
 				if (res.deviceId == these.formData.deviceId) {
 					if(res.device){
 						these.formData.bleStatu = 'connecting';
@@ -926,7 +935,7 @@
 					sourceType: ['album'],
 					success: function(res) {
 						uni.navigateTo({
-							url: "/pages/ImgCrop/ImgCrop",
+							url: "/pages/common/ImgCrop/ImgCrop",
 							events: {
 								ImgCutOver: function(data) {
 
diff --git a/pages/6170/deviceControl/index.vue b/pages/6170/deviceControl/index.vue
index c18438c..36b73b9 100644
--- a/pages/6170/deviceControl/index.vue
+++ b/pages/6170/deviceControl/index.vue
@@ -331,7 +331,7 @@
 	var ble = null;
 	var rec = null;
 
-	var pagePath = "pages/6170/BJQ6170";
+	var pagePath = "/pages/6170/deviceControl/index";
 
 	export default {
 		components: {
@@ -498,9 +498,12 @@
 				if (receive.deviceId !== this.formData.deviceId) {
 					return;
 				}
-				let data = recei.ReceiveData(receive, device, pagePath, recArr);
+				let data = rec.ReceiveData(receive, device, pagePath, recArr);
 				console.log("蓝牙收到消息", data)
 				this.receivData(data);
+			},
+			receivData(data) {
+
 			},
 			bleStateBreak() {
 				if (this.Status.pageHide) {
@@ -542,9 +545,9 @@
 				});
 			},
 			deviceDispose(res) {
-				if (this.Status.pageHide) {
-					return;
-				}
+				// if (this.Status.pageHide) {
+				// 	return;
+				// }
 				if (res.deviceId == these.formData.deviceId) {
 					if (res.device) {
 						these.formData.bleStatu = 'connecting';
@@ -856,20 +859,26 @@
 							})
 							uni.hideLoading();
 						}
+					}).catch(ex => {
+						console.error("ex=", ex);
 					});
 				}
 
 				if (ble && this.itemInfo.deviceMac) {
+					console.log("111111")
 					let f = this.getDevice();
 					if (f) {
+						console.log("222222");
 						let json = {
 							instruct: [1, 0, 0, 0, 0]
 						};
 						json.instruct[1] = parseInt(selectedItem.instructValue);
 
 						ble.sendString(f.deviceId, json).then(res => {
-
+							console.log("ble send success")
+							this.lightModeA = false;
 						}).catch(ex => {
+							console.error("ble send fail,mqsending....")
 							mqSend();
 						});
 					} else {
@@ -979,7 +988,7 @@
 						}
 						let that = this;
 						uni.navigateTo({
-							url: "/pages/ImgCrop/ImgCrop",
+							url: "/pages/common/ImgCrop/ImgCrop",
 							events: {
 								ImgCutOver: function(data) {
 									that.selectedImage = data.picPath;
@@ -990,6 +999,9 @@
 								ev.eventChannel.emit('checkImg', {
 									data: res.tempFiles[0].path,
 								});
+							},
+							fail(ex) {
+								console.error("跳转失败", ex);
 							}
 						});
 					}
@@ -1797,7 +1809,7 @@
 		onLoad(options) {
 			these = this;
 
-
+			rec = BleReceive.getBleReceive();
 			const eventChannel = this.getOpenerEventChannel();
 			// 监听 'detailData' 事件，获取传过来的数据
 			uni.showLoading({
@@ -1815,7 +1827,7 @@
 				// 根据 apiType 设置右图标的显示状态
 				this.isRightIconVisible = this.apiType === 'listA';
 
-				this.initBle();
+
 				// 初始化并连接MQTT
 				this.mqttClient = new MqttClient();
 				this.mqttClient.connect(() => {
@@ -1896,6 +1908,9 @@
 					rec = BleReceive.getBleReceive();
 					ble = BleTool.getBleTool();
 
+					this.initBle();
+
+					console.log("ble=", ble);
 					let f = ble.data.LinkedList.find((v) => {
 						if (v.macAddress == this.itemInfo.deviceMac) {
 							console.log("找到设备了", v);
@@ -1908,9 +1923,9 @@
 					if (f) {
 						these.formData.bleStatu = 'connecting';
 						ble.LinkBlue(f.deviceId, f.writeServiceId, f.wirteCharactId, f.notifyCharactId).then(
-						res => {
-							these.formData.bleStatu = true;
-						});
+							res => {
+								these.formData.bleStatu = true;
+							});
 					}
 				}
 
@@ -1922,6 +1937,16 @@
 			})
 
 		},
+		onShow() {
+			let f = this.getDevice();
+			if (f) {
+				these.formData.bleStatu = 'connecting';
+				ble.LinkBlue(f.deviceId, f.writeServiceId, f.wirteCharactId, f.notifyCharactId).then(res => {
+					console.log("连接成功")
+					these.formData.bleStatu = true;
+				});
+			}
+		},
 		onUnload() {
 			// 页面卸载时断开MQTT连接
 			if (this.mqttClient) {
diff --git a/pages/6331/BJQ6331.vue b/pages/6331/BJQ6331.vue
index 68e2abb..c372de2 100644
--- a/pages/6331/BJQ6331.vue
+++ b/pages/6331/BJQ6331.vue
@@ -414,6 +414,14 @@ import request, { baseURL } from '@/utils/request.js';
 		},
 		onShow() {
 			this.Status.pageHide = false;
+            let f = this.getDevice();
+            if (f) {
+                these.formData.bleStatu = 'connecting';
+                ble.LinkBlue(f.deviceId, f.writeServiceId, f.wirteCharactId, f.notifyCharactId).then(res => {
+                    console.log("连接成功")
+                    these.formData.bleStatu = true;
+                });
+            }
 		},
 		computed: {
 
@@ -613,9 +621,9 @@ import request, { baseURL } from '@/utils/request.js';
 
 			},
 			deviceDispose(res) {
-				if (this.Status.pageHide) {
-					return;
-				}
+				//if (this.Status.pageHide) {
+				//	return;
+				//}
 				if (res.deviceId == these.formData.deviceId) {
 					if(res.device){
 						these.formData.bleStatu = 'connecting';
diff --git a/pages/650/HBY650.vue b/pages/650/HBY650.vue
index 6742974..081ac7e 100644
--- a/pages/650/HBY650.vue
+++ b/pages/650/HBY650.vue
@@ -418,6 +418,15 @@ import request, { baseURL } from '@/utils/request.js';
 		},
 		onShow() {
 			this.Status.pageHide = false;
+			
+			let f=this.getDevice();
+						if(f){
+			                these.formData.bleStatu = 'connecting';
+							ble.LinkBlue(f.deviceId, f.writeServiceId, f.wirteCharactId, f.notifyCharactId).then(res => {
+								console.log("连接成功")
+								these.formData.bleStatu = true;
+							});
+						}
 		},
 		computed: {
 			getbleStatu(){
@@ -510,9 +519,9 @@ import request, { baseURL } from '@/utils/request.js';
 
 			},
 			deviceDispose(res) {
-				if (this.Status.pageHide) {
-					return;
-				}
+				// if (this.Status.pageHide) {
+				// 	return;
+				// }
 				if (res.deviceId == these.formData.deviceId) {
 					if(res.device){
 						these.formData.bleStatu = 'connecting';
@@ -1051,7 +1060,7 @@ import request, { baseURL } from '@/utils/request.js';
 				var gotoCutImg = (imgPath) => {
 
 					uni.navigateTo({
-						url: "/pages/ImgCrop/ImgCrop",
+						url: "/pages/common/ImgCrop/ImgCrop",
 						events: {
 							ImgCutOver: function(data) {
 								// console.log("我收到裁剪后的图片了，感谢老铁," + data)
diff --git a/pages/670/HBY670.vue b/pages/670/HBY670.vue
index 91addfe..1187d22 100644
--- a/pages/670/HBY670.vue
+++ b/pages/670/HBY670.vue
@@ -16,7 +16,7 @@
 		
 		
 
-		<view class="eq" :style="{marginTop:Status.navbar.height+'px'}">
+		<view class="eq" >
 			<view class="leftImg" @click.stop="previewImg(device.devicePic?device.devicePic:formData.img)">
 				<image class="img" :src="device.devicePic?device.devicePic:formData.img" mode="aspectFit"></image>
 			</view>
@@ -561,6 +561,15 @@
 		},
 		onShow() {
 			this.Status.pageHide = false;
+			
+			let f=this.getDevice();
+						if(f){
+			                these.formData.bleStatu = 'connecting';
+							ble.LinkBlue(f.deviceId, f.writeServiceId, f.wirteCharactId, f.notifyCharactId).then(res => {
+								console.log("连接成功")
+								these.formData.bleStatu = true;
+							});
+						}
 		},
 		onHide: function() {
 			this.Status.pageHide = true;
@@ -634,9 +643,9 @@
 
 			},
 			deviceDispose(res) {
-				if (this.Status.pageHide) {
-					return;
-				}
+				// if (this.Status.pageHide) {
+				// 	return;
+				// }
 				if (res.deviceId == these.formData.deviceId) {
 					if(res.device){
 						these.formData.bleStatu = 'connecting';
@@ -1871,7 +1880,7 @@
 				var gotoCutImg = (imgPath) => {
 
 					uni.navigateTo({
-						url: "/pages/ImgCrop/ImgCrop",
+						url: "/pages/common/ImgCrop/ImgCrop",
 						events: {
 							ImgCutOver: function(data) {
 								// console.log("我收到裁剪后的图片了，感谢老铁," + data)
diff --git a/pages/7305/BJQ7305.vue b/pages/7305/BJQ7305.vue
index 0daf510..efcb034 100644
--- a/pages/7305/BJQ7305.vue
+++ b/pages/7305/BJQ7305.vue
@@ -243,7 +243,7 @@
 						],
 						activeIndex: -1,
 						bgColor: '#2a2a2a',
-						itemBgColor: '#00000000',
+						itemBgColor: '#3a3a3a',
 						textColor: '#ffffffde',
 						textAlign: 'flex-start',
 						title: '主灯模式',
@@ -376,6 +376,15 @@
 		},
 		onShow: function() {
 			this.Status.pageHide = false;
+			
+			let f=this.getDevice();
+			if(f){
+				these.formData.bleStatu = 'connecting';
+				ble.LinkBlue(f.deviceId, f.writeServiceId, f.wirteCharactId, f.notifyCharactId).then(res => {
+					console.log("连接成功")
+					these.formData.bleStatu = true;
+				});
+			}
 		},
 		computed: {
 			getbleStatu() {
@@ -399,22 +408,20 @@
 					return txt;
 				}
 				switch (this.formData.mode) {
-					case 0:
+					case 1:
 
 
 						txt = "强光模式";
 
 						break;
-					case 1:
+					case 2:
 						txt = "弱光模式";
 						break;
 
-					case 2:
+					case 3:
 						txt = "爆闪模式";
 						break;
-					case 3:
-						txt = "关闭";
-						break;
+					
 					default:
 						txt = "关闭";
 						break;
@@ -481,9 +488,9 @@
 				})
 			},
 			deviceRecovry(res) {
-				if (this.Status.pageHide) {
-					return;
-				}
+				// if (this.Status.pageHide) {
+				// 	return;
+				// }
 				if (res.deviceId == these.formData.deviceId) {
 					this.formData.bleStatu = true;
 					// 重新连接后状态以设备上报为准
@@ -498,9 +505,9 @@
 
 			},
 			deviceDispose(res) {
-				if (this.Status.pageHide) {
-					return;
-				}
+				// if (this.Status.pageHide) {
+				// 	return;
+				// }
 				if (res.deviceId == these.formData.deviceId) {
 					if (res.device) {
 						these.formData.bleStatu = 'connecting';
@@ -587,7 +594,7 @@
 				}
 
 				let json = recei.ReceiveData(receive, device, path, recArr);
-				console.log("收到消息:", receive.hexs);
+				console.log("收到消息:", receive);
 				if (!json) {
 					return;
 				}
@@ -597,6 +604,8 @@
 						these.formData[key] = json[key];
 					}
 				});
+				these.formData.mode=parseInt(receive.hexs[2],16);
+				console.error("mode="+these.formData.mode);
 				if ('statu' in json) {
 					const chargingVal = json.statu;
 					const isCharging = chargingVal === 1 || chargingVal === '1' || chargingVal === true ||
@@ -783,7 +792,7 @@
 					sourceType: ['album'],
 					success: function(res) {
 						uni.navigateTo({
-							url: "/pages/ImgCrop/ImgCrop",
+							url: "/pages/common/ImgCrop/ImgCrop",
 							events: {
 								ImgCutOver: function(data) {
 									//将8位的二进制数组转换成16进制数据
@@ -1023,21 +1032,16 @@
 					case 0:
 
 
-						if (type == 'main') {
+						
 
 							dataValue = 0x01;
-						} else if (type == 'fu') {
-
-							dataValue = 0x04;
-						}
+						
 
 						break;
 					case 1:
 						dataValue = 0x02;
 						break;
-						// case 2:
-						// 	dataValue = 0x02;
-						// 	break;
+						
 					case 2:
 						dataValue = 0x03;
 						break;
@@ -1071,7 +1075,7 @@
 				});
 
 				ble.sendData(f.deviceId, buffer, f.writeServiceId, f.wirteCharactId, 100).then(() => {
-					this.formData.mode = mode;
+					this.formData.mode = mode+1;
 					this.setBleFormData();
 				}).catch((ex) => {
 					these.showPop({
@@ -1088,7 +1092,7 @@
 
 			},
 			handleItemClick(item, index) {
-
+debugger;
 			
 				this.Status.BottomMenu.activeIndex = index;
 
diff --git a/pages/common/addBLE/addEquip.vue b/pages/common/addBLE/addEquip.vue
index 371aca4..fe24c19 100644
--- a/pages/common/addBLE/addEquip.vue
+++ b/pages/common/addBLE/addEquip.vue
@@ -104,6 +104,7 @@
 			</view>
 		</BottomSlideMenuPlus>
 
+		<MsgBox ref="msgPop" />
 		<global-loading ref="loading" />
 	</view>
 </template>
@@ -115,7 +116,15 @@
 		showLoading,
 		hideLoading,
 		updateLoading
-	} from '@/utils/loading.js'
+	} from '@/utils/loading.js';
+	import {
+		MsgSuccess,
+		MsgError,
+		MsgClose,
+		MsgWarning,
+		showPop,
+		MsgClear
+	} from '@/utils/MsgPops.js';
 	const pagePath = "pages/common/addBLE/addEquip";
 	var ble = null;
 	var these = null;
@@ -490,24 +499,17 @@
 								console.log('定位权限已授予');
 								resolve(true);
 							} else {
-								console.warn('定位权限被拒绝');
-								uni.showModal({
-									title: '权限提醒',
-									content: '为了正常扫描蓝牙设备，需要您开启定位权限',
-									showCancel: false,
-									success: () => {
-										uni.openSetting(); // 引导用户去设置页
-									}
-								});
+								// console.warn('定位权限被拒绝');
+							
+								MsgClear(these);
+								showPop({headerTxt:'权限提醒',message:'扫描蓝牙设备，需要您开启定位权限',buttonText:'去开启',okCallback:uni.openSetting},these,true);
+								
 								resolve(false);
 							}
 						},
 						(error) => {
-							console.error('请求定位权限失败:', error);
-							uni.showToast({
-								title: '权限请求异常',
-								icon: 'none'
-							});
+						
+							MsgError('请求定位权限失败:'+error.code,'确定',these);
 							resolve(false);
 						}
 					);
@@ -537,7 +539,7 @@
 					}
 				}
 				showLoading(these, {
-					text: '正在刷新'
+					text: '正在扫描蓝牙设备'
 				})
 				let time = null;
 				let startSearch = () => {
@@ -558,10 +560,9 @@
 							if (err.code === 10001) {
 								these.showOpenSetting();
 							} else {
-								uni.showModal({
-									title: '提示',
-									content: '出现错误:' + err.msg
-								});
+								
+								MsgClear(these);
+								MsgError('出现错误:' + err.msg,'确定',these);
 
 							}
 						}).finally(() => {
@@ -571,7 +572,9 @@
 
 				}
 
-				ble.StopSearch().finally(startSearch);
+				ble.StopSearch().catch(err=>{
+					console.error("err=",err);
+				}).finally(startSearch);
 
 
 
@@ -806,9 +809,9 @@
 					linkCallback(res);
 				}).catch(ex => {
 					console.error("ex=", ex)
-					uni.showModal({
-						content: "连接失败:" + ex.msg
-					});
+					MsgClear(these);
+					
+					MsgError("连接失败:" + ex.msg,'确定',these);
 					hideLoading(these);
 				});
 
diff --git a/utils/BleHelper.js b/utils/BleHelper.js
index 2578eb2..cc90d94 100644
--- a/utils/BleHelper.js
+++ b/utils/BleHelper.js
@@ -56,7 +56,7 @@ class BleHelper {
 			isOpenBlue: false, //蓝牙模块是否开启
 			available: false, //蓝牙状态是否可用
 			discovering: false, //蓝牙是否正在搜索
-			
+
 			isSubscribe: false, //是否开启了订阅
 			LinkedList: linkedDevices, //已连接的设备列表 
 			platform: systemInfo.uniPlatform,
@@ -139,7 +139,7 @@ class BleHelper {
 				{
 					key: '10013',
 					remark: '连接 deviceId 为空或者是格式不正确'
-				},				
+				},
 				{
 					key: '10016',
 					remark: '定位服务已关闭'
@@ -234,11 +234,11 @@ class BleHelper {
 		}
 		if (key) {
 			// console.log("key=" + key);
-			let f =-1;
-			 
-			 this.cfg[type].find((v,index) => {
-				if(v.key == key){
-					f=index;
+			let f = -1;
+
+			this.cfg[type].find((v, index) => {
+				if (v.key == key) {
+					f = index;
 				}
 			});
 			if (f > -1) {
@@ -262,10 +262,10 @@ class BleHelper {
 
 		if (key) {
 			// console.log("key=" + key);
-			let f =-1;
-			 this.cfg[type].find((v,index) => {
-				if(v.key == key){
-					f=index;
+			let f = -1;
+			this.cfg[type].find((v, index) => {
+				if (v.key == key) {
+					f = index;
 				}
 			});
 			if (f > -1) {
@@ -281,26 +281,26 @@ class BleHelper {
 
 
 	//获取某个事件的所有订阅者,但不包含某些订阅者
-	getCfgAllKeys(type,retains){
-		if(!retains){
-			retains=[];
+	getCfgAllKeys(type, retains) {
+		if (!retains) {
+			retains = [];
 		}
-		if(!Array.isArray(retains)){
-			retains=[retains];
+		if (!Array.isArray(retains)) {
+			retains = [retains];
 		}
-		let keys=null;
+		let keys = null;
 		for (let index = 0; index < this.cfg[type]; index++) {
 			let ele = this.cfg[type];
-			let f=retains.find(v=>{
-				return v.toLowerCase()==ele.key.toLowerCase();
+			let f = retains.find(v => {
+				return v.toLowerCase() == ele.key.toLowerCase();
 			});
-			if(!f){
-				if(!keys){
-					keys=[ele.key];
-				}else{
-					keys.push(ele.key);	
+			if (!f) {
+				if (!keys) {
+					keys = [ele.key];
+				} else {
+					keys.push(ele.key);
 				}
-				
+
 			}
 		}
 		return keys;
@@ -316,15 +316,15 @@ class BleHelper {
 		this.removeCallback(currKey, 'recoveryCallback');
 	}
 	//移除所有蓝牙恢复连接的回调,但不包括currkey
-	removeAllRecoveryCallback(currKey) {		
-		let keys=this.getCfgAllKeys('recoveryCallback',currKey);
-		if(keys){
+	removeAllRecoveryCallback(currKey) {
+		let keys = this.getCfgAllKeys('recoveryCallback', currKey);
+		if (keys) {
 			for (let i = 0; i < keys.length; i++) {
 				let key = keys[i];
 				this.removeRecoveryCallback(key);
 			}
 		}
-		
+
 	}
 
 	//设置蓝牙断开连接的回调
@@ -337,14 +337,14 @@ class BleHelper {
 		this.removeCallback(currKey, 'bleDisposeCallback');
 	}
 	removeAllDisposeCallback(currKey) {
-		let keys=this.getCfgAllKeys('bleDisposeCallback',currKey);
-		if(keys){
+		let keys = this.getCfgAllKeys('bleDisposeCallback', currKey);
+		if (keys) {
 			for (let i = 0; i < keys.length; i++) {
 				let key = keys[i];
 				this.removeDisposeCallback(key);
 			}
 		}
-		
+
 	}
 
 
@@ -358,14 +358,14 @@ class BleHelper {
 		this.removeCallback(currKey, 'onDeviceFound');
 	}
 	removeAllDeviceFound(currKey) {
-		let keys=this.getCfgAllKeys('onDeviceFound',currKey);
-		if(keys){
+		let keys = this.getCfgAllKeys('onDeviceFound', currKey);
+		if (keys) {
 			for (let i = 0; i < keys.length; i++) {
 				let key = keys[i];
 				this.removeDeviceFound(key);
 			}
 		}
-		
+
 	}
 
 	//添加接收到数据的回调
@@ -378,14 +378,14 @@ class BleHelper {
 		this.removeCallback(currKey, 'receivDataCallback');
 	}
 	removeAllReceiveCallback(currKey) {
-		let keys=this.getCfgAllKeys('receivDataCallback',currKey);
-		if(keys){
+		let keys = this.getCfgAllKeys('receivDataCallback', currKey);
+		if (keys) {
 			for (let i = 0; i < keys.length; i++) {
 				let key = keys[i];
 				this.removeReceiveCallback(key);
 			}
 		}
-		
+
 	}
 
 	//添加蓝牙不可用的回调
@@ -398,14 +398,14 @@ class BleHelper {
 		this.removeCallback(currKey, 'stateBreakCallback');
 	}
 	removeAllStateBreakCallback(currKey) {
-		let keys=this.getCfgAllKeys('stateBreakCallback',currKey);
-		if(keys){
+		let keys = this.getCfgAllKeys('stateBreakCallback', currKey);
+		if (keys) {
 			for (let i = 0; i < keys.length; i++) {
 				let key = keys[i];
 				this.removeStateBreakCallback(key);
 			}
 		}
-		
+
 	}
 
 	//设置蓝牙适配器恢复可用的回调
@@ -418,14 +418,14 @@ class BleHelper {
 		this.removeCallback(currKey, 'stateRecoveryCallback');
 	}
 	removeAllStateRecoveryCallback(currKey) {
-		let keys=this.getCfgAllKeys('stateRecoveryCallback',currKey);
-		if(keys){
+		let keys = this.getCfgAllKeys('stateRecoveryCallback', currKey);
+		if (keys) {
 			for (let i = 0; i < keys.length; i++) {
 				let key = keys[i];
 				this.removeStateRecoveryCallback(key);
 			}
 		}
-		
+
 	}
 
 	//清除所有事件回调
@@ -448,10 +448,11 @@ class BleHelper {
 	}
 
 	getError(ex) {
-		let code = ex.code;
-		ex.msg = code
+		
+		ex.msg =ex.code+':'+ ex.errMsg;
+		 
 		let f = this.dic.errRemarks.find((v) => {
-			return v.key == code;
+			return v.key == ex.code;
 		});
 		if (f) {
 			ex.msg = f.remark;
@@ -733,20 +734,26 @@ class BleHelper {
 					let trimmedStr = str.trim();
 					if (trimmedStr && (trimmedStr.startsWith('{') || trimmedStr.startsWith('['))) {
 						let receivJson = JSON.parse(str);
-						let key = "sta_address"; //HBY100以此方式上传mac地址
-						if (key in receivJson) {
+
+						if ("sta_address" in receivJson || "sta_imei" in receivJson) {
 							this.data.LinkedList.find((v) => {
 								if (v.deviceId == receive
 									.deviceId) {
-									let macStr = receivJson[
-										key];
-									if (macStr.includes(':')) {
-										v.macAddress = macStr;
-									} else {
-										v.macAddress = macStr
-											.replace(/(.{2})/g,
-												'$1:').slice(0,
-												-1)
+									let macStr = receivJson["sta_address"];
+									if (macStr) {
+										if (macStr.includes(':')) {
+											v.macAddress = macStr;
+										} else {
+											v.macAddress = macStr
+												.replace(/(.{2})/g,
+													'$1:').slice(0,
+													-1)
+										}
+									}
+									
+									let sta_imei=receivJson["sta_imei"];
+									if(sta_imei){
+										v.imei=sta_imei;
 									}
 
 									isUpdate = true;
@@ -754,6 +761,8 @@ class BleHelper {
 							});
 
 						}
+
+
 					}
 				} catch (convertException) {
 					if (str && (str.trim().startsWith('{') || str.trim().startsWith('['))) {
@@ -779,23 +788,23 @@ class BleHelper {
 					str: str,
 					hexs: hexs
 				};
-				 // console.log("监听到特征值:",recData);
+				// console.log("监听到特征值:", recData);
 				if (this.cfg.receivDataCallback) {
 
 					if (this.cfg.receivDataCallback.length > 0) {
 
-						 // console.log("有人订阅消息")
+						// console.log("有人订阅消息")
 						this.cfg.receivDataCallback.forEach((
 							rec) => {
-							 // console.log("有人订阅消息111", )
+							// console.log("有人订阅消息111", )
 							if (rec.callback) {
 								try {
-									 // console.log("正在处理订阅消息",rec);
+									// console.log("正在处理订阅消息",rec);
 									rec.callback(recData, f,
 										rec.key, this.cfg
 										.receivDataCallback
 									);
-									 // console.log("处理订阅消息完毕");
+									// console.log("处理订阅消息完毕");
 								} catch (err) {
 									console.error(
 										"订阅消息出现异常",
@@ -886,10 +895,10 @@ class BleHelper {
 	}
 
 	BleConnChange() {
-		let stateTimeout=null;
+		let stateTimeout = null;
 		uni.onBLEConnectionStateChange((res) => {
-		
-			
+
+
 			// 检查状态是否真的发生了变化
 			let ble = this.data.LinkedList.find(dev => {
 				return res.deviceId === dev.deviceId;
@@ -903,7 +912,7 @@ class BleHelper {
 			// console.log("蓝牙连接状态变化了", res);
 
 			clearTimeout(stateTimeout);
-			stateTimeout=setTimeout(() => {
+			stateTimeout = setTimeout(() => {
 				if (!res.connected) {
 					// console.error("蓝牙已断开", res);
 					let f = this.data.LinkedList.find((
@@ -986,7 +995,7 @@ class BleHelper {
 				return;
 			}
 			res.devices = arr;
-			
+
 			if (this.cfg.onDeviceFound) {
 				if (this.cfg.onDeviceFound.length > 0) {
 					this.cfg.onDeviceFound.forEach((found) => {
@@ -1011,7 +1020,7 @@ class BleHelper {
 			this.data.available = false;
 			this.data.discovering = false;
 			this.data.isOpenBlue = false;
-		
+
 
 			return Promise.resolve();
 		}
@@ -1028,7 +1037,7 @@ class BleHelper {
 					this.data.available = false;
 					this.data.discovering = false;
 					this.data.isOpenBlue = false;
-					
+
 					resolve();
 				},
 				fail: (ex) => {
@@ -1063,7 +1072,7 @@ class BleHelper {
 		if (this.data.platform == 'web') {
 			return Promise.resolve({});
 		}
-		
+
 		var these = this;
 		//开始搜索
 		var Search = () => {
@@ -1071,7 +1080,7 @@ class BleHelper {
 			let RunSearch = () => {
 				return new Promise((resolve, reject) => {
 					uni.startBluetoothDevicesDiscovery({
-						services:[],
+						services: [],
 						allowDuplicatesKey: true,
 						success: (res) => {
 							console.log('开始搜索蓝牙设备成功');
@@ -1227,7 +1236,7 @@ class BleHelper {
 								// console.log("success SubScribe");
 								succ(
 									res
-									); //见了鬼了，有时候执行了succ但promise永远pending了
+								); //见了鬼了，有时候执行了succ但promise永远pending了
 							},
 							fail: (ex) => {
 
@@ -1370,8 +1379,7 @@ class BleHelper {
 								// 	notifyCharId));
 
 
-							} else
-							{
+							} else {
 								console.error("预设的蓝牙服务和特征中找不到");
 								for (var i = 0; i < res.services.length; i++) {
 									let service = res.services[i];
@@ -1604,23 +1612,23 @@ class BleHelper {
 						timeout: 15000,
 						success: (info) => {
 							//释放连接锁
-							
+
 							delete this.data.connectingDevices[deviceId];
 							console.log("新连接成功", this.data.LinkedList);
-							
+
 							// 处理 MTU 设置
 							if (plus.os.name === 'Android') {
 								this.setMtu(deviceId).catch(ex => {
 									console.error("mtu设置失败=", ex);
 								});
 							}
-							
+
 							this.getLinkBlue().then((arr) => {
-								let linkId=new Date().getTime();//本次连接的id
+								let linkId = new Date().getTime(); //本次连接的id
 								let cr = arr.devices.find(c => {
 									if (c.deviceId == deviceId) {
 										c.Linked = true;
-										c.linkId=linkId
+										c.linkId = linkId
 										return true;
 									}
 									return false;
@@ -1628,7 +1636,8 @@ class BleHelper {
 
 								if (fIndex > -1) {
 									this.data.LinkedList[fIndex].Linked = true;
-									this.data.LinkedList[fIndex].linkId=linkId;
+									this.data.LinkedList[fIndex].linkId =
+									linkId;
 								} else {
 									this.data.LinkedList.push(cr);
 								}
@@ -1662,7 +1671,7 @@ class BleHelper {
 									});
 								}
 
-								
+
 								resolve(true);
 
 							}).catch((ex) => {
@@ -1955,17 +1964,17 @@ class BleHelper {
 						return;
 					}
 					// console.log("device=", device);
-				uni.writeBLECharacteristicValue({
-					deviceId: device.deviceId,
-					serviceId: device.writeServiceId,
-					characteristicId: device.wirteCharactId,
-					value: buffer,
-					writeType: 'write',
-					success: () => {
-						console.log("✓ 蓝牙指令发送成功 - deviceId:", device
-							.deviceId);
-						succ();
-					},
+					uni.writeBLECharacteristicValue({
+						deviceId: device.deviceId,
+						serviceId: device.writeServiceId,
+						characteristicId: device.wirteCharactId,
+						value: buffer,
+						writeType: 'write',
+						success: () => {
+							console.log("✓ 蓝牙指令发送成功 - deviceId:", device
+								.deviceId);
+							succ();
+						},
 						fail: (ex) => {
 							ex = this.getError(ex);
 							console.error("✗ 蓝牙指令发送失败 - deviceId:", device
@@ -2030,7 +2039,7 @@ class BleHelper {
 
 	}
 
-	
+
 
 
 
@@ -2048,5 +2057,5 @@ export default {
 
 		return instance;
 	},
-	constService:serviceDic
-}
+	constService: serviceDic
+}
\ No newline at end of file
diff --git a/utils/BleReceive.js b/utils/BleReceive.js
index e4a7caf..5836a75 100644
--- a/utils/BleReceive.js
+++ b/utils/BleReceive.js
@@ -11,7 +11,8 @@ class BleReceive {
 			'/pages/670/HBY670': this.Receive_670.bind(this),
 			'/pages/4877/BJQ4877': this.Receive_4877.bind(this),
 			'/pages/100/HBY100': this.Receive_100.bind(this),
-			'/pages/102/HBY102': this.Receive_102.bind(this)
+			'/pages/102/HBY102': this.Receive_102.bind(this),
+			'/pages/6170/deviceControl/index':this.Receive_6170.bind(this)
 		};
 	}
 
@@ -671,6 +672,43 @@ class BleReceive {
 	}
 
 
+Receive_6170(receive, f, path, recArr) {
+		let receiveData = {};
+
+		try {
+			console.log("订阅消息者：", path);
+			console.log("设备收到消息：", f);
+			console.log("消息内容:", receive);
+			receiveData = JSON.parse(receive.str);
+
+			let recCnt = recArr.find(v => {
+				return v.key.replace(/\//g, "").toLowerCase() == f.device.detailPageUrl
+					.replace(/\//g, "").toLowerCase();
+			});
+			if (!recCnt) {
+				if (receiveData.sta_PowerPercent <= 20) {
+					uni.showModal({
+						title: "提示",
+						content: "设备'" + f.device.deviceName + "'电量低",
+						showCancel: false
+					});
+				}
+				
+			}
+
+
+
+			
+
+
+		} catch (error) {
+			receiveData = {};
+			console.error("文本解析失败", error)
+		}
+		return receiveData;
+
+	}
+
 	Receive_102(receive, f, path, recArr) {
 		let receiveData = {};