diff --git a/components/MsgBox/MsgBox.vue b/components/MsgBox/MsgBox.vue
index 41f8d0c..3c4bea3 100644
--- a/components/MsgBox/MsgBox.vue
+++ b/components/MsgBox/MsgBox.vue
@@ -6,10 +6,12 @@
 			:buttonTextColor="item.buttonTextColor" :iconUrl="item.iconUrl" :message="item.message"
 			:buttonText="item.buttonText" @buttonClick="okCallback(item,index)" :visiblePrompt="item.visiblePrompt"
 			:promptTitle="item.promptTitle" v-model="item.modelValue" @closePop="closePop(item)"
-			:buttonCancelText="item.buttonCancelText" :showCancel="item.showCancel"
+			:buttonCancelText="item.buttonCancelText" :showCancel="item.showCancel" :showSlot="item.showSlot"
 			:showHeader="item.showHeader" :headerTxt="item.headerTxt"
 		
-			@cancelPop="cancelClick(item,index)" />
+			@cancelPop="cancelClick(item,index)" >
+			<slot />
+			</MessagePopup>
 	</view>
 </template>
 
@@ -48,10 +50,10 @@
 				this.closePop(item);
 			},
 			closePop: function(item) {
-				debugger;
+				
 				if (item) {
 					this.Msgboxs.find((v, i) => {
-						debugger;
+						
 						if (item.key && v.key) {
 							if (item.key === v.key) {
 								this.Msgboxs.splice(i, 1);
@@ -79,7 +81,7 @@
 					showPop: true, //是否显示弹窗
 					popType: 'custom',
 					bgColor: '#383934bd',
-					borderColor: '#BBE600',
+					borderColor: '#BBE6004d',
 					textColor: '#ffffffde',
 					buttonBgColor: '#BBE600',
 					buttonTextColor: '#232323DE',
@@ -116,7 +118,7 @@
 				}
 
 				if (!json.borderColor) {
-					json.borderColor = '#BBE600';
+					json.borderColor = '#BBE6004d';
 					json.buttonBgColor = '#BBE600';
 				}
 				json.showPop = true;
@@ -137,21 +139,37 @@
 					error: {
 						icoUrl: '/static/images/common/uploadErr.png',
 						borderColor: "#e034344d",
-						buttonBgColor: "#E03434"
+						buttonBgColor: "#E03434",
+						bgColor:'#38393466',
+						buttonTextColor:'#FFFFFFde'
 					},
 					succ: {
 						icoUrl: '/static/images/common/success.png',
-						borderColor: "#BBE600",
-						buttonBgColor: "#BBE600"
+						borderColor: "#BBE6004d",
+						buttonBgColor: "#BBE600",
+						bgColor:'#38393466'
 					},
 					warn: {
 						icoUrl: '/static/images/common/warning.png',
-						borderColor: "#FFC84E",
+						borderColor: "#FFC84E4d",
 						buttonBgColor: "#FFC84E",
+						bgColor:'#38393466'
 					},
 					info:{						
-						borderColor: "#BBE600",
-						buttonBgColor: "#BBE600"
+						borderColor: "#BBE6004d",
+						buttonBgColor: "#BBE600",
+						bgColor:'#38393466'
+					},
+					prompt:{
+						
+						
+						borderColor: "#aed6004d",
+						buttonBgColor: "#aed600",
+						bgColor:'#38393466',
+						buttonTextColor:'#232323de',
+						showSlot:true,
+						showCancel:true,
+						buttonCancelText:'取消'
 					}
 				}
 
@@ -171,7 +189,13 @@
 					borderColor: cfg[type].borderColor,
 					buttonBgColor: cfg[type].buttonBgColor,
 					buttonText: btnTxt ? btnTxt : '确定',
-					okCallback: okCallback ? okCallback : this.closePop
+					okCallback: okCallback ? okCallback : this.closePop,
+					buttonTextColor:cfg[type].buttonTextColor,
+					bgColor:cfg[type].bgColor,
+					showSlot:cfg[type].showSlot,
+					showCancel:cfg[type].showCancel,
+					buttonCancelText:cfg[type].buttonCancelText
+					
 				};
 				return this.showPop(options);
 
diff --git a/components/ProParams/ProParams.vue b/components/ProParams/ProParams.vue
index 11742ea..28a41b6 100644
--- a/components/ProParams/ProParams.vue
+++ b/components/ProParams/ProParams.vue
@@ -107,6 +107,6 @@
 		justify-content: space-between;
 		align-items: center;
 		font-size: 28rpx;
-		color: #FFFFFF;
+		color: #FFFFFFde;
 	}
 </style>
\ No newline at end of file
diff --git a/components/TextToHex/TextToHex.vue b/components/TextToHex/TextToHex.vue
index ea33b5e..fe8cfee 100644
--- a/components/TextToHex/TextToHex.vue
+++ b/components/TextToHex/TextToHex.vue
@@ -58,7 +58,7 @@
 			 * 清除Canvas内容
 			 */
 			clearCanvas() {
-				this.ctx.setFillStyle(this.bgColor);
+				this.ctx.setFillStyle('#FFFFFF');//this.bgColor
 				this.ctx.fillRect(0, 0, this.currentCanvasWidth, this.currentCanvasHeight);
 			},
 
@@ -73,31 +73,49 @@
 
 					// 逐行处理
 					for (let y = 0; y < 16; y++) {
-						let byte1 = 0,
-							byte2 = 0;
+						let byte1 = '',
+							byte2 = '';
 
 						// 每行16个像素，分为两个字节
 						for (let x = 0; x < 16; x++) {
 							// 计算像素在imageData中的索引 (RGBA格式)
 							let index = (y * 16 + x) * 4;
-							let red = imageData[index];
-
-							// 黑色像素（R值较低）视为1，白色视为0
-							let isBlack = red < 128;
-
-							if (x < 8) {
-								// 第一个字节（左8位）
-								if (isBlack) {
-									byte1 |= 0x80 >> x; // 从左到右设置位
-								}
-							} else {
-								// 第二个字节（右8位）
-								if (isBlack) {
-									byte2 |= 0x80 >> (x - 8);
-								}
+							let index = (y * 16 + x) * 4;
+							let r = imageData[index];
+							let g = imageData[index+1];
+							let b = imageData[index+2];
+												
+												
+							let gray = (r + g + b) / 3;
+							let bit = gray < 255 ? '1' : '0';
+										
+							
+							
+							if (x < 8) {				
+								byte1+=bit;
+							} else {				
+								byte2+=bit;
 							}
-						}
+							// let red = imageData[index];
 
+							// // 黑色像素（R值较低）视为1，白色视为0
+							// let isBlack = red < 128;
+
+							// if (x < 8) {
+							// 	// 第一个字节（左8位）
+							// 	if (isBlack) {
+							// 		byte1 |= 0x80 >> x; // 从左到右设置位
+							// 	}
+							// } else {
+							// 	// 第二个字节（右8位）
+							// 	if (isBlack) {
+							// 		byte2 |= 0x80 >> (x - 8);
+							// 	}
+							// }
+						}
+						
+						byte1=parseInt(byte1,2);
+						byte2=parseInt(byte2,2);
 						// 将字节转换为两位十六进制字符串
 						matrix.push('0x' + byte1.toString(16).padStart(2, '0').toUpperCase());
 						matrix.push('0x' + byte2.toString(16).padStart(2, '0').toUpperCase());
@@ -118,7 +136,7 @@
 					this.clearCanvas();
 
 					// 3. 设置文字样式
-					ctx.setFillStyle(this.color);
+					ctx.setFillStyle('#000000');//this.color
 					ctx.setTextBaseline('middle');
 					ctx.setFontSize(this.fontSize);
 					ctx.font = `${this.fontSize}px "PingFang SC", PingFang SC, Arial, sans-serif`;
diff --git a/components/TextToHex/TextToHexV1.vue b/components/TextToHex/TextToHexV1.vue
index 36612d1..a54a9ed 100644
--- a/components/TextToHex/TextToHexV1.vue
+++ b/components/TextToHex/TextToHexV1.vue
@@ -60,7 +60,7 @@
 			 * 清除Canvas内容
 			 */
 			clearCanvas() {
-				this.ctx.setFillStyle(this.bgColor);
+				this.ctx.setFillStyle('#FFFFFF'); //this.bgColor
 				this.ctx.fillRect(0, 0, this.currentCanvasWidth, this.currentCanvasHeight);
 			},
 
@@ -71,22 +71,22 @@
 				if (this.canvasWarmed) {
 					return;
 				}
-				
+
 				try {
 					// 设置画布尺寸
 					this.currentCanvasWidth = 16;
 					this.currentCanvasHeight = 16;
-					
+
 					// 清空画布
 					this.clearCanvas();
-					
+
 					// 绘制一个测试字符来预热字体和画布
-					this.ctx.setFillStyle(this.color);
+					this.ctx.setFillStyle('#000000'); //this.color
 					this.ctx.setFontSize(this.fontSize);
 					this.ctx.font = `${this.fontSize}px "PingFangBold", "PingFang SC", Arial, sans-serif`;
 					this.ctx.setTextBaseline('middle');
 					this.ctx.fillText('测', 0, 8);
-					
+
 					// 等待画布绘制完成
 					await new Promise((resolve) => {
 						this.ctx.draw(false, () => {
@@ -110,7 +110,7 @@
 							}, 100);
 						});
 					});
-					
+
 					// 额外等待确保字体完全加载
 					await new Promise(resolve => setTimeout(resolve, 200));
 				} catch (ex) {
@@ -118,55 +118,55 @@
 					this.canvasWarmed = true; // 即使失败也标记为已预热，避免重复尝试
 				}
 			},
-			
+
 			/**
 			 * 复用单个Canvas处理所有文本行
 			 */
 			async drawAndGetPixels() {
 				// 第一次调用时先预热画布（解决APP重新打开后第一次获取数据不完整的问题）
 				// await this.warmupCanvas();
-				
-				let convertCharToMatrix=function(imageData) {
-					debugger;
+				let convertCharToMatrix = function(imageData) {
+					
 					// console.log("imgData=",imageData)
 					let matrix = [];
-
+				
 					// 逐行处理
 					for (let y = 0; y < 16; y++) {
-						let byte1 = 0,
-							byte2 = 0;
-
-						// 每行16个像素，分为两个字节
+						let byte1 = '',
+							byte2 = '';
+				
+				
 						for (let x = 0; x < 16; x++) {
-							// 计算像素在imageData中的索引 (RGBA格式)
+				
 							let index = (y * 16 + x) * 4;
-							let red = imageData[index];
-
-							// 黑色像素（R值较低）视为1，白色视为0
-							let isBlack = red < 128;
-
-							if (x < 8) {
-								// 第一个字节（左8位）
-								if (isBlack) {
-									byte1 |= 0x80 >> x; // 从左到右设置位
-								}
-							} else {
-								// 第二个字节（右8位）
-								if (isBlack) {
-									byte2 |= 0x80 >> (x - 8);
-								}
+							let r = imageData[index];
+							let g = imageData[index+1];
+							let b = imageData[index+2];
+					
+					
+							let gray = (r + g + b) / 3;
+					        let bit = gray < 255 ? '1' : '0';
+										
+							
+							
+							if (x < 8) {				
+								byte1+=bit;
+							} else {				
+								byte2+=bit;
 							}
 						}
-
+						byte1=parseInt(byte1,2);
+						byte2=parseInt(byte2,2);
 						// 将字节转换为两位十六进制字符串
 						matrix.push('0x' + byte1.toString(16).padStart(2, '0').toUpperCase());
 						matrix.push('0x' + byte2.toString(16).padStart(2, '0').toUpperCase());
 					}
-
+				
 					return matrix;
 				}
+			
 
-				let  drawTxt=async (textLine)=> {
+				let drawTxt = async (textLine) => {
 					debugger;
 					let result = {};
 					let ctx = this.ctx;
@@ -179,12 +179,12 @@
 					this.clearCanvas();
 
 					// 3. 设置文字样式
-					ctx.setFillStyle(this.color);
+					ctx.setFillStyle('#000000'); //this.color
 					ctx.setTextBaseline('middle');
 					// ctx.setTextAlign('center')
 					ctx.setFontSize(this.fontSize);
-					ctx.font = `${this.fontSize}px "PingFangBold", "PingFang SC", Arial, sans-serif`;
-					
+					ctx.font = `${this.fontSize}px  "PingFang SC","PingFangBold", Arial, sans-serif`;
+
 					// 4. 绘制当前行文本
 					let currentX = 0;
 					let currentY = this.fontSize / 2;
@@ -206,8 +206,8 @@
 								width: this.currentCanvasWidth,
 								height: this.currentCanvasHeight,
 								success: res => {
-									
-									result={
+
+									result = {
 										line: textLine,
 										pixelData: res.data,
 										width: this.currentCanvasWidth,
@@ -228,10 +228,10 @@
 				let arr = [];
 				// 循环处理每行文本
 				for (let i = 0; i < this.validTxts.length; i++) {
-debugger;
+					debugger;
 					let linePixls = [];
 					let item = this.validTxts[i];
-				
+
 					for (var j = 0; j < item.length; j++) {
 						let result = await drawTxt(item[j]);
 						linePixls.push(convertCharToMatrix(result.pixelData));
@@ -239,7 +239,7 @@ debugger;
 					// console.log("hexs=",linePixls.join(","));
 					arr.push(linePixls);
 				}
-				
+
 				return arr;
 			}
 		}
diff --git a/components/TextToHex/TextToHexV2.vue b/components/TextToHex/TextToHexV2.vue
index ffd27b4..d49c4ed 100644
--- a/components/TextToHex/TextToHexV2.vue
+++ b/components/TextToHex/TextToHexV2.vue
@@ -70,7 +70,7 @@
 			 * 清除Canvas内容
 			 */
 			clearCanvas() {
-				this.ctx.setFillStyle(this.bgColor);
+				this.ctx.setFillStyle('#FFFFFF');//this.bgColor
 				this.ctx.fillRect(0, 0, this.currentCanvasWidth, this.currentCanvasHeight);
 			},
 
@@ -87,7 +87,7 @@
 					this.clearCanvas();
 
 					// 绘制一个测试字符来预热字体和画布
-					this.ctx.setFillStyle(this.color);
+					this.ctx.setFillStyle('#000000');//this.color
 					this.ctx.setFontSize(this.fontSize);
 					this.ctx.font = `${this.fontSize}px "PingFangBold","PingFang SC", Arial, sans-serif`;
 					this.ctx.setTextBaseline('middle');
@@ -212,7 +212,7 @@
 					this.clearCanvas();
 
 					// 3. 设置文字样式
-					ctx.setFillStyle(this.color);
+					ctx.setFillStyle('#000000');//this.color
 					ctx.setTextBaseline('middle');
 					// ctx.setTextAlign('center')
 					ctx.setFontSize(this.fontSize);
diff --git a/components/TextToHex/textToDotMatrix.vue b/components/TextToHex/textToDotMatrix.vue
index 2dc904d..1ac8e4b 100644
--- a/components/TextToHex/textToDotMatrix.vue
+++ b/components/TextToHex/textToDotMatrix.vue
@@ -58,7 +58,7 @@
 			 * 清除Canvas内容
 			 */
 			clearCanvas() {
-				this.ctx.setFillStyle(this.bgColor);
+				this.ctx.setFillStyle('#FFFFFF');//this.bgColor
 				this.ctx.fillRect(0, 0, this.currentCanvasWidth, this.currentCanvasHeight);
 			},
 
@@ -100,10 +100,19 @@
 						for (let x = 0; x < 16; x++) {
 							// 计算像素在imageData中的索引 (RGBA格式)
 							let index = (y * 16 + x) * 4;
-							let red = imageData[index];
+							// let red = imageData[index];
 
+
+							let r = imageData[index];
+							let g = imageData[index+1];
+							let b = imageData[index+2];
+
+
+							let gray = (r + g + b) / 3;
+							let bit = gray < 255 ? '1' : '0';
+							
 							// 黑色像素（R值较低）视为1，白色视为0
-							let isBlack = red < 128 ? 1 : 0;
+							let isBlack =gray < 255 ? 1 : 0;// red < 128 ? 1 : 0;
 							arr.push(isBlack);
 
 						}
@@ -154,7 +163,7 @@
 					this.clearCanvas();
 
 					// 3. 设置文字样式
-					ctx.setFillStyle(this.color);
+					ctx.setFillStyle('#000000');//this.color
 					ctx.setTextBaseline('middle');
 					// ctx.setTextAlign('center')
 					ctx.setFontSize(this.fontSize);
diff --git a/components/TextToHex/textToDotMatrixFor7305.vue b/components/TextToHex/textToDotMatrixFor7305.vue
index ddf0847..082a62e 100644
--- a/components/TextToHex/textToDotMatrixFor7305.vue
+++ b/components/TextToHex/textToDotMatrixFor7305.vue
@@ -65,7 +65,7 @@
 			 * 清除Canvas内容
 			 */
 			clearCanvas() {
-				this.ctx.setFillStyle(this.bgColor);
+				this.ctx.setFillStyle('#FFFFFF');//this.bgColor
 				this.ctx.fillRect(0, 0, this.currentCanvasWidth, this.currentCanvasHeight);
 			},
 
@@ -82,9 +82,9 @@
 					this.currentCanvasWidth = 16;
 					this.currentCanvasHeight = 16;
 					this.clearCanvas();
-					this.ctx.setFillStyle(this.color);
+					this.ctx.setFillStyle('#000000');//this.color
 					this.ctx.setFontSize(this.fontSize);
-					this.ctx.font = `${this.fontSize}px "PingFangBold", "PingFang SC", Arial, sans-serif`;
+					this.ctx.font = `${this.fontSize}px "PingFang SC","PingFangBold",  Arial, sans-serif`;
 					this.ctx.setTextBaseline('middle');
 					this.ctx.fillText('测', 0, 8);
 
@@ -158,12 +158,20 @@
 						// pixels.push(R < 128 ? 1 : 0);
 						
 						
-						const R = imageData[i];
-						const G = imageData[i + 1];
-						const B = imageData[i + 2];
-						const gray = 0.299 * R + 0.587 * G + 0.114 * B; // 灰度转换
-						pixels.push(gray < 128 ? 1 : 0);
+						// const R = imageData[i];
+						// const G = imageData[i + 1];
+						// const B = imageData[i + 2];
+						// const gray = 0.299 * R + 0.587 * G + 0.114 * B; // 灰度转换
+						// pixels.push(gray < 128 ? 1 : 0);
 						
+						let r = imageData[i];
+						let g = imageData[i+1];
+						let b = imageData[i+2];
+
+
+						let gray = (r + g + b) / 3;
+						let bit = gray < 255 ? 1 : 0;
+						pixels.push(bit);
 					}
 
 					const lowBytes = new Array(charWidth).fill(0);
@@ -197,11 +205,11 @@
 					this.clearCanvas();
 
 					// 3. 设置文字样式
-					ctx.setFillStyle(this.color);
+					ctx.setFillStyle('#000000');//this.color
 					ctx.setTextBaseline('middle');
 					// ctx.setTextAlign('center')
 					ctx.setFontSize(this.fontSize);
-					ctx.font = `${this.fontSize}px "PingFangBold", "PingFang SC", Arial, sans-serif`;
+					ctx.font = `${this.fontSize}px "PingFang SC","PingFangBold",  Arial, sans-serif`;
 
 					// 4. 绘制当前行文本
 					debugger;
diff --git a/components/TextToHex/textToDotMatrixV1.vue b/components/TextToHex/textToDotMatrixV1.vue
index 5191740..04f2cb0 100644
--- a/components/TextToHex/textToDotMatrixV1.vue
+++ b/components/TextToHex/textToDotMatrixV1.vue
@@ -59,7 +59,7 @@
 			 * 清除Canvas内容
 			 */
 			clearCanvas() {
-				this.ctx.setFillStyle(this.bgColor);
+				this.ctx.setFillStyle('#FFFFFF');//this.bgColor
 				this.ctx.fillRect(0, 0, this.currentCanvasWidth, this.currentCanvasHeight);
 			},
 
@@ -105,10 +105,18 @@
 							let G = imageData[index+1];
 							let B = imageData[index]+2;
 							
+							// let r = imageData[i];
+							// let g = imageData[i+1];
+							// let b = imageData[i+2];
+							
+							
+							let gray = (R + G + B) / 3;
+							let bit = gray < 255 ? 1 : 0;
+							
 							
 							// 黑色像素（R值较低）视为1，白色视为0
-							let isBlack = R < 128 ? 1 : 0;
-							arr.push(isBlack);
+							// let isBlack = R < 128 ? 1 : 0;
+							arr.push(bit);
 
 						}
 					}
@@ -159,11 +167,11 @@
 					this.clearCanvas();
 
 					// 3. 设置文字样式
-					ctx.setFillStyle(this.color);
+					ctx.setFillStyle('#000000');//this.color
 					ctx.setTextBaseline('middle');
 					// ctx.setTextAlign('center')
 					ctx.setFontSize(this.fontSize);
-					ctx.font = `${this.fontSize}px "PingFangBold", "PingFang SC", Arial, sans-serif`;
+					ctx.font = `${this.fontSize}px PingFangBold", "PingFang SC", Arial, sans-serif`;
 
 					// 4. 绘制当前行文本
 					let currentX = 0;
diff --git a/components/global-loading/global-loading.vue b/components/global-loading/global-loading.vue
index 2a73aab..138339e 100644
--- a/components/global-loading/global-loading.vue
+++ b/components/global-loading/global-loading.vue
@@ -141,9 +141,8 @@
 		flex-direction: column;
 		align-items: center;
 		justify-content: center;
-		transform: translateZ(0);
-		/* 启用GPU加速 */
-		margin-top: -150rpx;
+		transform: translateZ(0);		
+		margin-top: 0rpx;
 	}
 
 	/* 刻度容器 */
diff --git a/pages.json b/pages.json
index 9289587..886b888 100644
--- a/pages.json
+++ b/pages.json
@@ -459,6 +459,13 @@
 			"style": {
 				"navigationBarTitleText": ""
 			}
+		},
+		{
+			"path": "pages/210/HBY210",
+			"style": {
+				"navigationStyle": "custom",
+				"navigationBarTitleText": "HBY210"
+			}
 		}
 
 	],
diff --git a/pages/008A/HBY008A.vue b/pages/008A/HBY008A.vue
index a6b2dd8..fabaf03 100644
--- a/pages/008A/HBY008A.vue
+++ b/pages/008A/HBY008A.vue
@@ -66,7 +66,9 @@
 		</view>
 	
 		<ProParams :id="device.id"></ProParams>
+		
 		<MsgBox ref="msgPop" />
+			
 		<global-loading ref="loading" />
 	</view>
 </template>
@@ -85,7 +87,8 @@
 		MsgClose,
 		MsgWarning,
 		showPop,
-		MsgInfo
+		MsgInfo,
+		MsgPrompt
 	} from '@/utils/MsgPops.js'
 	import Common from '@/utils/Common.js';
 	import BleTool from '@/utils/BleHelper.js'
@@ -213,7 +216,7 @@
 		},
 
 		onLoad() {
-			
+		
 			these = this;
 			recei = BleReceive.getBleReceive();
 			ble = BleTool.getBleTool();
@@ -227,8 +230,8 @@
 
 			eventChannel = this.getOpenerEventChannel();
 
-			eventChannel.on('detailData', function(data) {
-
+			eventChannel.on('detailData', (data)=> {
+				
 				console.log("收到父页面的参数：" + JSON.stringify(data));
 				var device = data.data;
 				these.Status.apiType = data.apiType;
@@ -1196,7 +1199,7 @@
 	.navbarRight .img {
 		width: 35rpx;
 		height: 35rpx;
-		margin-right: 20rpx;
+		margin-right: 30rpx;
 	}
 
 	.uni-navbar--fixed {
diff --git a/pages/018A/HBY018A.vue b/pages/018A/HBY018A.vue
index 2c38b37..2052a4e 100644
--- a/pages/018A/HBY018A.vue
+++ b/pages/018A/HBY018A.vue
@@ -623,7 +623,7 @@
 					borderColor: "#e034344d",
 					buttonBgColor: "#E03434",
 					buttonText: '去连接',
-					buttonTextColor: '#232323de',
+					buttonTextColor: '#FFFFFFde',
 					okCallback: function() {
 
 						uni.navigateTo({
diff --git a/pages/100/HBY100.vue b/pages/100/HBY100.vue
index 2e11bab..d988b27 100644
--- a/pages/100/HBY100.vue
+++ b/pages/100/HBY100.vue
@@ -1360,7 +1360,7 @@ onFreqChanging(e){
 					borderColor: "#e034344d",
 					buttonBgColor: "#E03434",
 					buttonText: '去连接',
-					buttonTextColor: '#232323de',
+                    buttonTextColor: '#FFFFFFde',
 					okCallback: function() {
 
 						uni.navigateTo({
diff --git a/pages/100J/HBY100-J.vue b/pages/100J/HBY100-J.vue
index 53ba724..26f63d4 100644
--- a/pages/100J/HBY100-J.vue
+++ b/pages/100J/HBY100-J.vue
@@ -58,6 +58,11 @@
 					<text class="value"
 						:class="deviceInfo.onlineStatus===0?'red':'green'">{{ deviceInfo.onlineStatus === 0 ? '离线': '在线' }}</text>
 				</view>
+				<view class="item">
+					<text class="lbl">充电状态</text>
+					<text class="value"
+						>{{ deviceInfo.chargingStatus === 0 ? '未充电': '充电中' }}</text>
+				</view>
 				<view class="info-row">
 					<text class="info-label" style="display: flex; align-items: center;">定位信息</text>
 					<view class="info-value status-running" @click="gpsPosition(deviceInfo)">
@@ -192,6 +197,16 @@
 				</view>
 			</view>
 			<ProParams :id="device.id"></ProParams>
+			
+			<MessagePopup :visible="Status.Pop.showPop" :type="Status.Pop.popType" :bgColor="Status.Pop.bgColor"
+								:borderColor="Status.Pop.borderColor" :textColor="Status.Pop.textColor"
+								:buttonBgColor="Status.Pop.buttonBgColor" :buttonTextColor="Status.Pop.buttonTextColor"
+								:iconUrl="Status.Pop.iconUrl" :message="Status.Pop.message" :buttonText="Status.Pop.buttonText"
+								@buttonClick="HidePop" :visiblePrompt="Status.Pop.visiblePrompt"
+								:promptTitle="Status.Pop.promptTitle" v-model="Status.Pop.modelValue"
+								:buttonCancelText="Status.Pop.buttonCancelText" :showCancel="Status.Pop.showCancel"
+								@cancelPop="closePop" />
+								
 			<MsgBox ref="msgPop" />
 		</view>
 	</view>
@@ -1514,7 +1529,7 @@
 					option.buttonBgColor = '#BBE600';
 				}
 				these.Status.Pop.showPop = true;
-                showPop(option,this);
+                
 			},
 			btnClick() {
 
diff --git a/pages/100Y/HBY100Y.vue b/pages/100Y/HBY100Y.vue
index cf619a7..4c43935 100644
--- a/pages/100Y/HBY100Y.vue
+++ b/pages/100Y/HBY100Y.vue
@@ -1196,7 +1196,7 @@
 	.navbarRight .img {
 		width: 35rpx;
 		height: 35rpx;
-		margin-right: 20rpx;
+		margin-right: 30rpx;
 	}
 
 	.uni-navbar--fixed {
diff --git a/pages/102/HBY102.vue b/pages/102/HBY102.vue
index 113d0ed..f9ab8c2 100644
--- a/pages/102/HBY102.vue
+++ b/pages/102/HBY102.vue
@@ -1365,7 +1365,7 @@
 					borderColor: "#e034344d",
 					buttonBgColor: "#E03434",
 					buttonText: '去连接',
-					buttonTextColor: '#232323de',
+                    buttonTextColor: '#FFFFFFde',
 					okCallback: function() {
 
 						uni.navigateTo({
diff --git a/pages/210/HBY210.vue b/pages/210/HBY210.vue
index 9b725c6..edd15d3 100644
--- a/pages/210/HBY210.vue
+++ b/pages/210/HBY210.vue
@@ -1,750 +1,671 @@
 <template>
-	<view>
-		<!-- 添加全局加载遮罩 -->
-		<view v-if="pageLoading" class="page-loading-mask">
+	<view class="maincontent contentBg">
+
+		<uni-nav-bar :border="false" @clickLeft="prevPage" fixed="true" statusBar="true" background-color="#121212"
+			color="#FFFFFF" :title="Status.navbar.title">
+			<template v-slot:left>
+				<view>
+					<uni-icons type="left" size="24" color="#FFFFFF"></uni-icons>
+				</view>
+			</template>
+			<block slot="right">
+				<view class="navbarRight center">
+					<image @click.stop="handleRightClick(index,item)" v-for="item,index in Status.navbar.icons"
+						class="img" :src="item.src" mode="aspectFit"></image>
+				</view>
+
+			</block>
+		</uni-nav-bar>
+
+		<view class="eq" :style="{marginTop:Status.navbar.height+'px'}">
+			<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>
+			<view class="rightTxt">
+				<view class="row">
+					<image class="img" src="/static/images/common/battry.png" mode="aspectFit"></image>
+					<view class="txt">
+						<view class="bigTxt">{{formData.battary}}%</view>
+						<view class="smallTxt">电量</view>
+					</view>
+				</view>
+				<view class="row">
+					<image class="img" src="/static/images/common/time.png" mode="aspectFit"></image>
+					<view class="txt">
+						<view class="bigTxt">{{formData.xuhang}}</view>
+						<view class="smallTxt">续航时间</view>
+					</view>
+				</view>
+			</view>
 		</view>
-		<!-- 使用自定义导航栏 -->
-		<view v-show="!pageLoading">
-			<custom-navbar :title="navTitle" :showBack="true" color="#FFFFFF" :rightIcons="[
-				    {src: '/static/images/210/ls.png'},
-				    ...(isRightIconVisible ? [{src: '/static/images/common/shape.png'}] : [])
-				  ]" @icon-click="handleIconClick"></custom-navbar>
+		<view class="eqinfo">
+			<view class="item">
+				<text class="lbl">设备名称</text>
+				<text class="value valueFont">{{device.deviceName}}</text>
+			</view>
+			<view class="item">
+				<text class="lbl">设备IMEI</text>
+				<text class="value">{{device.deviceImei}}</text>
+			</view>
 
-			<view class="device-detail-container" :style="{ paddingTop: navBarHeight + 'px' }">
-				<!-- 设备电量信息 -->
-				<view class="battery-section">
-					<view class="battery-sectionLeft">
-						<image :src="deviceInfo.devicePic" class="bipImg" mode="aspectFit"></image>
-					</view>
-					<view>
-						<view class="battery-v1">
-							<image src="/static/images/common/battry.png" class="dlIMG"></image>
-							<view>
-								<view class="battery-v2">{{deviceInfo.batteryPercentage}}%</view>
-								<view class="battery-v3">电量</view>
-							</view>
-						</view>
-						<view class="battery-v1">
-							<image src="/static/images/common/time.png" class="dlIMG" mode="aspectFit"></image>
-							<view>
-								<view class="battery-v2">{{deviceInfo.batteryRemainingTime}}分钟</view>
-								<view class="battery-v3">续航时间</view>
-							</view>
-						</view>
-					</view>
-					<view>
-					</view>
-				</view>
-
-				<!-- 设备基本信息 -->
-				<view class="info-card">
-					<view class="info-row">
-						<text class="info-label">设备状态</text>
-						<text class="info-value status-running">运行中</text>
-					</view>
-					<view class="info-row">
-						<text class="info-label">联机状态</text>
-						<text class="info-value status-greend">联机</text>
-					</view>
-					<view class="info-row">
-						<text class="info-label">定位信息</text>
-						<view class="info-value status-running" @click="gpsPosition">
-							<view class="info-value status-running">114.72 30.28</view>
-							<view class="info-value status-running">
-								<uni-icons @click="toggleForm" type="location" size="17"
-									color="rgba(255, 255, 255, 0.8)" style="vertical-align: bottom;" />
-								深圳市龙华区富源晟
-							</view>
-						</view>
-					</view>
-				</view>
-				<!-- ===========主副机选择============= -->
-				<view class="mode-section">
-					<view class="radio-group">
-						<view v-for="(item, index) in radioList" :key="index" class="group-item">
-							<view class="radio-icon" :class="{ 'selected': radioSelected === index }">
-								{{ item }}
-								<view class="uni-border"></view>
-							</view>
-						</view>
-					</view>
-				</view>
-				<!-- ============灯光模式选择================ -->
-				<view class="mode-section">
-					<view class="mode-buttons">
-						<view v-for="(item, index) in modeItems" :key="index" class="mode-v1"
-							:class="{ 'active-mode': selectedIndex === index }">
-							<view class="mode-v2" @click="handleModeClick(index)">
-								<image :src="selectedIndex === index ? item.activeImage : item.image" class="setIMG"
-									mode="aspectFit"></image>
-								<view>
-									<view class="battery-v2">{{ item.title }}</view>
-									<view class="mode-v3" v-if="item.subTitle">{{ item.subTitle }}</view>
-								</view>
-							</view>
-						</view>
-					</view>
-				</view>
-
-				<!-- 人员信息登记 -->
-				<view class="form-section">
-					<view class="mode-buttons">
-						<view class="section-title">人员信息登记</view>
-						<view class="right-icons">
-							<uni-icons @click="toggleForm" :type="isFormExpanded ? 'arrowup' : 'down'" size="20"
-								color="rgba(255, 255, 255, 0.87" class="toggle-icon" />
-						</view>
-					</view>
-					<view class="form-content" v-if="isFormExpanded">
-						<button class="send-btn1" @click="sendPersonnelInfo">发送</button>
-						<view class="form-row">
-							<text class="form-label">单位：</text>
-							<input class="form-input" placeholder="请输入单位" v-model="personnelInfo.unitName" />
-						</view>
-						<view class="form-row">
-							<text class="form-label">姓名：</text>
-							<input class="form-input" placeholder="请输入姓名" v-model="personnelInfo.name" />
-						</view>
-						<view class="form-row">
-							<text class="form-label">职位：</text>
-							<input class="form-input" placeholder="请输入职位" v-model="personnelInfo.position" />
-						</view>
-						<view class="form-row">
-							<text class="form-label">ID：</text>
-							<input class="form-input" placeholder="请输入ID号" v-model="personnelInfo.code" />
-						</view>
-					</view>
-				</view>
-				<!-- 人员信息登记 -->
-				<view class="form-section">
-					<view class="mode-buttons">
-						<view class="section-title">发送信息</view>
-						<button class="send-btn" @click="sendTextMessage">发送</button>
-					</view>
-
-					<view class="form-row">
-						<input class="form-input" placeholder="请输入文字" v-model="messageToSend" />
-					</view>
-				</view>
-				<!-- 产品信息 -->
-				<ProParams :id="itemInfo.id"></ProParams>
-				
+			<view class="item">
+				<text class="lbl">Mac地址</text>
+				<text class="value">{{device.deviceMac}}</text>
 			</view>
-			<!-- 弹框 -->
-			<view class="agreement-mask" v-if="lightModeA" @click.stop="closePopup">
-				<!-- 报警时长弹窗 -->
-				<view class="agreement-popup" @click.stop>
-					<!-- 标题 -->
-					<view class="popup-title">报警时长</view>
-					<view class="popup-content">
-						<view class="time-picker-container">
-							<TimePicker ref="timePicker" :defaultTime="currentAlarmTime" @change="handleTimeChange" />
-						</view>
+			<view class="item">
+				<text class="lbl">蓝牙名称</text>
+				<text class="value valueFont">{{device.bluetoothName}}</text>
+			</view>
+			<view class="item" @click.top="bleStatuToggle">
+				<text class="lbl">蓝牙状态</text>
+				<text class="value" :class="formData.bleStatu?'green':'red'">{{getbleStatu}}</text>
+			</view>
+			<view class="item">
+				<text class="lbl">设备状态</text>
+				<text class="value valueFont">{{sta_system}}</text>
+			</view>
+			<view class="item">
+				<text class="lbl">定位信息</text>
+				<view class="multiValue" @click.stop="gotoMap()">
+					<view class="valueItem valueFont">
+						{{formData.sta_longitude}}
+			
 					</view>
-					<!-- 按钮组 -->
-					<view class="popup-buttons">
-						<button class="agree" @click="saveAlarmTime">保存</button>
+					<view class="valueItem valueFont">
+			
+						{{formData.sta_latitude}}
+			
+					</view>
+					<view class="valueItem">
+			
+						<view style="width:80%;float: right;text-align: right;" class="valueFont">
+							<uni-icons type="location" size="17" color="rgba(255, 255, 255, 0.8)"
+								style="vertical-align: bottom;" />
+							{{formData.address}}
+						</view>
+						<view class="clear"></view>
 					</view>
 				</view>
+			
+			
 			</view>
-			<!-- 上传开机画面弹框 -->
-			<view class="agreement-mask" v-if="lightModeB" @click.stop="closePopup">
-				<!-- 上传画面弹窗 -->
-				<view class="agreement-popupB" @click.stop>
-					<!-- 标题 -->
-					<view class="popup-title">上传开机画面</view>
-					<view class="popup-content">
-						<view class="example-body">
-							<view class="icoContent" @click="checkImgUpload">
-								<image v-if="selectedImage" :src="selectedImage" mode="aspectFit" class="img"
-									style="width: 100%; height: 100%;"></image>
-								<image v-else mode="aspectFit" class="img"
-									src="/static/images/6155/DeviceDetail/add.png"></image>
-							</view>
-						</view>
-					</view>
-					<!-- 按钮组 -->
-					<view class="popup-buttons">
-						<button class="agree" @click="handleupload">确定</button>
-					</view>
-				</view>
-			</view>
-			<!-- =====报警声音上传======= -->
-			<view class="agreement-mask" v-if="lightModeC" @click.stop="closePopup">
-				<view class="agreement-popupB" @click.stop>
-					<!-- 标题 -->
-					<view class="popup-title">报警声音</view>
-					<view class="popup-content">
-						<view>
-							<view class="upload_flex" @click="uploadFile">
-								<image src="/static/images/210/upload.png" mode="aspectFit" class="uploadIMG"></image>
-								<text>点击选择上传文件</text>
-							</view>
-							<view class="upload_flex" @click="deleteQ">
-								<image src="/static/images/210/delete.png" mode="aspectFit" class="uploadIMG"></image>
-								<text>删除文件</text>
-							</view>
-							<!-- 展示已上传的报警声音文件 -->
-							<view class="file-list-tip" v-if="soundFileList.length > 0">
-								<text>已上传文件：{{ soundFileList.map(item => item.name).join('、') }}</text>
-							</view>
-						</view>
-					</view>
-					<!-- 按钮组 -->
-					<view class="popup-buttons">
-						<button class="agree" @click="handleSoundUpload">确定</button>
-					</view>
-				</view>
-			</view>
-			<!-- =====删除报警声音文件列表弹窗======= -->
-			<view class="agreement-mask" v-if="deleteSoundMode" @click.stop="closeDeleteSoundPopup">
-				<view class="agreement-popupB" @click.stop style="height: 45%;">
-					<!-- 标题 -->
-					<view class="popup-title">选择要删除的报警声音</view>
-					<view class="popup-content">
-						<!-- 无文件提示 -->
-						<view v-if="soundFileList.length === 0" class="empty-tip">
-							<text>暂无已上传的报警声音文件</text>
-						</view>
-						<view v-else class="file-list">
-							<view 
-								class="file-item" 
-								v-for="(file, index) in soundFileList" 
-								:key="index"
-							>
-								<checkbox 
-									
-									:value="file"
-									@change="handleSoundFileSelect"
-								/>
-								<text class="file-name">{{ file.name }}</text>
-							</view>
-						</view>
-					</view>
-					<!-- 按钮组 -->
-					<view class="popup-buttons" style="position: relative; bottom: 0;">
-						<button class="disagree" @click="closeDeleteSoundPopup" style="width: 48%;">取消</button>
-						<button class="agreeBtn" @click="confirmDeleteSound" :disabled="selectedSoundFiles.length === 0" style="width: 48%;">确定删除</button>
-					</view>
-				</view>
-			</view>
-			<!-- ======各个弹框类型======= -->
-			<CustomPopup :show="currentPopup.show" v-bind="currentPopup.config" @confirm="handleConfirm"
-				@cancel="handleCancel" />
 		</view>
+
+
+		<view class="lampMode">
+			<view class="mode "  :class="{active:formData.sta_SOSGrade=='2'}" v-on:click.stop="sosSetting(2)">
+				<view class="leftImg">
+					<image v-show="formData.sta_SOSGrade!='2'"  class="img" src="/static/images/670/rb.png" mode="aspectFit"></image>
+					<image v-show="formData.sta_SOSGrade=='2'" class="img" src="/static/images/670/rbActive.png" mode="aspectFit"></image>
+				</view>
+				<view class="rightTxt">
+					<text class="bigTxt">红蓝警示</text>
+					<text class="smallTxt">{{formData.sta_SOSGrade=='2'?'开启':'关闭'}}</text>
+				</view>
+			</view>
+			<view class="mode  " :class="{active:formData.sta_SOSGrade=='1'}"  v-on:click.stop="sosSetting(1)">
+				<view class="leftImg">
+					<image v-show="formData.sta_SOSGrade!='1'" class="img" src="/static/images/670/sg.png" mode="aspectFit"></image>
+					<image v-show="formData.sta_SOSGrade=='1'" class="img" src="/static/images/670/sgActive.png" mode="aspectFit"></image>
+				</view>
+				<view class="rightTxt">
+					<text class="bigTxt">声光报警</text>
+					<text class="smallTxt">{{formData.sta_SOSGrade=='1'?'开启':'关闭'}}</text>
+				</view>
+			</view>
+			
+			<view class="mode  " :class="{active:formData.sta_RadarType=='1'}"  v-on:click.stop="redarSetting(1)">
+				<view class="leftImg">
+					<image v-show="formData.sta_RadarType=='1'" class="img" src="/static/images/102/redarActive.png" mode="aspectFit"></image>
+					<image v-show="formData.sta_RadarType!='1'" class="img" src="/static/images/102/redar.png" mode="aspectFit"></image>
+				</view>
+				<view class="rightTxt">
+					<text class="bigTxt">物体感应</text>
+					<text class="smallTxt">{{formData.sta_RadarType=='1'?'开启':'关闭'}}</text>
+				</view>
+			</view>
+		</view>
+
+		<ProParams :id="device.id"></ProParams>
+		<MsgBox ref="msgPop" />
+		<global-loading ref="loading" />
 	</view>
 </template>
 
 <script>
-	// 弹框配置中心
-	const POPUP_CONFIGS = {
-		person: {
-			config: {
-				icon: '/static/images/common/sendSucc.png',
-				message: '信息发送成功',
-				showCancel: false
-			},
-
-		},
-		// 开机log
-		logo: {
-			config: {
-				icon: '/static/images/common/upload.png',
-				message: '上传成功',
-				showCancel: false
-			},
-
-		},
-		bettery: {
-			config: {
-				title: '设备电量低于20%',
-				titleColor: 'rgba(224, 52, 52, 1)',
-				message: '请及时充电',
-				icon: '/static/images/common/path.png',
-				popupBorder: '1rpx solid rgba(224, 52, 52, 0.3)',
-				confirmBtnBg: 'rgba(224, 52, 52, 1)',
-				showCancel: true
-			},
-			onConfirm() {
-				console.log('确认按钮');
-				return true; // 直接关闭
-			}
-		},
-
-		cancel: {
-			config: {
-				titleColor: 'rgba(224, 52, 52, 1)',
-				icon: '/static/images/common/svg.png',
-				popupBorder: '1rpx solid rgba(224, 52, 52, 0.3)',
-				confirmBtnBg: 'rgba(224, 52, 52, 1)',
-				showCancel: true //取消按钮
-			},
-			onConfirm() {
-				console.log('解除报警确认');
-			}
-		},
-		del: {
-			config: {
-				message: '确定开启报警?',
-				icon: '/static/images/210/bj_1.png',
-				popupBorder: '1rpx solid rgba(255, 200, 78, 1)',
-				confirmBtnBg: 'rgba(255, 200, 78, 1)',
-				showCancel: true
-			},
-			onConfirm() {
-				console.log('删除确认');
-			}
-		},
-		// 自动报警
-		autoAlarm: {
-			config: {
-				icon: '/static/images/6170/svg.png',
-				title: '报警信息',
-				message: '002号设备(ID:123456)\n出现报警', // 使用\n换行
-				showCountdown: true,
-				countdownTime: 59,
-				confirmText: '解除报警',
-				popupBorder: '1rpx solid rgba(224, 52, 52, 0.3)',
-				confirmBtnBg: 'rgba(224, 52, 52, 1)',
-				confirmBtnColor: "rgba(255, 255, 255, 0.87)",
-				showCancel: false,
-			},
-			onConfirm() {
-				console.log('自动报警确认');
-				// 这里可以添加自动报警的逻辑
-			}
-		},
-		// 报警声音上传成功
-		soundUpload: {
-			config: {
-				icon: '/static/images/common/upload.png',
-				message: '报警声音上传成功',
-				showCancel: false
-			}
-		},
-		// 报警声音删除成功
-		soundDelete: {
-			config: {
-				icon: '/static/images/common/sendSucc.png',
-				message: '报警声音删除成功',
-				showCancel: false
-			}
-		}
-	}
-	import MqttClient from '@/utils/mqtt.js';
+	import request from '@/utils/request.js';
 	import {
-		deviceDetail,
-		registerPersonInfo,
-		deviceSendMessage,
-		deviceShareId,
-		lightModeSettings, //灯光模式设置
-		laserModeSettings, //激光模式设置
-		mapReverseGeocoding //地图逆解析
-	} from '@/api/6170/deviceControl.js'
+		showLoading,
+		hideLoading,
+		updateLoading
+	} from '@/utils/loading.js';
 
 	import {
-		baseURL,
-		getToken,
-		clientid
-	} from '@/utils/request'
+		MsgSuccess,
+		MsgError,
+		MsgClose,
+		MsgWarning,
+		showPop,
+		MsgInfo
+	} from '@/utils/MsgPops.js'
+	import Common from '@/utils/Common.js';
+	import BleTool from '@/utils/BleHelper.js'
+	import BleReceive from '@/utils/BleReceive';
+
+
+	var eventChannel = null;
+	var these = null;
+	var ble = null;
+	var recei = null;
+	var mq = null;
+	var pagePath = "/pages/210/HBY210";
+
 	export default {
 		data() {
 			return {
-				selectedIndex: -1, // Track currently selected index
-				modeItems: [{
-						image: "/static/images/210/lj.png",
-						activeImage: "/static/images/210/lj-HL.png",
-						title: "联机设备",
-						subTitle: ""
-					},
-					{
-						image: "/static/images/210/bj.png",
-						activeImage: "/static/images/210/bj-HL.png",
-						title: "报警声音",
-						subTitle: "上传"
+				Status: {
+					msgOkIntval: null, //紧急通知等待的时间
+					msgOkTime: null, //
+					pageHide: false,
+					apiType: "listA",
+					navbar: {
+						icons: [{
+								src: '/static/images/common/msg.png'
+							},
+							{
+								src: '/static/images/common/shape.png'
+							}
+						],
+						title: 'HBY210',
+						showBack: true,
+						height: 90
 					},
+					usrToggle: true,
+					bleLinkCnt: 0
+				},
+				formData: {
+					img: '/static/images/common/BJQ6075.png',
 
-					{
-						image: "/static/images/210/zd.png",
-						activeImage: "/static/images/210/zd-HL.png",
-						title: "自动报警",
-						subTitle: ""
-					},
-					{
-						image: "/static/images/210/zd.png",
-						activeImage: "/static/images/210/zd-HL.png",
-						title: "手动报警",
-						subTitle: ""
-					},
+				
+					address: "", //地址
 
-					{
-						image: "/static/images/common/path7.png",
-						activeImage: "/static/images/210/path-HL.png",
-						title: "开机画面",
-						subTitle: "上传"
-					},
-					{
-						image: "/static/images/210/time.png",
-						activeImage: "/static/images/210/time-HL.png",
-						title: "报警时长",
-						subTitle: "30秒"
-					}
-				],
-				currentPopup: {
-					show: false,
-					config: {},
-					callback: null
+					company: "湖北消防总队", //单位
+					usrname: "胡红军", //姓名 
+					job: "中队长", //职位
+					usrid: "", //id
+
+					deviceId: "",
+
+					bleStatu: false,
+
+					sta_PowerPercent: "",
+					sta_PowerTime: "",
+					sta_SOSGrade: '',
+					sta_longitude: "",
+					sta_latitude: "",
+					sta_system: "", //设备状态，0关机，1仅充电，2开机未充电,3，开机且充电
+					sta_RadarType:""
 				},
-				pageLoading: true,
-				mainMode: 'string',
-				secondaryMode: 'string',
-				navBarHeight: 70 + uni.getSystemInfoSync().statusBarHeight,
-				navTitle: "",
-				lightModeA: false,
-				lightModeB: false,
-				isFormExpanded: true, // 默认展开
-				deviceID: '',
-				itemInfo: {},
-				alarmTimeDisplay: '',
-				currentAlarmTime: {
-					minutes: '0',
-					seconds: '30'
+				device: {
+					id: "",
+					deviceName: "",
+					deviceImei: "",
+					deviceMac: "",
+					communicationMode: 0,
+					devicePic: "",
+					typeName: "",
+					bluetoothName: null,
+					deviceStatus: null,
+					bindingTime: "",
+					onlineStatus: 0,
+					battery: "0",
+					latitude: null,
+					longitude: null,
+					alarmStatus: null,
+					detailPageUrl: "/pages/008A/HBY008A",
+					showConfirm: false
 				},
-				mqttClient: null,
-				messageToSend: '',
-				personnelInfo: {
-					unitName: '',
-					name: '',
-					position: '',
-					code: '',
-				},
-				deviceInfo: {},
-				activePermissions: [], // 存储当前设备的权限数组
-				isSharedDevice: false, // 标记是否来自分享
-				isRightIconVisible: false,
-				showPopupFlag: false, //是否显示弹框
-				popupMessage: '！',
-				popupConfirmText: '确认',
-				showUploadPopup: false,
-				selectedImage: null, // 添加这个变量来存储选择的图片
-				file: '',
-				selectedItemIndex: 0,
-				radioList: ['M', 'S'],
-				radioSelected: 0, // -1表示未选中任何项
-				deviceType: '',
-				popupType: '', //弹框类型
-				lightModeC: false,
-				// 新增：报警声音文件相关
-				soundFileList: [], 
-				deleteSoundMode: false, 
-				selectedSoundFiles: [] 
+
+				permissions: []
+
 			}
 		},
-		methods: {
-			// 点击弹框外的区域关闭
-			closePopup() {
-				this.lightModeA = false;
-				this.lightModeB = false;
-				this.lightModeC = false;
-			},
-			// 关闭删除报警声音弹窗
-			closeDeleteSoundPopup() {
-				this.deleteSoundMode = false;
-				this.selectedSoundFiles = []; // 清空选中状态
-				this.lightModeC = true; // 回到报警声音上传弹窗
-			},
-	
-			handleSoundFileSelect() {
-				console.log("选中的报警声音文件：", this.selectedSoundFiles);
-			},
-			// 确认删除选中的报警声音文件
-			confirmDeleteSound() {
-				this.soundFileList = this.soundFileList.filter(file => !this.selectedSoundFiles.includes(file));
-				this.showPopup('soundDelete');
-				this.selectedSoundFiles = [];
-				this.closeDeleteSoundPopup();
-			},
-			// 上传报警声音文件
-			uploadFile() {
-				uni.chooseFile({
-					count: 1,
-					success: (res) => {
-						const file = res.tempFiles[0];
-						const fileSize = file.size || 0;
-						// 限制文件大小（示例：5MB）
-						if (fileSize > 5 * 1024 * 1024) {
-							uni.showToast({
-								title: '文件大小不能超过5MB',
-								icon: 'none',
-								duration: 3000
-							});
-							return;
-						}
-						// 显示上传中加载提示
-						uni.showLoading({
-							title: '上传中...',
-							mask: true
-						});
-						// 调用上传接口
-						uni.uploadFile({
-							url: baseURL + '/app/device/uploadSound', // 替换为真实的报警声音上传接口
-							filePath: file.path,
-							name: 'file',
-							formData: {
-								deviceId: this.deviceID,
-							},
-							header: {
-								'Authorization': 'Bearer ' + getToken(),
-								'clientid': clientid(),
-							},
-							complete: (res) => {
-								uni.hideLoading();
-								try {
-									const responseData = JSON.parse(res.data);
-									if (responseData.code === 200) {
-										// 上传成功，添加到文件列表
-										this.soundFileList.push({
-											name: file.name,
-											url: responseData.data.url // 接口返回的文件地址
-										});
-										this.showPopup('soundUpload');
-									} else {
-										uni.showToast({
-											title: responseData.msg,
-											icon: 'none'
-										});
-									}
-								} catch (e) {
-									uni.showToast({
-										title: '上传失败',
-										icon: 'none'
-									});
-								}
-							}
-						});
-					},
-					fail: (err) => {
-						console.error('选择文件失败:', err);
-						uni.showToast({
-							title: '选择文件失败',
-							icon: 'none'
-						});
-					}
-				});
-			},
-			deleteQ() {
-				if (this.soundFileList.length === 0) {
-					uni.showToast({
-						title: "暂无可删除的报警声音文件",
-						icon: "none"
-					});
-					return;
+		computed: {
+			getbleStatu() {
+				if (this.formData.bleStatu === true) {
+					return '已连接';
 				}
-				this.lightModeC = false;
-				this.deleteSoundMode = true;
-			},
-			// 报警声音上传弹窗确定按钮
-			handleSoundUpload() {
-				uni.showToast({
-					title: "报警声音配置确认成功",
-					icon: "success"
-				});
-				this.closePopup();
-			},
-			// 打开弹框
-			showPopup(type) {
-				this.currentPopup = {
-					show: true,
-					config: POPUP_CONFIGS[type].config,
-					callback: POPUP_CONFIGS[type].onConfirm
+				if (this.formData.bleStatu === 'connecting') {
+					return '连接中';
 				}
-			},
-			handleConfirm() {
-				this.currentPopup.show = false;
-				console.log('这是点击了确认');
-			},
-			// 统一处理取消
-			handleCancel() {
-				this.currentPopup.show = false;
-			},
-			handleModeClick(index) {
-				this.selectedIndex = index;
-				switch (index) {
-					case 0:
-						this.selectMode();
-						break;
-					case 1:
-						this.soundAlarm();
-						break;
-					case 2:
-						this.manualAlarm();
-						break;
-					case 3:
-						this.automaticAlarm();
-						break;
-					case 4:
-						this.uploadStartup();
-						break;
-					case 5:
-						this.alarmTime();
-						break;
+				if (this.formData.bleStatu === 'dicconnect') {
+					return '正在断开';
 				}
-			},
-			// 手动报警
-			manualAlarm() {
-				this.showPopup('del');
-			},
-			handleRadioSelect(index) {
-				this.radioSelected = index;
-				console.log('选中了单选选项：', this.radioList[index]);
-			},
-			// 自动报警
-			automaticAlarm() {
-				this.showPopup('autoAlarm');
-			},
-			// *******定位******
-			gpsPosition() {
-				uni.navigateTo({
-					url: '/pages/common/map/index'
-				})
-			},
-			// 报警声音
-			soundAlarm() {
-				this.lightModeC = true
-			},
-			// 联机设备
-			selectMode() {
-				uni.navigateTo({
-					url: '/pages/210/onlineDevice/index',
-					events: {
-						ack: function(data) {}
-					},
-					success: (res) => {
-						// 页面跳转成功后的回调函数
-						res.eventChannel.emit('onlineDevice', {
-							data: this.deviceType
-						});
-					}
-				})
-			},
-			// 人员信息登录
-			toggleForm() {
-				this.isFormExpanded = !this.isFormExpanded;
-			},
-			// 上传开机画面
-			uploadStartup() {
-				this.lightModeB = true
-			},
-			// 上传开机画面-选择图片
-			checkImgUpload() {
-				uni.chooseImage({
-					count: 1,
-					sizeType: ['original', 'compressed'],
-					sourceType: ['album', 'camera'],
-					success: (res) => {
-						// 将选择的图片赋值给selectedImage
-						const file = res.tempFiles[0];
-						const fileSize = file.size || 0;
-						if (fileSize > 2 * 1024 * 1024) {
-							console.log(`文件过大: ${fileSize} 字节`); // 调试日志
-							uni.showToast({
-								title: '图片大小不能超过2MB',
-								icon: 'none',
-								duration: 3000
-							});
-							return;
-						}
-						this.selectedImage = res.tempFilePaths[0];
-						console.log('选择的图片:', res);
-						//this.file = res.tempFiles[0].file
-					},
-					fail: (err) => {
-						console.error('选择图片失败:', err);
-						uni.showToast({
-							title: '选择图片失败',
-							icon: 'none'
-						});
-					}
-				});
-			},
-			// 上传开机画面确认按键
-			handleupload() {
-				if (!this.selectedImage) {
-					uni.showToast({
-						title: '请上传一张图片',
-						icon: 'none'
-					});
-					return;
+				if (this.formData.bleStatu === 'err') {
+					return '连接异常';
 				}
-				// 显示上传中加载提示
-				uni.showLoading({
-					title: '上传中...',
-					mask: true
-				});
+				return '未连接';
+			},
+			sta_system(){
+				//0关机，1仅充电，2开机未充电,3，开机且充电
+				if(this.formData.sta_system=='0'){
+					return '已关机'
+				}
+				if(this.formData.sta_system=='1'){
+					return '仅充电'
+				}
+				if(this.formData.sta_system=='2'){
+					return '开机未充电'
+				}
+				if(this.formData.sta_system=='3'){
+					return '开机充电中'
+				}
+			}
+		},
+		created() {
+			this.Status.navbar.height = uni.getSystemInfoSync().statusBarHeight + 20;
+		},
+		onUnload() {
+			console.log("页面卸载,释放资源");
+			let statusTopic = `A/${this.formData.imei?this.formData.imei:this.device.deviceImei}`;
+			if (ble) {
+				ble.removeAllCallback(pagePath);
+				ble.removeReceiveCallback(pagePath);
+			}
 
-				uni.uploadFile({
-					url: baseURL + '/app/device/uploadLogo',
-					filePath: this.selectedImage,
-					name: 'file',
-					formData: {
-						deviceId: this.deviceID,
-					},
-					header: {
-						'Authorization': 'Bearer ' + getToken(),
-						'clientid': clientid(),
-					},
-					complete: (res) => {
-						console.log(res, 'resss');
-						try {
-							const responseData = JSON.parse(res.data);
-							if (responseData.code === 200) {
-								this.showPopup('logo');
-								this.selectedImage = '';
-								this.file = null;
-								this.lightModeB = false
-							} else {
-								uni.showToast({
-									title: responseData.msg,
-									icon: 'none'
-								});
+			if (mq) {
+				mq.unsubscribe(statusTopic);
+				mq.disconnect();
+				mq = null;
+			}
+
+		},
+		onShow() {
+			this.Status.pageHide = false;
+			let f = this.getDevice();
+			if (!f) {
+				this.showBleUnConnect();
+				return;
+			}
+		},
+		onHide: function() {
+			this.Status.pageHide = true;
+		},
+
+		onLoad() {
+
+			these = this;
+			recei = BleReceive.getBleReceive();
+			ble = BleTool.getBleTool();
+
+
+			ble.addReceiveCallback(these.bleValueNotify, pagePath);
+			ble.addStateBreakCallback(these.bleStateBreak, pagePath);
+			ble.addStateRecoveryCallback(these.bleStateRecovry, pagePath);
+			ble.addDisposeCallback(these.deviceDispose, pagePath);
+			ble.addRecoveryCallback(these.deviceRecovry, pagePath);
+
+			eventChannel = this.getOpenerEventChannel();
+
+			eventChannel.on('detailData', function(data) {
+
+				console.log("收到父页面的参数：" + JSON.stringify(data));
+				var device = data.data;
+				these.Status.apiType = data.apiType;
+				these.device = device;
+
+
+				these.formData.usrid = device.deviceImei;
+				if (data.apiType !== 'listA') {
+					Common.getdeviceShareId(data.data.id).then(res => {
+						if (res.code == 200) {
+							if (res.data.permission) {
+								these.permissions = res.data.permission.split(',');
 							}
-						} catch (e) {
-							uni.showToast({
-								title: '上传失败',
-								icon: 'none'
-							});
-						} finally {
-							uni.hideLoading();
 						}
+					});
+				}
+				if (these.device.deviceImei) {
+					these.initMQ();
+				}
+				let f = ble.data.LinkedList.find((v) => {
+					if (v.macAddress == device.deviceMac) {
+						console.log("找到设备了", v);
+						these.formData.deviceId = v.deviceId;
+						return true;
 					}
-				})
+					return false;
+				});
+				if (!f) {
+					these.showBleUnConnect();
+					these.getDetail();
+					return;
+				}
+				let form = f.formData;
+				if (form) {
+					let keys = Object.keys(form);
+					for (var i = keys.length; i >= 0; i--) {
+						let key = keys[i];
+
+						these.formData[key] = form[key];
+					}
+				}
+				if (these.formData['imei'] && !these.device.deviceImei) {
+					these.initMQ();
+				} else if (these.device.deviceImei) {
+					these.formData['imei'] = these.device.deviceImei;
+				}
+				these.getDetail();
+
+				these.formData.bleStatu = 'connecting';
+				ble.LinkBlue(f.deviceId, f.writeServiceId, f.wirteCharactId, f.notifyCharactId).then(res => {
+					these.formData.bleStatu = true;
+				}).catch(ex => {
+					these.formData.bleStatu = 'err';
+					MsgError("连接错误:" + ex.msg, "确定", these);
+				});
+			});
+
+
+		},
+		methods: {
+			redarSetting(val) {
+				let f=this.getDevice();
+				
+				
+				if (!f) {
+					this.showBleUnConnect();
+					return;
+				}
+				
+				let newVal = null;
+				if (val == this.formData.sta_RadarType) {
+					newVal = 0;
+				}else{
+					newVal=val;
+				}
+				
+				
+				
+				let bleSend=()=>{
+					let json={ins_RadarType:newVal};	
+					json=JSON.stringify(json);
+					if(ble){
+						ble.sendString(f.deviceId, json).then(res=>{
+							this.formData.sta_RadarType=newVal;
+						}).catch(ex=>{
+							this.mqSend(json);
+							this.formData.sta_RadarType=newVal;
+						});
+					}
+				}
+				
+				
+					bleSend();
+				
+				
 			},
-			// 报警时长
-			alarmTime() {
-				this.lightModeA = true
+			sosSetting(val) {
+				let f=this.getDevice();
+				
+				
+				if (!f) {
+					this.showBleUnConnect();
+					return;
+				}
+				
+				let newVal = null;
+				if (val == this.formData.sta_SOSGrade) {
+					newVal = 0;
+				}else{
+					newVal=val;
+				}
+				
+				
+				let msg="";
+				if (newVal == 0 && this.formData.sta_SOSGrade == 1) {
+					msg="确定解除声光报警?";
+					
+				}
+				else if (newVal == 1) {
+					msg="确定开启声光报警?";
+				}
+				let bleSend=()=>{
+					let json={ins_SOSGrade:newVal};	
+					json=JSON.stringify(json);
+					if(ble){
+						ble.sendString(f.deviceId, json).then(res=>{
+							this.formData.sta_SOSGrade=newVal;
+						}).catch(ex=>{
+							this.mqSend(json);
+							this.formData.sta_SOSGrade=newVal;
+						});
+					}
+				}
+				
+				if(msg){
+					MsgError(msg,'',these,()=>{
+					  bleSend();
+					});
+				}
+				else{
+					bleSend();
+				}
+				
 			},
-			handleTimeChange(time) {
-				this.currentAlarmTime = time;
+			getDevice: function() {					
+				let f = ble.data.LinkedList.find((v) => {
+					if (v.macAddress == these.device.deviceMac) {
+						if (!this.formData.deviceId) {
+							this.formData.deviceId = v.deviceId
+						};
+						return true;
+					}
+				});
+			
+				return f;
 			},
-			// 保存时间
-			saveAlarmTime() {
-				const time = this.$refs.timePicker.getCurrentTime();
-				this.alarmTimeDisplay = `${time.minutes}分${time.seconds}秒`;
-				this.modeItems[5].subTitle = this.alarmTimeDisplay; // 手动更新 modeItems
-				this.lightModeA = false;
-				// 	console.log("保存的时间：", time);
+			bleStatuToggle() {
+				let f = this.getDevice();
+				if (!f) {
+					this.showBleUnConnect();
+					return;
+				}
+				if (this.formData.bleStatu === true) {
+					this.formData.bleStatu = 'dicconnect';
+					ble.disconnectDevice(f.deviceId).finally(r => {
+						this.formData.bleStatu = false;
+					});
+					return;
+				}
+
+				if (this.formData.bleStatu === false || this.formData.bleStatu === 'err') {
+					this.formData.bleStatu = 'connecting';
+					ble.LinkBlue(f.deviceId, f.writeServiceId, f.wirteCharactId, f.notifyCharactId).then(res => {
+						these.formData.bleStatu = true;
+					}).catch(ex => {
+						these.formData.bleStatu = 'err';
+						MsgError("连接错误:" + ex.msg, "确定", these);
+					});
+					return;
+				}
+
+
 			},
-			handleIconClick(s,e) {
-				if (s === 0) {
-					console.log("消息");
+			mqSend(json){
+				if(mq){
+					mq.publish("B/" + this.device.deviceImei, json).then(res=>{
+						
+					}).catch(ex=>{
+						
+					});
+					
+					
+				}
+				
+			},
+			showBleUnConnect() {
+				MsgError("蓝牙未连接过该设备,请使用蓝牙重新添加该设备",'去连接',this,()=>{
 					uni.navigateTo({
-						url: '/pages/670/History',
-						success: (res) => {
+						url: "/pages/common/addBLE/addEquip",
+						events: {
+							BindOver: function(data) {
+								console.log(data)
+								these.formData.bleStatu = true;
+							}
+						},
+						success: function(res) {
+							// 通过eventChannel向被打开页面传送数据
 							res.eventChannel.emit('detailData', {
-								data: these.device,
-							});
+								data: these.device
+							})
 						}
 					})
+				})
+		
+			},
+			initMQ() {
+
+
+				return new Promise((resolve, reject) => {
+					if (mq) {
+
+						resolve();
+						return;
+					}
+					console.log("正在初始化MQtt")
+					mq = new MqttClient();
+					mq.connect(() => {
+						console.log("连接成功，开始订阅消息")
+						// 订阅来自设备的状态更新
+						const statusTopic =
+							`A/${this.formData.imei?this.formData.imei:this.device.deviceImei}`;
+						mq.subscribe(statusTopic, (payload, receive) => {
+							console.log("mq收到消息", payload)
+							let json = JSON.parse(payload);
+							this.receivData(json);
+						});
+						resolve();
+					});
+				});
+
+			},
+			bleValueNotify: function(receive, device, path, recArr) { //订阅消息
+				if (receive.deviceId !== this.formData.deviceId) {
+					return;
+				}
+				let data = recei.ReceiveData(receive, device, pagePath, recArr);
+				console.log("蓝牙收到消息", data)
+				this.receivData(data);
+			},
+			receivData(data) { //处理蓝牙/MQ的数据
+				let keys = Object.keys(data);
+				keys.forEach(key => {
+					this.formData[key] = data[key];
+				});
+				this.setBleFormData();
+			},
+			setBleFormData() {
+				let f = ble.data.LinkedList.find((v) => {
+					if (v.deviceId == these.formData.deviceId) {
+						v.formData = these.formData;
+
+						return true;
+					}
+					return false;
+				});
+				if (f) {
+					uni.setStorageSync(ble.StorageKey, ble.data.LinkedList);
+				}
+
+			},
+			deviceRecovry(res) {
+				if (this.Status.pageHide) {
+					return;
+				}
+				if (res.deviceId == these.formData.deviceId) {
+					this.formData.bleStatu = true;
+					setTimeout(() => {
+						hideLoading(these, 1000);
+					});
+					uni.showToast({
+						icon: 'success',
+						title: '蓝牙连接成功'
+					});
+				}
+
+			},
+			deviceDispose(res) {
+				if (this.Status.pageHide) {
+					return;
+				}
+				if (res.deviceId == these.formData.deviceId) {
+					if (res.device) {
+						these.formData.bleStatu = 'connecting';
+					} else {
+						this.formData.bleStatu = false;
+					}
+					setTimeout(() => {
+						hideLoading(these, 1000);
+					});
+					uni.showToast({
+						icon: 'fail',
+						title: '蓝牙连接已断开'
+					});
+				}
+
+			},
+			bleStateBreak() {
+				if (this.Status.pageHide) {
+					return;
+				}
+				//蓝牙适配器不可用
+				this.formData.bleStatu = false;
+				uni.showToast({
+					icon: 'fail',
+					title: '蓝牙已不可用'
+				})
+				hideLoading(this);
+			},
+			bleStateRecovry() {
+				console.log("蓝牙可用");
+				if (this.Status.pageHide) {
+					return;
+				}
+				console.log("蓝牙可用");
+				//蓝牙适配器再次可用,尝试恢复连接
+				showLoading(this, {
+					text: "蓝牙恢复可用,正在连接设备"
+				});
+				this.formData.bleStatu = 'connecting';
+				ble.LinkBlue(these.formData.deviceId).then(() => {
+					these.formData.bleStatu = true;
+					updateLoading(these, {
+						text: '连接成功'
+					});
+				}).catch(ex => {
+					updateLoading(these, {
+						text: ex.msg
+					})
+					these.formData.bleStatu = 'err';
+					MsgError("连接错误:" + ex.msg, "确定", these);
+				}).finally(() => {
+					setTimeout(() => {
+						hideLoading(these);
+					}, 1000);
+
+				});
+			},
+
+			prevPage() {
+				uni.navigateBack({
+
+				});
+			},
+			handleRightClick: function(s, e) {
+
+				if (s === 0) {
+
 					return;
 				} else if (s === 1) {
 					console.log("分享");
@@ -755,7 +676,7 @@
 						},
 						success: (res) => {
 							let json = {
-								persissonType: '210'
+								persissonType: '6075'
 							};
 							Object.assign(json, this.device);
 							res.eventChannel.emit('share', {
@@ -766,763 +687,741 @@
 				}
 			},
 
-
-			// 发送人员信息
-			sendPersonnelInfo() {
-				if (!this.personnelInfo.unitName) {
-					uni.showToast({
-						title: '单位名称不能为空',
-						icon: 'none'
-					});
-					return;
-				}
-				if (!this.personnelInfo.name) {
-					uni.showToast({
-						title: '姓名不能为空',
-						icon: 'none'
-					});
-					return;
-				}
-				if (!this.personnelInfo.position) {
-					uni.showToast({
-						title: '职位不能为空',
-						icon: 'none'
-					});
-					return;
-				}
-				if (!this.personnelInfo.code) {
-					uni.showToast({
-						title: 'ID不能为空',
-						icon: 'none'
-					});
-					return;
-				}
-				uni.showLoading({
-					title: '发送中...',
-					mask: true
-				})
-				let data = {
-					code: this.personnelInfo.code,
-					name: this.personnelInfo.name,
-					position: this.personnelInfo.position,
-					unitName: this.personnelInfo.unitName,
-					deviceId: this.deviceID
-				}
-				registerPersonInfo(data).then((res) => {
-					if (res.code == 200) {
-						uni.hideLoading()
-						this.showPopup('person');
-					} else {
-						uni.showToast({
-							title: res.msg,
-							icon: 'none'
-						});
-					}
-				})
-			},
-			// 发送文本消息
-			sendTextMessage() {
-				if (!this.messageToSend) {
-					uni.showToast({
-						title: '请输入要发送的文字',
-						icon: 'none'
-					});
-					return;
-				}
-				uni.showLoading({
-					title: '发送中...',
-					mask: true
-				})
-				let data = {
-					sendMsg: this.messageToSend,
-					deviceIds: [this.deviceID]
-				}
-				deviceSendMessage(data).then((res) => {
-					if (res.code == 200) {
-						uni.hideLoading()
-						this.showPopup('person');
-					} else {
-						uni.showToast({
-							title: res.msg,
-							icon: 'none'
-						});
-					}
-				})
-			},
-			// 统一处理返回方法
-			handleDeviceData(res, isFromShared = false) {
-				if (res.code == 200) {
-					// 最后关闭加载状态
-					this.pageLoading = false
-					this.deviceInfo = res.data
-					this.personnelInfo = {
-						unitName: res.data.personnelInfo?.unitName || '',
-						name: res.data.personnelInfo?.name || '',
-						code: res.data.personnelInfo?.code || '',
-						position: res.data.personnelInfo?.position || '',
-					}
-					this.messageToSend = res.data.sendMsg || ''
-					// 关闭加载中
-					uni.hideLoading()
-				}
-			},
-			// 获取设备详情（普通详情）
-			async fetchDeviceDetail(id) {
-				try {
-					const res = await deviceDetail(id)
-					this.handleDeviceData(res, false)
-				} catch (error) {
-					uni.showToast({
-						title: '获取详情失败',
-						icon: 'none'
-					})
-				}
-			},
-		},
-		onLoad(options) {
-			const eventChannel = this.getOpenerEventChannel();
-			// 监听 'detailData' 事件，获取传过来的数据
-			uni.showLoading({
-				title: '加载中...'
-			})
-			eventChannel.on('detailData', (data) => {
-				this.itemInfo = data.data;
-				this.deviceID = data.data.id;
-				this.navTitle = data.data.deviceName;
-				this.apiType = data.apiType
-				this.deviceType = data.deviceType
-
-				// 根据 apiType 设置右图标的显示状态
-				this.isRightIconVisible = this.apiType === 'listA';
-				// 初始化并连接MQTT
-				this.mqttClient = new MqttClient();
-				this.mqttClient.connect(() => {  
-					console.log('MQTT 连接成功，开始订阅主题');
-					// 订阅来自设备的状态更新
-					const statusTopic = `A/${this.itemInfo.deviceImei}`;
-					this.mqttClient.subscribe(statusTopic, (payload) => {
-						console.log(`收到来自 ${statusTopic} 的消息:`, payload);
-						// uni.showModal({
-						// 	title: '收到设备消息',
-						// 	content: payload,
-						// 	showCancel: false
-						// });
-						// ✅ 发送全局事件通知主页面更新
-						uni.$emit('deviceStatusUpdate', {
-							message: JSON.stringify(payload), // 消息内容
-							timestamp: new Date().getTime() // 时间戳
-						});
-					});
-				});
-				this.fetchDeviceDetail(data.data.id)
-
-			});
-			// 如果需要向调用页面返回数据，可以触发 'ack' 事件
-			eventChannel.emit('ack', {
-
-			})
-
-		},
-		onUnload() {
-			// 页面卸载时断开MQTT连接
-			if (this.mqttClient) {
-				this.mqttClient.disconnect();
-			}
-		},
-
+		}
 	}
 </script>
 
-<style scoped>
-	.page-loading-mask {
-		position: fixed;
-		top: 0;
-		left: 0;
-		right: 0;
-		bottom: 0;
-		background-color: #121212;
+<style>
+	.content {
+		padding: 30rpx;
+		box-sizing: border-box;
+	}
+
+	.eq {
+		width: 100%;
+		height: 250rpx;
+		border-radius: 8px;
+		background: rgba(26, 26, 26, 1);
+		box-sizing: border-box;
+		padding: 24rpx 28rpx;
 		display: flex;
+		flex-direction: row;
+		flex-wrap: nowrap;
+		align-content: center;
 		justify-content: center;
 		align-items: center;
-		z-index: 9999;
+		margin-bottom: 24rpx;
 	}
 
-	/* 优化权限控制区域的显示 */
-	.mode-section,
-	.form-section {
-		transition: opacity 0.3s ease;
-	}
-
-	.device-detail-container {
-		padding: 30rpx;
-		background: #121212;
-		min-height: 100vh;
-	}
-
-	.status-bar {
-		display: flex;
-		justify-content: space-between;
-		margin-bottom: 40rpx;
-	}
-
-	.time {
-		font-size: 36rpx;
-		font-weight: bold;
-	}
-
-	.battery {
-		font-size: 36rpx;
-	}
-
-	.battery-section {
-		background-color: rgb(26, 26, 26);
+	.eq .leftImg {
+		box-sizing: border-box;
+		padding: 36rpx;
 		border-radius: 16rpx;
-		padding: 30rpx;
-		display: flex;
-		justify-content: space-between;
-		margin-bottom: 20rpx;
-		align-items: center;
+		background: rgba(42, 42, 42, 0.5);
 	}
 
-	.mode-v1.active-mode {
-		border: 2rpx solid #BBE600 !important;
-		border-radius: 12rpx;
+	.eq .leftImg,
+	.eq .rightTxt {
+		width: 50%;
+		height: 100%;
 	}
 
-	.mode-v1.active-mode .battery-v2 {
-		color: #BBE600 !important;
-	}
-
-	.mode-v1.active-mode .mode-v3 {
-		color: #BBE600 !important;
-	}
-
-	.battery-info,
-	.duration {
+	.eq .rightTxt {
 		display: flex;
 		flex-direction: column;
-		align-items: center;
+		flex-wrap: nowrap;
+		align-content: flex-start;
+		justify-content: space-evenly;
+		align-items: flex-start;
 	}
 
-	.bipImg {
-		width: 204rpx;
-		height: 144rpx;
-		margin-top: 30rpx;
+	.eq .leftImg .img {
+		width: 100%;
+		height: 100%;
 	}
 
-	.dlIMG {
+	.eq .rightTxt .img {
 		width: 52rpx;
 		height: 52rpx;
 	}
 
-	.cpIMG {
-		width: 66rpx;
-		height: 66rpx;
-	}
-
-	.battery-sectionLeft {
-		width: 308rpx;
-		height: 220rpx;
-		background: rgba(42, 42, 42, 0.5);
-		border-radius: 16rpx;
-		text-align: center;
-		align-items: center;
-		line-height: 220rpx;
-	}
-
-	.percentage {
-		font-size: 48rpx;
-		font-weight: bold;
-		color: #007AFF;
-	}
-
-	.label {
-		font-size: 28rpx;
-		color: #666;
-		margin-top: 10rpx;
-	}
-
-	.battery-v1 {
-		display: flex;
-		align-items: center;
-		margin-bottom: 10rpx;
-	}
-
-
-	.battery-v2 {
-		color: rgba(255, 255, 255, 0.87);
-		margin-left: 18rpx;
-		font-size: 32rpx;
-	}
-
-	.battery-v3 {
-		color: rgba(255, 255, 255, 0.6);
-		margin-left: 25rpx;
-		font-size: 26rpx;
-	}
-
-	.mode-v3 {
-		color: rgba(255, 255, 255, 0.6);
-		font-size: 26rpx;
-		padding-top: 10rpx;
-	}
-
-	.radio-group {
-		display: flex;
-		gap: 12px;
-		align-items: center;
-		margin-bottom: 20rpx;
-		font-size: 200rpx;
-	}
-
-	.group-item {
-		background: rgba(26, 26, 26, 1);
+	.eq .rightTxt .row {
 		width: 100%;
-		height: 136rpx;
-		border-radius: 72rpx;
-		text-align: center;
-		line-height: 136rpx;
-		position: relative;
-	}
-
-	.radio-icon.selected {
-		background-color: rgba(174, 214, 0, 1);
-		transition: background-color 0.3s;
-		border-radius: 72rpx;
-	}
-
-	.radio-icon {
-		font-size: 50rpx;
-	}
-
-	.uni-border {
-		border: 4rpx solid rgba(26, 26, 26, 1);
-		width: 96%;
-		height: 123rpx;
-		position: absolute;
-		top: 7rpx;
-		left: 6rpx;
-		border-radius: 72rpx;
-	}
-
-	.info-card {
-		background-color: rgb(26, 26, 26);
-		border-radius: 16rpx;
-		padding: 10rpx 30rpx 5rpx 30rpx;
-		margin-bottom: 20rpx;
-
-	}
-
-	.info-row {
-		display: flex;
-		justify-content: space-between;
-		margin-bottom: 20rpx;
-	}
-
-	.info-label {
-		font-size: 28rpx;
-		color: rgba(255, 255, 255, 0.87);
-	}
-
-	.info-value {
-		font-size: 28rpx;
-		color: rgba(255, 255, 255, 0.87);
-	}
-
-	.status-running {
-		color: rgba(255, 255, 255, 0.6);
-		text-align: end;
-	}
-
-	.status-greend {
-		color: rgba(174, 214, 0, 1);
-		text-align: end;
-	}
-
-	.light {
-		position: absolute;
-		/* top:10rpx; */
-		color: rgba(74, 74, 74, 0.87);
-		top: 58rpx;
-		left: 108rpx
-	}
-
-	.section-title {
-		font-size: 32rpx;
-		margin-bottom: 20rpx;
-		display: block;
-		color: rgba(255, 255, 255, 0.87);
-	}
-
-	.slider-container {
 		display: flex;
+		flex-direction: row;
+		flex-wrap: nowrap;
+		align-content: center;
+		justify-content: flex-start;
 		align-items: center;
+		box-sizing: border-box;
+		padding-left: 50rpx;
 	}
 
-	.slider {
-		flex: 1;
-		margin: 0 20rpx;
-	}
-
-	.mode-buttons {
-		display: flex;
-		justify-content: space-between;
-		flex-wrap: wrap;
-	}
-
-	.mode_1 {
-		width: 180rpx;
-		height: 180rpx;
-		border-radius: 16rpx;
-		background: rgb(26, 26, 26);
-		align-items: center;
-		text-align: center;
-		color: rgba(255, 255, 255, 0.6);
-		padding-top: 37rpx;
-	}
-
-	.mode-v1 {
-		background: #1A1A1A;
-		border-radius: 18rpx;
-		height: 150rpx;
-		margin-bottom: 20rpx;
-		width: 47%;
-		display: flex;
-		text-align: center;
-	}
-
-	.mode-v2 {
-		display: flex;
-		align-items: center;
-		text-align: center;
-		margin-left: 40rpx;
-
-	}
-
-	.example-body {
-		position: absolute;
-		left: 50%;
-		top: 65%;
-		width: 100%;
-		transform: translate(-20%, -100%);
-	}
-
-	.icoContent {
-		width: 320rpx;
-		height: 160rpx;
-		border-radius: 8rpx;
-		background: rgba(58, 58, 58, 1);
-		text-align: center;
-		line-height: 200rpx;
-	}
-
-	.img {
-		width: 62rpx;
-		height: 62rpx;
-	}
-
-	.example_title {
-		color: rgba(255, 255, 255, 0.87);
-	}
-
-	.mode-btn {
-		width: 48%;
-		height: 80rpx;
-		line-height: 80rpx;
-		background-color: #f5f5f5;
-		color: #333;
-		border-radius: 8rpx;
-		font-size: 28rpx;
-		border: none;
-	}
-
-	.mode-btn.active {
-		background-color: #007AFF;
-		color: #fff;
-	}
-
-	.form-section {
-		background-color: rgb(26, 26, 26);
-		border-radius: 16rpx;
-		padding: 30rpx;
-		margin-bottom: 30rpx;
-
-	}
-
-	.form-row {
-		display: flex;
-		align-items: center;
-		margin-bottom: 20rpx;
-		background: rgba(42, 42, 42, 1);
-		border-radius: 16rpx;
+	.eq .rightTxt .row .txt {
 		padding-left: 20rpx;
 	}
 
-	.form-label {
-		font-size: 32rpx;
+	.eq .bigTxt {
 		color: rgba(255, 255, 255, 0.87);
-	}
-
-	.form-input {
-		height: 80rpx;
-		border: 1rpx solid transparent;
-		font-size: 32rpx;
-		color: rgba(255, 255, 255, 0.87);
-	}
-
-	.product-section {
-		background-color: #fff;
-		border-radius: 16rpx;
-		padding: 30rpx;
-		margin-bottom: 30rpx;
-		box-shadow: 0 4rpx 12rpx rgba(0, 0, 0, 0.05);
-	}
-
-	.product-tabs {
-		display: flex;
-		margin-top: 20rpx;
-	}
-
-	.tab {
-		padding: 15rpx 30rpx;
+		font-family: PingFang SC;
 		font-size: 28rpx;
-		color: #666;
-		border-bottom: 4rpx solid transparent;
+		font-weight: 400;
 	}
 
-	.tab.active {
-		color: #007AFF;
-		border-bottom-color: #007AFF;
+	.eq .smallTxt {
+		color: rgba(255, 255, 255, 0.6);
+		font-family: PingFang SC;
+		font-size: 24rpx;
+		font-weight: 400;
 	}
 
-	.action-buttons {
-		padding: 30rpx 0;
-	}
 
-	.send-btn {
-		background-color: rgb(187, 230, 0);
-		color: rgba(35, 35, 35, 0.87);
-		height: 50rpx;
-		line-height: 50rpx;
+	.eqinfo {
 		border-radius: 16rpx;
-		font-size: 26rpx;
-		width: 112rpx;
-		white-space: nowrap;
-		text-align: center;
-		position: absolute;
-		right: 70rpx;
-
+		background: rgba(26, 26, 26, 1);
+		box-sizing: border-box;
+		padding: 14rpx 0rpx;
 	}
 
-	.send-btn1 {
-		background-color: rgb(187, 230, 0);
-		color: rgba(35, 35, 35, 0.87);
-		height: 50rpx;
-		line-height: 50rpx;
-		border-radius: 16rpx;
-		font-size: 26rpx;
-		width: 112rpx;
-		white-space: nowrap;
-		text-align: center;
-		position: absolute;
-		right: 0rpx;
-		top: -70rpx
-	}
-
-
-	/* 遮罩层 */
-	.agreement-mask {
-		position: fixed;
-		top: 0;
-		left: 0;
-		right: 0;
-		bottom: 0;
-		background-color: rgba(0, 0, 0, 0.5);
+	.eqinfo .item {
+		width: 100%;
+		min-height: 60rpx;
+		height: auto;
+		line-height: 60rpx;
+		padding: 0rpx 28rpx;
+		box-sizing: border-box;
 		display: flex;
+		flex-direction: row;
+		flex-wrap: nowrap;
+		align-content: center;
+		justify-content: space-between;
+		align-items: center;
+	}
+
+	.eqinfo .lbl {
+		color: rgba(255, 255, 255, 0.87);
+		font-family: PingFang SC;
+		font-size: 28rpx;
+		font-weight: 400;
+		width: 140rpx;
+		letter-spacing: 0.07px;
+		text-align: left;
+	}
+
+	.eqinfo .value {
+		color: rgba(255, 255, 255, 0.6);
+		font-family: 'PingFang SC';
+		font-size: 28rpx !important;
+		font-weight: 400;
+
+		letter-spacing: 0.07px;
+		text-align: left;
+	}
+
+
+	.eqinfo .valueFont {
+		font-family: 'PingFang SC';
+		font-size: 28rpx !important;
+		font-weight: 400;
+		color: rgba(255, 255, 255, 0.6);
+	}
+
+	.eqinfo .multiValue {
+		display: flex;
+		flex-direction: column;
+		flex-wrap: wrap;
+		align-content: flex-end;
+		align-items: flex-end;
+		justify-content: flex-start;
+		width: calc(100% - 140rpx)
+	}
+
+	.eqinfo .valueItem {
+		height: auto;
+		line-height: 40rpx;
+		color: rgba(255, 255, 255, 0.6);
+		font-family: PingFang SC;
+		font-size: 14px;
+		font-weight: 400;
+		letter-spacing: 0.07px;
+	}
+
+	.lamp {
+		margin-top: 24rpx;
+	}
+
+	.lamp .title {
+		width: 100%;
+		height: 60rpx;
+		line-height: 60rpx;
+		padding: 0rpx 28rpx;
+		box-sizing: border-box;
+		display: flex;
+		flex-direction: row;
+		flex-wrap: nowrap;
+		align-content: center;
+		justify-content: space-between;
+		align-items: center;
+		font-size: 28rpx;
+	}
+
+	.lampMode {
+		padding: 30rpx 0rpx;
+		width: 100%;
+		box-sizing: border-box;
+display: flex;
+		align-content: space-around;
+		justify-content: space-between;
+		align-items: center;
+		justify-items: stretch;
+		flex-direction: row;
+		flex-wrap: wrap;
+	}
+
+	.lampMode .mode {
+		width: calc(calc(100% - 34rpx) / 2);
+		border-radius: 8px;
+		margin-top: 20rpx;
+		background: rgba(26, 26, 26, 1);
+		display: flex;
+		flex-direction: row;
+		flex-wrap: nowrap;
+		align-content: center;
+		align-items: center;
+		justify-content: flex-start;
+		padding: 30rpx;
+		box-sizing: border-box;
+	}
+
+	.lampMode .mode.active {
+
+		border: 1px solid rgba(174, 214, 0, 1);
+	}
+
+	.lampMode .mode.active .bigTxt {
+
+		color: rgba(174, 214, 0, 1) !important;
+	}
+
+	.mode.marginLeft {
+		margin-left: 34rpx !important;
+	}
+
+	.mode .leftImg .img {
+		width: 70rpx;
+		height: 70rpx;
+	}
+
+	.mode .rightTxt {
+		display: flex;
+		flex-direction: column;
+		flex-wrap: nowrap;
+		align-content: flex-start;
 		justify-content: center;
-		align-items: center;
-		z-index: 9999;
+		align-items: flex-start;
+		padding-left: 20rpx;
 	}
 
-	/* 弹窗主体 */
-	.agreement-popup {
-		width: 100%;
-		height: 40%;
-		background-color: rgb(42, 42, 42);
-		border-radius: 60rpx 60rpx 0rpx 0rpx;
-		padding: 40rpx;
-		box-sizing: border-box;
-		position: absolute;
-		bottom: 0rpx;
-	}
-
-	.agreement-popupB {
-		width: 100%;
-		height: 32%;
-		background-color: rgb(42, 42, 42);
-		border-radius: 60rpx 60rpx 0rpx 0rpx;
-		padding: 40rpx;
-		box-sizing: border-box;
-		position: absolute;
-		bottom: 0rpx;
-	}
-
-	.agreement-popupC {
-		width: 80%;
-		background-color: rgb(42, 42, 42);
-		border-radius: 40rpx;
-		padding: 40rpx;
-		box-sizing: border-box;
-		border: 1px solid rgba(255, 200, 78, 1);
-	}
-
-	.popup-Title {
-		color: rgba(255, 200, 78, 1);
-	}
-
-	/* 标题 */
-	.popup-title {
-		font-size: 36rpx;
-		text-align: center;
-		margin-bottom: 30rpx;
+	.mode .bigTxt {
 		color: rgba(255, 255, 255, 0.87);
+		font-family: PingFang SC;
+		font-size: 28rpx;
+		font-weight: 400;
+
+		letter-spacing: 0.07px;
+
 	}
 
-	/* 内容文本 */
-	.popup-content {
-		font-size: 30rpx;
-		line-height: 1.6;
-		color: rgba(255, 255, 255, 0.87);
-		margin-bottom: 50rpx;
+	.mode .smallTxt {
+		color: rgba(255, 255, 255, 0.6);
+		font-family: PingFang SC;
+		font-size: 24rpx;
+		font-weight: 400;
+
+		letter-spacing: 0.07px;
+
 	}
 
-	.upload_flex {
-		display: flex;
-		cursor: pointer;
-		align-items: center;
+	.usrinfo {
+		border-radius: 8px;
+		width: 100%;
+		box-sizing: border-box;
+		padding: 24rpx 28rpx;
+		background: rgba(26, 26, 26, 1);
 		margin-bottom: 20rpx;
 	}
 
-	.uploadIMG {
-		width: 68rpx;
-		height: 68rpx;
-		margin-right: 20rpx;
-	}
-
-	.item {
-		padding: 10px;
-		margin: 5px 0;
-		display: flex;
-		align-items: center;
-		cursor: pointer;
-		transition: background-color 0.3s;
-	}
-
-	.setIMG {
-		width: 24px;
-		height: 24px;
-		margin-right: 10px;
-	}
-
-	.item.selected {
-		background-color: rgb(58, 58, 58);
+	.usrtitle {
 		color: rgba(255, 255, 255, 0.87);
-		border-radius: 8rpx;
-	}
-
-	/* 按钮容器 */
-	.popup-buttons {
-		display: flex;
-		justify-content: space-between;
-	}
-
-	/*确定按钮 */
-	.agree {
-		background-color: rgb(187, 230, 0);
-		color: #232323;
-		border: none;
-		font-size: 24rpx;
-		height: 88rpx;
-		line-height: 88rpx;
-		font-size: 32rpx;
-		width: 100%;
-		position: absolute;
-		bottom: 0rpx;
-		left: 0rpx
-	}
-
-	/* 通用按钮样式 */
-	.btn {
-		flex: 1;
-		height: 80rpx;
-		line-height: 80rpx;
-		border-radius: 40rpx;
-		font-size: 32rpx;
-		margin: 0 20rpx;
-	}
-
-	/* 不同意按钮 */
-	.disagree {
-		background-color: transparent;
-		color: rgba(255, 255, 255, 0.87);
-		border: 1px solid rgba(255, 200, 78, 0.7);
-		font-size: 24rpx;
-		color: rgba(255, 200, 78, 1);
-	}
-
-	/* 同意按钮 */
-	.agreeBtn {
-		background-color: rgba(255, 200, 78, 1);
-		color: #232323;
-		border: none;
-		font-size: 24rpx;
-	}
-
-	.right-icons {
-		/* display: flex; */
-		align-items: center;
-	}
-
-	.toggle-icon {
-		cursor: pointer;
-		font-size: 16px;
-		margin-top: -40rpx;
-	}
-
-	.icon {
-		font-size: 14px;
-		color: #fff;
-	}
-
-	.form-content {
-		transition: all 0.3s ease;
-		margin-top: 60rpx;
-		position: relative;
-	}
-
-	/* 新增：删除文件列表样式 */
-	.file-list-tip {
-		margin-top: 20rpx;
-		font-size: 26rpx;
-		color: #666;
-	}
-	.empty-tip {
-		text-align: center;
-		color: #999;
-		padding: 20rpx 0;
-	}
-	.file-list {
-		padding: 10rpx 0;
-	}
-	.file-item {
-		display: flex;
-		align-items: center;
-		padding: 10rpx 0;
-		border-bottom: 1px solid #eee;
-	}
-	.file-name {
-		margin-left: 10rpx;
+		font-family: PingFang SC;
 		font-size: 28rpx;
+		font-weight: 400;
+		height: 40rpx;
+		line-height: 40rpx;
+		letter-spacing: 0.07px;
+
+	}
+
+	.usrinfo .btnSend {
+		line-height: 65rpx;
+		border-radius: 8px;
+		width: 120rpx;
+		height: 65rpx;
+		color: rgba(35, 35, 35, 0.87);
+		font-family: PingFang SC;
+		font-size: 24rpx;
+		font-weight: 400;
+		letter-spacing: 0.15rpx;
+		text-align: center;
+		background-color: #BBE600;
+	}
+
+	.usrinfo .item {
+		border-radius: 8px;
+		width: 100%;
+		box-sizing: border-box;
+		line-height: 90rpx;
+		height: 90rpx;
+		background: rgba(42, 42, 42, 1);
+		margin-top: 24rpx;
+		display: flex;
+		flex-direction: row;
+		flex-wrap: nowrap;
+		align-content: center;
+		justify-content: flex-start;
+		align-items: center;
+	}
+
+	.usrinfo .lbl {
+		width: 120rpx;
+		height: 100%;
+		padding-left: 24rpx;
+		box-sizing: border-box;
+
+		text-align: right;
+
 		color: rgba(255, 255, 255, 0.87);
+		font-family: PingFang SC;
+		font-size: 28rpx;
+		font-weight: 400;
+
+		letter-spacing: 0.07px;
+
+	}
+
+	.usrinfo .value {
+		width: calc(100% - 120rpx);
+		height: 100%;
+
+		font-size: 28rpx;
+		font-weight: 400;
+
+		letter-spacing: 0.07px;
+		text-align: left;
+
+	}
+
+	.usrinfo .value .uni-input-input {
+		color: rgba(255, 255, 255, 0.87);
+		font-family: PingFang SC;
+
+	}
+
+
+	.usrplace {
+		color: rgba(255, 255, 255, 0.4);
+		font-family: PingFang SC;
+		font-size: 28rpx;
+		font-weight: 400;
+		letter-spacing: 0.07px;
+		text-align: left;
+	}
+
+	.proinfo .itemcontent {
+		display: flex;
+		display: flex;
+		flex-direction: row;
+		flex-wrap: nowrap;
+		align-content: center;
+		justify-content: space-evenly;
+	}
+
+	.proinfo .item {
+		width: 180rpx;
+		height: 180rpx;
+		box-sizing: border-box;
+		padding: 40rpx;
+		border-radius: 16rpx;
+		background: rgba(26, 26, 26, 1);
+		display: flex;
+		flex-direction: column;
+		flex-wrap: nowrap;
+		align-content: center;
+		justify-content: center;
+		align-items: center;
+	}
+
+	.proinfo .item .img {
+		width: 50rpx;
+		height: 50rpx;
+
+
+	}
+
+	.proinfo .item .txt {
+		color: rgba(255, 255, 255, 0.6);
+		font-family: PingFang SC;
+		font-size: 24rpx;
+		font-weight: 400;
+		margin-top: 20rpx;
+		letter-spacing: 0.07px;
+		text-align: left;
+	}
+
+
+	.slider-container {
+		padding: 0px;
+	}
+
+
+
+
+	.addIco {
+		width: 100%;
+		height: 360rpx;
+		display: flex;
+		flex-direction: row;
+		flex-wrap: nowrap;
+		align-content: center;
+		justify-content: center;
+		align-items: center;
+	}
+
+	.icoContent {
+		width: 240rpx;
+		height: 240rpx;
+		border-radius: 8rpx;
+
+
+		background: rgba(58, 58, 58, 1);
+	}
+
+	.icoContent .img {
+		width: 70rpx;
+		height: 70rpx;
+	}
+
+	.modeSetting {
+		display: flex;
+		flex-direction: row;
+		flex-wrap: nowrap;
+		align-content: center;
+		justify-content: space-around;
+		align-items: center;
+		border-radius: 8px;
+		background: rgba(26, 26, 26, 1);
+		box-sizing: border-box;
+		padding: 30rpx 0rpx;
+	}
+
+	.modeSetting .item {
+		width: 120rpx;
+		height: 120rpx;
+		background: rgba(42, 42, 42, 1);
+		border-radius: 50%;
+
+		color: rgba(255, 255, 255, 0.87);
+
+		font-family: PingFang SC;
+		font-size: 28rpx;
+		font-weight: 400;
+		line-height: 0px;
+
+		box-sizing: border-box;
+	}
+
+	.modeSetting .item.active {
+		border: 4rpx solid rgba(174, 214, 0, 1);
+		background: rgba(26, 26, 26, 1);
+		padding: 6rpx;
+		color: rgba(26, 26, 26, 0.87);
+	}
+
+	.modeSetting .item.active .p100 {
+		background: rgba(174, 214, 0, 1);
+		border-radius: 50%;
+
+	}
+
+
+	.usrinfo .image {
+		width: 30rpx;
+		height: 40rpx;
+	}
+
+	.usrinfo .img {
+		width: 30rpx;
+		height: 40rpx;
+	}
+
+	.content {
+
+		box-sizing: border-box;
+		width: 100%;
+		min-height: 100vh;
+		height: auto;
+	}
+
+	.contentBg {
+		background-color: #121212;
+		color: #ffffffde;
+	}
+
+	.fleft {
+		float: left;
+	}
+
+	.fright {
+		float: right;
+	}
+
+	.clear {
+		clear: both;
+	}
+
+	.displayNone {
+		display: none !important;
+	}
+
+	.p100 {
+		width: 100%;
+		height: 100%;
+	}
+
+	.center {
+		display: flex;
+		flex-direction: row;
+		flex-wrap: nowrap;
+		align-content: center;
+		justify-content: center;
+		align-items: center;
+	}
+
+	.centerLeft {
+		display: flex;
+		flex-direction: row;
+		flex-wrap: nowrap;
+		align-content: center;
+		justify-content: flex-start;
+		align-items: center;
+	}
+
+	.warnnig {
+		border-radius: 16rpx;
+		width: 100%;
+		height: 70rpx;
+		line-height: 70rpx;
+		background: rgba(224, 52, 52, 1);
+		box-sizing: border-box;
+		padding: 0rpx 30rpx;
+		margin-top: 20rpx;
+		color: rgba(255, 255, 255, 0.87);
+		font-family: 'PingFang SC';
+		font-size: 28rpx;
+		font-weight: 400;
+		display: flex;
+		flex-direction: row;
+		flex-wrap: nowrap;
+		align-content: center;
+		justify-content: space-between;
+		align-items: center;
+	}
+
+	.optTitle {
+		color: rgba(255, 255, 255, 0.87);
+
+		font-family: 'PingFang SC';
+		font-size: 28rpx;
+		font-weight: 400;
+
+		letter-spacing: 0.14rpx;
+		text-align: left;
+		width: 100%;
+		box-sizing: border-box;
+		padding: 30rpx 0rpx 10rpx 30rpx;
+	}
+
+	.sosContent {
+		width: 100%;
+		height: 130rpx;
+
+		display: flex;
+		flex-direction: row;
+		flex-wrap: nowrap;
+		align-content: center;
+		justify-content: space-between;
+		align-items: center;
+	}
+
+	.sosContent .item {
+		width: calc(calc(100% - 80rpx) / 2);
+		height: 100%;
+		box-sizing: border-box;
+		border-radius: 16rpx;
+		background: rgba(26, 26, 26, 1);
+		color: rgba(255, 255, 255, 0.87);
+		font-family: 'PingFang SC';
+		font-size: 28rpx;
+		font-weight: 400;
+		letter-spacing: 0.14rpx;
+		display: flex;
+		flex-direction: row;
+		flex-wrap: nowrap;
+		align-content: center;
+		justify-content: center;
+		align-items: center;
+	}
+
+	.sosContent .item.active {
+		border: 1px solid rgba(224, 52, 52, 1);
+		color: rgba(224, 52, 52, 1);
+	}
+
+	.sosContent .imgContent {
+		width: 55rpx;
+		height: 55rpx;
+		background-color: #232323;
+		border-radius: 4rpx;
+		margin-right: 30rpx;
+	}
+
+	.sosContent .imgContent .img {
+		width: 70%;
+		height: 70%;
+
+	}
+
+	.sosContent .item.active .imgContent {
+		background-color: #E034340F;
+	}
+
+	.lightMode {
+		width: 100%;
+		height: 180rpx;
+		border-radius: 16rpx;
+		background: rgba(26, 26, 26, 1);
+		margin-bottom: 30rpx;
+		display: flex;
+		flex-direction: row;
+		flex-wrap: nowrap;
+		align-content: center;
+		justify-content: space-between;
+		align-items: center;
+	}
+
+
+	.lightMode .item {
+		width: calc(calc(100% - 90rpx) / 3);
+		height: 100%;
+		box-sizing: border-box;
+		border-radius: 16rpx;
+
+		color: rgba(255, 255, 255, 0.87);
+		font-family: 'PingFang SC';
+		font-size: 28rpx;
+		font-weight: 400;
+		letter-spacing: 0.14rpx;
+		display: flex;
+		flex-direction: column;
+		flex-wrap: nowrap;
+		align-content: center;
+		justify-content: space-evenly;
+		align-items: center;
+	}
+
+	.lightMode .item.active {
+
+		color: #AED600;
+	}
+
+	.lightMode .imgContent {
+		width: 80rpx;
+		height: 100rpx;
+	}
+
+	.lightMode .imgContent .img {
+		width: 100%;
+		height: 100%;
+
+	}
+
+	.picVideo .btnImg {
+		width: 100%;
+		height: 100rpx;
+		border-radius: 16rpx;
+		background: rgba(42, 42, 42, 1);
+	}
+
+	.picVideo .btnImg .img {
+		width: 40rpx;
+		height: 40rpx;
+	}
+
+
+	.netContent {
+		display: flex;
+		flex-direction: row;
+		flex-wrap: nowrap;
+		align-content: flex-end;
+		justify-content: space-around;
+		align-items: flex-end;
+		width: 50rpx;
+	}
+
+	.net {
+		width: 7rpx;
+		background: rgba(255, 255, 255, 0.3);
+	}
+
+	.net.netone {
+		height: 11rpx;
+	}
+
+	.net.nettwo {
+		height: 17rpx;
+	}
+
+	.net.netsiri {
+		height: 23rpx;
+	}
+
+	.net.netfour {
+		height: 29rpx;
+	}
+
+	.net.netfive {
+		height: 35rpx;
+	}
+
+	.net.active {
+		background: #FFFFFF !important;
+	}
+
+	.navbarRight .img {
+		width: 35rpx;
+		height: 35rpx;
+		margin-right: 30rpx;
+	}
+
+	.uni-navbar--fixed {
+		top: 0rpx;
+	}
+
+	/deep/ .uni-navbar--fixed {
+		top: 0px;
+	}
+
+	/deep/ .uni-navbar__placeholder {
+		display: none !important;
 	}
 </style>
\ No newline at end of file
diff --git a/pages/210/HBY210Old.vue b/pages/210/HBY210Old.vue
new file mode 100644
index 0000000..1177a37
--- /dev/null
+++ b/pages/210/HBY210Old.vue
@@ -0,0 +1,1528 @@
+<template>
+	<view>
+		<!-- 添加全局加载遮罩 -->
+		<view v-if="pageLoading" class="page-loading-mask">
+		</view>
+		<!-- 使用自定义导航栏 -->
+		<view v-show="!pageLoading">
+			<custom-navbar :title="navTitle" :showBack="true" color="#FFFFFF" :rightIcons="[
+				    {src: '/static/images/210/ls.png'},
+				    ...(isRightIconVisible ? [{src: '/static/images/common/shape.png'}] : [])
+				  ]" @icon-click="handleIconClick"></custom-navbar>
+
+			<view class="device-detail-container" :style="{ paddingTop: navBarHeight + 'px' }">
+				<!-- 设备电量信息 -->
+				<view class="battery-section">
+					<view class="battery-sectionLeft">
+						<image :src="deviceInfo.devicePic" class="bipImg" mode="aspectFit"></image>
+					</view>
+					<view>
+						<view class="battery-v1">
+							<image src="/static/images/common/battry.png" class="dlIMG"></image>
+							<view>
+								<view class="battery-v2">{{deviceInfo.batteryPercentage}}%</view>
+								<view class="battery-v3">电量</view>
+							</view>
+						</view>
+						<view class="battery-v1">
+							<image src="/static/images/common/time.png" class="dlIMG" mode="aspectFit"></image>
+							<view>
+								<view class="battery-v2">{{deviceInfo.batteryRemainingTime}}分钟</view>
+								<view class="battery-v3">续航时间</view>
+							</view>
+						</view>
+					</view>
+					<view>
+					</view>
+				</view>
+
+				<!-- 设备基本信息 -->
+				<view class="info-card">
+					<view class="info-row">
+						<text class="info-label">设备状态</text>
+						<text class="info-value status-running">运行中</text>
+					</view>
+					<view class="info-row">
+						<text class="info-label">联机状态</text>
+						<text class="info-value status-greend">联机</text>
+					</view>
+					<view class="info-row">
+						<text class="info-label">定位信息</text>
+						<view class="info-value status-running" @click="gpsPosition">
+							<view class="info-value status-running">114.72 30.28</view>
+							<view class="info-value status-running">
+								<uni-icons @click="toggleForm" type="location" size="17"
+									color="rgba(255, 255, 255, 0.8)" style="vertical-align: bottom;" />
+								深圳市龙华区富源晟
+							</view>
+						</view>
+					</view>
+				</view>
+				<!-- ===========主副机选择============= -->
+				<view class="mode-section">
+					<view class="radio-group">
+						<view v-for="(item, index) in radioList" :key="index" class="group-item">
+							<view class="radio-icon" :class="{ 'selected': radioSelected === index }">
+								{{ item }}
+								<view class="uni-border"></view>
+							</view>
+						</view>
+					</view>
+				</view>
+				<!-- ============灯光模式选择================ -->
+				<view class="mode-section">
+					<view class="mode-buttons">
+						<view v-for="(item, index) in modeItems" :key="index" class="mode-v1"
+							:class="{ 'active-mode': selectedIndex === index }">
+							<view class="mode-v2" @click="handleModeClick(index)">
+								<image :src="selectedIndex === index ? item.activeImage : item.image" class="setIMG"
+									mode="aspectFit"></image>
+								<view>
+									<view class="battery-v2">{{ item.title }}</view>
+									<view class="mode-v3" v-if="item.subTitle">{{ item.subTitle }}</view>
+								</view>
+							</view>
+						</view>
+					</view>
+				</view>
+
+				<!-- 人员信息登记 -->
+				<view class="form-section">
+					<view class="mode-buttons">
+						<view class="section-title">人员信息登记</view>
+						<view class="right-icons">
+							<uni-icons @click="toggleForm" :type="isFormExpanded ? 'arrowup' : 'down'" size="20"
+								color="rgba(255, 255, 255, 0.87" class="toggle-icon" />
+						</view>
+					</view>
+					<view class="form-content" v-if="isFormExpanded">
+						<button class="send-btn1" @click="sendPersonnelInfo">发送</button>
+						<view class="form-row">
+							<text class="form-label">单位：</text>
+							<input class="form-input" placeholder="请输入单位" v-model="personnelInfo.unitName" />
+						</view>
+						<view class="form-row">
+							<text class="form-label">姓名：</text>
+							<input class="form-input" placeholder="请输入姓名" v-model="personnelInfo.name" />
+						</view>
+						<view class="form-row">
+							<text class="form-label">职位：</text>
+							<input class="form-input" placeholder="请输入职位" v-model="personnelInfo.position" />
+						</view>
+						<view class="form-row">
+							<text class="form-label">ID：</text>
+							<input class="form-input" placeholder="请输入ID号" v-model="personnelInfo.code" />
+						</view>
+					</view>
+				</view>
+				<!-- 人员信息登记 -->
+				<view class="form-section">
+					<view class="mode-buttons">
+						<view class="section-title">发送信息</view>
+						<button class="send-btn" @click="sendTextMessage">发送</button>
+					</view>
+
+					<view class="form-row">
+						<input class="form-input" placeholder="请输入文字" v-model="messageToSend" />
+					</view>
+				</view>
+				<!-- 产品信息 -->
+				<ProParams :id="itemInfo.id"></ProParams>
+				
+			</view>
+			<!-- 弹框 -->
+			<view class="agreement-mask" v-if="lightModeA" @click.stop="closePopup">
+				<!-- 报警时长弹窗 -->
+				<view class="agreement-popup" @click.stop>
+					<!-- 标题 -->
+					<view class="popup-title">报警时长</view>
+					<view class="popup-content">
+						<view class="time-picker-container">
+							<TimePicker ref="timePicker" :defaultTime="currentAlarmTime" @change="handleTimeChange" />
+						</view>
+					</view>
+					<!-- 按钮组 -->
+					<view class="popup-buttons">
+						<button class="agree" @click="saveAlarmTime">保存</button>
+					</view>
+				</view>
+			</view>
+			<!-- 上传开机画面弹框 -->
+			<view class="agreement-mask" v-if="lightModeB" @click.stop="closePopup">
+				<!-- 上传画面弹窗 -->
+				<view class="agreement-popupB" @click.stop>
+					<!-- 标题 -->
+					<view class="popup-title">上传开机画面</view>
+					<view class="popup-content">
+						<view class="example-body">
+							<view class="icoContent" @click="checkImgUpload">
+								<image v-if="selectedImage" :src="selectedImage" mode="aspectFit" class="img"
+									style="width: 100%; height: 100%;"></image>
+								<image v-else mode="aspectFit" class="img"
+									src="/static/images/6155/DeviceDetail/add.png"></image>
+							</view>
+						</view>
+					</view>
+					<!-- 按钮组 -->
+					<view class="popup-buttons">
+						<button class="agree" @click="handleupload">确定</button>
+					</view>
+				</view>
+			</view>
+			<!-- =====报警声音上传======= -->
+			<view class="agreement-mask" v-if="lightModeC" @click.stop="closePopup">
+				<view class="agreement-popupB" @click.stop>
+					<!-- 标题 -->
+					<view class="popup-title">报警声音</view>
+					<view class="popup-content">
+						<view>
+							<view class="upload_flex" @click="uploadFile">
+								<image src="/static/images/210/upload.png" mode="aspectFit" class="uploadIMG"></image>
+								<text>点击选择上传文件</text>
+							</view>
+							<view class="upload_flex" @click="deleteQ">
+								<image src="/static/images/210/delete.png" mode="aspectFit" class="uploadIMG"></image>
+								<text>删除文件</text>
+							</view>
+							<!-- 展示已上传的报警声音文件 -->
+							<view class="file-list-tip" v-if="soundFileList.length > 0">
+								<text>已上传文件：{{ soundFileList.map(item => item.name).join('、') }}</text>
+							</view>
+						</view>
+					</view>
+					<!-- 按钮组 -->
+					<view class="popup-buttons">
+						<button class="agree" @click="handleSoundUpload">确定</button>
+					</view>
+				</view>
+			</view>
+			<!-- =====删除报警声音文件列表弹窗======= -->
+			<view class="agreement-mask" v-if="deleteSoundMode" @click.stop="closeDeleteSoundPopup">
+				<view class="agreement-popupB" @click.stop style="height: 45%;">
+					<!-- 标题 -->
+					<view class="popup-title">选择要删除的报警声音</view>
+					<view class="popup-content">
+						<!-- 无文件提示 -->
+						<view v-if="soundFileList.length === 0" class="empty-tip">
+							<text>暂无已上传的报警声音文件</text>
+						</view>
+						<view v-else class="file-list">
+							<view 
+								class="file-item" 
+								v-for="(file, index) in soundFileList" 
+								:key="index"
+							>
+								<checkbox 
+									
+									:value="file"
+									@change="handleSoundFileSelect"
+								/>
+								<text class="file-name">{{ file.name }}</text>
+							</view>
+						</view>
+					</view>
+					<!-- 按钮组 -->
+					<view class="popup-buttons" style="position: relative; bottom: 0;">
+						<button class="disagree" @click="closeDeleteSoundPopup" style="width: 48%;">取消</button>
+						<button class="agreeBtn" @click="confirmDeleteSound" :disabled="selectedSoundFiles.length === 0" style="width: 48%;">确定删除</button>
+					</view>
+				</view>
+			</view>
+			<!-- ======各个弹框类型======= -->
+			<CustomPopup :show="currentPopup.show" v-bind="currentPopup.config" @confirm="handleConfirm"
+				@cancel="handleCancel" />
+		</view>
+	</view>
+</template>
+
+<script>
+	// 弹框配置中心
+	const POPUP_CONFIGS = {
+		person: {
+			config: {
+				icon: '/static/images/common/sendSucc.png',
+				message: '信息发送成功',
+				showCancel: false
+			},
+
+		},
+		// 开机log
+		logo: {
+			config: {
+				icon: '/static/images/common/upload.png',
+				message: '上传成功',
+				showCancel: false
+			},
+
+		},
+		bettery: {
+			config: {
+				title: '设备电量低于20%',
+				titleColor: 'rgba(224, 52, 52, 1)',
+				message: '请及时充电',
+				icon: '/static/images/common/path.png',
+				popupBorder: '1rpx solid rgba(224, 52, 52, 0.3)',
+				confirmBtnBg: 'rgba(224, 52, 52, 1)',
+				showCancel: true
+			},
+			onConfirm() {
+				console.log('确认按钮');
+				return true; // 直接关闭
+			}
+		},
+
+		cancel: {
+			config: {
+				titleColor: 'rgba(224, 52, 52, 1)',
+				icon: '/static/images/common/svg.png',
+				popupBorder: '1rpx solid rgba(224, 52, 52, 0.3)',
+				confirmBtnBg: 'rgba(224, 52, 52, 1)',
+				showCancel: true //取消按钮
+			},
+			onConfirm() {
+				console.log('解除报警确认');
+			}
+		},
+		del: {
+			config: {
+				message: '确定开启报警?',
+				icon: '/static/images/210/bj_1.png',
+				popupBorder: '1rpx solid rgba(255, 200, 78, 1)',
+				confirmBtnBg: 'rgba(255, 200, 78, 1)',
+				showCancel: true
+			},
+			onConfirm() {
+				console.log('删除确认');
+			}
+		},
+		// 自动报警
+		autoAlarm: {
+			config: {
+				icon: '/static/images/6170/svg.png',
+				title: '报警信息',
+				message: '002号设备(ID:123456)\n出现报警', // 使用\n换行
+				showCountdown: true,
+				countdownTime: 59,
+				confirmText: '解除报警',
+				popupBorder: '1rpx solid rgba(224, 52, 52, 0.3)',
+				confirmBtnBg: 'rgba(224, 52, 52, 1)',
+				confirmBtnColor: "rgba(255, 255, 255, 0.87)",
+				showCancel: false,
+			},
+			onConfirm() {
+				console.log('自动报警确认');
+				// 这里可以添加自动报警的逻辑
+			}
+		},
+		// 报警声音上传成功
+		soundUpload: {
+			config: {
+				icon: '/static/images/common/upload.png',
+				message: '报警声音上传成功',
+				showCancel: false
+			}
+		},
+		// 报警声音删除成功
+		soundDelete: {
+			config: {
+				icon: '/static/images/common/sendSucc.png',
+				message: '报警声音删除成功',
+				showCancel: false
+			}
+		}
+	}
+	import MqttClient from '@/utils/mqtt.js';
+	import {
+		deviceDetail,
+		registerPersonInfo,
+		deviceSendMessage,
+		deviceShareId,
+		lightModeSettings, //灯光模式设置
+		laserModeSettings, //激光模式设置
+		mapReverseGeocoding //地图逆解析
+	} from '@/api/6170/deviceControl.js'
+
+	import {
+		baseURL,
+		getToken,
+		clientid
+	} from '@/utils/request'
+	export default {
+		data() {
+			return {
+				selectedIndex: -1, // Track currently selected index
+				modeItems: [{
+						image: "/static/images/210/lj.png",
+						activeImage: "/static/images/210/lj-HL.png",
+						title: "联机设备",
+						subTitle: ""
+					},
+					{
+						image: "/static/images/210/bj.png",
+						activeImage: "/static/images/210/bj-HL.png",
+						title: "报警声音",
+						subTitle: "上传"
+					},
+
+					{
+						image: "/static/images/210/zd.png",
+						activeImage: "/static/images/210/zd-HL.png",
+						title: "自动报警",
+						subTitle: ""
+					},
+					{
+						image: "/static/images/210/zd.png",
+						activeImage: "/static/images/210/zd-HL.png",
+						title: "手动报警",
+						subTitle: ""
+					},
+
+					{
+						image: "/static/images/common/path7.png",
+						activeImage: "/static/images/210/path-HL.png",
+						title: "开机画面",
+						subTitle: "上传"
+					},
+					{
+						image: "/static/images/210/time.png",
+						activeImage: "/static/images/210/time-HL.png",
+						title: "报警时长",
+						subTitle: "30秒"
+					}
+				],
+				currentPopup: {
+					show: false,
+					config: {},
+					callback: null
+				},
+				pageLoading: true,
+				mainMode: 'string',
+				secondaryMode: 'string',
+				navBarHeight: 70 + uni.getSystemInfoSync().statusBarHeight,
+				navTitle: "",
+				lightModeA: false,
+				lightModeB: false,
+				isFormExpanded: true, // 默认展开
+				deviceID: '',
+				itemInfo: {},
+				alarmTimeDisplay: '',
+				currentAlarmTime: {
+					minutes: '0',
+					seconds: '30'
+				},
+				mqttClient: null,
+				messageToSend: '',
+				personnelInfo: {
+					unitName: '',
+					name: '',
+					position: '',
+					code: '',
+				},
+				deviceInfo: {},
+				activePermissions: [], // 存储当前设备的权限数组
+				isSharedDevice: false, // 标记是否来自分享
+				isRightIconVisible: false,
+				showPopupFlag: false, //是否显示弹框
+				popupMessage: '！',
+				popupConfirmText: '确认',
+				showUploadPopup: false,
+				selectedImage: null, // 添加这个变量来存储选择的图片
+				file: '',
+				selectedItemIndex: 0,
+				radioList: ['M', 'S'],
+				radioSelected: 0, // -1表示未选中任何项
+				deviceType: '',
+				popupType: '', //弹框类型
+				lightModeC: false,
+				// 新增：报警声音文件相关
+				soundFileList: [], 
+				deleteSoundMode: false, 
+				selectedSoundFiles: [] 
+			}
+		},
+		methods: {
+			// 点击弹框外的区域关闭
+			closePopup() {
+				this.lightModeA = false;
+				this.lightModeB = false;
+				this.lightModeC = false;
+			},
+			// 关闭删除报警声音弹窗
+			closeDeleteSoundPopup() {
+				this.deleteSoundMode = false;
+				this.selectedSoundFiles = []; // 清空选中状态
+				this.lightModeC = true; // 回到报警声音上传弹窗
+			},
+	
+			handleSoundFileSelect() {
+				console.log("选中的报警声音文件：", this.selectedSoundFiles);
+			},
+			// 确认删除选中的报警声音文件
+			confirmDeleteSound() {
+				this.soundFileList = this.soundFileList.filter(file => !this.selectedSoundFiles.includes(file));
+				this.showPopup('soundDelete');
+				this.selectedSoundFiles = [];
+				this.closeDeleteSoundPopup();
+			},
+			// 上传报警声音文件
+			uploadFile() {
+				uni.chooseFile({
+					count: 1,
+					success: (res) => {
+						const file = res.tempFiles[0];
+						const fileSize = file.size || 0;
+						// 限制文件大小（示例：5MB）
+						if (fileSize > 5 * 1024 * 1024) {
+							uni.showToast({
+								title: '文件大小不能超过5MB',
+								icon: 'none',
+								duration: 3000
+							});
+							return;
+						}
+						// 显示上传中加载提示
+						uni.showLoading({
+							title: '上传中...',
+							mask: true
+						});
+						// 调用上传接口
+						uni.uploadFile({
+							url: baseURL + '/app/device/uploadSound', // 替换为真实的报警声音上传接口
+							filePath: file.path,
+							name: 'file',
+							formData: {
+								deviceId: this.deviceID,
+							},
+							header: {
+								'Authorization': 'Bearer ' + getToken(),
+								'clientid': clientid(),
+							},
+							complete: (res) => {
+								uni.hideLoading();
+								try {
+									const responseData = JSON.parse(res.data);
+									if (responseData.code === 200) {
+										// 上传成功，添加到文件列表
+										this.soundFileList.push({
+											name: file.name,
+											url: responseData.data.url // 接口返回的文件地址
+										});
+										this.showPopup('soundUpload');
+									} else {
+										uni.showToast({
+											title: responseData.msg,
+											icon: 'none'
+										});
+									}
+								} catch (e) {
+									uni.showToast({
+										title: '上传失败',
+										icon: 'none'
+									});
+								}
+							}
+						});
+					},
+					fail: (err) => {
+						console.error('选择文件失败:', err);
+						uni.showToast({
+							title: '选择文件失败',
+							icon: 'none'
+						});
+					}
+				});
+			},
+			deleteQ() {
+				if (this.soundFileList.length === 0) {
+					uni.showToast({
+						title: "暂无可删除的报警声音文件",
+						icon: "none"
+					});
+					return;
+				}
+				this.lightModeC = false;
+				this.deleteSoundMode = true;
+			},
+			// 报警声音上传弹窗确定按钮
+			handleSoundUpload() {
+				uni.showToast({
+					title: "报警声音配置确认成功",
+					icon: "success"
+				});
+				this.closePopup();
+			},
+			// 打开弹框
+			showPopup(type) {
+				this.currentPopup = {
+					show: true,
+					config: POPUP_CONFIGS[type].config,
+					callback: POPUP_CONFIGS[type].onConfirm
+				}
+			},
+			handleConfirm() {
+				this.currentPopup.show = false;
+				console.log('这是点击了确认');
+			},
+			// 统一处理取消
+			handleCancel() {
+				this.currentPopup.show = false;
+			},
+			handleModeClick(index) {
+				this.selectedIndex = index;
+				switch (index) {
+					case 0:
+						this.selectMode();
+						break;
+					case 1:
+						this.soundAlarm();
+						break;
+					case 2:
+						this.manualAlarm();
+						break;
+					case 3:
+						this.automaticAlarm();
+						break;
+					case 4:
+						this.uploadStartup();
+						break;
+					case 5:
+						this.alarmTime();
+						break;
+				}
+			},
+			// 手动报警
+			manualAlarm() {
+				this.showPopup('del');
+			},
+			handleRadioSelect(index) {
+				this.radioSelected = index;
+				console.log('选中了单选选项：', this.radioList[index]);
+			},
+			// 自动报警
+			automaticAlarm() {
+				this.showPopup('autoAlarm');
+			},
+			// *******定位******
+			gpsPosition() {
+				uni.navigateTo({
+					url: '/pages/common/map/index'
+				})
+			},
+			// 报警声音
+			soundAlarm() {
+				this.lightModeC = true
+			},
+			// 联机设备
+			selectMode() {
+				uni.navigateTo({
+					url: '/pages/210/onlineDevice/index',
+					events: {
+						ack: function(data) {}
+					},
+					success: (res) => {
+						// 页面跳转成功后的回调函数
+						res.eventChannel.emit('onlineDevice', {
+							data: this.deviceType
+						});
+					}
+				})
+			},
+			// 人员信息登录
+			toggleForm() {
+				this.isFormExpanded = !this.isFormExpanded;
+			},
+			// 上传开机画面
+			uploadStartup() {
+				this.lightModeB = true
+			},
+			// 上传开机画面-选择图片
+			checkImgUpload() {
+				uni.chooseImage({
+					count: 1,
+					sizeType: ['original', 'compressed'],
+					sourceType: ['album', 'camera'],
+					success: (res) => {
+						// 将选择的图片赋值给selectedImage
+						const file = res.tempFiles[0];
+						const fileSize = file.size || 0;
+						if (fileSize > 2 * 1024 * 1024) {
+							console.log(`文件过大: ${fileSize} 字节`); // 调试日志
+							uni.showToast({
+								title: '图片大小不能超过2MB',
+								icon: 'none',
+								duration: 3000
+							});
+							return;
+						}
+						this.selectedImage = res.tempFilePaths[0];
+						console.log('选择的图片:', res);
+						//this.file = res.tempFiles[0].file
+					},
+					fail: (err) => {
+						console.error('选择图片失败:', err);
+						uni.showToast({
+							title: '选择图片失败',
+							icon: 'none'
+						});
+					}
+				});
+			},
+			// 上传开机画面确认按键
+			handleupload() {
+				if (!this.selectedImage) {
+					uni.showToast({
+						title: '请上传一张图片',
+						icon: 'none'
+					});
+					return;
+				}
+				// 显示上传中加载提示
+				uni.showLoading({
+					title: '上传中...',
+					mask: true
+				});
+
+				uni.uploadFile({
+					url: baseURL + '/app/device/uploadLogo',
+					filePath: this.selectedImage,
+					name: 'file',
+					formData: {
+						deviceId: this.deviceID,
+					},
+					header: {
+						'Authorization': 'Bearer ' + getToken(),
+						'clientid': clientid(),
+					},
+					complete: (res) => {
+						console.log(res, 'resss');
+						try {
+							const responseData = JSON.parse(res.data);
+							if (responseData.code === 200) {
+								this.showPopup('logo');
+								this.selectedImage = '';
+								this.file = null;
+								this.lightModeB = false
+							} else {
+								uni.showToast({
+									title: responseData.msg,
+									icon: 'none'
+								});
+							}
+						} catch (e) {
+							uni.showToast({
+								title: '上传失败',
+								icon: 'none'
+							});
+						} finally {
+							uni.hideLoading();
+						}
+					}
+				})
+			},
+			// 报警时长
+			alarmTime() {
+				this.lightModeA = true
+			},
+			handleTimeChange(time) {
+				this.currentAlarmTime = time;
+			},
+			// 保存时间
+			saveAlarmTime() {
+				const time = this.$refs.timePicker.getCurrentTime();
+				this.alarmTimeDisplay = `${time.minutes}分${time.seconds}秒`;
+				this.modeItems[5].subTitle = this.alarmTimeDisplay; // 手动更新 modeItems
+				this.lightModeA = false;
+				// 	console.log("保存的时间：", time);
+			},
+			handleIconClick(s,e) {
+				if (s === 0) {
+					console.log("消息");
+					uni.navigateTo({
+						url: '/pages/670/History',
+						success: (res) => {
+							res.eventChannel.emit('detailData', {
+								data: these.device,
+							});
+						}
+					})
+					return;
+				} else if (s === 1) {
+					console.log("分享");
+					uni.navigateTo({
+						url: '/pages/common/share/index',
+						events: {
+							ack: function(data) {}
+						},
+						success: (res) => {
+							let json = {
+								persissonType: '210'
+							};
+							Object.assign(json, this.device);
+							res.eventChannel.emit('share', {
+								data: json
+							});
+						}
+					})
+				}
+			},
+
+
+			// 发送人员信息
+			sendPersonnelInfo() {
+				if (!this.personnelInfo.unitName) {
+					uni.showToast({
+						title: '单位名称不能为空',
+						icon: 'none'
+					});
+					return;
+				}
+				if (!this.personnelInfo.name) {
+					uni.showToast({
+						title: '姓名不能为空',
+						icon: 'none'
+					});
+					return;
+				}
+				if (!this.personnelInfo.position) {
+					uni.showToast({
+						title: '职位不能为空',
+						icon: 'none'
+					});
+					return;
+				}
+				if (!this.personnelInfo.code) {
+					uni.showToast({
+						title: 'ID不能为空',
+						icon: 'none'
+					});
+					return;
+				}
+				uni.showLoading({
+					title: '发送中...',
+					mask: true
+				})
+				let data = {
+					code: this.personnelInfo.code,
+					name: this.personnelInfo.name,
+					position: this.personnelInfo.position,
+					unitName: this.personnelInfo.unitName,
+					deviceId: this.deviceID
+				}
+				registerPersonInfo(data).then((res) => {
+					if (res.code == 200) {
+						uni.hideLoading()
+						this.showPopup('person');
+					} else {
+						uni.showToast({
+							title: res.msg,
+							icon: 'none'
+						});
+					}
+				})
+			},
+			// 发送文本消息
+			sendTextMessage() {
+				if (!this.messageToSend) {
+					uni.showToast({
+						title: '请输入要发送的文字',
+						icon: 'none'
+					});
+					return;
+				}
+				uni.showLoading({
+					title: '发送中...',
+					mask: true
+				})
+				let data = {
+					sendMsg: this.messageToSend,
+					deviceIds: [this.deviceID]
+				}
+				deviceSendMessage(data).then((res) => {
+					if (res.code == 200) {
+						uni.hideLoading()
+						this.showPopup('person');
+					} else {
+						uni.showToast({
+							title: res.msg,
+							icon: 'none'
+						});
+					}
+				})
+			},
+			// 统一处理返回方法
+			handleDeviceData(res, isFromShared = false) {
+				if (res.code == 200) {
+					// 最后关闭加载状态
+					this.pageLoading = false
+					this.deviceInfo = res.data
+					this.personnelInfo = {
+						unitName: res.data.personnelInfo?.unitName || '',
+						name: res.data.personnelInfo?.name || '',
+						code: res.data.personnelInfo?.code || '',
+						position: res.data.personnelInfo?.position || '',
+					}
+					this.messageToSend = res.data.sendMsg || ''
+					// 关闭加载中
+					uni.hideLoading()
+				}
+			},
+			// 获取设备详情（普通详情）
+			async fetchDeviceDetail(id) {
+				try {
+					const res = await deviceDetail(id)
+					this.handleDeviceData(res, false)
+				} catch (error) {
+					uni.showToast({
+						title: '获取详情失败',
+						icon: 'none'
+					})
+				}
+			},
+		},
+		onLoad(options) {
+			const eventChannel = this.getOpenerEventChannel();
+			// 监听 'detailData' 事件，获取传过来的数据
+			uni.showLoading({
+				title: '加载中...'
+			})
+			eventChannel.on('detailData', (data) => {
+				this.itemInfo = data.data;
+				this.deviceID = data.data.id;
+				this.navTitle = data.data.deviceName;
+				this.apiType = data.apiType
+				this.deviceType = data.deviceType
+
+				// 根据 apiType 设置右图标的显示状态
+				this.isRightIconVisible = this.apiType === 'listA';
+				// 初始化并连接MQTT
+				this.mqttClient = new MqttClient();
+				this.mqttClient.connect(() => {  
+					console.log('MQTT 连接成功，开始订阅主题');
+					// 订阅来自设备的状态更新
+					const statusTopic = `A/${this.itemInfo.deviceImei}`;
+					this.mqttClient.subscribe(statusTopic, (payload) => {
+						console.log(`收到来自 ${statusTopic} 的消息:`, payload);
+						// uni.showModal({
+						// 	title: '收到设备消息',
+						// 	content: payload,
+						// 	showCancel: false
+						// });
+						// ✅ 发送全局事件通知主页面更新
+						uni.$emit('deviceStatusUpdate', {
+							message: JSON.stringify(payload), // 消息内容
+							timestamp: new Date().getTime() // 时间戳
+						});
+					});
+				});
+				this.fetchDeviceDetail(data.data.id)
+
+			});
+			// 如果需要向调用页面返回数据，可以触发 'ack' 事件
+			eventChannel.emit('ack', {
+
+			})
+
+		},
+		onUnload() {
+			// 页面卸载时断开MQTT连接
+			if (this.mqttClient) {
+				this.mqttClient.disconnect();
+			}
+		},
+
+	}
+</script>
+
+<style scoped>
+	.page-loading-mask {
+		position: fixed;
+		top: 0;
+		left: 0;
+		right: 0;
+		bottom: 0;
+		background-color: #121212;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		z-index: 9999;
+	}
+
+	/* 优化权限控制区域的显示 */
+	.mode-section,
+	.form-section {
+		transition: opacity 0.3s ease;
+	}
+
+	.device-detail-container {
+		padding: 30rpx;
+		background: #121212;
+		min-height: 100vh;
+	}
+
+	.status-bar {
+		display: flex;
+		justify-content: space-between;
+		margin-bottom: 40rpx;
+	}
+
+	.time {
+		font-size: 36rpx;
+		font-weight: bold;
+	}
+
+	.battery {
+		font-size: 36rpx;
+	}
+
+	.battery-section {
+		background-color: rgb(26, 26, 26);
+		border-radius: 16rpx;
+		padding: 30rpx;
+		display: flex;
+		justify-content: space-between;
+		margin-bottom: 20rpx;
+		align-items: center;
+	}
+
+	.mode-v1.active-mode {
+		border: 2rpx solid #BBE600 !important;
+		border-radius: 12rpx;
+	}
+
+	.mode-v1.active-mode .battery-v2 {
+		color: #BBE600 !important;
+	}
+
+	.mode-v1.active-mode .mode-v3 {
+		color: #BBE600 !important;
+	}
+
+	.battery-info,
+	.duration {
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+	}
+
+	.bipImg {
+		width: 204rpx;
+		height: 144rpx;
+		margin-top: 30rpx;
+	}
+
+	.dlIMG {
+		width: 52rpx;
+		height: 52rpx;
+	}
+
+	.cpIMG {
+		width: 66rpx;
+		height: 66rpx;
+	}
+
+	.battery-sectionLeft {
+		width: 308rpx;
+		height: 220rpx;
+		background: rgba(42, 42, 42, 0.5);
+		border-radius: 16rpx;
+		text-align: center;
+		align-items: center;
+		line-height: 220rpx;
+	}
+
+	.percentage {
+		font-size: 48rpx;
+		font-weight: bold;
+		color: #007AFF;
+	}
+
+	.label {
+		font-size: 28rpx;
+		color: #666;
+		margin-top: 10rpx;
+	}
+
+	.battery-v1 {
+		display: flex;
+		align-items: center;
+		margin-bottom: 10rpx;
+	}
+
+
+	.battery-v2 {
+		color: rgba(255, 255, 255, 0.87);
+		margin-left: 18rpx;
+		font-size: 32rpx;
+	}
+
+	.battery-v3 {
+		color: rgba(255, 255, 255, 0.6);
+		margin-left: 25rpx;
+		font-size: 26rpx;
+	}
+
+	.mode-v3 {
+		color: rgba(255, 255, 255, 0.6);
+		font-size: 26rpx;
+		padding-top: 10rpx;
+	}
+
+	.radio-group {
+		display: flex;
+		gap: 12px;
+		align-items: center;
+		margin-bottom: 20rpx;
+		font-size: 200rpx;
+	}
+
+	.group-item {
+		background: rgba(26, 26, 26, 1);
+		width: 100%;
+		height: 136rpx;
+		border-radius: 72rpx;
+		text-align: center;
+		line-height: 136rpx;
+		position: relative;
+	}
+
+	.radio-icon.selected {
+		background-color: rgba(174, 214, 0, 1);
+		transition: background-color 0.3s;
+		border-radius: 72rpx;
+	}
+
+	.radio-icon {
+		font-size: 50rpx;
+	}
+
+	.uni-border {
+		border: 4rpx solid rgba(26, 26, 26, 1);
+		width: 96%;
+		height: 123rpx;
+		position: absolute;
+		top: 7rpx;
+		left: 6rpx;
+		border-radius: 72rpx;
+	}
+
+	.info-card {
+		background-color: rgb(26, 26, 26);
+		border-radius: 16rpx;
+		padding: 10rpx 30rpx 5rpx 30rpx;
+		margin-bottom: 20rpx;
+
+	}
+
+	.info-row {
+		display: flex;
+		justify-content: space-between;
+		margin-bottom: 20rpx;
+	}
+
+	.info-label {
+		font-size: 28rpx;
+		color: rgba(255, 255, 255, 0.87);
+	}
+
+	.info-value {
+		font-size: 28rpx;
+		color: rgba(255, 255, 255, 0.87);
+	}
+
+	.status-running {
+		color: rgba(255, 255, 255, 0.6);
+		text-align: end;
+	}
+
+	.status-greend {
+		color: rgba(174, 214, 0, 1);
+		text-align: end;
+	}
+
+	.light {
+		position: absolute;
+		/* top:10rpx; */
+		color: rgba(74, 74, 74, 0.87);
+		top: 58rpx;
+		left: 108rpx
+	}
+
+	.section-title {
+		font-size: 32rpx;
+		margin-bottom: 20rpx;
+		display: block;
+		color: rgba(255, 255, 255, 0.87);
+	}
+
+	.slider-container {
+		display: flex;
+		align-items: center;
+	}
+
+	.slider {
+		flex: 1;
+		margin: 0 20rpx;
+	}
+
+	.mode-buttons {
+		display: flex;
+		justify-content: space-between;
+		flex-wrap: wrap;
+	}
+
+	.mode_1 {
+		width: 180rpx;
+		height: 180rpx;
+		border-radius: 16rpx;
+		background: rgb(26, 26, 26);
+		align-items: center;
+		text-align: center;
+		color: rgba(255, 255, 255, 0.6);
+		padding-top: 37rpx;
+	}
+
+	.mode-v1 {
+		background: #1A1A1A;
+		border-radius: 18rpx;
+		height: 150rpx;
+		margin-bottom: 20rpx;
+		width: 47%;
+		display: flex;
+		text-align: center;
+	}
+
+	.mode-v2 {
+		display: flex;
+		align-items: center;
+		text-align: center;
+		margin-left: 40rpx;
+
+	}
+
+	.example-body {
+		position: absolute;
+		left: 50%;
+		top: 65%;
+		width: 100%;
+		transform: translate(-20%, -100%);
+	}
+
+	.icoContent {
+		width: 320rpx;
+		height: 160rpx;
+		border-radius: 8rpx;
+		background: rgba(58, 58, 58, 1);
+		text-align: center;
+		line-height: 200rpx;
+	}
+
+	.img {
+		width: 62rpx;
+		height: 62rpx;
+	}
+
+	.example_title {
+		color: rgba(255, 255, 255, 0.87);
+	}
+
+	.mode-btn {
+		width: 48%;
+		height: 80rpx;
+		line-height: 80rpx;
+		background-color: #f5f5f5;
+		color: #333;
+		border-radius: 8rpx;
+		font-size: 28rpx;
+		border: none;
+	}
+
+	.mode-btn.active {
+		background-color: #007AFF;
+		color: #fff;
+	}
+
+	.form-section {
+		background-color: rgb(26, 26, 26);
+		border-radius: 16rpx;
+		padding: 30rpx;
+		margin-bottom: 30rpx;
+
+	}
+
+	.form-row {
+		display: flex;
+		align-items: center;
+		margin-bottom: 20rpx;
+		background: rgba(42, 42, 42, 1);
+		border-radius: 16rpx;
+		padding-left: 20rpx;
+	}
+
+	.form-label {
+		font-size: 32rpx;
+		color: rgba(255, 255, 255, 0.87);
+	}
+
+	.form-input {
+		height: 80rpx;
+		border: 1rpx solid transparent;
+		font-size: 32rpx;
+		color: rgba(255, 255, 255, 0.87);
+	}
+
+	.product-section {
+		background-color: #fff;
+		border-radius: 16rpx;
+		padding: 30rpx;
+		margin-bottom: 30rpx;
+		box-shadow: 0 4rpx 12rpx rgba(0, 0, 0, 0.05);
+	}
+
+	.product-tabs {
+		display: flex;
+		margin-top: 20rpx;
+	}
+
+	.tab {
+		padding: 15rpx 30rpx;
+		font-size: 28rpx;
+		color: #666;
+		border-bottom: 4rpx solid transparent;
+	}
+
+	.tab.active {
+		color: #007AFF;
+		border-bottom-color: #007AFF;
+	}
+
+	.action-buttons {
+		padding: 30rpx 0;
+	}
+
+	.send-btn {
+		background-color: rgb(187, 230, 0);
+		color: rgba(35, 35, 35, 0.87);
+		height: 50rpx;
+		line-height: 50rpx;
+		border-radius: 16rpx;
+		font-size: 26rpx;
+		width: 112rpx;
+		white-space: nowrap;
+		text-align: center;
+		position: absolute;
+		right: 70rpx;
+
+	}
+
+	.send-btn1 {
+		background-color: rgb(187, 230, 0);
+		color: rgba(35, 35, 35, 0.87);
+		height: 50rpx;
+		line-height: 50rpx;
+		border-radius: 16rpx;
+		font-size: 26rpx;
+		width: 112rpx;
+		white-space: nowrap;
+		text-align: center;
+		position: absolute;
+		right: 0rpx;
+		top: -70rpx
+	}
+
+
+	/* 遮罩层 */
+	.agreement-mask {
+		position: fixed;
+		top: 0;
+		left: 0;
+		right: 0;
+		bottom: 0;
+		background-color: rgba(0, 0, 0, 0.5);
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		z-index: 9999;
+	}
+
+	/* 弹窗主体 */
+	.agreement-popup {
+		width: 100%;
+		height: 40%;
+		background-color: rgb(42, 42, 42);
+		border-radius: 60rpx 60rpx 0rpx 0rpx;
+		padding: 40rpx;
+		box-sizing: border-box;
+		position: absolute;
+		bottom: 0rpx;
+	}
+
+	.agreement-popupB {
+		width: 100%;
+		height: 32%;
+		background-color: rgb(42, 42, 42);
+		border-radius: 60rpx 60rpx 0rpx 0rpx;
+		padding: 40rpx;
+		box-sizing: border-box;
+		position: absolute;
+		bottom: 0rpx;
+	}
+
+	.agreement-popupC {
+		width: 80%;
+		background-color: rgb(42, 42, 42);
+		border-radius: 40rpx;
+		padding: 40rpx;
+		box-sizing: border-box;
+		border: 1px solid rgba(255, 200, 78, 1);
+	}
+
+	.popup-Title {
+		color: rgba(255, 200, 78, 1);
+	}
+
+	/* 标题 */
+	.popup-title {
+		font-size: 36rpx;
+		text-align: center;
+		margin-bottom: 30rpx;
+		color: rgba(255, 255, 255, 0.87);
+	}
+
+	/* 内容文本 */
+	.popup-content {
+		font-size: 30rpx;
+		line-height: 1.6;
+		color: rgba(255, 255, 255, 0.87);
+		margin-bottom: 50rpx;
+	}
+
+	.upload_flex {
+		display: flex;
+		cursor: pointer;
+		align-items: center;
+		margin-bottom: 20rpx;
+	}
+
+	.uploadIMG {
+		width: 68rpx;
+		height: 68rpx;
+		margin-right: 20rpx;
+	}
+
+	.item {
+		padding: 10px;
+		margin: 5px 0;
+		display: flex;
+		align-items: center;
+		cursor: pointer;
+		transition: background-color 0.3s;
+	}
+
+	.setIMG {
+		width: 24px;
+		height: 24px;
+		margin-right: 10px;
+	}
+
+	.item.selected {
+		background-color: rgb(58, 58, 58);
+		color: rgba(255, 255, 255, 0.87);
+		border-radius: 8rpx;
+	}
+
+	/* 按钮容器 */
+	.popup-buttons {
+		display: flex;
+		justify-content: space-between;
+	}
+
+	/*确定按钮 */
+	.agree {
+		background-color: rgb(187, 230, 0);
+		color: #232323;
+		border: none;
+		font-size: 24rpx;
+		height: 88rpx;
+		line-height: 88rpx;
+		font-size: 32rpx;
+		width: 100%;
+		position: absolute;
+		bottom: 0rpx;
+		left: 0rpx
+	}
+
+	/* 通用按钮样式 */
+	.btn {
+		flex: 1;
+		height: 80rpx;
+		line-height: 80rpx;
+		border-radius: 40rpx;
+		font-size: 32rpx;
+		margin: 0 20rpx;
+	}
+
+	/* 不同意按钮 */
+	.disagree {
+		background-color: transparent;
+		color: rgba(255, 255, 255, 0.87);
+		border: 1px solid rgba(255, 200, 78, 0.7);
+		font-size: 24rpx;
+		color: rgba(255, 200, 78, 1);
+	}
+
+	/* 同意按钮 */
+	.agreeBtn {
+		background-color: rgba(255, 200, 78, 1);
+		color: #232323;
+		border: none;
+		font-size: 24rpx;
+	}
+
+	.right-icons {
+		/* display: flex; */
+		align-items: center;
+	}
+
+	.toggle-icon {
+		cursor: pointer;
+		font-size: 16px;
+		margin-top: -40rpx;
+	}
+
+	.icon {
+		font-size: 14px;
+		color: #fff;
+	}
+
+	.form-content {
+		transition: all 0.3s ease;
+		margin-top: 60rpx;
+		position: relative;
+	}
+
+	/* 新增：删除文件列表样式 */
+	.file-list-tip {
+		margin-top: 20rpx;
+		font-size: 26rpx;
+		color: #666;
+	}
+	.empty-tip {
+		text-align: center;
+		color: #999;
+		padding: 20rpx 0;
+	}
+	.file-list {
+		padding: 10rpx 0;
+	}
+	.file-item {
+		display: flex;
+		align-items: center;
+		padding: 10rpx 0;
+		border-bottom: 1px solid #eee;
+	}
+	.file-name {
+		margin-left: 10rpx;
+		font-size: 28rpx;
+		color: rgba(255, 255, 255, 0.87);
+	}
+</style>
\ No newline at end of file
diff --git a/pages/4877/BJQ4877.vue b/pages/4877/BJQ4877.vue
index 71d7976..11ca4e5 100644
--- a/pages/4877/BJQ4877.vue
+++ b/pages/4877/BJQ4877.vue
@@ -1252,7 +1252,7 @@
 					borderColor: "#e034344d",
 					buttonBgColor: "#E03434",
 					buttonText: '去连接',
-					buttonTextColor: '#232323de',
+                    buttonTextColor: '#FFFFFFde',
 					okCallback: function() {
 
 						uni.navigateTo({
diff --git a/pages/4877/BJQ4877V1.vue b/pages/4877/BJQ4877V1.vue
index 894db34..cb07bc4 100644
--- a/pages/4877/BJQ4877V1.vue
+++ b/pages/4877/BJQ4877V1.vue
@@ -748,7 +748,7 @@ import request, { baseURL } from '@/utils/request.js';
 					borderColor: "#e034344d",
 					buttonBgColor: "#E03434",
 					buttonText: '去连接',
-					buttonTextColor: '#232323de',
+                    buttonTextColor: '#FFFFFFde',
 					okCallback: function() {
 
 						uni.navigateTo({
diff --git a/pages/6075J/BJQ6075J.vue b/pages/6075J/BJQ6075J.vue
index 23e169c..86221db 100644
--- a/pages/6075J/BJQ6075J.vue
+++ b/pages/6075J/BJQ6075J.vue
@@ -39,7 +39,7 @@
 			</view>
 		</view>
 
-		<view class="warnnig" :class="formData.sta_ShakeBit!==0  ?'':'displayNone'">
+		<view class="warnnig" :class="formData.sta_ShakeBit!=0  ?'':'displayNone'">
 			<view>{{formData.sta_ShakeBit==3?'设备疑似受到外力碰撞':'设备声光报警中'}}！</view>
 			<view @click.stop="SOSToggle()">
 				<uni-icons type="closeempty" color="#FFFFFFde" size="16"></uni-icons>
@@ -1418,7 +1418,7 @@
 						console.error("出现错误", ex)
 					});
 				}
-				let msg = val == 1 ? '确定开启声光报警' : '确定关闭声光报警';
+				let msg = val == 1 ? '确定开启声光报警' : '确定解除声光报警';
 
 				showPop({
 					message: msg,
@@ -1912,7 +1912,7 @@
 					borderColor: "#e034344d",
 					buttonBgColor: "#E03434",
 					buttonText: '去连接',
-					buttonTextColor: '#232323de',
+                    buttonTextColor: '#FFFFFFde',
 					showCancel: true,
 					okCallback: function() {
 						console.log("1111");
@@ -2858,7 +2858,7 @@
 	.navbarRight .img {
 		width: 35rpx;
 		height: 35rpx;
-		margin-right: 20rpx;
+		margin-right: 30rpx;
 	}
 
 	.uni-navbar--fixed {
diff --git a/pages/6107/BJQ6107.vue b/pages/6107/BJQ6107.vue
index 840d484..d56e3fa 100644
--- a/pages/6107/BJQ6107.vue
+++ b/pages/6107/BJQ6107.vue
@@ -840,7 +840,7 @@
 					borderColor: "#e034344d",
 					buttonBgColor: "#E03434",
 					buttonText: '去连接',
-					buttonTextColor: '#232323de',
+                    buttonTextColor: '#FFFFFFde',
 					okCallback: function() {
 
 						uni.navigateTo({
diff --git a/pages/6155/BJQ6155.vue b/pages/6155/BJQ6155.vue
index d0a89a1..b83802b 100644
--- a/pages/6155/BJQ6155.vue
+++ b/pages/6155/BJQ6155.vue
@@ -708,7 +708,7 @@
 					borderColor: "#e034344d",
 					buttonBgColor: "#E03434",
 					buttonText: '去连接',
-					buttonTextColor: '#232323de',
+                    buttonTextColor: '#FFFFFFde',
 					okCallback: function() {
 						// console.log("1111");
 						uni.navigateTo({
diff --git a/pages/6155/deviceDetail.vue b/pages/6155/deviceDetail.vue
index 5071785..56d92a9 100644
--- a/pages/6155/deviceDetail.vue
+++ b/pages/6155/deviceDetail.vue
@@ -688,7 +688,7 @@
 					borderColor: "#e034344d",
 					buttonBgColor: "#E03434",
 					buttonText: '去连接',
-					buttonTextColor: '#232323de',
+                    buttonTextColor: '#FFFFFFde',
 					okCallback: function() {
 						// console.log("1111");
 						uni.navigateTo({
diff --git a/pages/6170/deviceControl/index.vue b/pages/6170/deviceControl/index.vue
index 04b3c39..5db95c3 100644
--- a/pages/6170/deviceControl/index.vue
+++ b/pages/6170/deviceControl/index.vue
@@ -58,6 +58,12 @@
 							{{getbleStatu}}
 						</text>
 					</view>
+					<view class="info-row" v-if="itemInfo.deviceMac" @click="bleStatuToggle">
+						<text class="info-label">充电状态</text>
+						<text class="info-value status-running"  >
+							{{deviceInfo.chargeState != 0?'充电中':'未充电'}}
+						</text>
+					</view>
 					<view class="info-row">
 						<text class="info-label" style="display: flex; align-items: center;">定位信息</text>
 						<view class="info-value status-running" @click="gpsPosition(deviceInfo)">
@@ -73,7 +79,7 @@
 						</view>
 					</view>
 				</view>
-				<view class="callpolice" v-if="deviceInfo.onlineStatus == 1 && deviceInfo.alarmStatus == 1">
+				<view class="callpolice" v-if="deviceInfo.alarmStatus == 1">
 					<view class="">设备强制报警中</view>
 					<view>
 						<uni-icons type="closeempty" size="15" color="rgba(255, 255, 255, 0.9)"
@@ -436,6 +442,52 @@
 			}
 		},
 		methods: {
+			onReceive(deviceState){//蓝牙/Mq通用消息处理
+				switch (deviceState[0]) {
+					// 1设备切换灯光实时返回
+					case 1:
+						this.currentMainMode = this.getMainLightModeLabel(
+							deviceState[
+								1]);
+						this.sliderValue = deviceState[2];
+						this.deviceInfo.batteryRemainingTime = deviceState[3];
+						break;
+						// 12为设备实时上报
+					case 12:
+						this.currentMainMode = this.getMainLightModeLabel(
+							deviceState[
+								1]);
+						this.isLaserOn = deviceState[2] === 1; //第3位表示当时激光灯档位
+						this.currentlaserMode = this.isLaserOn ? "开启" : "关闭";
+						if (this.deviceInfo) {
+							this.deviceInfo.batteryPercentage = deviceState[3]; //第4位电量百分比
+							this.deviceInfo.chargeState = deviceState[4]; //第5位为充电状态（0没有充电，1正在充电，2为已充满）
+							this.deviceInfo.batteryRemainingTime = deviceState[5]; //第6位200代表电池剩余续航时间200分钟
+						}
+						setTimeout(() => {
+							if (this.deviceInfo.batteryPercentage < 20 &&
+								this.deviceInfo.chargeState == 0) {
+								this.popupType = 'bettery';
+								this.popupMessage = '请及时充电';
+								this.showPopupFlag = true;
+							}
+							if (this.apiType === 'listA') {
+								this.fetchDeviceDetail(data.data.id)
+							} else {
+								// 分享权限详情
+								this.fetchSharedDeviceDetail(data.data.id)
+							}
+						}, 10000);
+						// 上报电量,在列表里面同步
+						uni.$emit('deviceStatusUpdate', {
+							message: parsedMessage,
+							timestamp: new Date().getTime()
+						});
+						break;
+					default:
+						console.log('未知的 deviceState 类型:', deviceState[0]);
+				}
+			},
 			bleStatuToggle() {
 				let f = this.getDevice();
 				if (!f) {
@@ -504,7 +556,7 @@
 					borderColor: "#e034344d",
 					buttonBgColor: "#E03434",
 					buttonText: '去连接',
-					buttonTextColor: '#232323de',
+                    buttonTextColor: '#FFFFFFde',
 					showCancel: true,
 					okCallback: function() {
 						console.log("1111");
@@ -532,11 +584,9 @@
 				}
 				let data = rec.ReceiveData(receive, device, pagePath, recArr);
 				console.log("蓝牙收到消息", data)
-				this.receivData(data);
-			},
-			receivData(data) {
-
+				this.onReceive(data.state);
 			},
+		
 			bleStateBreak() {
 				if (this.Status.pageHide) {
 					return;
@@ -1566,6 +1616,7 @@
 				// this.popupConfirmText="";
 			},
 			OpenWarn(val){//开启/解除强制报警
+			debugger;
 				const topic = `B/${this.itemInfo.deviceImei}`;
 				let message={"instruct":[7,val,0,0,0,0]};
 				message=JSON.stringify(message);
@@ -1575,6 +1626,8 @@
 				});
 				if(flag){
 					this.itemInfo.alarmStatus=val;
+				}else{
+					MsgError("操作没有成功",'确定',this);
 				}
 				
 				this.showPopupFlag = false;
@@ -1644,11 +1697,11 @@
 					// 3.解除告警状态
 					const registerRes = await deviceSendAlarmMessage(data);
 					if (registerRes.code !== 200) {
-						uni.showToast({
-							title: registerRes.msg,
-							icon: 'none'
-						})
-						
+						// uni.showToast({
+						// 	title: registerRes.msg,
+						// 	icon: 'none'
+						// })
+						this.OpenWarn(0);
 						return
 					}
 					this.itemInfo.alarmStatus=0;
@@ -1908,53 +1961,8 @@
 							const deviceState = parsedMessage.state; // 直接取 state 数组
 							// 切换主灯光模式,亮度值设备同步
 							if (!deviceState) return;
-							// 1设备切换灯光实时返回
-							switch (deviceState[0]) {
-								case 1:
-									this.currentMainMode = this.getMainLightModeLabel(
-										deviceState[
-											1]);
-									this.sliderValue = deviceState[2];
-									this.deviceInfo.batteryRemainingTime = deviceState[3];
-									break;
-									// 12为设备实时上报
-								case 12:
-									this.currentMainMode = this.getMainLightModeLabel(
-										deviceState[
-											1]);
-									this.isLaserOn = deviceState[2] === 1; //第3位表示当时激光灯档位
-									this.currentlaserMode = this.isLaserOn ? "开启" : "关闭";
-									if (this.deviceInfo) {
-										this.deviceInfo.batteryPercentage = deviceState[
-											3]; //第4位电量百分比
-										this.deviceInfo.chargeState = deviceState[
-											4]; //第5位为充电状态（0没有充电，1正在充电，2为已充满）
-										this.deviceInfo.batteryRemainingTime = deviceState[
-											5]; //第6位200代表电池剩余续航时间200分钟
-									}
-									setTimeout(() => {
-										if (this.deviceInfo.batteryPercentage < 20 &&
-											this.deviceInfo.chargeState == 0) {
-											this.popupType = 'bettery';
-											this.popupMessage = '请及时充电';
-											this.showPopupFlag = true;
-										}
-										if (this.apiType === 'listA') {
-											this.fetchDeviceDetail(data.data.id)
-										} else {
-											// 分享权限详情
-											this.fetchSharedDeviceDetail(data.data.id)
-										}
-									}, 10000);
-									// 上报电量,在列表里面同步
-									uni.$emit('deviceStatusUpdate', {
-										message: parsedMessage,
-										timestamp: new Date().getTime()
-									});
-									break;
-								default:
-									console.log('未知的 deviceState 类型:', deviceState[0]);
-							}
+							
+							this.onReceive(deviceState);
 						} catch (error) {
 							console.log('解析MQTT消息失败:', error, '原始消息:', payload);
 						}
diff --git a/pages/6331/BJQ6331.vue b/pages/6331/BJQ6331.vue
index ed179ee..e69a769 100644
--- a/pages/6331/BJQ6331.vue
+++ b/pages/6331/BJQ6331.vue
@@ -739,7 +739,7 @@ import request, { baseURL } from '@/utils/request.js';
 					borderColor: "#e034344d",
 					buttonBgColor: "#E03434",
 					buttonText: '去连接',
-					buttonTextColor: '#232323de',
+                    buttonTextColor: '#FFFFFFde',
 					okCallback: function() {
 
 						uni.navigateTo({
diff --git a/pages/650/HBY650.vue b/pages/650/HBY650.vue
index b39916f..e71eadd 100644
--- a/pages/650/HBY650.vue
+++ b/pages/650/HBY650.vue
@@ -822,7 +822,7 @@ import request, { baseURL } from '@/utils/request.js';
 					borderColor: "#e034344d",
 					buttonBgColor: "#E03434",
 					buttonText: '去连接',
-					buttonTextColor: '#232323de',
+                    buttonTextColor: '#FFFFFFde',
 					okCallback: function() {
 
 						uni.navigateTo({
diff --git a/pages/670/HBY670.vue b/pages/670/HBY670.vue
index a76b342..f2fbd45 100644
--- a/pages/670/HBY670.vue
+++ b/pages/670/HBY670.vue
@@ -180,7 +180,7 @@
 			<view class="item" @click="lightSetting('close')" :class="formData.lightCurr=='close'?'active':''">
 				<view class="imgContent center">
 					<image class="img"
-						   :src="formData.lightCurr=='close'?'/static/images/lightImg/jieNActive.png':'/static/images/lightImg/jieN.png'"
+						   :src="formData.lightCurr=='close'?'/static/images/lightImg/closeLightActive.png':'/static/images/lightImg/closeLight.png'"
 						   mode="aspectFit"></image>
 				</view>
 				<view class="txt">关闭</view>
@@ -340,7 +340,7 @@
                         borderColor: '#BBE600',
                         textColor: '#ffffffde',
                         buttonBgColor: '#BBE600',
-                        buttonTextColor: '#232323DE',
+                        buttonTextColor: '#FFFFFFDE',
 
                         iconUrl: '',
                         message: '您确定要这样做吗？',
@@ -725,7 +725,7 @@
 					borderColor: "#e034344d",
 					buttonBgColor: "#E03434",
 					buttonText: '去连接',
-					buttonTextColor: '#232323de',
+                    buttonTextColor: '#FFFFFFde',
 					showCancel: true,
 					cancelCallback: () => {
 						// this.closePop();
@@ -1178,6 +1178,7 @@
 						iconUrl: "/static/images/common/uploadErr.png",
 						borderColor: "#e034344d",
 						buttonBgColor: "#E03434",
+                        buttonTextColor: "#FFFFFFde",
 						okCallback: null,
 						buttonText: "确定"
 					},these)
@@ -1221,6 +1222,7 @@
 								iconUrl: "/static/images/common/uploadErr.png",
 								borderColor: "#e034344d",
 								buttonBgColor: "#E03434",
+                                buttonTextColor: "#FFFFFFde"
 							},these);
 
 						}).finally(() => {
@@ -1285,7 +1287,8 @@
 								message: "通信异常,请检查手机或设备网络",
 								iconUrl: "/static/images/common/uploadErr.png",
 								borderColor: "#e034344d",
-								buttonBgColor: "#E03434",
+                                buttonBgColor: "#E03434",
+                                buttonTextColor: "#FFFFFFde"
 							},these);
 
 						}).finally(() => {
@@ -1367,7 +1370,8 @@
 						message: '无操作权限',
 						iconUrl: "/static/images/common/uploadErr.png",
 						borderColor: "#e034344d",
-						buttonBgColor: "#E03434",
+                        buttonBgColor: "#E03434",
+                        buttonTextColor: "#FFFFFFde",
 						okCallback: null,
 						buttonText: "确定"
 					},these)
@@ -1439,7 +1443,8 @@
 								message: "通信异常,请检查手机或设备网络",
 								iconUrl: "/static/images/common/uploadErr.png",
 								borderColor: "#e034344d",
-								buttonBgColor: "#E03434",
+                                buttonBgColor: "#E03434",
+                                buttonTextColor: "#FFFFFFde"
 							},these);
 
 						}).finally(() => {
@@ -1562,6 +1567,7 @@
 							iconUrl: "/static/images/common/uploadErr.png",
 							borderColor: "#e034344d",
 							buttonBgColor: "#E03434",
+                            buttonTextColor:"#FFFFFFde",
 							okCallback: OpenSOS,
 							buttonText: "开启"
 						},these);
@@ -1591,6 +1597,7 @@
 						iconUrl: "/static/images/common/uploadErr.png",
 						borderColor: "#e034344d",
 						buttonBgColor: "#E03434",
+                        buttonTextColor: "#FFFFFFde",
 						okCallback: null,
 						buttonText: "确定"
 					},these)
@@ -1632,7 +1639,8 @@
 								message: "通信异常,请检查手机或设备网络",
 								iconUrl: "/static/images/common/uploadErr.png",
 								borderColor: "#e034344d",
-								buttonBgColor: "#E03434",
+                                buttonBgColor: "#E03434",
+                                buttonTextColor: "#FFFFFFde"
 							},these);
 
 						}).finally(() => {
@@ -2192,7 +2200,8 @@
 						message: '无操作权限',
 						iconUrl: "/static/images/common/uploadErr.png",
 						borderColor: "#e034344d",
-						buttonBgColor: "#E03434",
+                        buttonBgColor: "#E03434",
+                        buttonTextColor: "#FFFFFFde",
 						okCallback: null,
 						buttonText: "确定"
 					},these)
@@ -2313,7 +2322,8 @@
 						message: '无操作权限',
 						iconUrl: "/static/images/common/uploadErr.png",
 						borderColor: "#e034344d",
-						buttonBgColor: "#E03434",
+                        buttonBgColor: "#E03434",
+                        buttonTextColor: "#FFFFFFde",
 						okCallback: null,
 						buttonText: "确定"
 					},these)
@@ -2531,7 +2541,8 @@
 						message: '无操作权限',
 						iconUrl: "/static/images/common/uploadErr.png",
 						borderColor: "#e034344d",
-						buttonBgColor: "#E03434",
+                        buttonBgColor: "#E03434",
+                        buttonTextColor: "#FFFFFFde",
 						okCallback: null,
 						buttonText: "确定"
 					},these)
@@ -2921,18 +2932,16 @@
 
 	}
 
-	.usrinfo .btnSend {
-		line-height: 65rpx;
-		border-radius: 8px;
-		width: 120rpx;
-		height: 65rpx;
-		color: rgba(35, 35, 35, 0.87);
-		font-family: PingFang SC;
-		font-size: 24rpx;
-		font-weight: 400;
-		letter-spacing: 0.15rpx;
-		text-align: center;
-		background-color: #BBE600;
+	.usrinfo .btnSend {	
+	background-color: rgb(187, 230, 0);
+	color: rgba(35, 35, 35, 0.87);
+	height: 50rpx;
+	line-height: 50rpx;
+	border-radius: 16rpx;
+	font-size: 26rpx;
+	width: 112rpx;
+	white-space: nowrap;
+	text-align: center;
 	}
 
 	.usrinfo .item {
@@ -3330,7 +3339,7 @@
 	.navbarRight .img{
 		width: 35rpx;
 		height: 35rpx;
-		margin-right: 20rpx;
+		margin-right: 30rpx;
 	}
 	.uni-navbar--fixed{
 		top:0rpx;
diff --git a/pages/7305/BJQ7305.vue b/pages/7305/BJQ7305.vue
index a5f89ab..f980767 100644
--- a/pages/7305/BJQ7305.vue
+++ b/pages/7305/BJQ7305.vue
@@ -628,7 +628,7 @@
 					borderColor: "#e034344d",
 					buttonBgColor: "#E03434",
 					buttonText: '去连接',
-					buttonTextColor: '#232323de',
+                    buttonTextColor: '#FFFFFFde',
 					okCallback: function() {
 						console.log("1111");
 						uni.navigateTo({
diff --git a/pages/common/addDevice/addBle.vue b/pages/common/addDevice/addBle.vue
index d963791..bddf46d 100644
--- a/pages/common/addDevice/addBle.vue
+++ b/pages/common/addDevice/addBle.vue
@@ -482,20 +482,20 @@
 
 
 			ble.addStateBreakCallback(() => {
-				uni.showModal({
-					title: '提示',
-					content: '蓝牙不可用'
-				});
+			
+				
+				MsgError('蓝牙不可用','',these);
 
 				these.EquipMents.filter((v, i) => {
 					these.$set(these.EquipMents[i], 'link', false);
 				});
 			}, pagePath);
 			ble.addStateRecoveryCallback(() => {
-					uni.showModal({
-						title: '提示',
-						content: '蓝牙恢复可用'
-					});
+				
+					
+					MsgSuccess('蓝牙恢复可用','',these,()=>{
+						MsgClear(these);
+					})
 				},
 				pagePath);
 
@@ -568,7 +568,7 @@
 							
 							
 							plus.runtime.openURL('weixin://', (err) => {
-							  MsgError("打开微信失败,请手动打开微信粘贴");
+							  MsgError("打开微信失败,请手动打开微信,发送至'文件传输助手'");
 							});
 						},
 						fail(ex){
@@ -805,10 +805,8 @@
 
 						let json = getUrlParams(res.result);
 						if (!json.key) {
-							uni.showModal({
-								title: '错误',
-								content: "无效的二维码"
-							})
+							
+							MsgError('无效的二维码','',these);
 							return;
 						}
 						this.scanKey = json.key;
@@ -1050,9 +1048,8 @@
 						these.sendEquipToMq();
 					}).catch(ex => {
 						console.log("ex=", ex)
-						uni.showModal({
-							content: "连接失败:" + ex.msg
-						});
+						
+						MsgError("连接失败:" + ex.msg,'',these);
 						hideLoading(these);
 					});
 				}
diff --git a/pages/common/index/index.vue b/pages/common/index/index.vue
index 1fbee95..0c95f43 100644
--- a/pages/common/index/index.vue
+++ b/pages/common/index/index.vue
@@ -27,7 +27,7 @@
 			<mescroll-uni class="device-list" @init="mescrollInit" @down="downCallback" @up="upCallback" :up="upOption"
 				:down="downOption" :fixed="false" :style="{ height: mescrollHeight + 'px' }">
 				<view v-if="deviceList.length>0">
-					<uni-swipe-action ref="swipeAction">
+					<uni-swipe-action ref="swipeAction" >
 						<block v-for="(item, index) in deviceList" :key="index" :ref="'swipeItem_' + index">
 							<uni-swipe-action-item :right-options="Options"
 								@click="handleSwipeClick($event, item, index)" class="device-card"
@@ -88,6 +88,7 @@
 				</view>
 				<!-- 按钮组 -->
 				<view class="popup-buttons">
+					<button class="btn cancelBtn" @click="closePopup('delete')">取消</button>
 					<button class="btn agreeBtn" @click="handleBtn">确定</button>
 				</view>
 			</view>
@@ -98,14 +99,15 @@
 				<view class="popup-content">
 					<view>
 						<view class="popup-flex">
-							<text>设备名称</text>
-							<input type="text" v-model="deviceName" placeholder="请输入设备名称" class="popup-input"
+							<text>名称</text>
+							<input type="text" v-model="deviceName" placeholder="请输入名称" class="popup-input"
 								@click.stop />
 						</view>
 					</view>
 				</view>
 				<!-- 按钮组 -->
 				<view class="popup-buttons" style="margin-top:50rpx;">
+					<button class="btn cancelBtn" @click="closePopup('rename')">取消</button>
 					<button class="btn agreeBtn4" @click="handleBtnName">确定</button>
 				</view>
 			</view>
@@ -134,6 +136,9 @@
 		</view>
 		<!-- 蒙板、用于点击任意位置关闭悬浮的菜单 -->
 		<view class="mask" v-show="showTooltip||showshare" @click.stop="closePopMenu"></view>
+		
+		
+		<MsgBox ref="msgPop" />
 	</view>
 </template>
 
@@ -772,7 +777,8 @@
 				this.downCallback();
 			});
 			ble = bleTool.getBleTool();
-			recei = BleReceive.getBleReceive();
+			console.log("this=",this);
+			recei = BleReceive.getBleReceive(this);
 			//蓝牙连接成功的回调
 			ble.addRecoveryCallback((res) => {
 				// console.log("蓝牙连接成功的回调");
@@ -799,8 +805,9 @@
 
 			//接收到消息的回调
 			ble.addReceiveCallback((receive, device, path, recArr) => {
-				// console.error("首页收到消息了");
-				recei.ReceiveData(receive, device, path, recArr);
+				 console.error("首页收到消息了");
+				let json=recei.ReceiveData(receive, device, path, recArr);
+				console.error("消息内容",json);
 				this.updateBleStatu();
 			}, pagePath);
 
@@ -873,12 +880,25 @@
 		text-align: center;
 		/* 文字居中 */
 		/* 设置最小宽度 */
+		
+		position: relative;
 	}
 
-	.active {
-		color: rgba(187, 230, 0, 1);
-		border-bottom: 6rpx solid rgba(187, 230, 0, 1);
+	.tab-item.active {
+		color: #bbe600;
+		
 		height: 60rpx;
+		font-weight: bold;
+	}
+	.tab-item.active::before{
+		content: "";
+		background-color:  #bbe600;
+		position: absolute;
+		top: 90%;
+		left:35%;
+		width: 30%;
+		height: 6rpx;
+		border-radius: 6rpx;
 	}
 
 	.sendFlex {
@@ -1128,14 +1148,32 @@
 		border-radius: 40rpx;
 		padding: 30rpx;
 		text-align: center;
-		border: 1px solid rgba(255, 200, 78, 0.3);
+		border: 1px solid #E034344d;
 	}
 
+
+	.cancelBtn{
+		
+		
+		text-align: center;
+		width: 170rpx !important;
+		background-color: #00000000;
+	}
+	
+	.agreement-popupC .cancelBtn{
+		border:1rpx solid #E034344d;
+		color:#E03434;
+	}
+	
+	.agreement-popupD .cancelBtn{
+		border: 1rpx solid rgba(255, 255, 255, 0.6);
+		color:rgba(255, 255, 255, 0.6);
+	}
 	.agreement-popupD {
-		width: 70%;
+		width: 75%;
 		background-color: rgb(42, 42, 42);
 		border-radius: 40rpx;
-		padding: 40rpx;
+		padding: 40rpx 5rpx;
 		text-align: center;
 		border: 1px solid rgba(187, 230, 0, 0.3);
 	}
@@ -1157,6 +1195,7 @@
 		font-size: 28rpx;
 		text-align: left;
 		text-indent: 5rpx;
+		width: calc(100% - 75rpx);
 	}
 
 	.svg {
@@ -1177,8 +1216,8 @@
 
 	/* 同意按钮 */
 	.agreeBtn {
-		background: #FFC84E;
-		color: #232323;
+		background: #E03434;
+		color: #FFFFFF;
 		border: none;
 		width: 170rpx !important;
 	}
diff --git a/static/images/670/qiangActive.png b/static/images/670/qiangActive.png
index b4930b5..159feba 100644
Binary files a/static/images/670/qiangActive.png and b/static/images/670/qiangActive.png differ
diff --git a/static/images/670/ruoActive.png b/static/images/670/ruoActive.png
index 5c6f7d8..6d8ebeb 100644
Binary files a/static/images/670/ruoActive.png and b/static/images/670/ruoActive.png differ
diff --git a/static/images/common/dell.png b/static/images/common/dell.png
index 71ff6da..6c074f3 100644
Binary files a/static/images/common/dell.png and b/static/images/common/dell.png differ
diff --git a/static/images/lightImg/closeLight.png b/static/images/lightImg/closeLight.png
index 506ea9b..b849335 100644
Binary files a/static/images/lightImg/closeLight.png and b/static/images/lightImg/closeLight.png differ
diff --git a/static/images/lightImg/closeLightActive.png b/static/images/lightImg/closeLightActive.png
new file mode 100644
index 0000000..c2d3655
Binary files /dev/null and b/static/images/lightImg/closeLightActive.png differ
diff --git a/utils/BleHelper.js b/utils/BleHelper.js
index 3d2b207..77abe9c 100644
--- a/utils/BleHelper.js
+++ b/utils/BleHelper.js
@@ -22,9 +22,6 @@ const serviceDic = [ //合作供应商的蓝牙主服务
 class BleHelper {
 	constructor() {
 		this.StorageKey = "linkedDevices";
-
-		recei = receivTool.getBleReceive();
-
 		this.init();
 	}
 	init() {
@@ -41,16 +38,12 @@ class BleHelper {
 				if (!v) return false;
 				v.Linked = false;
 				v.notifyState = false;
-				return !!v.device;
+				return v.device;
 			});
 		}
 
-
 		const systemInfo = uni.getSystemInfoSync();
 
-
-
-
 		this.data = {
 			isOpenBlue: false, //蓝牙模块是否开启
 			available: false, //蓝牙状态是否可用
@@ -71,17 +64,7 @@ class BleHelper {
 			stateRecoveryCallback: [], //蓝牙适配器恢复可用事件
 			stateBreakCallback: [] //蓝牙适配器不可用事件
 		}
-		//蓝牙模块不再订阅，改到首页订阅
-		// this.addReceiveCallback((receive, f, path, recArr) => {
-		// 	recei.ReceiveData(receive, f, path, recArr);
-		// }, "BleReceiveData");
 
-		// setTimeout(() => {
-		// 	this.OpenBlue().then(() => {
-		// 		this.linkAllDevices();
-		// 	});
-
-		// }, 10);
 
 		this.dic = {
 			errRemarks: [{
@@ -668,7 +651,7 @@ class BleHelper {
 	BleReceive() {
 		uni.onBLECharacteristicValueChange((receive) => {
 			//订阅消息
-			 console.log("收到订阅消息", receive);
+			 // console.log("收到订阅消息", receive);
 			let f = this.data.LinkedList.find((v) => {
 				return v.deviceId == receive.deviceId;
 			})
diff --git a/utils/BleReceive.js b/utils/BleReceive.js
index a9175c7..12206c1 100644
--- a/utils/BleReceive.js
+++ b/utils/BleReceive.js
@@ -1,8 +1,22 @@
 import Common from '@/utils/Common.js'
-import { parseBleData } from '@/api/100J/HBY100-J.js'
+import {
+	parseBleData
+} from '@/api/100J/HBY100-J.js'
+import {
+	MsgSuccess,
+	MsgError,
+	MsgClose,
+	MsgWarning,
+	showPop,
+	MsgClear,
+	MsgInfo
+} from '@/utils/MsgPops.js';
 
 class BleReceive {
-	constructor() {
+	constructor(_ref) {
+		if(_ref){
+			this.ref = _ref;	
+		}		
 		this.StorageKey = "linkedDevices";
 		this.HandlerMap = {
 			'/pages/6155/deviceDetail': this.Receive_6155.bind(this),
@@ -13,10 +27,12 @@ class BleReceive {
 			'/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/6170/deviceControl/index':this.Receive_6170.bind(this),
+			'/pages/6170/deviceControl/index': this.Receive_6170.bind(this),
 			'/pages/100J/HBY100-J': this.Receive_100J.bind(this),
-			'/pages/6075J/BJQ6075J':this.Receive_6075.bind(this)
+			'/pages/6075J/BJQ6075J': this.Receive_6075.bind(this),
+			'/pages/210/HBY210':this.Receive_210.bind(this),
 		};
+
 	}
 
 
@@ -63,23 +79,23 @@ class BleReceive {
 			return receive;
 		}
 
-		if (f && f.macAddress && f.device && f.device.id) {
+		if (fReady) {
 			let handler = null;
 			let keys = Object.keys(this.HandlerMap);
 			let devKey = f.device.detailPageUrl ? f.device.detailPageUrl.replace(/\//g, '').toLowerCase() : '';
-		
+
 			for (let index = 0; index < keys.length; index++) {
 				let devKey = f.device.detailPageUrl ? f.device.detailPageUrl.replace(/\//g, "").toLowerCase() : '';
 				let key = keys[index].replace(/\//g, '').toLowerCase();
 				if (key == devKey) {
 					handler = this.HandlerMap[keys[index]];
-					
+
 					break;
 				}
 			}
 
 			if (handler) {
-				let data = handler(receive, f, path, recArr);			
+				let data = handler(receive, f, path, recArr);
 				this.setBleFormData(data, f);
 				return data;
 			} else {
@@ -89,7 +105,7 @@ class BleReceive {
 		} else {
 			// 100J AE30 二进制帧在 f 不完整时已在上方 parseBleData，此处不再误报「无法处理」
 			if (!is100JAe30) {
-				console.log("已收到该消息,但无法处理", receive, "f:", f);
+				console.error("已收到该消息,但无法处理", receive, "f:", f);
 			}
 		}
 
@@ -180,40 +196,33 @@ class BleReceive {
 					formData.modeCurr = modeCurr;
 					formData.warnLevel = warn;
 					formData.iswarn = iswarn;
-			
+
 
 					let recCnt = recArr.find(v => {
 						return v.key.replace(/\//g, "").toLowerCase() == f.device.detailPageUrl
 							.replace(/\//g, "").toLowerCase();
 					});
 					if (!recCnt) {
+						let msg = [];
+						if (f) {
+							if (formData.battary <= 20) {
+								msg.push("设备'" + f.device.deviceName + "'电量低");
+							}
+							if (iswarn) {
+								msg.push("设备'" + f.device.deviceName + "'环境存在漏电电源");
+							}
 
-						if (iswarn) {
-							uni.showModal({
-								content: "'" + f.device.deviceName + "'环境存在漏电电源",
-								title: "警告",
-								success(res) {
-									if (res.confirm) {
-
-										if (f) {
-											uni.navigateTo({
-												url: f.detailPageUrl,
-												events: {
-													ack: function(data) {}
-												},
-												success: (res) => {
-													res.eventChannel.emit('detailData', {
-														data: f,
-														deviceType: '',
-														apiType: 'listA'
-													});
-												}
-											});
-										}
-									}
+							if (this.ref && msg.length>0) {
+								if (msg.length > 0) {
+									msg = msg.join(',');
+									MsgError("'" + f.device.deviceName + "'环境存在漏电电源", '', this.ref, () => {
+										MsgClear(this.ref);
+									});
 								}
-							})
+							}
 						}
+
+
 					}
 					return formData;
 				} catch (error) {
@@ -229,7 +238,7 @@ class BleReceive {
 					if (str.indexOf('mac address:') == 0) {
 						let formData = {};
 						formData.macAddress = str.split(':')[1];
-						
+
 						return formData;
 					} else {
 						let receiveData = {
@@ -348,7 +357,7 @@ class BleReceive {
 					receiveData.fourGStrenth = fourGStrenth;
 					receiveData.SOS = sosTxt;
 					receiveData.qzwarn = sosTxt === 'sg';
-					
+
 					console.log("recArr=", recArr);
 					let recCnt = recArr.find(v => {
 						return v.key.replace(/\//g, "").toLowerCase() == f.device.detailPageUrl
@@ -362,13 +371,22 @@ class BleReceive {
 						if (staticWarn) { //有静止报警
 							msgs.push("静止报警中");
 						}
+						if (receiveData.battary <= 20) {
+							msg.push("设备'" + f.device.deviceName + "'电量低");
+						}
 						if (msgs.length > 0) {
-							msgs = "设备'" + f.device.deviceName + msgs.join(";");
-							uni.showModal({
-								title: "警告",
-								content: msgs,
-								showCancel: false
-							});
+							msgs = msgs.join(";");
+							if (this.ref) {
+								MsgError(msgs, '', this.ref, () => {
+									MsgClear(this.ref);
+								});
+							}
+
+							// uni.showModal({
+							// 	title: "警告",
+							// 	content: msgs,
+							// 	showCancel: false
+							// });
 						}
 
 					}
@@ -436,7 +454,7 @@ class BleReceive {
 					console.log('将数据转文本失败', ex);
 				}
 			}
-		
+
 			return receiveData;
 		}
 
@@ -514,12 +532,13 @@ class BleReceive {
 
 				});
 				if (!recCnt) {
-					if (batteryLevel <= 20) {
-						// 会弹出两个框,暂且注释掉这段代码
-						uni.showModal({
-							content: "设备'" + f.device.deviceName + "'电量低",
-							title: "提示"
-						});
+					if (batteryLevel <= 20 && warn == 0x00) {
+
+						if (this.ref) {
+							MsgError("设备'" + f.device.deviceName + "'电量低", '', this.ref, () => {
+								MsgClear(this.ref);
+							});
+						}
 					}
 				}
 
@@ -613,13 +632,17 @@ class BleReceive {
 
 
 				});
+				console.log("formData=",formData)
 				if (!recCnt) {
-					if (batteryLevel <= 20) {
-						// 会弹出两个框,暂且注释掉这段代码
-						uni.showModal({
-							content: "设备'" + f.device.deviceName + "'电量低",
-							title: "提示"
-						});
+					console.log("11111");
+					if (formData.battary <= 20 && bytes[5] == 0x00) {
+						console.log("2222")
+						if (this.ref) {
+							console.log("3333333");
+							MsgError("设备'" + f.device.deviceName + "'电量低", '', this.ref, () => {
+								MsgClear(this.ref);
+							});
+						}
 					}
 				}
 
@@ -646,11 +669,13 @@ class BleReceive {
 			});
 			if (!recCnt) {
 				if (receiveData.sta_PowerPercent <= 20) {
-					uni.showModal({
-						title: "提示",
-						content: "设备'" + f.device.deviceName + "'电量低",
-						showCancel: false
-					});
+
+					if (this.ref) {
+						MsgError("设备'" + f.device.deviceName + "'电量低", '', this.ref, () => {
+							MsgClear(this.ref);
+						});
+					}
+
 				}
 			}
 		} catch (error) {
@@ -674,12 +699,16 @@ class BleReceive {
 					.replace(/\//g, "").toLowerCase();
 			});
 			if (!recCnt) {
-				if (receiveData.sta_battery <= 20) {
-					uni.showModal({
-						title: "提示",
-						content: "设备'" + f.device.deviceName + "'电量低",
-						showCancel: false
-					});
+				if (receiveData.sta_battery <= 20 && (receiveData.sta_system != '1' || receiveData.sta_system !=
+						'3')) {
+
+					if (this.ref) {
+						MsgError("设备'" + f.device.deviceName + "'电量低", '', this.ref, () => {
+							MsgClear(this.ref);
+						});
+					}
+
+
 				}
 			}
 		} catch (error) {
@@ -695,19 +724,22 @@ class BleReceive {
 		try {
 			if (!receive.bytes || receive.bytes.length < 3) return receiveData;
 			// 与 HBY100-J 页 bleValueNotify 共用 notify，避免 parseBleData 执行两次：重复日志、FB05 双次 resolve、onNotify 双次
-			const parsed = parseBleData(receive.bytes, { skipSideEffects: true });
+			const parsed = parseBleData(receive.bytes, {
+				skipSideEffects: true
+			});
 			if (!parsed) return receiveData;
 			if (parsed.longitude !== undefined) receiveData.longitude = parsed.longitude;
 			if (parsed.latitude !== undefined) receiveData.latitude = parsed.latitude;
 			if (parsed.batteryPercentage !== undefined) receiveData.batteryPercentage = parsed.batteryPercentage;
-			if (parsed.batteryRemainingTime !== undefined) receiveData.batteryRemainingTime = parsed.batteryRemainingTime;
+			if (parsed.batteryRemainingTime !== undefined) receiveData.batteryRemainingTime = parsed
+				.batteryRemainingTime;
 		} catch (e) {
 			console.log('[100J] BleReceive 解析失败', e);
 		}
 		return receiveData;
 	}
 
-Receive_6170(receive, f, path, recArr) {
+	Receive_6170(receive, f, path, recArr) {
 		let receiveData = {};
 
 		try {
@@ -721,21 +753,20 @@ Receive_6170(receive, f, path, recArr) {
 					.replace(/\//g, "").toLowerCase();
 			});
 			if (!recCnt) {
-				if (receiveData.sta_PowerPercent <= 20) {
-					uni.showModal({
-						title: "提示",
-						content: "设备'" + f.device.deviceName + "'电量低",
-						showCancel: false
-					});
+				let deviceState = receiveData.state;
+				if (deviceState && deviceState instanceof Array) {
+					if (deviceState[0] == 12 && deviceState[3] <= 20 && deviceState[4] == 0) {
+						if (this.ref) {
+							MsgError("设备'" + f.device.deviceName + "'电量低", '', this.ref, () => {
+								MsgClear(this.ref);
+							});
+						}
+					}
 				}
-				
+
+
 			}
 
-
-
-			
-
-
 		} catch (error) {
 			receiveData = {};
 			console.error("文本解析失败", error)
@@ -758,18 +789,21 @@ Receive_6170(receive, f, path, recArr) {
 					.replace(/\//g, "").toLowerCase();
 			});
 			if (!recCnt) {
-				if (receiveData.sta_PowerPercent <= 20) {
-					uni.showModal({
-						title: "提示",
-						content: "设备'" + f.device.deviceName + "'电量低",
-						showCancel: false
-					});
+
+				let msgs = [];
+
+				if (receiveData.sta_PowerPercent <= 20 && receiveData.sta_charge == 0) {
+					msgs.push("设备'" + f.device.deviceName + "'电量低");
 				}
 				if (receiveData.sta_Intrusion === 1) {
-					uni.showModal({
-						title: "提示",
-						content: "闯入报警中",
-						showCancel: false
+					msgs.push("设备'" + f.device.deviceName + "'闯入报警中");
+				}
+			
+
+				if (this.ref && msg.length>0) {	
+					msgs = msgs.join(",");
+					MsgError(msgs, '', this.ref, () => {
+						MsgClear(this.ref);
 					});
 				}
 
@@ -787,7 +821,7 @@ Receive_6170(receive, f, path, recArr) {
 
 					if (receiveData.sta_tomac.indexOf(':') == -1) {
 						receiveData.sta_tomac = receiveData.sta_tomac.replace(/(.{2})/g, '$1:').slice(0, -
-						1); //mac地址自动补:
+							1); //mac地址自动补:
 					}
 					uni.getStorageInfo({
 						success: function(res) {
@@ -814,9 +848,9 @@ Receive_6170(receive, f, path, recArr) {
 								let dev = arr.find(v => {
 									if (v.linkId == f.linkId) {
 										let vl = v.linkEqs.find(cvl => {
-											if(cvl.linkMac === receiveData.sta_tomac){
-												v.read=false;
-												cvl.linkTime=time;
+											if (cvl.linkMac === receiveData.sta_tomac) {
+												v.read = false;
+												cvl.linkTime = time;
 												return true;
 											}
 											return false;
@@ -853,7 +887,7 @@ Receive_6170(receive, f, path, recArr) {
 					console.error("某个设备闯入报警");
 					if (receiveData.sta_sosadd.indexOf(':') == -1) {
 						receiveData.sta_sosadd = receiveData.sta_sosadd.replace(/(.{2})/g, '$1:').slice(0, -
-						1); //mac地址自动补:
+							1); //mac地址自动补:
 					}
 					warnArrs.push({
 						linkId: f.linkId,
@@ -911,35 +945,61 @@ Receive_6170(receive, f, path, recArr) {
 	}
 
 
-	Receive_6075(receive,f,path,recArr){
+	Receive_6075(receive, f, path, recArr) {
 		let receiveData = {};
-		
+
 		try {
 
 			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
-				// 	});
-				// }
-				
-		
+			if (!recCnt && this.ref) {
+				if (receiveData.sta_PowerPercent <= 20 && (receiveData.sta_system != 3 || receiveData.sta_system !=1)) {
+					
+						MsgError("设备'" + f.device.deviceName + "'电量低", '', this.ref, () => {
+							MsgClear(this.ref);
+						});
+					
+				}
 			}
-				
+
 		} catch (error) {
 			receiveData = {};
 			console.log("文本解析失败", error)
 		}
 		return receiveData;
-		
+
+	}
+	Receive_210(receive, f, path, recArr) {
+		let receiveData = {};
+
+		try {
+
+			receiveData = JSON.parse(receive.str);
+
+			let recCnt = recArr.find(v => {
+				return v.key.replace(/\//g, "").toLowerCase() == f.device.detailPageUrl
+					.replace(/\//g, "").toLowerCase();
+			});
+			if (!recCnt && this.ref) {
+				if (receiveData.sta_PowerPercent <= 20 && (receiveData.sta_system != 3 || receiveData.sta_system !=1)) {
+					
+						MsgError("设备'" + f.device.deviceName + "'电量低", '', this.ref, () => {
+							MsgClear(this.ref);
+						});
+					
+				}
+			}
+
+		} catch (error) {
+			receiveData = {};
+			console.log("文本解析失败", error)
+		}
+		return receiveData;
+
 	}
 }
 
@@ -947,10 +1007,12 @@ Receive_6170(receive, f, path, recArr) {
 
 let receiveInstance = null;
 export default {
-	getBleReceive: function(found, receive) {
+	getBleReceive: function(_ref) {
+		console.log("_ref=",_ref);
 		if (!receiveInstance) {
-			receiveInstance = new BleReceive();
-
+			receiveInstance = new BleReceive(_ref);
+		}else{
+			console.log("使用现有实例receiveInstance")
 		}
 		return receiveInstance;
 	}
diff --git a/utils/MsgPops.js b/utils/MsgPops.js
index fd61c84..2cbb718 100644
--- a/utils/MsgPops.js
+++ b/utils/MsgPops.js
@@ -2,7 +2,8 @@ var MsgType = {
 	error: "error",
 	succ: "succ",
 	warn: "warn",
-	info:'info'
+	info:'info',
+	prompt:'prompt'
 }
 var time = null;
 // 显示成功
@@ -74,6 +75,26 @@ export const MsgInfo = (msg, btnTxt, ev, isClear,btnCallback) => {
 	return option;
 
 
+}
+
+//显示捕获窗口,用于自定义弹窗内容
+export const MsgPrompt = ( ev,refName, btnCallback,isClear) => {
+	if (!ev) {
+
+		return null;
+	}
+	if (!ev.$refs[refName]) {
+
+		return null;
+	}
+	let option = ev.$refs[refName].showMsg("", "", MsgType.prompt,btnCallback);
+	if (isClear === undefined || isClear) {
+		createClear(ev);
+	}
+
+	return option;
+
+
 }
 
 // 隐藏loading