diff --git a/api/6155/BlueHelper.js b/api/6155/BlueHelper.js
deleted file mode 100644
index 82dd23d..0000000
--- a/api/6155/BlueHelper.js
+++ /dev/null
@@ -1,671 +0,0 @@
-export default {
-	featrueValueCallback: null,//蓝牙特征变化回调
-	BleChangeCallback:null,//蓝牙状态变化回调
-	//引导用户打开蓝牙
-	showBluetoothGuide: function(showTip) {
-		let platform = process.env.UNI_PLATFORM;
-
-
-		var openBlueSetting = function() {
-			// 判断平台类型
-			if (platform === 'mp-weixin') {
-				uni.openSetting();
-			} else if (platform === 'app-plus' || platform === 'app') {
-				//----------------------------------------------------------------
-				const osName = plus.os.name;
-
-				if (osName === 'iOS') {
-					// iOS 平台打开蓝牙设置
-					plus.runtime.openURL('App-Prefs:root=Bluetooth', function() {
-						console.log('成功打开蓝牙设置');
-					}, function(err) {
-						console.error('打开蓝牙设置失败：' + err.message);
-						uni.showModal({
-							title: '提示',
-							content: '无法自动打开蓝牙设置，请手动前往设置 > 蓝牙 进行操作。',
-							showCancel: false
-						});
-					});
-				} else if (osName === 'Android') {
-					// Android 平台打开蓝牙设置
-					try {
-						const Intent = plus.android.importClass('android.content.Intent');
-						const Settings = plus.android.importClass('android.provider.Settings');
-						const main = plus.android.runtimeMainActivity();
-						const intent = new Intent(Settings.ACTION_BLUETOOTH_SETTINGS);
-						main.startActivity(intent);
-					} catch (e) {
-						console.error('打开蓝牙设置失败：' + e.message);
-						// 尝试使用通用设置页面作为备选方案
-						plus.runtime.openURL('settings://', function() {
-							console.log('打开系统设置成功，请手动找到蓝牙选项');
-						}, function() {
-							uni.showModal({
-								title: '提示',
-								content: '无法自动打开蓝牙设置，请手动前往设置页面开启蓝牙。',
-								showCancel: false
-							});
-						});
-					}
-				} else {
-					uni.showModal({
-						title: '提示',
-						content: '当前系统不支持自动打开蓝牙设置，请手动操作。',
-						showCancel: false
-					});
-				}
-
-
-				//--------------------------------------------------------------------
-			} else if (platform === 'mp-alipay') {
-				uni.openSetting();
-			}
-
-		}
-
-		if (showTip !== undefined) {
-			openBlueSetting();
-			return;
-		}
-		if (platform === 'mp-weixin' || platform === 'app-plus' || platform === 'mp-alipay' || platform === 'app') {
-			uni.showModal({
-				title: '蓝牙未开启',
-				content: '请在系统设置中打开蓝牙以使用此功能',
-				success: (res) => {
-					if (res.confirm) {
-						openBlueSetting();
-					}
-				}
-			});
-		} else {
-			console.log("当前平台不支持打开系统设置" + platform);
-		}
-
-
-	},
-	//获取蓝牙适配器状态
-	CheckBlue: function(callback) {
-
-		uni.getBluetoothAdapterState({
-			success(res1) {
-
-				console.log("当前蓝牙适配器状态:" + JSON.stringify(res1))
-				if (callback) {
-					callback(res1);
-				}
-
-			},
-			fail(ex1) {
-				console.log("检查蓝牙状态异常：" + JSON.stringify(ex1));
-				if (callback) {
-					if (ex1.code == 10000) {
-						console.log("未初始化蓝牙适配器");
-					}
-					let res1 = {
-						available: false,
-						discovering: false
-					}
-					callback(res1);
-				}
-			},
-			complete() {
-
-			}
-		});
-	},
-	//初始化蓝牙模块 
-	OpenBlue: function(isCheckState, callback, availCallback) {
-
-		var these = this;
-
-		var init = function() {
-			uni.openBluetoothAdapter({
-				success: (res) => {
-					console.log("蓝牙初始化成功:" + JSON.stringify(res));
-					if (callback) {
-						callback();
-					}
-					uni.onBluetoothAdapterStateChange(function(state) {
-						console.log('蓝牙状态发生变化:' + JSON.stringify(state));
-						if(this.BleChangeCallback){
-							this.BleChangeCallback()
-						}
-					})
-				},
-				fail: function(ex2) {
-					console.log("蓝牙初始化失败:" + JSON.stringify(ex2))
-					if (ex2.code == '10001') {
-						console.log("手机蓝牙未打开或设备不支持蓝牙");
-
-
-						if (availCallback) {
-							availCallback();
-						} else {
-							these.showBluetoothGuide();
-						}
-					}
-				}
-			});
-		}
-		if (isCheckState) {
-			this.CheckBlue(function(res1) {
-				if (res1.available) {
-					if (callback) {
-						callback();
-					}
-					return;
-				}
-				init();
-			})
-		} else {
-			init();
-		}
-
-
-
-	},
-	//关闭蓝牙模块,停止搜索、断开所有连接
-	CloseBlue: function(callback) {
-
-		this.StopSearch();
-
-		this.disconnectDevice();
-
-		uni.closeBluetoothAdapter({
-			success: () => {
-				console.log("蓝牙模块已关闭");
-				if (callback) {
-					callback();
-				}
-			}
-		});
-	},
-	//开始搜索新设备
-	StartSearch: function(callback) {
-
-		var these = this;
-
-		//发现新设备
-		var onDeviceFound = function() {
-			uni.onBluetoothDeviceFound(function(res) {
-				console.log("发现新设备:" + JSON.stringify(res));
-				if (callback) {
-					callback(res);
-				}
-			})
-		}
-		//开始搜索
-		var Search = function() {
-			uni.startBluetoothDevicesDiscovery({
-				services: ["0xFFE0"],
-				allowDuplicatesKey: false,
-				success: (res) => {
-					console.log('开始搜索蓝牙设备成功');
-					onDeviceFound();
-				},
-				fail: (err) => {
-					console.log(`搜索蓝牙设备失败: ${err.errMsg}`);
-				}
-			});
-
-		}
-		//先检查蓝牙状态是可用
-		this.CheckBlue(function(res1) {
-			if (res1.available) {
-				if (!res1.discovering) {
-					Search();
-				} else {
-					console.log("当前蓝牙正在搜索设备")
-				}
-
-			} else {
-				these.OpenBlue(false, Search, () => {
-					these.showBluetoothGuide();
-				});
-			}
-		});
-
-
-
-	},
-	//停止搜索
-	StopSearch: function() {
-		uni.stopBluetoothDevicesDiscovery({
-			success: (res) => {
-				console.log("停止搜索蓝牙设备成功")
-			},
-			fail() {
-				console.log("无法停止蓝牙搜索")
-			}
-		});
-	},
-	//获取已连接的设备
-	getLinkBlue: function(callback) {
-		uni.getConnectedBluetoothDevices({
-			services: ["0xFFE0"],
-			success: (res) => {
-				if (callback) {
-					callback(res);
-
-				}
-			},
-			fail: function(ex) {
-				console.log("获取已连接设备异常");
-				if (callback) {
-					callback({
-						devices: []
-					});
-				}
-			}
-		})
-	},
-	//连接某个设备
-	LinkBlue: function(deviceId, callback, error) {
-		
-		this.StopSearch();
-		var these = this;
-		let key = "linkedDevices";
-		var store = uni.getStorageInfoSync();
-		var f = store.keys.find(function(v) {
-			return v == key;
-		});
-		var linkedDevices = [];
-		if (f) {
-			var str = uni.getStorageSync(key);
-			if (str) {
-				linkedDevices = JSON.parse(str);
-			}else{
-				linkedDevices=[];
-			}
-
-		}
-		//连接成功的回调
-		var lindedCallback = function () {
-
-			let c = linkedDevices.find(function (v) {
-				return v.deviceId == deviceId;
-			});
-
-			if (c) {
-				console.log("连接成功开始监听特征变化")
-				//监听设备的特征变化
-				uni.notifyBLECharacteristicValueChange({
-					deviceId: deviceId,
-					serviceId: c.notifyServiceid,
-					characteristicId: c.notifyCharactId,
-					state: true,
-					success: function (res) {
-						console.log("开始监听成功。。。。")
-						if(res.errCode=='0'){
-							//订阅特征值
-							uni.onBLECharacteristicValueChange(function(data){
-								// data.characteristicId
-								// data.deviceId
-								// data.serviceId
-								// data.value
-								console.log("监听到特征值:"+JSON.stringify(data));
-								
-								if(these.featrueValueCallback){
-									these.featrueValueCallback(data);
-								}
-							});
-							
-						}
-					}
-				});
-			}
-
-			if (callback) {
-				callback(deviceId);
-			}
-		}
-
-		var linkState = function(res) {
-			console.log("获取已连接的设备回调" + JSON.stringify(res))
-			let flag = res.devices.find(function(v) {
-				if (v.deviceId == deviceId) {
-					return true;
-				}
-				return false;
-			});
-			if (flag) {
-				console.log("设备状态已连接");
-				
-				lindedCallback(deviceId);
-				
-				return;
-			} else {
-				console.log("设备未连接");
-				linkDevice(deviceId);
-			}
-		}
-
-		var linkDevice = function(id) {
-			console.log("正在连接"+id);
-			uni.createBLEConnection({
-				deviceId: id,
-				timeout: 30000,
-				success: function(info) {
-
-					console.log("连接成功");
-
-					uni.setBLEMTU({
-						deviceId: id,
-						mtu: 512,
-						success: () => {
-							console.log("mtu设置成功");
-							if(linkedDevices){
-								console.log("11111"+JSON.stringify(linkedDevices));
-								f = linkedDevices.find(function (v) {
-									return v.deviceId == id;
-								});
-							}else{
-								console.log("22222")
-								f=null;
-							}
-							
-
-
-							if (!f) {
-								console.log("缓存中没有找到该设备")
-
-								these.getLinkBlue(function (res) {
-									if (res.devices && res.devices.length) {
-										let f = res.devices.find(function (v) {
-											return v.deviceId == id;
-										});
-										linkedDevices.push(f);
-										uni.setStorageSync(key, JSON.stringify(linkedDevices));
-
-										getService(id);
-
-									}
-
-								});
-
-
-							} else {
-								console.log("缓存中已连接过");
-								if (!f.services) {
-									getService(id);
-								} else {
-									
-									lindedCallback(id);
-									
-								}
-							}
-						},
-						fail: function() {
-							console.log("mtu设置失败")
-						}
-					});
-
-				},
-				fail: function(ex) {
-					if (error) {
-						console.log("蓝牙连接失败" + JSON.stringify(error));
-						error(ex);
-					}
-				}
-			});
-		}
-		//获取服务
-		var getService = function(id) {
-
-			var repeatCnt = 0;
-			var startgetService = function() {
-				uni.getBLEDeviceServices({
-					deviceId: id,
-					success: function(res) {
-						if (res.services && res.services.length > 0) {
-							console.log("获取到服务：" + JSON.stringify(res));
-
-							linkedDevices.find(function(v) {
-								if (v.deviceId == id) {
-									v.services = res.services;
-								}
-							});
-							uni.setStorageSync(key, JSON.stringify(linkedDevices));
-							var promises = [];
-							for (var i = 0; i < res.services.length; i++) {
-								let service = res.services[i];
-								promises.push(getFeatrus(id, service.uuid));
-							}
-
-							Promise.all(promises)
-								.then(results => {
-									console.log('所有操作成功完成', results);
-									
-									lindedCallback(id);
-									
-								})
-								.catch(error => {
-									console.error('至少一个操作失败', error);
-								});
-
-
-						} else {
-							repeatCnt++;
-							if (repeatCnt > 5) {
-							
-									lindedCallback(id);
-								
-								return;
-							}
-							setTimeout(function() {
-								startgetService(id);
-							}, 500);
-						}
-					}
-				})
-			}
-
-			setTimeout(function() {
-				startgetService(id);
-			}, 1000);
-		}
-		//获取特性
-		var getFeatrus = function(id, serviceId) {
-			var promise = new Promise((resolve, reject) => {
-				uni.getBLEDeviceCharacteristics({
-					deviceId: id,
-					serviceId: serviceId,
-					success: (res) => {
-						console.log("获取到特征:" + JSON.stringify(res));
-
-						//写特征
-						let writeChar = res.characteristics.find(char =>
-							char.uuid.indexOf("FFE1") > -1
-						);
-						//通知特征
-						let notiChar = res.characteristics.find(char =>
-							char.uuid.indexOf("FFE2") > -1
-						);
-
-						linkedDevices.find(function(v) {
-							if (v.deviceId == id) {
-								if (!v.Characteristics) {
-									v.Characteristics = [];
-								}
-								v.Characteristics = v.Characteristics.concat(res
-									.characteristics);
-
-								if (writeChar) {
-									v.writeServiceId = serviceId;
-									v.wirteCharactId = writeChar.uuid;
-								}
-
-								if (notiChar) {
-									v.notifyServiceid = serviceId;
-									v.notifyCharactId = notiChar.uuid;
-								}
-							}
-						});
-
-						uni.setStorageSync(key, JSON.stringify(linkedDevices));
-						resolve(res);
-					},
-					fail: (ex) => {
-						console.log("获取特征出现异常:" + JSON.stringify(ex));
-						resolve(ex);
-					}
-				});
-			});
-			return promise;
-		}
-
-		//监测蓝牙状态变化
-		uni.onBLEConnectionStateChange(function(res) {
-			if (!res.connected) {
-				console.log("蓝牙断开连接" + res.deviceId + "");
-				// lindDevice(res.deviceId);
-			}
-		});
-
-		console.log("正在获取蓝牙适配器状态")
-		this.CheckBlue((res) => {
-			console.log("蓝牙状态：" + JSON.stringify(res));
-			if (res.available) {
-				this.getLinkBlue(linkState);
-			} else {
-				console.log("蓝牙适配器不可用,正在初始化");
-				this.OpenBlue(false, () => {
-					this.getLinkBlue(linkState);
-				}, () => {
-					console.log("请引导用户打开蓝牙");
-					these.showBluetoothGuide();
-				})
-			}
-
-		});
-
-
-	},
-	//断开连接
-	disconnectDevice: function(deviceId) {
-
-		var disconnect = function(id) {
-			uni.closeBLEConnection({
-				deviceId: id,
-				success: (res) => {
-					console.log("蓝牙连接已断开");
-
-				}
-			});
-		}
-		if (deviceId) {
-			disconnect(deviceId);
-			return;
-		}
-		//断开所有已连接的设备
-		this.getLinkBlue(function(res) {
-			if (res.devices && res.devices.length > 0) {
-				for (var i = 0; i < res.devices.length; i++) {
-					let item = res.devices[i];
-					disconnect(item.deviceId);
-				}
-
-			} else {
-				console.log("无连接设备");
-			}
-		});
-
-	},
-	//发送二进制数据
-	sendData: function(deviceid, buffer) {
-
-		console.log("准备向设备发送数据，deviceid=" + deviceid);
-		return new Promise((resolve, reject) => {
-			if (!deviceid) {
-				reject(`deviceid为空，请输入要发送的设备`);
-				return;
-			}
-			 console.log("准备发送数据包");
-			let key = "linkedDevices";
-			var store = uni.getStorageInfoSync();
-			var f = store.keys.find(function(v) {
-				return v == key;
-			});
-			 console.log("倒计时：5");
-			var linkedDevices = [];
-			if (f) {
-				var str = uni.getStorageSync(key);
-				if (str) {
-					linkedDevices = JSON.parse(str);
-				}
-
-			}
-			 console.log("倒计时：4");
-			if (linkedDevices && linkedDevices.length && linkedDevices.length > 0) {
-				 console.log("倒计时：3");
-				f = linkedDevices.find(function(v) {
-					return v.deviceId == deviceid;
-
-				});
-				console.log("f=" + JSON.stringify(f));
-				// console.log("deviceid=" + deviceid);
-				 console.log("倒计时：2");
-				if (f) {
-					 console.log("倒计时：1");
-					uni.writeBLECharacteristicValue({
-						deviceId: f.deviceId,
-						serviceId: f.writeServiceId,
-						characteristicId: f.wirteCharactId,
-						value: buffer,
-						success: () => {
-							console.log("发送数据成功");
-							resolve();
-						},
-						fail: (err) => {
-							console.log("发送数据失败" + JSON.stringify(err));
-							reject(`发送数据失败: ${err.errMsg}`);
-						},
-						complete: function() {
-							console.log("发送数据complete");
-						}
-					});
-				} else {
-					reject(`已连接设备中无法找到此设备`);
-					// console.log("警报：已连接设备中无法找到此设备")
-				}
-
-			} else {
-				console.log("检测到未与设备建立连接");
-				reject(`检测到未与设备建立连接`);
-			}
-
-
-		});
-	},
-	sendDataNew: function(deviceid, serviceId, characteristicId, buffer) {
-
-		console.log("准备向设备发送数据，deviceid=" + deviceid);
-		return new Promise((resolve, reject) => {
-			uni.writeBLECharacteristicValue({
-				deviceId: deviceid,
-				serviceId: serviceId,
-				characteristicId: characteristicId,
-				value: buffer,
-				success: () => {
-					console.log("发送数据成功");
-					resolve();
-				},
-				fail: (err) => {
-					console.log("发送数据失败" + JSON.stringify(err));
-					reject(`发送数据失败: ${err.errMsg}`);
-				},
-				complete: function() {
-					console.log("发送数据complete");
-				}
-			});
-
-
-
-
-
-		});
-	}
-
-}
-
-
diff --git a/api/670/HBY670.js b/api/670/HBY670.js
new file mode 100644
index 0000000..4cc35d3
--- /dev/null
+++ b/api/670/HBY670.js
@@ -0,0 +1,93 @@
+import {request,baseURL} from '@/utils/request'
+
+function getdata(data,url,method){
+	return new Promise((resolve,reject)=>{
+		if(!url){
+			reject('url为空');
+			return;
+		}
+		if(!method){
+			method='POST';
+		}
+		request({
+		  url: url,
+		  method: method,
+		  data:data
+		}).then((res)=>{
+			resolve(res);
+		}).catch(ex=>{
+			reject(ex);
+		});
+	});
+	
+}
+
+
+//人员信息设置
+function sendUsr(data){
+	let url="/app/xinghan/device/registerPersonInfo";
+	return getdata(data,url,"POST");
+}
+
+//报警信息
+function warnMsg(data){
+	let url="/app/xinghan/device/sendAlarmMessage"
+	return getdata(data,url,"POST");
+}
+
+//开机图片
+function sendPic(data){
+	return new Promise((resolve, reject) => {
+	
+		const token = uni.getStorageSync('token');
+		const clientid = uni.getStorageSync('clientID');
+		let config = {
+			header: {}
+		};
+		if (token) {
+			config.header['Authorization'] = 'Bearer ' + token;
+			config.header['clientid'] = clientid;
+		}
+	
+		uni.uploadFile({
+	
+			url: baseURL + '/app/xinghan/device/uploadLogo',
+			filePath: data.picPath,
+			name: 'file',
+			formData: {
+				deviceId: data.deviceId,
+				deviceImei: data.deviceImei
+			},
+			header: config.header,
+			timeout: 600000,
+			fail: (ex) => {
+				console.log("上传视频失败" ,ex);
+				reject(ex);
+			},
+			success: (res) => {
+				console.log("上传完成", res);
+				if(res.statusCode==200){
+				resolve(JSON.parse(res.data));	
+				}else{
+					reject(res);
+				}
+				
+			},
+			complete: () => {
+				
+			}
+	
+		});
+	});
+}
+
+export default{
+	sendUsr:sendUsr,
+	warnMsg:warnMsg,
+	sendPic:sendPic
+}
+
+
+
+
+
diff --git a/components/BottomSlideMenuPlus/BottomSlideMenuPlus.vue b/components/BottomSlideMenuPlus/BottomSlideMenuPlus.vue
index af0dd3b..ffe890d 100644
--- a/components/BottomSlideMenuPlus/BottomSlideMenuPlus.vue
+++ b/components/BottomSlideMenuPlus/BottomSlideMenuPlus.vue
@@ -2,17 +2,14 @@
 	<view class="message-popup" :class="{ 'show': config.show }">
 
 		<view class="mask" @click="closeMenu" :class="{ 'show': config.show }"
-		:style="{backgroundColor:config.maskBgColor,display:(config.showMask?'':'none')}"
-		>
+			:style="{backgroundColor:config.maskBgColor,display:(config.showMask?'':'none')}">
 
 		</view>
 		<view class="bottom-slide-menu" :style="{ backgroundColor: config.bgColor }" :class="{ 'show': config.show }"
 			@touchmove.stop.prevent>
 			<view class="menu-header" :class="config.showHeader?'':'displayNone'">
 				<view class="title" :style="{ color: config.textColor}">{{ config.title }}</view>
-				<view  class="close-icon" @click="closeMenu"
-				:style="{display:(config.showClose?'':'none')}"
-				>
+				<view class="close-icon" @click="closeMenu" :style="{display:(config.showClose?'':'none')}">
 					<image src="/static/Images/public/close.png" mode="aspectFit"></image>
 				</view>
 			</view>
@@ -29,7 +26,13 @@
 					<view class="p100" :style="{backgroundColor:config.activeIndex==index?config.itemBgColor:'',
 				justifyContent:config.textAlign
 				}">
-						<image v-if="item.icon" :src="item.icon" mode="aspectFit"></image>
+						<view class="imgContent" :style="{ 					
+				height:config.itemHeight,
+				width:config.itemHeight
+				}">
+							<image v-if="item.icon" :src="item.icon" mode="aspectFit"></image>
+						</view>
+
 						<text>{{ item.text }}</text>
 					</view>
 
@@ -61,34 +64,34 @@
 			config: {
 				type: Object,
 				default: () => ({
-					show: false,//是否显示
-					showHeader: false,//是否显示标头
-					showMask:true,//是否显示mask
-					showDivider: false,//是否在两个项之间显示分隔线
-					showBtn: false,//是否显示底部按钮
-					showClose:false,//是否显示右上角关闭按钮
-					maskBgColor:'',//mask的颜色
-					menuItems: [],//菜单项 包含icon text
-					activeIndex: -1,//当前已选中的项编号
-					bgColor: '#2a2a2a',//主体背景
-					itemBgColor: '#3a3a3a',//各项被选中后的背景
-					textColor: '#ffffffde',//各项的文字颜色
-					textAlign: 'flex-start',//各项的文字居中方式
-					title: '',//header的文字					
-					dividerColor: '#00000000',//分隔线颜色
-					dividerThickness: '0rpx',//分隔线宽度
-					dividerMargin: '10rpx',//分隔线距离两边的宽度
-					itemHeight: '80rpx',//各项的调试					
-					btnBgColor: "#bbe600",//按钮颜色
-					btnText: "确定",//按钮文字
-					btnTextColor: "#000000",//按钮文字颜色
-					
+					show: false, //是否显示
+					showHeader: false, //是否显示标头
+					showMask: true, //是否显示mask
+					showDivider: false, //是否在两个项之间显示分隔线
+					showBtn: false, //是否显示底部按钮
+					showClose: false, //是否显示右上角关闭按钮
+					maskBgColor: '', //mask的颜色
+					menuItems: [], //菜单项 包含icon text
+					activeIndex: -1, //当前已选中的项编号
+					bgColor: '#2a2a2a', //主体背景
+					itemBgColor: '#3a3a3a', //各项被选中后的背景
+					textColor: '#ffffffde', //各项的文字颜色
+					textAlign: 'flex-start', //各项的文字居中方式
+					title: '', //header的文字					
+					dividerColor: '#00000000', //分隔线颜色
+					dividerThickness: '0rpx', //分隔线宽度
+					dividerMargin: '10rpx', //分隔线距离两边的宽度
+					itemHeight: '80rpx', //各项的调试					
+					btnBgColor: "#bbe600", //按钮颜色
+					btnText: "确定", //按钮文字
+					btnTextColor: "#000000", //按钮文字颜色
+
 				})
 			},
 
 
 		},
-		
+
 		methods: {
 			closeMenu() {
 
@@ -100,19 +103,18 @@
 				this.$emit('itemClick', item, index);
 			},
 			btnClick() {
-				
+
 				let item = null;
 				let index = null;
 				if (this.config.activeIndex > -1) {
 					item = this.config.menuItems[this.config.activeIndex];
 				}
 				index = this.config.activeIndex;
-				this.$emit('btnClick', item, index); 
+				this.$emit('btnClick', item, index);
 			}
-			
+
 		}
 	}
-	
 </script>
 
 <style>
@@ -126,7 +128,7 @@
 	}
 
 	.p100 {
-		width: 100%;
+		width: calc(100% - 20rpx);
 		height: 100%;
 		border-radius: 8rpx;
 		display: flex;
@@ -136,7 +138,8 @@
 		justify-content: flex-start;
 		align-items: center;
 		box-sizing: border-box;
-		padding: 0rpx 20rpx;
+		padding: 0rpx 20rpx 0rpx 0rpx;
+		margin-left: 20rpx;
 	}
 
 	.displayNone {
@@ -151,7 +154,7 @@
 		z-index: 9999;
 		transition: transform 0.3s ease-out;
 		transform: translateY(100%);
-		border-radius: 16rpx 16rpx 0 0;
+		border-radius: 32rpx 32rpx 0 0;
 		box-shadow: 0 -2rpx 10rpx rgba(0, 0, 0, 0.1);
 	}
 
@@ -217,11 +220,24 @@
 		width: 100%;
 		box-sizing: border-box;
 		position: relative;
+		margin-bottom: 20rpx;
 	}
 
 	.menu-item image {
 		width: 40rpx;
 		height: 40rpx;
+
+	}
+
+	.imgContent {
+		display: flex;
+		flex-direction: row;
+		flex-wrap: nowrap;
+		align-content: center;
+		justify-content: center;
+		align-items: center;
+		background: #4a4a4a;
+		border-radius: 10rpx;
 		margin-right: 20rpx;
 	}
 
diff --git a/components/TextToHex/TextToHex.vue b/components/TextToHex/TextToHex.vue
new file mode 100644
index 0000000..ea33b5e
--- /dev/null
+++ b/components/TextToHex/TextToHex.vue
@@ -0,0 +1,194 @@
+<template>
+	<view>
+		<canvas type="2d" canvas-id="reusableCanvas" :width="currentCanvasWidth" :height="currentCanvasHeight"
+			class="offscreen-canvas"></canvas>
+	</view>
+</template>
+
+<script>
+	export default {
+		name: "TextToHexV1",
+		props: {
+			txts: {
+				type: Array,
+				default: () => [],
+				validator: (value) => value.every(item => typeof item === 'string')
+			},
+			fontSize: {
+				type: Number,
+				default: 16,
+				validator: (value) => value > 0 && value <= 100
+			},
+			bgColor: {
+				type: String,
+				default: "#ffffff"
+			},
+			color: {
+				type: String,
+				default: "#000000"
+			}
+		},
+		data() {
+			return {
+				// 当前Canvas的宽高（动态调整）
+				currentCanvasWidth: 0,
+				currentCanvasHeight: 0,
+				// Canvas上下文（复用）
+				ctx: null
+			};
+		},
+		computed: {
+			validTxts() {
+				return this.txts.filter(line => line.trim() !== '');
+			}
+		},
+		mounted() {
+			// 初始化Canvas上下文（只创建一次）
+			this.ctx = uni.createCanvasContext('reusableCanvas', this);
+		},
+		methods: {
+			/**
+			 * 估算单行文本所需的Canvas宽度
+			 */
+			calcLineWidth(textLine) {
+				return textLine.length * this.fontSize;
+			},
+
+			/**
+			 * 清除Canvas内容
+			 */
+			clearCanvas() {
+				this.ctx.setFillStyle(this.bgColor);
+				this.ctx.fillRect(0, 0, this.currentCanvasWidth, this.currentCanvasHeight);
+			},
+
+			/**
+			 * 复用单个Canvas处理所有文本行
+			 */
+			async drawAndGetPixels() {
+				
+				let convertCharToMatrix=function(imageData) {
+					// console.log("imgData=",imageData)
+					let matrix = [];
+
+					// 逐行处理
+					for (let y = 0; y < 16; y++) {
+						let byte1 = 0,
+							byte2 = 0;
+
+						// 每行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);
+								}
+							}
+						}
+
+						// 将字节转换为两位十六进制字符串
+						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 result = {};
+					let ctx = this.ctx;
+
+					// 1. 动态调整Canvas尺寸
+					this.currentCanvasWidth = this.calcLineWidth(textLine);
+					this.currentCanvasHeight = this.fontSize;
+
+					// 2. 清空Canvas（绘制背景）
+					this.clearCanvas();
+
+					// 3. 设置文字样式
+					ctx.setFillStyle(this.color);
+					ctx.setTextBaseline('middle');
+					ctx.setFontSize(this.fontSize);
+					ctx.font = `${this.fontSize}px "PingFang SC", PingFang SC, Arial, sans-serif`;
+
+					// 4. 绘制当前行文本
+					let currentX = 0;
+					let currentY = this.fontSize / 2;
+					for (let j = 0; j < textLine.length; j++) {
+						let char = textLine[j];
+						ctx.fillText(char, currentX, currentY);
+						// 按实际字符宽度计算间距
+						let charWidth = ctx.measureText(char).width;
+						currentX += charWidth;
+					}
+
+					// 5. 异步绘制并获取像素数据（串行处理避免冲突）
+					await new Promise((resolve, reject) => {
+						ctx.draw(false, () => {
+							uni.canvasGetImageData({
+								canvasId: 'reusableCanvas',
+								x: 0,
+								y: 0,
+								width: this.currentCanvasWidth,
+								height: this.currentCanvasHeight,
+								success: res => {
+									
+									result={
+										line: textLine,
+										pixelData: res.data,
+										width: this.currentCanvasWidth,
+										height: this.currentCanvasHeight
+									};
+									resolve();
+								},
+								fail: err => {
+									// console.error(`处理第${i+1}行失败:`, err);
+									reject(err)
+								}
+							});
+						});
+					});
+
+					return result;
+				}
+				let arr = [];
+				// 循环处理每行文本
+				for (let i = 0; i < this.validTxts.length; i++) {
+
+					let linePixls = [];
+					let item = this.validTxts[i];
+					console.log("item=",item);
+					for (var j = 0; j < item.length; j++) {
+						let result = await drawTxt(item[j]);
+						linePixls.push(convertCharToMatrix(result.pixelData));
+					}
+					console.log("hexs=",linePixls.join(","));
+					arr.push(linePixls);
+				}
+				
+				return arr;
+			}
+		}
+	};
+</script>
+
+<style>
+	.offscreen-canvas {
+		position: fixed;
+		left: -9999px;
+		top: -9999px;
+		visibility: hidden;
+	}
+</style>
\ No newline at end of file
diff --git a/components/TextToHex/TextToHexV1.vue b/components/TextToHex/TextToHexV1.vue
new file mode 100644
index 0000000..ea33b5e
--- /dev/null
+++ b/components/TextToHex/TextToHexV1.vue
@@ -0,0 +1,194 @@
+<template>
+	<view>
+		<canvas type="2d" canvas-id="reusableCanvas" :width="currentCanvasWidth" :height="currentCanvasHeight"
+			class="offscreen-canvas"></canvas>
+	</view>
+</template>
+
+<script>
+	export default {
+		name: "TextToHexV1",
+		props: {
+			txts: {
+				type: Array,
+				default: () => [],
+				validator: (value) => value.every(item => typeof item === 'string')
+			},
+			fontSize: {
+				type: Number,
+				default: 16,
+				validator: (value) => value > 0 && value <= 100
+			},
+			bgColor: {
+				type: String,
+				default: "#ffffff"
+			},
+			color: {
+				type: String,
+				default: "#000000"
+			}
+		},
+		data() {
+			return {
+				// 当前Canvas的宽高（动态调整）
+				currentCanvasWidth: 0,
+				currentCanvasHeight: 0,
+				// Canvas上下文（复用）
+				ctx: null
+			};
+		},
+		computed: {
+			validTxts() {
+				return this.txts.filter(line => line.trim() !== '');
+			}
+		},
+		mounted() {
+			// 初始化Canvas上下文（只创建一次）
+			this.ctx = uni.createCanvasContext('reusableCanvas', this);
+		},
+		methods: {
+			/**
+			 * 估算单行文本所需的Canvas宽度
+			 */
+			calcLineWidth(textLine) {
+				return textLine.length * this.fontSize;
+			},
+
+			/**
+			 * 清除Canvas内容
+			 */
+			clearCanvas() {
+				this.ctx.setFillStyle(this.bgColor);
+				this.ctx.fillRect(0, 0, this.currentCanvasWidth, this.currentCanvasHeight);
+			},
+
+			/**
+			 * 复用单个Canvas处理所有文本行
+			 */
+			async drawAndGetPixels() {
+				
+				let convertCharToMatrix=function(imageData) {
+					// console.log("imgData=",imageData)
+					let matrix = [];
+
+					// 逐行处理
+					for (let y = 0; y < 16; y++) {
+						let byte1 = 0,
+							byte2 = 0;
+
+						// 每行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);
+								}
+							}
+						}
+
+						// 将字节转换为两位十六进制字符串
+						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 result = {};
+					let ctx = this.ctx;
+
+					// 1. 动态调整Canvas尺寸
+					this.currentCanvasWidth = this.calcLineWidth(textLine);
+					this.currentCanvasHeight = this.fontSize;
+
+					// 2. 清空Canvas（绘制背景）
+					this.clearCanvas();
+
+					// 3. 设置文字样式
+					ctx.setFillStyle(this.color);
+					ctx.setTextBaseline('middle');
+					ctx.setFontSize(this.fontSize);
+					ctx.font = `${this.fontSize}px "PingFang SC", PingFang SC, Arial, sans-serif`;
+
+					// 4. 绘制当前行文本
+					let currentX = 0;
+					let currentY = this.fontSize / 2;
+					for (let j = 0; j < textLine.length; j++) {
+						let char = textLine[j];
+						ctx.fillText(char, currentX, currentY);
+						// 按实际字符宽度计算间距
+						let charWidth = ctx.measureText(char).width;
+						currentX += charWidth;
+					}
+
+					// 5. 异步绘制并获取像素数据（串行处理避免冲突）
+					await new Promise((resolve, reject) => {
+						ctx.draw(false, () => {
+							uni.canvasGetImageData({
+								canvasId: 'reusableCanvas',
+								x: 0,
+								y: 0,
+								width: this.currentCanvasWidth,
+								height: this.currentCanvasHeight,
+								success: res => {
+									
+									result={
+										line: textLine,
+										pixelData: res.data,
+										width: this.currentCanvasWidth,
+										height: this.currentCanvasHeight
+									};
+									resolve();
+								},
+								fail: err => {
+									// console.error(`处理第${i+1}行失败:`, err);
+									reject(err)
+								}
+							});
+						});
+					});
+
+					return result;
+				}
+				let arr = [];
+				// 循环处理每行文本
+				for (let i = 0; i < this.validTxts.length; i++) {
+
+					let linePixls = [];
+					let item = this.validTxts[i];
+					console.log("item=",item);
+					for (var j = 0; j < item.length; j++) {
+						let result = await drawTxt(item[j]);
+						linePixls.push(convertCharToMatrix(result.pixelData));
+					}
+					console.log("hexs=",linePixls.join(","));
+					arr.push(linePixls);
+				}
+				
+				return arr;
+			}
+		}
+	};
+</script>
+
+<style>
+	.offscreen-canvas {
+		position: fixed;
+		left: -9999px;
+		top: -9999px;
+		visibility: hidden;
+	}
+</style>
\ No newline at end of file
diff --git a/components/global-loading/global-loading.vue b/components/global-loading/global-loading.vue
new file mode 100644
index 0000000..0848bec
--- /dev/null
+++ b/components/global-loading/global-loading.vue
@@ -0,0 +1,199 @@
+<template>
+	<view v-if="visible" class="loading-container" @touchmove.stop.prevent="handleTouchMove">
+		<view class="loading-content">
+			<!-- 刻度点容器 -->
+			<view class="clock-container">
+				<view v-for="(dot, index) in dots" :key="index" class="clock-dot" :style="{
+            transform: `rotate(${index * angle}deg) translateY(-${radius}px)`,
+            backgroundColor: getDotColor(index),
+            animationDuration: `${duration}ms`,
+            animationDelay: `${index * (duration / dotsCount)}ms`
+          }"></view>
+			</view>
+
+			<!-- 提示文本 -->
+			<text class="loading-text" :class="text?'':'displayNone'" :style="{ color: textColor }">{{ text }}</text>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				visible: false,
+				dotsCount: 12,
+				dotColors: ['#CEF231'], 
+				text: '请稍候...',//文本文字
+				textColor: '#FFFFFFde',//文本颜色
+				radius: 32,//圆的半径
+				duration: 1200,//动画的播放速度
+				colorIndex: 0
+			}
+		},
+		computed: {
+			// 计算每个点之间的角度
+			angle() {
+				return 360 / this.dotsCount
+			},
+			// 生成刻度点数组
+			dots() {
+				return Array.from({
+					length: this.dotsCount
+				})
+			}
+		},
+		methods: {
+			// 获取刻度点颜色（实现无限循环变色）			
+			getDotColor(index) {
+				// 根据当前颜色索引和刻度点位置计算颜色
+				const colorIndex = (index + this.colorIndex) % this.dotColors.length
+				return this.dotColors[colorIndex]
+			},
+
+			// 更新颜色索引（实现循环变色）
+			updateColorIndex() {
+				this.colorIndex = (this.colorIndex + 1) % this.dotColors.length
+			},
+
+			// 显示loading
+			show(options) {
+			
+				if(!options){
+					options={};
+				}
+				
+				this.update(options)
+				this.visible = true
+				
+				// 启动颜色循环
+				if (!this.colorTimer) {
+					this.colorTimer = setInterval(() => {
+						this.updateColorIndex()
+					}, this.duration / this.dotColors.length)
+				}
+			},
+
+			// 隐藏loading
+			hide() {
+			
+				this.visible = false
+				// 清除颜色循环定时器
+				if (this.colorTimer) {
+					clearInterval(this.colorTimer)
+					this.colorTimer = null
+				}
+			},
+
+			// 更新loading配置
+			update(options) {
+				if(!options){
+					options={a:1};
+				}
+				Object.keys(options).forEach(key => {
+					if (this[key] !== undefined) {
+						this[key] = options[key]
+					}
+				})
+
+				// 如果更新了颜色数组，重置颜色索引
+				if (options.dotColors) {
+					this.colorIndex = 0
+				}
+			},
+
+			// 阻止触摸移动事件
+			handleTouchMove() {}
+		},
+
+		beforeDestroy() {
+			// 组件销毁前清除定时器
+			if (this.colorTimer) {
+				clearInterval(this.colorTimer)
+				this.colorTimer = null
+			}
+		}
+	}
+</script>
+
+<style scoped>
+	/* 全屏遮罩层 */
+	.loading-container {
+		position: fixed;
+		top: 0;
+		left: 0;
+		right: 0;
+		bottom: 0;
+		background-color: #000000c2;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		z-index: 99999999999;
+		pointer-events: auto;
+		box-sizing: border-box;
+		padding-bottom: 70%;
+	}
+
+	/* 内容居中 */
+	.loading-content {
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		justify-content: center;
+		transform: translateZ(0);
+		/* 启用GPU加速 */
+		margin-top: -150rpx;
+	}
+
+	/* 刻度容器 */
+	.clock-container {
+		position: relative;
+		width: 200rpx;
+		height: 200rpx;
+		
+	}
+
+	/* 单个刻度点 */
+	.clock-dot {
+		position: absolute;
+		top: 50%;
+		left: 50%;
+		width: 6rpx;
+		height: 30rpx;
+		border-radius: 12rpx;
+	/* 	margin-top: -4rpx;
+		margin-left: -4rpx; */
+		transform-origin: 0 0;
+		animation: colorScale infinite ease-in-out;
+		box-shadow: 0 0 8rpx rgba(0, 0, 0, 0.2);
+	}
+
+	/* 刻度点动画 - 颜色和大小变化 */
+	@keyframes colorScale {
+		0% {
+			opacity: 0.05;
+
+		}
+
+		100% {
+			opacity: 1;
+
+		}
+	}
+
+	/* 提示文本 */
+	.loading-text {
+		font-size: 32rpx;
+		font-weight: 400;
+		letter-spacing: 1.4rpx;
+		text-align: center;
+		max-width: 80vw;
+		
+		
+		font-family: 'PingFang SC';
+	}
+	
+	.displayNone{
+		display: none !important;
+	}
+</style>
\ No newline at end of file
diff --git a/config/index.js b/config/index.js
index e977462..dcd1dcc 100644
--- a/config/index.js
+++ b/config/index.js
@@ -2,11 +2,11 @@
 const config = {
 	// 开发环境
 	development: {
-		BASE_URL: 'http://192.168.2.34:8000',
+		BASE_URL: 'http://192.168.110.54:8000',
 		API_PREFIX: '',
 		// MQTT 配置
 		MQTT_HOST: '47.120.79.150',
-		MQTT_PORT: 9083,
+		MQTT_PORT: 8083,
 		MQTT_USERNAME: 'admin',
 		MQTT_PASSWORD: '#YtvpSfCNG'
 	},
@@ -16,7 +16,7 @@ const config = {
 		API_PREFIX: '',
 		// MQTT 配置
 		MQTT_HOST: '47.120.79.150',
-		MQTT_PORT: 9083,
+		MQTT_PORT: 8083,
 		MQTT_USERNAME: 'admin',
 		MQTT_PASSWORD: '#YtvpSfCNG'
 	}
diff --git a/main.js b/main.js
index 248201c..42275af 100644
--- a/main.js
+++ b/main.js
@@ -1,6 +1,6 @@
 import App from './App'
 
-// 引入 uView UI
+//// 引入 uView UI
 import uView from 'vk-uview-ui';
 import bleTool from '@/store/BLETools.js';
 
diff --git a/package-lock.json b/package-lock.json
index 346f6d7..a38d96b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -272,7 +272,8 @@
     "node_modules/mescroll-uni": {
       "version": "1.3.7",
       "resolved": "https://registry.npmjs.org/mescroll-uni/-/mescroll-uni-1.3.7.tgz",
-      "integrity": "sha512-1pQMtGA+iVRKhfJZZNXdBx05NnthIk6zm3hRbumswSA54eaKOMgpUDb9AQ2+rRdXmS6kLkEYSbW/fkb7/IyoAg=="
+      "integrity": "sha512-1pQMtGA+iVRKhfJZZNXdBx05NnthIk6zm3hRbumswSA54eaKOMgpUDb9AQ2+rRdXmS6kLkEYSbW/fkb7/IyoAg==",
+      "license": "MIT"
     },
     "node_modules/mime-db": {
       "version": "1.52.0",
@@ -296,7 +297,8 @@
     "node_modules/paho-mqtt": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/paho-mqtt/-/paho-mqtt-1.1.0.tgz",
-      "integrity": "sha512-KPbL9KAB0ASvhSDbOrZBaccXS+/s7/LIofbPyERww8hM5Ko71GUJQ6Nmg0BWqj8phAIT8zdf/Sd/RftHU9i2HA=="
+      "integrity": "sha512-KPbL9KAB0ASvhSDbOrZBaccXS+/s7/LIofbPyERww8hM5Ko71GUJQ6Nmg0BWqj8phAIT8zdf/Sd/RftHU9i2HA==",
+      "license": "EPL-1.0"
     },
     "node_modules/proxy-from-env": {
       "version": "1.1.0",
diff --git a/pages.json b/pages.json
index ff2076b..297bc18 100644
--- a/pages.json
+++ b/pages.json
@@ -190,6 +190,89 @@
 			"style": {
 				"navigationBarTitleText": "呼叫"
 			}
+		},
+		{
+			"path": "pages/BlueTooth/ModeSetting/VideoSend",
+			"style": {
+				"navigationBarTitleText": "发送视频"
+
+
+			}
+		},
+		{
+			"path": "pages/BlueTooth/ModeSetting/VideoSend_1",
+			"style": {
+				"navigationBarTitleText": "发送视频"
+
+
+			}
+		},
+		{
+			"path": "pages/BlueTooth/ModeSetting/VideoSend_670",
+			"style": {
+				"navigationBarTitleText": "发送视频"
+
+
+			}
+		},
+		{
+			"path": "pages/BlueTooth/ModeSetting/HBY650",
+			"style": {
+				"navigationBarTitleText": "HBY650"
+			}
+		},
+		{
+			"path": "pages/BlueTooth/ModeSetting/HBY650_1",
+			"style": {
+				"navigationBarTitleText": "HBY650"
+			}
+		},
+		{
+			"path": "pages/BlueTooth/ModeSetting/ModeSetting",
+			"style": {
+				"navigationBarTitleText": "7307-0.96TFT"
+			}
+		},
+		{
+			"path": "pages/BlueTooth/ModeSetting/update",
+			"style": {
+				"navigationBarTitleText": "版本更新"
+			}
+		},
+		{
+			"path": "pages/BlueTooth/ModeSetting/HBY6155",
+			"style": {
+				"navigationBarTitleText": "HBY6155"
+			}
+		},
+		{
+			"path": "pages/BlueTooth/ModeSetting/HBY6155V1",
+			"style": {
+				"navigationBarTitleText": "HBY6155_V1"
+			}
+		},
+		{
+			"path": "pages/BlueTooth/ModeSetting/HBY670V1",
+			"style": {
+				"navigationBarTitleText": "HBY670"
+			}
+		}, {
+			"path": "pages/BlueTooth/ModeSetting/index",
+			"style": {
+				"navigationBarTitleText": "设备类型"
+			}
+		},
+		{
+			"path": "pages/670/HBY670",
+			"style": {
+				"navigationBarTitleText": "HBY670"
+			}
+		},
+		{
+			"path": "pages/650/HBY650",
+			"style": {
+				"navigationBarTitleText": "HBY650"
+			}
 		}
 
 
diff --git a/pages/6155/ImgCrop.vue b/pages/6155/ImgCrop.vue
index cf66c28..e06f20f 100644
--- a/pages/6155/ImgCrop.vue
+++ b/pages/6155/ImgCrop.vue
@@ -25,18 +25,21 @@
 		onLoad: function(option) {
 			const eventChannel = this.getOpenerEventChannel();
 			var these = this;
-			eventChannel.on('checkImg', function(data) {
+			eventChannel.on('checkImg', (data)=> {
 				console.log("我收到你的消息了，消息内容是：" + JSON.stringify(data));
-				these.src = data.data;
+				this.src = data.data;
+				console.log("我收到你的消息了，消息内容是：",data);
 			})
 		},
 		methods: {
 			handleCrop(e) {
+				
 				var these = this;
+				
 				this.Statu = true;
 				console.log("裁剪完成");
 				console.log(e.tempFilePath);
-
+				// 
 				const ctx = uni.createCanvasContext('splashCanvas', this);
 				ctx.drawImage(
 					e.tempFilePath,
@@ -53,11 +56,12 @@
 							height: 80,
 							success: (res) => {
 								// 处理像素数据并发送
+								const eventChannel = these.getOpenerEventChannel();
 								console.log("res.data.length="+res.data.length);
-								// this.processAndSendImageData(res.data).then(
-								// 	resolve).catch(reject);
-								 const eventChannel = these.getOpenerEventChannel();
-								 eventChannel.emit('ImgCutOver',res.data);
+						
+								 
+								 eventChannel.emit('ImgCutOver',{piexls:res.data,picPath:e.tempFilePath});
+								
 								 uni.navigateBack();
 							},
 							fail: (err) => {
diff --git a/pages/6155/deviceDetail.vue b/pages/6155/deviceDetail.vue
index e1170bf..8e3e041 100644
--- a/pages/6155/deviceDetail.vue
+++ b/pages/6155/deviceDetail.vue
@@ -24,11 +24,11 @@
 		<view class="eqinfo">
 			<view class="item">
 				<text class="lbl">蓝牙名称</text>
-				<text class="value">{{formData.name}}</text>
+				<text class="value">{{formData.blename}}</text>
 			</view>
 			<view class="item">
-				<text class="lbl">信号强度</text>
-				<text class="value">{{formData.RSSI}}</text>
+				<text class="lbl">设备名称</text>
+				<text class="value">{{formData.deviceName}}</text>
 			</view>
 			<view class="item">
 				<text class="lbl">设备状态</text>
@@ -83,24 +83,23 @@
 				<text class="usrtitle fleft">人员信息登记</text>
 				<view class="btnSend fright" v-on:click.stop="sendUsr">发送</view>
 				<view class="clear"></view>
+				<TextToHex class="TextToHex" ref="textToHex" :txts="formData.textLines" :bgColor="'#000000'"
+					:color="'#FFFFFF'" :fontSize="16" />
 			</view>
 
 			<view class="item">
 				<text class="lbl">单位：</text>
-				<input class="value" v-model="user.company" placeholder="请输入单位" placeholder-class="usrplace" />
+				<input class="value" v-model="formData.textLines[0]" placeholder="请输入单位" placeholder-class="usrplace" />
+			</view>
+			<view class="item">
+				<text class="lbl">部门：</text>
+				<input class="value" v-model="formData.textLines[1]" placeholder="请输入姓名" placeholder-class="usrplace" />
 			</view>
 			<view class="item">
 				<text class="lbl">姓名：</text>
-				<input class="value" v-model="user.name" placeholder="请输入姓名" placeholder-class="usrplace" />
-			</view>
-			<view class="item">
-				<text class="lbl">职位：</text>
-				<input class="value" v-model="user.job" placeholder="请输入职位" placeholder-class="usrplace" />
-			</view>
-			<view class="item">
-				<text class="lbl">ID号：</text>
-				<input class="value" v-model="user.id" placeholder="请输入ID" placeholder-class="usrplace" />
+				<input class="value" v-model="formData.textLines[2]" placeholder="请输入职位" placeholder-class="usrplace" />
 			</view>
+
 		</view>
 		<view class="proinfo lamp">
 			<text class="title">产品信息</text>
@@ -139,25 +138,31 @@
 			</view>
 		</BottomSlideMenuPlus>
 
-		<Progress :config="Status.Progress"></Progress>
+		<global-loading ref="loading" />
 	</view>
 </template>
 
 <script>
-	import ble from '../../api/6155/BlueHelper';
-import { deviceReName } from '../../api/common';
+	import TextToHexVue from '@/components/TextToHex/TextToHex.vue';
+	import bleTool from '@/utils/BleHelper.js';
 
+	import {
+		showLoading,
+		hideLoading,
+		updateLoading
+	} from '@/utils/loading.js'
+	var ble = null;
+	var these = null;
 	export default {
 		data() {
 			return {
 				Status: {
-					refferKey: '',
 					Pop: {
 						showPop: false, //是否显示弹窗
 						popType: 'custom',
+						textColor: '#ffffffde',
 						bgColor: '#383934bd',
 						borderColor: '#BBE600',
-						textColor: '#ffffffde',
 						buttonBgColor: '#BBE600',
 						buttonTextColor: '#232323DE',
 						iconUrl: '',
@@ -204,113 +209,85 @@ import { deviceReName } from '../../api/common';
 						showMask: true,
 						maskBgColor: '#00000066',
 						showClose: false
-					},
-					Progress: {
-						show: false, //是否显示
-						height: '20rpx',
-						showMask: true, //是否显示mask
-						maskBgColor: '#00000000', //mask背景颜色
-						contentBgColor: '#121212', //总背景颜色
-						showText: true, //是否显示当前进度的文字
-						txtColor: '#ffffffde', //文字的颜色
-						curr: 20, //当前进度
-						total: 100, //总进度
-						proBgColor: '#2a2a2a', //进度条底色,
-						proBorder: '', //进度条border
-						currBgColor: '#bbe600', //当前进度底色
-						currBorder: '', //当前进度border
-						borderRadius: '10rpx'
 					}
 				},
 				formData: {
-					img: '/static/images/6155/DeviceDetail/equip.png',
-					battary: '60',
-					xuhang: '1小时',
-					name: 'JQZM-EF4651',
-					RSSI: '-30',
-					statu: '运行中',
-					liangDu: '50',
-					id:''
-				},
-				cEdit: {
+					img: '',
+					battary: '',
+					xuhang: '',
+					deviceName: '',
+					RSSI: '',
+					statu: '正常',
+					liangDu: '100',
+					id: '',
+					deviceId: '',
+					textLines: ['我爱你', '中国', '五星红旗'],
 					mode: ''
 				},
-				user: {
-					company: '黄石消防支队',
-					name: '菜英俊',
-					job: '小队长',
-					id: 'HSXF01061'
-				},
-				device: {
-					deviceId: ''
-				}
+
+
 			}
 		},
-
+		onUnload() {
+			ble.removeReceiveCallback(this);
+		},
 		onLoad: function() {
-			var these = this;
+			these = this;
+			ble = bleTool.getBleTool();
+			ble.addReceiveCallback(these.bleValueNotify);
 			let eventChannel = this.getOpenerEventChannel();
 
 			eventChannel.on('detailData', function(data) {
 
-				
-				console.log("收到父页面的参数：" + JSON.stringify(data));
-				var device = data.data;
-				these.device.deviceId = device.deviceMac;
-				these.formData.name=device.bluetoothName?device.bluetoothName:device.deviceName;
-				these.formData.img=device.devicePic;
-				these.formData.id=device.id;
-			})
-		
-			
-			 
-			ble.featrueValueCallback = these.bleValueNotify;
-			
-			
+
+				let device = data.data;
+				console.log("收到父页面的参数：" + JSON.stringify(device));
+				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.showPop({
+						message: "蓝牙未连接过该设备,请使用蓝牙重新添加该设备",
+						iconUrl: "/static/images/6155/DeviceDetail/uploadErr.png",
+						borderColor: "#e034344d",
+						buttonBgColor: "#E03434",
+					});
+					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];
+					}
+				}
+				these.formData.blename = f.name ? f.name : "Unname";
+				these.formData.deviceName = device.deviceName;
+				these.formData.img = device.devicePic;
+				these.formData.id = device.id;
+				these.formData.deviceId = f.deviceId;
+				ble.LinkBlue(f.deviceId, f.writeServiceId, f.wirteCharactId, f.notifyCharactId);
+				these.setBleFormData();
+
+
+
+			});
+
 		},
 		onHide: function() {
 
 		},
 		onBackPress(e) {
 
-			var these = this;
-			console.log("these.device=" + JSON.stringify(these.device));
-			if (these.device.deviceId) {
-				if (e.from === 'backbutton') {
-					ble.getLinkBlue((res) => {
-
-
-						if (res.devices.length == 0) {
-							console.log("没有已连接的蓝牙设备")
-							uni.navigateBack();
-							return;
-						}
-						let f = res.devices.find(function(v) {
-							return v.deviceId == these.device.deviceId;
-						});
-						if (!f) {
-							console.log("该设备没有连接")
-							uni.navigateBack();
-							return;
-						}
-
-						uni.showModal({
-							title: '提示',
-							content: '是否断开与设备的蓝牙连接？',
-							success: function(res) {
-								if (res.confirm) {
-									disconnectDevice(these.device.deviceId);
-
-								}
-								uni.navigateBack();
-							}
-						});
-
-					});
-					return true;
-				}
-			}
-			return false;
+			ble.removeReceiveCallback();
 
 		},
 		computed: {
@@ -332,206 +309,243 @@ import { deviceReName } from '../../api/common';
 			}
 		},
 		methods: {
-			bleValueNotify: function(data) {
-				console.log("读取到设备发送的数据:" + JSON.stringify(data));
-				// data.characteristicId
-				// data.deviceId
-				// data.serviceId
-				// data.value
+			getDevice: function() {
+				console.log("LinkedList=", ble.data.LinkedList);
+					console.log("formData=", these.formData);
+				let f = ble.data.LinkedList.find((v) => {
+					return v.deviceId == these.formData.deviceId;
+				});
+
+				return f;
+			},
+			bleValueNotify: function(receive) {
+				console.log("处理接收到的数据:" + receive);
+
+				let bytes = receive.bytes;
+
+				if (bytes[0] == 0xFB && bytes[1] == 0x64 && bytes.length >= 8) {
+					try {
+
+						let staticLevelByte = bytes[2];
+						let getName = function(type) {
+							let name = "";
+							switch (type) {
+								case 0x02:
+									name = '弱光';
+									break;
+								case 0x04:
+									name = '工作光';
+									break;
+								case 0x01:
+									name = '强光';
+									break;
+								case 0x03:
+									name = '爆闪';
+									break;
+								case 0x00:
+									name = '关闭';
+									break;
+							}
+							return name;
+						}
+						let staticLevelText = getName(staticLevelByte);
+
+						// 解析照明档位
+						let lightingLevelByte = bytes[3];
+						let lightingLevelText = getName(lightingLevelByte);
+
+
+						// 解析剩余电量
+						let batteryLevelByte = bytes[4];
+						// 电量百分比范围检查
+						let batteryLevel = Math.max(0, Math.min(100, batteryLevelByte));
+
+
+
+
+						//充电状态
+						let warn = bytes[5];
+						if (warn == 0x00) {
+							warn = '未充电';
+						} else if (warn == 0x01) {
+							warn = '充电中';
+						}
+
+						// 解析剩余照明时间（第三和第四字节，小端序）
+						let lightingTime = "";
+						let HH = Math.max(0, Math.min(100, bytes[6]));
+						let mm = Math.max(0, Math.min(100, bytes[7]));
+						lightingTime = HH + "小时" + mm + "分钟";
+
+						this.formData.mode = staticLevelText;
+						this.formData.fuMode = lightingLevelText;
+						this.formData.battary = batteryLevel;
+						this.formData.statu = warn;
+						this.formData.xuhang = lightingTime;
+
+						this.setBleFormData();
+					} catch (error) {
+						console.log('数据解析错误:', error);
+					}
+				}
 
 			},
 
 			proParam: function() {
-				this.alert('提示', "敬请期待");
+
+				uni.navigateTo({
+					url: '/pages/common/productDes/index?id=' + this.formData.id,
+					success(ev) {
+
+					}
+				});
 			},
 			handRemark: function() {
-				this.alert('提示', "敬请期待");
+				uni.navigateTo({
+					url: '/pages/common/operatingInstruct/index?id=' + this.formData.id,
+					success(ev) {
+
+					}
+				});
 			},
 			handVideo: function() {
-				this.alert('提示', "敬请期待");
+				uni.navigateTo({
+					url: '/pages/common/operationVideo/index?id=' + this.formData.id,
+					success(ev) {
+
+					}
+				});
 			},
 			checkImgUpload: function() {
-				console.log("123213213213");
-				var these = this;
+				let f = these.getDevice();
+
+				if (!f) {
+					these.showPop({
+						message: "蓝牙未连接过该设备,请使用蓝牙重新添加该设备",
+						iconUrl: "/static/images/6155/DeviceDetail/uploadErr.png",
+						borderColor: "#e034344d",
+						buttonBgColor: "#E03434",
+					});
+					return;
+				}
 
 				// 处理像素数据并发送
 				var processAndSendImageData = function(pixels) {
 					return new Promise((resolve, reject) => {
 						// 创建RGB565格式的像素数据
-						const rgb565Data = convertToRGB565(pixels);
+						const rgb565Data = ble.convertToRGB565(pixels);
 
 						// 分包发送
 						sendImagePackets(rgb565Data).then(resolve).catch(reject);
 					});
 				}
 
-				// 将RGBA转换为RGB565
-				var convertToRGB565 = function(pixels) {
 
-					var rgbaToRgb565 = function(r, g, b, a = 255) {
-						// 忽略透明度（如果需要考虑透明度，请根据需求处理）
-
-						// 将8位颜色值压缩到RGB565对应的位数
-						const r5 = Math.round((r / 255) * 31); // 5位：0-31
-						const g6 = Math.round((g / 255) * 63); // 6位：0-63
-						const b5 = Math.round((b / 255) * 31); // 5位：0-31
-
-						// 合并为16位整数
-						return (r5 << 11) | (g6 << 5) | b5;
-					}
-
-					const result = new Uint16Array(160 * 80);
-					let index = 0;
-					console.log("pixels.length=" + pixels.length);
-					for (let i = 0; i < pixels.length; i += 4) {
-						const r = pixels[i];
-						const g = pixels[i + 1];
-						const b = pixels[i + 2];
-
-						// 转换为RGB565 (R:5bit, G:6bit, B:5bit)
-						const rgb565 = ((r & 0xF8) << 8) | ((g & 0xFC) << 3) | (b >> 3);
-						//let rgb565=rgbaToRgb565(r,g,b);
-						result[index++] = rgb565;
-					}
-
-					return result;
-				}
 
 				// 分包发送图片数据
 				var sendImagePackets = function(imageData) {
 					return new Promise((resolve, reject) => {
-						// this.isSending = true;
-						// this.progress = 0;
-						// this.currentPacket = 0;
-
 						// 总数据包数
 						const totalPackets = 52;
 						let currentPacket = 1;
 
-						let key = "linkedDevices";
-						var store = uni.getStorageInfoSync();
-						var f = store.keys.find(function(v) {
-							return v == key;
-						});
-						// console.log("倒计时：5");
-						var linkedDevices = [];
-						if (f) {
-							var str = uni.getStorageSync(key);
-							if (str) {
-								linkedDevices = JSON.parse(str);
+						// 发送单个数据包
+						const sendNextPacket = () => {
+							if (currentPacket > totalPackets) {
+								hideLoading(these);
+								these.Status.BottomMenu.show = false;
+
+								these.showPop({
+									message: "上传成功",
+									iconUrl: "/static/images/6155/DeviceDetail/uploadSuccess.png"
+								});
+
+								resolve();
+								return;
 							}
 
-						}
-						// console.log("倒计时：4");
-						if (linkedDevices && linkedDevices.length && linkedDevices.length > 0) {
-							// console.log("倒计时：3");
-							f = linkedDevices.find(function(v) {
-								return v.deviceId == these.device.deviceId;
-
-							});
-							if (f) {
-								// 发送单个数据包
-								const sendNextPacket = () => {
-									if (currentPacket > totalPackets) {
-										uni.hideLoading();
-										these.Status.BottomMenu.show = false;
-										these.Status.Progress.show = false;
-										these.Status.Pop.showPop = true;
-										these.Status.Pop.message = "上传成功";
-										these.Status.Pop.iconUrl =
-											"/static/images/6155/DeviceDetail/uploadSuccess.png";
-										resolve();
-										return;
-									}
-
-									// 计算当前包的数据
-									let packetSize = 250;
-									if (currentPacket <= 51) {
-										packetSize = 250; // 前51个包每个500字节
-									} else {
-										packetSize = 50; // 最后一个包100字节
-									}
-
-									// 创建数据包
-									const startIndex = (currentPacket - 1) * packetSize;
-									const endIndex = Math.min(startIndex + packetSize, imageData
-										.length);
-									if (startIndex > endIndex) {
-										return;
-									}
-									const packetData = imageData.slice(startIndex,
-										endIndex); // imageData.subarray(startIndex, endIndex);
-									console.log("imageData.length=" + imageData.length +
-										",startIndex=" +
-										startIndex +
-										",endIndex=" + endIndex + ",数据包长度" + (endIndex -
-											startIndex) +
-										',packetData.length=' + packetData.length);
-									// 构建数据包
-									const bufferSize = 5 + packetData.length * 2; // 头部5字节 + 数据部分
-									const buffer = new ArrayBuffer(bufferSize);
-									const dataView = new DataView(buffer);
-
-									// 填充头部
-									dataView.setUint8(0, 0x55); // 帧头
-									dataView.setUint8(1, 0x02); // 帧类型：开机画面
-									dataView.setUint8(2, '0x' + currentPacket.toString(16).padStart(2,
-										'0')); // 包序号
-									// if(packetData.length==250)
-									// {
-									// dataView.setUint8(3, 0x01);
-									// dataView.setUint8(4, 0xFF);
-									// }
-
-									if (packetData.length == 250) {
-										dataView.setUint8(3, 0x01);
-										dataView.setUint8(4, 0xF4);
-									} else {
-										dataView.setUint8(3, 0x00);
-										dataView.setUint8(4, 0x64);
-									}
-
-									// 填充数据（每个RGB565值占2字节）
-									for (let i = 0; i < packetData.length; i++) {
-										dataView.setUint16(5 + i * 2, packetData[i], false); // 大端字节序
-									}
-									console.log(
-										`发送数据包${currentPacket}/${totalPackets},${dataView.getUint8(0)} ${dataView.getUint8(1)} ${dataView.getUint8(2)}`
-									)
-
-
-
-
-									//发送数据包
-									ble.sendDataNew(f.deviceId, f.writeServiceId, f.wirteCharactId, buffer)
-										.then(() => {
-											console.log("发送一个包完成了");
-											these.Status.Progress.curr = currentPacket;
-											currentPacket++;
-
-											setTimeout(sendNextPacket, 100);
-										}).catch(err => {
-											console.log("发送数据包失败了" + JSON.stringify(err));
-											// this.isSending = false;
-											these.Status.BottomMenu.show = false;
-											these.Status.Progress.show = false;
-											these.alert("发送数据包失败了");
-											uni.hideLoading();
-											reject(err);
-										});
-								}
-
-								
-								// 开始发送数据
-                                sendNextPacket();
-
-
+							// 计算当前包的数据
+							let packetSize = 250;
+							if (currentPacket <= 51) {
+								packetSize = 250; // 前51个包每个500字节
+							} else {
+								packetSize = 50; // 最后一个包100字节
 							}
+
+							// 创建数据包
+							const startIndex = (currentPacket - 1) * packetSize;
+							const endIndex = Math.min(startIndex + packetSize, imageData
+								.length);
+							if (startIndex > endIndex) {
+								return;
+							}
+							const packetData = imageData.slice(startIndex,
+								endIndex); // imageData.subarray(startIndex, endIndex);
+							console.log("imageData.length=" + imageData.length +
+								",startIndex=" +
+								startIndex +
+								",endIndex=" + endIndex + ",数据包长度" + (endIndex -
+									startIndex) +
+								',packetData.length=' + packetData.length);
+							// 构建数据包
+							const bufferSize = 5 + packetData.length * 2; // 头部5字节 + 数据部分
+							const buffer = new ArrayBuffer(bufferSize);
+							const dataView = new DataView(buffer);
+
+							// 填充头部
+							dataView.setUint8(0, 0x55); // 帧头
+							dataView.setUint8(1, 0x02); // 帧类型：开机画面
+							dataView.setUint8(2, '0x' + currentPacket.toString(16).padStart(2,
+								'0')); // 包序号
+							// if(packetData.length==250)
+							// {
+							// dataView.setUint8(3, 0x01);
+							// dataView.setUint8(4, 0xFF);
+							// }
+
+							if (packetData.length == 250) {
+								dataView.setUint8(3, 0x01);
+								dataView.setUint8(4, 0xF4);
+							} else {
+								dataView.setUint8(3, 0x00);
+								dataView.setUint8(4, 0x64);
+							}
+
+							// 填充数据（每个RGB565值占2字节）
+							for (let i = 0; i < packetData.length; i++) {
+								dataView.setUint16(5 + i * 2, packetData[i], false); // 大端字节序
+							}
+
+							//发送数据包
+							ble.sendData(f.deviceId, buffer, f.writeServiceId, f.wirteCharactId,
+									30)
+								.then(() => {
+									console.log("发送一个包完成了");
+
+									updateLoading(these, {
+										text: "正在发送" + currentPacket + "/" +
+											totalPackets
+									})
+									currentPacket++;
+
+									setTimeout(sendNextPacket, 100);
+								}).catch(err => {
+									console.log("发送数据包失败了", err);
+
+									these.Status.BottomMenu.show = false;
+									these.showPop({
+										message: "发送数据包失败了" + err.msg,
+										iconUrl: "/static/images/6155/DeviceDetail/uploadErr.png",
+										borderColor: "#e034344d",
+										buttonBgColor: "#E03434",
+									});
+
+									hideLoading(these);
+									reject(err);
+								});
 						}
-
-
-
-
+						// 开始发送数据
+						sendNextPacket();
 
 					});
 				}
@@ -546,17 +560,15 @@ import { deviceReName } from '../../api/common';
 							url: "/pages/6155/ImgCrop",
 							events: {
 								ImgCutOver: function(data) {
-									console.log("我收到裁剪后的图片了，感谢老铁," + data)
-									uni.showLoading({
-										title: "正在发送..."
+
+									showLoading(these, {
+										text: "正在发送0/52"
 									});
-									these.Status.Progress.show = true;
-									these.Status.Progress.curr = 0;
-									these.Status.Progress.total = 52;
+
 									these.Status.BottomMenu.show = false;
 									setTimeout(function() {
-										processAndSendImageData(data).catch(() => {
-
+										processAndSendImageData(data.piexls).catch((ex) => {
+											console.log("出现异常", ex);
 										});
 									}, 0)
 
@@ -568,7 +580,7 @@ import { deviceReName } from '../../api/common';
 								})
 							},
 							fail(ex) {
-								console.log("跳转页面失败"+JSON.stringify(ex));
+								console.log("跳转页面失败" + JSON.stringify(ex));
 							}
 						});
 
@@ -584,17 +596,20 @@ import { deviceReName } from '../../api/common';
 			},
 			ModeSetting: function(type) {
 
-				this.cEdit.mode = type;
+				this.formData.mode = type;
 				let items = [];
 				let title = '';
 				switch (type) {
 					case "main":
 						title = '主灯模式';
-						items = [
-							{
+						items = [{
 								text: '强光',
 								icon: '/static/images/6155/DeviceDetail/qiang.png'
 							},
+							{
+								text: '工作光',
+								icon: '/static/images/6155/DeviceDetail/fan.png'
+							},
 							{
 								text: '弱光',
 								icon: '/static/images/6155/DeviceDetail/ruo.png'
@@ -602,6 +617,10 @@ import { deviceReName } from '../../api/common';
 							{
 								text: '爆闪',
 								icon: '/static/images/6155/DeviceDetail/shan.png'
+							}, 
+							{
+								text: '关闭',
+								icon: '/static/images/6155/DeviceDetail/close.png'
 							}
 						];
 						break;
@@ -635,71 +654,93 @@ import { deviceReName } from '../../api/common';
 				//发送指令给设备
 				switch (this.Status.BottomMenu.type) {
 					case "main":
-						this.setMode(this.Status.BottomMenu.activeIndex);
+						this.setMode(this.Status.BottomMenu.activeIndex, this.Status.BottomMenu.type);
 						break;
 					case "fu":
-						this.setMode(this.Status.BottomMenu.activeIndex);
+						this.setMode(this.Status.BottomMenu.activeIndex, this.Status.BottomMenu.type);
 						break;
 				}
 				this.closeMenu();
 			},
-			setMode(mode) {
+			setMode(mode, type) {
+
+				let dataValue = 0;
+				this.setBleFormData();
 
 
+				if (type == 'main') {
+
+					type = 0x04;
+				} else if (type == 'fu') {
+
+					type = 0x05;
+				}
 
 				this.currentMode = mode;
-				let dataValue = 0;
+
 
 				switch (mode) {
 					case 0:
 						dataValue = 0x01;
-						console.log('开始切换到弱光模式');
 						break;
 					case 1:
-						dataValue = 0x02;
-						console.log('开始切换到工作光模式');
-						break;
-					case 2:
-						dataValue = 0x03;
-						console.log('开始切换到强光模式');
-						break;
-					case 2:
 						dataValue = 0x04;
-						console.log('开始切换到爆闪模式');
+						break;
+					case 2:
+						dataValue = 0x02;
+						break;
+					case 3:
+						dataValue = 0x03;
 						break;
 					case 4:
-						dataValue = 0x00; // 爆关闭主灯光
-						console.log('关闭主灯光');
+						dataValue = 0x00;
 						break;
+
 				}
 
 				// 构建数据包
-				const buffer = new ArrayBuffer(8);
-				const dataView = new DataView(buffer);
+				var buffer = new ArrayBuffer(6);
+				var dataView = new DataView(buffer);
 
-				dataView.setUint8(0, 0x4A); // 帧头
-				dataView.setUint8(1, 0x51); 
-				dataView.setUint8(2, 0x4F); 
-				dataView.setUint8(3, 0x43); 
-				 
-				
-				if(this.Status.BottomMenu.type=='main'){
-					//主灯模式
-					dataView.setUint8(4, 0x04); // 帧类型		
-				}else{
-					//副灯模式
-					dataView.setUint8(4, 0x05); // 帧类型		
-				}				
-				dataView.setUint8(5, dataValue); // 数据
-				dataView.setUint16(6, '9C41');
+				dataView.setUint8(0, 0xFA); // 帧头				
+				dataView.setUint8(1, dataValue); // 帧类型
+				dataView.setUint8(2, 0x00); // 数据
+				dataView.setUint8(3, 0x01); // 数据
+				dataView.setUint8(4, 0x00); // 数据
+				dataView.setUint8(5, 0xFF); // 数据
+
+				let f = this.getDevice();
 				// 发送数据
-                ble.LinkBlue(this.device.deviceId, () => {
-					setTimeout(() => {
-                        ble.sendData(this.device.deviceId, buffer);
-					}, 1000);
 
+				if (!f) {
+					these.showPop({
+						message: "蓝牙未连接过该设备,请使用蓝牙重新添加该设备",
+						iconUrl: "/static/images/6155/DeviceDetail/uploadErr.png",
+						borderColor: "#e034344d",
+						buttonBgColor: "#E03434",
+					});
+					return;
+				}
+
+				showLoading(these, {
+					text: "请稍候..."
 				});
 
+				ble.sendData(f.deviceId, buffer, f.writeServiceId, f.wirteCharactId, 30).then(() => {
+
+				}).catch((ex) => {
+					these.showPop({
+						message: "发送失败," + ex.msg,
+						iconUrl: "/static/images/6155/DeviceDetail/uploadErr.png",
+						borderColor: "#e034344d",
+						buttonBgColor: "#E03434",
+					});
+				}).finally(() => {
+					hideLoading(these);
+				});
+
+
+
 			},
 			handleItemClick(item, index) {
 
@@ -713,133 +754,200 @@ import { deviceReName } from '../../api/common';
 				}
 				this.Status.BottomMenu.activeIndex = index;
 
+			},
+			setBleFormData() {
+				ble.data.LinkedList.find((v) => {
+					if (v.deviceId == these.formData.deviceId) {
+						v.formData = these.formData;
+
+						return true;
+					}
+					return false;
+				});
+				uni.setStorage({
+					key: ble.StorageKey,
+					data: ble.data.LinkedList
+				})
+
 			},
 			HidePop: function() {
 				if (this.Status.Pop.clickEvt == 'SendUsr') {
 
 				}
-
-
 				this.Status.Pop.showPop = false;
 			},
-			sendUsr: function() {
+			showPop: function(option) {
 
-				// this.alert(JSON.stringify(this.user));
-				//生成位图并分包发送 //暂时弹出成功提示
-				var these = this;
-				var textLines = [
-					this.user.company,
-					this.user.name,
-					this.user.job,
-					this.user.id
+				if (!option) {
+					option = {
+						a: 1
+					};
+				}
+				let keys = Object.keys(option);
+				for (var i = 0; i < keys.length; i++) {
+					let key = keys[i];
+					these.Status.Pop[key] = option[key];
+				}
+				if (!option.borderColor) {
+					option.borderColor = '#BBE600';
+					option.buttonBgColor = '#BBE600';
+				}
+				these.Status.Pop.showPop = true;
+			},
+			sendUsr() {
+				let f = this.getDevice();
+				if (!f) {
+					these.showPop({
+						text: "蓝牙未连接过该设备,请使用蓝牙重新添加该设备",
+						iconUrl: "/static/images/6155/DeviceDetail/uploadErr.png",
+						borderColor: "#e034344d",
+						buttonBgColor: "#E03434",
+					});
+					return;
+				}
+				showLoading(these, {
+					text: "请稍候..."
+				});
+				this.setBleFormData();
+				let task = async () => {
+					var sendTxtPackge = (rgbdata, type, str) => {
 
-				];
-				var sendText = function() {
+						var promise = new Promise((resolve, reject) => {
+							try {
 
+								let packetSize = rgbdata.length; //每包均分的数量
+								let mode = rgbdata.length % packetSize; //最后一包的数量
+								let cnt = parseInt(rgbdata.length / packetSize) + (mode > 0 ? 1 :
+									0); //总包数量
+								let curr = 1; //当前包序号
 
+								let sendNext = () => {
 
+									if (curr > cnt) {
+										resolve();
+										return;
+									}
 
-					// 总数据包数
-					const totalPackets = textLines.length;
-					let currentPacket = 1;
+									let bufferSize = 261;
 
-					// 发送单个数据包
-					const sendNextPacket = () => {
-						if (currentPacket > totalPackets) {
-							these.Status.Pop = {
-								showPop: true, //是否显示弹窗
-								popType: 'custom',
-								bgColor: '#383934bd',
-								borderColor: '#BBE600',
-								textColor: '#ffffffde',
-								buttonBgColor: '#BBE600',
-								buttonTextColor: '#232323DE',
-								iconUrl: '/static/images/6155/DeviceDetail/sendSucc.png',
-								message: '人员信息发送成功',
-								buttonText: '确定',
-								clickEvt: 'SendUsr',
-								visiblePrompt: false,
-								promptTitle: '',
-								modelValue: '',
-								visibleClose: true
-							}
+									console.log("bufferSize=", bufferSize)
+									let buffer = new ArrayBuffer(bufferSize);
+									let dataView = new DataView(buffer);
+									let startIndex = (curr - 1) * packetSize;
 
-							return;
-						}
+									let endIndex = Math.min(startIndex + packetSize, rgbdata
+										.length);
+									if (startIndex > endIndex) {
 
-						// 获取当前行文字
-						const text = textLines[currentPacket - 1] || '';
-						let arr = ""; // gbk.encode(text)
-						let gbkData = ""; //gbk.arr2hex(arr);
+										return;
+									}
 
-						console.log(JSON.stringify(gbkData));
-						// 构建数据包
-						const bufferSize = 5 + text.length * 2; // 头部4字节 + 数据部分
-						const buffer = new ArrayBuffer(bufferSize);
-						const dataView = new DataView(buffer);
+									let packetData = rgbdata.slice(startIndex,
+										endIndex); //取一片数据发送
 
-						// 填充头部
-						dataView.setUint8(0, 0x55); // 帧头
-						dataView.setUint8(1, 0x03); // 帧类型：文字
-						dataView.setUint8(2, currentPacket.toString(16)); // 包序号
-						dataView.setUint16(3, (text.length * 2).toString(16)); // 数据长度
-						console.log("gbkData.length=" + gbkData.length)
-						// 填充数据
-						for (let i = 1; i <= text.length * 2; i++) {
-							const highNibble = gbkData[i * 2 - 2]; // 高4位
-							const lowNibble = gbkData[i * 2 - 1]; // 低4位（如果是奇数长度，补0）
-							console.log("i=" + i + "," + highNibble + lowNibble)
-							// 组合高低位并转换为字节值
-							const byteValue = parseInt(highNibble + lowNibble, 16);
-							dataView.setUint8(5 + i - 1, byteValue);
-						}
+									let start = 0;
+									if (curr == 1) {
+										dataView.setUint8(0, 0xFA);
+										dataView.setUint8(1, type);
+										dataView.setUint8(2, 0x01);
+										dataView.setUint8(3, 0x00);
 
+										// dataView.setUint16(2, str.length, false);
+										start = 4;
+									}
 
-						console.log("dataView.length=" + dataView.byteLength)
-						// 发送数据包
-                        ble.LinkBlue(these.device.deviceId, () => {
-							setTimeout(() => {
-                                ble.sendData(these.device.deviceId, buffer).then(() => {
-									// 更新进度
-									console.log(
-										`发送文字数据包 ${currentPacket}/${totalPackets}: ${text}`
-									);
+									for (let i = 0; i < packetData.length; i++) {
+										dataView.setUint8(start + i, packetData[i]);
+									}
 
-									// 发送下一个包
-									currentPacket++;
-									setTimeout(sendNextPacket, 100);
-								}).catch(err => {
-									// this.isSendingText = false;
-									uni.showToast({
-										title: '文字发送失败',
-										icon: 'none'
+									dataView.setUint8(bufferSize - 1, 0xFF);
+
+									let inteval = parseInt(this.inteval ? this.inteval : 0);
+
+									ble.sendData(f.deviceId, buffer, f.writeServiceId, f
+										.wirteCharactId, 30).then(() => {
+
+										curr++;
+										setTimeout(sendNext, inteval);
+									}).catch(err => {
+
+										if (err.code == '10007') {
+											setTimeout(sendNext, inteval);
+										} else {
+											reject(err);
+										}
 									});
-								});
-							}, 0);
 
+								}
+
+								sendNext();
+							} catch (ex) {
+								console.log("ex=", ex);
+
+								reject(ex);
+							}
 						});
 
-						// }).catch(err => {
-						// 	this.isSendingText = false;
-						// 	console.log(`文字编码失败: ${err}`);
-						// 	uni.showToast({
-						// 		title: '编码失败',
-						// 		icon: 'none'
-						// 	});
-						// });
-					};
+						return promise;
 
-					// 开始发送第一个包
-					sendNextPacket();
+					}
+
+
+					var result = await this.$refs.textToHex.drawAndGetPixels();
+
+					result = result.map(level1 => {
+						return level1.flat(Infinity);
+					});
+
+
+					let h3dic = [0x06, 0x07, 0x08];
+					let pros = [];
+					let flag = true;
+					for (var i = 0; i < result.length; i++) {
+
+						let str = this.formData.textLines[i];
+
+						if (str.length > 0) {
+
+							let width = str.length * 16;
+							var rgb = result[i];
+
+							try {
+								console.log("1111");
+								await sendTxtPackge(rgb, h3dic[i], str);
+								console.log("222222");
+							} catch (ex) {
+								flag = false;
+								console.log("33333");
+								break;
+							}
+						}
+
+
+					}
+
+					hideLoading(these);
+					if (flag) {
+						console.log("发送成功");
+						this.showPop( {
+							message: "发送成功"
+						});
+					} else {
+						this.showPop({
+							message: "出现异常发送失败",
+							iconUrl: "/static/images/6155/DeviceDetail/uploadErr.png",
+							borderColor: "#e034344d",
+							buttonBgColor: "#E03434",
+						});
+					}
 				}
-				sendText();
-
-
 
+				setTimeout(task, 0);
 			},
+
 			ack: function() {
 
-				var these = this;
+
 				let eventChannel = this.getOpenerEventChannel();
 				eventChannel.emit('ack', {
 					data: '我已收到了您的消息,谢谢。'
@@ -851,7 +959,8 @@ import { deviceReName } from '../../api/common';
 				//给蓝牙设备发送信号更新亮度
 				setTimeout(() => {
 					this.sendBrightness();
-				}, 100);
+					this.setBleFormData();
+				}, 10);
 			},
 			sendBrightness: function() {
 				const buffer = new ArrayBuffer(6);
@@ -864,16 +973,59 @@ import { deviceReName } from '../../api/common';
 				dataView.setUint8(3, 0x00); // 数据长度
 				dataView.setUint8(4, 0x01); // 数据长度
 				dataView.setUint8(5, data); // 数据
+				let f = this.getDevice();
+				if (f) {
+					// 发送数据
 
-				// 发送数据
-                ble.LinkBlue(this.device.deviceId, () => {
-					setTimeout(() => {
-                        ble.sendData(this.device.deviceId, buffer);
-					}, 1000)
+					ble.sendData(f.deviceId, buffer, f.writeServiceId, f.wirteCharactId, 30);
 
-				});
+				}
 
+			},
+			//获取当前设备状态
+			GetDeviceStatu: function() {
+				//数据头 命令码 数据 校验码
+				//JQOC    0B    00   9C41
+
+				//硬件响应
+				//数据头 命令码 主灯模式 副灯模式 亮度(%) 电量(%) 充电状态 校验码
+				//JQOC    0B     01      01      64      85     01     9C41
+				this.sendCmd('0x0B');
+			},
+			//设备重启
+			DeviceReStart: function() {
+				//数据头 命令码 数据 校验码
+				//JQOC   0C    01  9C412
+				this.sendCmd('0x0C');
+			},
+			//恢复出厂设置
+			DeviceReSet: function() {
+				//数据头 命令码 数据 校验码
+				//JQOC   0D    01  9C412
+				this.sendCmd('0x0D');
+			},
+			sendCmd: function(type, callback) {
+				//数据头 命令码 数据 校验码
+
+				const buffer = new ArrayBuffer(7);
+				const dataView = new DataView(buffer);
+				let data = '0x' + parseInt(this.formData.liangDu).toString(16);
+				console.log("亮度:" + this.formData.liangDu + ',16进制:' + data);
+				dataView.setUint8(0, 'JQOC'); // 帧头
+				dataView.setUint8(1, type); // 帧类型：亮度调节
+				dataView.setUint8(2, '0x01'); // 包序号				
+				dataView.setUint8(3, '9C41'); // 数据长度				
+				let f = this.getDevice();
+				if (f) {
+					// 发送数据
+
+					ble.sendData(f.deviceId, buffer, f.writeServiceId, f.wirteCharactId, 30);
+
+
+				}
 			}
+
+
 		}
 	}
 </script>
@@ -1002,14 +1154,14 @@ import { deviceReName } from '../../api/common';
 
 	.eq .bigTxt {
 		color: rgba(255, 255, 255, 0.87);
-		font-family: PingFang SC;
+		font-family: "PingFang SC";
 		font-size: 28rpx;
 		font-weight: 400;
 	}
 
 	.eq .smallTxt {
 		color: rgba(255, 255, 255, 0.6);
-		font-family: PingFang SC;
+		font-family: "PingFang SC";
 		font-size: 24rpx;
 		font-weight: 400;
 	}
@@ -1038,7 +1190,7 @@ import { deviceReName } from '../../api/common';
 
 	.eqinfo .lbl {
 		color: rgba(255, 255, 255, 0.87);
-		font-family: PingFang SC;
+		font-family: "PingFang SC";
 		font-size: 28rpx;
 		font-weight: 400;
 
@@ -1048,7 +1200,7 @@ import { deviceReName } from '../../api/common';
 
 	.eqinfo .value {
 		color: rgba(255, 255, 255, 0.6);
-		font-family: PingFang SC;
+		font-family: "PingFang SC";
 		font-size: 28rpx;
 		font-weight: 400;
 
@@ -1118,7 +1270,7 @@ import { deviceReName } from '../../api/common';
 
 	.mode .bigTxt {
 		color: rgba(255, 255, 255, 0.87);
-		font-family: PingFang SC;
+		font-family: "PingFang SC";
 		font-size: 28rpx;
 		font-weight: 400;
 
@@ -1128,7 +1280,7 @@ import { deviceReName } from '../../api/common';
 
 	.mode .smallTxt {
 		color: rgba(255, 255, 255, 0.6);
-		font-family: PingFang SC;
+		font-family: "PingFang SC";
 		font-size: 24rpx;
 		font-weight: 400;
 
@@ -1146,7 +1298,7 @@ import { deviceReName } from '../../api/common';
 
 	.usrtitle {
 		color: rgba(255, 255, 255, 0.87);
-		font-family: PingFang SC;
+		font-family: "PingFang SC";
 		font-size: 28rpx;
 		font-weight: 400;
 		height: 40rpx;
@@ -1156,12 +1308,12 @@ import { deviceReName } from '../../api/common';
 	}
 
 	.usrinfo .btnSend {
-		line-height: 40rpx;
+		line-height: 65rpx;
 		border-radius: 8px;
-		width: 82rpx;
-		height: 40rpx;
+		width: 120rpx;
+		height: 65rpx;
 		color: rgba(35, 35, 35, 0.87);
-		font-family: PingFang SC;
+		font-family: "PingFang SC";
 		font-size: 20rpx;
 		font-weight: 400;
 		letter-spacing: 0.07px;
@@ -1194,7 +1346,7 @@ import { deviceReName } from '../../api/common';
 		text-align: right;
 
 		color: rgba(255, 255, 255, 0.87);
-		font-family: PingFang SC;
+		font-family: "PingFang SC";
 		font-size: 28rpx;
 		font-weight: 400;
 
@@ -1212,7 +1364,7 @@ import { deviceReName } from '../../api/common';
 
 	.usrinfo .value .uni-input-input {
 		color: rgba(255, 255, 255, 0.87);
-		font-family: PingFang SC;
+		font-family: "PingFang SC";
 		font-size: 28rpx;
 		font-weight: 400;
 
@@ -1223,7 +1375,7 @@ import { deviceReName } from '../../api/common';
 
 	.usrplace {
 		color: rgba(255, 255, 255, 0.4);
-		font-family: PingFang SC;
+		font-family: "PingFang SC";
 		font-size: 28rpx;
 		font-weight: 400;
 		letter-spacing: 0.07px;
@@ -1263,7 +1415,7 @@ import { deviceReName } from '../../api/common';
 
 	.proinfo .item .txt {
 		color: rgba(255, 255, 255, 0.6);
-		font-family: PingFang SC;
+		font-family: "PingFang SC";
 		font-size: 24rpx;
 		font-weight: 400;
 		margin-top: 20rpx;
@@ -1277,36 +1429,6 @@ import { deviceReName } from '../../api/common';
 	}
 
 
-	/* .custom-slider .uni-slider-handle-wrapper {
-		height: 60rpx !important;
-		border-radius: 3px;
-	}
-
-	
-	.custom-slider .uni-slider-active {
-		background-color: #FF6B6B !important;
-	}
-
-	
-	.custom-slider .uni-slider-handle {
-		width: 60rpx !important;
-		height: 60rpx !important;
-		border-radius: 16rpx !important;
-		background-color: #FFFFFFde !important;
-		margin-top: -15px !important;
-		border: none !important;
-
-	}
-
-	.custom-slider .uni-slider-thumb {
-		width: 60rpx !important;
-		height: 60rpx !important;
-		border-radius: 16rpx !important;
-		background-color: #00000000 !important;
-
-		border: none !important;
-	} */
-
 	.addIco {
 		width: 100%;
 		height: 360rpx;
@@ -1331,4 +1453,11 @@ import { deviceReName } from '../../api/common';
 		width: 70rpx;
 		height: 70rpx;
 	}
+
+	.TextToHex {
+		position: fixed;
+		top: -99999rpx;
+		left: -99999rpx;
+		visibility: hidden;
+	}
 </style>
\ No newline at end of file
diff --git a/pages/650/HBY650.vue b/pages/650/HBY650.vue
new file mode 100644
index 0000000..f9963ee
--- /dev/null
+++ b/pages/650/HBY650.vue
@@ -0,0 +1,1841 @@
+<template>
+	<view class="content contentBg">
+		<view class="eq">
+			<view class="leftImg">
+				<image class="img" :src="formData.img" mode="aspectFit"></image>
+			</view>
+			<view class="rightTxt">
+				<view class="row">
+					<image class="img" src="/static/images/6155/DeviceDetail/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/6155/DeviceDetail/time.png" mode="aspectFit"></image>
+					<view class="txt">
+						<view class="bigTxt">{{formData.xuhang}}</view>
+						<view class="smallTxt">续航时间</view>
+					</view>
+				</view>
+			</view>
+		</view>
+		<view class="eqinfo">
+			<view class="item">
+				<text class="lbl">蓝牙名称</text>
+				<text class="value">{{formData.blename}}</text>
+			</view>
+			<view class="item">
+				<text class="lbl">设备名称</text>
+				<text class="value">{{formData.deviceName}}</text>
+			</view>
+			<view class="item">
+				<text class="lbl">预警级别</text>
+				<text class="value">{{formData.warnLevel}}</text>
+			</view>
+		</view>
+
+		<view class="warnnig" v-bind:class="formData.iswarn?'':'displayNone'">
+			<view>警告!环境存在漏电电源！</view>
+			<view class="netContent">
+				<view v-bind:class="getWarnStyle(1)" class="net netone"></view>
+				<view v-bind:class="getWarnStyle(2)" class="net nettwo"></view>
+				<view v-bind:class="getWarnStyle(3)" class="net netsiri"></view>
+				<view v-bind:class="getWarnStyle(4)" class="net netfour"></view>
+				<view v-bind:class="getWarnStyle(5)" class="net netfive"></view>
+			</view>
+		</view>
+
+		<view class="modeSetting">
+			<view class="item" :class="formData.modeCurr=='low'?'active':''"
+				@click="MainModeSetting('low','staticBattery')">
+				<view class="p100 center">低档</view>
+			</view>
+			<view class="item " :class="formData.modeCurr=='center'?'active':''"
+				@click="MainModeSetting('center','staticBattery')">
+				<view class="p100 center">中档</view>
+			</view>
+			<view class="item " :class="formData.modeCurr=='hight'?'active':''"
+				@click="MainModeSetting('hight','staticBattery')">
+				<view class="p100 center">高档</view>
+			</view>
+			<view class="item " :class="formData.modeCurr=='close'?'active':''"
+				@click="MainModeSetting('close','staticBattery')">
+				<view class="p100 center">关闭</view>
+			</view>
+		</view>
+		<view class="lampMode">
+			<view class="mode fleft" :class="formData.cMode?'active':''" v-on:click.stop="LampToggle()">
+				<view class="leftImg">
+					<image class="img" src="/static/images/6155/DeviceDetail/mainLamp.png" mode="aspectFit"></image>
+				</view>
+				<view class="rightTxt">
+					<text class="bigTxt">照明模式</text>
+
+				</view>
+			</view>
+
+			<view class="mode marginLeft fleft" :class="formData.cMode=='mode'?'':'active'"
+				v-on:click.stop="ShowUpload()">
+				<view class="leftImg">
+					<image class="img" src="/static/images/6155/DeviceDetail/open.png" mode="aspectFit"></image>
+				</view>
+				<view class="rightTxt">
+					<text class="bigTxt">开机画面</text>
+					<text class="smallTxt">上传</text>
+				</view>
+			</view>
+			<view class="clear"></view>
+		</view>
+		<view class="usrinfo">
+			<view @click="Status.usrToggle=!Status.usrToggle">
+				<text class="usrtitle fleft">人员信息登记</text>
+				<view class="image fright" :style="{transform:Status.usrToggle?'rotate(0deg)':'rotate(180deg)' }">
+
+					<image class="img" src="/static/images/6155/DeviceDetail/slideToggle.png" mode="aspectFit"></image>
+
+				</view>
+				<view class="clear"></view>
+			</view>
+			<view :class="Status.usrToggle?'':'displayNone'">
+				<view style="margin: 20rpx 0rpx;">
+
+					<view class="btnSend fright" v-on:click.stop="sendUsr(null)">发送</view>
+					<view class="clear"></view>
+				</view>
+				<view class="item">
+					<text class="lbl">单位：</text>
+					<input class="value" v-model="formData.company" placeholder="请输入单位" placeholder-class="usrplace" />
+				</view>
+				<view class="item">
+					<text class="lbl">姓名：</text>
+					<input class="value" v-model="formData.name" placeholder="请输入姓名" placeholder-class="usrplace" />
+				</view>
+				<view class="item">
+					<text class="lbl">职位：</text>
+					<input class="value" v-model="formData.job" placeholder="请输入职位" placeholder-class="usrplace" />
+				</view>
+				<view class="item">
+					<text class="lbl">ID号：</text>
+					<input class="value" v-model="formData.id" placeholder="请输入ID" placeholder-class="usrplace" />
+				</view>
+			</view>
+		</view>
+		<view class="proinfo lamp">
+			<text class="title">产品信息</text>
+			<view class="itemcontent">
+				<view class="item" @click="proParam()">
+					<image class="img" src="/static/images/6155/DeviceDetail/param.png" mode="aspectFit"></image>
+					<text class="txt">产品参数</text>
+				</view>
+				<view class="item" @click="handRemark()">
+					<image class="img" src="/static/images/6155/DeviceDetail/remark.png" mode="aspectFit"></image>
+					<text class="txt">操作说明</text>
+				</view>
+				<view class="item" @click="handVideo()">
+					<image class="img" src="/static/images/6155/DeviceDetail/video.png" mode="aspectFit"></image>
+					<text class="txt">操作视频</text>
+				</view>
+			</view>
+		</view>
+
+		<!-- 弹窗通知 -->
+		<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" />
+
+		<!-- 下方菜单 -->
+		<BottomSlideMenuPlus :config="Status.BottomMenu" @close="closeMenu" @itemClick="handleItemClick"
+			@btnClick="btnClick">
+			<view>
+				<view class="addIco">
+					<view class="icoContent center" v-on:click.stop="checkImgUpload()">
+						<image mode="aspectFit" class="img" src="/static/images/6155/DeviceDetail/add.png"></image>
+					</view>
+				</view>
+			</view>
+		</BottomSlideMenuPlus>
+
+		<global-loading ref="loading" />
+	</view>
+</template>
+
+<script>
+	import gbk from '@/utils/gbk.js'
+	import BleTool from '@/utils/BleHelper.js'
+	import BleReceive from '@/utils/BleReceive';
+	import {
+		showLoading,
+		hideLoading,
+		updateLoading
+	} from '@/utils/loading.js'
+	const pagePath = "pages/650/HBY650";
+	var ble = null;
+	var these = null;
+	var recei = null;
+	export default {
+		data() {
+			return {
+				Status: {
+
+					Pop: {
+						showPop: false, //是否显示弹窗
+						popType: 'custom',
+						bgColor: '#383934bd',
+						borderColor: '#BBE600',
+						textColor: '#ffffffde',
+						buttonBgColor: '#BBE600',
+						buttonTextColor: '#232323DE',
+						iconUrl: '',
+						message: '您确定要这样做吗？',
+						buttonText: '确定',
+						clickEvt: '',
+						visiblePrompt: false,
+						promptTitle: '设备名称',
+						modelValue: '',
+						visibleClose: false
+					},
+					BottomMenu: {
+						show: false,
+						showHeader: true,
+						menuItems: [{
+								text: '强光',
+								icon: '/static/images/6155/DeviceDetail/qiang.png'
+							},
+							{
+								text: '弱光',
+								icon: '/static/images/6155/DeviceDetail/ruo.png'
+							},
+							{
+								text: '爆闪',
+								icon: '/static/images/6155/DeviceDetail/shan.png'
+							}
+						],
+						activeIndex: -1,
+						bgColor: '#2a2a2a',
+						itemBgColor: '#3a3a3a',
+						textColor: '#ffffffde',
+						textAlign: 'flex-start',
+						title: '主灯模式',
+						showDivider: false,
+						dividerColor: '#00000000',
+						dividerThickness: '0rpx',
+						dividerMargin: '10rpx',
+						itemHeight: '80rpx',
+						type: '',
+						showBtn: true,
+						btnBgColor: "#bbe600",
+						btnText: "确定",
+						btnTextColor: "#232323de",
+						showMask: true,
+						maskBgColor: '#00000066',
+						showClose: false
+					},
+					usrToggle: true,
+				},
+				formData: {
+					img: '/static/images/6155/DeviceDetail/equip.png',
+					battary: '',
+					xuhang: '',
+					blename: '',
+					deviceId: '',
+					deviceName: '',
+					RSSI: '',
+					statu: '',
+					liangDu: '',
+					warnLevel: '',
+					macAddress: '',
+					cMode: false,
+					modeCurr: 'low',
+
+					company: '黄石消防支队',
+					name: '菜英俊',
+					job: '小队长',
+					id: 'HSXF01061',
+					iswarn: false
+				},
+				rgb565Data: [],
+				videoHexArray: []
+			}
+		},
+
+		onUnload() {
+			console.log("页面卸载,释放资源");
+			ble.removeReceiveCallback(pagePath);
+		},
+		onLoad: function() {
+			these = this;
+			recei = BleReceive.getBleReceive();
+			ble = BleTool.getBleTool();
+			ble.addReceiveCallback(these.bleValueNotify);
+			let eventChannel = this.getOpenerEventChannel();
+
+			eventChannel.on('detailData', function(data) {
+
+				console.log("收到父页面的参数：" + JSON.stringify(data));
+				var device = data.data;
+
+				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.showPop({
+						message: "蓝牙未连接过该设备,请使用蓝牙重新添加该设备",
+						iconUrl: "/static/images/6155/DeviceDetail/uploadErr.png",
+						borderColor: "#e034344d",
+						buttonBgColor: "#E03434",
+					});
+					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];
+					}
+				}
+				these.formData.blename = f.name ? f.name : "Unname";
+				these.formData.deviceName = device.deviceName;
+				these.formData.img = device.devicePic;
+				these.formData.id = device.id;
+				these.formData.deviceId = f.deviceId;
+				ble.LinkBlue(f.deviceId, f.writeServiceId, f.wirteCharactId, f.notifyCharactId);
+				these.setBleFormData();
+
+
+
+			});
+
+		},
+		onHide: function() {
+
+		},
+		onBackPress(e) {
+			ble.removeReceiveCallback(pagePath);
+		},
+		computed: {
+			RSSIRemark: function() {
+				let remark = '极弱';
+				if (this.formData.RSSI <= 0 && this.formData.RSSI >= -30) {
+					remark = '强';
+				}
+
+				if (this.formData.RSSI < -30 && this.formData.RSSI >= -60) {
+					remark = '一般';
+				}
+				if (this.formData.RSSI < -60 && this.formData.RSSI >= -85) {
+					remark = '弱';
+				}
+				if (this.formData.RSSI < -85 && this.formData.RSSI >= -100) {
+					remark = '微弱';
+				}
+			}
+		},
+		methods: {
+			getWarnStyle(index) {
+				let className = "";
+				switch (this.formData.warnLevel) {
+					case "无预警":
+						break;
+					case "弱预警":
+						if (index <= 1) {
+							className = "active";
+						}
+						break;
+					case "中预警":
+						if (index <= 3) {
+							className = "active";
+						}
+						break;
+					case "强预警":
+						if (index <= 4) {
+							className = "active";
+						}
+						break;
+					case "非常强预警":
+						if (index <= 5) {
+							className = "active";
+						}
+						break;
+				}
+
+				return className;
+			},
+			bleValueNotify: function(receive, device, path) { //订阅消息
+
+				let data = recei.ReceiveData(receive, device, pagePath);
+console.log("收到设备的数据",data)
+				if (data) {
+					if ("staBlue_picture" in data) {
+						//重发图片
+						console.log("收到重新发送图片的命令");
+						this.checkImgUpload('img', data.staBlue_picture);
+						return;
+					} else if ("staBlue_text" in data) {
+						//重发文本
+						console.log("收到重新发送文本的命令");
+						this.sendUsr(data.staBlue_text);
+						return;
+					} else if ("staBlue_vidio" in data) {
+						//重发视频
+						console.log("收到重新发送视频的命令");
+						this.checkImgUpload('video', data.staBlue_vidio);
+						return;
+					} else if ("staBlue" in data) {
+						if (data.staBlue == "finish") {
+							console.log("收到设备回复,全部传输完成");
+						}
+						return;
+					}
+
+					let keys = Object.keys(data);
+					for (var i = 0; i < keys.length; i++) {
+						let key = keys[i];
+						if(key in these.formData){
+							these.formData[key] = data[key];	
+						}
+						
+					}
+
+					if (these.formData.iswarn) {
+						these.showPop({
+							message: "环境存在漏电电源",
+							iconUrl: "/static/images/6155/DeviceDetail/warnning.png",
+							borderColor: "#e034344d",
+							buttonBgColor: "#E03434",
+						});
+					}
+
+					these.setBleFormData();
+				}
+
+
+				// // 转换为字节数组
+				// const bytes = receive.bytes;
+				// parseData(bytes);
+
+
+
+			},
+			getDevice: function() {
+
+				// console.log("LinkedList=", ble.data.LinkedList);
+				// console.log("formData=", these.formData);
+				let f = ble.data.LinkedList.find((v) => {
+					return v.deviceId == these.formData.deviceId;
+				});
+
+				return f;
+			},
+			setBleFormData() {
+				ble.data.LinkedList.find((v) => {
+					if (v.deviceId == these.formData.deviceId) {
+						v.formData = these.formData;
+
+						return true;
+					}
+					return false;
+				});
+
+				uni.setStorageSync(ble.StorageKey, ble.data.LinkedList);
+			},
+			MainModeSetting: function(type, byteType) {
+				if (this.formData.modeCurr == type) {
+					return;
+				}
+				showLoading(this, {
+					text: "请稍候..."
+				});
+				let task = () => {
+					this.formData.modeCurr = type;
+					let dataValue = 0x00;
+					let btype = 0x00;
+					switch (type) {
+						case "low": //低档
+							dataValue = 0x67;
+							break;
+						case "center": //中档
+							dataValue = 0x66;
+							break;
+						case "hight": //高档
+							dataValue = 0x65;
+							break;
+						case "close": //关闭
+							dataValue = 0x68;
+							break;
+						case true: //开灯
+							dataValue = 0x6E;
+							break;
+						case false: //关灯 
+							dataValue = 0x6F;
+							break;
+						default: //未知
+							dataValue = 0x00;
+							break;
+					}
+					switch (byteType) {
+						case "staticBattery":
+							btype = 0x00;
+							break;
+						case "lamp":
+							btype = 0x01;
+							break;
+						default:
+							break;
+					}
+
+					let buffer = new ArrayBuffer(6);
+					let dataView = new DataView(buffer);
+
+					dataView.setUint8(0, 0x55); // 帧头
+					dataView.setUint8(1, btype); // 帧类型
+					dataView.setUint8(2, 0x01); // 包序号
+					dataView.setUint8(3, 0x00); // 数据长度
+					dataView.setUint8(4, 0x01); // 数据长度
+					dataView.setUint8(5, dataValue); // 数据
+
+
+
+					let f = this.getDevice();
+
+					if (f) {
+						// 发送数据		
+
+						ble.sendData(f.deviceId, buffer, f.writeServiceId, f.wirteCharactId, 10).then(() => {
+
+
+							console.log("发送成功了");
+						}).catch((ex) => {
+
+							these.showPop({
+								message: ex.msg,
+								iconUrl: "/static/images/6155/DeviceDetail/uploadErr.png",
+								borderColor: "#e034344d",
+								buttonBgColor: "#E03434",
+							});
+
+						}).finally(() => {
+
+							hideLoading(these);
+
+							these.setBleFormData();
+						});
+					} else {
+						these.showPop({
+							message: "蓝牙未连接过该设备,请使用蓝牙重新添加该设备",
+							iconUrl: "/static/images/6155/DeviceDetail/uploadErr.png",
+							borderColor: "#e034344d",
+							buttonBgColor: "#E03434",
+						});
+						hideLoading(these);
+					}
+				}
+
+				setTimeout(task, 0);
+
+
+			},
+			LampToggle: function() {
+
+				this.formData.cMode = !this.formData.cMode;
+				this.MainModeSetting(this.formData.cMode, "lamp");
+			},
+			proParam: function() {
+
+				uni.navigateTo({
+					url: '/pages/common/productDes/index?id=' + this.formData.id,
+					success(ev) {
+
+					}
+				});
+			},
+			handRemark: function() {
+				uni.navigateTo({
+					url: '/pages/common/operatingInstruct/index?id=' + this.formData.id,
+					success(ev) {
+
+					}
+				});
+			},
+			handVideo: function() {
+				uni.navigateTo({
+					url: '/pages/common/operationVideo/index?id=' + this.formData.id,
+					success(ev) {
+
+					}
+				});
+			},
+			checkImgUpload: function(type, index) {
+				console.log("123213213213");
+				let f = these.getDevice();
+				// 分包发送图片数据
+				var sendImagePackets = function(ReSendNo) {
+
+					return new Promise((resolve, reject) => {
+
+						// 总数据包数
+						let totalPackets = 52;
+						let currentPacket = 1;
+
+						if (ReSendNo) {
+							totalPackets = ReSendNo;
+							currentPacket = ReSendNo;
+						}
+
+						if (f) {
+							// 发送单个数据包
+							const sendNextPacket = () => {
+								if (currentPacket > totalPackets) {
+									hideLoading(these);
+									these.Status.BottomMenu.show = false;
+									these.showPop({
+										showPop: true,
+										message: "上传成功",
+										iconUrl: "/static/images/6155/DeviceDetail/uploadSuccess.png",
+									});
+									if (!ReSendNo) {
+										setTimeout(()=>{
+											these.HoldYouHand("transmit complete", 0, f.deviceId, f
+												.writeServiceId, f.wirteCharactId);
+										},500);
+										
+									}
+
+									resolve();
+									return;
+								}
+
+								// 计算当前包的数据
+								let packetSize = 250;
+								// if (currentPacket <= 51) {
+								// 	packetSize = 250; // 前51个包每个500字节
+								// } else {
+								// 	packetSize = 50; // 最后一个包100字节
+								// }
+
+								// 创建数据包
+								const startIndex = (currentPacket - 1) * packetSize;
+								const endIndex = Math.min(startIndex + packetSize, these.rgb565Data
+									.length);
+								if (startIndex > endIndex) {
+									return;
+								}
+								const packetData = these.rgb565Data.slice(startIndex,
+									endIndex);
+								// 构建数据包
+								const bufferSize =505;// 5 + packetData.length * 2; // 头部5字节 + 数据部分
+								const buffer = new ArrayBuffer(bufferSize);
+								const dataView = new DataView(buffer);
+
+								// 填充头部
+								dataView.setUint8(0, 0x55); // 帧头
+								dataView.setUint8(1, 0x02); // 帧类型：开机画面
+								dataView.setUint8(2, '0x' + currentPacket.toString(16).padStart(2,
+									'0')); // 包序号
+
+
+								if (packetData.length == 250) {
+									dataView.setUint8(3, 0x01);
+									dataView.setUint8(4, 0xF4);
+								} else {
+									dataView.setUint8(3, 0x00);
+									dataView.setUint8(4, 0x64);
+								}
+
+								// 填充数据（每个RGB565值占2字节）
+								for (let i = 0; i < packetData.length; i++) {
+									dataView.setUint16(5 + i * 2, packetData[i], false); // 大端字节序
+								}
+
+								if (currentPacket > 51) { //第52包补FF
+									for (var i = 105; i < bufferSize; i++) {
+										dataView.setUint8(i, 0xFF);
+									}
+								}
+
+
+
+								//发送数据包
+								ble.sendData(f.deviceId, buffer, f.writeServiceId, f.wirteCharactId,
+										10)
+									.then(() => {
+
+
+										updateLoading(these, {
+											text: "正在发送:" + currentPacket + "/" +
+												totalPackets
+										})
+										currentPacket++;
+
+										setTimeout(sendNextPacket, 0);
+									}).catch(err => {
+										console.log("发送数据包失败了" + JSON.stringify(err));
+										if (err.code == '10007') {
+											setTimeout(sendNextPacket, 0);
+											return;
+										}
+										these.Status.BottomMenu.show = false;
+
+
+
+										these.showPop({
+											message: err.msg,
+											iconUrl: "/static/images/6155/DeviceDetail/uploadErr.png",
+											borderColor: "#e034344d",
+											buttonBgColor: "#E03434",
+										});
+										hideLoading(these);
+										reject(err);
+									});
+							}
+
+							if (ReSendNo) {
+								sendNextPacket(ReSendNo);
+								return;
+							}
+							// 开始牵手
+							these.HoldYouHand("picture transmit start", 120, f.deviceId, f.writeServiceId,
+								f.wirteCharactId).then(() => {
+								sendNextPacket();
+							}).catch((err) => {
+								console.log("握手没有成功");
+								these.showPop({
+									message: err.msg,
+									iconUrl: "/static/images/6155/DeviceDetail/uploadErr.png",
+									borderColor: "#e034344d",
+									buttonBgColor: "#E03434",
+								});
+								hideLoading(these);
+								reject(err);
+							});
+						}
+					});
+				}
+				//去图片裁剪
+				var gotoCutImg = (imgPath) => {
+
+					uni.navigateTo({
+						url: "/pages/6155/ImgCrop",
+						events: {
+							ImgCutOver: function(data) {
+								// console.log("我收到裁剪后的图片了，感谢老铁," + data)
+								showLoading(these, {
+									text: "正在发送..."
+								});
+
+								these.Status.BottomMenu.show = false;
+								these.rgb565Data = ble.convertToRGB565(data.piexls);
+								setTimeout(function() {
+									sendImagePackets().catch(() => {
+
+									});
+								}, 0)
+
+							}
+						},
+						success(ev) {
+							ev.eventChannel.emit('checkImg', {
+								data: imgPath
+							});
+							these.Status.BottomMenu.show = false;
+						}
+					});
+				}
+
+
+				let sendVideoPackets = (ReSendNo) => {
+					console.log("开始发送分片数据");
+					return new Promise((resolve, reject) => {
+						if (f) {
+							// 总数据包数
+							var totalPackets = 1536;
+
+							let currentPacket = 1;
+							console.log("发送数据准备中,总共" + totalPackets);
+							if (ReSendNo) {
+								totalPackets = ReSendNo;
+								currentPacket = ReSendNo;
+							}
+							this.totalPackets = totalPackets;
+							// 发送单个数据包
+							const sendNextVideoPacket = () => {
+								 console.log("准备发送一段数据");
+								if (currentPacket > totalPackets) {
+									if (!ReSendNo) {
+										setTimeout(()=>{
+											these.HoldYouHand("transmit complete", 0, f.deviceId, f
+												.writeServiceId, f.wirteCharactId).then(()=>{
+													console.log("全部发送完毕")
+												}).catch((ex)=>{
+													console.log("出现异常",ex);
+												});
+										},500);
+										
+									}
+									these.Status.BottomMenu.show = false;
+									hideLoading(these);
+									these.showPop({
+										showPop: true,
+										message: "上传成功",
+										iconUrl: "/static/images/6155/DeviceDetail/uploadSuccess.png"
+									});
+
+
+									
+
+									resolve();
+
+									return;
+								}
+
+								// 计算当前包的数据
+								let packetSize = 500;
+
+
+								// 创建数据包
+								const startIndex = (currentPacket - 1) * packetSize;
+								const endIndex = Math.min(startIndex + packetSize, these.videoHexArray
+									.length);
+								if (startIndex > endIndex) {
+									resolve();
+									return;
+								}
+								////console.log("111111");
+								const packetData = these.videoHexArray.slice(startIndex, endIndex);
+
+								// 构建数据包
+								////console.log("packetData.length"+packetData.length);
+								const bufferSize = 506; // 头部5字节 + 数据部分
+								const buffer = new ArrayBuffer(bufferSize);
+								const dataView = new DataView(buffer);
+
+								let sortNo = currentPacket.toString(16).padStart(4, '0');
+
+								// 填充头部
+								dataView.setUint8(0, 0x55); // 帧头
+								dataView.setUint8(1, 0x04); // 帧类型：开机画面
+								dataView.setUint8(2, '0x' + sortNo.substring(0, 2)); // 包序号
+								dataView.setUint8(3, '0x' + sortNo.substring(2, 4)); // 包序号
+
+								dataView.setUint8(4, 0x01);
+								dataView.setUint8(5, 0xF4);
+
+								for (let i = 0; i < packetData.length; i++) {
+									dataView.setUint8(6 + i, '0x' + packetData[i]);
+								}
+
+								let inteval = 50;
+								 console.log("开始发送一段视频"); //
+								ble.sendData(f.deviceId, buffer, f.writeServiceId, f
+									.wirteCharactId, 10).then(() => {
+									
+									updateLoading(these, {
+										text: "正在发送:" + currentPacket + "/" +
+											totalPackets
+									})
+
+									currentPacket++;
+
+									console.log("发送一段成功,发送下一段");
+									setTimeout(sendNextVideoPacket, inteval);
+								}).catch(err => {
+									console.log("发送失败了");
+									if (err.code == '10007') { //遇到这个错误自动重新发送
+										console.log(err.errMsg + ",发送失败了,正在补偿：" +
+											currentPacket);
+										setTimeout(sendNextVideoPacket, inteval);
+									} else {
+										these.Status.BottomMenu.show = false;
+										hideLoading(these);
+
+										these.showPop({
+											showPop: true,
+											message: err.msg + ",发送失败了",
+											borderColor: "#e034344d",
+											buttonBgColor: "#E03434",
+											buttonText: "确定",
+											iconUrl: "/static/images/6155/DeviceDetail/uploadErr.png"
+										});
+										reject(err);
+										return;
+									}
+
+								});
+							};
+
+
+							sendNextVideoPacket();
+
+
+						} else {
+							console.log("Fail.......")
+						}
+					});
+				}
+
+				var sendVideo = (videoPath) => {
+					let uploadVideo = () => {
+
+						if (these.videoHexArray.length > 0) {
+							console.log("开始处理,无需上传");
+							shotVideoClick(these.videoHexArray);
+							return;
+
+						}
+						console.log("开始处理,正在上传");
+
+						showLoading(these, {
+							text: "上传中"
+						});
+						let p1 = these.HoldYouHand("video transmit start", 2200, f.deviceId, f.writeServiceId,
+							f.wirteCharactId);
+						let p2 = new Promise((succ, err) => {
+							uni.uploadFile({
+								url: 'http://114.55.111.217/video/upload',
+								filePath: videoPath,
+								name: 'file',
+								header: {
+									"Method": "POST",
+									"Content-Type": "multipart/form-data"
+								},
+								timeout: 600000,
+								fail: (ex) => {
+									console.log("上传视频失败" + JSON.stringify(ex));
+
+									err(ex);
+								},
+								success: (res) => {
+
+									console.log("上传完成，向蓝牙设备发送");
+									succ(res);
+								}
+
+							});
+						});
+
+						Promise.all([p1, p2]).then((arr) => {
+
+							let res = arr[1];
+							res = JSON.parse(res.data);
+							if (res.data) {
+								these.videoHexArray = res.data;
+								updateLoading(these, {
+									text: "正在发送:0/1536"
+								});
+
+								these.Status.BottomMenu.show = false;
+
+								shotVideoClick(res.data);
+
+
+							} else {
+								console.log("服务器未返回正确的数据");
+
+
+								these.showPop({
+									message: "与服务器连接出现异常,请检查网络设置",
+									iconUrl: "/static/images/6155/DeviceDetail/uploadErr.png",
+									borderColor: "#e034344d",
+									buttonBgColor: "#E03434",
+								});
+							}
+
+						}).catch((ex) => {
+
+							hideLoading(these);
+							these.showPop({
+								message: "出现异常," + ex.msg,
+								iconUrl: "/static/images/6155/DeviceDetail/uploadErr.png",
+								borderColor: "#e034344d",
+								buttonBgColor: "#E03434",
+							});
+						})
+					}
+					let f = these.getDevice();
+
+
+
+
+					let shotVideoClick = () => {
+						console.log("正在开始发送");
+						sendVideoPackets().then(() => {
+							console.log("发送完成");
+
+						}).catch((ex1) => {
+							//console.log("出现了异常", ex1)
+						}).finally(() => {
+							hideLoading(these);
+						});
+					}
+
+
+					uploadVideo();
+
+				}
+
+				if (type) {
+					if (type == 'img') {
+						sendImagePackets(index);
+					} else if (type == 'video') {
+						sendVideoPackets(index);
+					}
+					return;
+				}
+				uni.chooseMedia({
+					count: 1,
+					mediaType: ['image', 'video'],
+					sourceType: ['album'],
+					maxDuration: 3,
+					sizeType: ['original'],
+					success: (res) => {
+
+						let file = res.tempFiles[0];
+
+						if (file.fileType == 'image') {
+							gotoCutImg(file.tempFilePath);
+							return;
+						}
+
+						if (file.fileType == 'video') {
+							if (file.duration < 2) {
+								this.alert('提示', "请选择2S及以上的视频");
+								return;
+							}
+
+							these.videoHexArray = [];
+							sendVideo(file.tempFilePath);
+							return;
+						}
+					}
+				});
+
+
+			},
+			ShowUpload: function() {
+				//上传开机画面
+				this.Status.BottomMenu.menuItems = [];
+				this.Status.BottomMenu.title = "上传开机画面";
+				this.Status.BottomMenu.type = "checkImg";
+				this.Status.BottomMenu.show = true;
+				this.formData.cMode = "img";
+			},
+
+			showMenu(flag) {
+				this.Status.BottomMenu.show = true;
+			},
+			closeMenu() {
+				this.Status.BottomMenu.show = false;
+			},
+			btnClick(item, index) {
+
+
+
+
+			},
+			setMode(mode) {
+
+
+
+
+			},
+			handleItemClick(item, index) {
+
+				switch (this.Status.BottomMenu.type) {
+					case "main":
+
+						break;
+					case "fu":
+
+						break;
+				}
+				this.Status.BottomMenu.activeIndex = index;
+
+			},
+			HidePop: function() {
+				if (this.Status.Pop.clickEvt == 'SendUsr') {
+
+				}
+
+
+				this.Status.Pop.showPop = false;
+			},
+			showPop: function(option) {
+
+				if (!option) {
+					option = {
+						a: 1
+					};
+				}
+				let keys = Object.keys(option);
+				for (var i = 0; i < keys.length; i++) {
+					let key = keys[i];
+					these.Status.Pop[key] = option[key];
+				}
+				if (!option.borderColor) {
+					option.borderColor = '#BBE600';
+					option.buttonBgColor = '#BBE600';
+				}
+				these.Status.Pop.showPop = true;
+			},
+			sendUsr: function(ReSendNo) {
+
+
+
+				var textLines = [
+					this.formData.company,
+					this.formData.name,
+					this.formData.job,
+					this.formData.id
+				];
+
+
+				let f = this.getDevice();
+				if (!f) {
+					these.showPop({
+						message: "蓝牙未连接过该设备,请使用蓝牙重新添加该设备",
+						iconUrl: "/static/images/6155/DeviceDetail/uploadErr.png",
+						borderColor: "#e034344d",
+						buttonBgColor: "#E03434",
+					});
+					return;
+				}
+				showLoading(this, {
+					text: "请稍候..."
+				});
+				var sendText = function() {
+					// 总数据包数
+					let totalPackets = textLines.length;
+					let currentPacket = 1;
+					// console.log("currentPacket=",currentPacket);
+					// console.log("ReSendNo=",ReSendNo);
+					if (ReSendNo) {
+						totalPackets = ReSendNo;
+						currentPacket = ReSendNo;
+					}
+					// console.log("currentPacket=",currentPacket);
+					// 发送单个数据包
+					const sendNextPacket = () => {
+						
+						if (currentPacket > totalPackets) {
+							if (!ReSendNo) {
+								setTimeout(()=>{
+									these.HoldYouHand("transmit complete", 0, f.deviceId, f.writeServiceId, f
+									.wirteCharactId);
+								},500);
+								
+							}
+
+							these.showPop({
+								showPop: true, //是否显示弹窗
+								popType: 'custom',
+								bgColor: '#383934bd',
+								borderColor: '#BBE600',
+								textColor: '#ffffffde',
+								buttonBgColor: '#BBE600',
+								buttonTextColor: '#232323DE',
+								iconUrl: '/static/images/6155/DeviceDetail/sendSucc.png',
+								message: '人员信息发送成功',
+								buttonText: '确定',
+								clickEvt: 'SendUsr',
+								visiblePrompt: false,
+								promptTitle: '',
+								modelValue: '',
+								visibleClose: true
+							});
+							these.setBleFormData();
+							return;
+						}
+
+						// 获取当前行文字
+						const text = textLines[currentPacket - 1] || '';
+						let arr = gbk.encode(text)
+						let gbkData = gbk.arr2hex(arr);
+
+				
+						// 构建数据包
+						const bufferSize = 5 + gbkData.length / 2; // 头部4字节 + 数据部分
+						const buffer = new ArrayBuffer(bufferSize);
+						const dataView = new DataView(buffer);
+
+						// 填充头部
+						dataView.setUint8(0, 0x55); // 帧头
+						dataView.setUint8(1, 0x03); // 帧类型：文字
+						dataView.setUint8(2, currentPacket.toString(16)); // 包序号
+						dataView.setUint16(3, (text.length * 2).toString(16)); // 数据长度
+						
+						// 填充数据				
+						let index = 0;
+						for (var i = 0; i < gbkData.length; i += 2) {
+							let value = parseInt(gbkData[i] + "" + gbkData[i + 1], 16);
+							dataView.setUint8(5 + index, value);
+							index++;
+						}
+					
+						
+						// 发送数据包
+
+
+						ble.sendData(f.deviceId, buffer, f.writeServiceId, f.wirteCharactId, 10).then(() => {
+							// 更新进度
+							console.log(
+								`发送文字数据包 ${currentPacket}/${totalPackets}: ${text}`
+							);
+
+							// 发送下一个包
+							currentPacket++;
+							setTimeout(sendNextPacket, 0);
+						}).catch(err => {
+
+							these.showPop({
+								message: "文字发送失败," + err.msg,
+								iconUrl: "/static/images/6155/DeviceDetail/uploadErr.png",
+								borderColor: "#e034344d",
+								buttonBgColor: "#E03434",
+							});
+						}).finally(() => {
+							hideLoading(these);
+						});
+
+
+
+
+
+					};
+
+					// 开始发送第一个包
+					sendNextPacket();
+				}
+
+
+				if(ReSendNo){
+					sendText(ReSendNo);
+					return;
+				}
+				setTimeout(() => {
+					these.HoldYouHand("word transmit start", 120, f.deviceId, f.writeServiceId, f
+						.wirteCharactId).then(
+						() => {
+
+							setTimeout(sendText, 200);
+						}).catch((ex) => {
+						console.log("握手没有成功", ex);
+						hideLoading(these);
+						these.showPop({
+							message: ex.msg,
+							iconUrl: "/static/images/6155/DeviceDetail/uploadErr.png",
+							borderColor: "#e034344d",
+							buttonBgColor: "#E03434",
+						});
+					});
+				}, 0);
+
+
+
+			},
+
+			HoldYouHand(str, pauseTime, deviceid, serviceid, characid) {
+				if (!pauseTime) {
+					pauseTime = 0;
+				}
+
+				var promise = new Promise((resolve, reject) => {
+					// 1. 创建 ArrayBuffer 和 DataView
+					const buffer = new ArrayBuffer(str.length);
+					const dataView = new DataView(buffer);
+
+					// 2. 将字符串转换为 ASCII 码并写入 DataView
+					for (let i = 0; i < str.length; i++) {
+						dataView.setUint8(i, str.charCodeAt(i));
+					}
+					console.log("开始握手");
+
+					ble.sendData(deviceid, buffer, serviceid, characid, 10).then(
+						() => {
+							setTimeout(() => {
+								console.log("握手成功并完成了等待");
+								resolve(true);
+							}, pauseTime);
+						}).catch(err => {
+						console.log("握手没有成功", )
+						reject(err);
+					});
+
+
+				});
+
+
+
+				return promise;
+			},
+
+			ack: function() {
+
+
+				let eventChannel = this.getOpenerEventChannel();
+				eventChannel.emit('ack', {
+					data: '我已收到了您的消息,谢谢。'
+				});
+
+			}
+		}
+	}
+</script>
+
+<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;
+		margin-bottom: 24rpx;
+	}
+
+	.eq .leftImg {
+		box-sizing: border-box;
+		padding: 36rpx;
+		border-radius: 16rpx;
+		background: rgba(42, 42, 42, 0.5);
+	}
+
+	.eq .leftImg,
+	.eq .rightTxt {
+		width: 50%;
+		height: 100%;
+	}
+
+	.eq .rightTxt {
+		display: flex;
+		flex-direction: column;
+		flex-wrap: nowrap;
+		align-content: flex-start;
+		justify-content: space-evenly;
+		align-items: flex-start;
+	}
+
+	.eq .leftImg .img {
+		width: 100%;
+		height: 100%;
+	}
+
+	.eq .rightTxt .img {
+		width: 52rpx;
+		height: 52rpx;
+	}
+
+	.eq .rightTxt .row {
+		width: 100%;
+		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;
+	}
+
+	.eq .rightTxt .row .txt {
+		padding-left: 20rpx;
+	}
+
+	.eq .bigTxt {
+		color: rgba(255, 255, 255, 0.87);
+		font-family: PingFang SC;
+		font-size: 28rpx;
+		font-weight: 400;
+	}
+
+	.eq .smallTxt {
+		color: rgba(255, 255, 255, 0.6);
+		font-family: PingFang SC;
+		font-size: 24rpx;
+		font-weight: 400;
+	}
+
+
+	.eqinfo {
+		border-radius: 16rpx;
+		background: rgba(26, 26, 26, 1);
+		box-sizing: border-box;
+		padding: 14rpx 0rpx;
+	}
+
+	.eqinfo .item {
+		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;
+	}
+
+	.eqinfo .lbl {
+		color: rgba(255, 255, 255, 0.87);
+		font-family: PingFang SC;
+		font-size: 28rpx;
+		font-weight: 400;
+
+		letter-spacing: 0.07px;
+		text-align: left;
+	}
+
+	.eqinfo .value {
+		color: rgba(255, 255, 255, 0.6);
+		font-family: PingFang SC;
+		font-size: 28rpx;
+		font-weight: 400;
+
+		letter-spacing: 0.07px;
+		text-align: left;
+	}
+
+	.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;
+
+	}
+
+	.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: flex-start;
+		padding-left: 20rpx;
+	}
+
+	.mode .bigTxt {
+		color: rgba(255, 255, 255, 0.87);
+		font-family: PingFang SC;
+		font-size: 28rpx;
+		font-weight: 400;
+
+		letter-spacing: 0.07px;
+
+	}
+
+	.mode .smallTxt {
+		color: rgba(255, 255, 255, 0.6);
+		font-family: PingFang SC;
+		font-size: 24rpx;
+		font-weight: 400;
+
+		letter-spacing: 0.07px;
+
+	}
+
+	.usrinfo {
+		border-radius: 8px;
+		width: 100%;
+		box-sizing: border-box;
+		padding: 24rpx 28rpx;
+		background: rgba(26, 26, 26, 1);
+	}
+
+	.usrtitle {
+		color: rgba(255, 255, 255, 0.87);
+		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;
+
+	}
+
+	.modeSetting .item {
+		width: 150rpx;
+		height: 150rpx;
+		background: rgba(26, 26, 26, 1);
+		border-radius: 50%;
+
+		color: rgba(255, 255, 255, 0.87);
+		margin-top: 20rpx;
+		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;
+	}
+
+	.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;
+	}
+</style>
\ No newline at end of file
diff --git a/pages/670/HBY670.vue b/pages/670/HBY670.vue
new file mode 100644
index 0000000..ea422b6
--- /dev/null
+++ b/pages/670/HBY670.vue
@@ -0,0 +1,2360 @@
+<template>
+	<view class="content contentBg">
+		<view class="eq">
+			<view class="leftImg">
+				<image class="img" :src="device['devicePic']" mode="aspectFit"></image>
+			</view>
+			<view class="rightTxt">
+				<view class="row">
+					<image class="img" src="/static/images/6155/DeviceDetail/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/6155/DeviceDetail/time.png" mode="aspectFit"></image>
+					<view class="txt">
+						<view class="bigTxt">{{formData.xuhang}}</view>
+						<view class="smallTxt">续航时间</view>
+					</view>
+				</view>
+			</view>
+		</view>
+		<view class="eqinfo">
+			<view class="item">
+				<text class="lbl">设备IMEI</text>
+				<text class="value">{{device.deviceImei}}</text>
+			</view>
+			<view class="item">
+				<text class="lbl">设备名称</text>
+				<text class="value">{{device.deviceName}}</text>
+			</view>
+			<view class="item">
+				<text class="lbl">定位信息</text>
+				<view>
+					<view>{{formData.lon}}&nbsp;&nbsp;{{formData.lat}}</view>
+					<text class="value">{{formData.address}}</text>
+				</view>
+
+			</view>
+		</view>
+
+		<view class="warnnig" v-bind:class="formData.staticWarn?'':'displayNone'">
+			<view>设备自动报警中！</view>
+			<view>{{Status.staticWarn.time}}s</view>
+		</view>
+		
+		<view class="optTitle">
+			档位
+		</view>
+		<view class="modeSetting">
+			<view class="item" :class="formData.modeCurr=='low'?'active':''"
+				@click="GearSetting('low','staticBattery')">
+				<view class="p100 center">低档</view>
+			</view>
+			<view class="item " :class="formData.modeCurr=='center'?'active':''"
+				@click="GearSetting('center','staticBattery')">
+				<view class="p100 center">中档</view>
+			</view>
+			<view class="item " :class="formData.modeCurr=='hight'?'active':''"
+				@click="GearSetting('hight','staticBattery')">
+				<view class="p100 center">高档</view>
+			</view>
+			
+		</view>
+		<view class="optTitle">
+			SOS
+		</view>
+		<view class="sosContent">
+			<view class="item" @click="sosSetting('sg')" :class="formData.SOS=='sg'?'active':''">
+				<view class="imgContent center">
+					<image class="img" :src="formData.SOS=='sg'?'/static/images/670/sgActive.png':'/static/images/670/sg.png'" mode="aspectFit"></image>
+				</view>
+				<view class="txt">声光报警</view>
+			</view>
+			<view class="item"  @click="sosSetting('rb')" :class="formData.SOS=='rb'?'active':''">
+				<view class="imgContent center">
+					<image class="img" :src="formData.SOS=='rb'?'/static/images/670/rbActive.png':'/static/images/670/rb.png'" mode="aspectFit"></image>
+				</view>
+				<view class="txt">红蓝闪烁</view>
+			</view>
+		</view>
+		<view class="optTitle">
+			照明模式
+		</view>
+		<view class="lightMode">
+			<view class="item" @click="lightSetting('qiang')" :class="formData.lightCurr=='qiang'?'active':''">
+				<view class="imgContent center">
+					<image class="img" :src="formData.lightCurr=='qiang'?'/static/images/670/qiangActive.png':'/static/images/670/qiang.png'" mode="aspectFit"></image>
+				</view>
+				<view class="txt">强光</view>
+			</view>
+			<view class="item"  @click="lightSetting('ruo')" :class="formData.lightCurr=='ruo'?'active':''">
+				<view class="imgContent center">
+					<image class="img" :src="formData.lightCurr=='ruo'?'/static/images/670/ruoActive.png':'/static/images/670/ruo.png'" mode="aspectFit"></image>
+				</view>
+				<view class="txt">弱光</view>
+			</view>
+			<view class="item"  @click="lightSetting('close')" :class="formData.lightCurr=='close'?'active':''">
+				<view class="imgContent center">
+					<image class="img" :src="formData.lightCurr=='close'?'/static/images/670/jieNActive.png':'/static/images/670/jieN.png'" mode="aspectFit"></image>
+				</view>
+				<view class="txt">关闭</view>
+			</view>
+		</view>
+
+		
+		<view class="usrinfo">
+			<view @click="Status.usrToggle=!Status.usrToggle">
+				<text class="usrtitle fleft">人员信息登记</text>
+				<view class="image fright" :style="{transform:Status.usrToggle?'rotate(0deg)':'rotate(180deg)' }">
+
+					<image class="img" src="/static/images/6155/DeviceDetail/slideToggle.png" mode="aspectFit"></image>
+
+				</view>
+				<view class="clear"></view>
+			</view>
+			<view :class="Status.usrToggle?'':'displayNone'">
+				<view style="margin: 20rpx 0rpx;">
+
+					<view class="btnSend fright" v-on:click.stop="sendUsr(null)">发送</view>
+					<view class="clear"></view>
+				</view>
+				<view class="item">
+					<text class="lbl">单位：</text>
+					<input class="value" v-model="formData.company" placeholder="请输入单位" placeholder-class="usrplace" />
+				</view>
+				<view class="item">
+					<text class="lbl">姓名：</text>
+					<input class="value" v-model="formData.usrname" placeholder="请输入姓名" placeholder-class="usrplace" />
+				</view>
+				<view class="item">
+					<text class="lbl">职位：</text>
+					<input class="value" v-model="formData.job" placeholder="请输入职位" placeholder-class="usrplace" />
+				</view>
+				<view class="item">
+					<text class="lbl">ID号：</text>
+					<input class="value" v-model="formData.usrid" placeholder="请输入ID" placeholder-class="usrplace" />
+				</view>
+			</view>
+		</view>
+		
+		<view class="usrinfo">
+			<view >
+				<text class="usrtitle fleft">发送信息</text>
+					<view class="btnSend fright" v-on:click.stop="sendUrgent(null)">发送</view>
+				<view class="clear"></view>
+			</view>
+			<view >
+			
+				<view class="item">				
+					<input class="value" style="text-indent: 20rpx;" v-model="formData.msgTxt" placeholder="请输入文字" placeholder-class="usrplace" />
+				</view>
+				
+			</view>
+		</view>
+		
+		<view class="usrinfo picVideo">
+			<view >
+				<text class="usrtitle fleft">开机画面</text>
+					
+				<view class="clear"></view>
+			</view>
+			<view v-on:click.stop="ShowUpload()" class="btnImg center">
+			
+				<image class="img" src="/static/images/6155/DeviceDetail/add.png" mode="aspectFit"></image>
+				
+			</view>
+		</view>
+		
+		<view class="proinfo lamp">
+			<text class="title">产品信息</text>
+			<view class="itemcontent">
+				<view class="item" @click="proParam()">
+					<image class="img" src="/static/images/6155/DeviceDetail/param.png" mode="aspectFit"></image>
+					<text class="txt">产品参数</text>
+				</view>
+				<view class="item" @click="handRemark()">
+					<image class="img" src="/static/images/6155/DeviceDetail/remark.png" mode="aspectFit"></image>
+					<text class="txt">操作说明</text>
+				</view>
+				<view class="item" @click="handVideo()">
+					<image class="img" src="/static/images/6155/DeviceDetail/video.png" mode="aspectFit"></image>
+					<text class="txt">操作视频</text>
+				</view>
+			</view>
+		</view>
+
+		<!-- 弹窗通知 -->
+		<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" />
+
+		<!-- 下方菜单 -->
+		<BottomSlideMenuPlus :config="Status.BottomMenu" @close="closeMenu" @itemClick="handleItemClick"
+			@btnClick="btnClick">
+			<view>
+				<view class="addIco">
+					<view class="icoContent center" v-on:click.stop="checkImgUpload()">
+						<image mode="aspectFit" class="img" src="/static/images/6155/DeviceDetail/add.png"></image>
+					</view>
+				</view>
+			</view>
+		</BottomSlideMenuPlus>
+
+		<global-loading ref="loading" />
+	</view>
+</template>
+
+<script>
+	import gbk from '@/utils/gbk.js'
+	import BleTool from '@/utils/BleHelper.js'
+	import BleReceive from '@/utils/BleReceive';
+	import api from '@/api/670/HBY670.js';
+	import MqttClient from '@/utils/mqtt.js'; 
+	import {
+		showLoading,
+		hideLoading,
+		updateLoading
+	} from '@/utils/loading.js'
+	const pagePath = "pages/650/HBY650";
+	var ble = null;
+	var these = null;
+	var recei = null;
+	var mqttClient=null;
+	export default {
+		data() {
+			return {
+				Status: {
+					staticWarn:{
+						time:0,
+						inteval:null
+					},
+					Pop: {
+						showPop: false, //是否显示弹窗
+						popType: 'custom',
+						bgColor: '#383934bd',
+						borderColor: '#BBE600',
+						textColor: '#ffffffde',
+						buttonBgColor: '#BBE600',
+						buttonTextColor: '#232323DE',
+						iconUrl: '',
+						message: '您确定要这样做吗？',
+						buttonText: '确定',
+						clickEvt: '',
+						visiblePrompt: false,
+						promptTitle: '设备名称',
+						modelValue: '',
+						visibleClose: false
+					},
+					BottomMenu: {
+						show: false,
+						showHeader: true,
+						menuItems: [{
+								text: '强光',
+								icon: '/static/images/6155/DeviceDetail/qiang.png'
+							},
+							{
+								text: '弱光',
+								icon: '/static/images/6155/DeviceDetail/ruo.png'
+							},
+							{
+								text: '爆闪',
+								icon: '/static/images/6155/DeviceDetail/shan.png'
+							}
+						],
+						activeIndex: -1,
+						bgColor: '#2a2a2a',
+						itemBgColor: '#3a3a3a',
+						textColor: '#ffffffde',
+						textAlign: 'flex-start',
+						title: '主灯模式',
+						showDivider: false,
+						dividerColor: '#00000000',
+						dividerThickness: '0rpx',
+						dividerMargin: '10rpx',
+						itemHeight: '80rpx',
+						type: '',
+						showBtn: true,
+						btnBgColor: "#bbe600",
+						btnText: "确定",
+						btnTextColor: "#232323de",
+						showMask: true,
+						maskBgColor: '#00000066',
+						showClose: false
+					},
+					usrToggle: true,
+				},
+				formData: {
+					    battary: "", //电量
+					    xuhang: "", //续航
+					    imei: "", //imei
+					    Lon: "", //经度
+					    Lat: "", //纬度 
+					    address: "", //地址
+					    modeCurr: "", //档位
+					    SOS: "sg", //sos
+					    lightCurr: "qiang", //照明模式
+					    company: "", //单位
+					    usrname: "", //姓名 
+					    job: "", //职位
+					    id: "", //id
+					    msgTxt: "", //消息1    
+					    qzwarn: false, //是否强制报警
+					    warnLevel: "", //报警级别
+					    staticWarn:false,//静止报警
+					    fourGStrenth:0,//4G信号强度
+						deviceId: ""
+				},
+				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/670/HBY670",
+					showConfirm: false
+				},
+				rgb565Data: [],
+				videoHexArray: [],
+				picPath:""
+			}
+		},
+
+		onUnload() {
+			console.log("页面卸载,释放资源");
+			ble.removeReceiveCallback(pagePath);
+		},
+		onLoad: function() {
+			console.log("670页面加载");
+			these = this;
+			recei = BleReceive.getBleReceive();
+			ble = BleTool.getBleTool();
+			ble.addReceiveCallback(these.bleValueNotify);
+			let eventChannel = this.getOpenerEventChannel();
+
+			eventChannel.on('detailData', function(data) {
+
+				console.log("收到父页面的参数：" + JSON.stringify(data));
+				var device = data.data;
+				these.device=device;
+				if(these.device.deviceImei){
+					these.initMQ();
+				}
+				let f = ble.data.LinkedList.find((v) => {
+					if (v.macAddress == device.deviceMac) {
+						console.log("找到设备了", v);
+						
+						return true;
+					}
+					return false;
+				});
+				if (!f) {
+					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;					
+				}
+				ble.LinkBlue(f.deviceId, f.writeServiceId, f.wirteCharactId, f.notifyCharactId);
+			});
+
+		},
+		onHide: function() {
+
+		},
+		onBackPress(e) {
+			ble.removeReceiveCallback(pagePath);
+		},
+		computed: {
+			RSSIRemark: function() {
+				let remark = '极弱';
+				if (this.formData.RSSI <= 0 && this.formData.RSSI >= -30) {
+					remark = '强';
+				}
+
+				if (this.formData.RSSI < -30 && this.formData.RSSI >= -60) {
+					remark = '一般';
+				}
+				if (this.formData.RSSI < -60 && this.formData.RSSI >= -85) {
+					remark = '弱';
+				}
+				if (this.formData.RSSI < -85 && this.formData.RSSI >= -100) {
+					remark = '微弱';
+				}
+			}
+		},
+		methods: {
+			initMQ() {
+			
+				return new Promise((resolve, reject) => {
+					console.log("正在初始化MQtt")
+					if (mqttClient) {
+						console.log("无需再次初始化")
+						resolve();
+						return;
+					}
+					mqttClient = new MqttClient();
+					mqttClient.connect(() => {
+						console.log("连接成功，开始订阅消息")
+						// 订阅来自设备的状态更新
+						const statusTopic = `A/${this.formData.imei?this.formData.imei:this.device.deviceImei}`;
+						mqttClient.subscribe(statusTopic, (payload, receive) => {
+			
+							try {
+			
+								let json = JSON.parse(payload);
+								let keys = Object.keys(json);
+								// console.log("keys=", keys);
+								if (keys.indexOf('sta_DetectGrade') > -1) { //上报的报文
+									console.log("收到设备上报的数据", payload);
+									 this.parseDataMQ(json);
+								} 
+								// else if (keys.indexOf('sta_PicTrans') > -1) { //发送开机画面
+								// 	console.log("收到开机画面答复", payload);
+								// 	// this.SendImgMQ(json);
+								// } 
+								// else if (keys.indexOf('sta_TexTrans') > -1) { //发送文本信息
+								// 	console.log("收到文本回复", payload);
+								// 	// this.SendTxtMQ(json);
+								// } 
+								// else if (keys.indexOf('sta_BreakNews') > -1) { //紧急通知
+								// 	console.log("收到紧急消息回复", payload);
+								// 	// this.sendUrgentMQ(json);
+								// } 
+								// else {
+								// 	console.log("收到不能处理的数据", payload);
+								// }
+			
+			
+							} catch (error) {
+								console.log("无法解析此消息", error);
+							}
+						});
+						resolve();
+					});
+				});
+			},
+			
+			sendMQ(message) {
+				message=JSON.stringify(message);
+				const topic = `B/${this.formData.imei?this.formData.imei:this.device.deviceImei}`;
+				return new Promise((resolve, reject) => {
+					if (!mqttClient) {
+						reject("MQTT未连接");
+						console.log("MQTT未连接")
+						return;
+					}
+					try {
+						let flag = mqttClient.publish(topic, message, {
+							qos: 1
+						});
+						if (flag) {
+							resolve();
+							return;
+						}
+						console.log("MQTT未连接，无法发布消息")
+						reject("MQTT未连接，无法发布消息");
+					} catch (error) {
+						console.log("出现了异常",error);
+						mqttClient.unsubscribe(`A/${this.formData.imei?this.formData.imei:this.device.deviceImei}`);
+						mqttClient.disconnect();
+						this.initMQ();
+						reject(error);
+					}
+				});
+			},
+		parseDataMQ(json){
+			let staticLevelText = "";
+			let dic = {
+				"3": "hight",
+				"2": "center",
+				"1": "low",
+				"0": "close",
+			
+			};
+			staticLevelText = dic[json.sta_DetectGrade];
+			
+			let lightingLevelText = json.sta_LightGrade ===
+				1 ? 'hight' :
+				json.sta_LightGrade ===
+				2 ?
+				'low' :
+				'close';
+			let warn = "";
+			dic = {
+				"0": "none",
+				"1": "ruo",
+				"2": "center",
+				"3": "hight",
+				"4": "veryhight",
+			};
+			warn = dic[json.sta_DetectResult];
+			
+			
+			let sosText = json.sta_SOSGrade === 2 ? 'rb' :
+				json.sta_SOSGrade === 1 ? "sg" : "close"
+			
+			let staticWarn = json.sta_ShakeBit === 1 ;
+			
+			receiveData.modeCurr = staticLevelText;
+			receiveData.lightCurr = lightingLevelText;
+			receiveData.xuhang = json.sta_PowerTime + "分钟";
+			receiveData.battary = json.sta_PowerPercent + "%";
+			receiveData.SOS = sosText;
+			receiveData.warnLevel = warn;
+			receiveData.staticWarn = staticWarn;
+			receiveData.fourGStrenth = json.sta_4gSinal;
+			receiveData.imei = json.sta_imei;
+			receiveData.Lon = json.sta_longitude;
+			receiveData.Lat = json.sta_latitude;
+			
+			this.refreshFormData(receiveData);
+			return receiveData;
+		},
+			bleValueNotify: function(receive, device, path) { //订阅消息
+
+				let data = recei.ReceiveData(receive, device, pagePath);
+				console.log("收到设备的数据", data)
+				if (data) {
+					if ("staBlue_picture" in data) {
+						//重发图片
+						console.log("收到重新发送图片的命令");
+						this.checkImgUpload('img', data.staBlue_picture);
+						return;
+					} else if ("staBlue_text" in data) {
+						//重发文本
+						console.log("收到重新发送文本的命令");
+						this.sendUsr(data.staBlue_text);
+						return;
+					} else if ("staBlue_vidio" in data) {
+						//重发视频
+						console.log("收到重新发送视频的命令");
+						this.checkImgUpload('video', data.staBlue_vidio);
+						return;
+					} else if ("staBlue" in data) {
+						if (data.staBlue == "finish") {
+							console.log("收到设备回复,全部传输完成");
+						}
+						return;
+					}
+					this.refreshFormData(data);
+					
+				}
+			},
+			refreshFormData(data){
+				let keys = Object.keys(data);
+				for (var i = 0; i < keys.length; i++) {
+					let key = keys[i];
+					if (key in these.formData) {
+						these.formData[key] = data[key];
+					}
+				}
+				if(this.formData.imei){
+					this.initMQ();
+				}
+				if (these.formData.staticWarn) {//有静止报警
+					these.showPop({
+						message: "自动报警",
+						iconUrl: "/static/images/6155/DeviceDetail/warnning.png",
+						borderColor: "#e034344d",
+						buttonBgColor: "#E03434",
+						buttonText:"解除报警",
+						clickEvt:"staticWarn"
+					});
+					this.Status.staticWarn.time=180;
+					this.Status.staticWarn.inteval=setInterval(()=>{
+						if(this.Status.staticWarn.time===0){
+							clearInterval(this.Status.staticWarn.inteval);
+							this.formData.staticWarn=false;
+							return;
+						}
+						this.Status.staticWarn.time=this.Status.staticWarn.time-1;							
+					},1000)
+					
+				}
+				
+				these.setBleFormData();
+			},
+			getDevice: function() {
+
+				// console.log("LinkedList=", ble.data.LinkedList);
+				// console.log("formData=", these.formData);
+				let f = ble.data.LinkedList.find((v) => {
+					return v.deviceId == these.formData.deviceId;
+				});
+
+				return f;
+			},
+			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);	
+				}
+				
+			},
+			lightSetting:function(type){
+				if (this.formData.lightCurr == type) {
+					return;
+				}
+
+				showLoading(this, {
+					text: "请稍候..."
+				});
+				let task = () => {
+					this.formData.lightCurr = type;
+					let dic = {
+						ble: {
+							qiang: 0x6D,
+							ruo: 0x6E,
+							jieneng:0x6E,
+							close: 0x6F
+						},
+						mqtt: {
+							qiang: 1,
+							ruo: 2,
+							jieneng:2,
+							close: 0
+						}
+					};
+					console.log("type=",type);
+					let json= {
+							ins_SOSGrade: [dic.mqtt[type]]
+						};
+
+					let requestSend=()=>{
+						this.sendMQ(json).then((res)=>{
+							console.log("4g发送成功");
+						}).catch((ex)=>{
+							these.showPop({
+								message: "通信异常,请检查手机或设备网络",
+								iconUrl: "/static/images/6155/DeviceDetail/uploadErr.png",
+								borderColor: "#e034344d",
+								buttonBgColor: "#E03434",
+							});
+							
+						}).finally(()=>{
+							hideLoading(these);
+							these.setBleFormData();
+						});
+						
+						
+					}
+
+					let f = this.getDevice();
+					let buffer=null;
+					if (f) {
+						// 发送数据		
+						buffer = new ArrayBuffer(6);
+						let dataView = new DataView(buffer);
+						dataView.setUint8(0, 0x55); // 帧头
+						dataView.setUint8(1, 0x01); // 帧类型
+						dataView.setUint8(2, 0x01); // 包序号
+						dataView.setUint8(3, 0x00); // 数据长度
+						dataView.setUint8(4, 0x01); // 数据长度
+						dataView.setUint8(5, dic.ble[type]); // 数据
+						
+						ble.sendData(f.deviceId, buffer, f.writeServiceId, f.wirteCharactId, 10).then(() => {
+							console.log("蓝牙发送成功了");
+							hideLoading(these);
+							these.setBleFormData();
+						}).catch((ex) => {
+							//使用4G发送
+							console.log("蓝牙发送失败,转4g发送",ex);
+							requestSend();
+						});
+					} else {
+						requestSend();									
+					}
+				}
+
+				setTimeout(task, 0);
+			},
+			sosSetting:function(type){
+				if (this.formData.SOS == type) {
+					type="close";
+				}
+
+				showLoading(this, {
+					text: "请稍候..."
+				});
+				let task = () => {
+					this.formData.SOS = type;
+					let dic = {
+					ble: {
+						sg: 0x68,
+						rb: 0x69,
+						close: 0x6A
+					},
+					mqtt: {
+						sg: 2,
+						rb: 1,
+						close: 0
+					}
+
+				}
+					console.log("type=",type);
+					let json= {
+							ins_SOSGrade: [dic.mqtt[type]]
+						};
+
+					let requestSend=()=>{
+						this.sendMQ(json).then((res)=>{
+							console.log("4g发送成功");
+						}).catch((ex)=>{
+							these.showPop({
+								message: "通信异常,请检查手机或设备网络",
+								iconUrl: "/static/images/6155/DeviceDetail/uploadErr.png",
+								borderColor: "#e034344d",
+								buttonBgColor: "#E03434",
+							});
+							
+						}).finally(()=>{
+							hideLoading(these);
+							these.setBleFormData();
+						});
+						
+						
+					}
+
+					let f = this.getDevice();
+					let buffer=null;
+					if (f) {
+						// 发送数据		
+						buffer = new ArrayBuffer(6);
+						let dataView = new DataView(buffer);
+						dataView.setUint8(0, 0x55); // 帧头
+						dataView.setUint8(1, 0x05); // 帧类型
+						dataView.setUint8(2, 0x01); // 包序号
+						dataView.setUint8(3, 0x00); // 数据长度
+						dataView.setUint8(4, 0x01); // 数据长度
+						dataView.setUint8(5, dic.ble[type]); // 数据
+						
+						ble.sendData(f.deviceId, buffer, f.writeServiceId, f.wirteCharactId, 10).then(() => {
+							console.log("蓝牙发送成功了");
+							hideLoading(these);
+							these.setBleFormData();
+						}).catch((ex) => {
+							//使用4G发送
+							console.log("蓝牙发送失败,转4g发送",ex);
+							requestSend();
+						});
+					} else {
+						requestSend();									
+					}
+				}
+
+				setTimeout(task, 0);
+			},
+			GearSetting: function(type) {//档位设置
+				if (this.formData.modeCurr == type) {
+					type="close";
+				}
+				showLoading(this, {
+					text: "请稍候..."
+				});
+				let task = () => {
+					this.formData.modeCurr = type;
+					let dic = {
+						ble: {
+							hight: 0x65,
+							center: 0x66,
+							low: 0x67,
+							close: 0x68
+						},
+						mqtt: {
+							hight: 3,
+							center: 2,
+							low: 1,
+							close: 0
+						}
+					}
+					console.log("type=",type);
+					let json= {
+						ins_DetectGrade: [dic.mqtt[type]]
+					}
+
+					let requestSend=()=>{
+						this.sendMQ(json).then((res)=>{
+							console.log("4g发送成功");
+						}).catch((ex)=>{
+							these.showPop({
+								message: "通信异常,请检查手机或设备网络",
+								iconUrl: "/static/images/6155/DeviceDetail/uploadErr.png",
+								borderColor: "#e034344d",
+								buttonBgColor: "#E03434",
+							});
+							
+						}).finally(()=>{
+							hideLoading(these);
+							these.setBleFormData();
+						});
+						
+						
+					}
+
+					let f = this.getDevice();
+					let buffer=null;
+					if (f) {
+						// 发送数据		
+						buffer = new ArrayBuffer(6);
+						let dataView = new DataView(buffer);
+						
+						dataView.setUint8(0, 0x55); // 帧头
+						dataView.setUint8(1, 0x00); // 帧类型
+						dataView.setUint8(2, 0x01); // 包序号
+						dataView.setUint8(3, 0x00); // 数据长度
+						dataView.setUint8(4, 0x01); // 数据长度
+						dataView.setUint8(5, dic.ble[type]); // 数据
+						
+						ble.sendData(f.deviceId, buffer, f.writeServiceId, f.wirteCharactId, 10).then(() => {
+							console.log("蓝牙发送成功了");
+							hideLoading(these);
+							these.setBleFormData();
+						}).catch((ex) => {
+							//使用4G发送
+							console.log("蓝牙发送失败,转4g发送",ex);
+							requestSend();
+						});
+					} else {
+						requestSend();									
+					}
+				}
+
+				setTimeout(task, 0);
+			},
+		
+			proParam: function() {
+
+				uni.navigateTo({
+					url: '/pages/common/productDes/index?id=' + this.device.id,
+					success(ev) {
+
+					}
+				});
+			},
+			handRemark: function() {
+				uni.navigateTo({
+					url: '/pages/common/operatingInstruct/index?id=' + this.device.id,
+					success(ev) {
+
+					}
+				});
+			},
+			handVideo: function() {
+				uni.navigateTo({
+					url: '/pages/common/operationVideo/index?id=' + this.device.id,
+					success(ev) {
+
+					}
+				});
+			},
+			checkImgUpload: function(type, index) {
+				console.log("123213213213");
+				let f = these.getDevice();
+				
+				var sendImgByRequest=()=>{
+					return new Promise((resolve,reject)=>{
+						api.sendPic({
+							picPath:these.picPath,
+							deviceId:these.device.id,
+							deviceImei:these.device.deviceImei
+						}).then((res)=>{
+							if (res.code == 200) {
+								these.showPop({
+									showPop: true,
+									message: "上传成功",
+									iconUrl: "/static/images/6155/DeviceDetail/uploadSuccess.png",									
+								});
+								resolve();
+								return;
+							} else {
+								
+								these.showPop({
+									message: res.errMsg?res.errMsg:"未知的原因上传失败了",
+									iconUrl: "/static/images/6155/DeviceDetail/uploadErr.png",
+									borderColor: "#e034344d",
+									buttonBgColor: "#E03434",
+								});
+								reject(res);
+							}
+						}).catch((ex)=>{
+							console.log("图片上传失败了",ex);
+							reject(ex)
+						}).finally(()=>{
+							hideLoading(these);
+						});
+					});
+					
+				}
+				// 分包发送图片数据
+				var sendImagePackets = function(ReSendNo) {
+
+					return new Promise((resolve, reject) => {
+
+						// 总数据包数
+						let totalPackets = 52;
+						let currentPacket = 1;
+
+						if (ReSendNo) {
+							totalPackets = ReSendNo;
+							currentPacket = ReSendNo;
+						}
+
+						if (f) {
+							// 发送单个数据包
+							const sendNextPacket = () => {
+								if (currentPacket > totalPackets) {
+									hideLoading(these);
+									these.Status.BottomMenu.show = false;
+									these.showPop({
+										showPop: true,
+										message: "上传成功",
+										iconUrl: "/static/images/6155/DeviceDetail/uploadSuccess.png",
+									});
+									if (!ReSendNo) {
+										setTimeout(() => {
+											these.HoldYouHand("transmit complete", 0, f
+												.deviceId, f
+												.writeServiceId, f.wirteCharactId);
+										}, 500);
+
+									}
+
+									resolve();
+									return;
+								}
+
+								// 计算当前包的数据
+								let packetSize = 250;
+								// if (currentPacket <= 51) {
+								// 	packetSize = 250; // 前51个包每个500字节
+								// } else {
+								// 	packetSize = 50; // 最后一个包100字节
+								// }
+
+								// 创建数据包
+								const startIndex = (currentPacket - 1) * packetSize;
+								const endIndex = Math.min(startIndex + packetSize, these.rgb565Data
+									.length);
+								if (startIndex > endIndex) {
+									return;
+								}
+								const packetData = these.rgb565Data.slice(startIndex,
+									endIndex);
+								// 构建数据包
+								const bufferSize = 505; // 5 + packetData.length * 2; // 头部5字节 + 数据部分
+								const buffer = new ArrayBuffer(bufferSize);
+								const dataView = new DataView(buffer);
+
+								// 填充头部
+								dataView.setUint8(0, 0x55); // 帧头
+								dataView.setUint8(1, 0x02); // 帧类型：开机画面
+								dataView.setUint8(2, '0x' + currentPacket.toString(16).padStart(2,
+									'0')); // 包序号
+
+
+								if (packetData.length == 250) {
+									dataView.setUint8(3, 0x01);
+									dataView.setUint8(4, 0xF4);
+								} else {
+									dataView.setUint8(3, 0x00);
+									dataView.setUint8(4, 0x64);
+								}
+
+								// 填充数据（每个RGB565值占2字节）
+								for (let i = 0; i < packetData.length; i++) {
+									dataView.setUint16(5 + i * 2, packetData[i], false); // 大端字节序
+								}
+
+								if (currentPacket > 51) { //第52包补FF
+									for (var i = 105; i < bufferSize; i++) {
+										dataView.setUint8(i, 0xFF);
+									}
+								}
+
+
+
+								//发送数据包
+								ble.sendData(f.deviceId, buffer, f.writeServiceId, f.wirteCharactId,
+										10)
+									.then(() => {
+
+
+										updateLoading(these, {
+											text: "正在发送:" + currentPacket + "/" +
+												totalPackets
+										});
+										currentPacket++;
+
+										setTimeout(sendNextPacket, 0);
+									}).catch(err => {
+										console.log("发送数据包失败了" + JSON.stringify(err));
+										if (err.code == '10007') {
+											setTimeout(sendNextPacket, 0);
+											return;
+										}else{
+											updateLoading(these, {
+												text: "蓝牙发送失败,正在使用4G发送"
+											});
+											sendImgByRequest().then(resolve).catch(reject);
+										}
+										// these.Status.BottomMenu.show = false;
+										// these.showPop({
+										// 	message: err.msg,
+										// 	iconUrl: "/static/images/6155/DeviceDetail/uploadErr.png",
+										// 	borderColor: "#e034344d",
+										// 	buttonBgColor: "#E03434",
+										// });
+										// hideLoading(these);
+										// reject(err);
+									});
+							}
+
+							if (ReSendNo) {
+								sendNextPacket(ReSendNo);
+								return;
+							}
+							// 开始牵手
+							these.HoldYouHand("picture transmit start", 120, f.deviceId, f.writeServiceId,
+								f.wirteCharactId).then(() => {
+								sendNextPacket();
+							}).catch((err) => {
+								updateLoading(these, {
+									text: "蓝牙发送失败,正在使用4G发送"
+								});
+								sendImgByRequest().then(resolve).catch(reject);
+								
+							});
+						}
+					});
+				}
+				//去图片裁剪
+				var gotoCutImg = (imgPath) => {
+
+					uni.navigateTo({
+						url: "/pages/6155/ImgCrop",
+						events: {
+							ImgCutOver: function(data) {
+								// console.log("我收到裁剪后的图片了，感谢老铁," + data)
+								showLoading(these, {
+									text: "正在发送..."
+								});
+
+								these.Status.BottomMenu.show = false;
+								these.picPath=data.picPath;
+								these.rgb565Data = ble.convertToRGB565(data.piexls);
+								setTimeout(function() {
+									
+									sendImagePackets().catch(() => {
+
+									});
+								}, 0)
+
+							}
+						},
+						success(ev) {
+							ev.eventChannel.emit('checkImg', {
+								data: imgPath
+							});
+							these.Status.BottomMenu.show = false;
+						}
+					});
+				}
+
+
+				let sendVideoPackets = (ReSendNo) => {
+					console.log("开始发送分片数据");
+					return new Promise((resolve, reject) => {
+						if (f) {
+							// 总数据包数
+							var totalPackets = 1536;
+
+							let currentPacket = 1;
+							console.log("发送数据准备中,总共" + totalPackets);
+							if (ReSendNo) {
+								totalPackets = ReSendNo;
+								currentPacket = ReSendNo;
+							}
+							this.totalPackets = totalPackets;
+							// 发送单个数据包
+							const sendNextVideoPacket = () => {
+								console.log("准备发送一段数据");
+								if (currentPacket > totalPackets) {
+									if (!ReSendNo) {
+										setTimeout(() => {
+											these.HoldYouHand("transmit complete", 0, f
+												.deviceId, f
+												.writeServiceId, f.wirteCharactId).then(
+											() => {
+													console.log("全部发送完毕")
+												}).catch((ex) => {
+												console.log("出现异常", ex);
+											});
+										}, 500);
+
+									}
+									these.Status.BottomMenu.show = false;
+									hideLoading(these);
+									these.showPop({
+										showPop: true,
+										message: "上传成功",
+										iconUrl: "/static/images/6155/DeviceDetail/uploadSuccess.png"
+									});
+
+
+
+
+									resolve();
+
+									return;
+								}
+
+								// 计算当前包的数据
+								let packetSize = 500;
+
+
+								// 创建数据包
+								const startIndex = (currentPacket - 1) * packetSize;
+								const endIndex = Math.min(startIndex + packetSize, these.videoHexArray
+									.length);
+								if (startIndex > endIndex) {
+									resolve();
+									return;
+								}
+								////console.log("111111");
+								const packetData = these.videoHexArray.slice(startIndex, endIndex);
+
+								// 构建数据包
+								////console.log("packetData.length"+packetData.length);
+								const bufferSize = 506; // 头部5字节 + 数据部分
+								const buffer = new ArrayBuffer(bufferSize);
+								const dataView = new DataView(buffer);
+
+								let sortNo = currentPacket.toString(16).padStart(4, '0');
+
+								// 填充头部
+								dataView.setUint8(0, 0x55); // 帧头
+								dataView.setUint8(1, 0x04); // 帧类型：开机画面
+								dataView.setUint8(2, '0x' + sortNo.substring(0, 2)); // 包序号
+								dataView.setUint8(3, '0x' + sortNo.substring(2, 4)); // 包序号
+
+								dataView.setUint8(4, 0x01);
+								dataView.setUint8(5, 0xF4);
+
+								for (let i = 0; i < packetData.length; i++) {
+									dataView.setUint8(6 + i, '0x' + packetData[i]);
+								}
+
+								let inteval = 30;
+								console.log("开始发送一段视频"); //
+								ble.sendData(f.deviceId, buffer, f.writeServiceId, f
+									.wirteCharactId, 10).then(() => {
+
+									updateLoading(these, {
+										text: "正在发送:" + currentPacket + "/" +
+											totalPackets
+									})
+
+									currentPacket++;
+
+									console.log("发送一段成功,发送下一段");
+									setTimeout(sendNextVideoPacket, inteval);
+								}).catch(err => {
+									console.log("发送失败了");
+									if (err.code == '10007') { //遇到这个错误自动重新发送
+										console.log(err.errMsg + ",发送失败了,正在补偿：" +
+											currentPacket);
+										setTimeout(sendNextVideoPacket, inteval);
+									} else {
+										these.Status.BottomMenu.show = false;
+										hideLoading(these);
+
+										these.showPop({
+											showPop: true,
+											message: err.msg + ",发送失败了",
+											borderColor: "#e034344d",
+											buttonBgColor: "#E03434",
+											buttonText: "确定",
+											iconUrl: "/static/images/6155/DeviceDetail/uploadErr.png"
+										});
+										reject(err);
+										return;
+									}
+
+								});
+							};
+
+
+							sendNextVideoPacket();
+
+
+						} else {
+							console.log("Fail.......")
+						}
+					});
+				}
+
+				var sendVideo = (videoPath) => {
+					let uploadVideo = () => {
+
+						if (these.videoHexArray.length > 0) {
+							console.log("开始处理,无需上传");
+							shotVideoClick(these.videoHexArray);
+							return;
+
+						}
+						console.log("开始处理,正在上传");
+
+						showLoading(these, {
+							text: "上传中"
+						});
+						let p1 = these.HoldYouHand("video transmit start", 2200, f.deviceId, f.writeServiceId,
+							f.wirteCharactId);
+						let p2 = new Promise((succ, err) => {
+							uni.uploadFile({
+								url: 'http://114.55.111.217/video/upload',
+								filePath: videoPath,
+								name: 'file',
+								header: {
+									"Method": "POST",
+									"Content-Type": "multipart/form-data"
+								},
+								timeout: 600000,
+								fail: (ex) => {
+									console.log("上传视频失败" + JSON.stringify(ex));
+
+									err(ex);
+								},
+								success: (res) => {
+
+									console.log("上传完成，向蓝牙设备发送");
+									succ(res);
+								}
+
+							});
+						});
+
+						Promise.all([p1, p2]).then((arr) => {
+
+							let res = arr[1];
+							res = JSON.parse(res.data);
+							if (res.data) {
+								these.videoHexArray = res.data;
+								updateLoading(these, {
+									text: "正在发送:0/1536"
+								});
+
+								these.Status.BottomMenu.show = false;
+
+								shotVideoClick(res.data);
+
+
+							} else {
+								console.log("服务器未返回正确的数据");
+
+
+								these.showPop({
+									message: "与服务器连接出现异常,请检查网络设置",
+									iconUrl: "/static/images/6155/DeviceDetail/uploadErr.png",
+									borderColor: "#e034344d",
+									buttonBgColor: "#E03434",
+								});
+							}
+
+						}).catch((ex) => {
+
+							hideLoading(these);
+							these.showPop({
+								message: "出现异常," + ex.msg,
+								iconUrl: "/static/images/6155/DeviceDetail/uploadErr.png",
+								borderColor: "#e034344d",
+								buttonBgColor: "#E03434",
+							});
+						})
+					}
+					let f = these.getDevice();
+
+
+
+
+					let shotVideoClick = () => {
+						console.log("正在开始发送");
+						sendVideoPackets().then(() => {
+							console.log("发送完成");
+
+						}).catch((ex1) => {
+							//console.log("出现了异常", ex1)
+						}).finally(() => {
+							hideLoading(these);
+						});
+					}
+
+
+					uploadVideo();
+
+				}
+
+				if (type) {
+					if (type == 'img') {
+						sendImagePackets(index);
+					} else if (type == 'video') {
+						sendVideoPackets(index);
+					}
+					return;
+				}
+				uni.chooseMedia({
+					count: 1,
+					mediaType: ['image', 'video'],
+					sourceType: ['album'],
+					maxDuration: 3,
+					sizeType: ['original'],
+					success: (res) => {
+
+						let file = res.tempFiles[0];
+
+						if (file.fileType == 'image') {
+							gotoCutImg(file.tempFilePath);
+							return;
+						}
+
+						if (file.fileType == 'video') {
+							if (file.duration < 2) {
+								this.alert('提示', "请选择2S及以上的视频");
+								return;
+							}
+
+							these.videoHexArray = [];
+							sendVideo(file.tempFilePath);
+							return;
+						}
+					}
+				});
+
+
+			},
+			ShowUpload: function() {
+				//上传开机画面
+				this.Status.BottomMenu.menuItems = [];
+				this.Status.BottomMenu.title = "上传开机画面";
+				this.Status.BottomMenu.type = "checkImg";
+				this.Status.BottomMenu.show = true;				
+				this.Status.BottomMenu.showBtn=false;
+			},
+
+			showMenu(flag) {
+				this.Status.BottomMenu.show = true;
+			},
+			closeMenu() {
+				this.Status.BottomMenu.show = false;
+			},
+			btnClick(item, index) {
+
+
+
+
+			},
+			setMode(mode) {
+
+
+
+
+			},
+			handleItemClick(item, index) {
+
+				switch (this.Status.BottomMenu.type) {
+					case "main":
+
+						break;
+					case "fu":
+
+						break;
+				}
+				this.Status.BottomMenu.activeIndex = index;
+
+			},
+			HidePop: function() {
+				if (this.Status.Pop.clickEvt == 'staticWarn') {
+					this.Status.staticWarnTime=0;
+				}
+				this.Status.Pop.showPop = false;
+			},
+			showPop: function(option) {
+
+				if (!option) {
+					option = {
+						a: 1
+					};
+				}
+				let keys = Object.keys(option);
+				for (var i = 0; i < keys.length; i++) {
+					let key = keys[i];
+					these.Status.Pop[key] = option[key];
+				}
+				if (!option.borderColor) {
+					option.borderColor = '#BBE600';
+					option.buttonBgColor = '#BBE600';
+				}
+				these.Status.Pop.showPop = true;
+			},
+			sendUsr: function(ReSendNo) {
+
+				let requestSend=()=>{
+					let json = {
+						deviceId: this.device.id,
+						deviceImei: this.device.deviceImei?this.device.deviceImei:this.formData.imei,
+						name: this.formData.company,
+						position: this.formData.name,
+						unitName: this.formData.job,
+						code: this.formData.id
+					};
+					api.sendUsr(json).then((res)=>{
+						these.showPop({
+							showPop: true, //是否显示弹窗
+							popType: 'custom',
+							bgColor: '#383934bd',
+							borderColor: '#BBE600',
+							textColor: '#ffffffde',
+							buttonBgColor: '#BBE600',
+							buttonTextColor: '#232323DE',
+							iconUrl: '/static/images/6155/DeviceDetail/sendSucc.png',
+							message: '人员信息发送成功',
+							buttonText: '确定',
+							clickEvt: 'SendUsr',
+							visiblePrompt: false,
+							promptTitle: '',
+							modelValue: '',
+							visibleClose: true
+						});
+						these.setBleFormData();
+					}).catch((ex)=>{
+						these.showPop({
+							message: "文字发送失败," + ex.msg,
+							iconUrl: "/static/images/6155/DeviceDetail/uploadErr.png",
+							borderColor: "#e034344d",
+							buttonBgColor: "#E03434",
+						});
+					}).finally(()=>{
+						hideLoading(these);
+					});
+				}
+
+				var textLines = [
+					this.formData.company,
+					this.formData.name,
+					this.formData.job,
+					this.formData.id
+				];
+
+
+				let f = this.getDevice();
+				if (!f) {
+					//走4G通道
+					requestSend();
+					return;
+				}
+				showLoading(this, {
+					text: "请稍候..."
+				});
+				var sendText = function() {
+					// 总数据包数
+					let totalPackets = textLines.length;
+					let currentPacket = 1;
+					// console.log("currentPacket=",currentPacket);
+					// console.log("ReSendNo=",ReSendNo);
+					if (ReSendNo) {
+						totalPackets = ReSendNo;
+						currentPacket = ReSendNo;
+					}
+					// console.log("currentPacket=",currentPacket);
+					// 发送单个数据包
+					const sendNextPacket = () => {
+
+						if (currentPacket > totalPackets) {
+							if (!ReSendNo) {
+								setTimeout(() => {
+									these.HoldYouHand("transmit complete", 0, f.deviceId, f
+										.writeServiceId, f
+										.wirteCharactId);
+								}, 500);
+
+							}
+
+							these.showPop({
+								showPop: true, //是否显示弹窗
+								popType: 'custom',
+								bgColor: '#383934bd',
+								borderColor: '#BBE600',
+								textColor: '#ffffffde',
+								buttonBgColor: '#BBE600',
+								buttonTextColor: '#232323DE',
+								iconUrl: '/static/images/6155/DeviceDetail/sendSucc.png',
+								message: '人员信息发送成功',
+								buttonText: '确定',
+								clickEvt: 'SendUsr',
+								visiblePrompt: false,
+								promptTitle: '',
+								modelValue: '',
+								visibleClose: true
+							});
+							these.setBleFormData();
+							hideLoading(these);
+							return;
+						}
+
+						// 获取当前行文字
+						const text = textLines[currentPacket - 1] || '';
+						let arr = gbk.encode(text)
+						let gbkData = gbk.arr2hex(arr);
+
+
+						// 构建数据包
+						const bufferSize = 5 + gbkData.length / 2; // 头部4字节 + 数据部分
+						const buffer = new ArrayBuffer(bufferSize);
+						const dataView = new DataView(buffer);
+
+						// 填充头部
+						dataView.setUint8(0, 0x55); // 帧头
+						dataView.setUint8(1, 0x03); // 帧类型：文字
+						dataView.setUint8(2, currentPacket.toString(16)); // 包序号
+						dataView.setUint16(3, (text.length * 2).toString(16)); // 数据长度
+
+						// 填充数据				
+						let index = 0;
+						for (var i = 0; i < gbkData.length; i += 2) {
+							let value = parseInt(gbkData[i] + "" + gbkData[i + 1], 16);
+							dataView.setUint8(5 + index, value);
+							index++;
+						}
+
+
+						// 发送数据包
+
+
+						ble.sendData(f.deviceId, buffer, f.writeServiceId, f.wirteCharactId, 10).then(() => {
+							// 更新进度
+							console.log(
+								`发送文字数据包 ${currentPacket}/${totalPackets}: ${text}`
+							);
+
+							// 发送下一个包
+							currentPacket++;
+							setTimeout(sendNextPacket, 0);
+						}).catch(err => {
+							if(err.code=='10007'){
+								setTimeout(sendNextPacket, 0);
+							}else{
+								requestSend();	
+							}													
+						}).finally(() => {
+							
+						});
+					};
+
+					// 开始发送第一个包
+					sendNextPacket();
+				}
+
+
+				if (ReSendNo) {
+					sendText(ReSendNo);
+					return;
+				}
+				setTimeout(() => {
+					these.HoldYouHand("word transmit start", 120, f.deviceId, f.writeServiceId, f
+						.wirteCharactId).then(
+						() => {
+							setTimeout(sendText, 200);
+						}).catch((ex) => {
+							requestSend();
+							// console.log("握手没有成功", ex);
+							// hideLoading(these);
+							// these.showPop({
+							// 	message: ex.msg,
+							// 	iconUrl: "/static/images/6155/DeviceDetail/uploadErr.png",
+							// 	borderColor: "#e034344d",
+							// 	buttonBgColor: "#E03434",
+							// });
+					});
+				}, 0);
+
+
+
+			},
+			sendUrgent(type) {
+				if(!this.formData.msgTxt){
+					
+					return;
+				}
+				showLoading(this, {
+					text: "请稍候..."
+				});
+				this.setBleFormData();
+				let arr=[];
+				if(this.formData.msgTxt.length>8){
+					arr.push(this.formData.msgTxt.substring(0,8));
+					arr.push(this.formData.msgTxt.substring(8));
+				}else{
+					let index=Math.floor(this.formData.msgTxt.length/2)
+					arr.push(this.formData.msgTxt.substring(0,index));
+					arr.push(this.formData.msgTxt.substring(index));
+				}
+				
+				let data={
+				    "sendMsg": arr.join('|'),
+				    "deviceIds": [
+				       this.device.id
+				    ],
+				    "deviceImeiList": [
+				       this.device.deviceImei?this.device.deviceImei:this.formData.imei
+				    ]
+				}
+				console.log("data=",data);
+				api.warnMsg(data).then((res)=>{
+					if (res.code == 200) {
+					these.showPop({
+						showPop: true, //是否显示弹窗
+						popType: 'custom',
+						bgColor: '#383934bd',
+						borderColor: '#BBE600',
+						textColor: '#ffffffde',
+						buttonBgColor: '#BBE600',
+						buttonTextColor: '#232323DE',
+						iconUrl: '/static/images/6155/DeviceDetail/sendSucc.png',
+						message: '发送成功',
+						buttonText: '确定',
+						clickEvt: 'SendUsr',
+						visiblePrompt: false,
+						promptTitle: '',
+						modelValue: '',
+						visibleClose: true
+					});
+					} else {
+						these.showPop({
+							message: res.msg,
+							iconUrl: "/static/images/6155/DeviceDetail/uploadErr.png",
+							borderColor: "#e034344d",
+							buttonBgColor: "#E03434",
+						});
+					}
+				}).finally(()=>{
+					hideLoading(this);
+				});
+			
+			},
+
+			HoldYouHand(str, pauseTime, deviceid, serviceid, characid) {
+				if (!pauseTime) {
+					pauseTime = 0;
+				}
+
+				var promise = new Promise((resolve, reject) => {
+					// 1. 创建 ArrayBuffer 和 DataView
+					const buffer = new ArrayBuffer(str.length);
+					const dataView = new DataView(buffer);
+
+					// 2. 将字符串转换为 ASCII 码并写入 DataView
+					for (let i = 0; i < str.length; i++) {
+						dataView.setUint8(i, str.charCodeAt(i));
+					}
+					console.log("开始握手");
+
+					ble.sendData(deviceid, buffer, serviceid, characid, 10).then(
+						() => {
+							setTimeout(() => {
+								console.log("握手成功并完成了等待");
+								resolve(true);
+							}, pauseTime);
+						}).catch(err => {
+						
+						console.log("握手没有成功", )
+						reject(err);
+					});
+
+
+				});
+
+
+
+				return promise;
+			},
+
+			ack: function() {
+
+
+				let eventChannel = this.getOpenerEventChannel();
+				eventChannel.emit('ack', {
+					data: '我已收到了您的消息,谢谢。'
+				});
+
+			}
+		}
+	}
+</script>
+
+<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;
+		margin-bottom: 24rpx;
+	}
+
+	.eq .leftImg {
+		box-sizing: border-box;
+		padding: 36rpx;
+		border-radius: 16rpx;
+		background: rgba(42, 42, 42, 0.5);
+	}
+
+	.eq .leftImg,
+	.eq .rightTxt {
+		width: 50%;
+		height: 100%;
+	}
+
+	.eq .rightTxt {
+		display: flex;
+		flex-direction: column;
+		flex-wrap: nowrap;
+		align-content: flex-start;
+		justify-content: space-evenly;
+		align-items: flex-start;
+	}
+
+	.eq .leftImg .img {
+		width: 100%;
+		height: 100%;
+	}
+
+	.eq .rightTxt .img {
+		width: 52rpx;
+		height: 52rpx;
+	}
+
+	.eq .rightTxt .row {
+		width: 100%;
+		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;
+	}
+
+	.eq .rightTxt .row .txt {
+		padding-left: 20rpx;
+	}
+
+	.eq .bigTxt {
+		color: rgba(255, 255, 255, 0.87);
+		font-family: PingFang SC;
+		font-size: 28rpx;
+		font-weight: 400;
+	}
+
+	.eq .smallTxt {
+		color: rgba(255, 255, 255, 0.6);
+		font-family: PingFang SC;
+		font-size: 24rpx;
+		font-weight: 400;
+	}
+
+
+	.eqinfo {
+		border-radius: 16rpx;
+		background: rgba(26, 26, 26, 1);
+		box-sizing: border-box;
+		padding: 14rpx 0rpx;
+	}
+
+	.eqinfo .item {
+		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;
+	}
+
+	.eqinfo .lbl {
+		color: rgba(255, 255, 255, 0.87);
+		font-family: PingFang SC;
+		font-size: 28rpx;
+		font-weight: 400;
+
+		letter-spacing: 0.07px;
+		text-align: left;
+	}
+
+	.eqinfo .value {
+		color: rgba(255, 255, 255, 0.6);
+		font-family: PingFang SC;
+		font-size: 28rpx;
+		font-weight: 400;
+
+		letter-spacing: 0.07px;
+		text-align: left;
+	}
+
+	.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;
+
+	}
+
+	.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: flex-start;
+		padding-left: 20rpx;
+	}
+
+	.mode .bigTxt {
+		color: rgba(255, 255, 255, 0.87);
+		font-family: PingFang SC;
+		font-size: 28rpx;
+		font-weight: 400;
+
+		letter-spacing: 0.07px;
+
+	}
+
+	.mode .smallTxt {
+		color: rgba(255, 255, 255, 0.6);
+		font-family: PingFang SC;
+		font-size: 24rpx;
+		font-weight: 400;
+
+		letter-spacing: 0.07px;
+
+	}
+
+	.usrinfo {
+		border-radius: 8px;
+		width: 100%;
+		box-sizing: border-box;
+		padding: 24rpx 28rpx;
+		background: rgba(26, 26, 26, 1);
+	}
+
+	.usrtitle {
+		color: rgba(255, 255, 255, 0.87);
+		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;
+	}
+</style>
\ No newline at end of file
diff --git a/pages/BlueTooth/ModeSetting/HBY6155.vue b/pages/BlueTooth/ModeSetting/HBY6155.vue
new file mode 100644
index 0000000..3ff9f9a
--- /dev/null
+++ b/pages/BlueTooth/ModeSetting/HBY6155.vue
@@ -0,0 +1,1947 @@
+<template>
+	<view class="container">
+		<!-- 蓝牙设备列表页 -->
+		<view v-if="currentPage === 'deviceList'">
+			<view class="title">蓝牙设备列表</view>
+
+			<view class="status-bar">
+				<text>蓝牙状态: {{ bluetoothStatus }}</text>
+				<button class="btn" :disabled="isLoading" @click="toggleBluetooth">
+					{{ isBluetoothOpen ? '关闭蓝牙' : '开启蓝牙' }}
+				</button>
+			</view>
+
+			<view class="search-area">
+				<button class="btn search-btn" :disabled="!isBluetoothOpen || isSearching" @click="startSearch">
+					{{ isSearching ? '正在搜索...' : '搜索设备' }}
+				</button>
+				<text class="tips">{{ searchTips }}</text>
+			</view>
+
+			<view class="devices-list" v-if="deviceList.length > 0">
+				<view class="device-item" v-for="(device, index) in deviceList" :key="index"
+					:class="{'active': device.name === targetDeviceName}"
+					@click="connectDevice(device.deviceId, device.name)">
+					<text class="device-name">{{ device.name || '未知设备' }}</text>
+					<text class="device-rssi">{{ device.RSSI }}dBm</text>
+					<text class="device-status" v-if="device.name === targetDeviceName">已连接</text>
+				</view>
+			</view>
+		</view>
+
+		<!-- 主控制页面 -->
+		<view v-if="currentPage === 'controlPanel'">
+			<view class="title">6155控制器</view>
+
+			<view class="status-bar">
+				<text>已连接: {{ targetDeviceName }}</text>
+				<button class="btn" @click="disconnectDevice(null)">断开连接</button>
+			</view>
+			<view>
+				<text>发送间隔:</text>
+				<input type="number" v-model="inteval" class="txt" />
+			</view>
+
+
+			<view class="function-tabs">
+				<button class="tab-btn" :class="{'active': currentTab === 'device'}" @click="getDevice()">设备信息</button>
+				<button class="tab-btn" :class="{'active': currentTab === 'mode'}"
+					@click="currentTab = 'mode'">主灯模式</button>
+				<button class="tab-btn" :class="{'active': currentTab === 'fumode'}"
+					@click="currentTab = 'fumode'">副灯模式</button>
+				<button class="tab-btn" :class="{'active': currentTab === 'brightness'}"
+					@click="currentTab = 'brightness'">亮度调节</button>
+				<button class="tab-btn" :class="{'active': currentTab === 'splash'}"
+					@click="currentTab = 'splash'">开机画面</button>
+				<button class="tab-btn" :class="{'active': currentTab === 'text'}"
+					@click="currentTab = 'text'">文字设置</button>
+			</view>
+
+			<!-- 设备信息选项卡 -->
+			<view v-if="currentTab === 'device'">
+				<view class="modes-area">
+					<view class="mode-title">固件版本:{{gujianVer}}</view>
+					<view class="mode-title">Mac地址:{{MacAdd}}</view>
+
+
+					<view class="modes-grid">
+						<view class="mode-item" :class="{'selected': currentMode === 'close'}" @click="ReStart()">
+
+							<text class="mode-name">设备重启</text>
+						</view>
+
+						<view class="mode-item" :class="{'selected': currentMode === 'close'}" @click="Restore()">
+
+							<text class="mode-name">恢复出厂设置</text>
+						</view>
+					</view>
+				</view>
+			</view>
+
+
+			<!-- 模式设置选项卡 -->
+			<view v-if="currentTab === 'mode'">
+				<view class="modes-area">
+					<view class="mode-title">选择灯光模式</view>
+					<view class="modes-grid">
+						<view class="mode-item" :class="{'selected': currentMode === 'close'}"
+							@click="setMode('close','main')">
+
+							<text class="mode-name">关闭</text>
+						</view>
+						<view class="mode-item" :class="{'selected': currentMode === 'low'}"
+							@click="setMode('low','main')">
+
+							<text class="mode-name">弱光</text>
+						</view>
+						<view class="mode-item" :class="{'selected': currentMode === 'work'}"
+							@click="setMode('work','main')">
+
+							<text class="mode-name">工作光</text>
+						</view>
+						<view class="mode-item" :class="{'selected': currentMode === 'high'}"
+							@click="setMode('high','main')">
+
+							<text class="mode-name">强光</text>
+						</view>
+
+						<view class="mode-item" :class="{'selected': currentMode === 'flash'}"
+							@click="setMode('flash','main')">
+
+							<text class="mode-name">爆闪</text>
+						</view>
+					</view>
+				</view>
+			</view>
+
+			<view v-if="currentTab === 'fumode'">
+				<view class="modes-area">
+					<view class="mode-title">选择灯光模式</view>
+					<view class="modes-grid">
+						<view class="mode-item" :class="{'selected': fucurrentMode === 'close'}"
+							@click="setMode('close','fu')">
+
+							<text class="mode-name">关闭</text>
+						</view>
+						<view class="mode-item" :class="{'selected': fucurrentMode === 'low'}"
+							@click="setMode('low','fu')">
+
+							<text class="mode-name">弱光</text>
+						</view>
+						<view class="mode-item" :class="{'selected': fucurrentMode === 'work'}"
+							@click="setMode('work','fu')">
+
+							<text class="mode-name">工作光</text>
+						</view>
+						<view class="mode-item" :class="{'selected': fucurrentMode === 'high'}"
+							@click="setMode('high','fu')">
+
+							<text class="mode-name">强光</text>
+						</view>
+
+						<view class="mode-item" :class="{'selected': fucurrentMode === 'flash'}"
+							@click="setMode('flash','fu')">
+
+							<text class="mode-name">爆闪</text>
+						</view>
+					</view>
+				</view>
+			</view>
+
+			<!-- 亮度调节选项卡 -->
+			<view v-if="currentTab === 'brightness'">
+				<view class="brightness-area">
+					<view class="brightness-title">亮度调节</view>
+					<view class="brightness-value">{{ brightness }}%</view>
+					<slider class="brightness-slider" :value="brightness" min="0" max="100"
+						@changing="onBrightnessChanging" @change="onBrightnessChanged" />
+				</view>
+			</view>
+
+			<!-- 开机画面选项卡 -->
+			<view v-if="currentTab === 'splash'">
+				<view class="splash-controls">
+					<button class="btn" @click="importImage">导入图片</button>
+
+					<button class="btn" :disabled="!hasImage || isSending" @click="sendSplashImage">确认发送</button>
+				</view>
+
+				<view class="splash-preview">
+					<view class="splash-frame">
+						<image v-if="tempImagePath" :src="tempImagePath" mode="aspectFill" :style="imageStyle"
+							@touchstart="onTouchStart" @touchmove="onTouchMove" @touchend="onTouchEnd"></image>
+						<view v-else class="empty-frame">点击"导入图片"选择开机画面</view>
+					</view>
+					<view class="frame-info">
+						<text>框选区域: 160×80像素</text>
+						<text v-if="hasImage">缩放: {{ scale.toFixed(2) }}x</text>
+					</view>
+				</view>
+
+				<view class="sending-progress" v-if="isSending">
+					<view class="progress-bar">
+						<view class="progress-fill" :style="{ width: progress + '%' }"></view>
+					</view>
+					<text>正在发送: {{ progress }}% ({{ currentPacket }}/{{ totalPackets }})</text>
+				</view>
+			</view>
+
+			<!-- 文字设置选项卡 -->
+			<view v-if="currentTab === 'text'">
+				<TextToHex class="TextToHex" ref="textToHex" :txts="textLines" :bgColor="'#000000'" :color="'#FFFFFF'"
+					:fontSize="16" />
+				<view class="text-inputs">
+					<view class="text-line" v-for="(line, index) in textLines" :key="index">
+						<text>第{{ index + 1 }}行:</text>
+						<input v-model="textLines[index]" placeholder="请输入文字" maxlength="30"
+							@confirm="onTextChanged(index)" />
+					</view>
+				</view>
+
+				<button class="btn send-text-btn" :disabled="isSendingText" @click="sendText">发送文字</button>
+
+				<view class="sending-progress" v-if="isSendingText">
+					<view class="progress-bar">
+						<view class="progress-fill" :style="{ width: textProgress + '%' }"></view>
+					</view>
+					<text>正在发送: {{ textProgress }}% ({{ currentTextPacket }}/{{ totalTextPackets }})</text>
+				</view>
+			</view>
+		</view>
+
+
+
+		<!-- 隐藏的canvas用于图片处理 -->
+		<canvas canvas-id="splashCanvas" style="width: 160px; height: 80px; z-index: 9999;position: fixed; "
+			:style="{top:canvasTop,left:canvasLeft}"></canvas>
+	</view>
+</template>
+
+<script>
+	import gbk from '@/utils/gbk.js';
+	import TextToHexVue from '@/components/TextToHex/TextToHex.vue';
+	export default {
+		comments: {
+			TextToHexVue
+		},
+		data() {
+			return {
+				gujianVer: '',
+				MacAdd: '',
+
+				canvasTop: '-1000px',
+				canvasLeft: '-1000px',
+				inteval: 100,
+				isLoading: false,
+				isBluetoothOpen: false,
+				isSearching: false,
+				isConnected: false,
+				isSending: false,
+				isSendingText: false,
+				bluetoothStatus: '未初始化',
+				searchTips: '',
+				deviceList: [],
+				connectedDeviceId: '',
+				serviceId: '0xFFE1',
+				writeCharacteristicId: '0xFFE1',
+				notifyCharacteristicId: '0xFFE2',
+				currentMode: '',
+				fucurrentMode: '',
+				logList: [],
+				packetCount: 1,
+				currentPage: 'deviceList',
+				targetDeviceName: 'JQZM-EF4651',
+				currentTab: 'mode',
+				brightness: 50,
+				brightnessTimer: null,
+				tempImagePath: '',
+				hasImage: false,
+				scale: 1,
+				translateX: 0,
+				translateY: 0,
+				lastX: 0,
+				lastY: 0,
+				isDragging: false,
+				progress: 0,
+				currentPacket: 0,
+				totalPackets: 100,
+				imageWidth: 0,
+				imageHeight: 0,
+				textLines: ['你好', '你是谁', '你在哪'],
+				textProgress: 0,
+				currentTextPacket: 0,
+				totalTextPackets: 4
+			}
+		},
+		computed: {
+			imageStyle() {
+				return `transform: scale(${this.scale}) translate(${this.translateX}px, ${this.translateY}px); transform-origin: 0 0;`;
+			}
+		},
+		onLoad() {
+			this.initBluetoothAdapter();
+		},
+		methods: {
+			//获取设备信息
+			getDevice() {
+				this.currentTab = 'device';
+
+
+
+				// 1. 创建 ArrayBuffer 和 DataView
+				var buffer = new ArrayBuffer(4);
+				var dataView = new DataView(buffer);
+
+
+				dataView.setUint8(0, 0x70);
+				dataView.setUint8(1, 0x65);
+				dataView.setUint8(2, 0xA1);
+				dataView.setUint8(3, 0x00);
+
+				this.sendData(buffer).then(() => {
+					console.log("发送命令成功，等待设备响应");
+				}).catch(err => {
+					console.log("发送命令失败", err);
+				});
+			},
+			// 蓝牙初始化
+			initBluetoothAdapter() {
+				console.log('开始初始化蓝牙适配器');
+				uni.openBluetoothAdapter({
+					success: (res) => {
+						this.isBluetoothOpen = true;
+						this.bluetoothStatus = '已开启';
+						console.log('蓝牙适配器初始化成功');
+						this.getBluetoothAdapterState();
+
+						// 自动开始搜索设备
+						this.startSearch();
+					},
+					fail: (err) => {
+						this.bluetoothStatus = '初始化失败';
+						console.log(`蓝牙适配器初始化失败: ${err.errMsg}`);
+						if (err.errCode === 10001) {
+							uni.onBluetoothAdapterStateChange((res) => {
+								if (res.available) {
+									this.isBluetoothOpen = true;
+									this.bluetoothStatus = '已开启';
+									console.log('蓝牙适配器已开启');
+									this.startSearch();
+								}
+							});
+						}
+					}
+				});
+			},
+
+			// 获取蓝牙适配器状态
+			getBluetoothAdapterState() {
+				uni.getBluetoothAdapterState({
+					success: (res) => {
+						this.isBluetoothOpen = res.available;
+						this.bluetoothStatus = res.available ? '已开启' : '已关闭';
+						if (!res.available) {
+							console.log('蓝牙适配器未开启');
+						}
+					}
+				});
+			},
+
+			// 开关蓝牙
+			toggleBluetooth() {
+				if (this.isBluetoothOpen) {
+					this.closeBluetoothAdapter();
+				} else {
+					this.initBluetoothAdapter();
+				}
+			},
+
+			// 关闭蓝牙适配器
+			closeBluetoothAdapter() {
+
+
+				this.stopSearch();
+				this.disconnectDevice(() => {
+					uni.closeBluetoothAdapter({
+						success: () => {
+							console.log("蓝牙已关闭");
+							this.isBluetoothOpen = false;
+							this.isSearching = false;
+							this.isConnected = false;
+							this.bluetoothStatus = '已关闭';
+							this.deviceList = [];
+							this.connectedDeviceId = '';
+							this.currentMode = '';
+							this.currentPage = 'deviceList';
+						}
+					})
+				});
+
+
+
+			},
+
+			// 开始搜索蓝牙设备
+			startSearch() {
+				if (this.isSearching) return;
+
+				this.isSearching = true;
+				this.deviceList = [];
+				this.searchTips = '搜索中...';
+				console.log('开始搜索蓝牙设备');
+
+				uni.startBluetoothDevicesDiscovery({
+					services: ["0xFFE0"],
+					allowDuplicatesKey: false,
+					success: (res) => {
+						console.log('开始搜索蓝牙设备成功');
+						this.onDeviceFound();
+
+
+					},
+					fail: (err) => {
+						this.isSearching = false;
+						this.searchTips = '搜索失败';
+						console.log(`搜索蓝牙设备失败: ${err.errMsg}`);
+					}
+				});
+			},
+
+			// 停止搜索蓝牙设备
+			stopSearch() {
+				this.isSearching = false;
+				this.searchTips = this.deviceList.length > 0 ? '搜索完成' : '未发现蓝牙设备';
+
+				uni.stopBluetoothDevicesDiscovery({
+					success: () => {
+						console.log('停止搜索蓝牙设备');
+					}
+				});
+			},
+
+			// 监听发现新设备
+			onDeviceFound() {
+				uni.onBluetoothDeviceFound((res) => {
+					var device = res.devices[0];
+					if (!device.name && !device.localName) return;
+					// if ((device.name || device.localName) === this.targetDeviceName) {
+					// 检查是否已存在该设备
+					var index = this.deviceList.findIndex(item => item.deviceId === device.deviceId);
+					if (index === -1) {
+						this.deviceList.push({
+							deviceId: device.deviceId,
+							name: device.name || device.localName,
+							RSSI: device.RSSI
+						});
+					} else {
+						// 更新信号强度
+						this.deviceList[index].RSSI = device.RSSI;
+
+					}
+					// }
+
+					// 如果找到目标设备，自动连接
+					if ((device.name || device.localName) === this.targetDeviceName) {
+						console.log(`发现目标设备: ${JSON.stringify(device)}`);
+						this.connectDevice(device.deviceId, this.targetDeviceName);
+					}
+				});
+			},
+
+			// 连接蓝牙设备
+			connectDevice(deviceId, deviceName) {
+				if (this.isConnected && this.connectedDeviceId === deviceId) return;
+
+				this.isLoading = true;
+				console.log(`开始连接设备: ${deviceName}`);
+				var these = this;
+				uni.createBLEConnection({
+					deviceId: deviceId,
+					timeout: 10000,
+					success: (res) => {
+						this.isConnected = true;
+						this.connectedDeviceId = deviceId;
+						this.targetDeviceName = deviceName;
+						console.log(`连接设备 ${deviceName} 成功`);
+						this.enableNotification(deviceId);
+						// 连接成功后切换到控制面板
+						this.currentPage = 'controlPanel';
+
+						setTimeout(function() {
+							uni.setBLEMTU({
+								deviceId: deviceId,
+								mtu: 512,
+								success: (info) => {
+									console.log("设置mtu成功")
+								},
+								fail: (ex) => {
+									console.log("设置mtu失败" + JSON.stringify(ex));
+								}
+							})
+
+							these.getDeviceServices(deviceId);
+						}, 2000)
+						// 获取服务和特征值
+
+
+						// 启用通知
+
+						this.stopSearch();
+					},
+					fail: (err) => {
+						console.log(`连接设备失败: ${JSON.stringify(err)}`);
+						uni.showToast({
+							title: '连接失败',
+							icon: 'none'
+						});
+					},
+					complete: () => {
+						this.isLoading = false;
+					}
+				});
+			},
+
+			// 断开蓝牙连接
+			disconnectDevice(callback) {
+				var these = this;
+
+				if (!this.connectedDeviceId) {
+					this.isConnected = false;
+					this.connectedDeviceId = '';
+					this.currentMode = '';
+					this.currentPage = 'deviceList';
+					if (callback) {
+						callback();
+					}
+					return;
+				}
+				uni.closeBLEConnection({
+					deviceId: this.connectedDeviceId,
+					success: () => {
+
+						console.log('蓝牙连接已断开');
+
+
+					},
+					fail: (ex) => {
+						let arr = [{
+								code: 0,
+								remark: '正常'
+							},
+							{
+								code: 10000,
+								remark: '未初始化蓝牙适配器'
+							},
+							{
+								code: 10001,
+								remark: '当前蓝牙适配器不可用'
+							},
+							{
+								code: 10002,
+								remark: '没有找到指定设备'
+							},
+							{
+								code: 10003,
+								remark: '连接失败'
+							},
+							{
+								code: 10004,
+								remark: '没有找到指定服务'
+							},
+							{
+								code: 10005,
+								remark: '没有找到指定特征值'
+							},
+							{
+								code: 10006,
+								remark: '当前连接已断开'
+							},
+							{
+								code: 10007,
+								remark: '当前特征值不支持此操作'
+							},
+							{
+								code: 10008,
+								remark: '其余所有系统上报的异常'
+							},
+							{
+								code: 10009,
+								remark: 'Android 系统特有，系统版本低于 4.3 不支持 BLE'
+							},
+							{
+								code: 10010,
+								remark: '已连接'
+							},
+							{
+								code: 10011,
+								remark: '配对设备需要配对码'
+							},
+							{
+								code: 10012,
+								remark: '连接超时'
+							},
+							{
+								code: 10013,
+								remark: '连接 deviceId 为空或者是格式不正确'
+							}
+						];
+						let f = arr.find(function(v) {
+							return v.code == ex.code;
+						})
+
+						console.log("无法断开蓝牙连接:" + f.remark);
+
+						uni.showToast({
+							title: "无法断开蓝牙连接:" + f.remark,
+							icon: 'fail'
+						});
+					},
+					complete: () => {
+						this.isConnected = false;
+						this.connectedDeviceId = '';
+						this.currentMode = '';
+						this.currentPage = 'deviceList';
+						if (callback) {
+							callback();
+						}
+					}
+				});
+			},
+
+			// 获取设备服务
+			getDeviceServices(deviceId) {
+				console.log("deviceId=" + deviceId);
+				var these = this;
+				uni.getBLEDeviceServices({
+					deviceId: deviceId,
+					success: (res) => {
+
+						console.log("发现服务" + JSON.stringify(res.services))
+						if (res.services.length == 0) {
+							setTimeout(function() {
+								these.getDeviceServices(deviceId);
+							}, 1000);
+							return;
+						}
+						// 查找目标服务
+						var targetService = res.services.find(service => service.uuid.indexOf('FFE0') > -1);
+
+						if (targetService) {
+							console.log(`找到目标服务: ${targetService.uuid}`);
+							this.serviceId = targetService.uuid;
+							this.getDeviceCharacteristics(deviceId, targetService.uuid);
+						}
+					},
+					fail: (err) => {
+						console.log(`获取设备服务失败: ${err.errMsg}`);
+					}
+				});
+			},
+
+
+			// 获取设备特征值
+			getDeviceCharacteristics(deviceId, serviceId) {
+				var these = this;
+				uni.getBLEDeviceCharacteristics({
+					deviceId: deviceId,
+					serviceId: serviceId,
+					success: (res) => {
+						console.log(`获取设备特征值成功，共发现 ${res.characteristics.length} 个特征值`);
+						console.log(`获取设备特征值成功${JSON.stringify(res.characteristics)}`);
+						// 查找可写特征值
+						var writeChar = res.characteristics.find(char =>
+							char.uuid.indexOf("FFE1") >= 1
+						);
+
+						// 查找通知特征值
+						var notifyChar = res.characteristics.find(char => {
+								return char.properties.notify;
+							}
+
+						);
+
+						if (writeChar) {
+							console.log(`找到可写特征值: ${writeChar.uuid}`);
+							this.writeCharacteristicId = writeChar.uuid;
+						} else {
+							console.log(`未找到可写特征值: ${this.writeCharacteristicId}`);
+						}
+
+						if (notifyChar) {
+							console.log(`找到通知特征值: ${notifyChar.uuid}`);
+							this.notifyCharacteristicId = notifyChar.uuid;
+							console.log("serviceId=" + serviceId);
+							console.log("characteristicId=" + notifyChar.uuid);
+
+							setTimeout(() => {
+								uni.notifyBLECharacteristicValueChange({
+									deviceId: deviceId,
+									serviceId: serviceId,
+									characteristicId: notifyChar.uuid,
+									state: true,
+									success: (info) => {
+										console.log('启用通知成功' + JSON.stringify(info));
+										uni.showToast({
+											title: "订阅消息成功",
+											icon: 'success'
+										});
+										// 监听特征值变化 
+										setTimeout(() => {
+											uni.onBLECharacteristicValueChange((
+												receive) => {
+												console.log("receive=",
+													receive);
+												var hexs = [];
+												var bytesToHex =
+													function(bytes) {
+														return bytes.map(
+															byte =>
+															byte
+															.toString(
+																16)
+															.padStart(
+																2, '0')
+														);
+													}
+
+												var parseData = (
+													bytes) => {
+													try {
+														// 跳过帧头(第一二个字节)，从第三个字节开始解析
+														let type =
+															bytes[2];
+														switch (type) {
+															case 0xA1: //获取设备信息
+																let v1 =
+																	parseInt(
+																		bytes[
+																			3
+																		],
+																		16
+																	);
+																let v2 =
+																	parseInt(
+																		bytes[
+																			4
+																		],
+																		16
+																	);
+																let vers =
+																	`${v1}.${v2}`;
+																console
+																	.log(
+																		hexs[
+																			5
+																		]
+																		.toString()
+																	);
+																let mac =
+																	`${hexs[5]}:${hexs[6]}:${hexs[7]}:${hexs[8]}:${hexs[9]}:${hexs[10]}`;
+																console
+																	.log(
+																		"解析成功,固件版本:" +
+																		vers +
+																		',MAC地址:' +
+																		mac
+																	);
+																these
+																	.MacAdd =
+																	mac;
+																these
+																	.gujianVer =
+																	vers;
+																break;
+															case 0xB2: //设备主动上报数据
+																let main =
+																	bytes[
+																		3
+																	]; //主灯																		
+																if (main ==
+																	0x00
+																) {
+																	main =
+																		'关闭';
+																	these
+																		.currentMode =
+																		'close';
+																} else if (
+																	main ==
+																	0x01
+																) {
+																	main =
+																		'弱光模式';
+																	these
+																		.currentMode =
+																		'low';
+																} else if (
+																	main ==
+																	0x02
+																) {
+																	main =
+																		'工作光模式';
+																	these
+																		.currentMode =
+																		'work';
+																} else if (
+																	main ==
+																	0x03
+																) {
+																	main =
+																		'强光模式';
+																	these
+																		.currentMode =
+																		'high';
+																} else if (
+																	main ==
+																	0x04
+																) {
+																	main =
+																		'爆闪模式';
+																	these
+																		.currentMode =
+																		'flash';
+																}
+																let fu =
+																	bytes[
+																		4
+																	]; //副灯
+																if (fu ==
+																	0x00
+																) {
+																	fu = '关闭'
+																} else if (
+																	fu ==
+																	0x01
+																) {
+																	fu = '弱光模式'
+																} else if (
+																	fu ==
+																	0x02
+																) {
+																	fu = '工作光模式'
+																} else if (
+																	fu ==
+																	0x03
+																) {
+																	fu = '强光模式'
+																} else if (
+																	fu ==
+																	0x04
+																) {
+																	fu = '爆闪模式'
+																}
+
+																let battery =
+																	bytes[
+																		5
+																	]; //电量
+																let batteryLevel =
+																	Math
+																	.max(
+																		0,
+																		Math
+																		.min(
+																			100,
+																			battery
+																		)
+																	); //电量百分比
+
+																let addBatt =
+																	bytes[
+																		6
+																	]; //充电状态
+																if (addBatt ==
+																	0x00
+																) {
+																	addBatt
+																		=
+																		"未充电"
+																} else if (
+																	addBatt ==
+																	0x01
+																) {
+																	addBatt
+																		=
+																		"充电中"
+																} else if (
+																	addBatt ==
+																	0x02
+																) {
+																	addBatt
+																		=
+																		"已充满"
+																}
+
+																let lightingTime =
+																	(bytes[
+																			7
+																		] <<
+																		8
+																	) |
+																	bytes[
+																		8
+																	]; //续航时间
+
+																console
+																	.log(
+																		"解析成功,主灯模式:" +
+																		main +
+																		',副灯模式:' +
+																		fu +
+																		",电量:" +
+																		batteryLevel +
+																		"%,充电状态:" +
+																		addBatt +
+																		",续航时间:" +
+																		lightingTime +
+																		"分钟"
+																	);
+																break;
+															default:
+																console
+																	.log(
+																		"收到了未知的类型数据,无法解析"
+																	);
+																try {
+																	var uint8Array =
+																		new Uint8Array(
+																			receive
+																			.value
+																		);
+																	let str =
+																		'';
+																	for (
+																		let i =
+																			0; i <
+																		uint8Array
+																		.length; i++
+																	) {
+																		// 将每个字节转换为对应的字符
+																		str +=
+																			String
+																			.fromCharCode(
+																				uint8Array[
+																					i
+																				]
+																			);
+																	}
+																	console
+																		.log(
+																			"将数据转文本",
+																			str
+																		);
+																} catch (
+																	ex
+																) {
+																	console
+																		.log(
+																			"将数据转文本失败",
+																			ex
+																		);
+																}
+																break;
+
+														}
+
+
+
+													} catch (error) {
+														console.error(
+															'数据解析错误:',
+															error);
+													}
+												}
+
+												var dataView =
+													new DataView(receive
+														.value);
+												console.log("dataView=",
+													dataView);
+												// 转换为字节数组
+												var bytes = [];
+												for (let i = 0; i <
+													dataView
+													.byteLength; i++) {
+													bytes.push(dataView
+														.getUint8(i));
+												}
+
+												// 保存原始数据用于调试
+												this.receivedData = bytes;
+												hexs = bytesToHex(bytes);
+												console.log('接收到原始数据:',
+													hexs.join(' '));
+
+												parseData(bytes);
+
+											});
+										}, 100)
+
+									},
+									fail: (err) => {
+										console.error('启用通知失败', err);
+									}
+								});
+							}, 500);
+
+						} else {
+							console.log(`未找到通知特征值: ${this.notifyCharacteristicId}`);
+						}
+
+
+
+					},
+					fail: (err) => {
+						console.log(`获取设备特征值失败: ${err.errMsg}`);
+					}
+				});
+			},
+
+			// 启用通知
+			enableNotification(deviceId) {
+				uni.notifyBLECharacteristicValueChange({
+					deviceId: deviceId,
+					serviceId: this.serviceId,
+					characteristicId: this.notifyCharacteristicId,
+					state: true,
+					success: () => {
+						console.log('启用通知成功');
+
+						// 监听通知
+						uni.onBLECharacteristicValueChange((res) => {
+							this.handleNotification(res.value);
+						});
+					},
+					fail: (err) => {
+						console.log(`启用通知失败: ${err.errMsg}`);
+					}
+				});
+			},
+
+			// 处理通知数据
+			handleNotification(buffer) {
+				console.log("收到设备通知数据")
+				// 解析从设备接收的数据
+				var dataView = new DataView(buffer);
+				let result = '';
+
+				for (let i = 0; i < dataView.byteLength; i++) {
+					result += String.fromCharCode(dataView.getUint8(i));
+				}
+
+				console.log(`收到设备数据: ${result}`);
+			},
+
+			// 设置灯光模式
+			setMode(mode, type) {
+				if (!this.isConnected) {
+					uni.showToast({
+						title: '未连接设备',
+						icon: 'none'
+					});
+					return;
+				}
+				if (type == 'main') {
+					if (this.currentMode === mode) return;
+					type = 0x04;
+				} else if (type == 'fu') {
+					if (this.fucurrentMode === mode) return;
+					type = 0x05;
+				}
+
+				this.currentMode = mode;
+				let dataValue = 0;
+
+				switch (mode) {
+					case 'close':
+						dataValue = 0x00;
+						break;
+					case 'low':
+						dataValue = 0x01;
+						break;
+					case 'work':
+						dataValue = 0x02;
+						break;
+					case 'high':
+						dataValue = 0x03;
+						break;
+					case 'flash':
+						dataValue = 0x04;
+						break;
+
+				}
+
+				// 构建数据包
+				var buffer = new ArrayBuffer(4);
+				var dataView = new DataView(buffer);
+
+				dataView.setUint8(0, 0x70); // 帧头
+				dataView.setUint8(1, 0x65); // 帧头
+				dataView.setUint8(2, type); // 帧类型
+
+				dataView.setUint8(3, dataValue); // 数据
+
+				// 发送数据
+				this.sendData(buffer);
+			},
+
+			// 亮度调节
+			onBrightnessChanging(e) {
+				this.brightness = e.detail.value;
+
+				// 清除之前的定时器
+				if (this.brightnessTimer) {
+					clearTimeout(this.brightnessTimer);
+				}
+
+				// 设置新的定时器，控制发送频率
+				this.brightnessTimer = setTimeout(() => {
+					this.sendBrightness();
+				}, 100);
+			},
+
+			onBrightnessChanged(e) {
+				this.brightness = e.detail.value;
+				//this.sendBrightness();
+			},
+
+			sendBrightness() {
+				if (!this.isConnected) return;
+
+				// 构建数据包
+				var buffer = new ArrayBuffer(4);
+				var dataView = new DataView(buffer);
+				let data = '0x' + parseInt(this.brightness).toString(16);
+				console.log("亮度:" + this.brightness + ',16进制:' + data);
+				dataView.setUint8(0, 0x70); // 帧头
+				dataView.setUint8(1, 0x65); // 帧类型：亮度调节
+				dataView.setUint8(2, 0x09); // 包序号				
+				dataView.setUint8(3, data); // 数据
+
+				// 发送数据
+				this.sendData(buffer);
+			},
+
+			// 导入图片
+			importImage() {
+				uni.chooseImage({
+					count: 1,
+					sourceType: ['album'],
+					success: (res) => {
+						this.tempImagePath = res.tempFilePaths[0];
+						this.hasImage = true;
+						this.scale = 1;
+						this.translateX = 0;
+						this.translateY = 0;
+
+						// 获取图片尺寸
+						uni.getImageInfo({
+							src: this.tempImagePath,
+							success: (info) => {
+								this.imageWidth = info.width;
+								this.imageHeight = info.height;
+								this.autoFitImage();
+								console.log('图片导入成功，请调整图片位置和大小');
+							},
+							fail: (err) => {
+								console.log(`获取图片信息失败: ${err.errMsg}`);
+							}
+						});
+					},
+					fail: (err) => {
+						console.log(`选择图片失败: ${err.errMsg}`);
+					}
+				});
+			},
+
+			// 自动适配图片到容器
+			autoFitImage() {
+				var frameWidth = 320; // 预览框宽度，根据实际UI调整
+				var frameHeight = 640; // 预览框高度，根据实际UI调整
+
+				var widthRatio = frameWidth / this.imageWidth;
+				var heightRatio = frameHeight / this.imageHeight;
+
+				// 取较小的缩放比例，确保图片能完全显示在容器内
+				this.scale = Math.min(widthRatio, heightRatio);
+
+				// 居中显示
+				this.translateX = (frameWidth - this.imageWidth * this.scale) / 2;
+				this.translateY = (frameHeight - this.imageHeight * this.scale) / 2;
+			},
+
+			// 触摸事件处理
+			onTouchStart(e) {
+				if (e.touches.length === 1) {
+					this.isDragging = true;
+					this.lastX = e.touches[0].clientX;
+					this.lastY = e.touches[0].clientY;
+				}
+			},
+
+			onTouchMove(e) {
+				if (this.isDragging && e.touches.length === 1) {
+					var currentX = e.touches[0].clientX;
+					var currentY = e.touches[0].clientY;
+
+					// 计算位移
+					var deltaX = currentX - this.lastX;
+					var deltaY = currentY - this.lastY;
+
+					// 更新位置
+					this.translateX += deltaX;
+					this.translateY += deltaY;
+
+					// 限制移动范围
+					this.limitImagePosition();
+
+					// 更新最后位置
+					this.lastX = currentX;
+					this.lastY = currentY;
+				}
+			},
+
+			onTouchEnd() {
+				this.isDragging = false;
+			},
+
+			// 限制图片移动范围
+			limitImagePosition() {
+				var frameWidth = 320; // 预览框宽度，根据实际UI调整
+				var frameHeight = 640; // 预览框高度，根据实际UI调整
+
+				var maxX = 0;
+				var minX = frameWidth - this.imageWidth * this.scale;
+				var maxY = 0;
+				var minY = frameHeight - this.imageHeight * this.scale;
+
+				this.translateX = Math.max(minX, Math.min(maxX, this.translateX));
+				this.translateY = Math.max(minY, Math.min(maxY, this.translateY));
+			},
+
+			// 发送开机画面
+			sendSplashImage() {
+				if (!this.hasImage) {
+					uni.showToast({
+						title: '请先导入图片',
+						icon: 'none'
+					});
+					return;
+				}
+
+				uni.showLoading({
+					title: '处理图片中...',
+					mask: true
+				});
+
+				// 将图片转换为RGB565格式并发送
+				this.convertAndSendImage().then(() => {
+					uni.hideLoading();
+					console.log('开机画面发送完成');
+					uni.showToast({
+						title: '开机画面发送完成',
+						icon: 'success'
+					});
+				}).catch((error) => {
+					uni.hideLoading();
+					console.log(`图片发送失败: ${error}`);
+					uni.showToast({
+						title: '图片发送失败',
+						icon: 'none'
+					});
+				});
+			},
+
+			// 转换图片并发送
+			convertAndSendImage() {
+				return new Promise((resolve, reject) => {
+					console.log("111111");
+					// 创建canvas用于处理图片
+					var ctx = uni.createCanvasContext('splashCanvas', this);
+					console.log("2222222");
+					// 绘制图片到canvas
+					ctx.drawImage(this.tempImagePath, 0, 0, 160, 80);
+					console.log("33333333");
+					try {
+						ctx.draw(false, () => {
+							console.log("4444444");
+							// 获取canvas像素数据
+							this.canvasTop = '0px';
+							this.canvasLeft = '0px';
+							setTimeout(() => {
+								uni.canvasGetImageData({
+									canvasId: 'splashCanvas',
+									x: 0,
+									y: 0,
+									width: 160,
+									height: 80,
+									success: (res) => {
+										// 处理像素数据并发送
+										console.log("res.data.length=" + res.data
+											.length);
+										this.processAndSendImageData(res.data).then(
+											resolve).catch(reject);
+									},
+									fail: (err) => {
+										reject(`获取canvas数据失败: ${err.errMsg}`);
+									}
+								});
+							}, 300); // 等待canvas绘制完成
+						});
+					} catch (ex) {
+						console.log("出现异常" + JSON.stringify(ex))
+					}
+
+				});
+			},
+
+			// 处理像素数据并发送
+			processAndSendImageData(pixels) {
+				return new Promise((resolve, reject) => {
+					// 创建RGB565格式的像素数据
+					var rgb565Data = this.convertToRGB565(pixels, 160, 80);
+					// console.log("rgb565Data=,",rgb565Data);
+					// 分包发送
+					this.sendImagePackets(rgb565Data).then(resolve).catch(reject);
+				});
+			},
+
+			// 将RGBA转换为RGB565
+			convertToRGB565(pixels, width, height) {
+
+				if (!width) {
+					width = 160;
+				}
+
+				if (!height) {
+					height = 80;
+				}
+				var result = new Uint16Array(width * height);
+				let index = 0;
+
+				for (let i = 0; i < pixels.length; i += 4) {
+					var r = pixels[i];
+					var g = pixels[i + 1];
+					var b = pixels[i + 2];
+
+					// 转换为RGB565 (R:5bit, G:6bit, B:5bit)
+					var rgb565 = ((r & 0xF8) << 8) | ((g & 0xFC) << 3) | (b >> 3);
+					//let rgb565=rgbaToRgb565(r,g,b);
+					result[index++] = rgb565;
+				}
+
+				return result;
+			},
+
+			// 分包发送图片数据
+			sendImagePackets(imageData) {
+				return new Promise((resolve, reject) => {
+					this.isSending = true;
+					this.progress = 0;
+					this.currentPacket = 0;
+
+					// 总数据包数
+
+					let currentPacket = 1;
+					let packetSize = 120;
+					let mode = imageData.length % packetSize;
+					let totalPackets = parseInt(imageData.length / packetSize) + (mode > 0 ? 1 : 0)
+					let inteval = parseInt(this.inteval ? this.inteval : 100);
+					this.totalPackets = totalPackets;
+					// 发送单个数据包
+					var sendNextPacket = () => {
+						if (currentPacket > totalPackets) {
+							this.isSending = false;
+							resolve();
+							return;
+						}
+
+						var start = 0;
+						var dataLength = 0;
+						var bufferSize = 0;
+						if (currentPacket == 1) {
+							bufferSize = packetSize * 2 + 5;
+							dataLength = packetSize * 2;
+							start = 5;
+						} else if (currentPacket == totalPackets) {
+							bufferSize = mode > 0 ? (mode * 2) : (packetSize * 2);
+							dataLength = bufferSize
+						} else {
+							bufferSize = packetSize * 2;
+							dataLength = bufferSize;
+						}
+						// 创建数据包
+						var startIndex = (currentPacket - 1) * packetSize;
+						var endIndex = Math.min(startIndex + packetSize, imageData.length);
+						if (startIndex > endIndex) {
+							return;
+						}
+
+						var packetData = imageData.slice(startIndex,
+							endIndex); // imageData.subarray(startIndex, endIndex);
+
+						// 构建数据包
+
+
+						var buffer = new ArrayBuffer(bufferSize);
+						var dataView = new DataView(buffer);
+
+						if (currentPacket == 1) { //第一包要填充头部
+							// 填充头部
+							dataView.setUint8(0, 0x70); // 帧头
+							dataView.setUint8(1, 0x65); // 帧类型：开机画面
+							dataView.setUint8(2, 0x0A); // 包序号
+							dataView.setUint16(3, dataLength, false);
+						}
+						//console.log("packetSize="+packetSize+",startIndex="+startIndex+",endIndex="+endIndex+",imageData.length="+imageData.length+",start="+start+",packetData.length="+packetData.length);
+						for (let i = 0; i < packetData.length; i++) {
+							dataView.setUint16(start + i * 2, packetData[i], false); //大端字节序
+						}
+
+						//发送数据包
+						this.sendData(buffer).then(() => {
+							// 更新进度
+							this.currentPacket = currentPacket;
+							this.progress = Math.round((currentPacket / totalPackets) * totalPackets);
+
+							currentPacket++;
+
+							setTimeout(sendNextPacket, inteval);
+						}).catch(err => {
+
+							if (err.code == 10007) {
+								setTimeout(sendNextPacket, inteval);
+								return;
+							}
+							this.isSending = false;
+							reject(err);
+						});
+					};
+
+					//牵着你的手
+					// var HoldYouHand = () => {
+					// 	var str = "transmit start"; //握手的协议字符串
+
+
+					// 	// 1. 创建 ArrayBuffer 和 DataView
+					// 	var buffer = new ArrayBuffer(str.length);
+					// 	var dataView = new DataView(buffer);
+
+					// 	// 2. 将字符串转换为 ASCII 码并写入 DataView
+					// 	for (let i = 0; i < str.length; i++) {
+					// 		dataView.setUint8(i, str.charCodeAt(i));
+					// 	}
+
+					// 	this.sendData(buffer).then(() => {
+					// 		// 开始发送第一个包
+					// 		console.log("握手成功了,等待500ms");
+					// 		setTimeout(sendNextPacket, 500);
+
+					// 	}).catch(err => {
+					// 		console.log("握手没有成功");
+					// 		reject(err);
+					// 	});
+					// }
+
+					sendNextPacket();
+
+				});
+			},
+
+			// 文字输入变化
+			onTextChanged(index) {
+				console.log(`第${index + 1}行文字已更新`);
+			},
+
+			// 发送文字
+			async sendText() {
+
+				var sendTxtPackge = (rgbdata, type, str) => {
+
+					var promise = new Promise((resolve, reject) => {
+						try {
+
+							let packetSize = 120; //每包均分的数量
+							let mode = rgbdata.length % packetSize; //最后一包的数量
+							let cnt = parseInt(rgbdata.length / packetSize) + (mode > 0 ? 1 : 0); //总包数量
+							let curr = 1; //当前包序号
+
+							let sendNext = () => {
+
+								if (curr > cnt) {
+									resolve();
+									return;
+								}
+								console.log("正在发送" + curr + "/" + cnt)
+								let bufferSize = 0;
+								if (curr == 1) {
+									bufferSize = packetSize * 2 + 5;
+								} else if (curr == cnt) {
+									bufferSize = mode > 0 ? (mode * 2) : (packetSize * 2);
+								} else {
+									bufferSize = packetSize * 2;
+								}
+
+								let buffer = new ArrayBuffer(bufferSize);
+								let dataView = new DataView(buffer);
+								let startIndex = (curr - 1) * packetSize;
+
+								let endIndex = Math.min(startIndex + packetSize, rgbdata.length);
+								if (startIndex > endIndex) {
+									return;
+								}
+
+								let packetData = rgbdata.slice(startIndex, endIndex); //取一片数据发送
+
+								let start = 0;
+								if (curr == 1) {
+									dataView.setUint8(0, 0x70);
+									dataView.setUint8(1, 0x65);
+									dataView.setUint8(2, type);
+									dataView.setUint16(3, str.length, false);
+									start = 5;
+								}
+								for (let i = 0; i < packetData.length; i++) {
+									dataView.setUint16(start + i * 2, packetData[i], false); // 大端字节序
+								}
+
+								let inteval = parseInt(this.inteval ? this.inteval : 0);
+
+								//发送数据包
+								this.sendData(buffer).then(() => {
+									console.log("发送成功,准备发送下一包" + curr)
+									curr++;
+									setTimeout(sendNext, inteval);
+								}).catch(err => {
+									console.log("出现错误", err)
+									if (err.code == '10007') {
+										setTimeout(sendNext, inteval);
+									} else {
+										reject(err);
+									}
+								});
+
+							}
+
+							sendNext();
+						} catch (ex) {
+							console.log("出现异常", ex)
+							reject(ex);
+						}
+					});
+
+					return promise;
+
+				}
+				var result = await this.$refs.textToHex.drawAndGetPixels();
+
+
+				let h3dic = [0x06, 0x07, 0x08];
+				let pros = [];
+				let flag = true;
+				for (var i = 0; i < result.length; i++) {
+
+					let str = this.textLines[i];
+
+					if (str.length > 0) {
+
+						let width = str.length * 16;
+						var rgb = this.convertToRGB565(result[i].pixelData, width, 16);
+						try {
+							await sendTxtPackge(rgb, h3dic[i], str);
+						} catch (ex) {
+							flag = false;
+							break;
+						}
+					}
+
+
+				}
+				if (flag) {
+					uni.showModal({
+						title: "提示",
+						content: "发送成功"
+
+					})
+
+				} else {
+					uni.showModal({
+						title: "错误",
+						content: "出现了异常发送失败"
+					})
+				}
+			},
+
+
+			// 发送数据通用方法
+			sendData(buffer) {
+
+				return new Promise((resolve, reject) => {
+					uni.writeBLECharacteristicValue({
+						deviceId: this.connectedDeviceId,
+						serviceId: this.serviceId,
+						characteristicId: this.writeCharacteristicId,
+						value: buffer,
+						success: () => {
+							console.log("发送数据成功");
+							resolve();
+						},
+						fail: (err) => {
+							console.log("发送数据失败");
+							reject(`发送数据失败: ${err.errMsg}`);
+						}
+					});
+				});
+			},
+
+			// 添加日志
+			addLog(message) {
+
+			},
+			ReStart() { //重启
+				if (!this.isConnected) return;
+
+				// 构建数据包
+				var buffer = new ArrayBuffer(4);
+				var dataView = new DataView(buffer);
+				let data = '0x' + parseInt(this.brightness).toString(16);
+				console.log("亮度:" + this.brightness + ',16进制:' + data);
+				dataView.setUint8(0, 0x70); // 帧头
+				dataView.setUint8(1, 0x65); // 帧类型：亮度调节
+				dataView.setUint8(2, 0x0C); // 包序号				
+				dataView.setUint8(3, 0x01); // 数据
+
+				// 发送数据
+				this.sendData(buffer);
+			},
+			Restore() { //恢复出厂设置
+				if (!this.isConnected) return;
+
+				// 构建数据包
+				var buffer = new ArrayBuffer(4);
+				var dataView = new DataView(buffer);
+				let data = '0x' + parseInt(this.brightness).toString(16);
+				console.log("亮度:" + this.brightness + ',16进制:' + data);
+				dataView.setUint8(0, 0x70); // 帧头
+				dataView.setUint8(1, 0x65); // 帧类型：亮度调节
+				dataView.setUint8(2, 0x0D); // 包序号				
+				dataView.setUint8(3, 0x01); // 数据
+
+				// 发送数据
+				this.sendData(buffer);
+
+			}
+		},
+		onUnload() {
+
+			this.closeBluetoothAdapter();
+		}
+	}
+</script>
+
+<style>
+	.container {
+		padding: 20rpx;
+		background-color: #f8f8f8;
+		min-height: 100vh;
+	}
+
+	.title {
+		font-size: 36rpx;
+		font-weight: bold;
+		text-align: center;
+		padding: 20rpx 0;
+		color: #333;
+	}
+
+	.status-bar {
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		padding: 15rpx 0;
+		border-bottom: 1rpx solid #eee;
+	}
+
+	.function-tabs {
+		display: flex;
+		margin: 20rpx 0;
+	}
+
+	.tab-btn {
+		flex: 1;
+		padding: 15rpx 0;
+		text-align: center;
+		font-size: 28rpx;
+		border-bottom: 2rpx solid #eee;
+	}
+
+	.tab-btn.active {
+		color: #409eff;
+		border-bottom: 2rpx solid #409eff;
+	}
+
+	/* 设备列表样式 */
+	.search-area {
+		padding: 20rpx 0;
+	}
+
+	.search-btn {
+		background-color: #409eff;
+		color: white;
+	}
+
+	.tips {
+		color: #999;
+		font-size: 24rpx;
+		margin-top: 10rpx;
+	}
+
+	.devices-list {
+		margin-top: 20rpx;
+	}
+
+	.device-item {
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		padding: 20rpx;
+		background-color: white;
+		border-radius: 10rpx;
+		margin-bottom: 15rpx;
+		box-shadow: 0 2rpx 10rpx rgba(0, 0, 0, 0.05);
+	}
+
+	.device-item.active {
+		background-color: #e8f3ff;
+		border-left: 6rpx solid #409eff;
+	}
+
+	.device-name {
+		font-size: 28rpx;
+		max-width: 500rpx;
+		white-space: nowrap;
+		overflow: hidden;
+		text-overflow: ellipsis;
+	}
+
+	.device-rssi {
+		color: #999;
+		font-size: 24rpx;
+	}
+
+	.device-status {
+		color: #409eff;
+		font-size: 24rpx;
+	}
+
+	/* 模式设置样式 */
+	.modes-area {
+		margin-top: 30rpx;
+	}
+
+	.mode-title {
+		font-size: 28rpx;
+		font-weight: bold;
+		margin-bottom: 20rpx;
+		color: #333;
+	}
+
+	.modes-grid {
+		display: flex;
+		flex-wrap: wrap;
+		justify-content: space-between;
+	}
+
+	.mode-item {
+		width: 30%;
+		padding: 20rpx 0;
+		background-color: white;
+		border-radius: 10rpx;
+		margin-top: 20rpx;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		box-shadow: 0 2rpx 10rpx rgba(0, 0, 0, 0.05);
+	}
+
+	.mode-item.selected {
+		background-color: #e8f3ff;
+		border: 2rpx solid #409eff;
+	}
+
+	.mode-icon {
+		font-size: 40rpx;
+		margin-bottom: 10rpx;
+	}
+
+	.mode-name {
+		font-size: 26rpx;
+	}
+
+	/* 亮度调节样式 */
+	.brightness-area {
+		margin-top: 30rpx;
+		padding: 20rpx;
+		background-color: white;
+		border-radius: 10rpx;
+		box-shadow: 0 2rpx 10rpx rgba(0, 0, 0, 0.05);
+	}
+
+	.brightness-title {
+		font-size: 28rpx;
+		font-weight: bold;
+		margin-bottom: 20rpx;
+		color: #333;
+	}
+
+	.brightness-value {
+		font-size: 36rpx;
+		text-align: center;
+		margin-bottom: 30rpx;
+		color: #409eff;
+	}
+
+	.brightness-slider {
+		width: 100%;
+	}
+
+	/* 开机画面样式 */
+	.splash-controls {
+		display: flex;
+		justify-content: center;
+		gap: 20rpx;
+		margin: 20rpx 0;
+	}
+
+	.splash-preview {
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+	}
+
+	.splash-frame {
+		height: 320rpx;
+		width: 640rpx;
+		border: 2rpx solid #409eff;
+		border-radius: 8rpx;
+		overflow: hidden;
+		position: relative;
+		background-color: #f0f0f0;
+	}
+
+	.empty-frame {
+		width: 100%;
+		height: 100%;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		color: #999;
+		font-size: 24rpx;
+	}
+
+	.frame-info {
+		margin-top: 15rpx;
+		color: #666;
+		font-size: 24rpx;
+	}
+
+	.sending-progress {
+		margin-top: 30rpx;
+		width: 100%;
+	}
+
+	.progress-bar {
+		height: 12rpx;
+		background-color: #e0e0e0;
+		border-radius: 6rpx;
+		overflow: hidden;
+	}
+
+	.progress-fill {
+		height: 100%;
+		background-color: #409eff;
+		transition: width 0.3s;
+	}
+
+	/* 文字设置样式 */
+	.text-inputs {
+		margin-top: 30rpx;
+		background-color: white;
+		border-radius: 10rpx;
+		box-shadow: 0 2rpx 10rpx rgba(0, 0, 0, 0.05);
+		padding: 20rpx;
+	}
+
+	.text-line {
+		display: flex;
+		align-items: center;
+		margin-bottom: 20rpx;
+	}
+
+	.text-line text {
+		width: 80rpx;
+		font-size: 26rpx;
+	}
+
+	.text-line input {
+		flex: 1;
+		height: 60rpx;
+		padding: 0 15rpx;
+		border: 1rpx solid #eee;
+		border-radius: 8rpx;
+		font-size: 26rpx;
+	}
+
+	.send-text-btn {
+		margin-top: 20rpx;
+		background-color: #409eff;
+		color: white;
+	}
+
+	/* 日志区域样式 */
+	.log-area {
+		margin-top: 30rpx;
+	}
+
+	.log-title {
+		font-size: 28rpx;
+		font-weight: bold;
+		margin-bottom: 15rpx;
+		color: #333;
+	}
+
+	.log-content {
+		height: 200rpx;
+		background-color: white;
+		border-radius: 10rpx;
+		padding: 15rpx;
+		font-size: 24rpx;
+		color: #666;
+	}
+
+	.log-item {
+		margin-bottom: 8rpx;
+	}
+
+	.btn {
+		padding: 10rpx 20rpx;
+		border-radius: 8rpx;
+		font-size: 26rpx;
+		text-align: center;
+	}
+
+	.btn[disabled] {
+		opacity: 0.5;
+	}
+
+	.txt {
+		border: 1px solid #000000;
+	}
+
+	.TextToHex {
+		position: fixed;
+		top: -99999rpx;
+		left: -99999rpx;
+		visibility: hidden;
+	}
+</style>
\ No newline at end of file
diff --git a/pages/BlueTooth/ModeSetting/HBY6155V1.vue b/pages/BlueTooth/ModeSetting/HBY6155V1.vue
new file mode 100644
index 0000000..06aa86a
--- /dev/null
+++ b/pages/BlueTooth/ModeSetting/HBY6155V1.vue
@@ -0,0 +1,1925 @@
+<template>
+	<view class="container">
+		<!-- 蓝牙设备列表页 -->
+		<view v-if="currentPage === 'deviceList'">
+			<view class="title">蓝牙设备列表</view>
+
+			<view class="status-bar">
+				<text>蓝牙状态: {{ bluetoothStatus }}</text>
+				<button class="btn" :disabled="isLoading" @click="toggleBluetooth">
+					{{ isBluetoothOpen ? '关闭蓝牙' : '开启蓝牙' }}
+				</button>
+			</view>
+
+			<view class="search-area">
+				<button class="btn search-btn" :disabled="!isBluetoothOpen || isSearching" @click="startSearch">
+					{{ isSearching ? '正在搜索...' : '搜索设备' }}
+				</button>
+				<text class="tips">{{ searchTips }}</text>
+			</view>
+
+			<view class="devices-list" v-if="deviceList.length > 0">
+				<view class="device-item" v-for="(device, index) in deviceList" :key="index"
+					:class="{'active': device.name === targetDeviceName}"
+					@click="connectDevice(device.deviceId, device.name,device)">
+					<text class="device-name">{{ device.name || '未知设备' }}</text>
+					<text class="device-rssi">{{ device.RSSI }}dBm</text>
+					<text class="device-status" v-if="device.name === targetDeviceName">已连接</text>
+				</view>
+			</view>
+		</view>
+
+		<!-- 主控制页面 -->
+		<view v-if="currentPage === 'controlPanel'">
+			<view class="title">6155控制器</view>
+
+			<view class="status-bar">
+				<text>已连接: {{ targetDeviceName }}</text>
+				<button class="btn" @click="disconnectDevice(null)">断开连接</button>
+			</view>
+			
+			<view class="receivLog">
+				<view>数据更新时间：{{receiveData.date}}</view>
+				<view class="w50 fleft">Mac地址:{{receiveData.macAddress}}</view>
+				<view class="w50 fleft">主灯模式:{{receiveData.mainMode}}</view>
+				<view class="w50 fleft">副灯模式:{{receiveData.fuMode}}</view>
+				<view class="w50 fleft">电池电量:{{receiveData.batteryCnt}}</view>
+				<view class="w50 fleft">充电状态:{{receiveData.batteryStatu}}</view>				
+				<view class="w50 fleft">续航时间:{{receiveData.time}}</view>
+				<view class="clear"></view>
+			</view>
+			
+			
+			<view>
+				<text>发送间隔:</text>
+				<input type="number" v-model="inteval" class="txt" />
+			</view>
+
+
+			<view class="function-tabs">
+				<button class="tab-btn" :class="{'active': currentTab === 'device'}" @click="getDevice()">设备信息</button>
+				<button class="tab-btn" :class="{'active': currentTab === 'mode'}"
+					@click="currentTab = 'mode'">主灯模式</button>
+				<button class="tab-btn" :class="{'active': currentTab === 'fumode'}"
+					@click="currentTab = 'fumode'">副灯模式</button>
+				<button class="tab-btn" :class="{'active': currentTab === 'brightness'}"
+					@click="currentTab = 'brightness'">亮度调节</button>
+				<button class="tab-btn" :class="{'active': currentTab === 'splash'}"
+					@click="currentTab = 'splash'">开机画面</button>
+				<button class="tab-btn" :class="{'active': currentTab === 'text'}"
+					@click="currentTab = 'text'">文字设置</button>
+			</view>
+
+			<!-- 设备信息选项卡 -->
+			<view v-if="currentTab === 'device'">
+				<view class="modes-area">
+					<view class="mode-title">固件版本:{{gujianVer}}</view>
+					<view class="mode-title">Mac地址:{{MacAdd}}</view>
+
+
+					<view class="modes-grid">
+						<view class="mode-item" :class="{'selected': currentMode === 'close'}" @click="ReStart()">
+
+							<text class="mode-name">设备重启</text>
+						</view>
+
+						<view class="mode-item" :class="{'selected': currentMode === 'close'}" @click="Restore()">
+
+							<text class="mode-name">恢复出厂设置</text>
+						</view>
+					</view>
+				</view>
+			</view>
+
+
+			<!-- 模式设置选项卡 -->
+			<view v-if="currentTab === 'mode'">
+				<view class="modes-area">
+					<view class="mode-title">选择灯光模式</view>
+					<view class="modes-grid">
+						<view class="mode-item" :class="{'selected': currentMode === 'close'}"
+							@click="setMode('close','main')">
+
+							<text class="mode-name">关闭</text>
+						</view>
+						<view class="mode-item" :class="{'selected': currentMode === 'low'}"
+							@click="setMode('low','main')">
+
+							<text class="mode-name">弱光</text>
+						</view>
+						<view class="mode-item" :class="{'selected': currentMode === 'work'}"
+							@click="setMode('work','main')">
+
+							<text class="mode-name">工作光</text>
+						</view>
+						<view class="mode-item" :class="{'selected': currentMode === 'high'}"
+							@click="setMode('high','main')">
+
+							<text class="mode-name">强光</text>
+						</view>
+
+						<view class="mode-item" :class="{'selected': currentMode === 'flash'}"
+							@click="setMode('flash','main')">
+
+							<text class="mode-name">爆闪</text>
+						</view>
+					</view>
+				</view>
+			</view>
+
+			<view v-if="currentTab === 'fumode'">
+				<view class="modes-area">
+					<view class="mode-title">选择灯光模式</view>
+					<view class="modes-grid">
+						<view class="mode-item" :class="{'selected': fucurrentMode === 'close'}"
+							@click="setMode('close','fu')">
+
+							<text class="mode-name">关闭</text>
+						</view>
+						<view class="mode-item" :class="{'selected': fucurrentMode === 'low'}"
+							@click="setMode('low','fu')">
+
+							<text class="mode-name">弱光</text>
+						</view>
+						<view class="mode-item" :class="{'selected': fucurrentMode === 'work'}"
+							@click="setMode('work','fu')">
+
+							<text class="mode-name">工作光</text>
+						</view>
+						<view class="mode-item" :class="{'selected': fucurrentMode === 'high'}"
+							@click="setMode('high','fu')">
+
+							<text class="mode-name">强光</text>
+						</view>
+
+						<view class="mode-item" :class="{'selected': fucurrentMode === 'flash'}"
+							@click="setMode('flash','fu')">
+
+							<text class="mode-name">爆闪</text>
+						</view>
+					</view>
+				</view>
+			</view>
+
+			<!-- 亮度调节选项卡 -->
+			<view v-if="currentTab === 'brightness'">
+				<view class="brightness-area">
+					<view class="brightness-title">亮度调节</view>
+					<view class="brightness-value">{{ brightness }}%</view>
+					<slider class="brightness-slider" :value="brightness" min="0" max="100"
+						@changing="onBrightnessChanging" @change="onBrightnessChanged" />
+				</view>
+			</view>
+
+			<!-- 开机画面选项卡 -->
+			<view v-if="currentTab === 'splash'">
+				<view class="splash-controls">
+					<button class="btn" @click="importImage">导入图片</button>
+
+					<button class="btn" :disabled="!hasImage || isSending" @click="sendSplashImage">确认发送</button>
+				</view>
+
+				<view class="splash-preview">
+					<view class="splash-frame">
+						<image v-if="tempImagePath" :src="tempImagePath" mode="aspectFill" :style="imageStyle"
+							@touchstart="onTouchStart" @touchmove="onTouchMove" @touchend="onTouchEnd"></image>
+						<view v-else class="empty-frame">点击"导入图片"选择开机画面</view>
+					</view>
+					<view class="frame-info">
+						<text>框选区域: 160×80像素</text>
+						<text v-if="hasImage">缩放: {{ scale.toFixed(2) }}x</text>
+					</view>
+				</view>
+
+				<view class="sending-progress" v-if="isSending">
+					<view class="progress-bar">
+						<view class="progress-fill" :style="{ width: progress + '%' }"></view>
+					</view>
+					<text>正在发送: {{ progress }}% ({{ currentPacket }}/{{ totalPackets }})</text>
+				</view>
+			</view>
+
+			<!-- 文字设置选项卡 -->
+			<view v-if="currentTab === 'text'">
+				<TextToHexV1 class="TextToHex" ref="textToHex" :txts="textLines" :bgColor="'#FFFFFF'" :color="'#000000'"
+					:fontSize="16" />
+				<view class="text-inputs">
+					<view class="text-line" v-for="(line, index) in textLines" :key="index">
+						<text>第{{ index + 1 }}行:</text>
+						<input v-model="textLines[index]" placeholder="请输入文字" maxlength="30"
+							@confirm="onTextChanged(index)" />
+					</view>
+				</view>
+
+				<button class="btn send-text-btn" :disabled="isSendingText" @click="sendText">发送文字</button>
+
+				<view class="sending-progress" v-if="isSendingText">
+					<view class="progress-bar">
+						<view class="progress-fill" :style="{ width: textProgress + '%' }"></view>
+					</view>
+					<text>正在发送: {{ textProgress }}% ({{ currentTextPacket }}/{{ totalTextPackets }})</text>
+				</view>
+			</view>
+		</view>
+
+
+
+		<!-- 隐藏的canvas用于图片处理 -->
+		<canvas canvas-id="splashCanvas" style="width: 160px; height: 80px; z-index: 9999;position: fixed; "
+			:style="{top:canvasTop,left:canvasLeft}"></canvas>
+
+		<view class="logs">
+			<view class="logItem" v-for="item,index in logList">
+				{{item['date']}}:{{item['remark']}}
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import gbk from '@/utils/gbk.js';
+	import TextToHexV1 from '@/components/TextToHex/TextToHexV1.vue';
+	import Common from '../../../utils/Common';
+	export default {
+		components: {
+			TextToHexV1
+		},
+		data() {
+			return {
+				gujianVer: '',
+				MacAdd: '',
+
+				canvasTop: '-1000px',
+				canvasLeft: '-1000px',
+				inteval: 100,
+				isLoading: false,
+				isBluetoothOpen: false,
+				isSearching: false,
+				isConnected: false,
+				isSending: false,
+				isSendingText: false,
+				bluetoothStatus: '未初始化',
+				searchTips: '',
+				deviceList: [],
+				connectedDeviceId: '',
+				serviceId: '0xFFE1',
+				writeCharacteristicId: '0xFFE1',
+				notifyCharacteristicId: '0xFFE2',
+				currentMode: '',
+				fucurrentMode: '',
+				logList: [],
+				packetCount: 1,
+				currentPage: 'deviceList',
+				targetDeviceName: 'JQZM-EF4651',
+				currentTab: 'mode',
+				brightness: 50,
+				brightnessTimer: null,
+				tempImagePath: '',
+				hasImage: false,
+				scale: 1,
+				translateX: 0,
+				translateY: 0,
+				lastX: 0,
+				lastY: 0,
+				isDragging: false,
+				progress: 0,
+				currentPacket: 0,
+				totalPackets: 100,
+				imageWidth: 0,
+				imageHeight: 0,
+				textLines: ['下雨了', '天亮了', '连接成功'],
+				textProgress: 0,
+				currentTextPacket: 0,
+				totalTextPackets: 4,
+				receiveData: {
+					"date": "",
+					"macAddress": "",
+					"mainMode": "",
+					"fuMode": "",
+					"batteryCnt": "",
+					"batteryStatu": "",
+					"time": ""
+				},
+			}
+		},
+		computed: {
+			imageStyle() {
+				return `transform: scale(${this.scale}) translate(${this.translateX}px, ${this.translateY}px); transform-origin: 0 0;`;
+			}
+		},
+		onLoad() {
+			this.initBluetoothAdapter();
+		},
+		methods: {
+			//获取设备信息
+			getDevice() {
+				this.currentTab = 'device';
+
+
+
+				// 1. 创建 ArrayBuffer 和 DataView
+				var buffer = new ArrayBuffer(4);
+				var dataView = new DataView(buffer);
+
+
+				dataView.setUint8(0, 0x70);
+				dataView.setUint8(1, 0x65);
+				dataView.setUint8(2, 0xA1);
+				dataView.setUint8(3, 0x00);
+
+				this.sendData(buffer).then(() => {
+					console.log("发送命令成功，等待设备响应");
+				}).catch(err => {
+					console.log("发送命令失败", err);
+				});
+			},
+			// 蓝牙初始化
+			initBluetoothAdapter() {
+				console.log('开始初始化蓝牙适配器');
+				uni.openBluetoothAdapter({
+					success: (res) => {
+						this.isBluetoothOpen = true;
+						this.bluetoothStatus = '已开启';
+						console.log('蓝牙适配器初始化成功');
+						this.getBluetoothAdapterState();
+
+						// 自动开始搜索设备
+						this.startSearch();
+					},
+					fail: (err) => {
+						this.bluetoothStatus = '初始化失败';
+						console.log(`蓝牙适配器初始化失败: ${err.errMsg}`);
+						if (err.errCode === 10001) {
+							uni.onBluetoothAdapterStateChange((res) => {
+								if (res.available) {
+									this.isBluetoothOpen = true;
+									this.bluetoothStatus = '已开启';
+									console.log('蓝牙适配器已开启');
+									this.startSearch();
+								}
+							});
+						}
+					}
+				});
+			},
+
+			// 获取蓝牙适配器状态
+			getBluetoothAdapterState() {
+				uni.getBluetoothAdapterState({
+					success: (res) => {
+						this.isBluetoothOpen = res.available;
+						this.bluetoothStatus = res.available ? '已开启' : '已关闭';
+						if (!res.available) {
+							console.log('蓝牙适配器未开启');
+						}
+					}
+				});
+			},
+
+			// 开关蓝牙
+			toggleBluetooth() {
+				if (this.isBluetoothOpen) {
+					this.closeBluetoothAdapter();
+				} else {
+					this.initBluetoothAdapter();
+				}
+			},
+
+			// 关闭蓝牙适配器
+			closeBluetoothAdapter() {
+
+
+				this.stopSearch();
+				this.disconnectDevice(() => {
+					uni.closeBluetoothAdapter({
+						success: () => {
+							console.log("蓝牙已关闭");
+							this.isBluetoothOpen = false;
+							this.isSearching = false;
+							this.isConnected = false;
+							this.bluetoothStatus = '已关闭';
+							this.deviceList = [];
+							this.connectedDeviceId = '';
+							this.currentMode = '';
+							this.currentPage = 'deviceList';
+						}
+					})
+				});
+
+
+
+			},
+
+			// 开始搜索蓝牙设备
+			startSearch() {
+				if (this.isSearching) return;
+
+				this.isSearching = true;
+				this.deviceList = [];
+				this.searchTips = '搜索中...';
+				console.log('开始搜索蓝牙设备');
+
+				uni.startBluetoothDevicesDiscovery({
+					services: ["0xFFE0"],
+					allowDuplicatesKey: false,
+					success: (res) => {
+						console.log('开始搜索蓝牙设备成功');
+						this.onDeviceFound();
+
+
+					},
+					fail: (err) => {
+						this.isSearching = false;
+						this.searchTips = '搜索失败';
+						console.log(`搜索蓝牙设备失败: ${err.errMsg}`);
+					}
+				});
+			},
+
+			// 停止搜索蓝牙设备
+			stopSearch() {
+				this.isSearching = false;
+				this.searchTips = this.deviceList.length > 0 ? '搜索完成' : '未发现蓝牙设备';
+
+				uni.stopBluetoothDevicesDiscovery({
+					success: () => {
+						console.log('停止搜索蓝牙设备');
+					}
+				});
+			},
+
+			// 监听发现新设备
+			onDeviceFound() {
+				uni.onBluetoothDeviceFound((res) => {
+					var device = res.devices[0];
+					if (!device.name && !device.localName) return;
+					// if ((device.name || device.localName) === this.targetDeviceName) {
+					// 检查是否已存在该设备
+					var index = this.deviceList.findIndex(item => item.deviceId === device.deviceId);
+					if (index === -1) {
+						this.deviceList.push({
+							deviceId: device.deviceId,
+							name: device.name || device.localName,
+							RSSI: device.RSSI
+						});
+					} else {
+						// 更新信号强度
+						this.deviceList[index].RSSI = device.RSSI;
+
+					}
+					// }
+
+					// 如果找到目标设备，自动连接
+					if ((device.name || device.localName) === this.targetDeviceName) {
+						console.log(`发现目标设备: ${JSON.stringify(device)}`);
+						this.connectDevice(device.deviceId, this.targetDeviceName,device);
+					}
+				});
+			},
+
+			// 连接蓝牙设备
+			connectDevice(deviceId, deviceName,device) {
+				if (this.isConnected && this.connectedDeviceId === deviceId) return;
+
+				this.isLoading = true;
+				if(device){
+					console.log("device=",device);
+				}
+				console.log(`开始连接设备: ${deviceName}`);
+				var these = this;
+				uni.createBLEConnection({
+					deviceId: deviceId,
+					timeout: 10000,
+					success: (res) => {
+						this.isConnected = true;
+						this.connectedDeviceId = deviceId;
+						this.targetDeviceName = deviceName;
+						console.log(`连接设备 ${deviceName} 成功`);
+						this.enableNotification(deviceId);
+						// 连接成功后切换到控制面板
+						this.currentPage = 'controlPanel';
+
+						setTimeout(function() {
+							uni.setBLEMTU({
+								deviceId: deviceId,
+								mtu: 1024,
+								success: (info) => {
+									console.log("设置mtu成功",info)
+								},
+								fail: (ex) => {
+									console.log("设置mtu失败" + JSON.stringify(ex));
+								}
+							})
+
+							these.getDeviceServices(deviceId);
+						}, 2000)
+						// 获取服务和特征值
+
+
+						// 启用通知
+
+						this.stopSearch();
+					},
+					fail: (err) => {
+						console.log(`连接设备失败: ${JSON.stringify(err)}`);
+						uni.showToast({
+							title: '连接失败',
+							icon: 'none'
+						});
+					},
+					complete: () => {
+						this.isLoading = false;
+					}
+				});
+			},
+
+			// 断开蓝牙连接
+			disconnectDevice(callback) {
+				var these = this;
+
+				if (!this.connectedDeviceId) {
+					this.isConnected = false;
+					this.connectedDeviceId = '';
+					this.currentMode = '';
+					this.currentPage = 'deviceList';
+					if (callback) {
+						callback();
+					}
+					return;
+				}
+				uni.closeBLEConnection({
+					deviceId: this.connectedDeviceId,
+					success: () => {
+
+						console.log('蓝牙连接已断开');
+
+
+					},
+					fail: (ex) => {
+						let arr = [{
+								code: 0,
+								remark: '正常'
+							},
+							{
+								code: 10000,
+								remark: '未初始化蓝牙适配器'
+							},
+							{
+								code: 10001,
+								remark: '当前蓝牙适配器不可用'
+							},
+							{
+								code: 10002,
+								remark: '没有找到指定设备'
+							},
+							{
+								code: 10003,
+								remark: '连接失败'
+							},
+							{
+								code: 10004,
+								remark: '没有找到指定服务'
+							},
+							{
+								code: 10005,
+								remark: '没有找到指定特征值'
+							},
+							{
+								code: 10006,
+								remark: '当前连接已断开'
+							},
+							{
+								code: 10007,
+								remark: '当前特征值不支持此操作'
+							},
+							{
+								code: 10008,
+								remark: '其余所有系统上报的异常'
+							},
+							{
+								code: 10009,
+								remark: 'Android 系统特有，系统版本低于 4.3 不支持 BLE'
+							},
+							{
+								code: 10010,
+								remark: '已连接'
+							},
+							{
+								code: 10011,
+								remark: '配对设备需要配对码'
+							},
+							{
+								code: 10012,
+								remark: '连接超时'
+							},
+							{
+								code: 10013,
+								remark: '连接 deviceId 为空或者是格式不正确'
+							}
+						];
+						let f = arr.find(function(v) {
+							return v.code == ex.code;
+						})
+
+						console.log("无法断开蓝牙连接:" + f.remark);
+
+						uni.showToast({
+							title: "无法断开蓝牙连接:" + f.remark,
+							icon: 'fail'
+						});
+					},
+					complete: () => {
+						this.isConnected = false;
+						this.connectedDeviceId = '';
+						this.currentMode = '';
+						this.currentPage = 'deviceList';
+						if (callback) {
+							callback();
+						}
+					}
+				});
+			},
+
+			// 获取设备服务
+			getDeviceServices(deviceId) {
+				console.log("deviceId=" + deviceId);
+				var these = this;
+				uni.getBLEDeviceServices({
+					deviceId: deviceId,
+					success: (res) => {
+
+						these.addLog("发现服务" + JSON.stringify(res.services));
+						if (res.services.length == 0) {
+							setTimeout(function() {
+								these.getDeviceServices(deviceId);
+							}, 1000);
+							return;
+						}
+						// 查找目标服务
+						var targetService = res.services.find((service) => {
+							return service.uuid.indexOf('FFE0') > -1 || service.uuid.indexOf(
+								'0000AE30-0000-1000-8000-00805F9B34FB') > -1;
+						});
+
+						if (targetService) {
+							these.addLog(`找到目标服务: ${targetService.uuid}`);
+							this.serviceId = targetService.uuid;
+							this.getDeviceCharacteristics(deviceId, targetService.uuid);
+						} else {
+							these.addLog("没找到目标服务");
+						}
+					},
+					fail: (err) => {
+						console.log(`获取设备服务失败: ${err.errMsg}`);
+					}
+				});
+			},
+
+
+			// 获取设备特征值
+			getDeviceCharacteristics(deviceId, serviceId) {
+				var these = this;
+				uni.getBLEDeviceCharacteristics({
+					deviceId: deviceId,
+					serviceId: serviceId,
+					success: (res) => {
+						console.log(`获取设备特征值成功，共发现 ${res.characteristics.length} 个特征值`);
+						these.addLog(`获取设备成功:${JSON.stringify(res.characteristics)}`);
+						// 查找可写特征值
+						var writeChar = res.characteristics.find(char => {
+								return char.uuid.indexOf("FFE1") > -1 || char.uuid.indexOf(
+									"0000AE03-0000-1000-8000-00805F9B34FB") > -1;
+							}
+
+						);
+
+						// 查找通知特征值
+						var notifyChar = res.characteristics.find(char => {
+								return (char.uuid.indexOf("FFE2") > -1 || char.uuid.indexOf(
+										"0000AE02-0000-1000-8000-00805F9B34FB") > -1) && char.properties
+									.notify;
+							}
+
+						);
+
+						if (writeChar) {
+							console.log(`找到可写特征值: ${writeChar.uuid}`);
+							this.writeCharacteristicId = writeChar.uuid;
+						} else {
+							console.log(`未找到可写特征值: ${this.writeCharacteristicId}`);
+						}
+
+						if (notifyChar) {
+							console.log(`找到通知特征值: ${notifyChar.uuid}`);
+							this.notifyCharacteristicId = notifyChar.uuid;
+							console.log("serviceId=" + serviceId);
+							console.log("characteristicId=" + notifyChar.uuid);
+
+							setTimeout(() => {
+								uni.notifyBLECharacteristicValueChange({
+									deviceId: deviceId,
+									serviceId: serviceId,
+									characteristicId: notifyChar.uuid,
+									state: true,
+									success: (info) => {
+										console.log('启用通知成功' + JSON.stringify(info));
+										uni.showToast({
+											title: "订阅消息成功",
+											icon: 'success'
+										});
+										// 监听特征值变化 
+										setTimeout(() => {
+											uni.onBLECharacteristicValueChange((
+												receive) => {
+												console.log("receive=",
+													receive);
+												var hexs = [];
+												var bytesToHex =
+													function(bytes) {
+														return bytes.map(
+															byte =>
+															byte
+															.toString(
+																16)
+															.padStart(
+																2, '0')
+														);
+													}
+
+												var parseData = (bytes) => {
+												console.log("bytes[0]==0xFC",bytes[0]==0xFC)
+													let date = new Date();
+													this.receiveData.date =date.getHours() +":" + date.getMinutes() +":" + date.getSeconds();
+													if(bytes[0]==0xFB && bytes[1]==0x64 && bytes.length >=8){
+														try {
+															// 跳过帧头(第一个字节)，从第二个字节开始解析
+															let staticLevelByte = bytes[2];
+															let getName=function(type){
+																let name="";
+																switch ( type ) {
+																	case 0x02:
+																		name = '弱光';
+																		break;
+																	case 0x04:
+																		name = '工作光';
+																		break;
+																	case 0x01:
+																		name = '强光';
+																		break;
+																	case 0x03:
+																		name = '爆闪';
+																		break;
+																		case 0x00:
+																			name = '关闭';
+																			break;
+																}
+																return name ;
+															}
+															let staticLevelText = getName(staticLevelByte);
+														
+															// 解析照明档位
+															let lightingLevelByte = bytes[3];
+															let lightingLevelText = getName(lightingLevelByte);
+														
+														
+														// 解析剩余电量
+														let batteryLevelByte = bytes[4];
+														// 电量百分比范围检查
+														let batteryLevel = Math.max(0,Math.min(100, batteryLevelByte));
+														
+														
+													
+														
+															//充电状态
+															let warn=bytes[5];
+															if(warn==0x00){
+																warn='未充电';
+															}
+															else if(warn==0x01){
+																warn='充电中';
+															}
+															
+															// 解析剩余照明时间（第三和第四字节，小端序）
+															let lightingTime ="";
+																let HH = Math.max(0,Math.min(100, bytes[6]));
+																let mm = Math.max(0,Math.min(100, bytes[7]));
+																lightingTime=HH+"小时"+mm+"分钟";
+																													
+															this.receiveData.mainMode=staticLevelText;
+															this.receiveData.fuMode=lightingLevelText;
+															this.receiveData.batteryCnt=batteryLevel+"%";
+															this.receiveData.batteryStatu=warn;
+															this.receiveData.time=lightingTime;
+															
+															let arr=["主灯模式:"+this.receiveData.mainMode,
+															"副灯模式:"+this.receiveData.fuMode,
+															"电池电量:"+this.receiveData.batteryCnt,
+															"充电状态:"+this.receiveData.batteryStatu,
+															"续航时间:"+this.receiveData.time
+															];
+															this.logList=[];
+															this.addLog(arr.join(","));
+														} catch (error) {
+															console.log('数据解析错误:',error);
+														}
+													}
+													else if(bytes[0]==0xFC){
+														this.logList=[];
+														var bytesToHexString = (bytes) => {
+															return bytes.map(byte => byte.toString(16).padStart(2, '0')).join(' ');
+														}
+														
+														let hexs = bytesToHexString(bytes);
+														let arr=hexs.split(' ');
+														if(arr.length>=7){
+															this.receiveData.macAddress=arr.slice(1,7).join(":");
+															this.addLog("设备mac地址:"+this.receiveData.macAddress);
+														}else{
+															
+															this.addLog("收到无效的数据");
+														}
+													}
+													else {
+														this.addLog("收到无效的数据");
+														
+													}
+												}
+
+												var dataView =
+													new DataView(receive
+														.value);
+												console.log("dataView=",
+													dataView);
+												// 转换为字节数组
+												var bytes = [];
+												for (let i = 0; i <
+													dataView
+													.byteLength; i++) {
+													bytes.push(dataView
+														.getUint8(i));
+												}
+
+												// 保存原始数据用于调试
+												this.receivedData = bytes;
+												hexs = bytesToHex(bytes);
+												console.log('接收到原始数据:',
+													hexs.join(' '));
+
+												parseData(bytes);
+
+											});
+										}, 100)
+
+									},
+									fail: (err) => {
+										console.error('启用通知失败', err);
+									}
+								});
+							}, 500);
+
+						} else {
+							console.log(`未找到通知特征值: ${this.notifyCharacteristicId}`);
+						}
+
+
+
+					},
+					fail: (err) => {
+						console.log(`获取设备特征值失败: ${err.errMsg}`);
+					}
+				});
+			},
+
+			// 启用通知
+			enableNotification(deviceId) {
+				uni.notifyBLECharacteristicValueChange({
+					deviceId: deviceId,
+					serviceId: this.serviceId,
+					characteristicId: this.notifyCharacteristicId,
+					state: true,
+					success: () => {
+						console.log('启用通知成功');
+
+						// 监听通知
+						uni.onBLECharacteristicValueChange((res) => {
+							this.handleNotification(res.value);
+						});
+					},
+					fail: (err) => {
+						console.log(`启用通知失败: ${err.errMsg}`);
+					}
+				});
+			},
+
+			// 处理通知数据
+			handleNotification(buffer) {
+				console.log("收到设备通知数据")
+				// 解析从设备接收的数据
+				var dataView = new DataView(buffer);
+				let result = '';
+
+				for (let i = 0; i < dataView.byteLength; i++) {
+					result += String.fromCharCode(dataView.getUint8(i));
+				}
+
+				console.log(`收到设备数据: ${result}`);
+			},
+
+			// 设置灯光模式
+			setMode(mode, type) {
+				this.logList = [];
+				if (!this.isConnected) {
+					this.addLog("未连接设备")
+					uni.showToast({
+						title: '未连接设备',
+						icon: 'none'
+					});
+					return;
+				}
+				if (type == 'main') {
+					if (this.currentMode === mode) return;
+					type = 0x04;
+				} else if (type == 'fu') {
+					if (this.fucurrentMode === mode) return;
+					type = 0x05;
+				}
+
+				this.currentMode = mode;
+				let dataValue = 0;
+
+				switch (mode) {
+					case 'close':
+						dataValue = 0x00;
+						break;
+					case 'low':
+						dataValue = 0x02;
+						break;
+					case 'work':
+						dataValue = 0x04;
+						break;
+					case 'high':
+						dataValue = 0x01;
+						break;
+					case 'flash':
+						dataValue = 0x03;
+						break;
+
+				}
+
+				// 构建数据包
+				var buffer = new ArrayBuffer(6);
+				var dataView = new DataView(buffer);
+
+				dataView.setUint8(0, 0xFA); // 帧头				
+				dataView.setUint8(1, dataValue); // 帧类型
+				dataView.setUint8(2, 0x00); // 数据
+				dataView.setUint8(3, 0x01); // 数据
+				dataView.setUint8(4, 0x00); // 数据
+				dataView.setUint8(5, 0xFF); // 数据
+
+				// 发送数据
+				this.sendData(buffer);
+			},
+
+			// 亮度调节
+			onBrightnessChanging(e) {
+				this.brightness = e.detail.value;
+
+				// 清除之前的定时器
+				if (this.brightnessTimer) {
+					clearTimeout(this.brightnessTimer);
+				}
+
+				// 设置新的定时器，控制发送频率
+				this.brightnessTimer = setTimeout(() => {
+					this.sendBrightness();
+				}, 100);
+			},
+
+			onBrightnessChanged(e) {
+				this.brightness = e.detail.value;
+				//this.sendBrightness();
+			},
+
+			sendBrightness() {
+				if (!this.isConnected) return;
+
+				// 构建数据包
+				var buffer = new ArrayBuffer(4);
+				var dataView = new DataView(buffer);
+				let data = '0x' + parseInt(this.brightness).toString(16);
+				console.log("亮度:" + this.brightness + ',16进制:' + data);
+				dataView.setUint8(0, 0x70); // 帧头
+				dataView.setUint8(1, 0x65); // 帧类型：亮度调节
+				dataView.setUint8(2, 0x09); // 包序号				
+				dataView.setUint8(3, data); // 数据
+
+				// 发送数据
+				this.sendData(buffer);
+			},
+
+			// 导入图片
+			importImage() {
+				uni.chooseImage({
+					count: 1,
+					sourceType: ['album'],
+					success: (res) => {
+						this.tempImagePath = res.tempFilePaths[0];
+						this.hasImage = true;
+						this.scale = 1;
+						this.translateX = 0;
+						this.translateY = 0;
+
+						// 获取图片尺寸
+						uni.getImageInfo({
+							src: this.tempImagePath,
+							success: (info) => {
+								this.imageWidth = info.width;
+								this.imageHeight = info.height;
+								this.autoFitImage();
+								console.log('图片导入成功，请调整图片位置和大小');
+							},
+							fail: (err) => {
+								console.log(`获取图片信息失败: ${err.errMsg}`);
+							}
+						});
+					},
+					fail: (err) => {
+						console.log(`选择图片失败: ${err.errMsg}`);
+					}
+				});
+			},
+
+			// 自动适配图片到容器
+			autoFitImage() {
+				var frameWidth = 320; // 预览框宽度，根据实际UI调整
+				var frameHeight = 640; // 预览框高度，根据实际UI调整
+
+				var widthRatio = frameWidth / this.imageWidth;
+				var heightRatio = frameHeight / this.imageHeight;
+
+				// 取较小的缩放比例，确保图片能完全显示在容器内
+				this.scale = Math.min(widthRatio, heightRatio);
+
+				// 居中显示
+				this.translateX = (frameWidth - this.imageWidth * this.scale) / 2;
+				this.translateY = (frameHeight - this.imageHeight * this.scale) / 2;
+			},
+
+			// 触摸事件处理
+			onTouchStart(e) {
+				if (e.touches.length === 1) {
+					this.isDragging = true;
+					this.lastX = e.touches[0].clientX;
+					this.lastY = e.touches[0].clientY;
+				}
+			},
+
+			onTouchMove(e) {
+				if (this.isDragging && e.touches.length === 1) {
+					var currentX = e.touches[0].clientX;
+					var currentY = e.touches[0].clientY;
+
+					// 计算位移
+					var deltaX = currentX - this.lastX;
+					var deltaY = currentY - this.lastY;
+
+					// 更新位置
+					this.translateX += deltaX;
+					this.translateY += deltaY;
+
+					// 限制移动范围
+					this.limitImagePosition();
+
+					// 更新最后位置
+					this.lastX = currentX;
+					this.lastY = currentY;
+				}
+			},
+
+			onTouchEnd() {
+				this.isDragging = false;
+			},
+
+			// 限制图片移动范围
+			limitImagePosition() {
+				var frameWidth = 320; // 预览框宽度，根据实际UI调整
+				var frameHeight = 640; // 预览框高度，根据实际UI调整
+
+				var maxX = 0;
+				var minX = frameWidth - this.imageWidth * this.scale;
+				var maxY = 0;
+				var minY = frameHeight - this.imageHeight * this.scale;
+
+				this.translateX = Math.max(minX, Math.min(maxX, this.translateX));
+				this.translateY = Math.max(minY, Math.min(maxY, this.translateY));
+			},
+
+			// 发送开机画面
+			sendSplashImage() {
+				if (!this.hasImage) {
+					uni.showToast({
+						title: '请先导入图片',
+						icon: 'none'
+					});
+					return;
+				}
+
+				uni.showLoading({
+					title: '处理图片中...',
+					mask: true
+				});
+
+				// 将图片转换为RGB565格式并发送
+				this.convertAndSendImage().then(() => {
+					uni.hideLoading();
+					console.log('开机画面发送完成');
+					uni.showToast({
+						title: '开机画面发送完成',
+						icon: 'success'
+					});
+				}).catch((error) => {
+					uni.hideLoading();
+					console.log(`图片发送失败: ${error}`);
+					uni.showToast({
+						title: '图片发送失败',
+						icon: 'none'
+					});
+				});
+			},
+
+			// 转换图片并发送
+			convertAndSendImage() {
+				return new Promise((resolve, reject) => {
+					console.log("111111");
+					// 创建canvas用于处理图片
+					var ctx = uni.createCanvasContext('splashCanvas', this);
+					console.log("2222222");
+					// 绘制图片到canvas
+					ctx.drawImage(this.tempImagePath, 0, 0, 160, 80);
+					console.log("33333333");
+					try {
+						ctx.draw(false, () => {
+							console.log("4444444");
+							// 获取canvas像素数据
+							this.canvasTop = '0px';
+							this.canvasLeft = '0px';
+							setTimeout(() => {
+								uni.canvasGetImageData({
+									canvasId: 'splashCanvas',
+									x: 0,
+									y: 0,
+									width: 160,
+									height: 80,
+									success: (res) => {
+										// 处理像素数据并发送
+										console.log("res.data.length=" + res.data
+											.length);
+										this.processAndSendImageData(res.data).then(
+											resolve).catch(reject);
+									},
+									fail: (err) => {
+										reject(`获取canvas数据失败: ${err.errMsg}`);
+									}
+								});
+							}, 300); // 等待canvas绘制完成
+						});
+					} catch (ex) {
+						console.log("出现异常" + JSON.stringify(ex))
+					}
+
+				});
+			},
+
+			// 处理像素数据并发送
+			processAndSendImageData(pixels) {
+				return new Promise((resolve, reject) => {
+					// 创建RGB565格式的像素数据
+					var rgb565Data = this.convertToRGB565(pixels, 160, 80);
+					// console.log("rgb565Data=,",rgb565Data);
+					// 分包发送
+					this.sendImagePackets(rgb565Data).then(resolve).catch(reject);
+				});
+			},
+
+			// 将RGBA转换为RGB565
+			convertToRGB565(pixels, width, height) {
+
+				if (!width) {
+					width = 160;
+				}
+
+				if (!height) {
+					height = 80;
+				}
+				var result = new Uint16Array(width * height);
+				let index = 0;
+
+				for (let i = 0; i < pixels.length; i += 4) {
+					var r = pixels[i];
+					var g = pixels[i + 1];
+					var b = pixels[i + 2];
+
+
+					//var rgb565 = ((r & 0xF8) << 8) | ((g & 0xFC) << 3) | (b >> 3);
+					var bgr565 = (b >> 3) | ((g & 0xFC) << 3) | ((r & 0xF8) << 8);
+					result[index++] = bgr565;
+				}
+
+				return result;
+			},
+
+			// 分包发送图片数据
+			sendImagePackets(imageData) {
+				return new Promise((resolve, reject) => {
+					this.isSending = true;
+					this.progress = 0;
+					this.currentPacket = 0;
+
+					// 总数据包数
+
+					let currentPacket = 1;
+					let packetSize = 120;
+					let mode = imageData.length % packetSize;
+					let totalPackets = parseInt(imageData.length / packetSize) + (mode > 0 ? 1 : 0)
+					let inteval = parseInt(this.inteval ? this.inteval : 100);
+					this.totalPackets = totalPackets;
+					// 发送单个数据包
+					var sendNextPacket = () => {
+						if (currentPacket > totalPackets) {
+							this.isSending = false;
+							resolve();
+							return;
+						}
+
+						var start = 0;
+						var dataLength = 0;
+						var bufferSize = 0;
+						if (currentPacket == 1) {
+							bufferSize = packetSize * 2 + 5;
+							dataLength = packetSize * 2;
+							start = 5;
+						} else if (currentPacket == totalPackets) {
+							bufferSize = mode > 0 ? (mode * 2) : (packetSize * 2);
+							dataLength = bufferSize
+						} else {
+							bufferSize = packetSize * 2;
+							dataLength = bufferSize;
+						}
+						// 创建数据包
+						var startIndex = (currentPacket - 1) * packetSize;
+						var endIndex = Math.min(startIndex + packetSize, imageData.length);
+						if (startIndex > endIndex) {
+							return;
+						}
+
+						var packetData = imageData.slice(startIndex,
+							endIndex); // imageData.subarray(startIndex, endIndex);
+
+						// 构建数据包
+
+
+						var buffer = new ArrayBuffer(bufferSize);
+						var dataView = new DataView(buffer);
+
+						if (currentPacket == 1) { //第一包要填充头部
+							// 填充头部
+							dataView.setUint8(0, 0x70); // 帧头
+							dataView.setUint8(1, 0x65); // 帧头
+							dataView.setUint8(2, 0x0A); // 帧类型
+							dataView.setUint16(3, dataLength, false); //包长度
+						}
+
+						for (let i = 0; i < packetData.length; i++) {
+							dataView.setUint16(start + i * 2, packetData[i], false); //本包数据,大端字节序
+						}
+
+						//发送数据包
+						this.sendData(buffer).then(() => {
+							// 更新进度
+							this.currentPacket = currentPacket;
+							this.progress = Math.round((currentPacket / totalPackets) * totalPackets);
+
+							currentPacket++;
+
+							setTimeout(sendNextPacket, inteval);
+						}).catch(err => {
+
+							if (err.code == 10007) {
+								setTimeout(sendNextPacket, inteval);
+								return;
+							}
+							this.isSending = false;
+							reject(err);
+						});
+					};
+
+
+					sendNextPacket();
+
+				});
+			},
+
+			// 文字输入变化
+			onTextChanged(index) {
+				console.log(`第${index + 1}行文字已更新`);
+			},
+
+			// 发送文字
+			async sendText() {
+				this.logList = [];
+				uni.showLoading({
+					title: "请稍候....",
+					mask: true
+				});
+				this.addLog({
+					date: Common.DateFormat(),
+					remark: '开始发送文字'
+				});
+
+				var sendTxtPackge = (rgbdata, type, str) => {
+
+					var promise = new Promise((resolve, reject) => {
+						try {
+
+							let packetSize = rgbdata.length; //每包均分的数量
+							let mode = rgbdata.length % packetSize; //最后一包的数量
+							let cnt = parseInt(rgbdata.length / packetSize) + (mode > 0 ? 1 : 0); //总包数量
+							let curr = 1; //当前包序号
+							this.addLog({
+								date: Common.DateFormat(),
+								remark: '当前包' + curr
+							});
+							let sendNext = () => {
+
+								if (curr > cnt) {
+									resolve();
+									return;
+								}
+								this.addLog({
+									date: Common.DateFormat(),
+									remark: "正在向设备发送" + curr + "/" + cnt
+								})
+								let bufferSize = 261;
+								// if (curr == 1) {
+								 	//bufferSize = packetSize + 7;
+								// } else if (curr == cnt) {
+								// 	bufferSize = mode > 0 ? (mode) : (packetSize);
+								// } else {
+								// 	bufferSize = packetSize;
+								// }
+								console.log("bufferSize=", bufferSize)
+								let buffer = new ArrayBuffer(bufferSize);
+								let dataView = new DataView(buffer);
+								let startIndex = (curr - 1) * packetSize;
+								this.addLog({
+									date: Common.DateFormat(),
+									remark: "分片大小" + bufferSize
+								})
+								let endIndex = Math.min(startIndex + packetSize, rgbdata.length);
+								if (startIndex > endIndex) {
+									this.addLog({
+										date: Common.DateFormat(),
+										remark: "发送完成"
+									})
+									return;
+								}
+
+								let packetData = rgbdata.slice(startIndex, endIndex); //取一片数据发送
+								this.addLog({
+									date: Common.DateFormat(),
+									remark: "获取到分片"
+								})
+								let start = 0;
+								if (curr == 1) {
+									dataView.setUint8(0, 0xFA);
+									dataView.setUint8(1, type);
+									dataView.setUint8(2, 0x01);
+									dataView.setUint8(3, 0x00);
+									
+									// dataView.setUint16(2, str.length, false);
+									start = 4;
+								}
+
+								for (let i = 0; i < packetData.length; i++) {
+									dataView.setUint8(start + i, packetData[i]);
+								}
+
+								dataView.setUint8(bufferSize - 1, 0xFF);
+								this.addLog({
+									date: Common.DateFormat(),
+									remark: "数据准备就绪"
+								})
+								let inteval = parseInt(this.inteval ? this.inteval : 0);
+
+								//发送数据包
+								this.sendData(buffer).then(() => {
+									this.addLog({
+										date: Common.DateFormat(),
+										remark: "发送成功,准备发送下一包"
+									})
+									curr++;
+									 setTimeout(sendNext, inteval);
+								}).catch(err => {
+									console.log("err=", err);
+									this.addLog({
+										date: Common.DateFormat(),
+										remark: "出现错误" + JSON.stringify(err)
+									});
+									if (err.code == '10007') {
+										setTimeout(sendNext, inteval);
+									} else {
+										reject(err);
+									}
+								});
+
+							}
+
+							sendNext();
+						} catch (ex) {
+							console.log("ex=", ex);
+							this.addLog({
+								date: Common.DateFormat(),
+								remark: "出现异常1" + JSON.stringify(ex)
+							})
+							reject(ex);
+						}
+					});
+
+					return promise;
+
+				}
+
+				// this.addLog({
+				// 	date: Common.DateFormat(),
+				// 	remark: '正在取模'
+				// });
+				var result = await this.$refs.textToHex.drawAndGetPixels();
+				// this.addLog({
+				// 	date: Common.DateFormat(),
+				// 	remark: '取模成功'
+				// });
+				result = result.map(level1 => {
+					return level1.flat(Infinity);
+				});
+
+
+				let h3dic = [0x06, 0x07, 0x08];
+				let pros = [];
+				let flag = true;
+				for (var i = 0; i < result.length; i++) {
+
+					let str = this.textLines[i];
+
+					if (str.length > 0) {
+
+						let width = str.length * 16;
+						var rgb = result[i];
+						this.addLog({
+							date: Common.DateFormat(),
+							remark: '开始发送第' + (i + 1)
+						});
+						try {
+							await sendTxtPackge(rgb, h3dic[i], str);
+						} catch (ex) {
+							flag = false;
+							break;
+						}
+					}
+
+
+				}
+				uni.hideLoading();
+				if (flag) {
+
+					uni.showModal({
+						title: "提示",
+						content: "发送成功"
+
+					})
+
+				} else {
+					uni.showModal({
+						title: "错误",
+						content: "出现了异常发送失败"
+					})
+				}
+			},
+
+
+			// 发送数据通用方法
+			sendData(buffer) {
+				this.addLog("设备就绪,正在握手");
+				return new Promise((resolve, reject) => {
+					this.addLog("握手成功，正在发送");
+					this.addLog("设备id:" + this.connectedDeviceId);
+					this.addLog("服务id:" + this.serviceId);
+					this.addLog("特征id:" + this.writeCharacteristicId);
+					uni.writeBLECharacteristicValue({
+						deviceId: this.connectedDeviceId,
+						serviceId: this.serviceId,
+						characteristicId: this.writeCharacteristicId,
+						writeType:plus.os.name=='Android'?'writeNoResponse':'write',
+						value: buffer,
+						success: () => {
+							this.addLog({
+								date: Common.DateFormat(),
+								remark: "发送数据成功"
+							})
+							resolve();
+
+						},
+						fail: (err) => {
+							this.addLog({
+								date: Common.DateFormat(),
+								remark: "发送数据失败" + JSON.stringify(err)
+							})
+							reject(err);
+						},
+						complete: () => {
+							this.addLog({
+								date: Common.DateFormat(),
+								remark: "向设备写入数据完成"
+							})
+						}
+					});
+				});
+			},
+
+			// 添加日志
+			addLog(message) {
+				if (message.date) {
+					console.log(message.remark);
+					this.logList.push(message);
+				} else {
+					console.log(message);
+					this.logList.push({
+						date: Common.DateFormat(),
+						remark: message
+					});
+				}
+
+
+			},
+			ReStart() { //重启
+				if (!this.isConnected) return;
+
+				// 构建数据包
+				var buffer = new ArrayBuffer(4);
+				var dataView = new DataView(buffer);
+				let data = '0x' + parseInt(this.brightness).toString(16);
+				console.log("亮度:" + this.brightness + ',16进制:' + data);
+				dataView.setUint8(0, 0x70); // 帧头
+				dataView.setUint8(1, 0x65); // 帧类型：亮度调节
+				dataView.setUint8(2, 0x0C); // 包序号				
+				dataView.setUint8(3, 0x01); // 数据
+
+				// 发送数据
+				this.sendData(buffer);
+			},
+			Restore() { //恢复出厂设置
+				if (!this.isConnected) return;
+
+				// 构建数据包
+				var buffer = new ArrayBuffer(4);
+				var dataView = new DataView(buffer);
+				let data = '0x' + parseInt(this.brightness).toString(16);
+				console.log("亮度:" + this.brightness + ',16进制:' + data);
+				dataView.setUint8(0, 0x70); // 帧头
+				dataView.setUint8(1, 0x65); // 帧类型：亮度调节
+				dataView.setUint8(2, 0x0D); // 包序号				
+				dataView.setUint8(3, 0x01); // 数据
+
+				// 发送数据
+				this.sendData(buffer);
+
+			}
+		},
+		onUnload() {
+
+			this.closeBluetoothAdapter();
+		}
+	}
+</script>
+
+<style>
+	.logs {
+		width: 100%;
+		height: auto;
+		min-height: 200rpx;
+		border: 1rpx solid #666;
+		padding: 30rpx;
+	}
+
+	.logs .logItem {
+		margin-bottom: 20rpx;
+		font-size: 28rpx;
+		font-weight: 400;
+
+	}
+
+	.container {
+		padding: 20rpx;
+		background-color: #f8f8f8;
+		min-height: 100vh;
+	}
+
+	.title {
+		font-size: 36rpx;
+		font-weight: bold;
+		text-align: center;
+		padding: 20rpx 0;
+		color: #333;
+	}
+
+	.status-bar {
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		padding: 15rpx 0;
+		border-bottom: 1rpx solid #eee;
+	}
+
+	.function-tabs {
+		display: flex;
+		margin: 20rpx 0;
+	}
+
+	.tab-btn {
+		flex: 1;
+		padding: 15rpx 0;
+		text-align: center;
+		font-size: 28rpx;
+		border-bottom: 2rpx solid #eee;
+	}
+
+	.tab-btn.active {
+		color: #409eff;
+		border-bottom: 2rpx solid #409eff;
+	}
+
+	/* 设备列表样式 */
+	.search-area {
+		padding: 20rpx 0;
+	}
+
+	.search-btn {
+		background-color: #409eff;
+		color: white;
+	}
+
+	.tips {
+		color: #999;
+		font-size: 24rpx;
+		margin-top: 10rpx;
+	}
+
+	.devices-list {
+		margin-top: 20rpx;
+	}
+
+	.device-item {
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		padding: 20rpx;
+		background-color: white;
+		border-radius: 10rpx;
+		margin-bottom: 15rpx;
+		box-shadow: 0 2rpx 10rpx rgba(0, 0, 0, 0.05);
+	}
+
+	.device-item.active {
+		background-color: #e8f3ff;
+		border-left: 6rpx solid #409eff;
+	}
+
+	.device-name {
+		font-size: 28rpx;
+		max-width: 500rpx;
+		white-space: nowrap;
+		overflow: hidden;
+		text-overflow: ellipsis;
+	}
+
+	.device-rssi {
+		color: #999;
+		font-size: 24rpx;
+	}
+
+	.device-status {
+		color: #409eff;
+		font-size: 24rpx;
+	}
+
+	/* 模式设置样式 */
+	.modes-area {
+		margin-top: 30rpx;
+	}
+
+	.mode-title {
+		font-size: 28rpx;
+		font-weight: bold;
+		margin-bottom: 20rpx;
+		color: #333;
+	}
+
+	.modes-grid {
+		display: flex;
+		flex-wrap: wrap;
+		justify-content: space-between;
+	}
+
+	.mode-item {
+		width: 30%;
+		padding: 20rpx 0;
+		background-color: white;
+		border-radius: 10rpx;
+		margin-top: 20rpx;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		box-shadow: 0 2rpx 10rpx rgba(0, 0, 0, 0.05);
+	}
+
+	.mode-item.selected {
+		background-color: #e8f3ff;
+		border: 2rpx solid #409eff;
+	}
+
+	.mode-icon {
+		font-size: 40rpx;
+		margin-bottom: 10rpx;
+	}
+
+	.mode-name {
+		font-size: 26rpx;
+	}
+
+	/* 亮度调节样式 */
+	.brightness-area {
+		margin-top: 30rpx;
+		padding: 20rpx;
+		background-color: white;
+		border-radius: 10rpx;
+		box-shadow: 0 2rpx 10rpx rgba(0, 0, 0, 0.05);
+	}
+
+	.brightness-title {
+		font-size: 28rpx;
+		font-weight: bold;
+		margin-bottom: 20rpx;
+		color: #333;
+	}
+
+	.brightness-value {
+		font-size: 36rpx;
+		text-align: center;
+		margin-bottom: 30rpx;
+		color: #409eff;
+	}
+
+	.brightness-slider {
+		width: 100%;
+	}
+
+	/* 开机画面样式 */
+	.splash-controls {
+		display: flex;
+		justify-content: center;
+		gap: 20rpx;
+		margin: 20rpx 0;
+	}
+
+	.splash-preview {
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+	}
+
+	.splash-frame {
+		height: 320rpx;
+		width: 640rpx;
+		border: 2rpx solid #409eff;
+		border-radius: 8rpx;
+		overflow: hidden;
+		position: relative;
+		background-color: #f0f0f0;
+	}
+
+	.empty-frame {
+		width: 100%;
+		height: 100%;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		color: #999;
+		font-size: 24rpx;
+	}
+
+	.frame-info {
+		margin-top: 15rpx;
+		color: #666;
+		font-size: 24rpx;
+	}
+
+	.sending-progress {
+		margin-top: 30rpx;
+		width: 100%;
+	}
+
+	.progress-bar {
+		height: 12rpx;
+		background-color: #e0e0e0;
+		border-radius: 6rpx;
+		overflow: hidden;
+	}
+
+	.progress-fill {
+		height: 100%;
+		background-color: #409eff;
+		transition: width 0.3s;
+	}
+
+	/* 文字设置样式 */
+	.text-inputs {
+		margin-top: 30rpx;
+		background-color: white;
+		border-radius: 10rpx;
+		box-shadow: 0 2rpx 10rpx rgba(0, 0, 0, 0.05);
+		padding: 20rpx;
+	}
+
+	.text-line {
+		display: flex;
+		align-items: center;
+		margin-bottom: 20rpx;
+	}
+
+	.text-line text {
+		width: 80rpx;
+		font-size: 26rpx;
+	}
+
+	.text-line input {
+		flex: 1;
+		height: 60rpx;
+		padding: 0 15rpx;
+		border: 1rpx solid #eee;
+		border-radius: 8rpx;
+		font-size: 26rpx;
+	}
+
+	.send-text-btn {
+		margin-top: 20rpx;
+		background-color: #409eff;
+		color: white;
+	}
+
+	/* 日志区域样式 */
+	.log-area {
+		margin-top: 30rpx;
+	}
+
+	.log-title {
+		font-size: 28rpx;
+		font-weight: bold;
+		margin-bottom: 15rpx;
+		color: #333;
+	}
+
+	.log-content {
+		height: 200rpx;
+		background-color: white;
+		border-radius: 10rpx;
+		padding: 15rpx;
+		font-size: 24rpx;
+		color: #666;
+	}
+
+	.log-item {
+		margin-bottom: 8rpx;
+	}
+
+	.btn {
+		padding: 10rpx 20rpx;
+		border-radius: 8rpx;
+		font-size: 26rpx;
+		text-align: center;
+	}
+
+	.btn[disabled] {
+		opacity: 0.5;
+	}
+
+	.txt {
+		border: 1px solid #000000;
+	}
+
+	.TextToHex {
+		position: fixed;
+		top: -99999rpx;
+		left: -99999rpx;
+		visibility: hidden;
+	}
+</style>
\ No newline at end of file
diff --git a/pages/BlueTooth/ModeSetting/HBY650.vue b/pages/BlueTooth/ModeSetting/HBY650.vue
new file mode 100644
index 0000000..07ebe45
--- /dev/null
+++ b/pages/BlueTooth/ModeSetting/HBY650.vue
@@ -0,0 +1,1892 @@
+<template>
+	<view class="container">
+		<!-- 蓝牙设备列表页 -->
+		<view v-if="currentPage === 'deviceList'">
+			<view class="title">蓝牙设备列表</view>
+
+			<view class="status-bar">
+				<text>蓝牙状态: {{ bluetoothStatus }}</text>
+				<button class="btn" :disabled="isLoading" @click="toggleBluetooth">
+					{{ isBluetoothOpen ? '关闭蓝牙' : '开启蓝牙' }}
+				</button>
+			</view>
+
+			<view class="search-area">
+				<button class="btn search-btn" :disabled="!isBluetoothOpen || isSearching" @click="startSearch">
+					{{ isSearching ? '正在搜索...' : '搜索设备' }}
+				</button>
+				<text class="tips">{{ searchTips }}</text>
+			</view>
+
+			<view class="devices-list" v-if="deviceList.length > 0">
+				<view class="device-item" v-for="(device, index) in deviceList" :key="index"
+					:class="{'active': device.name === targetDeviceName}"
+					@click="connectDevice(device.deviceId, device.name)">
+					<text class="device-name">{{ device.name || '未知设备' }}</text>
+					<text class="device-rssi">{{ device.RSSI }}dBm</text>
+					<text class="device-status" v-if="device.name === targetDeviceName">已连接</text>
+				</view>
+			</view>
+		</view>
+
+		<!-- 主控制页面 -->
+		<view v-if="currentPage === 'controlPanel'">
+			<view class="title">蓝牙设备控制器</view>
+
+			<view class="status-bar">
+				<text>已连接: {{ targetDeviceName }}</text>
+				<button class="btn" @click="disconnectDevice(null)">断开连接</button>
+			</view>
+			<view class="receivLog">
+				<view>数据更新时间：{{receiveData.date}}</view>
+				<view class="w50 fleft">Mac地址:{{receiveData.macAddress}}</view>
+				<view class="w50 fleft">静电探测档位:{{receiveData.staticLevel}}</view>
+				<view class="w50 fleft">剩余照明时间:{{receiveData.lightingTime}}</view>
+				<view class="w50 fleft">照明档位:{{receiveData.lightingLevel}}</view>
+				<view class="w50 fleft">电池电量:{{receiveData.batteryLevel}}</view>
+				<view class="w50 fleft">预警级别:{{receiveData.warnLevel}}</view>
+				<view class="clear"></view>
+			</view>
+
+			<view v-show="currentTab === 'splash' || currentTab === 'text'">
+				<text>发送间隔:</text>
+				<input type="number" v-model="inteval" class="txt" />
+			</view>
+
+
+			<view class="function-tabs">
+				<button class="tab-btn" :class="{'active': currentTab === 'mode'}"
+					@click="currentTab = 'mode'">检测模式</button>
+				<button class="tab-btn" :class="{'active': currentTab === 'brightness'}"
+					@click="currentTab = 'brightness'">照明模式</button>
+				<button class="tab-btn" :class="{'active': currentTab === 'splash'}"
+					@click="currentTab = 'splash'">开机画面</button>
+				<button class="tab-btn" :class="{'active': currentTab === 'flash'}" @click="gotoSendVideo">开机动画</button>
+				<button class="tab-btn" :class="{'active': currentTab === 'text'}"
+					@click="currentTab = 'text'">文字设置</button>
+			</view>
+
+			<!-- 模式设置选项卡 -->
+			<view v-if="currentTab === 'mode'">
+				<view class="modes-area">
+					<view class="mode-title">选择静电探测档位</view>
+					<view class="modes-grid">
+						<view class="mode-item" :class="{'selected': currentMode === 'high'}" @click="setMode('high')">
+							<text class="mode-icon">💡</text>
+							<text class="mode-name">高档模式</text>
+						</view>
+						<view class="mode-item" :class="{'selected': currentMode === 'low'}" @click="setMode('low')">
+							<text class="mode-icon">🔅</text>
+							<text class="mode-name">中档模式</text>
+						</view>
+						<view class="mode-item" :class="{'selected': currentMode === 'flash'}"
+							@click="setMode('flash')">
+							<text class="mode-icon">💥</text>
+							<text class="mode-name">低档模式</text>
+						</view>
+					</view>
+				</view>
+			</view>
+
+			<!-- 亮度调节选项卡 -->
+			<view v-if="currentTab === 'brightness'">
+				<view class="brightness-area">
+					<view class="brightness-title">照明模式</view>
+					<button class="tab-btn" :class="{'active': brightnessStatu}"
+						@click="setBrightness(true)">开启</button>
+					<button class="tab-btn" :class="{'active': !brightnessStatu}"
+						@click="setBrightness(false)">关闭</button>
+				</view>
+			</view>
+
+			<!-- 开机画面选项卡 -->
+			<view v-if="currentTab === 'splash'">
+				<canvas canvas-id="splashCanvas" style="width: 160px; height: 80px; z-index: 9999;position: fixed; "
+					:style="{top:canvasTop,left:canvasLeft}"></canvas>
+					<view class="splash-controls">
+						<button class="btn" @click="importImage">导入图片</button>
+
+						<button class="btn" :disabled="!hasImage || isSending" @click="sendSplashImage">确认发送</button>
+					</view>
+
+					<view class="splash-preview">
+						<view class="splash-frame">
+							<image v-if="tempImagePath" :src="tempImagePath" mode="aspectFill" :style="imageStyle"
+								@touchstart="onTouchStart" @touchmove="onTouchMove" @touchend="onTouchEnd"></image>
+							<view v-else class="empty-frame">点击"导入图片"选择开机画面</view>
+						</view>
+						<view class="frame-info">
+							<text>框选区域: 160×80像素</text>
+							<text v-if="hasImage">缩放: {{ scale.toFixed(2) }}x</text>
+						</view>
+					</view>
+
+					<view class="sending-progress" v-if="isSending">
+						<view class="progress-bar">
+							<view class="progress-fill" :style="{ width: progress + '%' }"></view>
+						</view>
+						<text>正在发送: {{ progress }}% ({{ currentPacket }}/{{ totalPackets }})</text>
+					</view>
+			</view>
+
+			<!--开机动画选项卡-->
+			<!-- 		<view v-if="currentTab === 'flash'">
+				<canvas canvas-id="flashCanvas" style="width: 160px; height: 80px; z-index: 9999;position: fixed; "
+					:style="{top:canvasTop,left:canvasLeft}" </canvas>
+				<view>
+					<button @click="checkVideo">选择视频</button>
+					<button @click="sendVideo">发送视频</button>
+				</view>
+				<view>
+					<f-video ref="compARef" :src="videoPath" :direction="-90" :autoplay="true" :videoHeight="videoHeight"
+						:videoWidth="videoWidth" @shotVideoClick="shotVideoClick"></f-video>
+				</view>
+				
+					
+			</view> -->
+			<!-- 文字设置选项卡 -->
+			<view v-if="currentTab === 'text'">
+				<view class="text-inputs">
+					<view class="text-line" v-for="(line, index) in textLines" :key="index">
+						<text>第{{ index + 1 }}行:</text>
+						<input v-model="textLines[index]" placeholder="请输入文字" maxlength="30"
+							@confirm="onTextChanged(index)" />
+					</view>
+				</view>
+
+				<button class="btn send-text-btn" :disabled="isSendingText" @click="sendText">发送文字</button>
+
+				<view class="sending-progress" v-if="isSendingText">
+					<view class="progress-bar">
+						<view class="progress-fill" :style="{ width: textProgress + '%' }"></view>
+					</view>
+					<text>正在发送: {{ textProgress }}% ({{ currentTextPacket }}/{{ totalTextPackets }})</text>
+				</view>
+			</view>
+		</view>
+
+
+
+
+
+	</view>
+</template>
+
+<script>
+	import gbk from '@/utils/gbk.js';
+
+	export default {
+		data() {
+			return {
+				canvasTop: '-1000px',
+				canvasLeft: '-1000px',
+				inteval: 0,
+				isLoading: false,
+				isBluetoothOpen: false,
+				isSearching: false,
+				isConnected: false,
+				isSending: false,
+				isSendingText: false,
+				bluetoothStatus: '未初始化',
+				searchTips: '',
+				deviceList: [],
+				connectedDeviceId: '',
+				serviceId: '0xFFE1',
+				writeCharacteristicId: '0xFFE1',
+				notifyCharacteristicId: '0xFFE2',
+				currentMode: '',
+				logList: [],
+				packetCount: 1,
+				currentPage: 'deviceList',
+				targetDeviceName: ['JQZM-EF4651', 'XLCX-68455E'],
+				currentTab: 'mode',
+				brightness: 50,
+				brightnessTimer: null,
+				tempImagePath: '',
+				hasImage: false,
+				scale: 1,
+				translateX: 0,
+				translateY: 0,
+				lastX: 0,
+				lastY: 0,
+				isDragging: false,
+
+				imageWidth: 0,
+				imageHeight: 0,
+				textLines: ['你好中国', '你好中国', '你好中国', '你好中国'],
+				progress: 0,
+				currentPacket: 0,
+				totalPackets: 100,
+				textProgress: 0,
+				currentTextPacket: 0,
+				totalTextPackets: 4,
+				brightnessStatu: false,
+				receiveData: {
+					"date": "",
+					"staticLevel": "",
+					"lightingLevel": "",
+					"lightingTime": "",
+					"batteryLevel": "",
+					"macAddress": "",
+					"warnLevel": ""
+				},
+				subscits: [],
+				videoPath: "",
+				videoWidth: "",
+				videoHeight: "",
+				videoDuration: ""
+
+			}
+		},
+		computed: {
+			imageStyle() {
+				return `transform: scale(${this.scale}) translate(${this.translateX}px, ${this.translateY}px); transform-origin: 0 0;`;
+			}
+		},
+		onLoad() {
+
+			// debugger;
+			//  // let iconv = require('iconv-lite');
+			// // 假设我们有一个UTF-8编码的字符串
+			// let utf8String = '你好，世界！';
+
+			// // 使用iconv-lite将字符串从UTF-8编码转换为GBK编码
+			// let gbkBuffer = iconv.encode(utf8String, 'GBK');
+
+			// console.log('转换后的GBK编码Buffer对象:', gbkBuffer)
+
+			this.initBluetoothAdapter();
+		},
+
+		methods: {
+			//灯光打开与关闭
+			setBrightness(flag) {
+				if (this.brightnessStatu == flag) {
+					return;
+
+				}
+				this.brightnessStatu = flag;
+
+				setTimeout(() => {
+					let buffer = new ArrayBuffer(6);
+					let dataView = new DataView(buffer);
+					dataView.setUint8(0, 0x55); // 帧头
+					dataView.setUint8(1, 0x00); // 帧类型
+					dataView.setUint8(2, 0x01); // 包序号
+					dataView.setUint8(3, 0x00); // 数据长度
+					dataView.setUint8(4, 0x01); // 数据长度
+					dataView.setUint8(5, flag ? 0x6e : 0x6f); // 数据
+
+					// 发送数据
+					this.sendData(buffer);
+
+				}, 0);
+			},
+			// 蓝牙初始化
+			initBluetoothAdapter() {
+				console.log('开始初始化蓝牙适配器');
+				uni.openBluetoothAdapter({
+					success: (res) => {
+						this.isBluetoothOpen = true;
+						this.bluetoothStatus = '已开启';
+						console.log('蓝牙适配器初始化成功');
+						this.getBluetoothAdapterState();
+
+						// 自动开始搜索设备
+						this.startSearch();
+					},
+					fail: (err) => {
+						this.bluetoothStatus = '初始化失败';
+						console.log(`蓝牙适配器初始化失败: ${err.errMsg}`);
+						if (err.errCode === 10001) {
+							uni.onBluetoothAdapterStateChange((res) => {
+								if (res.available) {
+									this.isBluetoothOpen = true;
+									this.bluetoothStatus = '已开启';
+									console.log('蓝牙适配器已开启');
+									this.startSearch();
+								}
+							});
+						}
+					}
+				});
+			},
+
+			// 获取蓝牙适配器状态
+			getBluetoothAdapterState() {
+				uni.getBluetoothAdapterState({
+					success: (res) => {
+						this.isBluetoothOpen = res.available;
+						this.bluetoothStatus = res.available ? '已开启' : '已关闭';
+						if (!res.available) {
+							console.log('蓝牙适配器未开启');
+						}
+					}
+				});
+			},
+
+			// 开关蓝牙
+			toggleBluetooth() {
+				if (this.isBluetoothOpen) {
+					this.closeBluetoothAdapter();
+				} else {
+					this.initBluetoothAdapter();
+				}
+			},
+
+			// 关闭蓝牙适配器
+			closeBluetoothAdapter() {
+
+
+				this.stopSearch();
+				this.disconnectDevice(() => {
+					uni.closeBluetoothAdapter({
+						success: () => {
+							console.log("蓝牙已关闭");
+							this.isBluetoothOpen = false;
+							this.isSearching = false;
+							this.isConnected = false;
+							this.bluetoothStatus = '已关闭';
+							this.deviceList = [];
+							this.connectedDeviceId = '';
+							this.currentMode = '';
+							this.currentPage = 'deviceList';
+						}
+					})
+				});
+
+
+
+			},
+
+			// 开始搜索蓝牙设备
+			startSearch() {
+				if (this.isSearching) return;
+
+				this.isSearching = true;
+				this.deviceList = [];
+				this.searchTips = '搜索中...';
+				console.log('开始搜索蓝牙设备');
+
+				uni.startBluetoothDevicesDiscovery({
+					services: ["0000FFE0-0000-1000-8000-00805F9B34FB"],
+					allowDuplicatesKey: false,
+					success: (res) => {
+						console.log('开始搜索蓝牙设备成功');
+						this.onDeviceFound();
+
+
+					},
+					fail: (err) => {
+						this.isSearching = false;
+						this.searchTips = '搜索失败';
+						console.log(`搜索蓝牙设备失败: ${err.errMsg}`);
+					}
+				});
+			},
+
+			// 停止搜索蓝牙设备
+			stopSearch() {
+				this.isSearching = false;
+				this.searchTips = this.deviceList.length > 0 ? '搜索完成' : '未发现蓝牙设备';
+
+				uni.stopBluetoothDevicesDiscovery({
+					success: () => {
+						console.log('停止搜索蓝牙设备');
+					}
+				});
+			},
+
+			// 监听发现新设备
+			onDeviceFound() {
+				uni.onBluetoothDeviceFound((res) => {
+					let device = res.devices[0];
+					if (!device.name && !device.localName) return;
+
+					let index = this.deviceList.findIndex(item => item.deviceId === device.deviceId);
+					if (index === -1) {
+						this.deviceList.push({
+							deviceId: device.deviceId,
+							name: device.name || device.localName,
+							RSSI: device.RSSI
+						});
+					} else {
+						// 更新信号强度
+						this.deviceList[index].RSSI = device.RSSI;
+
+					}
+					// }
+
+					// 如果找到目标设备，自动连接
+					if (this.targetDeviceName.indexOf(device.name || device.localName) > -1) {
+						console.log(`发现目标设备: ${JSON.stringify(device)}`);
+						this.connectDevice(device.deviceId, device.name);
+					}
+				});
+			},
+
+			// 连接蓝牙设备
+			connectDevice(deviceId, deviceName) {
+				if (this.isConnected && this.connectedDeviceId === deviceId) return;
+
+				this.isLoading = true;
+				console.log(`开始连接设备: ${deviceId}`);
+				var these = this;
+				uni.createBLEConnection({
+					deviceId: deviceId,
+					timeout: 10000,
+					success: (res) => {
+						this.stopSearch();
+						this.isConnected = true;
+						this.connectedDeviceId = deviceId;
+						this.targetDeviceName = deviceName;
+						console.log(`连接设备 ${deviceName} 成功`);
+						this.enableNotification(deviceId);
+						// 连接成功后切换到控制面板
+						this.currentPage = 'controlPanel';
+
+						// setTimeout(function() {
+							uni.setBLEMTU({
+								deviceId: deviceId,
+								mtu: 512,
+								success: (info) => {
+									console.log("设置mtu成功")
+								},
+								fail: (ex) => {
+									console.log("设置mtu失败" + JSON.stringify(ex));
+								},
+								complete() {
+									
+								}
+							})
+							these.getDeviceServices(deviceId);
+
+						// }, 2000)
+
+
+
+					},
+					fail: (err) => {
+						console.log(`连接设备失败: ${JSON.stringify(err)}`);
+						uni.showToast({
+							title: '连接失败',
+							icon: 'none'
+						});
+					},
+					complete: () => {
+						this.isLoading = false;
+					}
+				});
+			},
+
+			// 断开蓝牙连接
+			disconnectDevice(callback) {
+				var these = this;
+				var promises = [];
+				for (var i = 0; i < these.subscits.length; i++) {
+					promises.push(new Promise((succ, err) => {
+						uni.notifyBLECharacteristicValueChange({
+							deviceId: these.connectedDeviceId,
+							serviceId: these.subscits[i].serviceId,
+							characteristicId: these.subscits[i].notifyId,
+							state: false,
+							success: () => {
+								console.log("取消订阅成功");
+								succ();
+							},
+							fail: () => {
+								err();
+							}
+						});
+					}));
+				}
+				these.subscits = [];
+				Promise.all(promises).then(() => {
+					if (!this.connectedDeviceId) {
+						this.isConnected = false;
+						this.connectedDeviceId = '';
+						this.currentMode = '';
+						this.currentPage = 'deviceList';
+						if (callback) {
+							callback();
+						}
+						return;
+					}
+					setTimeout(() => {
+						uni.closeBLEConnection({
+							deviceId: this.connectedDeviceId,
+							success: (res) => {
+
+								console.log('蓝牙连接已断开' + JSON.stringify(res));
+
+
+							},
+							fail: (ex) => {
+								let arr = [{
+										code: 0,
+										remark: '正常'
+									},
+									{
+										code: 10000,
+										remark: '未初始化蓝牙适配器'
+									},
+									{
+										code: 10001,
+										remark: '当前蓝牙适配器不可用'
+									},
+									{
+										code: 10002,
+										remark: '没有找到指定设备'
+									},
+									{
+										code: 10003,
+										remark: '连接失败'
+									},
+									{
+										code: 10004,
+										remark: '没有找到指定服务'
+									},
+									{
+										code: 10005,
+										remark: '没有找到指定特征值'
+									},
+									{
+										code: 10006,
+										remark: '当前连接已断开'
+									},
+									{
+										code: 10007,
+										remark: '当前特征值不支持此操作'
+									},
+									{
+										code: 10008,
+										remark: '其余所有系统上报的异常'
+									},
+									{
+										code: 10009,
+										remark: 'Android 系统特有，系统版本低于 4.3 不支持 BLE'
+									},
+									{
+										code: 10010,
+										remark: '已连接'
+									},
+									{
+										code: 10011,
+										remark: '配对设备需要配对码'
+									},
+									{
+										code: 10012,
+										remark: '连接超时'
+									},
+									{
+										code: 10013,
+										remark: '连接 deviceId 为空或者是格式不正确'
+									}
+								];
+								let f = arr.find(function(v) {
+									return v.code == ex.code;
+								})
+
+								console.log("无法断开蓝牙连接:" + f.remark);
+
+								uni.showToast({
+									title: "无法断开蓝牙连接:" + f.remark,
+									icon: 'fail'
+								});
+
+							},
+							complete: () => {
+								this.isConnected = false;
+								this.connectedDeviceId = '';
+								this.currentMode = '';
+								this.currentPage = 'deviceList';
+								if (callback) {
+									callback();
+								}
+							}
+						});
+
+					}, 200)
+
+				}).catch().finally();
+
+
+
+
+
+			},
+
+			// 获取设备服务
+			getDeviceServices(deviceId) {
+				console.log("deviceId=" + deviceId);
+				var these = this;
+				uni.getBLEDeviceServices({
+					deviceId: deviceId,
+					success: (res) => {
+
+						console.log("发现服务" + JSON.stringify(res.services))
+						if (res.services.length == 0) {
+							setTimeout(function() {
+								these.getDeviceServices(deviceId);
+							}, 200);
+							return;
+						}
+						// 查找目标服务
+						let targetService = res.services.find(service => service.uuid.indexOf('FFE0') > -1);
+
+						if (targetService) {
+							console.log(`找到目标服务: ${targetService.uuid}`);
+							this.serviceId = targetService.uuid;
+							this.getDeviceCharacteristics(deviceId, targetService.uuid);
+						}
+
+
+
+
+					},
+					fail: (err) => {
+						console.log(`获取设备服务失败: ${err.errMsg}`);
+					}
+				});
+			},
+
+
+			// 获取设备特征值
+			getDeviceCharacteristics(deviceId, serviceId) {
+				uni.getBLEDeviceCharacteristics({
+					deviceId: deviceId,
+					serviceId: serviceId,
+					success: (res) => {
+						console.log(`获取设备特征值成功，共发现 ${res.characteristics.length} 个特征值`);
+						console.log(`获取设备特征值成功${JSON.stringify(res.characteristics)}`);
+						// 查找可写特征值
+						let writeChar = res.characteristics.find(char =>
+							char.uuid.indexOf("FFE1") >= 1
+						);
+
+						// 查找通知特征值
+						let notifyChar = res.characteristics.find(char => {
+								return char.properties.notify;
+							}
+
+						);
+
+						if (writeChar) {
+							console.log(`找到可写特征值: ${writeChar.uuid}`);
+							this.writeCharacteristicId = writeChar.uuid;
+						} else {
+							console.log(`未找到可写特征值: ${this.writeCharacteristicId}`);
+						}
+
+						if (notifyChar) {
+							console.log(`找到通知特征值: ${notifyChar.uuid}`);
+							this.notifyCharacteristicId = notifyChar.uuid;
+							console.log("serviceId=" + serviceId);
+							console.log("characteristicId=" + notifyChar.uuid);
+							this.subscits.push({
+								deviceId: deviceId,
+								serviceId:serviceId,
+								notifyId: notifyChar.uuid
+							});
+							setTimeout(() => {
+								uni.notifyBLECharacteristicValueChange({
+									deviceId: deviceId,
+									serviceId: serviceId,
+									characteristicId: notifyChar.uuid,
+									state: true,
+									success: (info) => {
+										console.log('启用通知成功' + JSON.stringify(info));
+										uni.showToast({
+											title: "订阅消息成功",
+											icon: 'success'
+										});
+										// 监听特征值变化 
+										setTimeout(() => {
+											uni.onBLECharacteristicValueChange((
+												receive) => {
+
+												var bytesToHexString =
+													function(bytes) {
+														return bytes.map(byte =>byte.toString(16).padStart(2, '0')).join(' ');
+													}
+
+												var parseData = (bytes) => {
+													if (bytes.length <7) {
+														console.log('数据包长度不足，至少需要6个字节');
+														return;
+													}
+													let date = new Date();
+													this.receiveData.date =date.getHours() +":" + date.getMinutes() +":" + date.getSeconds();
+													if(bytes[0]==0x55){
+														try {
+															// 跳过帧头(第一个字节)，从第二个字节开始解析
+															let staticLevelByte = bytes[1];
+															let staticLevelText = '未知';
+															switch ( staticLevelByte ) {
+																case 0x65:
+																	staticLevelText = '高档';
+																	break;
+																case 0x66:
+																	staticLevelText = '中档';
+																	break;
+																case 0x67:
+																	staticLevelText = '低档';
+																	break;
+																case 0x68:
+																	staticLevelText = '关闭';
+																	break;
+															}
+														
+															// 解析照明档位
+															let lightingLevelByte = bytes[2];
+															let lightingLevelText = lightingLevelByte === 0x6e ? '开启':'关闭';
+														
+															// 解析剩余照明时间（第三和第四字节，小端序）
+															let lightingTime =
+																(bytes[3] <<8) | bytes[4];
+														
+															// 解析剩余电量
+															let batteryLevelByte = bytes[5];
+															// 电量百分比范围检查
+															let batteryLevel = Math.max(0,Math.min(100, batteryLevelByte));
+														
+															let warn=bytes[6];
+															if(warn==0x00){
+																warn='无预警';
+															}
+															else if(warn==0x01){
+																warn='弱预警';
+															}
+															else if(warn==0x02){
+																warn='中预警';
+															}
+															else if(warn==0x03){
+																warn='强预警';
+															}
+															else if(warn==0x04){
+																warn='非常强预警';
+															}
+															console.log(warn)
+															console.log('解析结果:', {
+																	staticLevel: staticLevelText,
+																	lightingLevel: lightingLevelText,
+																	lightingTime: `${lightingTime} 分钟`,
+																	batteryLevel: `${batteryLevel}%`
+																});
+															
+															this.receiveData.staticLevel =staticLevelText;
+															this.receiveData.lightingLevel =lightingLevelText;
+															this.receiveData.lightingTime =lightingTime +'分钟';
+															this.receiveData.batteryLevel =batteryLevel +'%';
+															this.receiveData.warnLevel=warn;
+														} catch (error) {
+															console.log('数据解析错误:',error);
+														}
+													}
+													else{
+														try{
+															let uint8Array = new Uint8Array(receive.value);
+															let str = '';
+															for (let i = 0; i < uint8Array.length; i++) {
+																// 将每个字节转换为对应的字符
+																str += String.fromCharCode(uint8Array[i]);
+															}
+															if(str.indexOf('mac address:')==0){
+																this.receiveData.macAddress=str.split(':')[1];
+																console.log("收到mac地址:",+this.receiveData.macAddress)
+															}else{
+																console.log("收到无法解析的字符串:",str)
+															}															
+														}catch(ex){
+															console.log("将数据转文本失败",ex);
+														}
+													}
+												}
+
+												let dataView =new DataView(receive.value);
+
+												// 转换为字节数组
+												let bytes = [];
+												for (let i = 0; i <dataView.byteLength; i++) {
+													bytes.push(dataView.getUint8(i));
+												}
+
+												// 保存原始数据用于调试
+												this.receivedData = bytes;
+												console.log('接收到原始数据:',bytesToHexString(bytes));
+
+												parseData(bytes);
+
+											});
+										}, 100)
+
+									},
+									fail: (err) => {
+										console.error('启用通知失败', err);
+									}
+								});
+							}, 500);
+
+						} else {
+							console.log(`未找到通知特征值: ${this.notifyCharacteristicId}`);
+						}
+
+
+
+					},
+					fail: (err) => {
+						console.log(`获取设备特征值失败: ${err.errMsg}`);
+					}
+				});
+			},
+
+			// 启用通知
+			enableNotification(deviceId) {
+				// uni.notifyBLECharacteristicValueChange({
+				// 	deviceId: deviceId,
+				// 	serviceId: this.serviceId,
+				// 	characteristicId: this.notifyCharacteristicId,
+				// 	state: true,
+				// 	success: () => {
+				// 		console.log('启用通知成功');
+
+				// 		// 监听通知
+				// 		uni.onBLECharacteristicValueChange((res) => {
+				// 			this.handleNotification(res.value);
+				// 		});
+				// 	},
+				// 	fail: (err) => {
+				// 		console.log(`启用通知失败: ${err.errMsg}`);
+				// 	}
+				// });
+			},
+
+			// 处理通知数据
+			handleNotification(buffer) {
+				console.log("收到设备通知数据")
+				// 解析从设备接收的数据
+				let dataView = new DataView(buffer);
+				let result = '';
+
+				for (let i = 0; i < dataView.byteLength; i++) {
+					result += String.fromCharCode(dataView.getUint8(i));
+				}
+
+				console.log(`收到设备数据: ${result}`);
+			},
+
+			// 设置静电检测模式
+			setMode(mode) {
+				if (!this.isConnected) {
+					uni.showToast({
+						title: '未连接设备',
+						icon: 'none'
+					});
+					return;
+				}
+
+				if (this.currentMode === mode) return;
+
+				this.currentMode = mode;
+				let dataValue = 0;
+
+				switch (mode) {
+					case 'high':
+						dataValue = 0x65; // 高档模式
+						//console.log('开始切换到高档模式');
+						break;
+					case 'low':
+						dataValue = 0x66; // 中档模式
+						//console.log('开始切换到中档模式');
+						break;
+					case 'flash':
+						dataValue = 0x67; // 低档模式
+						//console.log('开始切换到低档模式');
+						break;
+					default:
+						dataValue = 0x68; // 低档模式
+						//console.log('开始切换到低档模式');
+						break;
+				}
+
+				// 构建数据包
+				let buffer = new ArrayBuffer(6);
+				let dataView = new DataView(buffer);
+
+				dataView.setUint8(0, 0x55); // 帧头
+				dataView.setUint8(1, 0x00); // 帧类型
+				dataView.setUint8(2, 0x01); // 包序号
+				dataView.setUint8(3, 0x00); // 数据长度
+				dataView.setUint8(4, 0x01); // 数据长度
+				dataView.setUint8(5, dataValue); // 数据
+
+
+				// 发送数据
+				this.sendData(buffer);
+
+
+
+			},
+
+			// 亮度调节
+			onBrightnessChanging(e) {
+				this.brightness = e.detail.value;
+
+				// 清除之前的定时器
+				if (this.brightnessTimer) {
+					clearTimeout(this.brightnessTimer);
+				}
+
+				// 设置新的定时器，控制发送频率
+				this.brightnessTimer = setTimeout(() => {
+					this.sendBrightness();
+				}, 100);
+			},
+
+			onBrightnessChanged(e) {
+				this.brightness = e.detail.value;
+				//this.sendBrightness();
+			},
+
+			sendBrightness() {
+				if (!this.isConnected) return;
+
+				// 构建数据包
+				let buffer = new ArrayBuffer(6);
+				let dataView = new DataView(buffer);
+				let data = '0x' + parseInt(this.brightness).toString(16);
+				console.log("亮度:" + this.brightness + ',16进制:' + data);
+				dataView.setUint8(0, 0x55); // 帧头
+				dataView.setUint8(1, 0x01); // 帧类型：亮度调节
+				dataView.setUint8(2, 0x01); // 包序号
+				dataView.setUint8(3, 0x00); // 数据长度
+				dataView.setUint8(4, 0x01); // 数据长度
+				dataView.setUint8(5, data); // 数据
+
+				// 发送数据
+				this.sendData(buffer);
+			},
+
+			// 导入图片
+			importImage() {
+				uni.chooseImage({
+					count: 1,
+					sourceType: ['album'],
+					success: (res) => {
+						this.tempImagePath = res.tempFilePaths[0];
+						this.hasImage = true;
+						this.scale = 1;
+						this.translateX = 0;
+						this.translateY = 0;
+
+						// 获取图片尺寸
+						uni.getImageInfo({
+							src: this.tempImagePath,
+							success: (info) => {
+								this.imageWidth = info.width;
+								this.imageHeight = info.height;
+								this.autoFitImage();
+								console.log('图片导入成功，请调整图片位置和大小');
+							},
+							fail: (err) => {
+								console.log(`获取图片信息失败: ${err.errMsg}`);
+							}
+						});
+					},
+					fail: (err) => {
+						console.log(`选择图片失败: ${err.errMsg}`);
+					}
+				});
+			},
+
+			// 自动适配图片到容器
+			autoFitImage() {
+				let frameWidth = 320; // 预览框宽度，根据实际UI调整
+				let frameHeight = 640; // 预览框高度，根据实际UI调整
+
+				let widthRatio = frameWidth / this.imageWidth;
+				let heightRatio = frameHeight / this.imageHeight;
+
+				// 取较小的缩放比例，确保图片能完全显示在容器内
+				this.scale = Math.min(widthRatio, heightRatio);
+
+				// 居中显示
+				this.translateX = (frameWidth - this.imageWidth * this.scale) / 2;
+				this.translateY = (frameHeight - this.imageHeight * this.scale) / 2;
+			},
+
+			// 触摸事件处理
+			onTouchStart(e) {
+				if (e.touches.length === 1) {
+					this.isDragging = true;
+					this.lastX = e.touches[0].clientX;
+					this.lastY = e.touches[0].clientY;
+				}
+			},
+
+			onTouchMove(e) {
+				if (this.isDragging && e.touches.length === 1) {
+					let currentX = e.touches[0].clientX;
+					let currentY = e.touches[0].clientY;
+
+					// 计算位移
+					let deltaX = currentX - this.lastX;
+					let deltaY = currentY - this.lastY;
+
+					// 更新位置
+					this.translateX += deltaX;
+					this.translateY += deltaY;
+
+					// 限制移动范围
+					this.limitImagePosition();
+
+					// 更新最后位置
+					this.lastX = currentX;
+					this.lastY = currentY;
+				}
+			},
+
+			onTouchEnd() {
+				this.isDragging = false;
+			},
+
+			// 限制图片移动范围
+			limitImagePosition() {
+				let frameWidth = 320; // 预览框宽度，根据实际UI调整
+				let frameHeight = 640; // 预览框高度，根据实际UI调整
+
+				let maxX = 0;
+				let minX = frameWidth - this.imageWidth * this.scale;
+				let maxY = 0;
+				let minY = frameHeight - this.imageHeight * this.scale;
+
+				this.translateX = Math.max(minX, Math.min(maxX, this.translateX));
+				this.translateY = Math.max(minY, Math.min(maxY, this.translateY));
+			},
+
+			// 发送开机画面
+			sendSplashImage() {
+				if (!this.hasImage) {
+					uni.showToast({
+						title: '请先导入图片',
+						icon: 'none'
+					});
+					return;
+				}
+
+				uni.showLoading({
+					title: '处理图片中...',
+					mask: true
+				});
+
+				// 将图片转换为RGB565格式并发送
+				this.convertAndSendImage().then(() => {
+					uni.hideLoading();
+					console.log('开机画面发送完成');
+					uni.showToast({
+						title: '开机画面发送完成',
+						icon: 'success'
+					});
+				}).catch((error) => {
+					uni.hideLoading();
+					console.log(`图片发送失败: ${error}`);
+					uni.showToast({
+						title: '图片发送失败',
+						icon: 'none'
+					});
+				});
+			},
+
+			// 转换图片并发送
+			convertAndSendImage() {
+				return new Promise((resolve, reject) => {
+					console.log("111111");
+					// 创建canvas用于处理图片
+					let ctx = uni.createCanvasContext('splashCanvas', this);
+					console.log("2222222");
+					// 绘制图片到canvas
+					ctx.drawImage(this.tempImagePath, 0, 0, 160, 80);
+					console.log("33333333");
+					try {
+						ctx.draw(false, () => {
+							console.log("4444444");
+							// 获取canvas像素数据
+							this.canvasTop = '0px';
+							this.canvasLeft = '0px';
+							setTimeout(() => {
+								uni.canvasGetImageData({
+									canvasId: 'splashCanvas',
+									x: 0,
+									y: 0,
+									width: 160,
+									height: 80,
+									success: (res) => {
+										// 处理像素数据并发送
+										console.log("res.data.length=" + res.data
+											.length);
+										this.processAndSendImageData(res.data).then(
+											resolve).catch(reject);
+									},
+									fail: (err) => {
+										reject(`获取canvas数据失败: ${err.errMsg}`);
+									}
+								});
+							}, 300); // 等待canvas绘制完成
+						});
+					} catch (ex) {
+						console.log("出现异常" + JSON.stringify(ex))
+					}
+
+				});
+			},
+
+			// 处理像素数据并发送
+			processAndSendImageData(pixels) {
+				return new Promise((resolve, reject) => {
+					// 创建RGB565格式的像素数据
+					let rgb565Data = this.convertToRGB565(pixels);
+
+					// 分包发送
+					this.sendImagePackets(rgb565Data).then(resolve).catch(reject);
+				});
+			},
+
+			// 将RGBA转换为RGB565
+			convertToRGB565(pixels) {
+
+				var rgbaToRgb565 = function(r, g, b, a = 255) {
+					// 忽略透明度（如果需要考虑透明度，请根据需求处理）
+
+					// 将8位颜色值压缩到RGB565对应的位数
+					let r5 = Math.round((r / 255) * 31); // 5位：0-31
+					let g6 = Math.round((g / 255) * 63); // 6位：0-63
+					let b5 = Math.round((b / 255) * 31); // 5位：0-31
+
+					// 合并为16位整数
+					return (r5 << 11) | (g6 << 5) | b5;
+				}
+
+				let result = new Uint16Array(160 * 80);
+				let index = 0;
+				console.log("pixels.length=" + pixels.length);
+				for (let i = 0; i < pixels.length; i += 4) {
+					let r = pixels[i];
+					let g = pixels[i + 1];
+					let b = pixels[i + 2];
+
+					// 转换为RGB565 (R:5bit, G:6bit, B:5bit)
+					let rgb565 = ((r & 0xF8) << 8) | ((g & 0xFC) << 3) | (b >> 3);
+					//let rgb565=rgbaToRgb565(r,g,b);
+					result[index++] = rgb565;
+				}
+
+				return result;
+			},
+
+			// 分包发送图片数据
+			sendImagePackets(imageData) {
+				return new Promise((resolve, reject) => {
+					this.isSending = true;
+					this.progress = 0;
+					this.currentPacket = 0;
+
+					// 总数据包数
+					let totalPackets = 52;
+					let currentPacket = 1;
+
+					// 发送单个数据包
+					let sendNextPacket = () => {
+						if (currentPacket > totalPackets) {
+							this.isSending = false;
+							resolve();
+							return;
+						}
+
+						// 计算当前包的数据
+						let packetSize = 250;
+						if (currentPacket <= 51) {
+							packetSize = 250; // 前51个包每个500字节
+						} else {
+							packetSize = 50; // 最后一个包100字节
+						}
+
+						// 创建数据包
+						let startIndex = (currentPacket - 1) * 250;
+						let endIndex = Math.min(startIndex + packetSize, imageData.length);
+						if (startIndex > endIndex) {
+							return;
+						}
+						//console.log("imageData="+imageData.length);
+						let packetData = imageData.slice(startIndex,
+							endIndex);
+						// 构建数据包
+						let bufferSize = 5 + packetData.length * 2; // 头部5字节 + 数据部分
+						let buffer = new ArrayBuffer(bufferSize);
+						let dataView = new DataView(buffer);
+
+						// 填充头部
+						dataView.setUint8(0, 0x55); // 帧头
+						dataView.setUint8(1, 0x02); // 帧类型：开机画面
+						dataView.setUint8(2, '0x' + currentPacket.toString(16).padStart(2, '0')); // 包序号
+						// dataView.setUint8(3, 0x01);
+						// dataView.setUint8(4, 0xFF);
+						if (packetData.length == 250) {
+							dataView.setUint8(3, 0x01);
+							dataView.setUint8(4, 0xF4);
+						} else {
+							dataView.setUint8(3, 0x00);
+							dataView.setUint8(4, 0x64);
+						}
+
+						// 填充数据（每个RGB565值占2字节）
+						for (let i = 0; i < packetData.length; i++) {
+							dataView.setUint16(5 + i * 2, packetData[i], false); // 大端字节序
+						}
+						console.log(
+							`发送数据包${currentPacket}/${totalPackets},${dataView.getUint8(0)} ${dataView.getUint8(1)} ${dataView.getUint8(2)}`
+						)
+						
+						let inteval = parseInt(this.inteval ? this.inteval : 0);
+						//发送数据包
+						this.sendData(buffer).then(() => {
+							// 更新进度
+							this.currentPacket = currentPacket;
+							this.progress = Math.round((currentPacket / totalPackets) * 52);
+							// console.log(`发送开机画面数据包 ${currentPacket}/${totalPackets}`);
+
+							// 发送下一个包（添加延迟避免蓝牙缓冲区溢出）
+							currentPacket++;
+							
+							// if ((currentPacket - 1) % 16 == 1) {
+							// 	inteval += 150;
+							// 	console.log("当前是第" + (currentPacket - 1) + "完成,额外多停留150ms,inteval=" +
+							// 		inteval);
+							// } else {
+							// 	console.log("interval=" + inteval)
+							// }
+							setTimeout(sendNextPacket, inteval);
+						}).catch(err => {
+							
+							
+							if(err.code=='10007'){
+								
+								setTimeout(sendNextPacket, inteval);
+							}else{
+								this.isSending = false;
+								uni.hideLoading();
+								reject(err);
+							}
+							
+						});
+					};
+
+					//牵着你的手
+					var HoldYouHand = () => {
+						var str ="picture transmit start"; //握手的协议字符串
+
+
+						// 1. 创建 ArrayBuffer 和 DataView
+						let buffer = new ArrayBuffer(str.length);
+						let dataView = new DataView(buffer);
+
+						// 2. 将字符串转换为 ASCII 码并写入 DataView
+						for (let i = 0; i < str.length; i++) {
+							dataView.setUint8(i, str.charCodeAt(i));
+						}
+
+						this.sendData(buffer).then(() => {
+							// 开始发送第一个包
+							console.log("握手成功了,等待200ms");
+							setTimeout(sendNextPacket, 120);
+
+						}).catch(err => {
+							console.log("握手没有成功");
+							reject(err);
+						});
+					}
+
+					HoldYouHand();
+
+				});
+			},
+
+			// 文字输入变化
+			onTextChanged(index) {
+				console.log(`第${index + 1}行文字已更新`);
+			},
+
+			// 发送文字
+			sendText() {
+				if (!this.isConnected) {
+					uni.showToast({
+						title: '未连接设备',
+						icon: 'none'
+					});
+					return;
+				}
+
+				this.isSendingText = true;
+				this.textProgress = 0;
+				this.currentTextPacket = 0;
+
+				// 总数据包数
+				let totalPackets = this.textLines.length;
+				let currentPacket = 1;
+
+				// 发送单个数据包
+				let sendNextPacket = () => {
+					if (currentPacket > totalPackets) {
+						this.isSendingText = false;
+						console.log('文字发送完成');
+						uni.showToast({
+							title: '发送成功',
+							icon: 'success'
+						});
+						return;
+					}
+
+					// 获取当前行文字
+					let text = this.textLines[currentPacket - 1] || '';
+
+					// 将文字转换为GBK编码
+					this.convertToGBK(text).then(gbkData => {
+						console.log(JSON.stringify(gbkData));
+						// 构建数据包
+						let bufferSize = 5 + text.length * 2; // 头部4字节 + 数据部分
+						let buffer = new ArrayBuffer(bufferSize);
+						let dataView = new DataView(buffer);
+
+						// 填充头部
+						dataView.setUint8(0, 0x55); // 帧头
+						dataView.setUint8(1, 0x03); // 帧类型：文字
+						dataView.setUint8(2, currentPacket.toString(16)); // 包序号
+
+						console.log(text.length.toString(16));
+						dataView.setUint16(3, (text.length * 2).toString(16)); // 数据长度
+						console.log("gbkData.length=" + gbkData.length);
+						let str = new Array();
+						// 填充数据
+						for (let i = 1; i <= text.length * 2; i++) {
+							let highNibble = gbkData[i * 2 - 2]; // 高4位
+							let lowNibble = gbkData[i * 2 - 1]; // 低4位（如果是奇数长度，补0）
+							console.log("i=" + i + "," + highNibble + lowNibble)
+							// 组合高低位并转换为字节值
+							let byteValue = parseInt(highNibble + lowNibble, 16);
+							dataView.setUint8(5 + i - 1, byteValue);
+						}
+						console.log(str.join(" "));
+
+						console.log("dataView.length=" + dataView.byteLength)
+						// 发送数据包
+						this.sendData(buffer).then(() => {
+							// 更新进度
+							this.currentTextPacket = currentPacket;
+							this.textProgress = Math.round((currentPacket / totalPackets) * 100);
+							console.log(`发送文字数据包 ${currentPacket}/${totalPackets}: ${text}`);
+
+							// 发送下一个包
+							currentPacket++;
+							setTimeout(sendNextPacket, this.inteval ? this.inteval : 0);
+						}).catch(err => {
+							this.isSendingText = false;
+							uni.showToast({
+								title: '文字发送失败',
+								icon: 'none'
+							});
+						});
+					}).catch(err => {
+						this.isSendingText = false;
+						console.log(`文字编码失败: ${err}`);
+						uni.showToast({
+							title: '编码失败',
+							icon: 'none'
+						});
+					});
+				};
+
+				// 开始发送第一个包
+
+				//牵着你的手
+				var HoldYouHand = () => {
+					var str = "word transmit start"; //握手的协议字符串
+
+
+					// 1. 创建 ArrayBuffer 和 DataView
+					let buffer = new ArrayBuffer(str.length);
+					let dataView = new DataView(buffer);
+
+					// 2. 将字符串转换为 ASCII 码并写入 DataView
+					for (let i = 0; i < str.length; i++) {
+						dataView.setUint8(i, str.charCodeAt(i));
+					}
+
+					this.sendData(buffer).then(() => {
+						// 开始发送第一个包
+						console.log("握手成功了,等待200ms");
+						setTimeout(sendNextPacket, 120);
+
+					}).catch(err => {
+						console.log("握手没有成功");
+						uni.showToast({
+							title: '握手没有成功',
+							icon: 'none'
+						});
+					});
+				}
+
+				HoldYouHand();
+
+			},
+
+			// 将文字转换为GBK编码（使用第三方库或API）
+			convertToGBK(text) {
+				return new Promise((resolve, reject) => {
+					// 注意：uniapp环境中可能需要使用特定的GBK编码库
+					// 这里使用模拟实现，实际项目中应使用适当的编码库
+					try {
+
+						// 模拟GBK编码转换
+
+						let arr = gbk.encode(text)
+						let utf8Data = gbk.arr2hex(arr);
+						// 注意：这只是示例，实际GBK编码需要使用专门的库
+						resolve(utf8Data); // 实际项目中替换为GBK编码实现
+					} catch (error) {
+						console.log("错误：" + JSON.stringify(error));
+						reject(error);
+					}
+				});
+			},
+
+			// 发送数据通用方法
+			sendData(buffer) {
+
+				return new Promise(async (resolve, reject) => {
+
+					var promise = new Promise((succ, err) => {
+						uni.writeBLECharacteristicValue({
+							deviceId: this.connectedDeviceId,
+							serviceId: this.serviceId,
+							characteristicId: this.writeCharacteristicId,
+							value: buffer,
+							writeType: plus.os.name == 'iOS' ? 'write' : 'writeNoResponse',
+							success: () => {
+								//console.log("发送数据成功");
+								succ();
+							},
+							fail: (ex) => {
+								console.log("发送数据失败", ex);
+								
+								err(ex);
+							},
+							complete: function() {
+								//console.log("123456");
+							}
+						});
+					});
+					if (plus.os.name == 'iOS') {
+
+						function timeout(ms) {
+							return new Promise((_, err) => {
+								setTimeout(() => {
+									err({
+										code: -1,
+										errMsg: '超时了'
+									})
+								}, ms);
+							});
+						}
+						
+						Promise.race([promise, timeout(this.inteval?this.inteval:0)]).then(resolve).catch((ex) => {
+							console.log("ex=",ex);
+							if (ex.code == -1) {
+								resolve();
+							} else {
+								reject(ex);
+							}
+
+						}).finally(() => {
+							console.log("完成了")
+						});
+					} else {
+						promise.then(resolve).catch(reject);
+					}
+				});
+			},
+
+			// 添加日志
+			addLog(message) {
+
+			},
+			checkVideo: function() {
+				uni.chooseVideo({
+					sourceType: ['album', 'camera'],
+					compressed: true,
+					maxDuration: 2,
+					camera: 'back',
+					success: (res) => {
+						this.videoPath = res.tempFilePath;
+						this.videoWidth = res.width;
+						this.videoHeight = res.height;
+						this.videoDuration = res.duration;
+					}
+				})
+			},
+			sendVideo: function() {
+				uni.showLoading({
+					title: "正在处理视频"
+				});
+				setTimeout(() => {
+					this.$refs.compARef.shotVideoClick(0);
+
+				}, 0);
+
+			},
+			shotVideoClick: function(array) {
+
+
+			},
+			gotoSendVideo: function() {
+				this.currentTab = 'flash';
+				uni.navigateTo({
+					url: "/pages/BlueTooth/ModeSetting/VideoSend",
+					success: (res) => {
+						let channel = res.eventChannel;
+						channel.emit("receiveDevice", {
+							connectedDeviceId: this.connectedDeviceId,
+							serviceId: this.serviceId,
+							writeCharacteristicId: this.writeCharacteristicId,
+							notifyCharacteristicId: this.notifyCharacteristicId
+						})
+					}
+				})
+			}
+
+		},
+		onUnload() {
+			this.closeBluetoothAdapter();
+		}
+	}
+</script>
+
+<style>
+	.receivLog {
+		padding: 20rpx;
+		width: 100%;
+		height: auto;
+		box-sizing: border-box;
+		border: 2rpx solid #e5e5e5;
+		border-radius: 20rpx;
+		font-size: 28rpx;
+		color: #2e2e2e;
+	}
+
+	.container {
+		padding: 20rpx;
+		background-color: #f8f8f8;
+		min-height: 100vh;
+	}
+
+	.title {
+		font-size: 36rpx;
+		font-weight: bold;
+		text-align: center;
+		padding: 20rpx 0;
+		color: #333;
+	}
+
+	.status-bar {
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		padding: 15rpx 0;
+		border-bottom: 1rpx solid #eee;
+	}
+
+	.function-tabs {
+		display: flex;
+		margin: 20rpx 0;
+	}
+
+	.tab-btn {
+		flex: 1;
+		padding: 15rpx 0;
+		text-align: center;
+		font-size: 28rpx;
+		border-bottom: 2rpx solid #eee;
+	}
+
+	.tab-btn.active {
+		color: #409eff;
+		border-bottom: 2rpx solid #409eff;
+	}
+
+	/* 设备列表样式 */
+	.search-area {
+		padding: 20rpx 0;
+	}
+
+	.search-btn {
+		background-color: #409eff;
+		color: white;
+	}
+
+	.tips {
+		color: #999;
+		font-size: 24rpx;
+		margin-top: 10rpx;
+	}
+
+	.devices-list {
+		margin-top: 20rpx;
+	}
+
+	.device-item {
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		padding: 20rpx;
+		background-color: white;
+		border-radius: 10rpx;
+		margin-bottom: 15rpx;
+		box-shadow: 0 2rpx 10rpx rgba(0, 0, 0, 0.05);
+	}
+
+	.device-item.active {
+		background-color: #e8f3ff;
+		border-left: 6rpx solid #409eff;
+	}
+
+	.device-name {
+		font-size: 28rpx;
+		max-width: 500rpx;
+		white-space: nowrap;
+		overflow: hidden;
+		text-overflow: ellipsis;
+	}
+
+	.device-rssi {
+		color: #999;
+		font-size: 24rpx;
+	}
+
+	.device-status {
+		color: #409eff;
+		font-size: 24rpx;
+	}
+
+	/* 模式设置样式 */
+	.modes-area {
+		margin-top: 30rpx;
+	}
+
+	.mode-title {
+		font-size: 28rpx;
+		font-weight: bold;
+		margin-bottom: 20rpx;
+		color: #333;
+	}
+
+	.modes-grid {
+		display: flex;
+		flex-wrap: wrap;
+		justify-content: space-between;
+	}
+
+	.mode-item {
+		width: 30%;
+		padding: 20rpx 0;
+		background-color: white;
+		border-radius: 10rpx;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		box-shadow: 0 2rpx 10rpx rgba(0, 0, 0, 0.05);
+	}
+
+	.mode-item.selected {
+		background-color: #e8f3ff;
+		border: 2rpx solid #409eff;
+	}
+
+	.mode-icon {
+		font-size: 40rpx;
+		margin-bottom: 10rpx;
+	}
+
+	.mode-name {
+		font-size: 26rpx;
+	}
+
+	/* 亮度调节样式 */
+	.brightness-area {
+		margin-top: 30rpx;
+		padding: 20rpx;
+		background-color: white;
+		border-radius: 10rpx;
+		box-shadow: 0 2rpx 10rpx rgba(0, 0, 0, 0.05);
+	}
+
+	.brightness-title {
+		font-size: 28rpx;
+		font-weight: bold;
+		margin-bottom: 20rpx;
+		color: #333;
+	}
+
+	.brightness-value {
+		font-size: 36rpx;
+		text-align: center;
+		margin-bottom: 30rpx;
+		color: #409eff;
+	}
+
+	.brightness-slider {
+		width: 100%;
+	}
+
+	/* 开机画面样式 */
+	.splash-controls {
+		display: flex;
+		justify-content: center;
+		gap: 20rpx;
+		margin: 20rpx 0;
+	}
+
+	.splash-preview {
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+	}
+
+	.splash-frame {
+		height: 320rpx;
+		width: 640rpx;
+		border: 2rpx solid #409eff;
+		border-radius: 8rpx;
+		overflow: hidden;
+		position: relative;
+		background-color: #f0f0f0;
+	}
+
+	.empty-frame {
+		width: 100%;
+		height: 100%;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		color: #999;
+		font-size: 24rpx;
+	}
+
+	.frame-info {
+		margin-top: 15rpx;
+		color: #666;
+		font-size: 24rpx;
+	}
+
+	.sending-progress {
+		margin-top: 30rpx;
+		width: 100%;
+	}
+
+	.progress-bar {
+		height: 12rpx;
+		background-color: #e0e0e0;
+		border-radius: 6rpx;
+		overflow: hidden;
+	}
+
+	.progress-fill {
+		height: 100%;
+		background-color: #409eff;
+		transition: width 0.3s;
+	}
+
+	/* 文字设置样式 */
+	.text-inputs {
+		margin-top: 30rpx;
+		background-color: white;
+		border-radius: 10rpx;
+		box-shadow: 0 2rpx 10rpx rgba(0, 0, 0, 0.05);
+		padding: 20rpx;
+	}
+
+	.text-line {
+		display: flex;
+		align-items: center;
+		margin-bottom: 20rpx;
+	}
+
+	.text-line text {
+		width: 80rpx;
+		font-size: 26rpx;
+	}
+
+	.text-line input {
+		flex: 1;
+		height: 60rpx;
+		padding: 0 15rpx;
+		border: 1rpx solid #eee;
+		border-radius: 8rpx;
+		font-size: 26rpx;
+	}
+
+	.send-text-btn {
+		margin-top: 20rpx;
+		background-color: #409eff;
+		color: white;
+	}
+
+	/* 日志区域样式 */
+	.log-area {
+		margin-top: 30rpx;
+	}
+
+	.log-title {
+		font-size: 28rpx;
+		font-weight: bold;
+		margin-bottom: 15rpx;
+		color: #333;
+	}
+
+	.log-content {
+		height: 200rpx;
+		background-color: white;
+		border-radius: 10rpx;
+		padding: 15rpx;
+		font-size: 24rpx;
+		color: #666;
+	}
+
+	.log-item {
+		margin-bottom: 8rpx;
+	}
+
+	.btn {
+		padding: 10rpx 20rpx;
+		border-radius: 8rpx;
+		font-size: 26rpx;
+		text-align: center;
+	}
+
+	.btn[disabled] {
+		opacity: 0.5;
+	}
+
+	.txt {
+		border: 1px solid #000000;
+	}
+	
+	.w50{
+		width: 50%;
+		color: #656363;
+		font-size: 26prx;
+	}
+	.fleft{
+		float: left;
+	}
+	.clear{
+		clear: both;
+	}
+</style>
\ No newline at end of file
diff --git a/pages/BlueTooth/ModeSetting/HBY650_1.vue b/pages/BlueTooth/ModeSetting/HBY650_1.vue
new file mode 100644
index 0000000..8338463
--- /dev/null
+++ b/pages/BlueTooth/ModeSetting/HBY650_1.vue
@@ -0,0 +1,1899 @@
+<template>
+	<view class="container">
+		<!-- 蓝牙设备列表页 -->
+		<view v-if="currentPage === 'deviceList'">
+			<view class="title">蓝牙设备列表</view>
+
+			<view class="status-bar">
+				<text>蓝牙状态: {{ bluetoothStatus }}</text>
+				<button class="btn" :disabled="isLoading" @click="toggleBluetooth">
+					{{ isBluetoothOpen ? '关闭蓝牙' : '开启蓝牙' }}
+				</button>
+			</view>
+
+			<view class="search-area">
+				<button class="btn search-btn" :disabled="!isBluetoothOpen || isSearching" @click="startSearch">
+					{{ isSearching ? '正在搜索...' : '搜索设备' }}
+				</button>
+				<text class="tips">{{ searchTips }}</text>
+			</view>
+
+			<view class="devices-list" v-if="deviceList.length > 0">
+				<view class="device-item" v-for="(device, index) in deviceList" :key="index"
+					:class="{'active': device.name === targetDeviceName}"
+					@click="connectDevice(device.deviceId, device.name)">
+					<text class="device-name">{{ device.name || '未知设备' }}</text>
+					<text class="device-rssi">{{ device.RSSI }}dBm</text>
+					<text class="device-status" v-if="device.name === targetDeviceName">已连接</text>
+				</view>
+			</view>
+		</view>
+
+		<!-- 主控制页面 -->
+		<view v-if="currentPage === 'controlPanel'">
+			<view class="title">蓝牙设备控制器</view>
+
+			<view class="status-bar">
+				<text>已连接: {{ targetDeviceName }}</text>
+				<button class="btn" @click="disconnectDevice(null)">断开连接</button>
+			</view>
+			<view class="receivLog">
+				<view>数据更新时间：{{receiveData.date}}</view>
+				<view class="w50 fleft">Mac地址:{{receiveData.macAddress}}</view>
+				<view class="w50 fleft">静电探测档位:{{receiveData.staticLevel}}</view>
+				<view class="w50 fleft">剩余照明时间:{{receiveData.lightingTime}}</view>
+				<view class="w50 fleft">照明档位:{{receiveData.lightingLevel}}</view>
+				<view class="w50 fleft">电池电量:{{receiveData.batteryLevel}}</view>
+				<view class="w50 fleft">预警级别:{{receiveData.warnLevel}}</view>
+				<view class="clear"></view>
+			</view>
+
+			<view v-show="currentTab === 'splash' || currentTab === 'text'">
+				<text>发送间隔:</text>
+				<input type="number" v-model="inteval" class="txt" />
+			</view>
+
+
+			<view class="function-tabs">
+				<button class="tab-btn" :class="{'active': currentTab === 'mode'}" @click="currentTab = 'mode'">
+					检测模式
+				</button>
+				<button class="tab-btn" :class="{'active': currentTab === 'brightness'}"
+					@click="currentTab = 'brightness'">
+					照明模式
+				</button>
+				<button class="tab-btn" :class="{'active': currentTab === 'splash'}" @click="currentTab = 'splash'">
+					开机画面
+				</button>
+				<button class="tab-btn" :class="{'active': currentTab === 'flash'}" @click="gotoSendVideo">开机动画</button>
+				<button class="tab-btn" :class="{'active': currentTab === 'text'}" @click="currentTab = 'text'">
+					文字设置
+				</button>
+			</view>
+
+			<!-- 模式设置选项卡 -->
+			<view v-if="currentTab === 'mode'">
+				<view class="modes-area">
+					<view class="mode-title">选择静电探测档位</view>
+					<view class="modes-grid">
+						<view class="mode-item" :class="{'selected': currentMode === 'high'}" @click="setMode('high')">
+							<text class="mode-icon">💡</text>
+							<text class="mode-name">高档模式</text>
+						</view>
+						<view class="mode-item" :class="{'selected': currentMode === 'low'}" @click="setMode('low')">
+							<text class="mode-icon">🔅</text>
+							<text class="mode-name">中档模式</text>
+						</view>
+						<view class="mode-item" :class="{'selected': currentMode === 'flash'}"
+							@click="setMode('flash')">
+							<text class="mode-icon">💥</text>
+							<text class="mode-name">低档模式</text>
+						</view>
+					</view>
+				</view>
+			</view>
+
+			<!-- 亮度调节选项卡 -->
+			<view v-if="currentTab === 'brightness'">
+				<view class="brightness-area">
+					<view class="brightness-title">照明模式</view>
+					<button class="tab-btn" :class="{'active': brightnessStatu}" @click="setBrightness(true)">
+						开启
+					</button>
+					<button class="tab-btn" :class="{'active': !brightnessStatu}" @click="setBrightness(false)">
+						关闭
+					</button>
+				</view>
+			</view>
+
+			<!-- 开机画面选项卡 -->
+			<view v-if="currentTab === 'splash'">
+				<canvas canvas-id="splashCanvas" style="width: 160px; height: 80px; z-index: 9999;position: fixed; "
+					:style="{top:canvasTop,left:canvasLeft}"></canvas>
+				<view class="splash-controls">
+					<button class="btn" @click="importImage">导入图片</button>
+
+					<button class="btn" :disabled="!hasImage || isSending" @click="sendSplashImage">确认发送</button>
+				</view>
+
+				<view class="splash-preview">
+					<view class="splash-frame">
+						<image v-if="tempImagePath" :src="tempImagePath" mode="aspectFill" :style="imageStyle"
+							@touchstart="onTouchStart" @touchmove="onTouchMove" @touchend="onTouchEnd"></image>
+						<view v-else class="empty-frame">点击"导入图片"选择开机画面</view>
+					</view>
+					<view class="frame-info">
+						<text>框选区域: 160×80像素</text>
+						<text v-if="hasImage">缩放: {{ scale.toFixed(2) }}x</text>
+					</view>
+				</view>
+
+				<view class="sending-progress" v-if="isSending">
+					<view class="progress-bar">
+						<view class="progress-fill" :style="{ width: progress + '%' }"></view>
+					</view>
+					<text>正在发送: {{ progress }}% ({{ currentPacket }}/{{ totalPackets }})</text>
+				</view>
+			</view>
+
+
+			<!-- 文字设置选项卡 -->
+			<view v-if="currentTab === 'text'">
+				<view class="text-inputs">
+					<view class="text-line" v-for="(line, index) in textLines" :key="index">
+						<text>第{{ index + 1 }}行:</text>
+						<input v-model="textLines[index]" placeholder="请输入文字" maxlength="30"
+							@confirm="onTextChanged(index)" />
+					</view>
+				</view>
+
+				<button class="btn send-text-btn" :disabled="isSendingText" @click="sendText">发送文字</button>
+
+				<view class="sending-progress" v-if="isSendingText">
+					<view class="progress-bar">
+						<view class="progress-fill" :style="{ width: textProgress + '%' }"></view>
+					</view>
+					<text>正在发送: {{ textProgress }}% ({{ currentTextPacket }}/{{ totalTextPackets }})</text>
+				</view>
+			</view>
+		</view>
+
+
+
+
+
+	</view>
+</template>
+
+<script>
+	import gbk from '@/utils/gbk.js';
+
+	export default {
+		data() {
+			return {
+				canvasTop: '-1000px',
+				canvasLeft: '-1000px',
+				inteval: 0,
+				isLoading: false,
+				isBluetoothOpen: false,
+				isSearching: false,
+				isConnected: false,
+				isSending: false,
+				isSendingText: false,
+				bluetoothStatus: '未初始化',
+				searchTips: '',
+				deviceList: [],
+				connectedDeviceId: '',
+				serviceId: '0xFFE1',
+				writeCharacteristicId: '0xFFE1',
+				notifyCharacteristicId: '0xFFE2',
+				currentMode: '',
+				logList: [],
+				packetCount: 1,
+				currentPage: 'deviceList',
+				targetDeviceName: ['JQZM-EF4651', 'XLCX-68455E'],
+				currentTab: 'mode',
+				brightness: 50,
+				brightnessTimer: null,
+				tempImagePath: '',
+				hasImage: false,
+				scale: 1,
+				translateX: 0,
+				translateY: 0,
+				lastX: 0,
+				lastY: 0,
+				isDragging: false,
+
+				imageWidth: 0,
+				imageHeight: 0,
+				textLines: ['你好中国', '你好中国', '你好中国', '你好中国'],
+				progress: 0,
+				currentPacket: 0,
+				totalPackets: 52,
+				textProgress: 0,
+				currentTextPacket: 0,
+				totalTextPackets: 4,
+				brightnessStatu: false,
+				receiveData: {
+					"date": "",
+					"staticLevel": "",
+					"lightingLevel": "",
+					"lightingTime": "",
+					"batteryLevel": "",
+					"macAddress": "",
+					"warnLevel": ""
+				},
+				subscits: [],
+				videoPath: "",
+				videoWidth: "",
+				videoHeight: "",
+				videoDuration: ""
+
+			}
+		},
+		computed: {
+			imageStyle() {
+				return `transform: scale(${this.scale}) translate(${this.translateX}px, ${this.translateY}px); transform-origin: 0 0;`;
+			}
+		},
+		onLoad() {
+
+			// debugger;
+			//  // let iconv = require('iconv-lite');
+			// // 假设我们有一个UTF-8编码的字符串
+			// let utf8String = '你好，世界！';
+
+			// // 使用iconv-lite将字符串从UTF-8编码转换为GBK编码
+			// let gbkBuffer = iconv.encode(utf8String, 'GBK');
+
+			// console.log('转换后的GBK编码Buffer对象:', gbkBuffer)
+
+			this.initBluetoothAdapter();
+		},
+
+		methods: {
+			//灯光打开与关闭
+			setBrightness(flag) {
+				if (this.brightnessStatu == flag) {
+					return;
+
+				}
+				this.brightnessStatu = flag;
+
+				setTimeout(() => {
+					let buffer = new ArrayBuffer(6);
+					let dataView = new DataView(buffer);
+					dataView.setUint8(0, 0x55); // 帧头
+					dataView.setUint8(1, 0x00); // 帧类型
+					dataView.setUint8(2, 0x01); // 包序号
+					dataView.setUint8(3, 0x00); // 数据长度
+					dataView.setUint8(4, 0x01); // 数据长度
+					dataView.setUint8(5, flag ? 0x6e : 0x6f); // 数据
+
+					// 发送数据
+					this.sendData(buffer);
+
+				}, 0);
+			},
+			// 蓝牙初始化
+			initBluetoothAdapter() {
+				console.log('开始初始化蓝牙适配器');
+				uni.openBluetoothAdapter({
+					success: (res) => {
+						this.isBluetoothOpen = true;
+						this.bluetoothStatus = '已开启';
+						console.log('蓝牙适配器初始化成功');
+						this.getBluetoothAdapterState();
+
+						// 自动开始搜索设备
+						this.startSearch();
+					},
+					fail: (err) => {
+						this.bluetoothStatus = '初始化失败';
+						console.log(`蓝牙适配器初始化失败: ${err.errMsg}`);
+						if (err.errCode === 10001) {
+							uni.onBluetoothAdapterStateChange((res) => {
+								if (res.available) {
+									this.isBluetoothOpen = true;
+									this.bluetoothStatus = '已开启';
+									console.log('蓝牙适配器已开启');
+									this.startSearch();
+								}
+							});
+						}
+					}
+				});
+			},
+
+			// 获取蓝牙适配器状态
+			getBluetoothAdapterState() {
+				uni.getBluetoothAdapterState({
+					success: (res) => {
+						this.isBluetoothOpen = res.available;
+						this.bluetoothStatus = res.available ? '已开启' : '已关闭';
+						if (!res.available) {
+							console.log('蓝牙适配器未开启');
+						}
+					}
+				});
+			},
+
+			// 开关蓝牙
+			toggleBluetooth() {
+				if (this.isBluetoothOpen) {
+					this.closeBluetoothAdapter();
+				} else {
+					this.initBluetoothAdapter();
+				}
+			},
+
+			// 关闭蓝牙适配器
+			closeBluetoothAdapter() {
+
+
+				this.stopSearch();
+				this.disconnectDevice(() => {
+					uni.closeBluetoothAdapter({
+						success: () => {
+							console.log("蓝牙已关闭");
+							this.isBluetoothOpen = false;
+							this.isSearching = false;
+							this.isConnected = false;
+							this.bluetoothStatus = '已关闭';
+							this.deviceList = [];
+							this.connectedDeviceId = '';
+							this.currentMode = '';
+							this.currentPage = 'deviceList';
+						}
+					})
+				});
+
+
+
+			},
+
+			// 开始搜索蓝牙设备
+			startSearch() {
+				if (this.isSearching) return;
+
+				this.isSearching = true;
+				this.deviceList = [];
+				this.searchTips = '搜索中...';
+				console.log('开始搜索蓝牙设备');
+
+				uni.startBluetoothDevicesDiscovery({
+					services: ["0000FFE0-0000-1000-8000-00805F9B34FB"],
+					allowDuplicatesKey: false,
+					success: (res) => {
+						console.log('开始搜索蓝牙设备成功');
+						this.onDeviceFound();
+
+
+					},
+					fail: (err) => {
+						this.isSearching = false;
+						this.searchTips = '搜索失败';
+						console.log(`搜索蓝牙设备失败: ${err.errMsg}`);
+					}
+				});
+			},
+
+			// 停止搜索蓝牙设备
+			stopSearch() {
+				this.isSearching = false;
+				this.searchTips = this.deviceList.length > 0 ? '搜索完成' : '未发现蓝牙设备';
+
+				uni.stopBluetoothDevicesDiscovery({
+					success: () => {
+						console.log('停止搜索蓝牙设备');
+					}
+				});
+			},
+
+			// 监听发现新设备
+			onDeviceFound() {
+				uni.onBluetoothDeviceFound((res) => {
+					let device = res.devices[0];
+					if (!device.name && !device.localName) return;
+
+					let index = this.deviceList.findIndex(item => item.deviceId === device.deviceId);
+					if (index === -1) {
+						this.deviceList.push({
+							deviceId: device.deviceId,
+							name: device.name || device.localName,
+							RSSI: device.RSSI
+						});
+					} else {
+						// 更新信号强度
+						this.deviceList[index].RSSI = device.RSSI;
+
+					}
+					// }
+
+					// 如果找到目标设备，自动连接
+					if (this.targetDeviceName.indexOf(device.name || device.localName) > -1) {
+						console.log(`发现目标设备: ${JSON.stringify(device)}`);
+						this.connectDevice(device.deviceId, device.name);
+					}
+				});
+			},
+
+			// 连接蓝牙设备
+			connectDevice(deviceId, deviceName) {
+				if (this.isConnected && this.connectedDeviceId === deviceId) return;
+
+				this.isLoading = true;
+				console.log(`开始连接设备: ${deviceId}`);
+				var these = this;
+				uni.createBLEConnection({
+					deviceId: deviceId,
+					timeout: 10000,
+					success: (res) => {
+						this.stopSearch();
+						this.isConnected = true;
+						this.connectedDeviceId = deviceId;
+						this.targetDeviceName = deviceName;
+						console.log(`连接设备 ${deviceName} 成功`);
+						this.enableNotification(deviceId);
+						// 连接成功后切换到控制面板
+						this.currentPage = 'controlPanel';
+
+						setTimeout(function() {
+							uni.setBLEMTU({
+								deviceId: deviceId,
+								mtu: 512,
+								success: (info) => {
+									console.log("设置mtu成功")
+								},
+								fail: (ex) => {
+									console.log("设置mtu失败" + JSON.stringify(ex));
+								},
+								complete() {
+									
+								}
+							})
+
+
+						}, 200)
+						these.getDeviceServices(deviceId);
+
+
+					},
+					fail: (err) => {
+						console.log(`连接设备失败: ${JSON.stringify(err)}`);
+						uni.showToast({
+							title: '连接失败',
+							icon: 'none'
+						});
+					},
+					complete: () => {
+						this.isLoading = false;
+					}
+				});
+			},
+
+			// 断开蓝牙连接
+			disconnectDevice(callback) {
+				var these = this;
+				var promises = [];
+				for (var i = 0; i < these.subscits.length; i++) {
+					promises.push(new Promise((succ, err) => {
+						uni.notifyBLECharacteristicValueChange({
+							deviceId: these.connectedDeviceId,
+							serviceId: these.subscits[i].serviceId,
+							characteristicId: these.subscits[i].notifyId,
+							state: false,
+							success: () => {
+								console.log("取消订阅成功");
+								succ();
+							},
+							fail: () => {
+								err();
+							}
+						});
+					}));
+				}
+				these.subscits = [];
+				Promise.all(promises).then(() => {
+					if (!this.connectedDeviceId) {
+						this.isConnected = false;
+						this.connectedDeviceId = '';
+						this.currentMode = '';
+						this.currentPage = 'deviceList';
+						if (callback) {
+							callback();
+						}
+						return;
+					}
+					setTimeout(() => {
+						uni.closeBLEConnection({
+							deviceId: this.connectedDeviceId,
+							success: (res) => {
+
+								console.log('蓝牙连接已断开' + JSON.stringify(res));
+
+
+							},
+							fail: (ex) => {
+								let arr = [{
+										code: 0,
+										remark: '正常'
+									},
+									{
+										code: 10000,
+										remark: '未初始化蓝牙适配器'
+									},
+									{
+										code: 10001,
+										remark: '当前蓝牙适配器不可用'
+									},
+									{
+										code: 10002,
+										remark: '没有找到指定设备'
+									},
+									{
+										code: 10003,
+										remark: '连接失败'
+									},
+									{
+										code: 10004,
+										remark: '没有找到指定服务'
+									},
+									{
+										code: 10005,
+										remark: '没有找到指定特征值'
+									},
+									{
+										code: 10006,
+										remark: '当前连接已断开'
+									},
+									{
+										code: 10007,
+										remark: '当前特征值不支持此操作'
+									},
+									{
+										code: 10008,
+										remark: '其余所有系统上报的异常'
+									},
+									{
+										code: 10009,
+										remark: 'Android 系统特有，系统版本低于 4.3 不支持 BLE'
+									},
+									{
+										code: 10010,
+										remark: '已连接'
+									},
+									{
+										code: 10011,
+										remark: '配对设备需要配对码'
+									},
+									{
+										code: 10012,
+										remark: '连接超时'
+									},
+									{
+										code: 10013,
+										remark: '连接 deviceId 为空或者是格式不正确'
+									}
+								];
+								let f = arr.find(function(v) {
+									return v.code == ex.code;
+								})
+
+								console.log("无法断开蓝牙连接:" + f.remark);
+
+								uni.showToast({
+									title: "无法断开蓝牙连接:" + f.remark,
+									icon: 'fail'
+								});
+
+							},
+							complete: () => {
+								this.isConnected = false;
+								this.connectedDeviceId = '';
+								this.currentMode = '';
+								this.currentPage = 'deviceList';
+								if (callback) {
+									callback();
+								}
+							}
+						});
+
+					}, 200)
+
+				}).catch().finally();
+
+
+
+
+
+			},
+
+			// 获取设备服务
+			getDeviceServices(deviceId) {
+				console.log("deviceId=" + deviceId);
+				var these = this;
+				uni.getBLEDeviceServices({
+					deviceId: deviceId,
+					success: (res) => {
+
+						console.log("发现服务" + JSON.stringify(res.services))
+						if (res.services.length == 0) {
+							setTimeout(function() {
+								these.getDeviceServices(deviceId);
+							}, 200);
+							return;
+						}
+						// 查找目标服务
+						let targetService = res.services.find(service => service.uuid.indexOf('FFE0') > -1);
+
+						if (targetService) {
+							console.log(`找到目标服务: ${targetService.uuid}`);
+							this.serviceId = targetService.uuid;
+							this.getDeviceCharacteristics(deviceId, targetService.uuid);
+						}
+
+
+
+
+					},
+					fail: (err) => {
+						console.log(`获取设备服务失败: ${err.errMsg}`);
+					}
+				});
+			},
+
+
+			// 获取设备特征值
+			getDeviceCharacteristics(deviceId, serviceId) {
+				uni.getBLEDeviceCharacteristics({
+					deviceId: deviceId,
+					serviceId: serviceId,
+					success: (res) => {
+						console.log(`获取设备特征值成功，共发现 ${res.characteristics.length} 个特征值`);
+						console.log(`获取设备特征值成功${JSON.stringify(res.characteristics)}`);
+						// 查找可写特征值
+						let writeChar = res.characteristics.find(char =>
+							char.uuid.indexOf("FFE1") >= 1
+						);
+
+						// 查找通知特征值
+						let notifyChar = res.characteristics.find(char => {
+								return char.properties.notify;
+							}
+
+						);
+
+						if (writeChar) {
+							console.log(`找到可写特征值: ${writeChar.uuid}`);
+							this.writeCharacteristicId = writeChar.uuid;
+						} else {
+							console.log(`未找到可写特征值: ${this.writeCharacteristicId}`);
+						}
+
+						if (notifyChar) {
+							console.log(`找到通知特征值: ${notifyChar.uuid}`);
+							this.notifyCharacteristicId = notifyChar.uuid;
+							console.log("serviceId=" + serviceId);
+							console.log("characteristicId=" + notifyChar.uuid);
+							this.subscits.push({
+								deviceId: deviceId,
+								serviceId: serviceId,
+								notifyId: notifyChar.uuid
+							});
+							setTimeout(() => {
+								uni.notifyBLECharacteristicValueChange({
+									deviceId: deviceId,
+									serviceId: serviceId,
+									characteristicId: notifyChar.uuid,
+									state: true,
+									success: (info) => {
+										console.log('启用通知成功' + JSON.stringify(info));
+										uni.showToast({
+											title: "订阅消息成功",
+											icon: 'success'
+										});
+										// 监听特征值变化
+										setTimeout(() => {
+											uni.onBLECharacteristicValueChange((
+												receive) => {
+
+												var bytesToHexString =function(bytes) {
+														return bytes.map(
+															byte =>byte.toString(16).padStart(2, '0')
+														).join(' ')
+													}
+
+
+												var parseData = (bytes) => {
+													if (bytes.length <7) {
+														console.log('数据包长度不足，至少需要6个字节');
+														return;
+													}
+													let date = new Date();
+													this.receiveData.date =date.getHours() +":" + date.getMinutes() +":" + date.getSeconds();
+													if(bytes[0]==0x55){
+														try {
+															// 跳过帧头(第一个字节)，从第二个字节开始解析
+															let staticLevelByte = bytes[1];
+															let staticLevelText = '未知';
+															switch ( staticLevelByte ) {
+																case 0x65:
+																	staticLevelText = '高档';
+																	break;
+																case 0x66:
+																	staticLevelText = '中档';
+																	break;
+																case 0x67:
+																	staticLevelText = '低档';
+																	break;
+																case 0x68:
+																	staticLevelText = '关闭';
+																	break;
+															}
+														
+															// 解析照明档位
+															let lightingLevelByte = bytes[2];
+															let lightingLevelText = lightingLevelByte === 0x6e ? '开启':'关闭';
+														
+															// 解析剩余照明时间（第三和第四字节，小端序）
+															let lightingTime =(bytes[3] <<8) | bytes[4];
+														
+															// 解析剩余电量
+															let batteryLevelByte = bytes[5];
+															// 电量百分比范围检查
+															let batteryLevel = Math.max(0,Math.min(100, batteryLevelByte));
+														
+															let warn=bytes[6];
+															if(warn==0x00){
+																warn='无预警';
+															}
+															else if(warn==0x01){
+																warn='弱预警';
+															}
+															else if(warn==0x02){
+																warn='中预警';
+															}
+															else if(warn==0x03){
+																warn='强预警';
+															}
+															else if(warn==0x04){
+																warn='非常强预警';
+															}
+															console.log(warn)
+															console.log('解析结果:', {
+																	staticLevel: staticLevelText,
+																	lightingLevel: lightingLevelText,
+																	lightingTime: `${lightingTime} 分钟`,
+																	batteryLevel: `${batteryLevel}%`
+																});
+															
+															this.receiveData.staticLevel =staticLevelText;
+															this.receiveData.lightingLevel =lightingLevelText;
+															this.receiveData.lightingTime =lightingTime +'分钟';
+															this.receiveData.batteryLevel =batteryLevel +'%';
+															this.receiveData.warnLevel=warn;
+														} catch (error) {
+															console.log('数据解析错误:',error);
+														}
+													}
+													else{
+														try{
+															let uint8Array = new Uint8Array(receive.value);
+															let str = '';
+															for (let i = 0; i < uint8Array.length; i++) {
+																// 将每个字节转换为对应的字符
+																str += String.fromCharCode(uint8Array[i]);
+															}
+															if(str.indexOf('mac address:')==0){
+																this.receiveData.macAddress=str.split(':')[1];
+																console.log("收到mac地址:",)
+															}else{
+																console.log("收到无法解析的字符串:",str)
+															}															
+														}catch(ex){
+															console.log("将数据转文本失败",ex);
+														}
+													}
+												}
+
+												let dataView =
+													new DataView(receive
+														.value);
+
+												// 转换为字节数组
+												let bytes = [];
+												for (let i = 0; i <
+													dataView
+													.byteLength; i++) {
+													bytes.push(dataView
+														.getUint8(i));
+												}
+
+												// 保存原始数据用于调试
+												this.receivedData = bytes;
+												console.log('接收到原始数据:',
+													bytesToHexString(
+														bytes));
+
+												parseData(bytes);
+
+											});
+										}, 100)
+
+									},
+									fail: (err) => {
+										console.error('启用通知失败', err);
+									}
+								});
+							}, 500);
+
+						} else {
+							console.log(`未找到通知特征值: ${this.notifyCharacteristicId}`);
+						}
+
+
+
+					},
+					fail: (err) => {
+						console.log(`获取设备特征值失败: ${err.errMsg}`);
+					}
+				});
+			},
+
+			// 启用通知
+			enableNotification(deviceId) {
+				// uni.notifyBLECharacteristicValueChange({
+				// 	deviceId: deviceId,
+				// 	serviceId: this.serviceId,
+				// 	characteristicId: this.notifyCharacteristicId,
+				// 	state: true,
+				// 	success: () => {
+				// 		console.log('启用通知成功');
+
+				// 		// 监听通知
+				// 		uni.onBLECharacteristicValueChange((res) => {
+				// 			this.handleNotification(res.value);
+				// 		});
+				// 	},
+				// 	fail: (err) => {
+				// 		console.log(`启用通知失败: ${err.errMsg}`);
+				// 	}
+				// });
+			},
+
+			// 处理通知数据
+			handleNotification(buffer) {
+				console.log("收到设备通知数据")
+				// 解析从设备接收的数据
+				let dataView = new DataView(buffer);
+				let result = '';
+
+				for (let i = 0; i < dataView.byteLength; i++) {
+					result += String.fromCharCode(dataView.getUint8(i));
+				}
+
+				console.log(`收到设备数据: ${result}`);
+			},
+
+			// 设置静电检测模式
+			setMode(mode) {
+				if (!this.isConnected) {
+					uni.showToast({
+						title: '未连接设备',
+						icon: 'none'
+					});
+					return;
+				}
+
+				if (this.currentMode === mode) return;
+
+				this.currentMode = mode;
+				let dataValue = 0;
+
+				switch (mode) {
+					case 'high':
+						dataValue = 0x65; // 高档模式
+						//console.log('开始切换到高档模式');
+						break;
+					case 'low':
+						dataValue = 0x66; // 中档模式
+						//console.log('开始切换到中档模式');
+						break;
+					case 'flash':
+						dataValue = 0x67; // 低档模式
+						//console.log('开始切换到低档模式');
+						break;
+					default:
+						dataValue = 0x68; // 低档模式
+						//console.log('开始切换到低档模式');
+						break;
+				}
+
+				// 构建数据包
+				let buffer = new ArrayBuffer(6);
+				let dataView = new DataView(buffer);
+
+				dataView.setUint8(0, 0x55); // 帧头
+				dataView.setUint8(1, 0x00); // 帧类型
+				dataView.setUint8(2, 0x01); // 包序号
+				dataView.setUint8(3, 0x00); // 数据长度
+				dataView.setUint8(4, 0x01); // 数据长度
+				dataView.setUint8(5, dataValue); // 数据
+
+
+				// 发送数据
+				this.sendData(buffer);
+
+
+
+			},
+
+			// 亮度调节
+			onBrightnessChanging(e) {
+				this.brightness = e.detail.value;
+
+				// 清除之前的定时器
+				if (this.brightnessTimer) {
+					clearTimeout(this.brightnessTimer);
+				}
+
+				// 设置新的定时器，控制发送频率
+				this.brightnessTimer = setTimeout(() => {
+					this.sendBrightness();
+				}, 100);
+			},
+
+			onBrightnessChanged(e) {
+				this.brightness = e.detail.value;
+				//this.sendBrightness();
+			},
+
+			sendBrightness() {
+				if (!this.isConnected) return;
+
+				// 构建数据包
+				let buffer = new ArrayBuffer(6);
+				let dataView = new DataView(buffer);
+				let data = '0x' + parseInt(this.brightness).toString(16);
+				console.log("亮度:" + this.brightness + ',16进制:' + data);
+				dataView.setUint8(0, 0x55); // 帧头
+				dataView.setUint8(1, 0x01); // 帧类型：亮度调节
+				dataView.setUint8(2, 0x01); // 包序号
+				dataView.setUint8(3, 0x00); // 数据长度
+				dataView.setUint8(4, 0x01); // 数据长度
+				dataView.setUint8(5, data); // 数据
+
+				// 发送数据
+				this.sendData(buffer);
+			},
+
+			// 导入图片
+			importImage() {
+				uni.chooseImage({
+					count: 1,
+					sourceType: ['album'],
+					success: (res) => {
+						this.tempImagePath = res.tempFilePaths[0];
+						this.hasImage = true;
+						this.scale = 1;
+						this.translateX = 0;
+						this.translateY = 0;
+
+						// 获取图片尺寸
+						uni.getImageInfo({
+							src: this.tempImagePath,
+							success: (info) => {
+								this.imageWidth = info.width;
+								this.imageHeight = info.height;
+								this.autoFitImage();
+								console.log('图片导入成功，请调整图片位置和大小');
+							},
+							fail: (err) => {
+								console.log(`获取图片信息失败: ${err.errMsg}`);
+							}
+						});
+					},
+					fail: (err) => {
+						console.log(`选择图片失败: ${err.errMsg}`);
+					}
+				});
+			},
+
+			// 自动适配图片到容器
+			autoFitImage() {
+				let frameWidth = 320; // 预览框宽度，根据实际UI调整
+				let frameHeight = 640; // 预览框高度，根据实际UI调整
+
+				let widthRatio = frameWidth / this.imageWidth;
+				let heightRatio = frameHeight / this.imageHeight;
+
+				// 取较小的缩放比例，确保图片能完全显示在容器内
+				this.scale = Math.min(widthRatio, heightRatio);
+
+				// 居中显示
+				this.translateX = (frameWidth - this.imageWidth * this.scale) / 2;
+				this.translateY = (frameHeight - this.imageHeight * this.scale) / 2;
+			},
+
+			// 触摸事件处理
+			onTouchStart(e) {
+				if (e.touches.length === 1) {
+					this.isDragging = true;
+					this.lastX = e.touches[0].clientX;
+					this.lastY = e.touches[0].clientY;
+				}
+			},
+
+			onTouchMove(e) {
+				if (this.isDragging && e.touches.length === 1) {
+					let currentX = e.touches[0].clientX;
+					let currentY = e.touches[0].clientY;
+
+					// 计算位移
+					let deltaX = currentX - this.lastX;
+					let deltaY = currentY - this.lastY;
+
+					// 更新位置
+					this.translateX += deltaX;
+					this.translateY += deltaY;
+
+					// 限制移动范围
+					this.limitImagePosition();
+
+					// 更新最后位置
+					this.lastX = currentX;
+					this.lastY = currentY;
+				}
+			},
+
+			onTouchEnd() {
+				this.isDragging = false;
+			},
+
+			// 限制图片移动范围
+			limitImagePosition() {
+				let frameWidth = 320; // 预览框宽度，根据实际UI调整
+				let frameHeight = 640; // 预览框高度，根据实际UI调整
+
+				let maxX = 0;
+				let minX = frameWidth - this.imageWidth * this.scale;
+				let maxY = 0;
+				let minY = frameHeight - this.imageHeight * this.scale;
+
+				this.translateX = Math.max(minX, Math.min(maxX, this.translateX));
+				this.translateY = Math.max(minY, Math.min(maxY, this.translateY));
+			},
+
+			// 发送开机画面
+			sendSplashImage() {
+				if (!this.hasImage) {
+					uni.showToast({
+						title: '请先导入图片',
+						icon: 'none'
+					});
+					return;
+				}
+
+				uni.showLoading({
+					title: '处理图片中...',
+					mask: true
+				});
+
+				// 将图片转换为RGB565格式并发送
+				this.convertAndSendImage().then(() => {
+					uni.hideLoading();
+					console.log('开机画面发送完成');
+					uni.showToast({
+						title: '开机画面发送完成',
+						icon: 'success'
+					});
+				}).catch((error) => {
+					uni.hideLoading();
+					console.log(`图片发送失败: ${error}`);
+					uni.showToast({
+						title: '图片发送失败',
+						icon: 'none'
+					});
+				});
+			},
+
+			// 转换图片并发送
+			convertAndSendImage() {
+				return new Promise((resolve, reject) => {
+					console.log("111111");
+					// 创建canvas用于处理图片
+					let ctx = uni.createCanvasContext('splashCanvas', this);
+					console.log("2222222");
+					// 绘制图片到canvas
+					ctx.drawImage(this.tempImagePath, 0, 0, 160, 80);
+					console.log("33333333");
+					try {
+						ctx.draw(false, () => {
+							console.log("4444444");
+							// 获取canvas像素数据
+							this.canvasTop = '0px';
+							this.canvasLeft = '0px';
+							setTimeout(() => {
+								uni.canvasGetImageData({
+									canvasId: 'splashCanvas',
+									x: 0,
+									y: 0,
+									width: 160,
+									height: 80,
+									success: (res) => {
+										// 处理像素数据并发送
+										console.log("res.data.length=" + res.data
+											.length);
+										this.processAndSendImageData(res.data).then(
+											resolve).catch(reject);
+									},
+									fail: (err) => {
+										reject(`获取canvas数据失败: ${err.errMsg}`);
+									}
+								});
+							}, 300); // 等待canvas绘制完成
+						});
+					} catch (ex) {
+						console.log("出现异常" + JSON.stringify(ex))
+					}
+
+				});
+			},
+
+			// 处理像素数据并发送
+			processAndSendImageData(pixels) {
+				return new Promise((resolve, reject) => {
+					// 创建RGB565格式的像素数据
+					let rgb565Data = this.convertToRGB565(pixels);
+
+					// 分包发送
+					this.sendImagePackets(rgb565Data).then(resolve).catch(reject);
+				});
+			},
+
+			// 将RGBA转换为RGB565
+			convertToRGB565(pixels) {
+
+				var rgbaToRgb565 = function(r, g, b, a = 255) {
+					// 忽略透明度（如果需要考虑透明度，请根据需求处理）
+
+					// 将8位颜色值压缩到RGB565对应的位数
+					let r5 = Math.round((r / 255) * 31); // 5位：0-31
+					let g6 = Math.round((g / 255) * 63); // 6位：0-63
+					let b5 = Math.round((b / 255) * 31); // 5位：0-31
+
+					// 合并为16位整数
+					return (r5 << 11) | (g6 << 5) | b5;
+				}
+
+				let result = new Uint16Array(160 * 80);
+				let index = 0;
+				console.log("pixels.length=" + pixels.length);
+				for (let i = 0; i < pixels.length; i += 4) {
+					let r = pixels[i];
+					let g = pixels[i + 1];
+					let b = pixels[i + 2];
+
+					// 转换为RGB565 (R:5bit, G:6bit, B:5bit)
+					let rgb565 = ((r & 0xF8) << 8) | ((g & 0xFC) << 3) | (b >> 3);
+					//let rgb565=rgbaToRgb565(r,g,b);
+					result[index++] = rgb565;
+				}
+
+				return result;
+			},
+
+			// 分包发送图片数据
+			sendImagePackets(imageData) {
+				return new Promise((resolve, reject) => {
+					this.isSending = true;
+					this.progress = 0;
+					this.currentPacket = 0;
+
+					// 总数据包数
+					let totalPackets = 52;
+					let currentPacket = 1;
+
+
+
+					// 发送单个数据包
+					let sendNextPacket = () => {
+						let promises = []; {
+							//----------------------------------------------------------------------------------------------
+							// if (currentPacket > totalPackets) {
+							// 	this.isSending = false;
+							// 	resolve();
+							// 	return;
+							// }
+
+							// 计算当前包的数据
+							let packetSize = 250;
+							if (currentPacket <= 51) {
+								packetSize = 250; // 前51个包每个500字节
+							} else {
+								packetSize = 50; // 最后一个包100字节
+							}
+
+							// 创建数据包
+							let startIndex = (currentPacket - 1) * 250;
+							let endIndex = Math.min(startIndex + packetSize, imageData.length);
+							if (startIndex > endIndex) {
+								return;
+							}
+							//console.log("imageData="+imageData.length);
+							let packetData = imageData.slice(startIndex,
+								endIndex);
+							// 构建数据包
+							let bufferSize = 5 + packetData.length * 2; // 头部5字节 + 数据部分
+							let buffer = new ArrayBuffer(bufferSize);
+							let dataView = new DataView(buffer);
+
+							// 填充头部
+							dataView.setUint8(0, 0x55); // 帧头
+							dataView.setUint8(1, 0x02); // 帧类型：开机画面
+							dataView.setUint8(2, '0x' + currentPacket.toString(16).padStart(2, '0')); // 包序号
+							// dataView.setUint8(3, 0x01);
+							// dataView.setUint8(4, 0xFF);
+							if (packetData.length == 250) {
+								dataView.setUint8(3, 0x01);
+								dataView.setUint8(4, 0xF4);
+							} else {
+								dataView.setUint8(3, 0x00);
+								dataView.setUint8(4, 0x64);
+							}
+
+							// 填充数据（每个RGB565值占2字节）
+							for (let i = 0; i < packetData.length; i++) {
+								dataView.setUint16(5 + i * 2, packetData[i], false); // 大端字节序
+							}
+							console.log(
+								`发送数据包${currentPacket}/${totalPackets},${dataView.getUint8(0)} ${dataView.getUint8(1)} ${dataView.getUint8(2)}`
+							)
+
+							let inteval = parseInt(this.inteval ? this.inteval : 0);
+							//发送数据包
+							let promise = this.sendData(buffer);
+							promises.push(promise);
+							if (currentPacket > totalPackets) {
+								console.log("111111");
+							}
+
+							if (currentPacket % 20 == 0 || ((currentPacket >= totalPackets && promises.length >
+									0))) {
+								Promise.all(promises).then(() => {
+									console.log("完成了一软数据发送");
+									if (currentPacket >= totalPackets) {
+										console.log("结束数据发送");
+										this.isSending = false;
+										resolve();
+										return;
+									}
+
+									console.log("进入下一轮");
+									promises = [];
+									this.currentPacket = currentPacket;
+									this.progress = Math.round((currentPacket / totalPackets) * 52);
+									currentPacket++;
+									setTimeout(sendNextPacket, inteval);
+								}).catch((err) => {
+									this.isSending = false;
+									uni.hideLoading();
+									reject(err);
+								}).finally(() => {
+									console.log("本轮完成");
+								});
+							} else {
+								currentPacket++;
+								sendNextPacket();
+							}
+
+							//----------------------------------------------------------------------------------------------
+
+
+						}
+					};
+
+					//牵着你的手
+					var HoldYouHand = () => {
+						var str = "picture transmit start"; //握手的协议字符串
+
+
+						// 1. 创建 ArrayBuffer 和 DataView
+						let buffer = new ArrayBuffer(str.length);
+						let dataView = new DataView(buffer);
+
+						// 2. 将字符串转换为 ASCII 码并写入 DataView
+						for (let i = 0; i < str.length; i++) {
+							dataView.setUint8(i, str.charCodeAt(i));
+						}
+
+						this.sendData(buffer).then(() => {
+							// 开始发送第一个包
+							console.log("握手成功了,等待200ms");
+							setTimeout(sendNextPacket, 120);
+
+						}).catch(err => {
+							console.log("握手没有成功");
+							reject(err);
+						});
+					}
+
+					HoldYouHand();
+
+				});
+			},
+
+			// 文字输入变化
+			onTextChanged(index) {
+				console.log(`第${index + 1}行文字已更新`);
+			},
+
+			// 发送文字
+			sendText() {
+				if (!this.isConnected) {
+					uni.showToast({
+						title: '未连接设备',
+						icon: 'none'
+					});
+					return;
+				}
+
+				this.isSendingText = true;
+				this.textProgress = 0;
+				this.currentTextPacket = 0;
+
+				// 总数据包数
+				let totalPackets = this.textLines.length;
+				let currentPacket = 1;
+
+				// 发送单个数据包
+				let sendNextPacket = () => {
+					if (currentPacket > totalPackets) {
+						this.isSendingText = false;
+						console.log('文字发送完成');
+						uni.showToast({
+							title: '发送成功',
+							icon: 'success'
+						});
+						return;
+					}
+
+					// 获取当前行文字
+					let text = this.textLines[currentPacket - 1] || '';
+
+					// 将文字转换为GBK编码
+					this.convertToGBK(text).then(gbkData => {
+						console.log(JSON.stringify(gbkData));
+						// 构建数据包
+						let bufferSize = 5 + text.length * 2; // 头部4字节 + 数据部分
+						let buffer = new ArrayBuffer(bufferSize);
+						let dataView = new DataView(buffer);
+
+						// 填充头部
+						dataView.setUint8(0, 0x55); // 帧头
+						dataView.setUint8(1, 0x03); // 帧类型：文字
+						dataView.setUint8(2, currentPacket.toString(16)); // 包序号
+
+						console.log(text.length.toString(16));
+						dataView.setUint16(3, (text.length * 2).toString(16)); // 数据长度
+						console.log("gbkData.length=" + gbkData.length);
+						let str = new Array();
+						// 填充数据
+						for (let i = 1; i <= text.length * 2; i++) {
+							let highNibble = gbkData[i * 2 - 2]; // 高4位
+							let lowNibble = gbkData[i * 2 - 1]; // 低4位（如果是奇数长度，补0）
+							console.log("i=" + i + "," + highNibble + lowNibble)
+							// 组合高低位并转换为字节值
+							let byteValue = parseInt(highNibble + lowNibble, 16);
+							dataView.setUint8(5 + i - 1, byteValue);
+						}
+						console.log(str.join(" "));
+
+						console.log("dataView.length=" + dataView.byteLength)
+						// 发送数据包
+						this.sendData(buffer).then(() => {
+							// 更新进度
+							this.currentTextPacket = currentPacket;
+							this.textProgress = Math.round((currentPacket / totalPackets) * 100);
+							console.log(`发送文字数据包 ${currentPacket}/${totalPackets}: ${text}`);
+
+							// 发送下一个包
+							currentPacket++;
+							setTimeout(sendNextPacket, this.inteval ? this.inteval : 0);
+						}).catch(err => {
+							this.isSendingText = false;
+							uni.showToast({
+								title: '文字发送失败',
+								icon: 'none'
+							});
+						});
+					}).catch(err => {
+						this.isSendingText = false;
+						console.log(`文字编码失败: ${err}`);
+						uni.showToast({
+							title: '编码失败',
+							icon: 'none'
+						});
+					});
+				};
+
+				// 开始发送第一个包
+
+				//牵着你的手
+				var HoldYouHand = () => {
+					var str = "word transmit start"; //握手的协议字符串
+
+
+					// 1. 创建 ArrayBuffer 和 DataView
+					let buffer = new ArrayBuffer(str.length);
+					let dataView = new DataView(buffer);
+
+					// 2. 将字符串转换为 ASCII 码并写入 DataView
+					for (let i = 0; i < str.length; i++) {
+						dataView.setUint8(i, str.charCodeAt(i));
+					}
+
+					this.sendData(buffer).then(() => {
+						// 开始发送第一个包
+						console.log("握手成功了,等待200ms");
+						setTimeout(sendNextPacket, 120);
+
+					}).catch(err => {
+						console.log("握手没有成功");
+						uni.showToast({
+							title: '握手没有成功',
+							icon: 'none'
+						});
+					});
+				}
+
+				HoldYouHand();
+
+			},
+
+			// 将文字转换为GBK编码（使用第三方库或API）
+			convertToGBK(text) {
+				return new Promise((resolve, reject) => {
+					// 注意：uniapp环境中可能需要使用特定的GBK编码库
+					// 这里使用模拟实现，实际项目中应使用适当的编码库
+					try {
+
+						// 模拟GBK编码转换
+
+						let arr = gbk.encode(text)
+						let utf8Data = gbk.arr2hex(arr);
+						// 注意：这只是示例，实际GBK编码需要使用专门的库
+						resolve(utf8Data); // 实际项目中替换为GBK编码实现
+					} catch (error) {
+						console.log("错误：" + JSON.stringify(error));
+						reject(error);
+					}
+				});
+			},
+
+			// 发送数据通用方法
+			sendData(buffer) {
+
+				let sendBuffer = () => {
+					return new Promise((resolve, reject) => {
+
+						var promise = new Promise((succ, err) => {
+							uni.writeBLECharacteristicValue({
+								deviceId: this.connectedDeviceId,
+								serviceId: this.serviceId,
+								characteristicId: this.writeCharacteristicId,
+								value: buffer,
+								writeType: plus.os.name == 'iOS' ? 'write' : 'writeNoResponse',
+								success: () => {
+									console.log("发送数据成功");
+									succ();
+								},
+								fail: (ex) => {
+									if (ex.code == '10007') {
+										console.log("失败重试");
+										setTimeout(() => {
+											sendBuffer().then(succ).catch(err);
+										}, this.inteval || 0)
+										// succ()
+
+									} else {
+										console.log("发送数据失败", ex);
+										err(ex);
+									}
+								},
+								complete: function() {
+									//console.log("123456");
+								}
+							});
+						});
+						if (plus.os.name == 'iOS') {
+
+							function timeout(ms) {
+								return new Promise((_, err) => {
+									setTimeout(() => {
+										err({
+											code: -1,
+											errMsg: '超时了'
+										})
+									}, ms);
+								});
+							}
+
+							Promise.race([promise, timeout(this.inteval ? this.inteval : 0)]).then(() => {
+									console.log("成功了");
+									resolve();
+								})
+								.catch((ex) => {
+
+									if (ex.code == -1) {
+										console.log("超时了")
+										resolve();
+									} else {
+										// reject(ex);
+										console.log("异常了", ex);
+										sendBuffer();
+									}
+
+								});
+						} else {
+
+							promise.then(() => {
+								console.log("then........")
+								resolve();
+							}).catch(() => {
+								console.log("catch.........")
+								reject()
+							});
+						}
+					});
+
+				}
+
+				return sendBuffer();
+			},
+
+
+			gotoSendVideo: function() {
+				this.currentTab = 'flash';
+				uni.navigateTo({
+					url: "/pages/BlueTooth/ModeSetting/VideoSend_1",
+					success: (res) => {
+						let channel = res.eventChannel;
+						channel.emit("receiveDevice", {
+							connectedDeviceId: this.connectedDeviceId,
+							serviceId: this.serviceId,
+							writeCharacteristicId: this.writeCharacteristicId,
+							notifyCharacteristicId: this.notifyCharacteristicId
+						})
+					}
+				})
+			}
+
+		},
+		onUnload() {
+			this.closeBluetoothAdapter();
+		}
+	}
+</script>
+
+<style>
+	.receivLog {
+		padding: 20rpx;
+		width: 100%;
+		height: auto;
+		box-sizing: border-box;
+		border: 2rpx solid #e5e5e5;
+		border-radius: 20rpx;
+		font-size: 28rpx;
+		color: #2e2e2e;
+	}
+
+	.container {
+		padding: 20rpx;
+		background-color: #f8f8f8;
+		min-height: 100vh;
+	}
+
+	.title {
+		font-size: 36rpx;
+		font-weight: bold;
+		text-align: center;
+		padding: 20rpx 0;
+		color: #333;
+	}
+
+	.status-bar {
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		padding: 15rpx 0;
+		border-bottom: 1rpx solid #eee;
+	}
+
+	.function-tabs {
+		display: flex;
+		margin: 20rpx 0;
+	}
+
+	.tab-btn {
+		flex: 1;
+		padding: 15rpx 0;
+		text-align: center;
+		font-size: 28rpx;
+		border-bottom: 2rpx solid #eee;
+	}
+
+	.tab-btn.active {
+		color: #409eff;
+		border-bottom: 2rpx solid #409eff;
+	}
+
+	/* 设备列表样式 */
+	.search-area {
+		padding: 20rpx 0;
+	}
+
+	.search-btn {
+		background-color: #409eff;
+		color: white;
+	}
+
+	.tips {
+		color: #999;
+		font-size: 24rpx;
+		margin-top: 10rpx;
+	}
+
+	.devices-list {
+		margin-top: 20rpx;
+	}
+
+	.device-item {
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		padding: 20rpx;
+		background-color: white;
+		border-radius: 10rpx;
+		margin-bottom: 15rpx;
+		box-shadow: 0 2rpx 10rpx rgba(0, 0, 0, 0.05);
+	}
+
+	.device-item.active {
+		background-color: #e8f3ff;
+		border-left: 6rpx solid #409eff;
+	}
+
+	.device-name {
+		font-size: 28rpx;
+		max-width: 500rpx;
+		white-space: nowrap;
+		overflow: hidden;
+		text-overflow: ellipsis;
+	}
+
+	.device-rssi {
+		color: #999;
+		font-size: 24rpx;
+	}
+
+	.device-status {
+		color: #409eff;
+		font-size: 24rpx;
+	}
+
+	/* 模式设置样式 */
+	.modes-area {
+		margin-top: 30rpx;
+	}
+
+	.mode-title {
+		font-size: 28rpx;
+		font-weight: bold;
+		margin-bottom: 20rpx;
+		color: #333;
+	}
+
+	.modes-grid {
+		display: flex;
+		flex-wrap: wrap;
+		justify-content: space-between;
+	}
+
+	.mode-item {
+		width: 30%;
+		padding: 20rpx 0;
+		background-color: white;
+		border-radius: 10rpx;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		box-shadow: 0 2rpx 10rpx rgba(0, 0, 0, 0.05);
+	}
+
+	.mode-item.selected {
+		background-color: #e8f3ff;
+		border: 2rpx solid #409eff;
+	}
+
+	.mode-icon {
+		font-size: 40rpx;
+		margin-bottom: 10rpx;
+	}
+
+	.mode-name {
+		font-size: 26rpx;
+	}
+
+	/* 亮度调节样式 */
+	.brightness-area {
+		margin-top: 30rpx;
+		padding: 20rpx;
+		background-color: white;
+		border-radius: 10rpx;
+		box-shadow: 0 2rpx 10rpx rgba(0, 0, 0, 0.05);
+	}
+
+	.brightness-title {
+		font-size: 28rpx;
+		font-weight: bold;
+		margin-bottom: 20rpx;
+		color: #333;
+	}
+
+	.brightness-value {
+		font-size: 36rpx;
+		text-align: center;
+		margin-bottom: 30rpx;
+		color: #409eff;
+	}
+
+	.brightness-slider {
+		width: 100%;
+	}
+
+	/* 开机画面样式 */
+	.splash-controls {
+		display: flex;
+		justify-content: center;
+		gap: 20rpx;
+		margin: 20rpx 0;
+	}
+
+	.splash-preview {
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+	}
+
+	.splash-frame {
+		height: 320rpx;
+		width: 640rpx;
+		border: 2rpx solid #409eff;
+		border-radius: 8rpx;
+		overflow: hidden;
+		position: relative;
+		background-color: #f0f0f0;
+	}
+
+	.empty-frame {
+		width: 100%;
+		height: 100%;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		color: #999;
+		font-size: 24rpx;
+	}
+
+	.frame-info {
+		margin-top: 15rpx;
+		color: #666;
+		font-size: 24rpx;
+	}
+
+	.sending-progress {
+		margin-top: 30rpx;
+		width: 100%;
+	}
+
+	.progress-bar {
+		height: 12rpx;
+		background-color: #e0e0e0;
+		border-radius: 6rpx;
+		overflow: hidden;
+	}
+
+	.progress-fill {
+		height: 100%;
+		background-color: #409eff;
+		transition: width 0.3s;
+	}
+
+	/* 文字设置样式 */
+	.text-inputs {
+		margin-top: 30rpx;
+		background-color: white;
+		border-radius: 10rpx;
+		box-shadow: 0 2rpx 10rpx rgba(0, 0, 0, 0.05);
+		padding: 20rpx;
+	}
+
+	.text-line {
+		display: flex;
+		align-items: center;
+		margin-bottom: 20rpx;
+	}
+
+	.text-line text {
+		width: 80rpx;
+		font-size: 26rpx;
+	}
+
+	.text-line input {
+		flex: 1;
+		height: 60rpx;
+		padding: 0 15rpx;
+		border: 1rpx solid #eee;
+		border-radius: 8rpx;
+		font-size: 26rpx;
+	}
+
+	.send-text-btn {
+		margin-top: 20rpx;
+		background-color: #409eff;
+		color: white;
+	}
+
+	/* 日志区域样式 */
+	.log-area {
+		margin-top: 30rpx;
+	}
+
+	.log-title {
+		font-size: 28rpx;
+		font-weight: bold;
+		margin-bottom: 15rpx;
+		color: #333;
+	}
+
+	.log-content {
+		height: 200rpx;
+		background-color: white;
+		border-radius: 10rpx;
+		padding: 15rpx;
+		font-size: 24rpx;
+		color: #666;
+	}
+
+	.log-item {
+		margin-bottom: 8rpx;
+	}
+
+	.btn {
+		padding: 10rpx 20rpx;
+		border-radius: 8rpx;
+		font-size: 26rpx;
+		text-align: center;
+	}
+
+	.btn[disabled] {
+		opacity: 0.5;
+	}
+
+	.txt {
+		border: 1px solid #000000;
+	}
+	.w50{
+		width: 50%;
+		color: #656363;
+		font-size: 26prx;
+	}
+	.fleft{
+		float: left;
+	}
+	.clear{
+		clear: both;
+	}
+</style>
\ No newline at end of file
diff --git a/pages/BlueTooth/ModeSetting/HBY670V1.vue b/pages/BlueTooth/ModeSetting/HBY670V1.vue
new file mode 100644
index 0000000..c457ae4
--- /dev/null
+++ b/pages/BlueTooth/ModeSetting/HBY670V1.vue
@@ -0,0 +1,2837 @@
+<template>
+	<view class="container">
+		<!-- 蓝牙设备列表页 -->
+		<view v-if="currentPage === 'deviceList'">
+			<view class="title">蓝牙设备列表</view>
+
+			<view class="status-bar">
+				<text>蓝牙状态: {{ bluetoothStatus }}</text>
+				<button class="btn" :disabled="isLoading" @click="toggleBluetooth">
+					{{ isBluetoothOpen ? '关闭蓝牙' : '开启蓝牙' }}
+				</button>
+			</view>
+
+			<view class="search-area">
+				<button class="btn search-btn" :disabled="!isBluetoothOpen || isSearching" @click="startSearch">
+					{{ isSearching ? '正在搜索...' : '搜索设备' }}
+				</button>
+				<text class="tips">{{ searchTips }}</text>
+			</view>
+
+			<view class="devices-list" v-if="deviceList.length > 0">
+				<view class="device-item" v-for="(device, index) in deviceList" :key="index"
+					:class="{'active': device.name === targetDeviceName}"
+					@click="connectDevice(device.deviceId, device.name)">
+					<text class="device-name">{{ device.name || '未知设备' }}</text>
+					<text class="device-rssi">{{ device.RSSI }}dBm</text>
+					<text class="device-status" v-if="device.name === targetDeviceName">已连接</text>
+				</view>
+			</view>
+		</view>
+
+		<!-- 主控制页面 -->
+		<view v-if="currentPage === 'controlPanel'">
+
+
+			<view class="status-bar">
+				<text>已连接: {{ targetDeviceName }}</text>
+				<button class="btn" @click="disconnectDevice(null)">断开连接</button>
+			</view>
+			<view class="status-bar">
+				<text>当前模式: {{ netMode=='ble'?'蓝牙模式':netMode=='mqtt'?'MQ模式':'Http模式' }}</text>
+				<button class="btn" @click="toggleNetMode()">模式切换</button>
+			</view>
+			<view class="receivLog">
+				<view>数据更新时间：{{receiveData.date}}</view>
+				<view class="w50 fleft">Mac:{{receiveData.macAddress}}</view>
+				<view class="w50 fleft">IMEI:{{receiveData.IMEI}}</view>
+				<view class="w50 fleft">经度:{{receiveData.Lon}}</view>
+				<view class="w50 fleft">纬度:{{receiveData.Lat}}</view>
+
+				<view class="w50 fleft">静电探测档位:{{receiveData.staticLevel}}</view>
+				<view class="w50 fleft">照明档位:{{receiveData.lightingLevel}}</view>
+				<view class="w50 fleft">剩余照明时间:{{receiveData.lightingTime}}</view>
+				<view class="w50 fleft">电池电量:{{receiveData.batteryLevel}}</view>
+				<view class="w50 fleft">预警级别:{{receiveData.warnLevel}}</view>
+				<view class="w50 fleft">静止报警状态:{{receiveData.staticWarn}}</view>
+				<view class="w50 fleft">4G信号强度:{{receiveData.fourGStrenth}}</view>
+				<view class="w50 fleft">SOS模式:{{receiveData.SOS}}</view>
+				<view class="clear"></view>
+			</view>
+			<view>重发包序号：{{reSendNumber}}</view>
+			<view class="sending-progress" v-if="isSending">
+				
+				<view class="progress-bar">
+					<view class="progress-fill" :style="{ width: progress + '%' }"></view>
+				</view>
+				<text>正在发送: {{ progress }}% ({{ currentPacket }}/{{ totalPackets }})</text>
+			</view>
+			<view v-show="currentTab === 'splash' || currentTab === 'text'">
+				<text>发送间隔:</text>
+				<input type="number" v-model="inteval" class="txt" />
+			</view>
+
+
+			<view class="function-tabs">
+				<button class="tab-btn" :class="{'active': currentTab === 'mode'}"
+					@click="currentTab = 'mode'">检测模式</button>
+				<button class="tab-btn" :class="{'active': currentTab === 'brightness'}"
+					@click="currentTab = 'brightness'">照明模式</button>
+
+				<button class="tab-btn" :class="{'active': currentTab === 'sos'}"
+					@click="currentTab = 'sos'">SOS</button>
+
+				<button class="tab-btn" :class="{'active': currentTab === 'splash'}"
+					@click="currentTab = 'splash'">开机画面</button>
+				<button class="tab-btn" :class="{'active': currentTab === 'flash'}" @click="gotoSendVideo">开机动画</button>
+				<button class="tab-btn" :class="{'active': currentTab === 'text'}"
+					@click="currentTab = 'text'">文字设置</button>
+				<button class="tab-btn" :class="{'active': currentTab === 'urgent'}"
+					@click="currentTab = 'urgent'">紧急通知</button>
+				<button class="tab-btn" :class="{'active': currentTab === 'warn'}"
+					@click="currentTab = 'warn'">强制报警</button>
+			</view>
+
+			<!-- 模式设置选项卡 -->
+			<view v-if="currentTab === 'mode'">
+				<view class="modes-area">
+					<view class="mode-title">选择静电探测档位</view>
+					<view class="modes-grid">
+						<view class="mode-item" :class="{'selected': currentMode === 'high'}" @click="setMode('high')">
+
+							<text class="mode-name">高档模式</text>
+						</view>
+						<view class="mode-item" :class="{'selected': currentMode === 'center'}"
+							@click="setMode('center')">
+
+							<text class="mode-name">中档模式</text>
+						</view>
+						<view class="mode-item" :class="{'selected': currentMode === 'low'}" @click="setMode('low')">
+
+							<text class="mode-name">低档模式</text>
+						</view>
+						<view class="mode-item" :class="{'selected': currentMode === 'close'}"
+							@click="setMode('close')">
+
+							<text class="mode-name">关闭</text>
+						</view>
+					</view>
+				</view>
+			</view>
+			<!-- 强制报警选项卡 -->
+			<view v-if="currentTab === 'warn'">
+				<view class="brightness-area">
+
+					<button class="tab-btn" :class="{'active': brightnessStatu==='qiang'}"
+						@click="MandatoryWarn('open')">开启报警</button>
+					<button class="tab-btn" :class="{'active': brightnessStatu==='ruo'}"
+						@click="MandatoryWarn('close')">关闭报警</button>
+
+				</view>
+			</view>
+			<!-- 亮度调节选项卡 -->
+			<view v-if="currentTab === 'brightness'">
+				<view class="brightness-area">
+					<view class="brightness-title">照明模式</view>
+					<button class="tab-btn" :class="{'active': brightnessStatu==='qiang'}"
+						@click="setBrightness('qiang')">强光</button>
+					<button class="tab-btn" :class="{'active': brightnessStatu==='ruo'}"
+						@click="setBrightness('ruo')">弱光</button>
+					<button class="tab-btn" :class="{'active': brightnessStatu==='close'}"
+						@click="setBrightness('close')">关闭</button>
+				</view>
+			</view>
+
+			<view v-if="currentTab === 'sos'">
+				<view class="modes-area">
+					<view class="mode-title">选择模式</view>
+					<view class="modes-grid">
+						<view class="mode-item" :class="{'selected': currentSOS === 'sos'}" @click="setSOS('sos')">
+
+							<text class="mode-name">红蓝模式</text>
+						</view>
+						<view class="mode-item" :class="{'selected': currentSOS === 'warn'}" @click="setSOS('warn')">
+
+							<text class="mode-name">爆闪模式</text>
+						</view>
+						<view class="mode-item" :class="{'selected': currentSOS === 'close'}" @click="setSOS('close')">
+
+							<text class="mode-name">关闭SOS</text>
+						</view>
+					</view>
+				</view>
+			</view>
+
+			<!-- 开机画面选项卡 -->
+			<view v-if="currentTab === 'splash'">
+				<canvas canvas-id="splashCanvas" style="width: 160px; height: 80px; z-index: 9999;position: fixed; "
+					:style="{top:canvasTop,left:canvasLeft}"></canvas>
+				<view class="splash-controls">
+					<button class="btn" @click="importImage">导入图片</button>
+
+					<button class="btn" :disabled="!hasImage || isSending" @click="sendSplashImage">确认发送</button>
+				</view>
+
+				<view class="splash-preview">
+					<view class="splash-frame">
+						<image v-if="tempImagePath" :src="tempImagePath" mode="aspectFit"></image>
+						<view v-else class="empty-frame">点击"导入图片"选择开机画面</view>
+					</view>
+
+				</view>
+
+
+			</view>
+
+
+			<!-- 文字设置选项卡 -->
+			<view v-if="currentTab === 'text'">
+				<view class="text-inputs">
+					<view class="text-line" v-for="(line, index) in textLines" :key="index">
+						<text>第{{ index + 1 }}行:</text>
+						<input v-model="textLines[index]" placeholder="请输入文字" maxlength="30"
+							@confirm="onTextChanged(index)" />
+					</view>
+				</view>
+
+				<button class="btn send-text-btn" @click="sendText()">发送</button>
+
+
+				<view class="sending-progress" v-if="isSendingText">
+					<view class="progress-bar">
+						<view class="progress-fill" :style="{ width: textProgress + '%' }"></view>
+					</view>
+					<text>正在发送: {{ textProgress }}% ({{ currentTextPacket }}/{{ totalTextPackets }})</text>
+				</view>
+			</view>
+			<!-- 紧急通知 -->
+			<view v-if="currentTab === 'urgent'">
+				<view class="text-inputs">
+					<view class="text-line" v-for="(line, index) in warnLines" :key="index">
+						<text>第{{ index + 1 }}行:</text>
+						<input v-model="warnLines[index]" placeholder="请输入文字" maxlength="30" />
+					</view>
+				</view>
+				<button class="btn send-text-btn" @click="sendUrgent()">发送文本</button>
+			</view>
+		</view>
+
+
+
+
+
+	</view>
+</template>
+
+<script>
+	import gbk from '@/utils/gbk.js';
+	import MqttClient from '@/utils/mqtt.js';
+	import {
+		request,
+		baseURL
+	} from '@/utils/request.js';
+	var videoChannel=null;
+	var mqttClient = null;
+	export default {
+		data() {
+			return {
+				rgb565Data: null,
+				netMode: 'ble',
+				canvasTop: '-1000px',
+				canvasLeft: '-1000px',
+				inteval: 20,
+				isLoading: false,
+				isBluetoothOpen: false,
+				isSearching: false,
+				isConnected: false,
+				isSending: false,
+				isSendingText: false,
+				bluetoothStatus: '未初始化',
+				searchTips: '',
+				deviceList: [],
+				connectedDeviceId: '',
+				serviceId: '0xFFE1',
+				writeCharacteristicId: '0xFFE1',
+				notifyCharacteristicId: '0xFFE2',
+				currentMode: '',
+				logList: [],
+				packetCount: 1,
+				currentPage: 'deviceList',
+				targetDeviceName: ['JQZM-EF4651', 'XLCX-68455E'],
+				currentTab: 'mode',
+				brightness: 50,
+				brightnessTimer: null,
+				tempImagePath: '',
+				hasImage: false,
+				scale: 1,
+				translateX: 0,
+				translateY: 0,
+				lastX: 0,
+				lastY: 0,
+				isDragging: false,
+
+				imageWidth: 0,
+				imageHeight: 0,
+				textLines: ['你好中国', '你好中国', '你好中国', '你好中国'],
+				textBytes: ['', '', ''],
+				warnLines: ['现场危险,停止救援,', '紧急撤离至安全区域!'],
+				progress: 0,
+				currentPacket: 0,
+				totalPackets: 100,
+				textProgress: 0,
+				currentTextPacket: 0,
+				totalTextPackets: 4,
+				brightnessStatu: false,
+				receiveData: {
+					date: "",
+					staticLevel: "",
+					lightingLevel: "",
+					lightingTime: "",
+					batteryLevel: "",
+					macAddress: "",
+					warnLevel: "",
+					staticWarn: "",
+					fourGStrenth: "",
+					IMEI: "",
+					Lon: "",
+					Lat: "",
+					SOS: ""
+				},
+				subscits: [],
+				videoPath: "",
+				videoWidth: "",
+				videoHeight: "",
+				videoDuration: "",
+				currentSOS: "",
+				reSendNumber:null
+			}
+		},
+		computed: {
+
+		},
+		onLoad() {
+
+			this.initBluetoothAdapter();
+
+		},
+
+		methods: {
+			MandatoryWarn(flag) { //强制报警 
+				let buffer = null;
+				let dic = {
+					ble: {
+						open: 0x70,
+						close: 0x71
+					},
+					mqtt: {
+						open: 1,
+						close: 0
+					}
+				};
+				this.currentTab = 'warn';
+				if (this.netMode == 'ble') {
+
+					dic[flag]
+					buffer = new ArrayBuffer(6);
+					let dataView = new DataView(buffer);
+					dataView.setUint8(0, 0x55); // 帧头
+					dataView.setUint8(1, 0x06); // 帧类型
+					dataView.setUint8(2, 0x01); // 包序号
+					dataView.setUint8(3, 0x00); // 数据长度
+					dataView.setUint8(4, 0x01); // 数据长度
+					dataView.setUint8(5, dic.ble[flag]); // 数据
+				} else {
+					buffer = {
+						ins_ShakeBit: [dic.mqtt[flag]]
+					}
+
+				}
+
+
+				// 发送数据
+				this.sendData(buffer, '/app/xinghan/device/ShakeBitSettings');
+
+			},
+			parseDataMQ(json) {
+
+
+
+				let staticLevelText = "";
+				let dic = {
+					"3": "高档",
+					"2": "中档",
+					"1": "低档",
+					"0": "关闭",
+
+				};
+				staticLevelText = dic[json.sta_DetectGrade];
+
+				let lightingLevelText = json.sta_LightGrade ===
+					1 ? '强光' :
+					json.sta_LightGrade ===
+					2 ?
+					'弱光' :
+					'关闭';
+				let warn = "";
+				dic = {
+					"0": "无预警",
+					"1": "弱预警",
+					"2": "中预警",
+					"3": "强预警",
+					"4": "非常强预警",
+				};
+				warn = dic[json.sta_DetectResult];
+
+
+				let sosText = json.sta_SOSGrade === 2 ? '红蓝模式' :
+					json.sta_SOSGrade === 1 ? "爆闪模式" : "关闭"
+
+				let staticWarn = json.sta_ShakeBit === 1 ? '正在报警' : '未报警';
+
+				this.receiveData.staticLevel = staticLevelText;
+				this.receiveData.lightingLevel = lightingLevelText;
+				this.receiveData.lightingTime = json.sta_PowerTime + "分钟";
+				this.receiveData.batteryLevel = json.sta_PowerPercent + "%";
+				this.receiveData.SOS = sosText;
+				this.receiveData.warnLevel = warn;
+				this.receiveData.staticWarn = staticWarn;
+				this.receiveData.fourGStrenth = json.sta_4gSinal;
+				this.receiveData.IMEI = json.sta_imei;
+				this.receiveData.Lon = json.sta_longitude;
+				this.receiveData.Lat = json.sta_latitude;
+
+			},
+			parseData(receive) {
+
+
+				var bytesToHexString =
+					function(bytes) {
+						return bytes.map(
+							byte =>
+							byte
+							.toString(
+								16)
+							.padStart(
+								2, '0')
+						).join(' ');
+					}
+
+				var todo = (
+					bytes) => {
+
+					let date =
+						new Date();
+					this.receiveData
+						.date = date
+						.getHours() +
+						':' + date
+						.getMinutes() +
+						':' + date
+						.getSeconds();
+					if (bytes[0] ==
+						0x55) {
+						try {
+							// 跳过帧头(第一个字节)，从第二个字节开始解析
+							let staticLevelByte =
+								bytes[
+									1];
+							let staticLevelText =
+								'未知';
+							switch (
+								staticLevelByte
+							) {
+								case 0x65:
+									staticLevelText
+										=
+										'高档';
+									break
+								case 0x66:
+									staticLevelText
+										=
+										'中档';
+									break
+								case 0x67:
+									staticLevelText
+										=
+										'低档';
+									break
+								case 0x68:
+									staticLevelText
+										=
+										'关闭';
+									break
+							}
+
+							// 解析照明档位
+							let lightingLevelByte =
+								bytes[
+									2];
+							let lightingLevelText = lightingLevelByte ===
+								0x6d ? '强光' :
+								lightingLevelByte ===
+								0x6e ?
+								'弱光' :
+								'关闭';
+
+							// 解析剩余照明时间（第三和第四字节，小端序）
+							let lightingTime =
+								(bytes[
+										3
+									] <<
+									8
+								) |
+								bytes[
+									4];
+
+							// 解析剩余电量 // 电量百分比范围检查
+							let batteryLevelByte =
+								bytes[
+									5];
+
+							let batteryLevel =
+								Math
+								.max(0,
+									Math
+									.min(
+										100,
+										batteryLevelByte
+									)
+								);
+
+							let warn =
+								bytes[
+									6];
+							if (warn ==
+								0x00) {
+								warn =
+									'无预警';
+							} else if (
+								warn ==
+								0x01) {
+								warn =
+									'弱预警';
+							} else if (
+								warn ==
+								0x02) {
+								warn =
+									'中预警';
+							} else if (
+								warn ==
+								0x03) {
+								warn =
+									'强预警';
+							} else if (
+								warn ==
+								0x04) {
+								warn =
+									'非常强预警';
+							}
+
+							let staticWarn =
+								bytes[
+									7
+								] ==
+								0x01 ?
+								'静止报警' :
+								'无静止报警';
+							let fourGStrenth =
+								bytes[
+									8
+								]; //4g信号强度
+							let sos = bytes[9] == 0x00 ? '关闭' : bytes[9] == 0x01 ? '爆闪模式' : '红蓝模式';
+							this.receiveData
+								.staticLevel =
+								staticLevelText;
+							this.receiveData
+								.lightingLevel =
+								lightingLevelText;
+							this.receiveData
+								.lightingTime =
+								lightingTime +
+								'分钟';
+							this.receiveData
+								.batteryLevel =
+								batteryLevel +
+								'%';
+							this.receiveData
+								.warnLevel =
+								warn;
+							this.receiveData
+								.staticWarn =
+								staticWarn;
+							this.receiveData
+								.fourGStrenth =
+								fourGStrenth;
+							this.receiveData.SOS = sos;
+						} catch (
+							error) {
+							console
+								.log(
+									'数据解析错误:',
+									error
+								);
+						}
+					} else {
+						try {
+							let uint8Array =
+								new Uint8Array(
+									receive
+									.value
+								);
+							let str =
+								'';
+							for (let i =
+									0; i <
+								uint8Array
+								.length; i++
+							) {
+								// 将每个字节转换为对应的字符
+								str +=
+									String
+									.fromCharCode(
+										uint8Array[
+											i
+										]
+									);
+							}
+							if (str
+								.indexOf(
+									'mac address:'
+								) ==
+								0) {
+								this.receiveData.macAddress = str.split(':').slice(1).join(":")
+								console
+									.log(
+										'收到mac地址:',
+										+
+										this
+										.receiveData
+										.macAddress
+									);
+							} else if (
+								str
+								.indexOf(
+									'imei:'
+								) ==
+								0) {
+								this.receiveData
+									.IMEI =
+									str
+									.split(
+										':'
+									)[
+										1
+									];
+								console
+									.log(
+										'收到IEMI:',
+										+
+										this
+										.receiveData
+										.macAddress
+									);
+								this
+									.initMQ();
+							} else if (
+								str
+								.indexOf(
+									'longitude:'
+								) ==
+								0) {
+								this.receiveData
+									.Lon =
+									str
+									.split(
+										':'
+									)[
+										1
+									];
+								console
+									.log(
+										'收到经度:',
+										+
+										this
+										.receiveData
+										.macAddress
+									);
+							} else if (
+								str
+								.indexOf(
+									'latitude:'
+								) ==
+								0) {
+								this.receiveData
+									.Lat =
+									str
+									.split(
+										':'
+									)[
+										1
+									];
+								console
+									.log(
+										'收到纬度:',
+										+
+										this
+										.receiveData
+										.macAddress
+									);
+							} else {
+								try {
+									let json=JSON.parse(str);
+									if("staBlue_picture" in json){
+										//重发图片
+										console.log("收到重新发送图片的命令");
+										this.reSendNumber=json.staBlue_picture;
+										setTimeout(()=>{
+										this.sendImagePackets(this.rgb565Data,json.staBlue_picture);	
+										},0);
+										
+										
+									return ;	
+									}
+									else if("staBlue_text" in json){
+										//重发文本
+										console.log("收到重新发送文本的命令");
+										this.reSendNumber=json.staBlue_text;
+										setTimeout(()=>{
+											this.sendText(null,json.staBlue_text);
+										},0)
+										
+										
+									return ;	
+									}
+									else if("staBlue_vidio" in json){
+										//重发视频
+										console.log("收到重新发送视频的命令");
+										
+										videoChannel.emit("ReSendVideo", {
+											videoNo:json.staBlue_vidio
+										});
+										
+									return ;	
+									}
+									else if("staBlue" in json){
+										if(json.staBlue=="finish"){
+											console.log("收到设备回复,全部传输完成");
+										}
+									return ;	
+									}
+									else{
+										console.log("无法解析该文本");
+									}
+									
+									
+									
+								} catch (error) {
+									console.log("文本解析失败")
+								}
+							}
+						} catch (ex) {
+							console
+								.log(
+									'将数据转文本失败',
+									ex
+								);
+						}
+					}
+				}
+
+
+				let dataView =
+					new DataView(receive
+						.value);
+
+				// 转换为字节数组
+				let bytes = [];
+				for (let i = 0; i <
+					dataView
+					.byteLength; i++) {
+					bytes.push(dataView
+						.getUint8(i));
+				}
+
+				// 保存原始数据用于调试
+				this.receivedData = bytes;
+				console.log('接收到原始数据:',
+					bytesToHexString(
+						bytes));
+
+				todo(bytes);
+
+
+			},
+			toggleNetMode() {
+				if (this.netMode == 'ble') {
+					if (!this.receiveData.IMEI) {
+						uni.showModal({
+							title: "提示",
+							content: "蓝牙设备未上报IMEI,无法开启4G模式"
+						});
+						return;
+					}
+					this.netMode = 'mqtt';
+					return;
+				}
+				if (this.netMode == 'mqtt') {
+					this.netMode = 'http';
+				} else {
+					this.netMode = 'ble';
+				}
+
+
+			},
+			setBrightness(flag) {
+				if (this.brightnessStatu === flag) {
+					return;
+
+				}
+				this.brightnessStatu = flag;
+
+
+				let dic = {
+					ble: {
+						qiang: 0x6D,
+						ruo: 0x6E,
+						close: 0x6F
+					},
+					mqtt: {
+						qiang: 1,
+						ruo: 2,
+						close: 0
+					}
+				}
+				let buffer = null;
+				if (this.netMode == 'ble') {
+					buffer = new ArrayBuffer(6);
+					let dataView = new DataView(buffer);
+					dataView.setUint8(0, 0x55); // 帧头
+					dataView.setUint8(1, 0x01); // 帧类型
+					dataView.setUint8(2, 0x01); // 包序号
+					dataView.setUint8(3, 0x00); // 数据长度
+					dataView.setUint8(4, 0x01); // 数据长度
+					dataView.setUint8(5, dic.ble[flag]); // 数据
+
+				} else {
+					buffer = {
+						ins_LightGrade: [dic.mqtt[flag]]
+					};
+				}
+
+				// 发送数据
+				this.sendData(buffer, '/app/xinghan/device/LightGradeSettings');
+
+
+			},
+			setSOS(flag) {
+				if (this.currentSOS === flag) {
+					return;
+
+				}
+				this.currentSOS = flag;
+
+
+				let dic = {
+					ble: {
+						sos: 0x68,
+						warn: 0x69,
+						close: 0x6A
+					},
+					mqtt: {
+						sos: 2,
+						warn: 1,
+						close: 0
+					}
+
+				}
+				setTimeout(() => {
+					let buffer = null;
+					if (this.netMode == 'ble') {
+						buffer = new ArrayBuffer(6);
+						let dataView = new DataView(buffer);
+						dataView.setUint8(0, 0x55); // 帧头
+						dataView.setUint8(1, 0x05); // 帧类型
+						dataView.setUint8(2, 0x01); // 包序号
+						dataView.setUint8(3, 0x00); // 数据长度
+						dataView.setUint8(4, 0x01); // 数据长度
+						dataView.setUint8(5, dic.ble[flag]); // 数据
+					} else {
+						buffer = {
+							ins_SOSGrade: [dic.mqtt[flag]]
+						};
+					}
+
+
+					// 发送数据
+					this.sendData(buffer, '/app/xinghan/device/SOSGradeSettings');
+
+				}, 0);
+			},
+			// 蓝牙初始化
+			initBluetoothAdapter() {
+				console.log('开始初始化蓝牙适配器');
+				uni.openBluetoothAdapter({
+					success: (res) => {
+						this.isBluetoothOpen = true;
+						this.bluetoothStatus = '已开启';
+						console.log('蓝牙适配器初始化成功');
+						this.getBluetoothAdapterState();
+
+						// 自动开始搜索设备
+						this.startSearch();
+					},
+					fail: (err) => {
+						this.bluetoothStatus = '初始化失败';
+						console.log(`蓝牙适配器初始化失败: ${err.errMsg}`);
+						if (err.errCode === 10001) {
+							uni.onBluetoothAdapterStateChange((res) => {
+								if (res.available) {
+									this.isBluetoothOpen = true;
+									this.bluetoothStatus = '已开启';
+									console.log('蓝牙适配器已开启');
+									this.startSearch();
+								}
+							});
+						}
+					}
+				});
+			},
+
+			// 获取蓝牙适配器状态
+			getBluetoothAdapterState() {
+				uni.getBluetoothAdapterState({
+					success: (res) => {
+						this.isBluetoothOpen = res.available;
+						this.bluetoothStatus = res.available ? '已开启' : '已关闭';
+						if (!res.available) {
+							console.log('蓝牙适配器未开启');
+						}
+					}
+				});
+			},
+
+			// 开关蓝牙
+			toggleBluetooth() {
+				if (this.isBluetoothOpen) {
+					this.closeBluetoothAdapter();
+				} else {
+					this.initBluetoothAdapter();
+				}
+			},
+
+			// 关闭蓝牙适配器
+			closeBluetoothAdapter() {
+
+
+				this.stopSearch();
+				this.disconnectDevice(() => {
+					uni.closeBluetoothAdapter({
+						success: () => {
+							console.log("蓝牙已关闭");
+							this.isBluetoothOpen = false;
+							this.isSearching = false;
+							this.isConnected = false;
+							this.bluetoothStatus = '已关闭';
+							this.deviceList = [];
+							this.connectedDeviceId = '';
+							this.currentMode = '';
+							this.currentPage = 'deviceList';
+						}
+					})
+				});
+
+
+
+			},
+
+			// 开始搜索蓝牙设备
+			startSearch() {
+				if (this.isSearching) return;
+
+				this.isSearching = true;
+				this.deviceList = [];
+				this.searchTips = '搜索中...';
+				console.log('开始搜索蓝牙设备');
+
+				uni.startBluetoothDevicesDiscovery({
+					services: ["0000FFE0-0000-1000-8000-00805F9B34FB"],
+					allowDuplicatesKey: false,
+					success: (res) => {
+						console.log('开始搜索蓝牙设备成功');
+						this.onDeviceFound();
+
+
+					},
+					fail: (err) => {
+						this.isSearching = false;
+						this.searchTips = '搜索失败';
+						console.log(`搜索蓝牙设备失败: ${err.errMsg}`);
+					}
+				});
+			},
+
+			// 停止搜索蓝牙设备
+			stopSearch() {
+				this.isSearching = false;
+				this.searchTips = this.deviceList.length > 0 ? '搜索完成' : '未发现蓝牙设备';
+
+				uni.stopBluetoothDevicesDiscovery({
+					success: () => {
+						console.log('停止搜索蓝牙设备');
+					}
+				});
+			},
+
+			// 监听发现新设备
+			onDeviceFound() {
+				uni.onBluetoothDeviceFound((res) => {
+					let device = res.devices[0];
+					if (!device.name && !device.localName) return;
+
+					let index = this.deviceList.findIndex(item => item.deviceId === device.deviceId);
+					if (index === -1) {
+						this.deviceList.push({
+							deviceId: device.deviceId,
+							name: device.name || device.localName,
+							RSSI: device.RSSI
+						});
+					} else {
+						// 更新信号强度
+						this.deviceList[index].RSSI = device.RSSI;
+
+					}
+					// }
+
+					// 如果找到目标设备，自动连接
+					if (this.targetDeviceName.indexOf(device.name || device.localName) > -1) {
+						console.log(`发现目标设备: ${JSON.stringify(device)}`);
+						this.connectDevice(device.deviceId, device.name);
+					}
+				});
+			},
+
+			// 连接蓝牙设备
+			connectDevice(deviceId, deviceName) {
+				if (this.isConnected && this.connectedDeviceId === deviceId) return;
+
+				this.isLoading = true;
+				console.log(`开始连接设备: ${deviceId}`);
+				var these = this;
+				uni.createBLEConnection({
+					deviceId: deviceId,
+					timeout: 20000,
+					success: (res) => {
+						this.stopSearch();
+						this.isConnected = true;
+						this.connectedDeviceId = deviceId;
+						this.targetDeviceName = deviceName;
+						console.log(`连接设备 ${deviceName} 成功`);
+						this.enableNotification(deviceId);
+						// 连接成功后切换到控制面板
+						this.currentPage = 'controlPanel';
+
+						// setTimeout(function() {
+						uni.setBLEMTU({
+							deviceId: deviceId,
+							mtu: 512,
+							success: (info) => {
+								console.log("设置mtu成功")
+							},
+							fail: (ex) => {
+								console.log("设置mtu失败" + JSON.stringify(ex));
+							},
+							complete() {
+
+							}
+						})
+						these.getDeviceServices(deviceId);
+
+						// }, 2000)
+
+
+
+					},
+					fail: (err) => {
+						console.log(`连接设备失败: ${JSON.stringify(err)}`);
+						uni.showToast({
+							title: '连接失败',
+							icon: 'none'
+						});
+					},
+					complete: () => {
+						this.isLoading = false;
+					}
+				});
+			},
+
+			// 断开蓝牙连接
+			disconnectDevice(callback) {
+				var these = this;
+				var promises = [];
+				for (var i = 0; i < these.subscits.length; i++) {
+					promises.push(new Promise((succ, err) => {
+						uni.notifyBLECharacteristicValueChange({
+							deviceId: these.connectedDeviceId,
+							serviceId: these.subscits[i].serviceId,
+							characteristicId: these.subscits[i].notifyId,
+							state: false,
+							success: () => {
+								console.log("取消订阅成功");
+								succ();
+							},
+							fail: () => {
+								err();
+							}
+						});
+					}));
+				}
+				these.subscits = [];
+				Promise.all(promises).then(() => {
+					if (!this.connectedDeviceId) {
+						this.isConnected = false;
+						this.connectedDeviceId = '';
+						this.currentMode = '';
+						this.currentPage = 'deviceList';
+						if (callback) {
+							callback();
+						}
+						return;
+					}
+					setTimeout(() => {
+						uni.closeBLEConnection({
+							deviceId: this.connectedDeviceId,
+							success: (res) => {
+
+								console.log('蓝牙连接已断开' + JSON.stringify(res));
+
+
+							},
+							fail: (ex) => {
+								let arr = [{
+										code: 0,
+										remark: '正常'
+									},
+									{
+										code: 10000,
+										remark: '未初始化蓝牙适配器'
+									},
+									{
+										code: 10001,
+										remark: '当前蓝牙适配器不可用'
+									},
+									{
+										code: 10002,
+										remark: '没有找到指定设备'
+									},
+									{
+										code: 10003,
+										remark: '连接失败'
+									},
+									{
+										code: 10004,
+										remark: '没有找到指定服务'
+									},
+									{
+										code: 10005,
+										remark: '没有找到指定特征值'
+									},
+									{
+										code: 10006,
+										remark: '当前连接已断开'
+									},
+									{
+										code: 10007,
+										remark: '当前特征值不支持此操作'
+									},
+									{
+										code: 10008,
+										remark: '其余所有系统上报的异常'
+									},
+									{
+										code: 10009,
+										remark: 'Android 系统特有，系统版本低于 4.3 不支持 BLE'
+									},
+									{
+										code: 10010,
+										remark: '已连接'
+									},
+									{
+										code: 10011,
+										remark: '配对设备需要配对码'
+									},
+									{
+										code: 10012,
+										remark: '连接超时'
+									},
+									{
+										code: 10013,
+										remark: '连接 deviceId 为空或者是格式不正确'
+									}
+								];
+								let f = arr.find(function(v) {
+									return v.code == ex.code;
+								})
+
+								console.log("无法断开蓝牙连接:" + f.remark);
+
+								uni.showToast({
+									title: "无法断开蓝牙连接:" + f.remark,
+									icon: 'fail'
+								});
+
+							},
+							complete: () => {
+								this.isConnected = false;
+								this.connectedDeviceId = '';
+								this.currentMode = '';
+								this.currentPage = 'deviceList';
+								if (callback) {
+									callback();
+								}
+							}
+						});
+
+					}, 200)
+
+				}).catch().finally();
+
+
+
+
+
+			},
+
+			// 获取设备服务
+			getDeviceServices(deviceId) {
+				console.log("deviceId=" + deviceId);
+				var these = this;
+				uni.getBLEDeviceServices({
+					deviceId: deviceId,
+					success: (res) => {
+
+						console.log("发现服务" + JSON.stringify(res.services))
+						if (res.services.length == 0) {
+							setTimeout(function() {
+								these.getDeviceServices(deviceId);
+							}, 200);
+							return;
+						}
+						// 查找目标服务
+						let targetService = res.services.find(service => service.uuid.indexOf('FFE0') > -1);
+
+						if (targetService) {
+							console.log(`找到目标服务: ${targetService.uuid}`);
+							this.serviceId = targetService.uuid;
+							this.getDeviceCharacteristics(deviceId, targetService.uuid);
+						}
+
+
+
+
+					},
+					fail: (err) => {
+						console.log(`获取设备服务失败: ${err.errMsg}`);
+					}
+				});
+			},
+
+
+			// 获取设备特征值
+			getDeviceCharacteristics(deviceId, serviceId) {
+				var these = this;
+				uni.getBLEDeviceCharacteristics({
+					deviceId: deviceId,
+					serviceId: serviceId,
+					success: (res) => {
+						console.log(`获取设备特征值成功，共发现 ${res.characteristics.length} 个特征值`);
+						console.log(`获取设备特征值成功${JSON.stringify(res.characteristics)}`);
+						// 查找可写特征值
+						let writeChar = res.characteristics.find(char =>
+							char.uuid.indexOf("FFE1") >= 1
+						);
+
+						// 查找通知特征值
+						let notifyChar = res.characteristics.find(char => {
+								return char.properties.notify;
+							}
+
+						);
+
+						if (writeChar) {
+							console.log(`找到可写特征值: ${writeChar.uuid}`);
+							this.writeCharacteristicId = writeChar.uuid;
+						} else {
+							console.log(`未找到可写特征值: ${this.writeCharacteristicId}`);
+						}
+
+						if (notifyChar) {
+							console.log(`找到通知特征值: ${notifyChar.uuid}`);
+							this.notifyCharacteristicId = notifyChar.uuid;
+							console.log("serviceId=" + serviceId);
+							console.log("characteristicId=" + notifyChar.uuid);
+							this.subscits.push({
+								deviceId: deviceId,
+								serviceId: serviceId,
+								notifyId: notifyChar.uuid
+							});
+							setTimeout(() => {
+								uni.notifyBLECharacteristicValueChange({
+									deviceId: deviceId,
+									serviceId: serviceId,
+									characteristicId: notifyChar.uuid,
+									state: true,
+									success: (info) => {
+										console.log('启用通知成功' + JSON.stringify(info));
+										uni.showToast({
+											title: "订阅消息成功",
+											icon: 'success'
+										});
+										// 监听特征值变化 
+										setTimeout(() => {
+											uni.onBLECharacteristicValueChange((
+												receive) => {
+												these.parseData(receive);
+											});
+										}, 100)
+
+									},
+									fail: (err) => {
+										console.error('启用通知失败', err);
+									}
+								});
+							}, 500);
+
+						} else {
+							console.log(`未找到通知特征值: ${this.notifyCharacteristicId}`);
+						}
+
+
+
+					},
+					fail: (err) => {
+						console.log(`获取设备特征值失败: ${err.errMsg}`);
+					}
+				});
+			},
+
+			// 启用通知
+			enableNotification(deviceId) {
+				// uni.notifyBLECharacteristicValueChange({
+				// 	deviceId: deviceId,
+				// 	serviceId: this.serviceId,
+				// 	characteristicId: this.notifyCharacteristicId,
+				// 	state: true,
+				// 	success: () => {
+				// 		console.log('启用通知成功');
+
+				// 		// 监听通知
+				// 		uni.onBLECharacteristicValueChange((res) => {
+				// 			this.handleNotification(res.value);
+				// 		});
+				// 	},
+				// 	fail: (err) => {
+				// 		console.log(`启用通知失败: ${err.errMsg}`);
+				// 	}
+				// });
+			},
+
+			// 处理通知数据
+			handleNotification(buffer) {
+				console.log("收到设备通知数据")
+				// 解析从设备接收的数据
+				let dataView = new DataView(buffer);
+				let result = '';
+
+				for (let i = 0; i < dataView.byteLength; i++) {
+					result += String.fromCharCode(dataView.getUint8(i));
+				}
+
+				console.log(`收到设备数据: ${result}`);
+			},
+
+			// 设置静电检测模式
+			setMode(mode) {
+				if (!this.isConnected) {
+					uni.showToast({
+						title: '未连接设备',
+						icon: 'none'
+					});
+					return;
+				}
+
+				if (this.currentMode === mode) return;
+
+				this.currentMode = mode;
+				let dic = {
+					ble: {
+						high: 0x65,
+						center: 0x66,
+						low: 0x67,
+						close: 0x68
+					},
+					mqtt: {
+						high: 3,
+						center: 2,
+						low: 1,
+						close: 0
+					}
+				}
+
+
+
+
+				// 构建数据包
+				let buffer = null;
+				if (this.netMode == 'ble') {
+					buffer = new ArrayBuffer(6);
+					let dataView = new DataView(buffer);
+
+					dataView.setUint8(0, 0x55); // 帧头
+					dataView.setUint8(1, 0x00); // 帧类型
+					dataView.setUint8(2, 0x01); // 包序号
+					dataView.setUint8(3, 0x00); // 数据长度
+					dataView.setUint8(4, 0x01); // 数据长度
+					dataView.setUint8(5, dic.ble[mode]); // 数据
+				} else {
+					buffer = {
+						ins_DetectGrade: [dic.mqtt[mode]]
+					}
+
+				}
+
+				// 发送数据
+				this.sendData(buffer, '/app/xinghan/device/DetectGradeSettings');
+
+
+
+			},
+
+			// 亮度调节
+			onBrightnessChanging(e) {
+				this.brightness = e.detail.value;
+
+				// 清除之前的定时器
+				if (this.brightnessTimer) {
+					clearTimeout(this.brightnessTimer);
+				}
+
+				// 设置新的定时器，控制发送频率
+				this.brightnessTimer = setTimeout(() => {
+					this.sendBrightness();
+				}, 100);
+			},
+
+			onBrightnessChanged(e) {
+				this.brightness = e.detail.value;
+				//this.sendBrightness();
+			},
+
+			sendBrightness() {
+				if (!this.isConnected) return;
+
+				// 构建数据包
+				let buffer = new ArrayBuffer(6);
+				let dataView = new DataView(buffer);
+				let data = '0x' + parseInt(this.brightness).toString(16);
+				console.log("亮度:" + this.brightness + ',16进制:' + data);
+				dataView.setUint8(0, 0x55); // 帧头
+				dataView.setUint8(1, 0x01); // 帧类型：亮度调节
+				dataView.setUint8(2, 0x01); // 包序号
+				dataView.setUint8(3, 0x00); // 数据长度
+				dataView.setUint8(4, 0x01); // 数据长度
+				dataView.setUint8(5, data); // 数据
+
+				// 发送数据
+				this.sendData(buffer);
+			},
+
+			// 导入图片
+			importImage() {
+				var these = this;
+				uni.chooseImage({
+					count: 1,
+					sourceType: ['album'],
+					success: (res) => {
+						this.tempImagePath = res.tempFilePaths[0];
+						this.hasImage = true;
+						this.scale = 1;
+						this.translateX = 0;
+						this.translateY = 0;
+
+						// 获取图片尺寸
+						uni.getImageInfo({
+							src: this.tempImagePath,
+							success: (info) => {
+								this.imageWidth = info.width;
+								this.imageHeight = info.height;
+
+
+								uni.navigateTo({
+									url: "/pages/6155/ImgCrop",
+									events: {
+										ImgCutOver: function(data) {
+											console.log("111111");
+											console.log("data=", data.length);
+											these.rgb565Data = these.convertToRGB565(
+												data);
+											console.log("rgb565=", these.rgb565Data
+												.length);
+										},
+										ImgCutOver_Path: function(data) {
+											these.tempImagePath = data;
+										}
+									},
+									success(ev) {
+										ev.eventChannel.emit('checkImg', {
+											data: res.tempFilePaths[0]
+										});
+
+									}
+								});
+								console.log('图片导入成功，请调整图片位置和大小');
+							},
+							fail: (err) => {
+								console.log(`获取图片信息失败: ${err.errMsg}`);
+							}
+						});
+
+
+					},
+					fail: (err) => {
+						console.log(`选择图片失败: ${err.errMsg}`);
+					}
+				});
+			},
+
+
+
+			// 发送开机画面
+			sendSplashImage() {
+				var these = this;
+				if (!these.rgb565Data) {
+					uni.showToast({
+						title: '请先导入图片',
+						icon: 'none'
+					});
+					return;
+				}
+
+
+
+				if (this.netMode == 'http') {
+					this.sendImgHttp();
+					return;
+				}
+				uni.showLoading({
+					title: '处理图片中...',
+					mask: true
+				});
+				let res = {
+					data: these.rgb565Data
+				};
+				// 将图片转换为RGB565格式并发送
+				this.convertAndSendImage(res).then(() => {
+					if (this.netMode == 'ble') {
+						uni.hideLoading();
+						console.log('开机画面发送完成');
+						uni.showToast({
+							title: '开机画面发送完成',
+							icon: 'success'
+						});
+					} else {
+						this.isSending = true;
+					}
+
+				}).catch((error) => {
+					uni.hideLoading();
+					console.log(`图片发送失败: ${error}`);
+					uni.showToast({
+						title: '图片发送失败',
+						icon: 'none'
+					});
+				});
+			},
+
+			// 转换图片并发送
+			convertAndSendImage(res) {
+				return new Promise((resolve, reject) => {
+
+					try {
+
+						this.processAndSendImageData(res.data).then(
+							resolve).catch(reject);
+
+					} catch (ex) {
+						console.log("出现异常" + JSON.stringify(ex))
+					}
+
+				});
+			},
+
+			// 处理像素数据并发送
+			processAndSendImageData(pixels) {
+				return new Promise((resolve, reject) => {
+					// 创建RGB565格式的像素数据
+
+
+					// 分包发送
+					this.sendImagePackets(pixels).then(resolve).catch(reject);
+				});
+			},
+
+			// 将RGBA转换为RGB565
+			convertToRGB565(pixels) {
+
+				var rgbaToRgb565 = function(r, g, b, a = 255) {
+					// 忽略透明度（如果需要考虑透明度，请根据需求处理）
+
+					// 将8位颜色值压缩到RGB565对应的位数
+					let r5 = Math.round((r / 255) * 31); // 5位：0-31
+					let g6 = Math.round((g / 255) * 63); // 6位：0-63
+					let b5 = Math.round((b / 255) * 31); // 5位：0-31
+
+					// 合并为16位整数
+					return (r5 << 11) | (g6 << 5) | b5;
+				}
+
+				let result = new Uint16Array(160 * 80);
+				let index = 0;
+				console.log("pixels.length=" + pixels.length);
+				for (let i = 0; i < pixels.length; i += 4) {
+					let r = pixels[i];
+					let g = pixels[i + 1];
+					let b = pixels[i + 2];
+
+					// 转换为RGB565 (R:5bit, G:6bit, B:5bit)
+					let rgb565 = ((r & 0xF8) << 8) | ((g & 0xFC) << 3) | (b >> 3);
+					//let rgb565=rgbaToRgb565(r,g,b);
+					result[index++] = rgb565;
+				}
+
+				return result;
+			},
+
+			// 分包发送图片数据
+			sendImagePackets(imageData, ReSendNo) {
+				if (this.netMode == 'ble') {
+					return new Promise((resolve, reject) => {
+						this.isSending = true;
+						this.progress = 0;
+						this.currentPacket = 0;
+
+						// 总数据包数
+						let totalPackets = 52;
+						let currentPacket = 1;
+
+						if (ReSendNo) {
+							this.currentPacket = ReSendNo;
+							this.currentPacket = ReSendNo;
+							totalPackets = ReSendNo;
+							currentPacket=ReSendNo;
+						}
+						// 发送单个数据包
+						let sendNextPacket = () => {
+							if (currentPacket > totalPackets) {
+								this.isSending = false;
+								if (!ReSendNo) {
+									this.bleSendComplete();
+								}else{
+							// this.reSendNumber="";
+						}
+								resolve();
+								return;
+							}
+
+							// 计算当前包的数据
+							let packetSize = 250;
+							// if (currentPacket <= 51) {
+							// 	packetSize = 250; // 前51个包每个500字节
+							// } else {
+							// 	packetSize = 50; // 最后一个包100字节
+							// }
+
+							// 创建数据包
+							let startIndex = (currentPacket - 1) * 250;
+							let endIndex = Math.min(startIndex + packetSize, imageData.length);
+							if (startIndex > endIndex) {
+								return;
+							}
+							//console.log("imageData="+imageData.length);
+							let packetData = imageData.slice(startIndex,
+								endIndex);
+							// 构建数据包
+							let bufferSize = 505; // 5 + packetData.length * 2; // 头部5字节 + 数据部分
+							let buffer = new ArrayBuffer(bufferSize);
+							let dataView = new DataView(buffer);
+
+							// 填充头部
+							dataView.setUint8(0, 0x55); // 帧头
+							dataView.setUint8(1, 0x02); // 帧类型：开机画面
+							dataView.setUint8(2, '0x' + currentPacket.toString(16).padStart(2, '0')); // 包序号
+							// dataView.setUint8(3, 0x01);
+							// dataView.setUint8(4, 0xFF);
+							if (packetData.length == 250) {
+								dataView.setUint8(3, 0x01);
+								dataView.setUint8(4, 0xF4);
+							} else {
+								dataView.setUint8(3, 0x00);
+								dataView.setUint8(4, 0x64);
+							}
+
+							// 填充数据（每个RGB565值占2字节）
+							for (let i = 0; i < packetData.length; i++) {
+								dataView.setUint16(5 + i * 2, packetData[i], false); // 大端字节序
+							}
+
+							if (currentPacket == 52) {
+								for (var i = 105; i < bufferSize; i++) {
+									dataView.setUint8(i, 0xFF);
+								}
+							}
+
+
+							let inteval = parseInt(this.inteval ? this.inteval : 0);
+							//发送数据包
+							this.sendData(buffer).then(() => {
+								// 更新进度
+								this.currentPacket = currentPacket;
+								this.progress = Math.round((currentPacket / totalPackets) * 52);
+								console.log("发送第" + currentPacket + "包成功");
+
+								// 发送下一个包（添加延迟避免蓝牙缓冲区溢出）
+								currentPacket++;
+
+
+								setTimeout(sendNextPacket, inteval);
+							}).catch(err => {
+
+
+								if (err.code == '10007') {
+									console.log("发送第" + currentPacket + "包失败");
+									setTimeout(sendNextPacket, inteval);
+								} else {
+									this.isSending = false;
+									uni.hideLoading();
+									reject(err);
+								}
+
+							});
+						};
+
+						//牵着你的手
+						var HoldYouHand = () => {
+							var str = "picture transmit start"; //握手的协议字符串
+
+
+							// 1. 创建 ArrayBuffer 和 DataView
+							let buffer = new ArrayBuffer(str.length);
+							let dataView = new DataView(buffer);
+
+							// 2. 将字符串转换为 ASCII 码并写入 DataView
+							for (let i = 0; i < str.length; i++) {
+								dataView.setUint8(i, str.charCodeAt(i));
+							}
+
+							this.sendData(buffer).then(() => {
+								// 开始发送第一个包
+								console.log("握手成功了,等待200ms");
+								setTimeout(sendNextPacket, 120);
+
+							}).catch(err => {
+								console.log("握手没有成功");
+								reject(err);
+							});
+						}
+						
+						if(ReSendNo){
+							sendNextPacket();
+						}else{
+						HoldYouHand();
+						}
+
+					});
+				} else {
+					return new Promise((resolve, reject) => {
+						let woshou = () => {
+							let buffer = {
+								ins_PicTrans: [0]
+							};
+							this.sendData(buffer).then(() => {
+								console.log("发送开机画面握手信息成功了")
+								resolve();
+							}).catch(ex => {
+								console.log("发送开机画面握手信息失败");
+								reject();
+							});
+						}
+
+						woshou();
+					});
+				}
+			},
+
+			// 文字输入变化
+			onTextChanged(index) {
+				console.log(`第${index + 1}行文字已更新`);
+			},
+			sendUrgent(type) {
+				if (this.netMode !== 'ble') {
+					let cmd = {
+						"ins_BreakNews": [0]
+					}
+					this.sendData(cmd).catch((ex) => {
+						console.log("发送紧急通知握手失败", ex);
+					});
+					return;
+				}
+				let sendTxt = (text) => {
+					console.log("开始发送数据:" + text);
+					return new Promise((resolve, reject) => {
+						let gbkData = this.convertToGBK(text);
+
+						console.log("gbkData=", gbkData);
+						// 构建数据包
+						let bufferSize = gbkData.length / 2; // 头部4字节 + 数据部分
+						let buffer = new ArrayBuffer(bufferSize);
+						let dataView = new DataView(buffer);
+						let index = 0;
+						// 填充数据
+						let arr = [];
+						for (var i = 0; i < gbkData.length; i += 2) {
+							let value = parseInt(gbkData[i] + "" + gbkData[i + 1], 16);
+							console.log("value=" + value);
+							dataView.setUint8(index, value);
+							index++;
+							arr.push(value);
+						}
+
+						console.log("arr=", arr.join(" "));
+
+						this.sendData(buffer).then(() => {
+							resolve();
+						}).catch(err => {
+							reject(err);
+						});
+
+
+					});
+
+				}
+				let dic = ["the first line:" + this.warnLines[0], "the second line:" + this.warnLines[1]]
+
+				let promis = new Array();
+				for (var i = 0; i < dic.length; i++) {
+					promis.push(sendTxt(dic[i]));
+				}
+
+				Promise.allSettled(promis).then((results) => {
+					let cnt = 0;
+					results.forEach(result => {
+						if (result.status === 'fulfilled') {
+							console.log('成功结果：', result.value);
+							cnt += 1;
+						} else {
+							console.log('失败原因：', result.reason);
+						}
+					});
+
+					uni.showModal({
+						title: '提示',
+						content: "发送包数量:" + dic.length + ",成功数量:" + cnt
+					})
+
+				});
+
+			},
+			// 发送文字
+			sendText(type, ReSendNo) {
+
+				if (!this.isConnected) {
+					uni.showToast({
+						title: '未连接设备',
+						icon: 'none'
+					});
+					return;
+				}
+
+				this.isSendingText = true;
+				this.textProgress = 0;
+				this.currentTextPacket = 0;
+
+				// 总数据包数
+				let totalPackets = this.textLines.length;
+				let currentPacket = 1;
+
+				if (ReSendNo) {
+					this.textProgress = ReSendNo - 1;
+					this.currentTextPacket = ReSendNo - 1;
+					totalPackets = ReSendNo;
+					currentPacket = ReSendNo;
+				}
+
+
+				// 发送单个数据包
+				let sendNextPacket = () => {
+					if (currentPacket > totalPackets) {
+						this.isSendingText = false;
+						console.log('文字发送完成');
+						if (!ReSendNo) {
+							this.bleSendComplete();
+						}else{
+							// this.reSendNumber="";
+						}
+
+						uni.showToast({
+							title: '发送成功',
+							icon: 'success'
+						});
+						return;
+					}
+
+					// 获取当前行文字
+					let text = this.textLines[currentPacket - 1] || '';
+
+					// 将文字转换为GBK编码
+					let gbkData = this.convertToGBK(text);
+
+					// 构建数据包
+					let bufferSize = 5 + gbkData.length / 2; // 头部4字节 + 数据部分
+					let buffer = new ArrayBuffer(bufferSize);
+					let dataView = new DataView(buffer);
+
+					// 填充头部
+					dataView.setUint8(0, 0x55); // 帧头
+					dataView.setUint8(1, 0x03); // 帧类型：文字
+					dataView.setUint8(2, currentPacket.toString(16)); // 包序号
+
+					dataView.setUint16(3, (text.length * 2).toString(16)); // 数据长度
+
+					let index = 0;
+					for (var i = 0; i < gbkData.length; i += 2) {
+						let value = parseInt(gbkData[i] + "" + gbkData[i + 1], 16);
+						dataView.setUint8(5 + index, value);
+						index++;
+					}
+
+
+
+					// 发送数据包
+					this.sendData(buffer).then(() => {
+						// 更新进度
+						this.currentTextPacket = currentPacket;
+						this.textProgress = Math.round((currentPacket / totalPackets) * 100);
+						console.log(`发送文字数据包 ${currentPacket}/${totalPackets}: ${text}`);
+
+						// 发送下一个包
+						currentPacket++;
+						setTimeout(sendNextPacket, this.inteval ? this.inteval : 0);
+					}).catch(err => {
+						this.isSendingText = false;
+						uni.showToast({
+							title: '文字发送失败',
+							icon: 'none'
+						});
+					});
+
+
+
+				};
+
+				// 开始发送第一个包
+
+				//牵着你的手
+				var HoldYouHand = () => {
+
+					var str = "word transmit start"; //握手的协议字符串
+					let buffer = null;
+					if (this.netMode == 'ble') {
+
+						buffer = new ArrayBuffer(str.length);
+						let dataView = new DataView(buffer);
+
+
+						for (let i = 0; i < str.length; i++) {
+							dataView.setUint8(i, str.charCodeAt(i));
+						}
+
+
+					} else if (this.netMode == 'mqtt') {
+						buffer = {
+							ins_TexTrans: [0]
+						}
+					} else {
+						buffer = {
+							deviceId: '1942386314582163705',
+							deviceImei: '862419074249128',
+							name: this.textLines[0],
+							position: this.textLines[1],
+							unitName: this.textLines[2],
+							code: this.textLines[3]
+						};
+						this.sendTxtHttp(buffer, '/app/xinghan/device/registerPersonInfo').then((res) => {
+							console.log("res=", res);
+							if (res.code == 200) {
+								uni.showToast({
+									title: '成功',
+									icon: 'success'
+								});
+							} else {
+								console.log("失败了", res);
+							}
+						}).catch((ex) => {
+							console.log("出现异常", ex);
+						});
+						return;
+					}
+
+
+
+					this.sendData(buffer, '/app/xinghan/device/uploadLogo').then(() => {
+						// 开始发送第一个包
+
+						if (this.netMode == 'ble') {
+							console.log("蓝牙握手成功了,等待200ms");
+							setTimeout(sendNextPacket, 120);
+						}
+
+					}).catch(err => {
+						console.log("握手没有成功");
+						uni.showToast({
+							title: '握手没有成功',
+							icon: 'none'
+						});
+					});
+				}
+				if(!ReSendNo){
+				HoldYouHand();	
+				}
+				else{
+					sendNextPacket();
+				}
+
+			},
+			bleSendComplete() {
+				var str = "transmit complete"; //握手的协议字符串
+				let buffer = new ArrayBuffer(str.length);
+				let dataView = new DataView(buffer);
+				for (let i = 0; i < str.length; i++) {
+					dataView.setUint8(i, str.charCodeAt(i));
+				}
+				setTimeout(()=>{
+					this.sendData(buffer).then(() => {
+						console.log("完成指令发送成功");
+					}).catch(err => {
+						console.log("完成指令发送失败");
+					});
+				},500)
+				
+			},
+			// 将文字转换为GBK编码（使用第三方库或API）
+			convertToGBK(text) {
+				let arr = gbk.encode(text)
+				console.log("arr=", arr.join(" "));
+				let utf8Data = gbk.arr2hex(arr);
+				return utf8Data; // 实际项目中替换为GBK编码实现
+			},
+
+
+
+			// 添加日志
+			addLog(message) {
+
+			},
+			checkVideo: function() {
+				uni.chooseVideo({
+					sourceType: ['album', 'camera'],
+					compressed: true,
+					maxDuration: 2,
+					camera: 'back',
+					success: (res) => {
+						this.videoPath = res.tempFilePath;
+						this.videoWidth = res.width;
+						this.videoHeight = res.height;
+						this.videoDuration = res.duration;
+					}
+				})
+			},
+			sendVideo: function() {
+				uni.showLoading({
+					title: "正在处理视频"
+				});
+				setTimeout(() => {
+					this.$refs.compARef.shotVideoClick(0);
+
+				}, 0);
+
+			},
+			shotVideoClick: function(array) {
+
+
+			},
+			gotoSendVideo: function() {
+				this.currentTab = 'flash';
+				uni.navigateTo({
+					url: "/pages/BlueTooth/ModeSetting/VideoSend_670",
+					success: (res) => {
+						let channel = res.eventChannel;
+						videoChannel=channel;
+						channel.emit("receiveDevice", {
+							connectedDeviceId: this.connectedDeviceId,
+							serviceId: this.serviceId,
+							writeCharacteristicId: this.writeCharacteristicId,
+							notifyCharacteristicId: this.notifyCharacteristicId,
+							netMode: this.netMode,
+							IMEI: this.receiveData.IMEI
+						});
+					},
+					fail(ex) {
+						console.log("出现异常,",ex);
+					}
+				})
+			},
+			initMQ() {
+
+				return new Promise((resolve, reject) => {
+
+					if (mqttClient) {
+						resolve();
+						return;
+					}
+					mqttClient = new MqttClient();
+					mqttClient.connect(() => {
+						// 订阅来自设备的状态更新
+						const statusTopic = `A/${this.receiveData.IMEI}`;
+						mqttClient.subscribe(statusTopic, (payload, receive) => {
+
+							try {
+
+								let json = JSON.parse(payload);
+								let keys = Object.keys(json);
+								console.log("keys=", keys);
+								if (keys.indexOf('sta_DetectGrade') > -1) { //上报的报文
+									console.log("收到设备上报的数据", payload);
+									this.parseDataMQ(json);
+								} else if (keys.indexOf('sta_PicTrans') > -1) { //发送开机画面
+									console.log("收到开机画面答复", payload);
+									this.SendImgMQ(json);
+								} else if (keys.indexOf('sta_TexTrans') > -1) { //发送文本信息
+									console.log("收到文本回复", payload);
+									this.SendTxtMQ(json);
+								} else if (keys.indexOf('sta_BreakNews') > -1) { //紧急通知
+									console.log("收到紧急消息回复", payload);
+									this.sendUrgentMQ(json);
+								} else {
+									console.log("收到不能处理的数据", payload);
+								}
+
+
+							} catch (error) {
+								console.log("无法解析此消息", error);
+							}
+						});
+						resolve();
+					});
+				});
+			},
+			// 发送数据通用方法
+			sendData(buffer, url) {
+				if (this.netMode == 'ble') {
+					return this.sendBle(buffer);
+				} else if (this.netMode == 'mqtt') {
+
+					buffer = JSON.stringify(buffer);
+					return this.sendMQ(buffer);
+				} else {
+					return this.sendRequest(buffer, url);
+				}
+
+
+			},
+			sendBle(buffer) {
+				return new Promise(async (resolve, reject) => {
+
+					var promise = new Promise((succ, err) => {
+						uni.writeBLECharacteristicValue({
+							deviceId: this.connectedDeviceId,
+							serviceId: this.serviceId,
+							characteristicId: this.writeCharacteristicId,
+							value: buffer,
+							writeType: plus.os.name == 'iOS' ? 'write' : 'writeNoResponse',
+							success: () => {
+								//console.log("发送数据成功");
+								succ();
+							},
+							fail: (ex) => {
+								console.log("发送数据失败", ex);
+
+								err(ex);
+							},
+							complete: function() {
+								//console.log("123456");
+							}
+						});
+					});
+					if (plus.os.name == 'iOS') {
+
+						function timeout(ms) {
+							return new Promise((_, err) => {
+								setTimeout(() => {
+									err({
+										code: -1,
+										errMsg: '超时了'
+									})
+								}, ms);
+							});
+						}
+
+						Promise.race([promise, timeout(this.inteval ? this.inteval : 0)]).then(resolve)
+							.catch((
+								ex) => {
+								console.log("ex=", ex);
+								if (ex.code == -1) {
+									resolve();
+								} else {
+									reject(ex);
+								}
+
+							}).finally(() => {
+								console.log("完成了")
+							});
+					} else {
+						promise.then(resolve).catch(reject);
+					}
+				});
+			},
+			sendImgHttp(data, url) {
+				uni.showLoading({
+					title: "上传中"
+				})
+				return new Promise((resolve, reject) => {
+
+					const token = uni.getStorageSync('token');
+					const clientid = uni.getStorageSync('clientID');
+					let config = {
+						header: {}
+					};
+					if (token) {
+						config.header['Authorization'] = 'Bearer ' + token;
+						config.header['clientid'] = clientid;
+					}
+
+					uni.uploadFile({
+
+						url: baseURL + '/app/xinghan/device/uploadLogo',
+						filePath: this.tempImagePath,
+						name: 'file',
+						formData: {
+							deviceId: '1942386314582163705',
+							deviceImei: '862419074249128'
+						},
+						header: config.header,
+						timeout: 600000,
+						fail: (ex) => {
+							//console.log("上传视频失败" + JSON.stringify(ex));
+							uni.showToast({
+								title: "视频文件上传失败了,请检查网络连接",
+								icon: 'fail'
+							});
+						},
+						success: (res) => {
+							console.log("上传完成", res);
+						},
+						complete: () => {
+							uni.hideLoading();
+						}
+
+					});
+				});
+			},
+			sendTxtHttp(data, url) {
+				return new Promise((resolve, reject) => {
+					request({
+						url: url,
+						method: 'POST',
+						data: data
+
+					}).then((res) => {
+						console.log("res=", res);
+						if (res.code == 200) {
+							console.log("2000000")
+							resolve(res);
+							return;
+						} else {
+							console.log("22222222")
+							reject(res);
+						}
+
+					}).catch((ex) => {
+						console.log("ex=", ex);
+						reject(ex);
+					});
+				});
+			},
+			sendRequest(message, url) {
+
+				return new Promise((resolve, reject) => {
+					try {
+						var keys = Object.keys(message);
+						let data = message[keys[0]];
+						request({
+							url: url,
+							method: 'POST',
+							data: {
+								deviceId: '1942386314582163705',
+								deviceImei: '862419074249128',
+								instructValue: data[0]
+							}
+						}).then((res) => {
+							console.log("res=", res);
+							if (res.code == 200) {
+								resolve();
+								return;
+							}
+							reject(res);
+						}).catch((ex) => {
+							console.log("ex=", ex);
+							reject(ex);
+						});
+					} catch (ex) {
+						console.log("ex=", ex);
+						reject(ex)
+					}
+
+				});
+
+
+			},
+			sendMQ(message) {
+
+				const topic = `B/${this.receiveData.IMEI}`;
+				return new Promise((resolve, reject) => {
+					if (!mqttClient) {
+						reject("MQTT未连接");
+						return;
+					}
+					try {
+						let flag = mqttClient.publish(topic, message, {
+							qos: 1
+						});
+						if (flag) {
+							resolve();
+							return;
+						}
+						reject("MQTT未连接，无法发布消息");
+					} catch (error) {
+						mqttClient.unsubscribe(`A/${this.receiveData.IMEI}`);
+						mqttClient.disconnect();
+						this.initMQ();
+						reject(error);
+					}
+				});
+			},
+			calCRC32(data) {
+				// 生成CRC32表
+				let crcTable = [];
+				for (let i = 0; i < 256; i++) {
+					let c = i;
+					for (let j = 0; j < 8; j++) {
+						c = (c & 1) ? (0xEDB88320 ^ (c >>> 1)) : (c >>> 1);
+					}
+					crcTable[i] = c;
+				}
+
+				// 计算CRC32值
+				let crc = 0xFFFFFFFF;
+				for (let i = 0; i < data.length; i++) {
+					crc = (crc >>> 8) ^ crcTable[(crc ^ data[i]) & 0xFF];
+				}
+				crc ^= 0xFFFFFFFF; // 最终异或
+
+
+
+				return [
+					(crc >>> 24) & 0xFF, // 最高位字节
+					(crc >>> 16) & 0xFF,
+					(crc >>> 8) & 0xFF,
+					crc & 0xFF // 最低位字节
+				];
+			},
+			SendImgMQ(json) { //发送开机画面MQ版本
+				if (this.netMode != 'mqtt') {
+					return;
+				}
+				try {
+
+
+					let val = json.sta_PicTrans;
+					if (val >= 1 && val <= 100) {
+						let imageData = this.rgb565Data;
+						console.log("imageData.length=" + imageData.length);
+						let packetSize = 128;
+						let startIndex = (val - 1) * packetSize;
+						let endIndex = Math.min(startIndex + packetSize, imageData.length);
+						if (startIndex > endIndex) {
+							console.log("发送已完成了")
+							return;
+						}
+						let packetData = imageData.slice(startIndex, endIndex);
+
+						let arr = [];
+
+						let bufferSize = packetData.length * 2; // 头部5字节 + 数据部分
+						let buffer = new ArrayBuffer(bufferSize);
+						let dataView = new DataView(buffer);
+
+						for (let i = 0; i < packetData.length; i++) {
+							dataView.setUint16(i * 2, packetData[i], false); // 大端字节序
+							arr.push(dataView.getUint8(i * 2));
+							arr.push(dataView.getUint8(i * 2 + 1));
+						}
+						buffer = {
+							ins_PicTrans: [val]
+						};
+
+						console.log("arr=", arr.length);
+						let crc32 = this.calCRC32(arr);
+						arr = arr.concat(crc32);
+						buffer.ins_PicTrans = buffer.ins_PicTrans.concat((arr));
+
+						this.sendData(buffer).then(() => {
+							console.log("发送开机画面第" + val + "包成功");
+							this.currentPacket = val;
+							this.progress = val;
+
+						}).catch((ex) => {
+							console.log("发送开机画面第" + val + "包失败,正在重试,", ex);
+							// this.SendImgMQ(json);
+						});
+					} else if (val == 'great!') {
+						uni.showToast({
+							icon: 'success',
+							title: "发送成功"
+						});
+						uni.hideLoading();
+						this.isSending = false;
+					}
+				} catch (error) {
+					console.log("error=", error)
+				}
+			},
+			SendTxtMQ(json) { //发送文字MQ版本
+				if (this.netMode != 'mqtt') {
+					return;
+				}
+				let val = json.sta_TexTrans;
+				this.currentTextPacket = 4;
+				if (val === 1 || val === 2 || val === 3 || val === 4) {
+
+
+					this.textProgress = Math.round(((val - 1) / this.currentTextPacket) * 100);
+
+					let text = this.textLines[val - 1] || '';
+					let gbkData = this.convertToGBK(text);
+					let buffer = {
+						ins_TexTrans: [val]
+					}
+					for (var i = 0; i < gbkData.length; i += 2) {
+						let value = parseInt(gbkData[i] + "" + gbkData[i + 1], 16);
+
+						buffer.ins_TexTrans.push(value);
+					}
+
+
+
+					this.sendData(buffer).then(() => {
+						console.log("发送成功第" + val + "包文本数据");
+
+					}).catch((ex) => {
+						console.log("发送失败第" + val + "包文本数据,正在重试,", ex);
+						this.SendTxtMQ(json); //重试
+					});
+					return;
+				}
+				if (val === 'genius!') {
+					this.textProgress = 100;
+					uni.showToast({
+						icon: "success",
+						title: "发送成功"
+					})
+					console.log("全部文本数据发送成功");
+				}
+
+			},
+			sendUrgentMQ(json) { //发送紧急通知MQ版本
+				if (this.netMode != 'mqtt') {
+					return;
+				}
+				let val = json.sta_BreakNews;
+				if (val === 1 || val === 2) {
+					let text = this.warnLines[val - 1] || '';
+					let gbkData = this.convertToGBK(text);
+					let buffer = {
+						ins_BreakNews: [val]
+					}
+
+
+
+					for (var i = 0; i < gbkData.length; i += 2) {
+						let value = parseInt(gbkData[i] + "" + gbkData[i + 1], 16);
+
+						buffer.ins_BreakNews.push(value);
+					}
+
+					this.sendData(buffer).then(() => {
+						console.log("发送成功第" + val + "包数据成功");
+					}).catch((ex) => {
+						console.log("发送失败第" + val + "包,正在重试,", ex);
+
+						this.sendUrgentMQ(json); //重试
+					});
+					return;
+				}
+
+				if (val == 'cover!') {
+					uni.showToast({
+						icon: "success",
+						title: "发送成功"
+					})
+					console.log("紧急通知全部发送成功");
+				}
+			}
+
+		},
+		onUnload() {
+			this.closeBluetoothAdapter();
+		}
+	}
+</script>
+
+<style>
+	.receivLog {
+		padding: 20rpx;
+		width: 100%;
+		height: auto;
+		box-sizing: border-box;
+		border: 2rpx solid #e5e5e5;
+		border-radius: 20rpx;
+		font-size: 28rpx;
+		color: #2e2e2e;
+	}
+
+	.container {
+		padding: 20rpx;
+		background-color: #f8f8f8;
+		min-height: 100vh;
+	}
+
+	.title {
+		font-size: 36rpx;
+		font-weight: bold;
+		text-align: center;
+		padding: 20rpx 0;
+		color: #333;
+	}
+
+	.status-bar {
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		padding: 15rpx 0;
+		border-bottom: 1rpx solid #eee;
+	}
+
+	.function-tabs {
+		display: flex;
+		margin: 20rpx 0;
+	}
+
+	.tab-btn {
+		flex: 1;
+		padding: 15rpx 0;
+		text-align: center;
+		font-size: 28rpx;
+		border-bottom: 2rpx solid #eee;
+	}
+
+	.tab-btn.active {
+		color: #409eff;
+		border-bottom: 2rpx solid #409eff;
+	}
+
+	/* 设备列表样式 */
+	.search-area {
+		padding: 20rpx 0;
+	}
+
+	.search-btn {
+		background-color: #409eff;
+		color: white;
+	}
+
+	.tips {
+		color: #999;
+		font-size: 24rpx;
+		margin-top: 10rpx;
+	}
+
+	.devices-list {
+		margin-top: 20rpx;
+	}
+
+	.device-item {
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		padding: 20rpx;
+		background-color: white;
+		border-radius: 10rpx;
+		margin-bottom: 15rpx;
+		box-shadow: 0 2rpx 10rpx rgba(0, 0, 0, 0.05);
+	}
+
+	.device-item.active {
+		background-color: #e8f3ff;
+		border-left: 6rpx solid #409eff;
+	}
+
+	.device-name {
+		font-size: 28rpx;
+		max-width: 500rpx;
+		white-space: nowrap;
+		overflow: hidden;
+		text-overflow: ellipsis;
+	}
+
+	.device-rssi {
+		color: #999;
+		font-size: 24rpx;
+	}
+
+	.device-status {
+		color: #409eff;
+		font-size: 24rpx;
+	}
+
+	/* 模式设置样式 */
+	.modes-area {
+		margin-top: 30rpx;
+	}
+
+	.mode-title {
+		font-size: 28rpx;
+		font-weight: bold;
+		margin-bottom: 20rpx;
+		color: #333;
+	}
+
+	.modes-grid {
+		display: flex;
+		flex-wrap: wrap;
+		justify-content: space-between;
+	}
+
+	.mode-item {
+		width: 30%;
+		padding: 20rpx 0;
+		background-color: white;
+		border-radius: 10rpx;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		box-shadow: 0 2rpx 10rpx rgba(0, 0, 0, 0.05);
+	}
+
+	.mode-item.selected {
+		background-color: #e8f3ff;
+		border: 2rpx solid #409eff;
+	}
+
+	.mode-icon {
+		font-size: 40rpx;
+		margin-bottom: 10rpx;
+	}
+
+	.mode-name {
+		font-size: 26rpx;
+	}
+
+	/* 亮度调节样式 */
+	.brightness-area {
+		margin-top: 30rpx;
+		padding: 20rpx;
+		background-color: white;
+		border-radius: 10rpx;
+		box-shadow: 0 2rpx 10rpx rgba(0, 0, 0, 0.05);
+	}
+
+	.brightness-title {
+		font-size: 28rpx;
+		font-weight: bold;
+		margin-bottom: 20rpx;
+		color: #333;
+	}
+
+	.brightness-value {
+		font-size: 36rpx;
+		text-align: center;
+		margin-bottom: 30rpx;
+		color: #409eff;
+	}
+
+	.brightness-slider {
+		width: 100%;
+	}
+
+	/* 开机画面样式 */
+	.splash-controls {
+		display: flex;
+		justify-content: center;
+		gap: 20rpx;
+		margin: 20rpx 0;
+	}
+
+	.splash-preview {
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+	}
+
+	.splash-frame {
+		height: 320rpx;
+		width: 640rpx;
+		border: 2rpx solid #409eff;
+		border-radius: 8rpx;
+		overflow: hidden;
+		position: relative;
+		background-color: #f0f0f0;
+	}
+
+	.splash-frame image {
+		width: 100%;
+		height: 100%;
+	}
+
+	.empty-frame {
+		width: 100%;
+		height: 100%;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		color: #999;
+		font-size: 24rpx;
+	}
+
+	.frame-info {
+		margin-top: 15rpx;
+		color: #666;
+		font-size: 24rpx;
+	}
+
+	.sending-progress {
+		margin-top: 30rpx;
+		width: 100%;
+	}
+
+	.progress-bar {
+		height: 12rpx;
+		background-color: #e0e0e0;
+		border-radius: 6rpx;
+		overflow: hidden;
+	}
+
+	.progress-fill {
+		height: 100%;
+		background-color: #409eff;
+		transition: width 0.3s;
+	}
+
+	/* 文字设置样式 */
+	.text-inputs {
+		margin-top: 30rpx;
+		background-color: white;
+		border-radius: 10rpx;
+		box-shadow: 0 2rpx 10rpx rgba(0, 0, 0, 0.05);
+		padding: 20rpx;
+	}
+
+	.text-line {
+		display: flex;
+		align-items: center;
+		margin-bottom: 20rpx;
+	}
+
+	.text-line text {
+		width: 80rpx;
+		font-size: 26rpx;
+	}
+
+	.text-line input {
+		flex: 1;
+		height: 60rpx;
+		padding: 0 15rpx;
+		border: 1rpx solid #eee;
+		border-radius: 8rpx;
+		font-size: 26rpx;
+	}
+
+	.send-text-btn {
+		margin-top: 20rpx;
+		background-color: #409eff;
+		color: white;
+	}
+
+	/* 日志区域样式 */
+	.log-area {
+		margin-top: 30rpx;
+	}
+
+	.log-title {
+		font-size: 28rpx;
+		font-weight: bold;
+		margin-bottom: 15rpx;
+		color: #333;
+	}
+
+	.log-content {
+		height: 200rpx;
+		background-color: white;
+		border-radius: 10rpx;
+		padding: 15rpx;
+		font-size: 24rpx;
+		color: #666;
+	}
+
+	.log-item {
+		margin-bottom: 8rpx;
+	}
+
+	.btn {
+		padding: 10rpx 20rpx;
+		border-radius: 8rpx;
+		font-size: 26rpx;
+		text-align: center;
+	}
+
+	.btn[disabled] {
+		opacity: 0.5;
+	}
+
+	.txt {
+		border: 1px solid #000000;
+	}
+
+	.w50 {
+		width: 50%;
+		color: #656363;
+		font-size: 26prx;
+		height: 60rpx;
+	}
+
+	.fleft {
+		float: left;
+	}
+
+	.clear {
+		clear: both;
+	}
+</style>
\ No newline at end of file
diff --git a/pages/BlueTooth/ModeSetting/ModeSetting.vue b/pages/BlueTooth/ModeSetting/ModeSetting.vue
new file mode 100644
index 0000000..c464993
--- /dev/null
+++ b/pages/BlueTooth/ModeSetting/ModeSetting.vue
@@ -0,0 +1,1499 @@
+<template>
+	<view class="container">
+		<!-- 蓝牙设备列表页 -->
+		<view v-if="currentPage === 'deviceList'">
+			<view class="title">蓝牙设备列表</view>
+
+			<view class="status-bar">
+				<text>蓝牙状态: {{ bluetoothStatus }}</text>
+				<button class="btn" :disabled="isLoading" @click="toggleBluetooth">
+					{{ isBluetoothOpen ? '关闭蓝牙' : '开启蓝牙' }}
+				</button>
+			</view>
+
+			<view class="search-area">
+				<button class="btn search-btn" :disabled="!isBluetoothOpen || isSearching" @click="startSearch">
+					{{ isSearching ? '正在搜索...' : '搜索设备' }}
+				</button>
+				<text class="tips">{{ searchTips }}</text>
+			</view>
+
+			<view class="devices-list" v-if="deviceList.length > 0">
+				<view class="device-item" v-for="(device, index) in deviceList" :key="index"
+					:class="{'active': device.name === targetDeviceName}"
+					@click="connectDevice(device.deviceId, device.name)">
+					<text class="device-name">{{ device.name || '未知设备' }}</text>
+					<text class="device-rssi">{{ device.RSSI }}dBm</text>
+					<text class="device-status" v-if="device.name === targetDeviceName">已连接</text>
+				</view>
+			</view>
+		</view>
+
+		<!-- 主控制页面 -->
+		<view v-if="currentPage === 'controlPanel'">
+			<view class="title">蓝牙灯光控制器</view>
+
+			<view class="status-bar">
+				<text>已连接: {{ targetDeviceName }}</text>
+				<button class="btn" @click="disconnectDevice(null)">断开连接</button>
+			</view>
+			<view>
+				<text>发送间隔:</text>
+				<input type="number" v-model="inteval" class="txt" />
+			</view>
+
+
+			<view class="function-tabs">
+				<button class="tab-btn" :class="{'active': currentTab === 'mode'}"
+					@click="currentTab = 'mode'">模式设置</button>
+				<button class="tab-btn" :class="{'active': currentTab === 'brightness'}"
+					@click="currentTab = 'brightness'">亮度调节</button>
+				<button class="tab-btn" :class="{'active': currentTab === 'splash'}"
+					@click="currentTab = 'splash'">开机画面</button>
+				<button class="tab-btn" :class="{'active': currentTab === 'text'}"
+					@click="currentTab = 'text'">文字设置</button>
+			</view>
+
+			<!-- 模式设置选项卡 -->
+			<view v-if="currentTab === 'mode'">
+				<view class="modes-area">
+					<view class="mode-title">选择灯光模式</view>
+					<view class="modes-grid">
+						<view class="mode-item" :class="{'selected': currentMode === 'high'}" @click="setMode('high')">
+							<text class="mode-icon">💡</text>
+							<text class="mode-name">强光模式</text>
+						</view>
+						<view class="mode-item" :class="{'selected': currentMode === 'low'}" @click="setMode('low')">
+							<text class="mode-icon">🔅</text>
+							<text class="mode-name">弱光模式</text>
+						</view>
+						<view class="mode-item" :class="{'selected': currentMode === 'flash'}"
+							@click="setMode('flash')">
+							<text class="mode-icon">💥</text>
+							<text class="mode-name">爆闪模式</text>
+						</view>
+					</view>
+				</view>
+			</view>
+
+			<!-- 亮度调节选项卡 -->
+			<view v-if="currentTab === 'brightness'">
+				<view class="brightness-area">
+					<view class="brightness-title">亮度调节</view>
+					<view class="brightness-value">{{ brightness }}%</view>
+					<slider class="brightness-slider" :value="brightness" min="0" max="100"
+						@changing="onBrightnessChanging" @change="onBrightnessChanged" />
+				</view>
+			</view>
+
+			<!-- 开机画面选项卡 -->
+			<view v-if="currentTab === 'splash'">
+				<view class="splash-controls">
+					<button class="btn" @click="importImage">导入图片</button>
+
+					<button class="btn" :disabled="!hasImage || isSending" @click="sendSplashImage">确认发送</button>
+				</view>
+
+				<view class="splash-preview">
+					<view class="splash-frame">
+						<image v-if="tempImagePath" :src="tempImagePath" mode="aspectFill" :style="imageStyle"
+							@touchstart="onTouchStart" @touchmove="onTouchMove" @touchend="onTouchEnd"></image>
+						<view v-else class="empty-frame">点击"导入图片"选择开机画面</view>
+					</view>
+					<view class="frame-info">
+						<text>框选区域: 160×80像素</text>
+						<text v-if="hasImage">缩放: {{ scale.toFixed(2) }}x</text>
+					</view>
+				</view>
+
+				<view class="sending-progress" v-if="isSending">
+					<view class="progress-bar">
+						<view class="progress-fill" :style="{ width: progress + '%' }"></view>
+					</view>
+					<text>正在发送: {{ progress }}% ({{ currentPacket }}/{{ totalPackets }})</text>
+				</view>
+			</view>
+
+			<!-- 文字设置选项卡 -->
+			<view v-if="currentTab === 'text'">
+				<view class="text-inputs">
+					<view class="text-line" v-for="(line, index) in textLines" :key="index">
+						<text>第{{ index + 1 }}行:</text>
+						<input v-model="textLines[index]" placeholder="请输入文字" maxlength="30"
+							@confirm="onTextChanged(index)" />
+					</view>
+				</view>
+
+				<button class="btn send-text-btn" :disabled="isSendingText" @click="sendText">发送文字</button>
+
+				<view class="sending-progress" v-if="isSendingText">
+					<view class="progress-bar">
+						<view class="progress-fill" :style="{ width: textProgress + '%' }"></view>
+					</view>
+					<text>正在发送: {{ textProgress }}% ({{ currentTextPacket }}/{{ totalTextPackets }})</text>
+				</view>
+			</view>
+		</view>
+
+
+
+		<!-- 隐藏的canvas用于图片处理 -->
+		<canvas canvas-id="splashCanvas" style="width: 160px; height: 80px; z-index: 9999;position: fixed; "
+			:style="{top:canvasTop,left:canvasLeft}" ></canvas>
+	</view>
+</template>
+
+<script>
+	import gbk from '@/utils/gbk.js';
+	export default {
+		data() {
+			return {
+				canvasTop: '-1000px',
+				canvasLeft: '-1000px',
+				inteval: 100,
+				isLoading: false,
+				isBluetoothOpen: false,
+				isSearching: false,
+				isConnected: false,
+				isSending: false,
+				isSendingText: false,
+				bluetoothStatus: '未初始化',
+				searchTips: '',
+				deviceList: [],
+				connectedDeviceId: '',
+				serviceId: '0xFFE1',
+				writeCharacteristicId: '0xFFE1',
+				notifyCharacteristicId: '0xFFE2',
+				currentMode: '',
+				logList: [],
+				packetCount: 1,
+				currentPage: 'deviceList',
+				targetDeviceName: 'JQZM-EF4651',
+				currentTab: 'mode',
+				brightness: 50,
+				brightnessTimer: null,
+				tempImagePath: '',
+				hasImage: false,
+				scale: 1,
+				translateX: 0,
+				translateY: 0,
+				lastX: 0,
+				lastY: 0,
+				isDragging: false,
+				progress: 0,
+				currentPacket: 0,
+				totalPackets: 100,
+				imageWidth: 0,
+				imageHeight: 0,
+				textLines: ['你好中国', '你好中国', '你好中国', '你好中国'],
+				textProgress: 0,
+				currentTextPacket: 0,
+				totalTextPackets: 4
+			}
+		},
+		computed: {
+			imageStyle() {
+				return `transform: scale(${this.scale}) translate(${this.translateX}px, ${this.translateY}px); transform-origin: 0 0;`;
+			}
+		},
+		onLoad() {
+
+			// debugger;
+			//  // const iconv = require('iconv-lite');
+			// // 假设我们有一个UTF-8编码的字符串
+			// let utf8String = '你好，世界！';
+
+			// // 使用iconv-lite将字符串从UTF-8编码转换为GBK编码
+			// let gbkBuffer = iconv.encode(utf8String, 'GBK');
+
+			// console.log('转换后的GBK编码Buffer对象:', gbkBuffer)
+
+			this.initBluetoothAdapter();
+		},
+		methods: {
+			// 蓝牙初始化
+			initBluetoothAdapter() {
+				console.log('开始初始化蓝牙适配器');
+				uni.openBluetoothAdapter({
+					success: (res) => {
+						this.isBluetoothOpen = true;
+						this.bluetoothStatus = '已开启';
+						console.log('蓝牙适配器初始化成功');
+						this.getBluetoothAdapterState();
+
+						// 自动开始搜索设备
+						this.startSearch();
+					},
+					fail: (err) => {
+						this.bluetoothStatus = '初始化失败';
+						console.log(`蓝牙适配器初始化失败: ${err.errMsg}`);
+						if (err.errCode === 10001) {
+							uni.onBluetoothAdapterStateChange((res) => {
+								if (res.available) {
+									this.isBluetoothOpen = true;
+									this.bluetoothStatus = '已开启';
+									console.log('蓝牙适配器已开启');
+									this.startSearch();
+								}
+							});
+						}
+					}
+				});
+			},
+
+			// 获取蓝牙适配器状态
+			getBluetoothAdapterState() {
+				uni.getBluetoothAdapterState({
+					success: (res) => {
+						this.isBluetoothOpen = res.available;
+						this.bluetoothStatus = res.available ? '已开启' : '已关闭';
+						if (!res.available) {
+							console.log('蓝牙适配器未开启');
+						}
+					}
+				});
+			},
+
+			// 开关蓝牙
+			toggleBluetooth() {
+				if (this.isBluetoothOpen) {
+					this.closeBluetoothAdapter();
+				} else {
+					this.initBluetoothAdapter();
+				}
+			},
+
+			// 关闭蓝牙适配器
+			closeBluetoothAdapter() {
+
+
+				this.stopSearch();
+				this.disconnectDevice(() => {
+					uni.closeBluetoothAdapter({
+						success: () => {
+							console.log("蓝牙已关闭");
+							this.isBluetoothOpen = false;
+							this.isSearching = false;
+							this.isConnected = false;
+							this.bluetoothStatus = '已关闭';
+							this.deviceList = [];
+							this.connectedDeviceId = '';
+							this.currentMode = '';
+							this.currentPage = 'deviceList';
+						}
+					})
+				});
+
+
+
+			},
+
+			// 开始搜索蓝牙设备
+			startSearch() {
+				if (this.isSearching) return;
+
+				this.isSearching = true;
+				this.deviceList = [];
+				this.searchTips = '搜索中...';
+				console.log('开始搜索蓝牙设备');
+
+				uni.startBluetoothDevicesDiscovery({
+					services: ["0xFFE0"],
+					allowDuplicatesKey: false,
+					success: (res) => {
+						console.log('开始搜索蓝牙设备成功');
+						this.onDeviceFound();
+
+
+					},
+					fail: (err) => {
+						this.isSearching = false;
+						this.searchTips = '搜索失败';
+						console.log(`搜索蓝牙设备失败: ${err.errMsg}`);
+					}
+				});
+			},
+
+			// 停止搜索蓝牙设备
+			stopSearch() {
+				this.isSearching = false;
+				this.searchTips = this.deviceList.length > 0 ? '搜索完成' : '未发现蓝牙设备';
+
+				uni.stopBluetoothDevicesDiscovery({
+					success: () => {
+						console.log('停止搜索蓝牙设备');
+					}
+				});
+			},
+
+			// 监听发现新设备
+			onDeviceFound() {
+				uni.onBluetoothDeviceFound((res) => {
+					const device = res.devices[0];
+					if (!device.name && !device.localName) return;
+					// if ((device.name || device.localName) === this.targetDeviceName) {
+					// 检查是否已存在该设备
+					const index = this.deviceList.findIndex(item => item.deviceId === device.deviceId);
+					if (index === -1) {
+						this.deviceList.push({
+							deviceId: device.deviceId,
+							name: device.name || device.localName,
+							RSSI: device.RSSI
+						});
+					} else {
+						// 更新信号强度
+						this.deviceList[index].RSSI = device.RSSI;
+
+					}
+					// }
+
+					// 如果找到目标设备，自动连接
+					if ((device.name || device.localName) === this.targetDeviceName) {
+						console.log(`发现目标设备: ${JSON.stringify(device)}`);
+						this.connectDevice(device.deviceId, this.targetDeviceName);
+					}
+				});
+			},
+
+			// 连接蓝牙设备
+			connectDevice(deviceId, deviceName) {
+				if (this.isConnected && this.connectedDeviceId === deviceId) return;
+
+				this.isLoading = true;
+				console.log(`开始连接设备: ${deviceName}`);
+				var these = this;
+				uni.createBLEConnection({
+					deviceId: deviceId,
+					timeout: 10000,
+					success: (res) => {
+						this.isConnected = true;
+						this.connectedDeviceId = deviceId;
+						this.targetDeviceName = deviceName;
+						console.log(`连接设备 ${deviceName} 成功`);
+						this.enableNotification(deviceId);
+						// 连接成功后切换到控制面板
+						this.currentPage = 'controlPanel';
+
+						setTimeout(function() {
+							uni.setBLEMTU({
+								deviceId: deviceId,
+								mtu: 512,
+								success: (info) => {
+									console.log("设置mtu成功")
+								},
+								fail: (ex) => {
+									console.log("设置mtu失败" + JSON.stringify(ex));
+								}
+							})
+
+							these.getDeviceServices(deviceId);
+						}, 2000)
+						// 获取服务和特征值
+
+
+						// 启用通知
+
+						this.stopSearch();
+					},
+					fail: (err) => {
+						console.log(`连接设备失败: ${JSON.stringify(err)}`);
+						uni.showToast({
+							title: '连接失败',
+							icon: 'none'
+						});
+					},
+					complete: () => {
+						this.isLoading = false;
+					}
+				});
+			},
+
+			// 断开蓝牙连接
+			disconnectDevice(callback) {
+				var these = this;
+
+				if(!this.connectedDeviceId){
+					this.isConnected = false;
+					this.connectedDeviceId = '';
+					this.currentMode = '';
+					this.currentPage = 'deviceList';
+					if (callback) {
+						callback();
+					}
+					return;
+				}
+				uni.closeBLEConnection({
+					deviceId: this.connectedDeviceId,
+					success: () => {
+
+						console.log('蓝牙连接已断开');
+
+
+					},
+					fail: (ex) => {
+						let arr = [{
+								code: 0,
+								remark: '正常'
+							},
+							{
+								code: 10000,
+								remark: '未初始化蓝牙适配器'
+							},
+							{
+								code: 10001,
+								remark: '当前蓝牙适配器不可用'
+							},
+							{
+								code: 10002,
+								remark: '没有找到指定设备'
+							},
+							{
+								code: 10003,
+								remark: '连接失败'
+							},
+							{
+								code: 10004,
+								remark: '没有找到指定服务'
+							},
+							{
+								code: 10005,
+								remark: '没有找到指定特征值'
+							},
+							{
+								code: 10006,
+								remark: '当前连接已断开'
+							},
+							{
+								code: 10007,
+								remark: '当前特征值不支持此操作'
+							},
+							{
+								code: 10008,
+								remark: '其余所有系统上报的异常'
+							},
+							{
+								code: 10009,
+								remark: 'Android 系统特有，系统版本低于 4.3 不支持 BLE'
+							},
+							{
+								code: 10010,
+								remark: '已连接'
+							},
+							{
+								code: 10011,
+								remark: '配对设备需要配对码'
+							},
+							{
+								code: 10012,
+								remark: '连接超时'
+							},
+							{
+								code: 10013,
+								remark: '连接 deviceId 为空或者是格式不正确'
+							}
+						];
+						let f=arr.find(function(v){
+							return v.code==ex.code;
+						})
+						
+						console.log("无法断开蓝牙连接:"+ f.remark);
+
+						uni.showToast({
+							title: "无法断开蓝牙连接:"+ f.remark,
+							icon: 'fail'
+						});
+					},
+					complete: () => {
+						this.isConnected = false;
+						this.connectedDeviceId = '';
+						this.currentMode = '';
+						this.currentPage = 'deviceList';
+						if (callback) {
+							callback();
+						}
+					}
+				});
+			},
+
+			// 获取设备服务
+			getDeviceServices(deviceId) {
+				console.log("deviceId=" + deviceId);
+				var these = this;
+				uni.getBLEDeviceServices({
+					deviceId: deviceId,
+					success: (res) => {
+
+						console.log("发现服务" + JSON.stringify(res.services))
+						if (res.services.length == 0) {
+							setTimeout(function() {
+								these.getDeviceServices(deviceId);
+							}, 1000);
+							return;
+						}
+						// 查找目标服务
+						const targetService = res.services.find(service => service.uuid.indexOf('FFE0') > -1);
+
+						if (targetService) {
+							console.log(`找到目标服务: ${targetService.uuid}`);
+							this.serviceId = targetService.uuid;
+							this.getDeviceCharacteristics(deviceId, targetService.uuid);
+						}
+					},
+					fail: (err) => {
+						console.log(`获取设备服务失败: ${err.errMsg}`);
+					}
+				});
+			},
+
+
+			// 获取设备特征值
+			getDeviceCharacteristics(deviceId, serviceId) {
+				uni.getBLEDeviceCharacteristics({
+					deviceId: deviceId,
+					serviceId: serviceId,
+					success: (res) => {
+						console.log(`获取设备特征值成功，共发现 ${res.characteristics.length} 个特征值`);
+						console.log(`获取设备特征值成功${JSON.stringify(res.characteristics)}`);
+						// 查找可写特征值
+						const writeChar = res.characteristics.find(char =>
+							char.uuid.indexOf("FFE1") >= 1
+						);
+
+						// 查找通知特征值
+						const notifyChar = res.characteristics.find(char =>
+							char.uuid.indexOf("FFE2") > -1
+						);
+
+						if (writeChar) {
+							console.log(`找到可写特征值: ${writeChar.uuid}`);
+							this.writeCharacteristicId = writeChar.uuid;
+						} else {
+							console.log(`未找到可写特征值: ${this.writeCharacteristicId}`);
+						}
+
+						if (notifyChar) {
+							console.log(`找到通知特征值: ${notifyChar.uuid}`);
+							this.notifyCharacteristicId = notifyChar.uuid;
+						} else {
+							console.log(`未找到通知特征值: ${this.notifyCharacteristicId}`);
+						}
+					},
+					fail: (err) => {
+						console.log(`获取设备特征值失败: ${err.errMsg}`);
+					}
+				});
+			},
+
+			// 启用通知
+			enableNotification(deviceId) {
+				uni.notifyBLECharacteristicValueChange({
+					deviceId: deviceId,
+					serviceId: this.serviceId,
+					characteristicId: this.notifyCharacteristicId,
+					state: true,
+					success: () => {
+						console.log('启用通知成功');
+
+						// 监听通知
+						uni.onBLECharacteristicValueChange((res) => {
+							this.handleNotification(res.value);
+						});
+					},
+					fail: (err) => {
+						console.log(`启用通知失败: ${err.errMsg}`);
+					}
+				});
+			},
+
+			// 处理通知数据
+			handleNotification(buffer) {
+				console.log("收到设备通知数据")
+				// 解析从设备接收的数据
+				const dataView = new DataView(buffer);
+				let result = '';
+
+				for (let i = 0; i < dataView.byteLength; i++) {
+					result += String.fromCharCode(dataView.getUint8(i));
+				}
+
+				console.log(`收到设备数据: ${result}`);
+			},
+
+			// 设置灯光模式
+			setMode(mode) {
+				if (!this.isConnected) {
+					uni.showToast({
+						title: '未连接设备',
+						icon: 'none'
+					});
+					return;
+				}
+
+				if (this.currentMode === mode) return;
+
+				this.currentMode = mode;
+				let dataValue = 0;
+
+				switch (mode) {
+					case 'high':
+						dataValue = 0x65; // 强光模式
+						console.log('开始切换到强光模式');
+						break;
+					case 'low':
+						dataValue = 0x66; // 弱光模式
+						console.log('开始切换到弱光模式');
+						break;
+					case 'flash':
+						dataValue = 0x67; // 爆闪模式
+						console.log('开始切换到爆闪模式');
+						break;
+				}
+
+				// 构建数据包
+				const buffer = new ArrayBuffer(6);
+				const dataView = new DataView(buffer);
+
+				dataView.setUint8(0, 0x55); // 帧头
+				dataView.setUint8(1, 0x00); // 帧类型
+				dataView.setUint8(2, 0x01); // 包序号
+				dataView.setUint8(3, 0x00); // 数据长度
+				dataView.setUint8(4, 0x01); // 数据长度
+				dataView.setUint8(5, dataValue); // 数据
+
+				// 发送数据
+				this.sendData(buffer);
+			},
+
+			// 亮度调节
+			onBrightnessChanging(e) {
+				this.brightness = e.detail.value;
+
+				// 清除之前的定时器
+				if (this.brightnessTimer) {
+					clearTimeout(this.brightnessTimer);
+				}
+
+				// 设置新的定时器，控制发送频率
+				this.brightnessTimer = setTimeout(() => {
+					this.sendBrightness();
+				}, 100);
+			},
+
+			onBrightnessChanged(e) {
+				this.brightness = e.detail.value;
+				//this.sendBrightness();
+			},
+
+			sendBrightness() {
+				if (!this.isConnected) return;
+
+				// 构建数据包
+				const buffer = new ArrayBuffer(6);
+				const dataView = new DataView(buffer);
+				let data = '0x' + parseInt(this.brightness).toString(16);
+				console.log("亮度:" + this.brightness + ',16进制:' + data);
+				dataView.setUint8(0, 0x55); // 帧头
+				dataView.setUint8(1, 0x01); // 帧类型：亮度调节
+				dataView.setUint8(2, 0x01); // 包序号
+				dataView.setUint8(3, 0x00); // 数据长度
+				dataView.setUint8(4, 0x01); // 数据长度
+				dataView.setUint8(5, data); // 数据
+
+				// 发送数据
+				this.sendData(buffer);
+			},
+
+			// 导入图片
+			importImage() {
+				uni.chooseImage({
+					count: 1,
+					sourceType: ['album'],
+					success: (res) => {
+						this.tempImagePath = res.tempFilePaths[0];
+						this.hasImage = true;
+						this.scale = 1;
+						this.translateX = 0;
+						this.translateY = 0;
+
+						// 获取图片尺寸
+						uni.getImageInfo({
+							src: this.tempImagePath,
+							success: (info) => {
+								this.imageWidth = info.width;
+								this.imageHeight = info.height;
+								this.autoFitImage();
+								console.log('图片导入成功，请调整图片位置和大小');
+							},
+							fail: (err) => {
+								console.log(`获取图片信息失败: ${err.errMsg}`);
+							}
+						});
+					},
+					fail: (err) => {
+						console.log(`选择图片失败: ${err.errMsg}`);
+					}
+				});
+			},
+
+			// 自动适配图片到容器
+			autoFitImage() {
+				const frameWidth = 320; // 预览框宽度，根据实际UI调整
+				const frameHeight = 640; // 预览框高度，根据实际UI调整
+
+				const widthRatio = frameWidth / this.imageWidth;
+				const heightRatio = frameHeight / this.imageHeight;
+
+				// 取较小的缩放比例，确保图片能完全显示在容器内
+				this.scale = Math.min(widthRatio, heightRatio);
+
+				// 居中显示
+				this.translateX = (frameWidth - this.imageWidth * this.scale) / 2;
+				this.translateY = (frameHeight - this.imageHeight * this.scale) / 2;
+			},
+
+			// 触摸事件处理
+			onTouchStart(e) {
+				if (e.touches.length === 1) {
+					this.isDragging = true;
+					this.lastX = e.touches[0].clientX;
+					this.lastY = e.touches[0].clientY;
+				}
+			},
+
+			onTouchMove(e) {
+				if (this.isDragging && e.touches.length === 1) {
+					const currentX = e.touches[0].clientX;
+					const currentY = e.touches[0].clientY;
+
+					// 计算位移
+					const deltaX = currentX - this.lastX;
+					const deltaY = currentY - this.lastY;
+
+					// 更新位置
+					this.translateX += deltaX;
+					this.translateY += deltaY;
+
+					// 限制移动范围
+					this.limitImagePosition();
+
+					// 更新最后位置
+					this.lastX = currentX;
+					this.lastY = currentY;
+				}
+			},
+
+			onTouchEnd() {
+				this.isDragging = false;
+			},
+
+			// 限制图片移动范围
+			limitImagePosition() {
+				const frameWidth = 320; // 预览框宽度，根据实际UI调整
+				const frameHeight = 640; // 预览框高度，根据实际UI调整
+
+				const maxX = 0;
+				const minX = frameWidth - this.imageWidth * this.scale;
+				const maxY = 0;
+				const minY = frameHeight - this.imageHeight * this.scale;
+
+				this.translateX = Math.max(minX, Math.min(maxX, this.translateX));
+				this.translateY = Math.max(minY, Math.min(maxY, this.translateY));
+			},
+
+			// 发送开机画面
+			sendSplashImage() {
+				if (!this.hasImage) {
+					uni.showToast({
+						title: '请先导入图片',
+						icon: 'none'
+					});
+					return;
+				}
+
+				uni.showLoading({
+					title: '处理图片中...',
+					mask: true
+				});
+
+				// 将图片转换为RGB565格式并发送
+				this.convertAndSendImage().then(() => {
+					uni.hideLoading();
+					console.log('开机画面发送完成');
+					uni.showToast({
+						title: '开机画面发送完成',
+						icon: 'success'
+					});
+				}).catch((error) => {
+					uni.hideLoading();
+					console.log(`图片发送失败: ${error}`);
+					uni.showToast({
+						title: '图片发送失败',
+						icon: 'none'
+					});
+				});
+			},
+
+			// 转换图片并发送
+			convertAndSendImage() {
+				return new Promise((resolve, reject) => {
+					console.log("111111");
+					// 创建canvas用于处理图片
+					const ctx = uni.createCanvasContext('splashCanvas', this);
+					console.log("2222222");
+					// 绘制图片到canvas
+					ctx.drawImage(this.tempImagePath, 0, 0, 160, 80);
+					console.log("33333333");
+					try {
+						ctx.draw(false, () => {
+							console.log("4444444");
+							// 获取canvas像素数据
+							this.canvasTop = '0px';
+							this.canvasLeft = '0px';
+							setTimeout(() => {
+								uni.canvasGetImageData({
+									canvasId: 'splashCanvas',
+									x: 0,
+									y: 0,
+									width: 160,
+									height: 80,
+									success: (res) => {
+										// 处理像素数据并发送
+										console.log("res.data.length=" + res.data
+											.length);
+										this.processAndSendImageData(res.data).then(
+											resolve).catch(reject);
+									},
+									fail: (err) => {
+										reject(`获取canvas数据失败: ${err.errMsg}`);
+									}
+								});
+							}, 300); // 等待canvas绘制完成
+						});
+					} catch (ex) {
+						console.log("出现异常" + JSON.stringify(ex))
+					}
+
+				});
+			},
+
+			// 处理像素数据并发送
+			processAndSendImageData(pixels) {
+				return new Promise((resolve, reject) => {
+					// 创建RGB565格式的像素数据
+					const rgb565Data = this.convertToRGB565(pixels);
+
+					// 分包发送
+					this.sendImagePackets(rgb565Data).then(resolve).catch(reject);
+				});
+			},
+
+			// 将RGBA转换为RGB565
+			convertToRGB565(pixels) {
+
+				var rgbaToRgb565 = function(r, g, b, a = 255) {
+					// 忽略透明度（如果需要考虑透明度，请根据需求处理）
+
+					// 将8位颜色值压缩到RGB565对应的位数
+					const r5 = Math.round((r / 255) * 31); // 5位：0-31
+					const g6 = Math.round((g / 255) * 63); // 6位：0-63
+					const b5 = Math.round((b / 255) * 31); // 5位：0-31
+
+					// 合并为16位整数
+					return (r5 << 11) | (g6 << 5) | b5;
+				}
+
+				const result = new Uint16Array(160 * 80);
+				let index = 0;
+				console.log("pixels.length=" + pixels.length);
+				for (let i = 0; i < pixels.length; i += 4) {
+					const r = pixels[i];
+					const g = pixels[i + 1];
+					const b = pixels[i + 2];
+
+					// 转换为RGB565 (R:5bit, G:6bit, B:5bit)
+					const rgb565 = ((r & 0xF8) << 8) | ((g & 0xFC) << 3) | (b >> 3);
+					//let rgb565=rgbaToRgb565(r,g,b);
+					result[index++] = rgb565;
+				}
+
+				return result;
+			},
+
+			// 分包发送图片数据
+			sendImagePackets(imageData) {
+				return new Promise((resolve, reject) => {
+					this.isSending = true;
+					this.progress = 0;
+					this.currentPacket = 0;
+
+					// 总数据包数
+					const totalPackets = 52;
+					let currentPacket = 1;
+					this.totalPackets=totalPackets;
+					// 发送单个数据包
+					const sendNextPacket = () => {
+						if (currentPacket > totalPackets) {
+							this.isSending = false;
+							resolve();
+							return;
+						}
+
+						// 计算当前包的数据
+						let packetSize = 250;
+						if (currentPacket <= 51) {
+							packetSize = 250; // 前51个包每个500字节
+						} else {
+							packetSize = 50; // 最后一个包100字节
+						}
+
+						// 创建数据包
+						const startIndex = (currentPacket - 1) * packetSize;
+						const endIndex = Math.min(startIndex + packetSize, imageData.length);
+						if (startIndex > endIndex) {
+							return;
+						}
+						const packetData = imageData.slice(startIndex,
+							endIndex); // imageData.subarray(startIndex, endIndex);
+						console.log("imageData.length=" + imageData.length + ",startIndex=" + startIndex +
+							",endIndex=" + endIndex + ",数据包长度" + (endIndex - startIndex) +
+							',packetData.length=' + packetData.length);
+						// 构建数据包
+						const bufferSize = 5 + packetData.length * 2; // 头部5字节 + 数据部分
+						const buffer = new ArrayBuffer(bufferSize);
+						const dataView = new DataView(buffer);
+
+						// 填充头部
+						dataView.setUint8(0, 0x55); // 帧头
+						dataView.setUint8(1, 0x02); // 帧类型：开机画面
+						dataView.setUint8(2, '0x' + currentPacket.toString(16).padStart(2, '0')); // 包序号
+						// dataView.setUint8(3, 0x01);
+						// dataView.setUint8(4, 0xFF);
+						if (packetData.length == 250) {
+							dataView.setUint8(3, 0x01);
+							dataView.setUint8(4, 0xF4);
+						} else {
+							dataView.setUint8(3, 0x00);
+							dataView.setUint8(4, 0x64);
+						}
+
+						// 填充数据（每个RGB565值占2字节）
+						for (let i = 0; i < packetData.length; i++) {
+							dataView.setUint16(5 + i * 2, packetData[i], false); // 大端字节序
+						}
+						console.log(
+							`发送数据包${currentPacket}/${totalPackets},${dataView.getUint8(0)} ${dataView.getUint8(1)} ${dataView.getUint8(2)}`
+						)
+						//发送数据包
+						this.sendData(buffer).then(() => {
+							// 更新进度
+							this.currentPacket = currentPacket;
+							this.progress = Math.round((currentPacket / totalPackets) * 52);
+							// console.log(`发送开机画面数据包 ${currentPacket}/${totalPackets}`);
+
+							// 发送下一个包（添加延迟避免蓝牙缓冲区溢出）
+							currentPacket++;
+							let inteval = parseInt(this.inteval ? this.inteval : 100);
+							// if ((currentPacket - 1) % 16 == 1) {
+							// 	inteval += 150;
+							// 	console.log("当前是第" + (currentPacket - 1) + "完成,额外多停留150ms,inteval=" +
+							// 		inteval);
+							// } else {
+							// 	console.log("interval=" + inteval)
+							// }
+							setTimeout(sendNextPacket, inteval);
+						}).catch(err => {
+							this.isSending = false;
+							reject(err);
+						});
+					};
+
+					//牵着你的手
+					var HoldYouHand = () => {
+						var str = "transmit start"; //握手的协议字符串
+
+
+						// 1. 创建 ArrayBuffer 和 DataView
+						const buffer = new ArrayBuffer(str.length);
+						const dataView = new DataView(buffer);
+
+						// 2. 将字符串转换为 ASCII 码并写入 DataView
+						for (let i = 0; i < str.length; i++) {
+							dataView.setUint8(i, str.charCodeAt(i));
+						}
+
+						this.sendData(buffer).then(() => {
+							// 开始发送第一个包
+							console.log("握手成功了,等待500ms");
+							setTimeout(sendNextPacket, 500);
+
+						}).catch(err => {
+							console.log("握手没有成功");
+							reject(err);
+						});
+					}
+
+					HoldYouHand();
+
+				});
+			},
+
+			// 文字输入变化
+			onTextChanged(index) {
+				console.log(`第${index + 1}行文字已更新`);
+			},
+
+			// 发送文字
+			sendText() {
+				if (!this.isConnected) {
+					uni.showToast({
+						title: '未连接设备',
+						icon: 'none'
+					});
+					return;
+				}
+
+				this.isSendingText = true;
+				this.textProgress = 0;
+				this.currentTextPacket = 0;
+
+				// 总数据包数
+				const totalPackets = this.textLines.length;
+				let currentPacket = 1;
+
+				// 发送单个数据包
+				const sendNextPacket = () => {
+					if (currentPacket > totalPackets) {
+						this.isSendingText = false;
+						console.log('文字发送完成');
+						uni.showToast({
+							title: '发送成功',
+							icon: 'success'
+						});
+						return;
+					}
+
+					// 获取当前行文字
+					const text = this.textLines[currentPacket - 1] || '';
+
+					// 将文字转换为GBK编码
+					this.convertToGBK(text).then(gbkData => {
+						console.log(JSON.stringify(gbkData));
+						// 构建数据包
+						const bufferSize = 5 + text.length * 2; // 头部4字节 + 数据部分
+						const buffer = new ArrayBuffer(bufferSize);
+						const dataView = new DataView(buffer);
+
+						// 填充头部
+						dataView.setUint8(0, 0x55); // 帧头
+						dataView.setUint8(1, 0x03); // 帧类型：文字
+						dataView.setUint8(2, currentPacket.toString(16)); // 包序号
+
+						console.log(text.length.toString(16));
+						dataView.setUint16(3, (text.length * 2).toString(16)); // 数据长度
+						console.log("gbkData.length=" + gbkData.length);
+						let str = new Array();
+						// 填充数据
+						for (let i = 1; i <= text.length * 2; i++) {
+							const highNibble = gbkData[i * 2 - 2]; // 高4位
+							const lowNibble = gbkData[i * 2 - 1]; // 低4位（如果是奇数长度，补0）
+							console.log("i=" + i + "," + highNibble + lowNibble)
+							// 组合高低位并转换为字节值
+							const byteValue = parseInt(highNibble + lowNibble, 16);
+							dataView.setUint8(5 + i - 1, byteValue);
+						}
+						console.log(str.join(" "));
+
+						console.log("dataView.length=" + dataView.byteLength)
+						// 发送数据包
+						this.sendData(buffer).then(() => {
+							// 更新进度
+							this.currentTextPacket = currentPacket;
+							this.textProgress = Math.round((currentPacket / totalPackets) * 100);
+							console.log(`发送文字数据包 ${currentPacket}/${totalPackets}: ${text}`);
+
+							// 发送下一个包
+							currentPacket++;
+							setTimeout(sendNextPacket, this.inteval ? this.inteval : 100);
+						}).catch(err => {
+							this.isSendingText = false;
+							uni.showToast({
+								title: '文字发送失败',
+								icon: 'none'
+							});
+						});
+					}).catch(err => {
+						this.isSendingText = false;
+						console.log(`文字编码失败: ${err}`);
+						uni.showToast({
+							title: '编码失败',
+							icon: 'none'
+						});
+					});
+				};
+
+				// 开始发送第一个包
+				sendNextPacket();
+			},
+
+			// 将文字转换为GBK编码（使用第三方库或API）
+			convertToGBK(text) {
+				return new Promise((resolve, reject) => {
+					// 注意：uniapp环境中可能需要使用特定的GBK编码库
+					// 这里使用模拟实现，实际项目中应使用适当的编码库
+					try {
+
+						// 模拟GBK编码转换
+
+						let arr = gbk.encode(text)
+						let utf8Data = gbk.arr2hex(arr);
+						// 注意：这只是示例，实际GBK编码需要使用专门的库
+						resolve(utf8Data); // 实际项目中替换为GBK编码实现
+					} catch (error) {
+						console.log("错误：" + JSON.stringify(error));
+						reject(error);
+					}
+				});
+			},
+
+			// 发送数据通用方法
+			sendData(buffer) {
+				console.log("deviceId=" + this.connectedDeviceId);
+				console.log("serviceId=" + this.serviceId);
+				console.log("characteristicId=" + this.writeCharacteristicId);
+				return new Promise((resolve, reject) => {
+					uni.writeBLECharacteristicValue({
+						deviceId: this.connectedDeviceId,
+						serviceId: this.serviceId,
+						characteristicId: this.writeCharacteristicId,
+						value: buffer,
+						success: () => {
+							console.log("发送数据成功");
+							resolve();
+						},
+						fail: (err) => {
+							console.log("发送数据失败");
+							reject(`发送数据失败: ${err.errMsg}`);
+						}
+					});
+				});
+			},
+
+			// 添加日志
+			addLog(message) {
+				const time = new Date().toLocaleTimeString();
+				this.logList.unshift({
+					time,
+					message
+				});
+				console.log(message);
+				// 限制日志数量
+				if (this.logList.length > 20) {
+					this.logList.pop();
+				}
+			}
+		},
+		onUnload() {
+
+			this.closeBluetoothAdapter();
+		}
+	}
+</script>
+
+<style>
+	.container {
+		padding: 20rpx;
+		background-color: #f8f8f8;
+		min-height: 100vh;
+	}
+
+	.title {
+		font-size: 36rpx;
+		font-weight: bold;
+		text-align: center;
+		padding: 20rpx 0;
+		color: #333;
+	}
+
+	.status-bar {
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		padding: 15rpx 0;
+		border-bottom: 1rpx solid #eee;
+	}
+
+	.function-tabs {
+		display: flex;
+		margin: 20rpx 0;
+	}
+
+	.tab-btn {
+		flex: 1;
+		padding: 15rpx 0;
+		text-align: center;
+		font-size: 28rpx;
+		border-bottom: 2rpx solid #eee;
+	}
+
+	.tab-btn.active {
+		color: #409eff;
+		border-bottom: 2rpx solid #409eff;
+	}
+
+	/* 设备列表样式 */
+	.search-area {
+		padding: 20rpx 0;
+	}
+
+	.search-btn {
+		background-color: #409eff;
+		color: white;
+	}
+
+	.tips {
+		color: #999;
+		font-size: 24rpx;
+		margin-top: 10rpx;
+	}
+
+	.devices-list {
+		margin-top: 20rpx;
+	}
+
+	.device-item {
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		padding: 20rpx;
+		background-color: white;
+		border-radius: 10rpx;
+		margin-bottom: 15rpx;
+		box-shadow: 0 2rpx 10rpx rgba(0, 0, 0, 0.05);
+	}
+
+	.device-item.active {
+		background-color: #e8f3ff;
+		border-left: 6rpx solid #409eff;
+	}
+
+	.device-name {
+		font-size: 28rpx;
+		max-width: 500rpx;
+		white-space: nowrap;
+		overflow: hidden;
+		text-overflow: ellipsis;
+	}
+
+	.device-rssi {
+		color: #999;
+		font-size: 24rpx;
+	}
+
+	.device-status {
+		color: #409eff;
+		font-size: 24rpx;
+	}
+
+	/* 模式设置样式 */
+	.modes-area {
+		margin-top: 30rpx;
+	}
+
+	.mode-title {
+		font-size: 28rpx;
+		font-weight: bold;
+		margin-bottom: 20rpx;
+		color: #333;
+	}
+
+	.modes-grid {
+		display: flex;
+		flex-wrap: wrap;
+		justify-content: space-between;
+	}
+
+	.mode-item {
+		width: 30%;
+		padding: 20rpx 0;
+		background-color: white;
+		border-radius: 10rpx;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		box-shadow: 0 2rpx 10rpx rgba(0, 0, 0, 0.05);
+	}
+
+	.mode-item.selected {
+		background-color: #e8f3ff;
+		border: 2rpx solid #409eff;
+	}
+
+	.mode-icon {
+		font-size: 40rpx;
+		margin-bottom: 10rpx;
+	}
+
+	.mode-name {
+		font-size: 26rpx;
+	}
+
+	/* 亮度调节样式 */
+	.brightness-area {
+		margin-top: 30rpx;
+		padding: 20rpx;
+		background-color: white;
+		border-radius: 10rpx;
+		box-shadow: 0 2rpx 10rpx rgba(0, 0, 0, 0.05);
+	}
+
+	.brightness-title {
+		font-size: 28rpx;
+		font-weight: bold;
+		margin-bottom: 20rpx;
+		color: #333;
+	}
+
+	.brightness-value {
+		font-size: 36rpx;
+		text-align: center;
+		margin-bottom: 30rpx;
+		color: #409eff;
+	}
+
+	.brightness-slider {
+		width: 100%;
+	}
+
+	/* 开机画面样式 */
+	.splash-controls {
+		display: flex;
+		justify-content: center;
+		gap: 20rpx;
+		margin: 20rpx 0;
+	}
+
+	.splash-preview {
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+	}
+
+	.splash-frame {
+		height: 320rpx;
+		width: 640rpx;
+		border: 2rpx solid #409eff;
+		border-radius: 8rpx;
+		overflow: hidden;
+		position: relative;
+		background-color: #f0f0f0;
+	}
+
+	.empty-frame {
+		width: 100%;
+		height: 100%;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		color: #999;
+		font-size: 24rpx;
+	}
+
+	.frame-info {
+		margin-top: 15rpx;
+		color: #666;
+		font-size: 24rpx;
+	}
+
+	.sending-progress {
+		margin-top: 30rpx;
+		width: 100%;
+	}
+
+	.progress-bar {
+		height: 12rpx;
+		background-color: #e0e0e0;
+		border-radius: 6rpx;
+		overflow: hidden;
+	}
+
+	.progress-fill {
+		height: 100%;
+		background-color: #409eff;
+		transition: width 0.3s;
+	}
+
+	/* 文字设置样式 */
+	.text-inputs {
+		margin-top: 30rpx;
+		background-color: white;
+		border-radius: 10rpx;
+		box-shadow: 0 2rpx 10rpx rgba(0, 0, 0, 0.05);
+		padding: 20rpx;
+	}
+
+	.text-line {
+		display: flex;
+		align-items: center;
+		margin-bottom: 20rpx;
+	}
+
+	.text-line text {
+		width: 80rpx;
+		font-size: 26rpx;
+	}
+
+	.text-line input {
+		flex: 1;
+		height: 60rpx;
+		padding: 0 15rpx;
+		border: 1rpx solid #eee;
+		border-radius: 8rpx;
+		font-size: 26rpx;
+	}
+
+	.send-text-btn {
+		margin-top: 20rpx;
+		background-color: #409eff;
+		color: white;
+	}
+
+	/* 日志区域样式 */
+	.log-area {
+		margin-top: 30rpx;
+	}
+
+	.log-title {
+		font-size: 28rpx;
+		font-weight: bold;
+		margin-bottom: 15rpx;
+		color: #333;
+	}
+
+	.log-content {
+		height: 200rpx;
+		background-color: white;
+		border-radius: 10rpx;
+		padding: 15rpx;
+		font-size: 24rpx;
+		color: #666;
+	}
+
+	.log-item {
+		margin-bottom: 8rpx;
+	}
+
+	.btn {
+		padding: 10rpx 20rpx;
+		border-radius: 8rpx;
+		font-size: 26rpx;
+		text-align: center;
+	}
+
+	.btn[disabled] {
+		opacity: 0.5;
+	}
+
+	.txt {
+		border: 1px solid #000000;
+	}
+</style>
\ No newline at end of file
diff --git a/pages/BlueTooth/ModeSetting/VideoSend.vue b/pages/BlueTooth/ModeSetting/VideoSend.vue
new file mode 100644
index 0000000..3ea69bb
--- /dev/null
+++ b/pages/BlueTooth/ModeSetting/VideoSend.vue
@@ -0,0 +1,472 @@
+<template>
+	<view class="content">
+		<canvas canvas-id="flashCanvas"
+			style="width: 160px; height: 80px; z-index: 9999;position: fixed; top:-9999px;left:-9999px;"></canvas>
+
+		<f-video ref="compARef" :src="videoPath" :direction="-90" :autoplay="true" @shotVideoClick="shotVideoClick"
+			:videoWidth="videoWidth" :videoHeight="videoHeight"></f-video>
+
+
+		<view>
+			<text>发送间隔</text>
+			<input type="text" v-model="inteval" />
+		</view>
+		<view>
+			<button @click="checkVideo">选择视频</button>
+			<!-- <button @click="CutImg">发送</button> -->
+			<button @click="uploadVideo">发送</button>
+		</view>
+
+
+		<view class="sending-progress" v-if="isSending">
+			<view class="progress-bar">
+				<view class="progress-fill" :style="{ width: progress + '%' }"></view>
+			</view>
+			<text>正在发送: {{ progress }}% ({{ currentPacket }}/{{ totalPackets }})</text>
+		</view>
+
+	</view>
+</template>
+
+<script>
+import Common from '@/utils/Common';
+
+	export default {
+		data() {
+			return {
+				videoPath: '',
+				inteval: 0,
+				progress: 0,
+				currentPacket: 0,
+				totalPackets: 100,
+
+				connectedDeviceId: '',
+				serviceId: '0xFFE1',
+				writeCharacteristicId: '0xFFE1',
+				notifyCharacteristicId: '0xFFE2',
+				isSending: "",
+				textProgress: "",
+
+				imgs: [],
+				videoWidth: 320,
+				videoHeight: 160,
+				videoDuration: 2,
+
+				hexArray: []
+
+			}
+		},
+		onLoad() {
+			const eventChannel = this.getOpenerEventChannel();
+
+			eventChannel.on('receiveDevice', (data) => {
+				this.connectedDeviceId = data.connectedDeviceId;
+				this.serviceId = data.serviceId;
+				this.writeCharacteristicId = data.writeCharacteristicId;
+				this.notifyCharacteristicId = data.notifyCharacteristicId;
+			})
+		},
+		methods: {
+			checkVideo: function() {
+				uni.chooseVideo({
+					sourceType: ['album', 'camera'],
+					compressed: false,
+					maxDuration: 2,
+					camera: 'back',
+					success: (res) => {
+						this.videoPath = res.tempFilePath;
+
+						this.imgs = [];
+						this.hexArray = [];
+						this.$refs.compARef.base64 = [];
+						this.videoWidth = res.width;
+						this.videoHeight = res.height;
+						this.videoDuration = res.duration;
+						console.log("视频宽:" + res.width + ",视频高:" + res.height + ",视频时长:" + res.duration);
+					}
+				})
+			},
+
+			uploadVideo: function() {
+
+				if (this.hexArray.length > 0) {
+					console.log("开始处理,无需上传");
+					this.shotVideoClick(this.hexArray, 'rgb565');
+					return;
+
+				}
+				if(!this.videoPath){
+					uni.showToast({
+						title: "请选择视频",
+						icon: 'fail'
+					})
+					return;
+				}
+				
+				console.log("正在上传视频");
+				uni.showLoading({
+					title: "上传中"
+				});
+				
+				let p2=new Promise((resolve,reject)=>{
+					let start = new Date();
+					console.log("Common.baseURL="+Common.baseURL);
+					uni.uploadFile({
+						url:Common.baseURL+'video/upload',						
+						filePath: this.videoPath,
+						name: 'file',
+						header: {
+							"Method": "POST",
+							"Content-Type": "multipart/form-data"
+						},
+						timeout: 600000,
+						fail: (ex) => {
+							//console.log("上传视频失败" + JSON.stringify(ex));
+							uni.showToast({
+								title: "视频文件上传失败了,请检查网络连接",
+								icon: 'fail'
+							})
+							uni.hideLoading();
+							reject(ex);
+						},
+						success: (res) => {
+							let end = new Date();
+							var diff = (end.getTime() - start.getTime()) / 1000;
+							let s = diff % 60;
+							let m = (diff - s) / 60;
+							console.log("上传完成,耗时:" + m + "分" + s + "秒");
+							uni.hideLoading();
+							resolve(res);
+						}
+					
+					});
+				});
+				
+				let p1=this.HoldYouHand();
+				
+				Promise.all([p2,p1]).then((arr)=>{
+					
+					if(arr[1]===true){
+						let res=arr[0];
+						res = JSON.parse(res.data);
+											
+						if (res.data) {
+							this.hexArray = res.data;
+							uni.showLoading({
+								title: "正在发送"
+							});
+											
+							setTimeout(() => {
+								this.shotVideoClick(res.data, 'rgb565');
+							}, 0)
+											
+						} else {
+							console.log("res")
+							uni.showModal({
+								content: "服务器未返回RGB565数据",
+								title: '错误'
+							})
+						}
+					}else{
+						uni.showModal({
+							content:"与设备握手失败了",
+							title:"错误"
+						})
+					}
+					
+				});
+
+			},
+			
+			shotVideoClick: function(array, type) {
+				//console.log("处理视频完成", array);
+				//console.log("type=" + type)
+				//console.log("array=", array);
+				this.imgs = array;
+
+			
+
+				var sendImagePackets = (imageData) => {
+					return new Promise((resolve, reject) => {
+
+						this.isSending = true;
+						this.progress = 0;
+						this.currentPacket = 0;
+
+						// 总数据包数
+						const totalPackets = 1536;
+						this.totalPackets = totalPackets;
+						let currentPacket = 1;
+
+						// 发送单个数据包
+						const sendNextPacket = () => {
+							////console.log("currentPacket="+currentPacket+",imageData.length="+imageData.length);
+							if (currentPacket > totalPackets) {
+								this.isSending = false;
+								resolve();
+
+								return;
+							}
+
+							// 计算当前包的数据
+							let packetSize = 250;
+							if (type == 'rgb565') {
+								packetSize = 500;
+							}
+
+							// 创建数据包
+							const startIndex = (currentPacket - 1) * packetSize;
+							const endIndex = Math.min(startIndex + packetSize, imageData.length);
+							if (startIndex > endIndex) {
+								resolve();
+								return;
+							}
+							////console.log("111111");
+							const packetData = imageData.slice(startIndex, endIndex);
+
+							// 构建数据包
+							////console.log("packetData.length"+packetData.length);
+							const bufferSize = 506; // 头部5字节 + 数据部分
+							const buffer = new ArrayBuffer(bufferSize);
+							const dataView = new DataView(buffer);
+
+							let sortNo = currentPacket.toString(16).padStart(4, '0');
+
+							// 填充头部
+							dataView.setUint8(0, 0x55); // 帧头
+							dataView.setUint8(1, 0x04); // 帧类型：开机画面
+							dataView.setUint8(2, '0x' + sortNo.substring(0, 2)); // 包序号
+							dataView.setUint8(3, '0x' + sortNo.substring(2, 4)); // 包序号
+
+
+							dataView.setUint8(4, 0x01);
+							dataView.setUint8(5, 0xF4);
+
+
+							if (type == 'rgb565') {
+								for (let i = 0; i < packetData.length; i++) {
+									dataView.setUint8(6 + i, '0x' + packetData[i]);
+								}
+							} else {
+								for (let i = 0; i < packetData.length; i++) {
+									dataView.setUint16(6 + i * 2, packetData[i], false);
+								}
+							}
+
+
+							let inteval = parseInt(this.inteval ? this.inteval : 0);
+							this.sendData(buffer).then(() => {
+								// 更新进度
+								this.currentPacket = currentPacket;
+								this.progress = Math.round((currentPacket / totalPackets) *
+									100);
+								//console.log(`发送数据包完成 ${currentPacket}/${totalPackets}`);
+
+								// 发送下一个包（添加延迟避免蓝牙缓冲区溢出）
+								currentPacket++;
+
+
+								setTimeout(sendNextPacket, inteval);
+							}).catch(err => {
+
+								// console.log(err.errMsg + ",发送失败了,正在补偿：" + currentPacket);
+								setTimeout(sendNextPacket, inteval);
+								// uni.showToast({
+								// 	title:"发送失败"+JSON.stringify(err)
+								// })
+							});
+						};
+
+					
+					
+
+						sendNextPacket();
+
+					});
+				}
+
+
+				if (type == 'rgb565') {
+					let start = new Date();
+					console.log("开始发送");
+					sendImagePackets(array).then(() => {
+						console.log("发送完成");
+						let end = new Date();
+						var diff = (end.getTime() - start.getTime()) / 1000;
+						let s = diff % 60;
+						let m = (diff-s) / 60;
+						console.log("发送完成,耗时:" + m + "分" + s + "秒");
+						uni.showToast({
+							title: "发送完成,耗时:" + m + "分" + s + "秒",
+							icon: 'success'
+						})
+					}).catch((ex1) => {
+						//console.log("出现了异常", ex1)
+					}).finally(() => {
+						uni.hideLoading();
+					});
+
+					return;
+				}
+
+
+			},
+			HoldYouHand() {
+				
+				var promise=new Promise((resolve,reject)=>{
+					try{
+						let start=new Date();
+						var str = "video transmit start"; //握手的协议字符串
+						console.log("开始握手:"+str)
+						
+						// 1. 创建 ArrayBuffer 和 DataView
+						const buffer = new ArrayBuffer(str.length);
+						const dataView = new DataView(buffer);
+						
+						// 2. 将字符串转换为 ASCII 码并写入 DataView
+						for (let i = 0; i < str.length; i++) {
+							dataView.setUint8(i, str.charCodeAt(i));
+						}
+						//console.log("111111");
+						this.sendData(buffer).then(() => {
+							// 开始发送第一个包							
+							setTimeout(()=>{
+								
+								let end = new Date();
+								var diff = (end.getTime() - start.getTime()) / 1000;
+								let s = diff % 60;
+								let m = (diff - s) / 60;
+								
+								console.log("握手成功并完成2200ms等待,耗时"+m+"分"+s+"秒");
+								
+								resolve(true);							
+							}, 2200);
+						
+						}).catch(err => {
+							//console.log("握手没有成功");
+							reject(err);
+						});
+					}catch(ex){
+						reject(ex);
+					}
+					
+					
+				});
+				
+				return promise;
+			
+			},
+			sendData(buffer) {
+				////console.log("deviceId=" + this.connectedDeviceId);
+				////console.log("serviceId=" + this.serviceId);
+
+				return new Promise(async (resolve, reject) => {
+
+					// //console.log("开始发送数据，buffer");
+
+
+					var promise = new Promise((succ, err) => {
+						uni.writeBLECharacteristicValue({
+							deviceId: this.connectedDeviceId,
+							serviceId: this.serviceId,
+							characteristicId: this.writeCharacteristicId,
+							value: buffer,
+							writeType: plus.os.name == 'iOS' ? 'write' : 'writeNoResponse',
+							success: () => {
+								// //console.log("发送数据成功");
+								succ();
+							},
+							fail: (ex) => {
+								//console.log("发送数据失败", ex);
+								err(ex);
+							},
+							complete: function() {
+								// //console.log("123456");
+							}
+						});
+					});
+					if (plus.os.name == 'iOS') {
+
+						function timeout(ms) {
+							return new Promise((_, err) => {
+								setTimeout(() => {
+									err({
+										code: -1,
+										errMsg: '超时了'
+									})
+								}, ms);
+							});
+						}
+
+						let inteval = parseInt(this.inteval ? this.inteval : 0);
+
+						Promise.race([promise, timeout(inteval)]).then(resolve).catch((ex) => {
+							//console.log("ex=", ex);
+							if (ex.code == -1) {
+								resolve();
+							} else {
+								reject();
+							}
+
+						}).finally(() => {
+							//console.log("完成了")
+						});
+					} else {
+						promise.then(resolve).catch(reject);
+					}
+				});
+			},
+			CutImg: function() {
+				if (this.imgs.length == 30) {
+					this.shotVideoClick(this.imgs, 'img');
+					return;
+				}
+				//console.log("开始处理视频")
+				uni.showLoading({
+					title: '开始处理'
+				});
+				this.$refs.compARef.shotVideoClick(0);
+			}
+		}
+	}
+</script>
+
+<style>
+	.sending-progress {
+		margin-top: 30rpx;
+		width: 100%;
+	}
+
+	.progress-bar {
+		height: 12rpx;
+		background-color: #e0e0e0;
+		border-radius: 6rpx;
+		overflow: hidden;
+	}
+
+	.progress-fill {
+		height: 100%;
+		background-color: #409eff;
+		transition: width 0.3s;
+	}
+
+	input {
+		border: 2rpx solid #000000;
+	}
+
+	button {
+		height: 100rpx;
+		line-height: 100rpx;
+		font-size: 28rpx;
+		float: left;
+	}
+
+	.content {
+		width: 100vw;
+		height: 300px;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		justify-content: center;
+	}
+</style>
\ No newline at end of file
diff --git a/pages/BlueTooth/ModeSetting/VideoSend_1.vue b/pages/BlueTooth/ModeSetting/VideoSend_1.vue
new file mode 100644
index 0000000..1c1eadb
--- /dev/null
+++ b/pages/BlueTooth/ModeSetting/VideoSend_1.vue
@@ -0,0 +1,517 @@
+<template>
+	<view class="content">
+		<canvas canvas-id="flashCanvas"
+			style="width: 160px; height: 80px; z-index: 9999;position: fixed; top:-9999px;left:-9999px;"></canvas>
+
+		<f-video ref="compARef" :src="videoPath" :direction="-90" :autoplay="true" @shotVideoClick="shotVideoClick"
+			:videoWidth="videoWidth" :videoHeight="videoHeight"></f-video>
+
+		<view>
+			<text>并发包数量</text>
+			<input type="text" v-model="packgeCnt" />
+		</view>
+		<view>
+			<text>发送间隔</text>
+			<input type="text" v-model="inteval" />
+		</view>
+		<view>
+			<button @click="checkVideo">选择视频</button>
+			<!-- <button @click="CutImg">发送</button> -->
+			<button @click="uploadVideo">发送</button>
+		</view>
+
+
+		<view class="sending-progress" v-if="isSending">
+			<view class="progress-bar">
+				<view class="progress-fill" :style="{ width: progress + '%' }"></view>
+			</view>
+			<text>正在发送: {{ progress }}% ({{ currentPacket }}/{{ totalPackets }})</text>
+		</view>
+
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				videoPath: '',
+				packgeCnt: 20,
+				inteval: 0,
+				progress: 0,
+				currentPacket: 0,
+				totalPackets: 100,
+
+				connectedDeviceId: '',
+				serviceId: '0xFFE1',
+				writeCharacteristicId: '0xFFE1',
+				notifyCharacteristicId: '0xFFE2',
+				isSending: "",
+				textProgress: "",
+
+				imgs: [],
+				videoWidth: 320,
+				videoHeight: 160,
+				videoDuration: 2,
+
+				hexArray: []
+
+			}
+		},
+		onLoad() {
+			const eventChannel = this.getOpenerEventChannel();
+
+			eventChannel.on('receiveDevice', (data) => {
+				this.connectedDeviceId = data.connectedDeviceId;
+				this.serviceId = data.serviceId;
+				this.writeCharacteristicId = data.writeCharacteristicId;
+				this.notifyCharacteristicId = data.notifyCharacteristicId;
+			})
+		},
+		methods: {
+			checkVideo: function() {
+				uni.chooseVideo({
+					sourceType: ['album', 'camera'],
+					compressed: false,
+					maxDuration: 2,
+					camera: 'back',
+					success: (res) => {
+						this.videoPath = res.tempFilePath;
+
+						this.imgs = [];
+						this.hexArray = [];
+						this.$refs.compARef.base64 = [];
+						this.videoWidth = res.width;
+						this.videoHeight = res.height;
+						this.videoDuration = res.duration;
+						console.log("视频宽:" + res.width + ",视频高:" + res.height + ",视频时长:" + res.duration);
+					}
+				})
+			},
+
+			uploadVideo: function() {
+
+				if (this.hexArray.length > 0) {
+					console.log("开始处理,无需上传");
+					this.shotVideoClick(this.hexArray, 'rgb565');
+					return;
+
+				}
+				if(!this.videoPath){
+					uni.showToast({
+						title: "请选择视频",
+						icon: 'fail'
+					})
+					return;
+				}
+				
+				console.log("正在上传视频");
+				uni.showLoading({
+					title: "上传中"
+				});
+				
+				let p2=new Promise((resolve,reject)=>{
+					console.log("Common.baseURL="+Common.baseURL);
+					let start = new Date();
+					uni.uploadFile({
+						url: Common.baseURL+'video/upload',
+						// url: 'http://192.168.110.169:5000/video/upload',
+						filePath: this.videoPath,
+						name: 'file',
+						header: {
+							"Method": "POST",
+							"Content-Type": "multipart/form-data"
+						},
+						timeout: 600000,
+						fail: (ex) => {
+							//console.log("上传视频失败" + JSON.stringify(ex));
+							uni.showToast({
+								title: "视频文件上传失败了,请检查网络连接",
+								icon: 'fail'
+							})
+							uni.hideLoading();
+							reject(ex);
+						},
+						success: (res) => {
+							let end = new Date();
+							var diff = (end.getTime() - start.getTime()) / 1000;
+							let s = diff % 60;
+							let m = (diff - s) / 60;
+							console.log("上传完成,耗时:" + m + "分" + s + "秒");
+							uni.hideLoading();
+							resolve(res);
+						}
+					
+					});
+				});
+				
+				let p1=this.HoldYouHand();
+				
+				Promise.all([p2,p1]).then((arr)=>{
+					if(arr[1]===true){
+						let res=arr[0];
+						res = JSON.parse(res.data);
+											
+						if (res.data) {
+							this.hexArray = res.data;
+							uni.showLoading({
+								title: "正在发送"
+							});
+											
+							setTimeout(() => {
+								this.shotVideoClick(res.data, 'rgb565');
+							}, 0)
+											
+						} else {
+							console.log("res")
+							uni.showModal({
+								content: "服务器未返回RGB565数据",
+								title: '错误'
+							})
+						}
+					}else{
+						uni.showModal({
+							content:"与设备握手失败了",
+							title:"错误"
+						})
+					}
+					
+				});
+
+			},
+			pause(e) {
+				////console.log('pause--------------------------', e);
+			},
+			shotVideoClick: function(array, type) {
+				//console.log("处理视频完成", array);
+				//console.log("type=" + type)
+				//console.log("array=", array);
+				this.imgs = array;
+
+
+
+				var sendImagePackets = (imageData) => {
+					return new Promise((resolve, reject) => {
+
+						this.isSending = true;
+						this.progress = 0;
+						this.currentPacket = 0;
+
+						// 总数据包数
+						const totalPackets = 1536;
+						this.totalPackets = totalPackets;
+						let currentPacket = 1;
+						let promises = [];
+						// 发送单个数据包
+						const sendNextPacket = () => {
+							////console.log("currentPacket="+currentPacket+",imageData.length="+imageData.length);
+							if (currentPacket > totalPackets) {
+								this.isSending = false;
+								resolve();
+
+								return;
+							}
+
+							// 计算当前包的数据
+							let packetSize = 250;
+							if (type == 'rgb565') {
+								packetSize = 500;
+							}
+
+							// 创建数据包
+							const startIndex = (currentPacket - 1) * packetSize;
+							const endIndex = Math.min(startIndex + packetSize, imageData.length);
+							if (startIndex > endIndex) {
+								resolve();
+								return;
+							}
+							////console.log("111111");
+							const packetData = imageData.slice(startIndex, endIndex);
+
+							// 构建数据包
+							////console.log("packetData.length"+packetData.length);
+							const bufferSize = 506; // 头部5字节 + 数据部分
+							const buffer = new ArrayBuffer(bufferSize);
+							const dataView = new DataView(buffer);
+
+							let sortNo = currentPacket.toString(16).padStart(4, '0');
+
+							// 填充头部
+							dataView.setUint8(0, 0x55); // 帧头
+							dataView.setUint8(1, 0x04); // 帧类型：开机画面
+							dataView.setUint8(2, '0x' + sortNo.substring(0, 2)); // 包序号
+							dataView.setUint8(3, '0x' + sortNo.substring(2, 4)); // 包序号
+
+
+							dataView.setUint8(4, 0x01);
+							dataView.setUint8(5, 0xF4);
+
+
+							if (type == 'rgb565') {
+								for (let i = 0; i < packetData.length; i++) {
+									dataView.setUint8(6 + i, '0x' + packetData[i]);
+								}
+							} else {
+								for (let i = 0; i < packetData.length; i++) {
+									dataView.setUint16(6 + i * 2, packetData[i], false);
+								}
+							}
+
+
+							let inteval = parseInt(this.inteval ? this.inteval : 0);
+							let promise = this.sendData(buffer);
+							promises.push(promise);
+							let packgeCnt = parseInt(this.packgeCnt || 20);
+							if (currentPacket % packgeCnt == 0 || (currentPacket >= totalPackets &&
+									promises.length > 0)) {
+								Promise.all(promises).then(() => {
+									if (currentPacket >= totalPackets) {
+										this.isSending = false;
+										resolve();
+										return;
+
+									}
+
+									this.currentPacket = currentPacket;
+									this.progress = Math.round((currentPacket / totalPackets) *
+										100);
+									currentPacket++;
+									setTimeout(sendNextPacket, inteval);
+								})
+							} else {
+								currentPacket++;
+								sendNextPacket();
+							}
+							// .then(() => {
+							// 	// 更新进度
+							// 	this.currentPacket = currentPacket;
+							// 	this.progress = Math.round((currentPacket / totalPackets) *
+							// 		100);
+
+							// 	currentPacket++;
+
+
+							// 	setTimeout(sendNextPacket, inteval);
+							// }).catch(err => {
+
+							// 	console.log(err.errMsg+",发送失败了,正在补偿：" + currentPacket);
+							// 	setTimeout(sendNextPacket, inteval);
+
+							// });
+						};
+
+						//
+						
+
+							sendNextPacket();
+
+					});
+				}
+
+
+				if (type == 'rgb565') {
+					let start = new Date();
+					console.log("开始发送");
+					sendImagePackets(array).then(() => {
+
+						let end = new Date();
+
+						var diff = (end.getTime() - start.getTime()) / 1000;
+						let s = diff % 60;
+						let m = (diff - s) / 60;
+						console.log("发送完成,耗时:" + m + "分" + s + "秒");
+						uni.showToast({
+							title: "发送完成,耗时:" + m + "分" + s + "秒",
+							icon: 'success',
+
+						})
+					}).catch((ex1) => {
+						//console.log("出现了异常", ex1)
+					}).finally(() => {
+						uni.hideLoading();
+					});
+
+					return;
+				}
+
+
+			},
+			HoldYouHand() {
+				
+				var promise=new Promise((resolve,reject)=>{
+					try{
+						let start=new Date();
+						var str = "video transmit start"; //握手的协议字符串
+						console.log("开始握手:"+str)
+						
+						// 1. 创建 ArrayBuffer 和 DataView
+						const buffer = new ArrayBuffer(str.length);
+						const dataView = new DataView(buffer);
+						
+						// 2. 将字符串转换为 ASCII 码并写入 DataView
+						for (let i = 0; i < str.length; i++) {
+							dataView.setUint8(i, str.charCodeAt(i));
+						}
+						//console.log("111111");
+						this.sendData(buffer).then(() => {
+							// 开始发送第一个包							
+							setTimeout(()=>{
+								
+								let end = new Date();
+								var diff = (end.getTime() - start.getTime()) / 1000;
+								let s = diff % 60;
+								let m = (diff - s) / 60;
+								
+								console.log("握手成功并完成2200ms等待,耗时"+m+"分"+s+"秒");
+								
+								resolve(true);							
+							}, 2200);
+						
+						}).catch(err => {
+							//console.log("握手没有成功");
+							reject(err);
+						});
+					}catch(ex){
+						reject(ex);
+					}
+					
+					
+				});
+				
+				return promise;
+
+			},
+			sendData(buffer) {
+				let sendBuffer = () => {
+					return new Promise((resolve, reject) => {
+
+						var promise = new Promise((succ, err) => {
+							uni.writeBLECharacteristicValue({
+								deviceId: this.connectedDeviceId,
+								serviceId: this.serviceId,
+								characteristicId: this.writeCharacteristicId,
+								value: buffer,
+								writeType: plus.os.name == 'iOS' ? 'write' : 'writeNoResponse',
+								success: () => {
+									// console.log("发送数据成功");
+									succ();
+								},
+								fail: (ex) => {
+									if (ex.code == '10007') {
+										// console.log("失败重试");
+										setTimeout(() => {
+											sendBuffer().then(succ).catch(err);
+										}, this.inteval || 0)
+										// succ()
+
+									} else
+
+									{
+										// console.log("发送数据失败",ex);
+										err(ex);
+									}
+								},
+								complete: function() {
+									//console.log("123456");
+								}
+							});
+						});
+						if (plus.os.name == 'iOS') {
+
+							function timeout(ms) {
+								return new Promise((_, err) => {
+									setTimeout(() => {
+										err({
+											code: -1,
+											errMsg: '超时了'
+										})
+									}, ms);
+								});
+							}
+
+							Promise.race([promise, timeout(this.inteval ? this.inteval : 0)]).then(() => {
+									// console.log("成功了");
+									resolve();
+								})
+								.catch((ex) => {
+
+									if (ex.code == -1) {
+										// console.log("超时了")
+										resolve();
+									} else {
+										reject(ex);
+										// console.log("异常了", ex);
+										//sendBuffer().then(resolve).catch(reject);
+									}
+
+								});
+						} else {
+
+							promise.then(() => {
+								//console.log("then........")
+								resolve();
+							}).catch(() => {
+								//console.log("catch.........")
+								reject()
+							});
+						}
+					});
+
+				}
+
+				return sendBuffer();
+			},
+			CutImg: function() {
+				if (this.imgs.length == 30) {
+					this.shotVideoClick(this.imgs, 'img');
+					return;
+				}
+				//console.log("开始处理视频")
+				uni.showLoading({
+					title: '开始处理'
+				});
+				this.$refs.compARef.shotVideoClick(0);
+			}
+		}
+	}
+</script>
+
+<style>
+	.sending-progress {
+		margin-top: 30rpx;
+		width: 100%;
+	}
+
+	.progress-bar {
+		height: 12rpx;
+		background-color: #e0e0e0;
+		border-radius: 6rpx;
+		overflow: hidden;
+	}
+
+	.progress-fill {
+		height: 100%;
+		background-color: #409eff;
+		transition: width 0.3s;
+	}
+
+	input {
+		border: 2rpx solid #000000;
+	}
+
+	button {
+		height: 100rpx;
+		line-height: 100rpx;
+		font-size: 28rpx;
+		float: left;
+	}
+
+	.content {
+		width: 100vw;
+		height: 300px;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		justify-content: center;
+	}
+</style>
\ No newline at end of file
diff --git a/pages/BlueTooth/ModeSetting/VideoSend_670.vue b/pages/BlueTooth/ModeSetting/VideoSend_670.vue
new file mode 100644
index 0000000..1e8bc89
--- /dev/null
+++ b/pages/BlueTooth/ModeSetting/VideoSend_670.vue
@@ -0,0 +1,537 @@
+<template>
+	<view class="content">
+		<canvas canvas-id="flashCanvas"
+			style="width: 160px; height: 80px; z-index: 9999;position: fixed; top:-9999px;left:-9999px;"></canvas>
+
+		<view>
+			<view>
+			选择的视频:{{videoPath}}</view>
+			</view>
+			<view>
+				重发包序号:{{reSendNumber}}
+			</view>
+		<view>
+			<text>发送间隔</text>
+			<input type="text" v-model="inteval" />
+		</view>
+		<view>
+			<button @click="checkVideo">选择视频</button>
+			
+			<button @click="uploadVideo">发送</button>
+		</view>
+
+
+		<view class="sending-progress" v-if="isSending">
+			<view class="progress-bar">
+				<view class="progress-fill" :style="{ width: progress + '%' }"></view>
+			</view>
+			<text>正在发送: {{ progress }}% ({{ currentPacket }}/{{ totalPackets }})</text>
+		</view>
+
+	</view>
+</template>
+
+<script>
+import Common from '../../../utils/Common';
+var mqttClient=null;
+	export default {
+		data() {
+			return {
+				videoPath: '',
+				inteval: 0,
+				progress: 0,
+				currentPacket: 0,
+				totalPackets: 100,
+
+				connectedDeviceId: '',
+				serviceId: '0xFFE1',
+				writeCharacteristicId: '0xFFE1',
+				notifyCharacteristicId: '0xFFE2',
+				isSending: "",
+				textProgress: "",
+				netMode:"ble",
+				IMEI:"",
+				
+				
+				imgs: [],
+				videoWidth: 320,
+				videoHeight: 160,
+				videoDuration: 2,
+
+				hexArray: [],
+				reSendNumber:""
+			}
+		},
+		onLoad() {
+			const eventChannel = this.getOpenerEventChannel();
+
+			eventChannel.on('receiveDevice', (data) => {
+				this.connectedDeviceId = data.connectedDeviceId;
+				this.serviceId = data.serviceId;
+				this.writeCharacteristicId = data.writeCharacteristicId;
+				this.notifyCharacteristicId = data.notifyCharacteristicId;
+				this.netMode=data.netMode;
+				mqttClient=data.mqttClient;
+				this.IMEI=data.IMEI;
+			});
+			
+			eventChannel.on('ReSendVideo',(data)=>{
+				//重新发送某一包
+				this.reSendNumber=data.videoNo;
+				setTimeout(()=>{
+					  this.shotVideoClick(this.hexArray,'rgb565',data.videoNo);
+				},0);
+			
+			  
+			});
+		},
+		methods: {
+			checkVideo: function() {
+				uni.chooseVideo({
+					sourceType: ['album', 'camera'],
+					compressed: false,
+					maxDuration: 2,
+					camera: 'back',
+					success: (res) => {
+						this.videoPath = res.tempFilePath;
+
+						this.imgs = [];
+						this.hexArray = [];
+						
+						this.videoWidth = res.width;
+						this.videoHeight = res.height;
+						this.videoDuration = res.duration;
+						console.log("视频宽:" + res.width + ",视频高:" + res.height + ",视频时长:" + res.duration);
+					}
+				})
+			},
+
+			uploadVideo: function() {
+
+				if (this.hexArray.length > 0) {
+					console.log("开始处理,无需上传");
+					this.shotVideoClick(this.hexArray, 'rgb565');
+					return;
+
+				}
+				if(!this.videoPath){
+					uni.showToast({
+						title: "请选择视频",
+						icon: 'fail'
+					})
+					return;
+				}
+				
+				console.log("正在上传视频");
+				uni.showLoading({
+					title: "上传中"
+				});
+				
+				let p2=new Promise((resolve,reject)=>{
+					let start = new Date();
+					console.log("Common.baseURL="+Common.baseURL);
+					uni.uploadFile({
+						url:Common.baseURL+'video/upload',						
+						filePath: this.videoPath,
+						name: 'file',
+						header: {
+							"Method": "POST",
+							"Content-Type": "multipart/form-data"
+						},
+						timeout: 600000,
+						fail: (ex) => {
+							//console.log("上传视频失败" + JSON.stringify(ex));
+							uni.showToast({
+								title: "视频文件上传失败了,请检查网络连接",
+								icon: 'fail'
+							})
+							uni.hideLoading();
+							reject(ex);
+						},
+						success: (res) => {
+							let end = new Date();
+							var diff = (end.getTime() - start.getTime()) / 1000;
+							let s = diff % 60;
+							let m = (diff - s) / 60;
+							console.log("上传完成,耗时:" + m + "分" + s + "秒");
+							uni.hideLoading();
+							resolve(res);
+						}
+					
+					});
+				});
+				
+				let p1=this.HoldYouHand();
+				
+				Promise.all([p2,p1]).then((arr)=>{
+					
+					if(arr[1]===true){
+						let res=arr[0];
+						res = JSON.parse(res.data);
+											
+						if (res.data) {
+							this.hexArray = res.data;
+							uni.showLoading({
+								title: "正在发送"
+							});
+											
+							setTimeout(() => {
+								this.shotVideoClick(res.data, 'rgb565');
+							}, 0)
+											
+						} else {
+							console.log("res")
+							uni.showModal({
+								content: "服务器未返回RGB565数据",
+								title: '错误'
+							})
+						}
+					}else{
+						uni.showModal({
+							content:"与设备握手失败了",
+							title:"错误"
+						})
+					}
+					
+				});
+
+			},
+			
+			shotVideoClick: function(array, type,ReSendNo) {
+				//console.log("处理视频完成", array);
+				//console.log("type=" + type)
+				//console.log("array=", array);
+				this.imgs = array;
+
+			
+
+				var sendImagePackets = (imageData) => {
+					return new Promise((resolve, reject) => {
+
+						this.isSending = true;
+						this.progress = 0;
+						this.currentPacket = 0;
+
+						// 总数据包数
+						var totalPackets = 1536;
+						this.totalPackets = totalPackets;
+						let currentPacket = 1;
+						if(ReSendNo){
+							this.progress = ReSendNo-1;
+							this.currentPacket = ReSendNo-1;
+							currentPacket=ReSendNo;
+							totalPackets=ReSendNo;
+							this.totalPackets=ReSendNo;
+						}
+						// 发送单个数据包
+						const sendNextPacket = () => {
+							////console.log("currentPacket="+currentPacket+",imageData.length="+imageData.length);
+							if (currentPacket > totalPackets) {
+								this.isSending = false;
+								if(!ReSendNo){
+								this.bleSendComplete();	
+								}else{
+							// this.reSendNumber="";
+						}
+								
+								resolve();
+								
+								return;
+							}
+
+							// 计算当前包的数据
+							let packetSize = 250;
+							if (type == 'rgb565') {
+								packetSize = 500;
+							}
+
+							// 创建数据包
+							const startIndex = (currentPacket - 1) * packetSize;
+							const endIndex = Math.min(startIndex + packetSize, imageData.length);
+							if (startIndex > endIndex) {
+								resolve();
+								return;
+							}
+							////console.log("111111");
+							const packetData = imageData.slice(startIndex, endIndex);
+
+							// 构建数据包
+							////console.log("packetData.length"+packetData.length);
+							const bufferSize = 506; // 头部5字节 + 数据部分
+							const buffer = new ArrayBuffer(bufferSize);
+							const dataView = new DataView(buffer);
+
+							let sortNo = currentPacket.toString(16).padStart(4, '0');
+
+							// 填充头部
+							dataView.setUint8(0, 0x55); // 帧头
+							dataView.setUint8(1, 0x04); // 帧类型：开机画面
+							dataView.setUint8(2, '0x' + sortNo.substring(0, 2)); // 包序号
+							dataView.setUint8(3, '0x' + sortNo.substring(2, 4)); // 包序号
+
+
+							dataView.setUint8(4, 0x01);
+							dataView.setUint8(5, 0xF4);
+
+
+							if (type == 'rgb565') {
+								for (let i = 0; i < packetData.length; i++) {
+									dataView.setUint8(6 + i, '0x' + packetData[i]);
+								}
+							} else {
+								for (let i = 0; i < packetData.length; i++) {
+									dataView.setUint16(6 + i * 2, packetData[i], false);
+								}
+							}
+
+
+							let inteval = parseInt(this.inteval ? this.inteval : 0);
+							this.sendData(buffer).then(() => {
+								// 更新进度
+								this.currentPacket = currentPacket;
+								this.progress = Math.round((currentPacket / totalPackets) *
+									100);
+								console.log(`发送数据包完成 ${currentPacket}/${totalPackets}`);
+
+								// 发送下一个包（添加延迟避免蓝牙缓冲区溢出）
+								currentPacket++;
+
+
+								setTimeout(sendNextPacket, inteval);
+							}).catch(err => {
+
+								console.log(err.errMsg + ",发送失败了,正在补偿：" + currentPacket);
+								setTimeout(sendNextPacket, inteval);
+								// uni.showToast({
+								// 	title:"发送失败"+JSON.stringify(err)
+								// })
+							});
+						};
+
+					
+					
+
+						sendNextPacket();
+
+					});
+				}
+
+
+				if (type == 'rgb565') {
+					let start = new Date();
+					console.log("开始发送");
+					sendImagePackets(array).then(() => {
+						console.log("发送完成");
+						let end = new Date();
+						var diff = (end.getTime() - start.getTime()) / 1000;
+						let s = diff % 60;
+						let m = (diff-s) / 60;
+						console.log("发送完成,耗时:" + m + "分" + s + "秒");
+						uni.showModal({
+							content: "发送完成,耗时:" + m + "分" + s + "秒",
+							title: 'success'
+						});
+						
+					}).catch((ex1) => {
+						console.log("出现了异常", ex1)
+					}).finally(() => {
+						uni.hideLoading();
+					});
+
+					return;
+				}
+
+
+			},
+			HoldYouHand() {
+				
+				var promise=new Promise((resolve,reject)=>{
+					try{
+						let start=new Date();
+						var str = "video transmit start"; //握手的协议字符串
+						console.log("开始握手:"+str)
+						
+						// 1. 创建 ArrayBuffer 和 DataView
+						const buffer = new ArrayBuffer(str.length);
+						const dataView = new DataView(buffer);
+						
+						// 2. 将字符串转换为 ASCII 码并写入 DataView
+						for (let i = 0; i < str.length; i++) {
+							dataView.setUint8(i, str.charCodeAt(i));
+						}
+						//console.log("111111");
+						this.sendData(buffer).then(() => {
+							// 开始发送第一个包							
+							setTimeout(()=>{
+								
+								let end = new Date();
+								var diff = (end.getTime() - start.getTime()) / 1000;
+								let s = diff % 60;
+								let m = (diff - s) / 60;
+								
+								console.log("握手成功并完成2200ms等待,耗时"+m+"分"+s+"秒");
+								
+								resolve(true);							
+							}, 2200);
+						
+						}).catch(err => {
+							//console.log("握手没有成功");
+							reject(err);
+						});
+					}catch(ex){
+						reject(ex);
+					}
+					
+					
+				});
+				
+				return promise;
+			
+			},
+			bleSendComplete() {
+				var str = "transmit complete"; //握手的协议字符串
+				let buffer = new ArrayBuffer(str.length);
+				let dataView = new DataView(buffer);
+				for (let i = 0; i < str.length; i++) {
+					dataView.setUint8(i, str.charCodeAt(i));
+				}
+				setTimeout(()=>{
+					this.sendData(buffer).then(() => {
+						console.log("完成指令发送成功");
+					}).catch(err => {
+						console.log("完成指令发送失败");
+					});
+				},1500)
+				
+			},
+			sendData(buffer) {
+				if(this.netMode=='ble'){
+					return this.sendBle(buffer);
+					
+				}
+				
+				return this.sendMQ(buffer);
+			},
+			sendBle(buffer){
+				return new Promise(async (resolve, reject) => {
+				
+					// //console.log("开始发送数据，buffer");
+				
+				
+					var promise = new Promise((succ, err) => {
+						uni.writeBLECharacteristicValue({
+							deviceId: this.connectedDeviceId,
+							serviceId: this.serviceId,
+							characteristicId: this.writeCharacteristicId,
+							value: buffer,
+							writeType: plus.os.name == 'iOS' ? 'write' : 'writeNoResponse',
+							success: () => {
+								// //console.log("发送数据成功");
+								succ();
+							},
+							fail: (ex) => {
+								//console.log("发送数据失败", ex);
+								err(ex);
+							},
+							complete: function() {
+								// //console.log("123456");
+							}
+						});
+					});
+					if (plus.os.name == 'iOS') {
+				
+						function timeout(ms) {
+							return new Promise((_, err) => {
+								setTimeout(() => {
+									err({
+										code: -1,
+										errMsg: '超时了'
+									})
+								}, ms);
+							});
+						}
+				
+						let inteval = parseInt(this.inteval ? this.inteval : 0);
+				
+						Promise.race([promise, timeout(inteval)]).then(resolve).catch((ex) => {
+							//console.log("ex=", ex);
+							if (ex.code == -1) {
+								resolve();
+							} else {
+								reject();
+							}
+				
+						}).finally(() => {
+							//console.log("完成了")
+						});
+					} else {
+						promise.then(resolve).catch(reject);
+					}
+				});
+			},
+			sendMQ(message) {
+				
+				const topic = `B/${this.IMEI}`;
+				return new Promise((resolve, reject) => {
+					if(!mqttClient){
+						reject("MQTT未连接");
+						return;
+					}
+					try {
+						let flag=mqttClient.publish(topic, message, {
+							qos: 1
+						});
+						if(flag){
+							resolve();
+							return;
+						}
+						reject("MQTT未连接，无法发布消息");
+					} catch (error) {
+						reject(error);
+					}
+				});
+			}
+			
+		}
+	}
+</script>
+
+<style>
+	.sending-progress {
+		margin-top: 30rpx;
+		width: 100%;
+	}
+
+	.progress-bar {
+		height: 12rpx;
+		background-color: #e0e0e0;
+		border-radius: 6rpx;
+		overflow: hidden;
+	}
+
+	.progress-fill {
+		height: 100%;
+		background-color: #409eff;
+		transition: width 0.3s;
+	}
+
+	input {
+		border: 2rpx solid #000000;
+	}
+
+	button {
+		height: 100rpx;
+		line-height: 100rpx;
+		font-size: 28rpx;
+		float: left;
+	}
+
+	.content {
+		width: 100vw;
+		height: 300px;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		justify-content: center;
+	}
+</style>
\ No newline at end of file
diff --git a/pages/BlueTooth/ModeSetting/index.vue b/pages/BlueTooth/ModeSetting/index.vue
new file mode 100644
index 0000000..d0edfba
--- /dev/null
+++ b/pages/BlueTooth/ModeSetting/index.vue
@@ -0,0 +1,115 @@
+<template>
+	<view class="container">
+		<view class="grid">
+			<view class="cell" @click="goToDetail(item.name)" v-for="item,index in options">{{item.url}}</view>
+
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				options: [{
+						name: '/pages/BlueTooth/ModeSetting/ModeSetting',
+						url: '7307'
+					},
+					{
+						name: '/pages/BlueTooth/ModeSetting/HBY650',
+						url: 'HBY650'
+					},
+					{
+						name: '/pages/BlueTooth/ModeSetting/HBY650_1',
+						url: 'HBY650_V1'
+					},
+
+					{
+						name: '/pages/BlueTooth/ModeSetting/HBY6155',
+						url: '6155'
+					},
+					{
+						name: '/pages/BlueTooth/ModeSetting/HBY6155V1',
+						url: '6155_V1'
+					},
+					{
+						name: "/pages/BlueTooth/ModeSetting/HBY670V1",
+						url: 'HBY670'
+					},
+					
+					{
+						name: '/pages/MapTest/MapTest',
+						url: '地图测试'
+					},
+					{
+						name: '',
+						url: '更多'
+					}
+
+				]
+
+			}
+		},
+		onShow: () => {
+
+		},
+		methods: {
+			goToDetail: function(url) {
+				console.log("url=" + url)
+				let qd = () => {
+					uni.showToast({
+						title: '敬请期待',
+						duration: 2000,
+						icon: "none"
+					});
+
+				};
+				if (url) {
+					uni.navigateTo({
+						url: url,
+						success: () => {
+
+						},
+						fail: () => {
+							qd();
+						}
+					});
+				} else {
+					qd();
+				}
+
+
+
+			}
+		}
+	}
+</script>
+
+<style>
+	.container {
+		padding: 15px;
+		background-color: #f5f5f5;
+		min-height: 100vh;
+	}
+
+	.grid {
+		display: flex;
+		align-content: space-around;
+		align-items: stretch;
+		justify-items: center;
+		flex-direction: row;
+		flex-wrap: wrap;
+		justify-content: flex-start;
+	}
+
+	.cell {
+		padding: 0rpx 20rpx;
+		border: 2rpx solid rgba(0, 0, 0, 0.3);
+		border-radius: 15rpx;
+		font-size: 28rpx;
+		height: 70rpx;
+		line-height: 70rpx;
+		margin-left: 30rpx;
+		margin-top: 20rpx;
+	}
+</style>
\ No newline at end of file
diff --git a/pages/BlueTooth/ModeSetting/update.vue b/pages/BlueTooth/ModeSetting/update.vue
new file mode 100644
index 0000000..e814728
--- /dev/null
+++ b/pages/BlueTooth/ModeSetting/update.vue
@@ -0,0 +1,273 @@
+<template>
+  <view class="update-container">
+    <!-- 进度条 -->
+    <view v-if="showProgress" class="progress-container">
+      <view class="progress-title">正在更新 {{ progress }}%</view>
+      <view class="progress-bar">
+        <view class="progress" :style="{ width: progress + '%' }"></view>
+      </view>
+    </view>
+    
+    <!-- 更新提示弹窗 -->
+    <view v-if="showUpdateDialog" class="dialog-mask">
+      <view class="dialog">
+        <view class="dialog-title">发现新版本 v{{ newVersion }}</view>
+        <view class="dialog-content">{{ updateInfo.desc || '有新的功能和优化，建议立即更新' }}</view>
+        <view class="dialog-buttons">
+          <button v-if="!updateInfo.force" class="cancel-btn" @click="showUpdateDialog = false">稍后更新</button>
+          <button class="confirm-btn" @click="startUpdate">立即更新</button>
+        </view>
+      </view>
+    </view>
+  </view>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+      // 当前版本
+      currentVersion: '',
+      // 最新版本
+      newVersion: '',
+      // 更新信息
+      updateInfo: {},
+      // 是否显示更新弹窗
+      showUpdateDialog: false,
+      // 是否显示进度条
+      showProgress: false,
+      // 更新进度
+      progress: 0
+    };
+  },
+  
+  onLoad() {
+    // 初始化时检查版本
+    this.checkVersion();
+  },
+  
+  methods: {
+    /**
+     * 检查当前版本
+     */
+    async checkVersion() {
+      try {
+        // 获取当前应用版本
+        const versionInfo = plus.runtime.version;
+        this.currentVersion = versionInfo;
+        console.log('当前版本:', this.currentVersion);
+        
+        // 调用后端接口检查最新版本
+        // 这里替换为你的后端接口地址
+        const res = await this.$http.get('/api/checkVersion', {
+          platform: uni.getSystemInfoSync().platform,
+          version: this.currentVersion
+        });
+        
+        if (res.code === 0 && res.data.hasUpdate) {
+          this.newVersion = res.data.version;
+          this.updateInfo = res.data;
+          // 显示更新提示
+          this.showUpdateDialog = true;
+        } else {
+          console.log('当前已是最新版本');
+        }
+      } catch (error) {
+        console.error('版本检查失败:', error);
+      }
+    },
+    
+    /**
+     * 开始更新
+     */
+    startUpdate() {
+      if (!this.updateInfo.downloadUrl) {
+        uni.showToast({
+          title: '更新地址不存在',
+          icon: 'none'
+        });
+        return;
+      }
+      
+      this.showUpdateDialog = false;
+      this.showProgress = true;
+      this.downloadWgt(this.updateInfo.downloadUrl);
+    },
+    
+    /**
+     * 下载wgt包
+     */
+    downloadWgt(url) {
+      const downloadTask = uni.downloadFile({
+        url: url,
+        success: (downloadResult) => {
+          if (downloadResult.statusCode === 200) {
+            // 下载成功，安装wgt包
+            this.installWgt(downloadResult.tempFilePath);
+          } else {
+            this.showProgress = false;
+            uni.showToast({
+              title: '下载失败',
+              icon: 'none'
+            });
+          }
+        },
+        fail: (err) => {
+          this.showProgress = false;
+          console.error('下载失败:', err);
+          uni.showToast({
+            title: '下载失败，请稍后重试',
+            icon: 'none'
+          });
+        }
+      });
+      
+      // 监听下载进度
+      downloadTask.onProgressUpdate((res) => {
+        this.progress = res.progress;
+      });
+    },
+    
+    /**
+     * 安装wgt包
+     */
+    installWgt(path) {
+      plus.runtime.install(
+        path,
+        {
+          force: false // 是否强制安装
+        },
+        () => {
+          console.log('安装成功');
+          this.showProgress = false;
+          
+          // 安装成功后提示重启
+          uni.showModal({
+            title: '更新完成',
+            content: '应用已更新，是否立即重启？',
+            showCancel: !this.updateInfo.force,
+            success: (res) => {
+              if (res.confirm) {
+                // 重启应用
+                plus.runtime.restart();
+              }
+            }
+          });
+        },
+        (err) => {
+          console.error('安装失败:', err);
+          this.showProgress = false;
+          uni.showToast({
+            title: '更新失败: ' + err.message,
+            icon: 'none',
+            duration: 3000
+          });
+        }
+      );
+    }
+  }
+};
+</script>
+
+<style scoped>
+.update-container {
+  position: fixed;
+  top: 0;
+  left: 0;
+  width: 100%;
+  height: 100%;
+  pointer-events: none;
+  z-index: 9999;
+}
+
+/* 进度条样式 */
+.progress-container {
+  position: fixed;
+  top: 0;
+  left: 0;
+  width: 100%;
+  background-color: #fff;
+  padding: 10rpx 20rpx;
+  pointer-events: auto;
+}
+
+.progress-title {
+  font-size: 28rpx;
+  color: #333;
+  margin-bottom: 10rpx;
+  text-align: center;
+}
+
+.progress-bar {
+  height: 8rpx;
+  background-color: #eee;
+  border-radius: 4rpx;
+  overflow: hidden;
+}
+
+.progress {
+  height: 100%;
+  background-color: #007aff;
+  transition: width 0.3s ease;
+}
+
+/* 弹窗样式 */
+.dialog-mask {
+  position: fixed;
+  top: 0;
+  left: 0;
+  width: 100%;
+  height: 100%;
+  background-color: rgba(0, 0, 0, 0.5);
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  pointer-events: auto;
+}
+
+.dialog {
+  width: 600rpx;
+  background-color: #fff;
+  border-radius: 16rpx;
+  overflow: hidden;
+}
+
+.dialog-title {
+  font-size: 36rpx;
+  font-weight: bold;
+  color: #333;
+  padding: 30rpx;
+  text-align: center;
+  border-bottom: 1px solid #eee;
+}
+
+.dialog-content {
+  font-size: 32rpx;
+  color: #666;
+  padding: 40rpx 30rpx;
+  line-height: 1.6;
+}
+
+.dialog-buttons {
+  display: flex;
+  border-top: 1px solid #eee;
+}
+
+.cancel-btn, .confirm-btn {
+  flex: 1;
+  height: 100rpx;
+  line-height: 100rpx;
+  font-size: 32rpx;
+  border: none;
+  background-color: transparent;
+}
+
+.cancel-btn {
+  color: #666;
+  border-right: 1px solid #eee;
+}
+
+.confirm-btn {
+  color: #007aff;
+}
+</style>
diff --git a/pages/common/addBLE/LinkBle.vue b/pages/common/addBLE/LinkBle.vue
index 8183fd0..c45f4fe 100644
--- a/pages/common/addBLE/LinkBle.vue
+++ b/pages/common/addBLE/LinkBle.vue
@@ -1,22 +1,296 @@
 <template>
-	<view>
-		
+	<view class="content">
+		<view class="deviceDetail">
+			<view class="imgContent">
+				<image src="/static/images/BLEAdd/addBleDevice.png" class="titleIco" mode="aspectFit">
+				</image>
+			</view>
+			<view class="deviceName">
+				蓝牙名:{{device.name}}
+			</view>
+			<view class="deviceName">
+				设备名:{{device.deviceName}}
+			</view>
+			<view class="deviceId">
+				ID:{{device.deviceId}}
+			</view>
+			<view class="bound" v-bind:class="boundStatu">
+				{{Statu.boundRemark}}
+			</view>
+		</view>
+		<view class="btnLink" @click="Link()">
+			连接
+		</view>
+
+		<global-loading ref="loading" />
 	</view>
 </template>
 
 <script>
+	import request from '@/utils/request.js';
+	import bleTool from '@/utils/BleHelper.js';
+	import {
+		showLoading,
+		hideLoading,
+		updateLoading
+	} from '@/utils/loading.js';
+	
+	const pagePath="pages/common/addBLE/LinkBle";
+	
+	var these = null;
+	var eventChannel = null;
+	var ble = null;
 	export default {
 		data() {
 			return {
-				
+				Statu: {
+					bound: null
+				},
+				device: {
+					"deviceId": "",
+					"name": "",
+					"deviceName": "",
+					"RSSI": -37,
+					"localName": "",
+					"advertisServiceUUIDs": [
+
+					],
+					"linkStatu": false,
+					"macAddress": ""
+				}
 			}
 		},
-		methods: {
+		computed: {
+			boundStatu: function() {
+				if (this.Statu.bound === null) {
+					return "displayNone"
+				}
+				if (this.Statu.bound) {
+					return "green"
+				} else {
+					return "red";
+				}
+			}
+		},
+		onBackPress() {
+			console.log("返回时断开蓝牙连接,取消订阅");
+			ble.disconnectDevice(these.device.deviceId);
+			ble.removeReceiveCallback(pagePath);
+		},
+		onUnload() {
+			ble.removeReceiveCallback(pagePath);
+		},
+		onLoad(option) {
+			these = this;
+			ble = bleTool.getBleTool();
+			ble.addReceiveCallback((receive,f,path) => {
+				console.log("收到设备消息，", receive);
+				if (these.device.deviceId == receive.deviceId) {
+					console.log("11111");
 			
+					if (receive.bytes[0] == 0xFC || receive.str.indexOf('mac address:') == 0) {
+						if (f && f.macAddress) {
+							these.device.macAddress = f.macAddress;
+							console.log("222222");
+							these.initDevice();
+						}
+					}
+				}
+			},pagePath);
+			eventChannel = this.getOpenerEventChannel();
+			eventChannel.on('LinkItem', function(data) {
+				let f = ble.data.LinkedList.find((v) => {
+					return v.deviceId = data.deviceId;
+				});
+				if (f) {
+					 these.device = Object.assign({}, these.device, f); 
+					console.log("获取到设备", f);
+
+				} else {
+					console.log("未获取到设备");
+				}
+			})
+		},
+		methods: {
+
+			initDevice: function() {
+				showLoading(these, {
+					text: '正在获取设备信息'
+				});
+				request({
+					url: '/app/device/getDeviceInfoByDeviceMac',
+					method: 'GET',
+					data: {
+						deviceMac: these.device.macAddress
+					}
+				}).then(res => {
+					console.log("获取设备信息", res);
+					if (res && res.code == 200) {
+						let data = res.data;
+						if (data) {
+							let keys = Object.keys(data);
+							ble.data.LinkedList.find((v) => {
+								if(v.deviceId = these.device.deviceId){
+									for (var i = 0; i < keys.length; i++) {
+										let key = keys[i];
+										v[key] = data[key];
+										console.log("key="+key);
+										console.log("value="+data[key]);
+									
+										
+										these.$set(these.device, key, data[key]);
+									
+									}
+									
+									ble.setBleData();
+								}
+							});
+							
+								console.log("device=",these.device);
+								console.log("LinkedList=",ble.data.LinkedList);
+							
+
+						}
+					}
+
+				}).catch((ex) => {
+					console.log("获取设备出现异常:", ex);
+				}).finally(() => {
+					hideLoading(these);
+				});
+			},
+			Link() {
+				// 调用绑定设备接口
+
+				let f = ble.data.LinkedList.find((v) => {
+					return v.deviceId = these.device.deviceId;
+				});
+				if (!f) {
+					these.Statu.bound = false;
+					these.Statu.boundRemark = "蓝牙连接不成功";
+					return;
+				}
+				if (!f.macAddress) {
+					these.Statu.bound = false;
+					these.Statu.boundRemark = "设备上报Mac地址异常";
+					return;
+				}
+				these.Statu.bound = null;
+				these.Statu.boundRemark = "";
+				showLoading(these, {
+
+					text: "连接中..."
+				})
+				let promise = request({
+					url: '/app/device/bind',
+					method: 'POST',
+					data: {
+						deviceImei: '',
+						deviceMac: these.device.macAddress,
+						communicationMode: '1', //0是4g,1是蓝牙
+					}
+				});
+				promise.then((res) => {
+					console.log("1111" + JSON.stringify(res));
+					if (res.code == 200) {
+						these.Statu.bound = true;
+						these.Statu.boundRemark = "设备绑定成功!";
+
+
+						uni.$emit("refreshDeviceList");
+						setTimeout(() => {
+							uni.switchTab({
+								url: "/pages/common/index/index"
+							});
+						}, 500);
+					} else {
+						these.Statu.bound = false;
+						these.Statu.boundRemark = res.msg;
+					}
+				}).catch((ex) => {
+					these.Statu.bound = false;
+					these.Statu.boundRemark = '出现了未知的异常,操作失败';
+				}).finally(() => {
+					hideLoading(this);
+				});
+			}
 		}
 	}
 </script>
 
 <style>
+	.content {
+		background-color: #1d1d1d;
+		color: #ffffffde;
+		box-sizing: border-box;
+		overflow: hidden;
+		width: 100%;
+		min-height: 100vh;
+		height: auto;
+		font-family: "PingFang SC";
+	}
 
-</style>
+	.deviceDetail {
+		margin: 200rpx auto;
+		display: flex;
+		flex-direction: column;
+		flex-wrap: nowrap;
+		align-content: center;
+		justify-content: center;
+		align-items: center;
+	}
+
+	.imgContent,
+	.titleIco {
+		width: 120rpx;
+		height: 120rpx;
+	}
+
+	.deviceId {
+		color: rgba(255, 255, 255, 0.87);
+		font-size: 32rpx;
+
+		line-height: 44rpx;
+		letter-spacing: 0.14rpx;
+		margin-top: 5rpx;
+	}
+
+	.btnLink {
+		position: fixed;
+		bottom: 30rpx;
+		left: 30rpx;
+		right: 30rpx;
+		width: calc(100% - 60rpx);
+		border-radius: 91px;
+		height: 90rpx;
+		background: rgba(187, 230, 0, 1);
+		color: rgba(35, 35, 35, 1);
+
+
+		font-size: 32rpx;
+		line-height: 90rpx;
+		letter-spacing: 12rpx;
+		text-align: center;
+	}
+
+	.bound,
+	.deviceName {
+		font-size: 32rpx;
+		font-weight: 400;
+		line-height: 44rpx;
+		letter-spacing: 0.14rpx;
+		margin-top: 5rpx;
+	}
+
+	.displayNone {
+		display: none !important;
+	}
+
+	.green {
+		color: rgba(187, 230, 0, 1);
+	}
+
+	.red {
+		color: rgba(245, 80, 80, 1);
+	}
+</style>
\ No newline at end of file
diff --git a/pages/common/addBLE/addEquip.vue b/pages/common/addBLE/addEquip.vue
index d5b4a94..5a4d3cd 100644
--- a/pages/common/addBLE/addEquip.vue
+++ b/pages/common/addBLE/addEquip.vue
@@ -81,13 +81,22 @@
 				</view>
 			</view>
 		</BottomSlideMenuPlus>
+	
+	<global-loading ref="loading" />
 	</view>
 </template>
 
 <script>
-	import ble from '../../../api/6155/BlueHelper.js';
-	import request from '../../../utils/request.js';
-
+	import bleTool from '@/utils/BleHelper.js';
+	import request from '@/utils/request.js';
+	import {
+		showLoading,
+		hideLoading,
+		updateLoading
+	} from '@/utils/loading.js'
+	const pagePath="pages/common/addBLE/addEquip";
+	var ble = null;
+	var these = null;
 	export default {
 		data() {
 			return {
@@ -127,72 +136,71 @@
 		},
 		onHide: function() {
 			ble.StopSearch();
+			ble.removeReceiveCallback(pagePath);
 		},
 		onBackPress: (e) => {
 			ble.StopSearch();
-			ble.disconnectDevice();
+			ble.removeDeviceFound(pagePath);
+			ble.removeReceiveCallback(pagePath);
 		},
+		onUnload(){
+			ble.StopSearch();
+			ble.removeDeviceFound(pagePath);
+			ble.removeReceiveCallback(pagePath);
+		},
+		onLoad() {
+			these = this;
+			ble = bleTool.getBleTool();
+			ble.addDeviceFound((arr) => {
+				
+				arr = arr.devices;
+				for (var i = 0; i < arr.length; i++) {
 
-		onShow: function() {
-			// return;
-			var these = this;
-			uni.getStorage({
-				key: "linkedDevices",
-				success: (res) => {
-					this.PairEquip = JSON.parse(res.data);
-				},
-				fail: (ex) => {
-					this.PairEquip = [];
-				}
-			});
-
-			if (process.env.UNI_PLATFORM == 'mp-weixin' ||
-				process.env.UNI_PLATFORM == 'mp-alipay' ||
-				process.env.UNI_PLATFORM == 'app-plus' ||
-				process.env.UNI_PLATFORM == 'app'
-
-			) {
-				//打开蓝牙开始搜索设备
-				ble.OpenBlue(true, () => {
-						ble.StartSearch(function(arr) {
-
-							arr = arr.devices;
-							for (var i = 0; i < arr.length; i++) {
-
-								arr[i].linkStatu = false;
-								let f = these.EquipMents.find(function(v) {
-									return v.deviceId == arr[i].deviceId;
-								});
-
-								if (!f) {
-									these.EquipMents.push(arr[i]);
-								}
-
-
-
-							}
-
-							console.log("设备列表：" + JSON.stringify(these.EquipMents));
-						});
-					},
-					() => {
-						these.showOpenSetting();
+					arr[i].linkStatu = false;
+					if(!arr[i].name){
+						continue;
+					}
+					let f = these.EquipMents.find(function(v) {
+						return v.deviceId == arr[i].deviceId;
+					});
 
+					if (!f) {
+					
+						these.EquipMents.push(arr[i]);
+					} else {
 
 					}
-				)
+				}
+			},pagePath);
 
-
-
-			} else {
-				console.log('当前环境：' + process.env.UNI_PLATFORM + '不支持蓝牙');
-			}
+		},
+		
+		onShow: function() {
+			
+			
+			this.EquipMents=[];
+			this.PairEquip=[];
+			ble.StartSearch().catch((ex) => {
+				if (ex.code == 10001) {
+					these.showOpenSetting();
+				}
+			});
+			
+			
+			ble.addReceiveCallback((receivData) => {
+				console.log("收到数据了:", receivData);//数据格式:{bytes:[109,97],str:"",hexs:"FA 01"}
+				console.log("LinkedList=",ble.data.LinkedList);
+				 let data=uni.getStorageSync(ble.StorageKey);
+				 console.log("data=",data);
+			},pagePath);
+			
 
 		},
 		methods: {
 			isItemLink: function(item, index) {
 				let src = '/static/images/BLEAdd/noLink.png';
-				if (this.PairEquip && this.PairEquip instanceof Array) {
+				
+				if (this.PairEquip && this.PairEquip.length) {
 					if (this.PairEquip.length > 0) {
 						let f = this.PairEquip.find(function(v) {
 							return v.deviceId == item.deviceId;
@@ -206,114 +214,56 @@
 				}
 				return src;
 			},
-			alert: function(title, content, callback) {
-				if (!title) {
-					title = '提示'
-				}
-				if (!content) {
-					content = title;
-				}
-
-				uni.showModal({
-					title: title,
-					content: content,
-					success: function(res) {
-						if (res.confirm) {
-							console.log('用户点击确定');
-						} else if (res.cancel) {
-							console.log('用户点击取消');
-						}
-
-						if (callback) {
-							callback(res);
-						}
-					}
-				});
-			},
+			
 
 			showOpenSetting: function() {
 				this.Status.BottomMenu.show = true;
 			},
 			gotoSetting: function() {
 				this.Status.BottomMenu.show = false;
-				ble.showBluetoothGuide(false);
+				ble.showBlueSetting(false);
 			},
 			Link: function(item, index) {
-				var these = this;
-				if (process.env.UNI_PLATFORM == 'mp-weixin' ||
-					process.env.UNI_PLATFORM == 'mp-alipay' ||
-					process.env.UNI_PLATFORM == 'app-plus' ||
-					process.env.UNI_PLATFORM == 'app'
-				) {
-
-					uni.showLoading({
-						title: "正在连接",
-						mask: true
-					});
-					setTimeout(() => {
-
-
-						ble.LinkBlue(item.deviceId, function() {
-							let c = these.PairEquip.find(function(v) {
-								return v.deviceId == item.deviceId;
-							});
-							if (!c) {
-								these.PairEquip.push(item);
-								uni.setStorage({
-									key: 'linkedDevices',
-									data: JSON.stringify(these.PairEquip),
-									success: () => {}
-								});
-							}
-
-
-
-
-							// 调用绑定设备接口
-							let promise = request({
-								url: '/app/device/bind',
-								method: 'POST',
-								data: {
-									deviceImei: '',
-									deviceMac: item.deviceId,
-									communicationMode: '1', //0是4g,1是蓝牙
-								}
-							});
-							promise.then((res) => {
-								console.log("1111" + JSON.stringify(res));
-								if (res.code == 0) {
-
-									uni.hideLoading()
-									uni.showToast({
-										title: res.data,
-										icon: 'success'
-									});
-									
-									
-								} else {
-									uni.showToast({
-										title: res.msg,
-									});
-								}
-							}).catch((ex) => {
-
-								uni.showToast({
-									title: '出现了未知的异常,操作失败',
-								});
-							});
-
-
-
-
-
-						}, (ex) => {
-							uni.hideLoading();
+			
+				showLoading(this,{
+					text: "正在连接"
+				});
+				setTimeout(() => {
+					let serviceid=null;
+					if(item.advertisServiceUUIDs.length>0){
+						serviceid=item.advertisServiceUUIDs[0];
+					}
+					ble.LinkBlue(item.deviceId,serviceid).then((res) => {
+						let c = these.PairEquip.find(function(v) {
+							return v.deviceId == item.deviceId;
 						});
-					}, 0);
+						if (!c) {
+
+							these.PairEquip.push(item);
+						}
+						ble.removeReceiveCallback(pagePath);
+						uni.navigateTo({
+							url:"/pages/common/addBLE/LinkBle",
+							events:{
+								
+							},
+							success(res) {
+								
+								 res.eventChannel.emit('LinkItem', item);
+							}
+						});
+
+					}).catch((ex) => {
+						console.log("ex=",ex)
+						uni.showModal({
+							content:"连接失败:"+ex.msg
+						});
+					}).finally(()=>{
+						hideLoading(this);
+					});
+				}, 0);
+
 
-				} else {
-					these.alert("提示", "当前平台不支持蓝牙");
-				}
 			}
 		}
 	}
@@ -451,7 +401,7 @@
 
 	.mainContent .lblTitle {
 		color: #ffffffde;
-		font-family: PingFang SC;
+		font-family: "PingFang SC";
 		font-size: 28rpx;
 		font-weight: 700;
 		text-align: left;
@@ -516,7 +466,7 @@
 
 	.list .item .name {
 		color: #ffffffde;
-		font-family: PingFang SC;
+		font-family: "PingFang SC";
 		font-size: 26rpx;
 		font-weight: 400;
 		line-height: 50rpx;
@@ -525,7 +475,7 @@
 
 	.list .item .id {
 		color: #ffffff99;
-		font-family: PingFang SC;
+		font-family: "PingFang SC";
 		font-size: 24rpx;
 		font-weight: 400;
 		line-height: 30rpx;
@@ -547,7 +497,7 @@
 
 	.openBlue .txt {
 		color: rgba(255, 255, 255, 0.87);
-		font-family: PingFang SC;
+		font-family: "PingFang SC";
 		font-size: 28rpx;
 		font-weight: 400;
 		letter-spacing: 0.14rpx;
@@ -572,7 +522,7 @@
 		width: 25%;
 		height: 60rpx;
 		text-align: center;
-		font-family: PingFang SC;
+		font-family: "PingFang SC";
 		font-size: 28rpx;
 		letter-spacing: 12rpx;
 		display: flex !important;
@@ -584,10 +534,12 @@
 		justify-content: center;
 
 	}
+
 	.openBlue .cancel {
 		border: 1px solid rgba(255, 255, 255, 1);
 		color: rgba(255, 255, 255, 1);
 	}
+
 	.openBlue .ok {
 		background-color: #BBE600;
 		color: #232323;
diff --git a/pages/common/login/index.vue b/pages/common/login/index.vue
index 21b7084..7268a38 100644
--- a/pages/common/login/index.vue
+++ b/pages/common/login/index.vue
@@ -60,7 +60,7 @@
 		data() {
 			return {
 				showView: false,
-				phone: '13800138002', //手机号码
+				phone: '17671332251', //手机号码
 				code: "123456", //验证码
 				agreed: false,
 				isCounting: false,
@@ -69,6 +69,29 @@
 				showAgreement: false, // 控制弹窗显示
 			}
 		},
+		onLoad(){
+					if(uni.getStorageSync("token") && uni.getStorageSync("clientID")){//免登陆
+						
+						let time=uni.getStorageSync("tokenTime");
+						if(!time){							
+							time=0;
+						}
+						let currTime=new Date().getTime();
+						if(currTime<time){
+							console.log("登陆过，并且没过期，自动进入设备页");
+							uni.switchTab({
+								url: '/pages/common/index/index'
+							});
+							return;
+						}else{
+							//token过期了
+							uni.removeStorageSync("token")
+							uni.removeStorageSync("clientID")
+							uni.removeStorageSync("tokenTime")
+						}
+						
+					}
+				},
 		methods: {
 			// 获取验证码
 			async getPhoneCode() {
@@ -158,6 +181,7 @@
 						uni.hideLoading()
 						uni.setStorageSync('token', res.data.access_token) // 缓存token
 						uni.setStorageSync('clientID', res.data.client_id) // 缓存token
+						uni.setStorageSync('tokenTime',new Date().getTime()+86400000);//过期时间
 						uni.showToast({
 							title: '登录成功',
 							icon: 'success'
diff --git a/static/fonts/PingFangSC.ttf b/static/fonts/PingFangSC.ttf
new file mode 100644
index 0000000..8790adb
Binary files /dev/null and b/static/fonts/PingFangSC.ttf differ
diff --git a/static/images/6155/DeviceDetail/Hby650.png b/static/images/6155/DeviceDetail/Hby650.png
new file mode 100644
index 0000000..098221c
Binary files /dev/null and b/static/images/6155/DeviceDetail/Hby650.png differ
diff --git a/static/images/6155/DeviceDetail/close.png b/static/images/6155/DeviceDetail/close.png
new file mode 100644
index 0000000..d837b53
Binary files /dev/null and b/static/images/6155/DeviceDetail/close.png differ
diff --git a/static/images/6155/DeviceDetail/uploadErr.png b/static/images/6155/DeviceDetail/uploadErr.png
new file mode 100644
index 0000000..68631ed
Binary files /dev/null and b/static/images/6155/DeviceDetail/uploadErr.png differ
diff --git a/static/images/6155/DeviceDetail/warnning.png b/static/images/6155/DeviceDetail/warnning.png
new file mode 100644
index 0000000..562696d
Binary files /dev/null and b/static/images/6155/DeviceDetail/warnning.png differ
diff --git a/static/images/670/jieN.png b/static/images/670/jieN.png
new file mode 100644
index 0000000..0919bf8
Binary files /dev/null and b/static/images/670/jieN.png differ
diff --git a/static/images/670/jieNActive.png b/static/images/670/jieNActive.png
new file mode 100644
index 0000000..c43abfe
Binary files /dev/null and b/static/images/670/jieNActive.png differ
diff --git a/static/images/670/qiang.png b/static/images/670/qiang.png
new file mode 100644
index 0000000..6f4df40
Binary files /dev/null and b/static/images/670/qiang.png differ
diff --git a/static/images/670/qiangActive.png b/static/images/670/qiangActive.png
new file mode 100644
index 0000000..84c4169
Binary files /dev/null and b/static/images/670/qiangActive.png differ
diff --git a/static/images/670/rb.png b/static/images/670/rb.png
new file mode 100644
index 0000000..b865fe4
Binary files /dev/null and b/static/images/670/rb.png differ
diff --git a/static/images/670/rbActive.png b/static/images/670/rbActive.png
new file mode 100644
index 0000000..f0cba81
Binary files /dev/null and b/static/images/670/rbActive.png differ
diff --git a/static/images/670/ruo.png b/static/images/670/ruo.png
new file mode 100644
index 0000000..3070db2
Binary files /dev/null and b/static/images/670/ruo.png differ
diff --git a/static/images/670/ruoActive.png b/static/images/670/ruoActive.png
new file mode 100644
index 0000000..24b0b68
Binary files /dev/null and b/static/images/670/ruoActive.png differ
diff --git a/static/images/670/sg.png b/static/images/670/sg.png
new file mode 100644
index 0000000..28d9bf7
Binary files /dev/null and b/static/images/670/sg.png differ
diff --git a/static/images/670/sgActive.png b/static/images/670/sgActive.png
new file mode 100644
index 0000000..5dd61b9
Binary files /dev/null and b/static/images/670/sgActive.png differ
diff --git a/static/images/BLEAdd/addBleDevice.png b/static/images/BLEAdd/addBleDevice.png
new file mode 100644
index 0000000..d96d0b2
Binary files /dev/null and b/static/images/BLEAdd/addBleDevice.png differ
diff --git a/utils/BleHelper.js b/utils/BleHelper.js
new file mode 100644
index 0000000..56c9523
--- /dev/null
+++ b/utils/BleHelper.js
@@ -0,0 +1,1274 @@
+import receivTool from "@/utils/BleReceive.js"
+var recei = null;
+class BleHelper {
+	constructor() {
+		this.StorageKey = "linkedDevices";
+		recei = receivTool.getBleReceive();
+
+		this.init();
+	}
+	init() {
+		let key = this.StorageKey;
+		var store = uni.getStorageInfoSync();
+		var f = store.keys.find(function(v) {
+			return v == key;
+		});
+		var linkedDevices = [];
+		if (f) {
+			linkedDevices = uni.getStorageSync(key);
+		}
+		if (linkedDevices && linkedDevices.length && linkedDevices.length > 0) {
+			console.log("111111", linkedDevices);
+			linkedDevices.filter((v) => {
+				v.Linked = false;
+				v.notifyState = false;
+			});
+		}
+
+		setTimeout(() => {
+			this.linkAllDevices();
+		}, 10);
+		this.data = {
+			isOpenBlue: false, //蓝牙模块是否开启
+			available: false, //蓝牙状态是否可用
+			discovering: false, //蓝牙是否正在搜索
+			searchList: [], //已搜索到的设备列表,
+			isSubscribe: false, //是否开启了订阅
+			LinkedList: linkedDevices, //已连接的设备列表 
+		}
+		this.cfg = {
+			onDeviceFound: [], //发现新设备的事件
+			receivDataCallback: [] //接收到数据的事件
+		}
+		this.addReceiveCallback((a,b,c)=>{
+			recei.ReceiveData(a,b,c);
+		}, "BleReceiveData");
+		this.dic = {
+			errRemarks: [{
+					key: '10000',
+					remark: '未初始化蓝牙适配器'
+				},
+				{
+					key: '10001',
+					remark: '当前蓝牙适配器不可用'
+				},
+				{
+					key: '10002',
+					remark: '没有找到指定设备'
+				},
+				{
+					key: '10003',
+					remark: '蓝牙设备连接失败'
+				},
+				{
+					key: '10004',
+					remark: '蓝牙设备没有找到指定服务'
+				},
+				{
+					key: '10005',
+					remark: '蓝牙设备没有找到指定特征值'
+				},
+				{
+					key: '10006',
+					remark: '蓝牙连接已断开'
+				},
+				{
+					key: '10007',
+					remark: '蓝牙设备当前特征值不支持此操作'
+				},
+				{
+					key: '10008',
+					remark: '其余所有系统上报的异常'
+				},
+				{
+					key: '10009',
+					remark: '蓝牙设备不支持BLE低功耗蓝牙'
+				},
+				{
+					key: '10010',
+					remark: '已连接'
+				},
+				{
+					key: '10011',
+					remark: '蓝牙设备配对设备需要配对码'
+				},
+				{
+					key: '10012',
+					remark: '蓝牙设备连接超时'
+				},
+				{
+					key: '10013',
+					remark: '连接 deviceId 为空或者是格式不正确'
+				}
+			]
+		}
+	}
+
+	linkAllDevices() {
+		console.log("模块启动时，自动连接已连接过的设备", this.data.LinkedList);
+
+		if (this.data.LinkedList && this.data.LinkedList.length > 0) {
+			for (var i = 0; i < this.data.LinkedList.length; i++) {
+				let device = this.data.LinkedList[i];
+				console.log("自动连接:" + device.deviceId);
+				this.LinkBlue(device.deviceId, device.writeServiceId, device.wirteCharactId, device
+					.notifyCharactId);
+			}
+		} else {
+			console.log("无设备连接");
+		}
+	}
+
+	getCurrentPagePath() {
+
+		const pages = getCurrentPages();
+
+		if (pages.length === 0) {
+			return "";
+		}
+
+		const currentPage = pages[pages.length - 1];
+		console.log("currentPage=", currentPage.route);
+		return currentPage.route;
+	}
+
+	//设置发现新设备的回调
+	addDeviceFound(callback, currKey) {
+		let key = currKey ? currKey : this.getCurrentPagePath();
+		if (!key) {
+			key = new Date().getTime();
+		}
+		if (key) {
+			console.log("key=" + key);
+			let f = this.cfg.onDeviceFound.findIndex((v) => {
+				return v.key == key;
+			});
+			if (f > -1) {
+				this.cfg.onDeviceFound[f].callback = callback;
+				return;
+			}
+			this.cfg.onDeviceFound.push({
+				key: key,
+				callback: callback
+			});
+		}
+	}
+
+	//移除发现新设备的回调
+	removeDeviceFound(currKey) {
+		let key = currKey ? currKey : this.getCurrentPagePath();
+
+		if (key) {
+			console.log("key=" + key);
+			let f = this.cfg.onDeviceFound.findIndex((v) => {
+				return v.key == key;
+			});
+			if (f > -1) {
+				this.cfg.onDeviceFound.splice(f, 1);
+			}
+		} else {
+			if (this.cfg.onDeviceFound.length > 0) {
+				this.cfg.onDeviceFound.splice(this.cfg.onDeviceFound.length - 1, 1);
+			}
+
+		}
+	}
+
+	//添加接收到数据的回调
+	addReceiveCallback(callback, currKey) {
+		let key = currKey ? currKey : this.getCurrentPagePath();
+		if (!key) {
+			key = new Date().getTime();
+		}
+		if (key) {
+			console.log("订阅消息回调,key=" + key);
+			let f = this.cfg.receivDataCallback.findIndex((v) => {
+				return v.key == key;
+			});
+			if (f > -1) {
+				this.cfg.receivDataCallback.callback = callback;
+				return;
+			}
+			this.cfg.receivDataCallback.push({
+				key: key,
+				callback: callback
+			});
+		}
+	}
+
+
+
+	//设置接收到数据的回调
+	removeReceiveCallback(currKey) {
+		let key = currKey ? currKey : this.getCurrentPagePath();
+		if (key) {
+			console.log("移除消息回调:" + key);
+			let f = this.cfg.receivDataCallback.findIndex((v) => {
+				return v.key == key;
+			});
+
+			if (f > -1) {
+				this.cfg.receivDataCallback.splice(f, 1);
+			}
+
+		} else {
+			if (this.cfg.receivDataCallback.length > 0) {
+				this.cfg.receivDataCallback.splice(this.cfg.receivDataCallback.length - 1, 1);
+			}
+		}
+	}
+
+
+
+	getError(ex) {
+		let code = ex.code;
+		ex.msg = "未知的异常"
+		let f = this.dic.errRemarks.find((v) => {
+			return v.key == code;
+		});
+		if (f) {
+			ex.msg = f.remark;
+		}
+		return ex;
+	}
+	//引导到设置中打开蓝牙
+	showBlueSetting(showTip) {
+		let platform = process.env.UNI_PLATFORM;
+
+
+		var openBlueSetting = function() {
+			// 判断平台类型
+			if (platform === 'mp-weixin') {
+				uni.openSetting();
+			} else if (platform === 'app-plus' || platform === 'app') {
+				//----------------------------------------------------------------
+				const osName = plus.os.name;
+
+				if (osName === 'iOS') {
+					// iOS 平台打开蓝牙设置
+					plus.runtime.openURL('App-Prefs:root=Bluetooth', function() {
+						////console.log('成功打开蓝牙设置');
+					}, function(err) {
+						console.error('打开蓝牙设置失败：' + err.message);
+						uni.showModal({
+							title: '提示',
+							content: '无法自动打开蓝牙设置，请手动前往设置 > 蓝牙 进行操作。',
+							showCancel: false
+						});
+					});
+				} else if (osName === 'Android') {
+					// Android 平台打开蓝牙设置
+					try {
+						const Intent = plus.android.importClass('android.content.Intent');
+						const Settings = plus.android.importClass('android.provider.Settings');
+						const main = plus.android.runtimeMainActivity();
+						const intent = new Intent(Settings.ACTION_BLUETOOTH_SETTINGS);
+						main.startActivity(intent);
+					} catch (e) {
+						console.error('打开蓝牙设置失败：' + e.message);
+						// 尝试使用通用设置页面作为备选方案
+						plus.runtime.openURL('settings://', function() {
+							////console.log('打开系统设置成功，请手动找到蓝牙选项');
+						}, function() {
+							uni.showModal({
+								title: '提示',
+								content: '无法自动打开蓝牙设置，请手动前往设置页面开启蓝牙。',
+								showCancel: false
+							});
+						});
+					}
+				} else {
+					uni.showModal({
+						title: '提示',
+						content: '当前系统不支持自动打开蓝牙设置，请手动操作。',
+						showCancel: false
+					});
+				}
+
+
+				//--------------------------------------------------------------------
+			} else if (platform === 'mp-alipay') {
+				uni.openSetting();
+			}
+
+		}
+
+		if (showTip !== undefined) {
+			openBlueSetting();
+			return;
+		}
+		if (platform === 'mp-weixin' || platform === 'app-plus' ||
+			platform === 'mp-alipay' || platform === 'app') {
+			uni.showModal({
+				title: '蓝牙未开启',
+				content: '请在系统设置中打开蓝牙以使用此功能',
+				success: (res) => {
+					if (res.confirm) {
+						openBlueSetting();
+					}
+				}
+			});
+		} else {
+			////console.log("当前平台不支持打开系统设置" + platform);
+		}
+
+
+	}
+
+	//获取蓝牙适配器状态
+	CheckBlue() {
+
+		return new Promise((resolve, reject) => {
+			if (this.data.available) {
+				resolve({
+					available: this.data.available,
+					discovering: this.data.discovering
+				});
+				return;
+			}
+			if (!this.data.isOpenBlue) {
+				resolve({
+					available: false,
+					discovering: false
+				});
+				return;
+			}
+			uni.getBluetoothAdapterState({
+				success: (info) => {
+					this.data.available=info.available;
+					this.data.discovering=info.discovering;
+					resolve(info);
+				},
+				fail: (ex1) => {
+					////console.log("ex1", ex1);
+					let res1 = {
+						available: false,
+						discovering: false
+					}
+					resolve(res1);
+				}
+			});
+		});
+	}
+	//打开蓝牙适配器
+	OpenBlue() {
+
+		var init = () => {
+			return new Promise((resolve, reject) => {
+				if (this.data.isOpenBlue) {
+					console.log("蓝牙状态已可用，提前返回");
+					resolve(false);
+					return;
+				}
+				
+				uni.openBluetoothAdapter({
+					success: (args) => {
+						console.log("蓝牙初始化成功:" + JSON.stringify(args));
+						this.data.isOpenBlue = true;
+						this.data.available=true;
+						resolve(true);
+
+						if (this.data.isSubscribe) { //整个App生命周期，只订阅一次
+							return;
+						}
+						console.log("开始订阅各类变化消息");
+						this.data.isSubscribe = true;
+
+
+						var bytesToHexString = (bytes) => {
+							return bytes.map(byte => byte.toString(16).padStart(2,
+								'0'));
+						}
+
+						uni.onBluetoothAdapterStateChange((state) => {
+							console.log('蓝牙状态发生变化:' + JSON.stringify(state));
+							this.data.available = state.available;
+							this.data.discovering = state.discovering;
+							if (this.data.available && this.data
+								.isOpenBlue) { //蓝牙状态再次可用，重连所有设备
+
+
+							}
+
+							if (!state.available) { //蓝牙状态不可用了，将所有设备标记为断开连接
+								this.data.LinkedList.filter((v) => {
+									v.Linked = false;
+									v.notifyState = false;
+									return true;
+								});
+								uni.setStorageSync(this.StorageKey, this.data
+									.LinkedList);
+							}
+						});
+
+						uni.onBLEConnectionStateChange((res) => {
+
+							if (!res.connected) {
+
+								console.log("蓝牙连接已断开", res);
+								this.data.LinkedList.find((v) => {
+									if (v.deviceId == res.deviceId) {
+										v.Linked = false;
+										v.notifyState = false;
+										return true;
+									}
+									return false;
+								});
+								uni.setStorageSync(this.StorageKey, this.data
+									.LinkedList);
+							} else {
+								console.log("蓝牙连接已恢复，", res);
+							}
+						});
+
+						uni.onBluetoothDeviceFound((devices) => {
+							// ////console.log("发现新设备:" + JSON.stringify(devices));
+							this.data.searchList = this.data.searchList.concat(
+								devices);
+							if (this.cfg.onDeviceFound) {
+								if (this.cfg.onDeviceFound.length > 0) {
+									this.cfg.onDeviceFound.forEach((found) => {
+										found.callback(devices);
+									});
+								}
+
+							}
+						});
+
+						uni.onBLECharacteristicValueChange((receive) => {
+							//订阅消息
+							console.log("收到订阅消息",receive);
+							let f=this.data.LinkedList.find((v) => {
+								return v.deviceId == receive.deviceId;	
+							})
+							let dataView = new DataView(receive.value);
+
+							// 转换为字节数组
+							let bytes = [];
+							for (let i = 0; i < dataView.byteLength; i++) {
+								bytes.push(dataView.getUint8(i));
+							}
+
+							let hexs = bytesToHexString(bytes);
+							let str = '';
+							try {
+								let uint8Array = new Uint8Array(receive.value);
+
+								for (let i = 0; i < uint8Array.length; i++) {
+									// 将每个字节转换为对应的字符
+									str += String.fromCharCode(uint8Array[i]);
+								}
+								let header = "mac address:";
+								if (str.indexOf(header) == 0) { //650以文本传输mac
+
+									this.data.LinkedList.find((v) => {
+										if (v.deviceId == receive
+											.deviceId) {
+											v.macAddress = str.replace(
+												header, "");
+											// console.log("收到mac地址:", str)
+										}
+									});
+									uni.setStorageSync(this.StorageKey, this.data
+										.LinkedList);
+								}
+
+								if (bytes[0] == 0xFC) { //6155以0xFC开头代表mac地址
+									// console.log("收到mac地址:", bytes)
+									if (bytes.length >= 7) {
+										let mac = hexs.slice(1, 7).join(":")
+											.toUpperCase();
+										this.data.LinkedList.find((v) => {
+											if (v.deviceId == receive
+												.deviceId) {
+												v.macAddress = mac;
+												// console.log("收到mac地址:", str)
+											}
+										});
+										uni.setStorageSync(this.StorageKey, this
+											.data.LinkedList);
+									}
+								}
+							} catch (ex) {
+								////console.log("将数据转文本失败", ex);
+							}
+							let recData = {
+								deviceId: receive.deviceId,
+								serviceId: receive.serviceId,
+								characteristicId: receive.characteristicId,
+								bytes: bytes,
+								str: str,
+								hexs: hexs
+							};
+							console.log("监听到特征值:" + JSON.stringify(recData));
+							if (this.cfg.receivDataCallback) {
+
+								if (this.cfg.receivDataCallback.length > 0) {
+
+									let path = this.getCurrentPagePath();
+									
+									this.cfg.receivDataCallback.forEach((rec) => {
+
+										if (rec.callback) {
+											rec.callback(recData, f, path);
+										}																			
+									})
+								}
+							} else {
+								console.log("无人订阅receivDataCallback,不处理数据");
+							}
+						});
+
+
+					},
+					fail: (ex2) => {
+						console.log("蓝牙模块启动失败", ex2);
+						reject(this.getError(ex2));
+					}
+				});
+			});
+		}
+
+		return new Promise((resolve, reject) => {
+			if (this.data.isOpenBlue) {
+				resolve();
+				return;
+			}
+
+			this.CheckBlue().then((res) => {
+				console.log("res=", res)
+				return init();
+			}).then(resolve).catch((ex) => {
+				console.log("22222");
+				reject(ex);
+			});
+
+
+		});
+	}
+	//关闭蓝牙适配器
+	CloseBlue() {
+		return new Promise((resolve, reject) => {
+			this.data.available = false;
+			this.data.discovering = false;
+			this.data.isOpenBlue = false;
+			this.data.searchList = [];
+
+			this.StopSearch();
+
+			this.disconnectDevice();
+
+			uni.closeBluetoothAdapter({
+				success: () => {
+					console.log("蓝牙模块已关闭");
+					this.data.isOpenBlue = false;
+				},
+				fail: (ex) => {
+					ex = this.getError(ex);
+					////console.log(msg);
+				},
+				complete: () => {
+					resolve();
+				}
+			});
+
+		});
+
+	}
+
+	//开始搜索新设备
+	StartSearch() {
+		this.data.searchList = [];
+		var these = this;
+		//开始搜索
+		var Search = () => {
+			console.log("Search........");
+			return new Promise((resolve, reject) => {
+				uni.startBluetoothDevicesDiscovery({
+					services: [],
+					allowDuplicatesKey: true,
+					success: (res) => {
+						//console.log('开始搜索蓝牙设备成功');
+						resolve(res);
+
+					},
+					fail: (err) => {
+						console.log(`搜索蓝牙设备失败:`, err);
+
+						reject(this.getError(err));
+					}
+				});
+			});
+
+
+		}
+
+
+
+		return this.OpenBlue().then((res) => {
+			console.log("蓝牙适配器状态", res)
+
+			return Search();
+		});
+
+
+	}
+	//停止搜索
+	StopSearch() {
+		return new Promise((resolve, reject) => {
+			uni.stopBluetoothDevicesDiscovery({
+				success: (res) => {
+					//console.log("停止搜索蓝牙设备成功");
+					resolve();
+				},
+				fail: (ex) => {
+					//console.log("无法停止蓝牙搜索");
+
+					reject(this.getError(ex));
+				}
+			});
+		})
+
+	}
+	//获取已连接的设备
+	getLinkBlue(callback) {
+		return new Promise((resolve, reject) => {
+			uni.getConnectedBluetoothDevices({
+				success: (res) => {
+
+					resolve(res);
+
+
+				},
+				fail: (ex) => {
+					////console.log("获取已连接设备异常", ex);
+
+					reject({
+						devices: []
+					});
+
+				}
+			});
+		});
+
+
+	}
+
+	//订阅消息
+	subScribe(deviceId, state) {
+		return new Promise((resolve, reject) => {
+			setTimeout(() => {
+				let c = this.data.LinkedList.find((v) => {
+					return v.deviceId == deviceId;
+				});
+				if (state) {
+					if (c.notifyState) {
+						resolve();
+						return;
+					}
+				}
+				console.log("c=", c);
+				let startSubScribe = (id, serviceId, characteristicId) => {
+
+					return new Promise((succ, err) => {
+						uni.notifyBLECharacteristicValueChange({
+							deviceId: id,
+							serviceId: serviceId,
+							characteristicId: characteristicId,
+							state: state,
+							success: (res) => {
+								if (state) {
+									console.log("订阅消息成功", res);
+								} else {
+									console.log("取消订阅成功", res);
+								}
+
+								this.data.LinkedList.find((v) => {
+									if (v.deviceId == deviceId) {
+										v.notifyState = state;
+									}
+								});
+								succ();
+							},
+							fail: (ex) => {
+
+								err(this.getError(ex));
+							}
+						});
+					});
+				}
+				let promies = new Array();
+				for (var i = 0; i < c.Characteristics.length; i++) {
+					let item = c.Characteristics[i];
+					let serviceId = item.serviceId;
+					let characteristicId = item.uuid;
+
+					if (item.properties.notify) {
+						promies.push(startSubScribe(deviceId, serviceId, characteristicId));
+					}
+				}
+				if (promies.length > 0) {
+					Promise.allSettled(promies).then((results) => {
+
+						results.forEach((result, index) => {
+							if (result.status === "fulfilled") {
+								//console.log(`操作${index + 1}成功:`, result.value);
+							} else {
+								// console.log(`操作${index + 1}失败:`, result.reason
+								// 	.message);
+							}
+						});
+
+						resolve();
+					}).catch((ex) => {
+						reject(ex);
+					});
+				} else {
+					resolve();
+				}
+
+
+
+			}, 20);
+
+		});
+	}
+
+	//获取服务
+	getService(id, targetServiceId, writeCharId, notifyCharId) {
+
+		if (!targetServiceId) {
+			targetServiceId = "xx"; // "FFE0";
+		}
+		return new Promise((resolve, reject) => {
+			var repeatCnt = 0;
+			var startgetService = () => {
+
+				uni.getBLEDeviceServices({
+					deviceId: id,
+					success: (res) => {
+						if (res.services && res.services.length > 0) {
+							console.log("获取到服务：" + JSON.stringify(res));
+
+							this.data.LinkedList.find((v) => {
+								if (v.deviceId == id) {
+									v.services = res.services;
+								}
+							});
+							uni.setStorageSync(this.StorageKey,
+								this.data.LinkedList);
+
+							var promises = [];
+							let se = res.services.find((v) => {
+								return v.uuid.indexOf(targetServiceId) > -1;
+							});
+							if (se) {
+								promises.push(this.getFeatrus(id, se.uuid, writeCharId,
+									notifyCharId));
+							} else {
+								for (var i = 0; i < res.services.length; i++) {
+									let service = res.services[i];
+									promises.push(this.getFeatrus(id, service.uuid,
+										writeCharId, notifyCharId));
+								}
+							}
+
+
+							if (promises.length == 0) {
+								console.log("未找到主服务");
+								reject({
+									msg: "未找到主服务",
+									code: -1
+								});
+							} else {
+
+								Promise.all(promises)
+									.then(results => {
+
+										return this.subScribe(id, true);
+									})
+									.then((res) => {
+										console.log('设备连接成功，初始化完成', res);
+										console.log("LinkedList=", this.data
+											.LinkedList);
+										resolve();
+									})
+									.catch(error => {
+										console.log("errrr", error);
+										reject(error);
+									});
+							}
+
+
+
+						} else {
+							repeatCnt++;
+							if (repeatCnt > 5) {
+
+								reject({
+									msg: "获取设备服务失败",
+									code: -1
+								});
+
+								return;
+							}
+							setTimeout(function() {
+								startgetService(id);
+							}, 100);
+						}
+					},
+					fail: (ex) => {
+						reject(this.getError(ex));
+					}
+				})
+			}
+
+			setTimeout(function() {
+				startgetService(id);
+			}, 100);
+		});
+	}
+
+	//获取特征
+	getFeatrus(id, serviceId, writeCharId, notifyCharId) {
+		var promise = new Promise((resolve, reject) => {
+			uni.getBLEDeviceCharacteristics({
+				deviceId: id,
+				serviceId: serviceId,
+				success: (res) => {
+					console.log("获取到特征:" + JSON.stringify(res));
+					res.characteristics.forEach((v) => {
+						v.serviceId = serviceId;
+					});
+					//写特征
+					let writeChar = res.characteristics.find(char => {
+						return char.uuid.indexOf(writeCharId) > -1
+					});
+					if (!writeChar) {
+						writeChar = res.characteristics.find(char => {
+							return char.properties.write;
+						});
+					}
+					//通知特征
+					let notiChar = res.characteristics.find(char => {
+						return char.uuid.indexOf(notifyCharId) > -1;
+					});
+					if (!notiChar) {
+						notiChar = res.characteristics.find(char => {
+							return char.properties.notify;
+						});
+					}
+					this.data.LinkedList.find(function(v) {
+						if (v.deviceId == id) {
+							if (!v.Characteristics) {
+								v.Characteristics = [];
+							}
+
+							for (var i = 0; i < res.characteristics.length; i++) {
+								let item = res.characteristics[i];
+								let flag = false;
+								for (var j = 0; j < v.Characteristics.length; j++) {
+									let charact = v.Characteristics[j];
+									if (charact.uuid == item.uuid) {
+										flag = true;
+										break;
+									}
+								}
+								if (!flag) {
+									v.Characteristics.push(item);
+								}
+							}
+
+
+							if (writeChar) {
+								v.writeServiceId = serviceId;
+								v.wirteCharactId = writeChar.uuid;
+							}
+
+							if (notiChar) {
+								v.notifyServiceid = serviceId;
+								v.notifyCharactId = notiChar.uuid;
+							}
+							return true;
+						}
+						return false;
+					});
+
+
+
+					uni.setStorageSync(this.StorageKey, this.data.LinkedList);
+					resolve(res);
+				},
+				fail: (ex) => {
+					////console.log("获取特征出现异常:" + JSON.stringify(ex));
+					reject(ex);
+				}
+			});
+		});
+		return promise;
+	}
+
+	//连接某个设备
+	LinkBlue(deviceId, targetServiceId, writeCharId, notifyCharId) {
+
+
+		if (!writeCharId) {
+			writeCharId = "xxxx"; // "FFE1";
+		}
+		if (!notifyCharId) {
+			notifyCharId = "xxxxx"; // "FFE2";
+		}
+
+
+
+		let fIndex = -1;
+		let f = this.data.LinkedList.find((v, index) => {
+			if (v.deviceId == deviceId) {
+				fIndex = index;
+				return true;
+			}
+			return false;
+		});
+		////console.log("findex=" + fIndex);
+
+		var these = this;
+
+
+		//连接设备
+		var linkDevice = () => {
+			return new Promise((resolve, reject) => {
+
+				if (fIndex > -1 && f?.Linked) {
+					console.log("当前已连接，跳过其他步骤")
+					resolve(false);
+					return;
+				}
+				if(!this.data.available){
+					reject(this.getError({code:10001}));
+					return;
+				}
+				console.log("正在连接" + deviceId);
+				uni.createBLEConnection({
+					deviceId: deviceId,
+					timeout: 3000,
+					success: (info) => {
+
+						console.log("新连接成功", this.data.LinkedList);
+						this.getLinkBlue().then((arr) => {
+							let cr = arr.devices.find(c => {
+								if (c.deviceId == deviceId) {
+									c.Linked = true;
+									return true;
+								}
+								return false;
+
+							});
+							if (fIndex > -1) {
+								this.data.LinkedList[fIndex].Linked = true;
+							} else {
+								this.data.LinkedList.push(cr);
+							}
+
+							uni.setStorageSync(this.StorageKey, this.data
+								.LinkedList);
+
+							let os = plus.os.name;
+							if (os == 'android') {
+								uni.setBLEMTU({
+									deviceId: deviceId,
+									mtu: 512,
+									success: (mtu) => {
+
+										////console.log("mtu设置成功");
+									},
+									fail: () => {
+										////console.log("mtu设置失败")
+									}
+								});
+							}
+
+							resolve(true);
+
+						}).catch((ex) => {
+
+							reject(this.getError(ex));
+						});
+
+
+					},
+					fail: (ex) => {
+						ex = this.getError(ex)
+						console.log("蓝牙连接失败" + JSON.stringify(ex));
+						reject(ex);
+					}
+				});
+			});
+		}
+
+
+
+
+		return new Promise((resolve, reject) => {
+			this.OpenBlue().then((res) => {
+				////console.log("2222222");
+				return linkDevice(deviceId);
+			}).then((res) => {
+				////console.log("11111111");
+				if (res) { //新连接
+					if (fIndex == -1) {
+						console.log("开始获取服务", targetServiceId)
+						return this.getService(deviceId, targetServiceId, writeCharId,
+						notifyCharId); //获取服务	
+					} else {
+						if (!f.notifyState) {
+							this.subScribe(deviceId, true);
+						}
+						return Promise.resolve(true);
+					}
+				} else { //已连接过，直接订阅消息					
+					if (fIndex > -1 && f && !f.notifyState) {
+
+						this.subScribe(deviceId, true);
+					}
+					return Promise.resolve(true); //已连接过的设备无需获取服务
+				}
+
+			}).then(() => {
+
+
+				setTimeout(() => {
+					resolve();
+				}, 500);
+			}).catch((ex) => {
+				////console.log("出现异常", ex);
+				reject(ex);
+			});
+		});
+
+
+	}
+	//断开连接
+	disconnectDevice(deviceId) {
+		var disconnect = (id) => {
+			return new Promise((resolve, reject) => {
+				uni.closeBLEConnection({
+					deviceId: id,
+					success: (res) => {
+						////console.log("蓝牙连接已断开:" + id);
+						this.subScribe(id, false);
+						resolve();
+					},
+					fail: (ex) => {
+
+						reject(this.getError(ex));
+					}
+				});
+			});
+
+		}
+		if (deviceId) {
+			disconnect(deviceId);
+
+			this.data.LinkedList.find(v => {
+				if (v.deviceId === deviceId) {
+					return true;
+				}
+				return false;
+			});
+
+			return;
+		}
+
+		if (this.data.LinkedList.length > 0) {
+			let arr = [];
+			for (var i = 0; i < this.data.LinkedList.length; i++) {
+				let item = this.data.LinkedList[i];
+				if (item.Linked) {
+					arr.push(disconnect(item.deviceId));
+				}
+
+			}
+			if (arr.length == 0) {
+				return;
+			}
+
+			Promise.allSettled(arr).then((results) => {
+				results.forEach((result, index) => {
+					if (result.status === 'fulfilled') {
+						////console.log(`第${index + 1}个Promise成功:`, result.value);
+					} else {
+						////console.log(`第${index + 1}个Promise失败:`, result.reason.message);
+					}
+				});
+			});
+
+		} else {
+			////console.log("无已连接设备");
+		}
+	}
+
+	//向蓝牙设备发送数据，如果没连接将自动连接后再发
+	sendData(deviceid, buffer, writeServiceId, wirteCharactId, ms) {
+
+		// console.log("deviceid=" + deviceid + ",writeServiceId=" + writeServiceId + ",wirteCharactId=" +
+		// 	wirteCharactId + ",timeout=" + ms)
+		if (ms === undefined) {
+			ms = 50;
+		}
+		let c = this.data.LinkedList.find((v) => {
+			return v.deviceId == deviceid;
+		});
+		let device = {
+			deviceId: deviceid,
+			writeServiceId: null,
+			wirteCharactId: null
+		};
+		if (writeServiceId) {
+			device.writeServiceId = writeServiceId;
+		}
+		if (wirteCharactId) {
+			device.wirteCharactId = wirteCharactId;
+		}
+		if (!device.writeServiceId || !device.wirteCharactId) {
+			//console.log("从已连接中找设备")
+			if (c) {
+				device = c;
+			}
+		}
+
+
+
+		let sendBuffer = () => {
+
+			return new Promise(async (resolve, reject) => {
+
+				var promise = new Promise((succ, err) => {
+					if (!c) {
+						err(this.getError({
+							code: 10002
+						})); //没有找到指定设备
+						return;
+					}
+					// console.log("device=", device);
+					uni.writeBLECharacteristicValue({
+						deviceId: device.deviceId,
+						serviceId: device.writeServiceId,
+						characteristicId: device.wirteCharactId,
+						value: buffer,
+						success: () => {
+							console.log("发送数据成功");
+							succ();
+						},
+						fail: (ex) => {
+							ex = this.getError(ex);
+							console.log("发送数据失败", ex);
+
+							err(ex);
+						}
+					});
+				});
+				if (plus.os.name == 'iOS') {
+
+					function timeOut(ms) {
+						return new Promise((_, err) => {
+							setTimeout(() => {
+								err({
+									code: -1,
+									errMsg: '超时了'
+								})
+							}, ms);
+						});
+					}
+
+					Promise.race([timeOut(ms), promise]).then(resolve).catch((ex) => {
+						console.log("ex=", ex);
+						if (ex.code == -1) {
+							resolve(ex);
+						} else {
+							reject(ex);
+						}
+
+					}).finally(() => {
+						//console.log("完成了")
+					});
+				} else {
+					promise.then(resolve).catch(reject);
+				}
+			});
+
+		}
+		if (c.Linked) {
+			// console.log("蓝牙已连接，直接发送");
+			return sendBuffer();
+		} else {
+			// console.log("先连接蓝牙再发送");
+			return new Promise((resolve, reject) => {
+				let f = this.data.LinkedList.find((v) => {
+					return v.deviceId == deviceid;
+				});
+				if (!f) {
+					reject({
+						code: '-9',
+						msg: '蓝牙未连接过此设备,请重新使用蓝牙添加该设备'
+					});
+					retrn;
+				}
+				this.LinkBlue(f.deviceId, f.writeServiceId, f.wirteCharactId, f.notifyCharactId).then((
+					res) => {
+					console.log("连接成功");
+					return sendBuffer();
+				}).then(() => {
+					//console.log("发送成功")
+					resolve();
+				}).catch((ex) => {
+					//console.log("出现异常", ex);
+					reject(this.getError(ex));
+				});
+			});
+		}
+
+
+	}
+
+	//将点阵数据转换成RGB565
+	convertToRGB565(pixels, type) {
+		if (!type) {
+			type = 'rgb';
+		}
+		const result = new Uint16Array(pixels.length / 4);
+		let index = 0;
+		for (let i = 0; i < pixels.length; i += 4) {
+			let r = pixels[i];
+			let g = pixels[i + 1];
+			let b = pixels[i + 2];
+			let a = pixels[i + 3];
+
+			if (type == 'bgr') {
+				result[index++] = (b >> 3) | ((g & 0xFC) << 3) | ((r & 0xF8) << 8);
+			} else {
+				result[index++] = ((r & 0xF8) << 8) | ((g & 0xFC) << 3) | (b >> 3);
+			}
+
+		}
+
+		return result;
+	}
+
+	setBleData() {
+		uni.setStorageSync(this.StorageKey, this.data.LinkedList);
+	}
+}
+
+let instance = null;
+export default {
+	getBleTool: function(found, receive) {
+		if (!instance) {
+			instance = new BleHelper();
+
+		} else {
+			////console.log("调用现有实例");
+		}
+
+		return instance;
+	}
+}
\ No newline at end of file
diff --git a/utils/BleReceive.js b/utils/BleReceive.js
new file mode 100644
index 0000000..c3b11ae
--- /dev/null
+++ b/utils/BleReceive.js
@@ -0,0 +1,411 @@
+class BleReceive {
+	constructor() {
+		this.StorageKey = "linkedDevices";
+		
+	}
+	
+	getCurrentPagePath() {
+	
+		const pages = getCurrentPages();
+	
+		if (pages.length === 0) {
+			console.log("pages.length=0");
+			return "";
+		}
+	
+		const currentPage = pages[pages.length - 1];
+		console.log("currentPage=", currentPage.route);
+		return currentPage.route;
+	}
+	
+	
+	setBleFormData(data,f) {
+		if(data){
+			let linkedList=uni.getStorageSync(this.StorageKey);
+			linkedList.find((v)=>{
+				if(f.deviceId==v.deviceId){
+					let keys=Object.keys(data);
+					keys.forEach((key)=>{
+						if(!v.formData){
+							v.formData={};
+						}
+						if(!f.formData){
+							f.formData={};							
+						}
+						v.formData[key]=data[key];
+						f.formData[key]=data[key];
+					});
+					
+					uni.setStorageSync(this.StorageKey,linkedList);
+				}
+			});
+		}
+		
+	}
+	
+	
+	ReceiveData(receive,f,path) {
+			if(f && f.macAddress && f.id){		
+				let data={};
+				if(f.detailPageUrl=='/pages/6155/deviceDetail'){
+					console.log("该设备是6155");
+					data= this.Receive_6155(receive,f,path);
+				}
+				
+				if(f.detailPageUrl=='/pages/650/HBY650'){
+					console.log("该设备是650");
+					data= this.Receive_650(receive,f,path);
+				}
+				if(f.detailPageUrl=='/pages/670/HBY670'){
+					console.log("该设备是670");
+					data= this.Receive_670(receive,f,path);
+				}
+				console.log("收到数据并处理完毕,",data);
+				return data;
+			}
+			console.log("已收到该消息,但无法处理",f);
+		
+	}
+
+	Receive_650(receive,f,path) {
+		console.log("通用程序正在处理650的数据",receive);
+		
+		var parseData = () => {
+			let bytes = receive.bytes;
+			if (bytes[0] == 0x55) {
+				
+				try {
+					
+					let staticLevelByte = bytes[1];
+					let staticLevelText = '未知';
+					let modeCurr = "";
+					
+					switch (staticLevelByte) {
+						case 0x65:
+							staticLevelText = '高档';
+							modeCurr = "hight";
+							break;
+						case 0x66:
+							staticLevelText = '中档';
+							modeCurr = "center";
+							break;
+						case 0x67:
+							staticLevelText = '低档';
+							modeCurr = "low";
+							break;
+						case 0x68:
+							staticLevelText = '关闭';
+							modeCurr = "close";
+							break;
+					}
+		
+					// 解析照明档位
+					let lightingLevelByte = bytes[2];
+					let lightingLevelText = lightingLevelByte === 0x6e ? '开启' : '关闭';
+		
+		
+					// 解析剩余照明时间（第三和第四字节，大端序）
+					let lightingTime = (bytes[3] << 8) | bytes[4];
+					let hours = Math.floor(lightingTime / 60);
+					let remainingMinutes = lightingTime % 60;
+					let xuhang = '0分';
+					// 处理不同情况的显示
+					if (hours === 0) {
+						xuhang = `${remainingMinutes}分`;
+					} else if (remainingMinutes === 0) {
+						xuhang = `${hours}小时`;
+					} else {
+						xuhang = `${hours}小时${remainingMinutes}分`;
+					}
+		
+					// 解析剩余电量
+					let batteryLevelByte = bytes[5];
+					// 电量百分比范围检查
+					let batteryLevel = Math.max(0, Math.min(100, batteryLevelByte));
+					let iswarn = false;
+					let warn = bytes[6];
+					if (warn == 0x00) {
+						warn = '无预警';
+					} else if (warn == 0x01) {
+						warn = '弱预警';
+					} else if (warn == 0x02) {
+						iswarn = true;
+						warn = '中预警';
+					} else if (warn == 0x03) {
+						iswarn = true;
+						warn = '强预警';
+					} else if (warn == 0x04) {
+						iswarn = true;
+						warn = '非常强预警';
+					}
+					
+					let formData={};
+					formData.battary = batteryLevel;
+					formData.xuhang = xuhang;
+					formData.cMode = lightingLevelByte === 0x6e;
+					formData.modeCurr = modeCurr;
+					formData.warnLevel = warn;
+					formData.iswarn = iswarn;
+					this.setBleFormData(formData,f);
+				
+					let route=this.getCurrentPagePath();
+					console.log("f=",f);
+					console.log("route="+route);
+					if (iswarn &&  f.detailPageUrl.indexOf(route)==-1 ) {											
+						uni.showModal({							
+							content:"环境存在漏电电源",
+							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' 
+												});
+											}
+										});
+									}								
+								}
+							}
+						})
+					}else{
+						console.log("当前全局不处理此消息");
+					}
+					return formData;
+				} catch (error) {
+					return null;
+				}
+			}
+			
+			if (receive.str) {
+				try {
+			
+					let str = receive.str;
+			
+					if (str.indexOf('mac address:') == 0) {
+						let formData={};
+						formData.macAddress = str.split(':')[1];
+						this.setBleFormData(formData,f);
+						return formData;
+					} 
+					else{
+						let receiveData={a:1};
+						try {
+							let json=JSON.parse(str);
+							
+							if("staBlue_picture" in json){
+								//重发图片
+								console.log("收到重新发送图片的命令");
+							receiveData=json;
+							}
+							else if("staBlue_text" in json){
+								//重发文本
+								console.log("收到重新发送文本的命令");
+								receiveData=json;
+							}
+							else if("staBlue_vidio" in json){
+								//重发视频
+								console.log("收到重新发送视频的命令");
+								receiveData=json;
+							}
+							else if("staBlue" in json){
+								if(json.staBlue=="finish"){
+									console.log("收到设备回复,全部传输完成");
+									receiveData=json;
+								}
+							
+							}
+							else{
+								receiveData={};
+								console.log("无法解析该文本");
+							}
+							
+							
+							
+						} catch (error) {
+							receiveData={};
+							console.log("文本解析失败")
+						}
+						return receiveData;
+					}
+					return null;
+				} catch (ex) {
+					return null;
+				}
+			}
+			
+		}
+		
+		let data=parseData(receive.bytes);
+		console.log("data=",data);
+		return data;
+		
+	}
+
+    Receive_670(receive,f,path){
+		
+		var todo = (bytes) =>{
+			console.log("todo");
+			let receiveData = {};
+			if (bytes[0] == 0x55) {
+				try {
+						console.log("todo");
+					// 跳过帧头(第一个字节)，从第二个字节开始解析
+					let staticLevelByte = bytes[1];
+					let staticLevelText = '';
+					switch (staticLevelByte) {
+					case 0x65:
+						staticLevelText = 'hight';
+						break
+					case 0x66:
+						staticLevelText = 'center';
+						break
+					case 0x67:
+						staticLevelText = 'low';
+						break
+					case 0x68:
+						staticLevelText = 'close';
+						break
+					}
+			console.log("todo");
+					// 解析照明档位
+					let lightingLevelByte = bytes[2];
+					let lightingLevelText = lightingLevelByte === 0x6d ? 'hight': lightingLevelByte === 0x6e ? 'low': 'close';
+		
+					// 解析剩余照明时间（第三和第四字节，小端序）
+					let lightingTime = (bytes[3] << 8) | bytes[4];
+		
+					// 解析剩余电量 // 电量百分比范围检查
+					let batteryLevelByte = bytes[5];
+		
+					let batteryLevel = Math.max(0, Math.min(100, batteryLevelByte));
+			console.log("todo");
+					let warn = bytes[6];
+					if (warn == 0x00) {
+						warn = 'none';
+					} else if (warn == 0x01) {
+						warn = 'ruo';
+					} else if (warn == 0x02) {
+						warn = 'center';
+					} else if (warn == 0x03) {
+						warn = 'hight';
+					} else if (warn == 0x04) {
+						warn = 'veryhight';
+					}
+		
+					let staticWarn = bytes[7] == 0x01;//静止报警
+					let fourGStrenth = bytes[8]; //4g信号强度
+					let sosTxt = bytes[9] == 0x00 ? 'close' : bytes[9] == 0x01 ? 'sg' : 'rb';
+						console.log("todo");
+					receiveData.modeCurr = staticLevelText;
+					receiveData.lightCurr = lightingLevelText;
+					receiveData.xuhang = lightingTime ;
+					receiveData.battary = batteryLevel;
+					receiveData.warnLevel = warn;
+					receiveData.staticWarn = staticWarn;
+					receiveData.fourGStrenth = fourGStrenth;
+					receiveData.SOS=sosTxt;
+				} catch(error) {
+					console.log('数据解析错误:', error);
+				}
+				console.log("todo");
+			} else {
+				try {
+					let uint8Array = new Uint8Array(receive.value);
+					let str = '';
+					for (let i = 0; i < uint8Array.length; i++) {
+						// 将每个字节转换为对应的字符
+						str += String.fromCharCode(uint8Array[i]);
+					}
+					if (str.indexOf('mac address:') == 0) {
+						receiveData.macAddress = str.split(':').slice(1).join(":");
+						 console.log('收到mac地址:', +this.receiveData.macAddress);
+					} else if (str.indexOf('imei:') == 0) {
+						receiveData.imei = str.split(':')[1];
+						console.log('收到IEMI:', +this.receiveData.macAddress);
+						
+					} else if (str.indexOf('longitude:') == 0) {
+						receiveData.Lon = str.split(':')[1];
+						console.log('收到经度:', +this.receiveData.macAddress);
+					} else if (str.indexOf('latitude:') == 0) {
+						receiveData.Lat = str.split(':')[1];
+						console.log('收到纬度:', +this.receiveData.macAddress);
+					} else {
+						try {
+							let json=JSON.parse(str);
+							if("staBlue_picture" in json){
+								//重发图片
+								console.log("收到重新发送图片的命令");
+							receiveData=json;
+							}
+							else if("staBlue_text" in json){
+								//重发文本
+								console.log("收到重新发送文本的命令");
+								receiveData=json;
+							}
+							else if("staBlue_vidio" in json){
+								//重发视频
+								console.log("收到重新发送视频的命令");
+								receiveData=json;
+							}
+							else if("staBlue" in json){
+								if(json.staBlue=="finish"){
+									console.log("收到设备回复,全部传输完成");
+									receiveData=json;
+								}
+							
+							}
+							else{
+								receiveData={};
+								console.log("无法解析该文本");
+							}
+							
+							
+							
+						} catch (error) {
+							receiveData={};
+							console.log("文本解析失败")
+						}
+					}
+				} catch(ex) {
+					receiveData={};
+					console.log('将数据转文本失败', ex);
+				}
+			}
+			console.log("todo",receiveData);
+			this.setBleFormData(receiveData,f);
+			return receiveData;
+		}
+		
+		
+		let data=todo(receive.bytes);
+		
+		return data;
+	}
+	Receive_6155() {
+		console.log("通用程序正在处理6155的数据");
+	}
+
+
+}
+
+
+
+let receiveInstance = null;
+export default {
+	getBleReceive: function(found, receive) {
+		if (!receiveInstance) {
+			receiveInstance = new BleReceive();
+
+		}
+		return receiveInstance;
+	}
+}
\ No newline at end of file
diff --git a/utils/Common.js b/utils/Common.js
new file mode 100644
index 0000000..1daf10b
--- /dev/null
+++ b/utils/Common.js
@@ -0,0 +1,218 @@
+var cfg={
+	Version:'Uat',//Dev:开发环境，Uat:Uat环境，Relese正式环境
+	DevApi:'http://192.168.110.54:8000/',//开发环境
+	UatApi:'http://114.55.111.217/',//UAT环境
+	ReleseApi:'http://relese:3169/api/'//Relese环境
+}
+export default {
+	   baseURL : cfg.Version=='Dev'?cfg.DevApi:(cfg.Version=='Uat'?cfg.UatApi:cfg.ReleseApi),
+	   guid:function generateUUID() {
+		  return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function(c) {
+		    const r = Math.random() * 16 | 0;
+		    const v = c === 'x' ? r : (r & 0x3 | 0x8);
+		    return v.toString(16);
+		  });
+		},
+		alert: function(title, content, callback) {
+			if(!title){
+				title='提示'
+			}
+			if(!content){
+				content=title;
+			}
+			
+			uni.showModal({
+				title: title,
+				content: content,
+				success: function(res) {
+					if (res.confirm) {
+						console.log('用户点击确定');
+					} else if (res.cancel) {
+						console.log('用户点击取消');
+					}
+
+					if (callback) {
+						callback(res);
+					}
+				}
+			});
+		},
+		
+		showLoading:function(title,mask){
+			uni.showLoading({
+				title:title,
+				mask:mask,
+			})
+		},
+		hideLoading:function(){
+			uni.hideLoading();
+		},
+		showToast:function(title,mask,duration,callback){
+			if(!duration){
+				duration=1500;
+			}
+			if(mask==undefined){
+				mask=false;
+			}
+			uni.showToast({
+				title:title,
+				mask:mask,
+				duration:duration,
+				callback:callback,
+				icon: 'none'
+			})
+		},
+		GetData:function(url,data,method,contentType,succ,err,complete){
+			var these=this;
+			if(!url){
+				console.error("url为空");
+				return;
+			}
+			
+			if(url.toLowerCase().indexOf('http://')==-1 || url.toLowerCase().indexOf('https://')==-1){
+				if(url.indexOf('/')==0){
+					url=url.substr(1,url.length-1);
+				}
+			let ServerPath=these.DevApi;
+				if(these.Version==='Dev'){
+					ServerPath=these.DevApi;
+				}
+				else if(these.Version==='Uat'){
+					ServerPath=these.UatApi;
+				}
+				else if(these.Version==='Relese'){
+					ServerPath=these.ReleseApi;
+				}else{
+					these.DevApi
+				}
+				url=ServerPath+url;
+			}
+			
+			var these=this;
+			if(!method){
+				method='POST';
+			}
+			method=method.toUpperCase();
+			
+			if(!contentType){
+				contentType='application/json;charset=UTF-8';
+			}
+			
+			these.checkLAN(
+			
+			function(){
+				these.showLoading('请稍候..',true);
+				setTimeout(function(){
+					uni.request({
+						url:url,
+						data:data,
+						header:{
+							"Content-Type":contentType
+						},
+						method:method,
+						timeout:60000,
+						dataType:'json',
+						success:function(json){
+							
+							if(succ){
+								succ(json);
+							}
+						},
+						fail:function(ex){
+							
+							if(err){
+								err(ex);
+							}
+						},
+						complete:function(){
+							
+							if(complete){
+								complete();
+							}
+						}
+					});
+					
+				},0);
+				
+			}
+			
+			,function(){
+				these.showToast('无网络连接');
+			});
+		},
+		checkLAN:function(succ,error){
+			uni.getNetworkType({
+			  success: (res) => {
+			    const networkType = res.networkType;
+			   
+			    
+			    // 判断网络是否连接
+			    if (networkType === 'none') {
+					console.error('无网络连接')
+			      if(error){
+					  error();
+				  }
+			    }else{
+					if(succ){
+						succ();
+					}
+					
+				}
+			  },
+			  fail: (err) => {
+			    console.error('获取网络状态失败：', err);
+				if(error){
+					error();
+				}
+			  }
+			});
+			
+		},
+		DateFormat: function(date, format) {
+			if(!date){
+				date=new Date();
+			}
+			if(!format){
+				format='yyyy-MM-dd HH:mm:ss';
+			}
+			// 处理参数默认值
+			if (typeof date === 'string' || typeof date === 'number') {
+				date = new Date(date);
+			}
+			date = date instanceof Date ? date : new Date();
+			format = format || 'yyyy-MM-dd';
+		
+			// 检查日期是否有效
+			if (isNaN(date.getTime())) {
+				return 'Invalid Date';
+			}
+		
+			// 定义格式化映射
+			const formatMap = {
+				'yyyy': date.getFullYear(),
+				'MM': String(date.getMonth() + 1).padStart(2, '0'),
+				'dd': String(date.getDate()).padStart(2, '0'),
+				'HH': String(date.getHours()).padStart(2, '0'),
+				'mm': String(date.getMinutes()).padStart(2, '0'),
+				'ss': String(date.getSeconds()).padStart(2, '0'),
+				'SSS': String(date.getMilliseconds()).padStart(3, '0'),
+				'M': date.getMonth() + 1,
+				'd': date.getDate(),
+				'H': date.getHours(),
+				'm': date.getMinutes(),
+				's': date.getSeconds(),
+				'S': date.getMilliseconds()
+			};
+		
+			// 替换格式字符串中的占位符
+			return format.replace(/(yyyy|MM|dd|HH|mm|ss|SSS|M|d|H|m|s|S)/g, (match) => {
+				return formatMap[match];
+			});
+		}
+		
+		
+		
+		
+	
+
+}
\ No newline at end of file
diff --git a/utils/gbk.js b/utils/gbk.js
new file mode 100644
index 0000000..61ac280
--- /dev/null
+++ b/utils/gbk.js
@@ -0,0 +1,122 @@
+export default {
+
+	arr2hex: function(arr) {
+		return arr.reduce(function(s, v) {
+			s += '';
+			s += ('00' + v.toString(16)).match(/..$/)[0];
+			return s;
+		}, "");
+	},
+	decode: function(arr) {
+		var arr_index = 0x8140;
+		var str = "";
+		var gbk_us = this.gbkus();
+		for (var n = 0, max = arr.length; n < max; n++) {
+			var code = arr[n] & 0xff;
+			if (code > 0x80 && n + 1 < max) {
+				var code1 = arr[n + 1] & 0xff;
+				if (code1 >= 0x40) {
+					code = gbk_us[(code << 8 | code1) - arr_index];
+					n++;
+				}
+			}
+			str += String.fromCharCode(code);
+		}
+		return str;
+	},
+	encode: function(str) {
+
+		var arr_index = 0x8140;
+		str += '';
+		var gbk_us = this.gbkus();
+		var gbk = [];
+		var wh = '?'.charCodeAt(0); //gbk中没有的字符的替换符
+		for (var i = 0; i < str.length; i++) {
+			var charcode = str.charCodeAt(i);
+			if (charcode < 0x80) gbk.push(charcode);
+			else {
+				var gcode = gbk_us.indexOf(charcode);
+				if (~gcode) {
+					gcode += arr_index;
+					gbk.push(0xFF & (gcode >> 8), 0xFF & gcode);
+				} else {
+					gbk.push(wh);
+				}
+			}
+		}
+		return gbk;
+	},
+	
+	
+	gbkus: function() {
+		
+		var Fn_unzip=function() {
+			return arguments[0].replace(/\x23(\d+)\x24/g, function(a, b) {
+					return Array(+b + 4).join("#");
+				})
+				.replace(/[\x26-\x7e]\x25[\x26-\x7e]/g, function(a) {
+					var b = a.substr(0, 1).charCodeAt(0),
+						e = a.substr(2).charCodeAt(0),
+						str = String.fromCharCode(b);
+					while (b++ < e) {
+						str += String.fromCharCode(b);
+					}
+					return str;
+				})
+				.replace(/\x23/g, "###")
+				.replace(/([\x26-\x7e]{2})\x21([\x26-\x7e\x23]+)(?:\x20|$)/g, function(all, hd, dt) {
+					return dt.replace(/./g, function(a) {
+						if (a != "#") {
+							return hd + a;
+						} else {
+							return a;
+						}
+					});
+				})
+				.match(/.../g);
+		}
+		
+		var gbkArray= function(gbkArr) {
+		
+			var Fn_Hex_decode = function() {
+				var n = 0,
+					str = arguments[0];
+				for (var i = 0, w = str.length; i < w; i++) {
+					var code = str.charCodeAt(i);
+					if (code < 38 || code > 126) return NaN;
+					n += (code - 38) * Math.pow(89, w - i - 1);
+				}
+				return n;
+			};
+		
+			var data = [];
+			for (var i = 0x81, k = 0; i <= 0xfe; i++) {
+				if (data.length > 0) {
+					data.length += 0x40 + 1;
+				}
+				for (var j = 0x40; j <= 0xfe; j++) {
+					if (
+						(j == 0x7f) ||
+						((0xa1 <= i && i <= 0xa7) && j <= 0xa0) ||
+						((0xaa <= i && i <= 0xaf) && j >= 0xa1) ||
+						(0xf8 <= i && j >= 0xa1)
+					) {
+						data.push(undefined);
+						continue;
+					}
+					var hex = gbkArr[k++];
+					var key = Fn_Hex_decode(hex);
+					data.push(key ? key : undefined);
+				}
+			}
+			return data;
+		}
+		
+		var arr = gbkArray(Fn_unzip(
+			"(T!HJ%LUX]e%gilotuwy{} (U!)-%/137>BDGHO%RTUW%\\_a%jl%rtw} (V!*+-0%27>C%EHJ%MP%R\\`cdfn%ptvz{} (W!()*,/3%579;=%CFGM%QWX\\^cdg%ilnprtvy%} (X!&')%.468CDHJLMOPSTWY%\\_b%dg%ilnprtuwxz%|~ (Y!'(*+-469%=?%GI%KO%RT%V[%_bdikmnptuy{}~ (Z!&')+%-/%;>@ACE%GKMNPR%TW[_%ikmo%rt%vy%{} ([!'(%+-%024%;=%BD%LO%QSTX%[]^`%ce%y{} (\\!()+%/1%7:%LN%SU%WY%cf%im%prt%xz%~ (]!&'%*-%/1%68%EG%cgloqs%uwx|%~ (^!')%-/02356;>FJKOPRSVWZ%]_`dfi%kmor%vyz (_!'+%-124%68;=@ACE%MOQRUVX%]_adegjqwx|~ (`!&)*-%/689;%=?%ADFIKLNOVX^%cehilmoq%uwyz|%~ (a!'),%/124%=?AD%HJ%PRSU%[]e%ho%qu%~ (b!()*,%.024%79;%=?A%FH%KM%WY%`c%ei%loq%tvy%| (c!'*+-.1346%8:%<>%GKLOQSUZ%\\_cghjltwy{| (d!(,/1%4679=>@D%JLMOQRTVWZ]`%ce%km%pr%tvy%} (e!+,-/0279%;>?DQW[%]_bdhqu%wy (f!&().47:;>ACEFHIKMP%SU^a%egikm%tx}~ (g!)*,.02%58<>BCGI%MPY[]`%bdeginpuv (h!(*-2%6=>A%CF%KMPRT%WZ\\%`deg%ln%qswxz{} (i!&+-%/1%469;>@AD%HJ%MP%TV%Y[\\abdh%mrsvx~ (j!&,%.0235%7:;>@%FH%PRTVXZ\\_%cf%hjkn%puw%{~ (k!').04578;=?%CFI%NQRTW%^`acdg%ilmo%ru%wz|~ (l!&(*%,.%9=%ACDHIK%OQS%U[%^`%ce%hk%ru%{~ (m!&')%79%CE%KM%PR%^`%hjkmnqxz%~ (n!&(*+./2%478<%>ACG%WYZ\\%^`%cgmnp%txy{} (o!&'%)+,.5%9;<EFHJOQS%UWX[%]`%dj%mp%tw%} (p!&'%)/2469%;=?%AC%KN%TVWZ[]`aefhk%mo%vxz%} (q!&'(,-/024%69%;=?%AC%EG%IK%NPSTV%Z\\%`b%eg%tv%| (r!&'(*+-%/1%57%<>%BE%UWZ\\^%`b%il%ps%ux%~ (s!&)%:<%?A%CE%OQ%SU%bd%ilnpqstvwy%~ (t!&')+,.%246%9=>ACDF%ILNRVXY[\\ac%fiklprsvxy (u!&(%,.013%?BDG%IK%MRVXY[%^abeg%jl%ostyz}~ (v!'(%,.013%9;%=@%CIJMOR%VXZ[]%_a%lnp%rtv~ (w!&(%+-/%24%689<=?A%CE%KNPR%VX%Z\\%`bcf%oq%tv%|~ (x!&'(*+-%5:;=%@B%SU%[^%km%svxy{%~ (y!&(),%1346%:<>@B%DF%HKMNPQSU%Y[%qs%~ (z!()%ACEFH%OQ%_bfnpqwx{}~ ({!&)+-%023569=ADEG%IKMV^%`c%fhinq%swxz (|!&'%)+%-/2%:>@ADEG%KMO%U[\\^`acefi%lnpquwy|%~ (}!&(+-%02%578:%<HIKLQRW%Y[%]_%bdgil%ruw%} (~!'(%*,/%35%7:;>?AI%MP%TVZ%\\^`be%hjlnoq%vx%} )&!&'%+-%356:<>?ABD%MO%TWX[%`b%fhj%mopr%vx{}~ )'!&)%-/%69%@BCG%QSTVX%bdghj%mo%{}~ )(!&'%9;%=?%WY%eg%mo%{} ))!'(+,2458=>@%DGHLOQ%SUVZ[_f%mp%twxz%~ )*!()-%025%:<%BE%IKLNOR%`dfhmp%rtwx{%} )+!(.137%:>%BD%HJP%SU%^a%fjkm%pr%} ),!&(%02568%:B%DFI%KMOQSVWY%[^%aehikmo%uxz%|~ )-!&'%358=%@B%DGIKLORSVX%Z\\^a%cgjq%suwxz~ ).!&(%+-%2467:%?AC%FI%MRSUVY^%`e%gijmnpqstwz{}~ )/!&()+,.9%;=>BCEIJLPQT%V^%`b%fh%loprv%|~ )0!'(*,-/%1457%:>?GJKMNPWY%[^%acdg%jlnp%ruwz{}~ )1!')*.035%79:=%DG%IL%PR%TVWY[^a%ejqruwx{%~ )2!&)%,.1%37%;=%@B%EHILO%QS%eg%nprtvwy%{}~ )3!&'%*,%/1%47%=?%BDF%XZ[]%ac%jl%txy{%~ )4!&'%+-%24%68%<>A%EHJ%Z\\%ik%su%z|~ )5!/058%:<?B%EGIK%NQRT%X^`%bfklq%suvx%~ )6!'(+4578:;=>@D%FH%KN%SW\\_%afijlmp%su%wy%{} )7!(*+-59;?GHJKNTUZ\\_b%ejm%pt%wyz|%~ )8!&(%*-78:=%?ABD%ILMO%RUXY[b%eg%nqu%wy{%} )9!'(*%-014%79;%>CEIK%MOQ%WY\\^cgijmnqsuw%{} ):!&')%+02%46%<>AC%GJKM%PRTVX%[]bce%ilmpqt%y|~ );!()%+-%/14%9;%?ABDFHIOQ%WY[%]_%ce%lnp%rt%} )<!()%.035%=@ADEG%JL%PR%UWX\\^%acfhj%lnpqs%y|~ )=!'(%*-%13%579;%SU%\\^%eg%km%xz%~ )>!'(+%.2578;%?ABEFHIKM%ORSUWZ%\\_`b%eh%jlnpqs%~ )?!&'(*%,/%146%8:<?@BDEHJLNPS%Z\\]`%bdi%lorsu%wz%~ )@!&'(*,-34;%>ABD%HJMNP%RTVY%[_%ac%egj%mor%uwy{| )A!'(%+-/024%:=>@AHIK%NPRSUWY%]a%cehik%mo%qsuvx%{}~ )B!&')%,/%35%=@%DF%JL%OQ%TV%oqu%|~ )C!&(%-/34689;?%EJLMO%QTV%XZ\\^%ceglnpqt%wyz|} )D!&)*,/0279:<%@BG%IKLPQSVY[]%`beghjkmoq%tv%y{~ )E!'+%-0258:=>@E%LNQ%Za%cgkmopr%tvwyz~ )F!()%/14%79@CEGHK%OQ%SU%[^%dg%imnrz~ )G!'),0%9DF%MOR%Z\\^a%hj%ln%pr%{}~ )H!&*%-/2357%@BD%IKMO%RTUWXZ\\%`bce%nps%uw%y|~ )I!&'(*%,.%2479;%FI%KM%TVWY%[]%`b%dfhik%{}~ )J!'(*+.01346%9;<>?A%EIJL%NPRTY%[]%befhil%uxy{}~ )K!&()+,.%02%68%?ACEG%IK%PR%TW%bd%gi%rtv%~ )L!&(%36%;=?%DFH%KMO%QS%Y\\%`bce%ln%twy%} )M!&'(*%46%<>?A%CE%GI%QSV%Z\\%ce%lnq%~ )N!&'%~ )O!&'%178:%CE%HJM%OQ%TVWZ\\]_%jl%sz{}~ )P!&'%136%9>AEG%JMNP%RU%Y[%bd%koq%wy|} )Q!&'%*,.018:<%@B%IL%NP%RTV%XZ%\\^%dh%lnrw|%~ )R!'*,2%48:=>@%CEFJ%LOR%VX%Z]_%aijl%nr%vxz|~ )S!&(%*-.2589;<?@C%FHJ%LNPVZ]^b%ehn%qt%vy{%} )T!&'-%/1249;<>ABGINTUWXZ[]%_bd%fh%kmqrt%y{}~ )U!()+,02%46;<>@EHLQ%TWY[]^`acdg%il%oqru%wy%} )V!&')*-.02359%=?EHOPSTVWYZ\\%ad%fk%mp%su%xz}~ )W!&),-/1%479:<>%@BDG%NP%SUY\\]_bcefhilp%rtvxz{} )X!&'(*,%36%=@%CFHJKM%OQ%[]^`%nq%suxy{%~ )Y!&)%/1%35689;<>@AC%FHKMPQTV%X[%^`%bd%fhjnpqs%u{ )Z!&)%24%79%@B%DFGI%MO%QU%^`%bd%gkmoqstv%|~ )[!&'%+.%024%=?%ACE%GI%KM%RU%WY[%]_ac%ik%mpqu%~ )\\!&'(*%-/%35%?ABDEG%LNP%UW%]`%jlo%z}~ )]!&'%DF%MP%VX%hj%ln%~ )^!&()+%8:%EIL%ORT%VX\\%_a%cf%hj%lnrsuvy%~ )_!&'%,246%8<@AF%IKM%Y\\^%`b%eglpr%xz|%~ )`!'(%14%8:;=@D%NP%W[%^`%mo%rtvx%~ )a!&'%+-/%359%=?%AD%GIKLN%SU%Y[%^`%ce%gj%nq%wy%{}~ )b!&'%)+-%/1%9;%DF%JM%VX%[]_%df%oq%|~ )c!&'%:<%EGIK%MP%RXZ\\^%dg%il%oq%suvxz|~ )d!()*-/%25689;%=@%BGHJ%NQSUVX%ce%psv%xz )e!&'%,1%35%8;=?%BDFG 'W!,-. &(+&.'&-~&'u'W!/1 ')>.<V')!@PBCFG 'W!@A4%;BC<= &'~&(!Kk '/!J;< '.!~| '/!>= '.u'/!K. '0`'/!94 '1t'0T'/!?Bu`\\Q1t '0!)* '/!xy2IH ';!*( &'}')!\\] '+{.;U&'q.>!&' ')Z&'t',5':!GF '9!eiha`;:ML ')e'-!XVWY 'W?'-!67%?#3$ '6!-.%@ '5!rs%~ '6!&'%, '5!^_%g## ']!67%?## '-!&'%1## .;!RST .>+.;!VW%~ .<!&'%U .>)'W!mn%~ 'X!&'%f#8$t%~ 'Y!&'%p#5$ &0!=>%MO%U#5$]%mo%u#4$ .9!89<=BC@AD%G##>?:;4#67#6$ &1!cd%hTi%~ &2!&'%)#12$*%/K0%I#10$ &.!()7 ')!=?O_ '+}',('-!\\]%_ '/!)37fz{ '0z'8!CD%ft%~ '9!&'%)-%/VW|%~ ':!&J '0P'W!>IJ#8$ &(!uU &+7&(T&).&(]&)6&(\\&)F&(a&+9&(`&)h&(g&+;&(f&*-&(n&+=&(m&+!?ACE &(!p^ &,a-Qc&)!_c -Qd&,q#1$'Z!&'%J#18$ 'W!MN%U '^`'a!@AN%PSv 'b!'*+. .93.>!(*# ',@']G#'):#0$'Yv'X!no 'Y!wx 'W2'X!pq .9!LM%UW%Z\\%ik%n -R!*+%6 'W3#10$'7!LM%~ '8!&'%>#12$ )e!HIKN%SVWabei%lnp%uw%y{%~ )f!'+%-23679%;@BCEFHIM%PS%_abdf%ik%rt%~ )g!(*%79%=?@BDFGIJL%OQ%TV%XZ[]%bdfgkn%prsv%y{}~ )h!&'(,-/3%9;%>@B%EGIK%MO%RT%cehil%or%z}~ )i!&'%)+,/13579:?%CE%HJ%\\^`eh%tvwy%} )j!'(%,.13%57%9;<>@%JLN%UY%hj%~ )k!&')%1357;=%CF%IKN%TV%Y[%bdfhj%mqstv%z|} )l!'+1369:<>%ACDFGJM%PR%UZ%ad%fh%npr%tw%{}~ )m!&()+%.0%2479<?@BFJ%NQZ[^_c%ejopr%uw{}~ )n!'(*%,047%:=>@%CEFHIMOQ%TVX%Z\\%_aeg%ilnrswyz|} )o!()+%-/346%=@%EGI%MOQ%TV%\\^%`b%iklnq%suw{|~ )p!&()+-.013%<>%FHILN%WYZ\\ (iC*r5(pM)89(gy(h[(gk)p*)o>*A;)s|*9E)ui)cO*s5*ux)R/({@(Z*)7s)B.(~d*4~)F{*42)@K)pg(_l)>Q)a|*2'*Jb(\\0(u2)4?)\\@*9t)8])5n(eJ(f+)|s(^7)mH))<)7>*Yr*ua)6M*2O(o@*t|*0J)cV)oo)E[)op);L(XR*W~)7F)z6)?3)hN);2)66*8L*xa)Dd)cf)61)76(Wo)k9(cY(a_*.d*b,))v)G`)Jk*6R*.k)HS)vH*E'*oR([d*U/*:L*4b(bm*L>(a&)p!]`bdelnrsu%wy%} )q!&'%-035%7:;=?@BCEFJLN%X[%^ac%egj%lnp%ty{}~ )r!&)+%-/%69%@C *B**t=(Yf(qR*{F({T)6!th )BK*V+++A)b})DT)um)12(c!`& *^r*4P*Wv*mT(Z=)e4(t-)1k)`B*K0(tz*:])Cj)}<)&|*/8)l*)TJ*[[*`!0t +3')Q4*cF)}()-`)v**@.*A<)Q!596 ))I)*v)nD*q<)>X),G).P*_0(s@*7;*a^*rQ*v?*_J*/W*X,)5](YH(e5(cm*_!9:< *a,)F:)-N*6j*JF+,1)3Y(`E)nu)-P)?.)\\_)Z'({u);N(^!A| )EP(T_)yA*{Q)_5)r!DE%GKNPQT%_a%ch%jm%rvwz%~ )s!&'%,/12469;%=?@BD%HJLN%Z\\%df%hk%or )mi)*e)gu*=C)<Z)7R*mh)T7(ci(b+):n*mu)~O(Wj))c*8V*5A*6\\)Wn)Sx*~=)8f(ck(hL*JC(pj(TS))K)Ow*'H*bn)/H)=:)f/*KF)D5)5i*W{)rS*Zw*eB)-M*=?*@y*z>(dx*E0)PD)1!mh )^Z*:;*8Q(Vg)SU*Bu)<z*)0)Ks)C7*;^(dK)}j(Y0(^X)UG(}G*[b):1(e&*;!AK )Eq)v7);C(|=(~@))6*TK)70)F'*V,):_)9r*G2*{`*T{*/a*nL(V;*q_*y+)@U)f))s!tvx}~ )t!&')*,.%18%=?@C%EHJNPSU%WY]_`cdf%hjkrtv%y{}~ )u!&')+-/04%8:%EK%RT%WY%_ (nv(|{)*'*p'([V*3}(d8)>Y)lB(i*(ZQ*Y,)6G*mQ)C[(ky)[T))*(f9)^m*^P)62)<Q)9[)-_)[n*bz*7\\*_A(|v)AX).|)S7*r>*Y(*JJ)<>)yh(pX)Lv)5,(fL(UE)z*)1i)[j*T>)6B*`V*~U)y\\(e`)n?)7k(c()Rg*_p),X*~:*2q+3k(Xj(}?*Xd*1T)?G)_?(]j(^~*D_)&Z({W)7'*d@)lq*ZZ)z?)2()~4(V[*/9)rl(TW*7f(`7(_m)M5(d^*[|*n^*sl)YY*rZ)J))u!`abdfgklnp%ruyz|~ )v!')+%28%;=%@BCE%GI%KO%RT%VY%[]%jl%np%tvxy{|~ )w!&'%*,%.0%6 )tu(\\&)se):o*N`(t*):B)(~){E)Ie(W[*8Y(j8(Tx)mR){])*!Qy *q>(`5(f=)^e)9.*n~(oe)@n)Ig*d[(hY)W=*.I*IY)5O*/1)mY*;=)vD*si*_/)2o)kM*T1)Ov(`T*XP)O3*3G*>{(n-(bn(Vb(Ta(_D*(G*d_*&i(YL*[t*&C){b);m)&g(\\**51)nL*(i)W6*1o)D6(zh(|V)vN)<[):r)9b)8<*ns);3*_O)}h)nt)5o(tM(fJ)P2([z)5P))n)P?(Vw*X7*Ji)-i*`f)w!78%<>%GI%MO%]_%cgil%oqt%|~ )x!&)*2457:%=?A%GJL%PSTW%Z\\%_a%c )/R*2s)7/(U&(cd*b~)9p*4J)@/)R5(X()1n)W+*TB),v*Ef)-7)82(^&*;v)G=(_s)8t*[=(ZB(~G)xH(|Z(`J)zZ)1<*a2)pp).B)-{)ov*[a)^J)om)}])s8(_f*ar(qU(X0)Z3*_{)>G)}/)e0)VG*1n(yJ)6x)++(nl*?3)}@))e),\\*`J*/U*y')9:)Y_)ut)_;(^D*uF(p5)l2(W~)l5)+-)1f(u-)Vc)Px)ue(eY*sr(_!>t )9A(eg*mF*Tg*Ys)cW)u{*G_*_~*Tq(e=)x!de%jl%wy%~ )y!&'%*,%047:<=?@BDF%HKLNOQ%VX%Z]`bdfi%oqrtvwy|} )z!&'%)+.%24578:; (TG)q/(eK*m<*xV+2S*o.({Q*S_(T!hb (^x*>m)47(ai)F>(Xy)0D(_.)Ts(^()6Y)?9*rW*UQ*`O)m|*c*)rJ)Q2)dO)eX*T_(qf)r`*XL)DA*oA*3w)+<)Wk(u_)|\\)s{*o<)Pn)?O*/O(q7(]v*qn(|W(s((f,*[g)>a*x_(my*mP)q>*`y)9?(gq(t!@` (o~*\\N)Cs*ZH*8U(`[)1p(qF*F@)&;+0<(YM*x}*Sv(w@)0O(d:)6?*a.*c/*{T)0B*2B(]d*2i(|r*{J)U-(Uy)z!<>@AC%QS%UWY]_%df%oq%uw%~ ){!&'%57%9;A%DHKMO%RT%VYZ_%adgh *X0(e.*0B)}c(WK(U<*qO)T*)h1*C6))N)lg*21)L')t3*mE*-4(_T)_h(e**_e*:q*X))dt*{B)T0(o-*9z)?[*4.)5[*r((uu(W:*S|*.T)>9*=U*uI(iZ*ye*4)(c9*Ta(e}*4>)+5)Sf*X9*9s*d.(f-)Q{(_y*.Q(oB)`C)S,*(9(tq(W8)/1)2K*(Z(Tv(|_)E7*FD)&C*ne*yU)mS)`&*`Z(^{*/^*Sz(to(_W(X=(f*(tQ)>r*4(({,)69)7,*^z)*4)R&)}:(WJ(Ya)CK){!ijmo%qt%xz%~ )|!&'%+-%79%BDEG%JNOQT%Y[]%ehikm%ortvy%{} )}!&'*%,.0135%7;=A )Uj)VM)x`*K6),T)l()6]*^o(Yx*eW)?I*5!Z| )+2*5{*Xt(a0*MY*XK(t3([\\(Vl*qk)cT*6K*Wx(|**S`*r:(uT*/[(g;(ld(kU*TI)>4)JQ*mL)po)Xz)*a)kn)D+)E])|l*3z*Xv)2F)y>)>]*Xc(^T(`4*mU*/y*3x*.L(~C)Wy)DE*&;)o}+&I*6a*0|*),):}*oQ)z^(fN(h7)O^):`)4}+04*4w)m=(a3*uT*>e)Fo*F&*qP*s1*nF(Tp(ea*.s)Fl*Z-*2K)C2)+0*1H)}!CDFH%KMOQS%XZ\\^abgikmprsuw%~ )~!&'(*+./13578:<%?A%GIJL%NQS%VY%[^%`i%kmnp%rt%{}~ *&&(pL*2u)Gq))-)>6(a`)0F+4-(X}*\\H(^8({b),P))1)Re)7[*Wz(^=*m\\(bf)SM*:M)eC(p,)Di*X-(tE*_-*=*(g@)~H(Wk)Sk(zt(vE+2X(eA*Ee*~r*UB*3~)>@*x^(n6*sd(`H)k2(`j(|?)7l*L.(UC)7:)/\\)H{(^?({O(^l*N<)~\\*{[*08)1o)^'*X/(]n)*n*`S)ix*N>(ni)tz)-6+42*qI*^R+'T*TE)oj)Fu)Eh*Z8*X5(`W*^t)Yr)HN*n_*bs(n9)E(*K~*_X(gs*&!'*%-/%246%:=>@%BD%FI%KM%OQRT%XZ%]_a%hj%lopr%wy%~ *'!&')%.124%@B%GK +&)(zy)Us)R-(V9({j*~Q*d7)3v*b5*v{(f/)VX(|0(_p(j**0=*2&)<i)8^)@:)43)0f)`3)R!^P (tU)DR*8J(sT(l|*Uu)QK*bc(uJ*2M(eT)Ue(fy(j=*<3*=2)Fk)y6(g7(X7(ee)pk*V;*qQ)Sa)V[*Xk*L<+0[*X:(l-+1o)my)-l)eL)0A(hN(V<)LG*J?)0+*^Z(go)_Z*Dm+06)U&({F),U*.<(j)(Y8)fG(f@(dP(ZI(ek(g'(U;)//)ib(su*>u*4e*G])e<*(z)XG*'!LM%UW%{~ *(!&'%*.%8:%@CDFI%KPQSV%Y[%]_`d%hjk ),d*DB(h~)6g(V&)SX)5S*9x(h)(c])fQ)Yi)l8(`,(b~*TA)KF)-n)/2)W8(o2)O4)gi)G-*_i*/T)8s)0|(hv)n5*Um)`>)VF({])*j*;g)2s+1b)v}*G@*'0)oy(_c)1v)`u)A3)*;)0&*Tr)^K)86*^s).H)0;*Eo(ms)Pz)0m)35(cX)1`)AV*X?)yu(WU)_k)RN*Sp*TV*.r*;y)@X(wu+'Z)UM)WA*UL)U7(WT)^F*<s)52)1Q*tQ*X')xI(_n(nz(q+)Cx)lu)z\\)yg)~P*(!opr%tvy{~ *)!&'%+/12458%>@%EG%NPQS%`b%vxz%} **!&'(*%,.%4 *3i*{:*`1)\\M*Sb+/q(v`*/!*J (ef)Df)HY*^{*'V*sc(e')/W)mb)Ry(d)(y2*.A)85(_S*55))9*@7)6C(^L(zs(WI)x>(`\\)18)UJ({!{y *S!^m )@+).W*r;(u`*/(*.D(kP)EC(t_(XU({m(aa*;o*xj*X>)l/*mq(Zw)z[(W2)EB*~H(y*)P5)pj(o=(|t)}N*qC)`w(^H*4-*97(uE*/E*;<)HA)Ex)v4)uS)7M)8r)~;(Yv(a+(_B*;e)KQ*g=*ZC*X1*N;*o/)~h(W1**!56%km%tv%~ *+!&'%= ([<*8P(`k*{D)WZ)Xv)VJ),7(\\s(vP(|d)UB)Rf)m**?<)GB(t|*So(c/*dE*rC*AH)I:)w+)`O*4z(V8*bP)UC*~N(v{(mQ):d*nJ)sy(Y.*5E)eM*NL*{O*/u*.x(a@)>T*dI*^!im (eH){\\):L)9])ox)yp*J5*r,)5F(al*9I)G.)DU)9/)rR)|Z)TV*.m*N](vD)5.*Bo*9l)lI(ZO(V_)mI*TO(}O))F)}_)?F*eL(V^)Tz*M2*)~*o'(VY*U3*_l*u^)A;)xR*_b)_n)Ut*+!>?%JL%RT%~ *,!&'%F (}B(as*;[(^.*:|)rB)Af++l(V@)1J*(!nc *.i(V)*R|)A_*xh*uD(r[)>g*o])-h)mm*uA)|!LK (_3)_1){^):I){<*.:)gP*w&(U2)^S(UJ*d&(d_)>L)@0*7!u~ (g9(}6)m>*v2)7B)eE)ma(}J*~C*=-(}E(g+)sw(U+)S\\*37)7<)9&))0(^C*Z!+l *o0(Yz(eB)1g)_.(a()8a+0:(w:(ZV)qw(d-*.|)<2)>&)6L)9P(ZD)cS*NC(_&*S}*.w(o**=/*mZ(^g(ex)&N*,!GH%~ *-!&'%-/%35%9;%P (YS)|P)UV*bg*~Y(iy(gA(cp(gZ),=):H)JF(_b)36(_}(q[(b@(o1)tB)qK)+M)3E*)7)5w)6Z(V6)^p*29)7a)_f*uK(oZ*:I)E{)Hv)vX*xw)yI(sr(g^(eL)W~(]p(`U({Y*Tb*43(i<(p0)0L(o4(f1){@)0)(zd)9_)6c(e@)6&({~)E;(h?){e*:T*dK)+)*Ki(t^(p8)7x*Z6*4s(o:)~2(Y2).v({t)OP(c0)}d)e.)Fy)t4)qv)@@(_((U|)pm(~k){k*?&(tt+'Y([W*-!QR%tv%~ *.!&'%46%8HNUVp~ */!-:KQ_xz|%~ *0!&'%)+.%7:; *{])2N)Xt(oG)@O)8W(n,)7V)6,)+i*qc(of)73(j'*Fc*5u*_4(i_*<m)DJ*XV*@5(x,)FB)7P*&P*q`(^<)\\)*U;):\\*NB)4G*/G)_D)Y})hf)Jc)eh)+`*bT)CU)Uf)8o(at)d'*27(XN(vY*d>)_[)V@(b:(U=*t;*on*A})vM**-(]F(ou)<o*3h*(+)T?)Hr)J-(_*(dN)H))dF+1l*&S)ed)y3)ZR)hg)D3*eG++X)wf*<E*;i(el)FJ(U*(d?(ar)ts(d<(`C([_(Xm(YY*0!>AC%FHK%OS%UWX[]%`b%eghj%qsuw%{}~ *1!&'(*+/12457%=@B%FIJMOQ%SU%XZ\\^%befh%mqr )n-)|8*(B)SS*sS(a\\)j2(h;(Yr*31*<n*_o*oq)+_)/N)VB))`)>V*5c*nX)/})_>*.]*(^(_<)G[*(a*96(Tj*^p*eJ)An(VB*Ti)<V*3'(\\X)m;)bE(|C*_N)[L(Us)</*od)+l)?;(`1*KG)_J(ad)ez)i;)D|)vz*tZ(Tz*bA+,9)Vn(_N*XA(ez)78)gl*=T*t:+3p*mv(Wq*1)(_?)^P*rk(~Y*xf(eC(Vx)Y4)hj)K*)uG*{d)lV(`2)no)U=)F&(^9+4,*3((gD)}P)|,*1!svwy%|~ *2!(*%03%58=%@DEGIPQS%UWYZa%fhjoprtvwz{}~ *3!&+%.02%468%EH%MO%Z *r|(og)7L*r=)JK(vx):a*&5)ZN*rA*9m(cq*xe)+&)^d)9k(cs*DC++5+11)uh*tv*Z=*XB+0v)[D)xU)-9*r<)5J*~>(er*n7(Y,)?g(}!jf */V*DE)R6)-o)gA)Y|*/@)&9)8,(zz)Y~(d+(U^)9X)lb)6d*^X(Wa(Ve)ST*.P*Sw*>'*HJ*0?*`s*n})~d*~k*K}*>G)Tp*~P*.v(uU+1Y)gU)t6*Dv*~!6L (kb(et(pU(U]+1D(ce*_Y*54)ry*{g*F0)Yy*@k)C:)30)Zj*3![^_begj%oqrtv{ *4!'*%,0479:<=?IK%OS%Y\\cdfgjry{} *5!&)%,.%02367@BDF%HJ%VXY[^%`bd%hj *U4*9Y*;@)q2)Qs).d*<y)f>*:s*nt)Q;)si*my(c~*:p(^^)*,*V>*X8(U5)ge)E&)G_*dJ*tM)a4)SO)qI(xT*oB)Q/*0v)@p(|.(v-(x\\*q!7F (W'*=o*?J)Mp)px*o1)f.)H'(zo)qo*dn*uL*)3*`/*U'),b*'|)yP*N?)Sz*F^({})*1)HJ)q`*/6(^a(]r(b1(wD*/F*uM*:E):.)rk*Bv)yJ)X+)+/(uf*@i)^H)Qq)7))pX)>J)1/*qL)@W*H/+/s*nG(ej(g(*U7);~*5!kl%prtx%z} *6!()*-%13%68:<%>ADEG%JSU%Y[]%`bd%iklp%tvwy{}~ *7!&'%+-%25%8=>@%BDF%L )<&*C^)L>*6n)vk);o+'l)6|)Ci*<g(s'+1v)SY)Z_(|<*rB*To)c})E\\)71)d&(V=(v:)Q-(rk)BE)*D(bG)2|)Cf)q.)rM)d,)ze)7i(h<(fT*mS*b)(w7*.M)Qv(U0(uC*2F(tn(cf)l4*s[(m_)81*5<)0U*qH)Vy(ff*{V(^Q(yR*5((u{*tW(ZZ)T:(}A)7I(XB(cN*6M*`>)YR*A*)72)*c)vA)<b)93)/'(w3*dS+/o(}D)8`*2x({4(ig*o!KN )V()1()El)eJ(_P({8*7!MN%[]%_abdg%kn%svx| *8!'(%+./135%:=@D%GINRZ\\]_%cefhjl%np%wy{%~ *9!'(%.0 )7Q)T3)cy)60*ma*.W*5>)UO(^h),A(uA(ak)/D(u@)B-*DD)mC)8;)4[*)F*T^(h8)O9+/u)Pm*B{(fY([M)SR(ic*Y[)cJ))])/G)i>)77)9J)cj)-|)X4)U:)=T)[>)pq)vS)q<)lQ(`>(e8(U@)+4)?c*2`*4Z)6^(g1(`B)_0*Jk*Yx)T6(f|*4^(q**Ky*XT*r`*cz(XK)SI(jW)p_)te)6k)_{)[t)-Q*@D)H[)uX*&Y*6z)CI+0F)8x)v3(oR)tG*t})6!<n (aI)i=)Q7*9!12%48<%?BCGHJL%NPSWZ%]abegijny|} *:!()*-.01347>DGHKPU%XZ%\\^`acdfhj%nxy{~ *;!'(+-.2%;>?CEGLPR (i]*5i)mV)pG(cH)n)(\\y(}F*S)*&)([&)ce*~a*y_)ZA)k8)x9)<4)s3)7f*xq*X+(gl*35(U?(oM*:g*=p)*b(_`)kL*T((}T(oD)TQ*xg(wa)ti+'\\*_|*(E(`p)5m*nT(VZ*<B*>k*=L*?c(p^)Cr(n?)A^)Ub*U<)Bt)]E)C])OL)FI)56(v/(TI(_7)ZE)E^)S=(^B)HL(tm)Oy)lc)&a*5;+3<)?y)w!rk *~[*Xw(~.(UK(W<(f3(tw)tA(lV)Qt*_U),@)S+)T8*Sh)9H*;!STVWYZ]_%chj%nrw *<!,-%256:%@CDF%IK%MP%SUVY[]%ch%kqwz{~ *=!&')+,.013%68:<%>AE%GI%KN%P )0I)U9)d:)6)*m!Ax (cR*_R)~9(Vs*U1(Uk+1r*m!df (`g)[B*aB)UA*U?(qB)'F)O!2[ )E6(f_*6&*0t(rq*A6),w)6e)Ld*o:)>m)0])G?)s5(UA(Y1))/*v*)<Y*1g)&@(YX){S(_z*:r(TZ)/a){I*mY(Y>(VF)y^)i<(bL*:')=&)y5(|;)S/*u=*^e)R)(Zn(d5)WO)<{)Ad)R7)1E*xW*T[)*u)iD){=)yC(T^*b7)hd)RI(mo*cx)Ss*Y2(cI*Ea)C0*\\K(}M*~;)Wj*=!QRV%Z]%_a%cehj%msu%z|%~ *>!()%-3%:<%AC%EH%OQ%Z\\%`bg%jln%rtx%z|~ *?!(*,- (e3(wQ+3w*YJ(dq(nD*y.)D(*do)Sw(^4)mn)7])dq(`R(a^*/{)^o)o*(d*+0A)K-)uJ*s]*K^*13)`_)b:(^U)E_)k:(sc)=l(mL*Sf*{K)63*.o)1y)_o(sk(V!UN ).X*vy(W6*Sa(_v(uW*.E)5p(Va)@.)5**;M*?z*;x*Gv)ad)YN({p*.l(^c):()E`*3f*;N*IL(]7({1(uO*_B(U`)Rd(^1*LQ*^Y*q}*AI)if*nj*q?)VI*:S),n)<?)Tg*>2*6@++w(r6*X[(TO(dw*?!./%24%7;>@%GIKLN%QS%_abdf%hlmoqstv%y|} *@!&'*,-/%469:<?%CE%GI%SUVX%Z (WY)>^)G+(js(Tm):s*~d)6.(y+)ig*99)VL)Ho(\\e*<J)t7)C~(`S)SG*.K(\\9(i^)a.)}o)AB)h+*:Y)D.(}v(`:)aM*JI*q9*rK)<r*Xa*7,(i})R\\)5c*/o(rj(W_(i?*XO)A<(TP(|x*Kx)G|)8_)z,)_i*9T(bb*w/(|o(h:*b;*.g(u/*XJ*Eb*8!,- *Xf);J(|b)2x)V,)wh*S{)tl)l0(g&(Ws*\\G)W;(w;*._)x/)S6({X(x8)kp*4B)2u)Wa(so)k!u{ )d7(cV*/4*@![\\%ce%hjl%npqs%vxz%~ *A!&'%),%5=%AC%FJ%TVWY%\\^%bd%fh%prt%w{|~ *B!&' )qA)pt(a**4`(n_))P(tW)eZ)?_)Xp*T;(}=*De(cP)t()7h)@?(VT*yf*Dt({U*T*(eO)sp(Xa(}S*~@(v?),L)wd(sj(T\\)F2(Ux)7W*P[*`U(b')@x(j|(lZ*`:(Vi(Xo*eE*{E)Qo))J)/u({[*N@*T9)>1)5g*{k({?(|])9@(i'(e4)nq(^I*A+)E.)H4)PC)6U*^}(e1*82)Vt)m3(US*XN({')ao*BU)B!(p *0Z*FB+1k+2e(}c)Cm*`()FD)DD)5))|C(r])+L)>k)Zp*B!(),.%46%@C%IK%MOQ%SW%\\^`%fh%np%twxz|%~ *C!&'(*%02%57%E )0.(`Q*2C);Z*JN)l&))M)FF)7^*t`(e))c[*Te)R;)rH)z-(f2)s:*xZ*8<*TX)u1)CR)_C)?Q)<B(k})/O)y9(eU(Tc)P4*3c(|X(k*(mp(W!uw *{G));)Dc*2n)/4*xb*`9({B*Sy*TY):{*8x)=2(kD*:=*d9(Y`*)w*`W*(O(\\q(r))YG({v*T-*3`*dL*?M)~R*Dq*s!(, */&+&D)uj(~-)zv*`z*sD)x0(zi)8p)|x*@))H.(hX*/j)hq*)y*n[)5\\(q}(Vj({:(uF(r,*C!FGI%KM%QS%]_%bd%suw%~ *D!&'%+-%/1%@FGI%MO%QS%UW%^ )g')8/*[@*Z]*4R*:B)6o(eM)TE*d2(tP)/3)Rw(o0);P*X*)nv)Z((o>)MD)n;)[S*U8*Tl(oI)QO*Jp)v6)9Z(eV)_/)Rk(r0);0(q3)Ha*6m(hb*)-(ZH*\\V)Vo*YF)_m)9G)V>)Yl*/'*=g)Fv*`;)V{*rl*Se(t})d>*C1*6P)m`*PR)H0(`n*Zp*nk):/*xx*[9(iu(X5)C=(l})1U)V8(`](}N(tO)WE(rC)l-)kr)0E*84*5q)7{)DF*_s)qz*ZA*X4*mt))^(d;(f0)_E*D!acdf%lw%} *E!)*%-/1%69%=@AFHIMNR%TV%Z\\%^`cghmnp%ruwx{%~ *F!'(%*,%.17%9<%?ACF%HMNP%SVX )RG),4([3(VA)+C)8K*8g*`R)G**dB)sA(ei*n6)-H)|R)GP)8V)}f*.y)n&([N)6X(tZ*`G(_k)y;){G(n:)-v*`L)U~(}e(n[(em(]y)X>(mw)9`*xs*6Q*FW*LV*`8(e{(}t*79)7@)5t*5\\+0,*r6*~!8F )IU(ur)7=(i7)8'(gr*Et)U8(vw)k<*Jz)O|(t<*UW),l)Xo)gc*x](T~)_y({C)us)8N)AJ)p/)1K({R(wd(TM*6')Rq)gE(V5)Dn*09)-d)@C)CY).c(uQ(vu*F![]_abfh%jl%oqrtuwxz%|~ *G!&)%/3468%;=%?AC%HJKO%VXZ%\\^`%ch%jmoprsuw%{}~ *H!&(%.0%4 )(n).9(d'*vx*_n)Fx(n0(i()1_(U')[3*/5*:5*=q(vH(W!Ze (}C*.F)Ch*@r(fw)lL*4G(i{+'g(X/)Ww*Tw(|g)3>(cz)nj)Ws*D~)?)*qJ*.S(f?)zR*)a*q=(k(*1P)kD)8.*FY)VD){c)5-)?C(cv):@)S1))3(f`*m[(U9)Rh*TP(}P)@)*9c)H((f!B8 )Q+)Ox(V()8S(cW*8>(WH(Y7(oA)5&*tB)AT)d.(bg(ab)0x*TS)@])ai)Du*MR)u.)t2)A`(l)(f<*n{)d?*H!5679:>@%BDF%IKLNOQ%UW%Y\\%`d%jl%oq%tv%y{%} *I!&'%/1%46%9;%@B%IKN%QS%WZ )yx)0H))T)0b*6o(t;)1\\)aT)_q)YB)RW)dE)MH*K2))u(UM(xu(j<*n=)Tl*)R*s6)5+*.`)ru*Dr(c2*tb*_')Aw)&4(Y))eY(TQ(d\\(t5(ep)98*o)(]m(Vm++P*.>(gc*W}*J2*8W*qA)V1),c(y5)A.*r_)gj)fA(du*6L*{Z*10({a*r!mF *.Y)q8(dX*ow*{n)~l*Lp)XI(UN*1c)x6*TJ)1s(gx(V?*xY))?)L~(\\M(en*Ul*>1)u9*tH(`d(h@(m8*nZ)V+({l)Vi)AC*I![\\%hj%oqrt%vx%z}~ *J!&'%),%13468%>DEHKMOQ%TV%Z^adeghjl%oq%su%y{%~ *K!&(*%/ (|m(zm)FT*3s(iq)|~)>C)I|(V/)OY*G7*uv(c^)80);@*b0)?>*4E*Tt(^e)H1(d.*I0)4=)Sr)TP*U-(}V*BP*9v*nf)O5*_,)?R)/-).N(Yj*I|)@h*67)f<)1z(^@(`+(on)-F*b(*J**df)*g)D4)/Y(vG(]i(_i*4|(bp)S'*sa)aZ(WL(Yw*1-)C{(je*nb)y8*Jt*.}(rw)5(*tD*DN(k_*x[)-t*Su*?u*d+(e6)@6)*~)lY)0=**l(xA*/!+. *^S(jG({Z)1,)?m)g>*K!13%57%;=%@B%EHILMO%RT%VX[\\_%cefkln%twz%| *L!&')+%-/%57%;=@%DH%LN%PR%UX%[]%_ac *`A)oU)qi*.t*u_*BA(zv){:*t.*Iw(b3)a_).5)@5*TF(|Y*~9))))PB)Rb*S!jl *`B*_V(dA)7&+/!v} (fD(Tq*:+)cw*E7)&i*J7)VR*sb(g|(V.*Ss)`2(gh*qX)_a)WC)pi(Tk)tI*FT(~U),3*Nz*x|*q])^i)Sm(tj)9a)q|*J+)ZS*9:(qa)bL(dB)tO*s^(hS)-J)`Y({k*T~*~V)P<(tT+0&)y_)DM)6/(XQ)mE*0r)T`*r))R.(W+)mv(^G)Fj)Z}*a_*6B(uc)i~*L!de%lnoq%~ *M!&'%03%8:%MO%QSUWXZ%t );M(},*aD){W*U.(vN(gW*7y*<+*MT*26)IX(l<*2l)cU*eI(_)(UL*xU)9N(T`(eS)C1*5v(tB)VU(TF(sx(cJ):5*nK(Y&(WE*JA*xp(t]*a6)ys(V~*4t)m5)S0({S(v\\)-A)I-*Du(ZJ)):(UF)sq(Vy*9A)6T)@\\*ap(}~(VS)-]*7?*`p*3a)mO(V:*KY)26)P~).Q(U6)pc)Y:*TG*Sk*T!n5 ),?*22*1[*.h*;J*<'(mu)Pp*w,*r*(vo(e|*nP)W5({|*{C(}>),R*s-*M!uv%~ *N!&'%:=GM%OQ%SUWY%\\^a%df%hj%ln%y{%~ *O!&')%> (d&*:_)LN(x6+0g)+**/i*<u*>!./ *;|*G0*__*Xb)pa)-U*xv)uH)@i(h1)7O(XE*7<)ml)+N*sj*ZX*F;(g:)TH)V/)R?)0X(b/)k~)*l(WS)0y).r(}))l.*b4*ms)d~)Sg)X)*cv)CG(e!(P (X3*eD*TU(d~)*k*_S)W.(U{)p[)JU*DR)2A*8&(X;(Yg*`v++0)20)W!g^ *r{(Uu(wL*t,(TT(~+)y1({>*TQ*1L)gC(pi*9R*bG(e^*a&(j[)&=).,)2/)OD)e]*46*PQ*O!?@%^`%hj%~ *P!&'%@B%H )Up(|1*KZ*xd*Uv*~7+0*)WT(^p(]h(p-*J_(dU):S*_&(n)(f\\(nB)fR)Y(*/Y*_m*:?)2f)/Z*rX)C.*.@*Y!1j *mX(~_*(T)CF)1&*qT*2N(U~*bm(bh*r^(]f*_a*As*d1)AE*w.(ze(c,)tm)D')Fp(gt)^Y({g*^g(^Y(nd(g\\)=f)Ar*X!^C *5:*>v*aL*)6(_r*CH)E/)@2)\\.*E?*[v(lX*`X)ot)^Q)b\\*W|)7S(`3)TR*X<)/@(rv)3\\)C<*X`)5j(jS)Wm)Ck*^Q*P!IJ%PS%Z\\%~ *Q!&'%R *n;*qG)qh)F8)Jw(g6(U:)_:*T,);^)?-({<){J(Zj(|F)sI)QA*PA*(H)Sl)ph)?K*_()''(}Z*D,)F;(co)54)|F)XL*/>)L<)|M)-T)Zr),])9D)VK)D;(TN))X*X&(Vk*4D)o&*s9)7E)@v)6A)Sj*Xu)a7*0Q(]k*3d(eI*aM)6[(hD*F2*_**2;*nq*@o*_j)UU)h.)?A)q_)kZ)t\\*7t*Ww*m;(Y/)Dz)m]*T.*tK)8@*oH*r+*?i)84)r()-e)e\\(Uv)/F)>o)7Y)Ou)>:*Q!ST%uw%~ *R!&'%;=%[ ))o)mk*bW*S~*9d)E))>*(f5*FZ)ss*4&*5-)RH(U8*.a*3))q4)I5)PO)6*(Zl(Xf(n|)7q)Ot*Ye(eG)@1*.R).b)8+)9o*7!lm *0V))d)&,(`P)Aj)ya)z9*X()^t)mx)Yv)Si){X(Ts)p^).k*mR*JU*.b)yE*4C*eH(W!-R *8?(fl))&)U.*T0*(U*^^*3u))b(g=)pJ({P)A,*~n)hA)F]*Ev)Co)f=*T!\\? *`H)|f)_])a>)7.)s7(kx(U(*>a)E}(aj*E[*X.*nR)}e*R!\\]%{}~ *S!&'(*%\\inx *T!+4Nm *U)(X1)T=)x.*~E)6V)cH)7g(TY)tK*^V)<]*XZ*&()GC)*s*KJ(uS)<K(sm)d{)I6*o&*`5*XX(oC*/A*Tj(_9)8Z)7C(cb)G&)i**:o*cy(i=)r')^W)UF(^E(gS*XD(vs)Yc)Vg(zl**)(Vh*(-)Yk(z`*7c)WW(zg+&t)HV*Zx({N*/=)/m*.O*b?*Xp(tu):,)yW*YZ(ca)?q)x'*T)*r1*.^*mn*-u(k{*d])C>*0R(|h*aT)@q)).(X2)Ej([1(X>(o3)+=#2$*U!CD%KM%PSUVX%_a%df%kn%tw%} *V!&'%)-%3568%:=?%EG%IK%_ (Uz(TR(]e(TV),<(cT(T[(V,(Td+'J(z|(lW(Tn)y2(U,(b}(U4(tS)cY(c})Qp(mt*4h*{l)Q3)re+2\\(T|(V3+2U(U!IV (V'*9O(zk(ie(kV(VX(d!CSY[d *uP*X](c)(eR(c!5=M *X\\(c!ur (_!u{ (`!(GMYZfx{v *?`(a!>CBQT (^N*0<(V!OW]V|u (W&(Vr(W!V.] (XF(W!0`bDf (X!@I )>3(X!<? *V!`a%~ *W!&'%f (X!A9 (W!mx (X!XVskeq`] (Y3(X^(Y5(Xv(Y!oqsNcleZh (Z!(Y| (Y|(Z!\\?^].L<UX ([U(Zs([,(Z!x~ ([!CR|~ (\\!'8T (]+(\\!kjdl (]!,0 (Vq)RD(X!:G (YW+43)RM*'}(^:))E+1g*{m(^M(t:(b!au *O((bx(_^(t?(]z(V4(]{(VG*JL*K)(VI*5?*KW)xQ(zD*I:*1G(^!w} (_!0/ *W!gh%uy *X!QRW_eh%jlnoqrx%~ *Y!&')*-%03%79:<%EG%IK%WY]^`bdg%iln%qtwy%{ (_:(^!bnq *S!]cdgqrt *T!&'/326%8:<=@CDHLMRTWZ]`cdfhkpsuvx%z} *U&*T|*U!(*%,02569:=>@A (cx(d0*q!lqp *r'*qy*r!328?JU]bhj~ *s!*4M *a!vz|x *b!2':9<@ *Y|*Z!&'*.%03%57;<>%@BDJL%RT%VY[\\^%ac%jnor%vy{~ *[!'()+%-01348:;A%EH%MO%Z\\]_`cf *b!>6UKDVJMYlhb]aqu *c!+1OKP^\\fps (`'(th(a!cmn (b&(hQ(b!8>X (e<)be)s[),1(_!ho +'G(dl),>)lW))7(o/(p!3+ (rV(s!;DP (n!ehfoujk (o?(n!w~ (o!LhNi_^KPYV (p!7. (oo(p!<Y1> (ov(p!*_bdc\\B~y (q)(p!ng *[!hjl%prsuw%y{}~ *\\!&'%*-%/1%79;%FIJLMO%UW%ik%~ *]!&' (q!<>. (pw(q!1OJuQ (r!=DYarX *{}+2^)4t*9!@DFVQoKUX^`r *:!&, *9w*:!68Q *9!_~u *:!9:/ *9!p{hqf *:!2< *9k*:!OweR}uJb@FziA *;!&/ *:t*;!)* *:!NC *;!1fpq *:v*<N*;!QIF *<W*;!sDd\\XtU,uBOH{z *]!()%~ *^!&'%. *;!}0~ *<!(&)*l4op\\fOXA8re9t7TZdvx} *=!dH; (q8*=!{n@`9 *>!&B *=!ti7Brf[\\M( *<|*>0*=!SD *>!f[dc} *?!89+:) *>!FPs *?!'=? *>!;w *?!r~ *@!(> *?n*@+*?!{pk *@8*?!RjeH *@!=;d )kc*A7*@H*A8*@w*A9*^!/0%OTjv| *_!.1%35%8;=%@C%FHIK%MPQTWZ%^`cghkqrtx} *`!')*,%.2%467?@DFKMP *A!U: *@!WT *A!XGgc]y )s0*A!Bqz *B!JN-5 *Ax*B!TB+_]Vyg *C!)LtRvc *D0),!;E (t!bg *2m(t{(u'(t~(bw(}!'*19 )5h)6!-b~ )7!4DAX )83)7`)8!J\\T )9e):U)9!)2Fl )8~)9!dB )8z)9!ft ):!QW?^ )9|):!=- );X)9!~v );!KG ):!jz );&):k);!,'d )<1);s)<C*`!QT[%]_%dh%loqruwx{}~ *a!'(%+-3%589;%@CEFH%KN%RU%[]`c%fhik%oqsuwy{}~ *b!&*+-%/138=BCEF )<!'deFgm} )=!+86]y )>)),H).])ko),N(cn(e!NZFEXosc (f!OV%XZG (e~(f![]'6 (g!-? (f!{uh (g!EF/ (f!zj (g!H{Xm_}RQ~ (h&(fv(gN(h'(g!fjw (h!+,. (g!TUO (h/(gz(h!0m9rOfEtuacy| (i`(j!/U (i!Bf:N8I5 *b!HILNOQ%SXZ%\\^%`d%fi%koprtv%y{%} *c!&'%),%.02%EG%JL%NQ%[]_%eg%oq (i!0On%p,)U (j!+r (i|(j!QY( (iz(j?(iw(j!v1 (it(k&(j!]^49 (k!1> (ji(kf(jq(k!23 (jt(k-(j!}d (k!6,9: (j!lm (k!/<+ *^~(k!eOSHkjEGnt (l!F'E (ks(l!;PGJ:BtR_Yijs (m!(Dilrv (n!1'5;@FEX ))!Wa\\Yy )*!*+ *c!rtu~ *d!'(%*,-/034:%<?AGN%PT%XZ\\^bcg%mp%ux%} *e!&'+%.1%46%ACFKM%VX%` )*!&3CJMP (~!8&9<B4DE=FHaNiXW]Omcp~ )&7(~w)&!8UVzy )'()&!wqYn )'!R8.7fUiWeEDcn| )(!:> *U~)(!Xf )-!W[fkmpy} ).!'38@G *J@)-E)d!ruy|} )e!/-:9>T[U^`cm_of *e!ab%~ *f!&'%g )eg)f!*&4 )ev)f!10(5L8?KDc`js )g!&)8 *8;(tK*yn(t!J( *{!8<%AILRUY\\_befh%j )*o)+')*z)+!,;6OKTI *XS)+!hgq~ ),'*73).!OTaZ )/5).y)/6).!lo )/!078 ).!ux )/!*KgXMA?[]<qS )0!QRTS )/t*f!hi%~ *g!&'%<>%VX%p )0!CVos )1-)0!v\\ket )1!l;1]XFZ4 )2!GM<J )1t)2!'5Rq )3!Czbu )4!,Ij ).h*sP*q!8:@BDEKMRSUWY%\\^ad%fhi (Tr)c])51)R!<[cQ )S!Q3>B: )R!op{} )S!4W~ )T))S[)T!LMF, )S`)T!5+O@C )S_)T!(DS *g!qr%vx%~ *h!&'%79%y )U5)T!|a )U!?D )T!\\Ync )U!'I*1 )To)U!KNP/ )V4)Uk)V!AC )UZ)V!67 )U!X\\x_ )Wd)V!jh )W!(X )Vb)W!*[0' )V|)W`)VN)WV)VQ)Wu)X!_?\\ )YJ)X!PwDE )W!|o )X5)Y!wI0x )Zl)Y!z=?USOoLg'Z7 )[!H,- )Z!cT8nu )[!1Z )Z!iHh )[!osr^Xb` )\\^*h!z{%~ *i!&'%TV%~ *j!&') )\\!V4FCOn{km| )]!NWOmi )^!*9 ({!7;LJ\\o )l,*~h);:(|!BL *L\\(|N*[<*Qv*_!Gdfv *`&*_!uzw *`+*_y*`!=<C^IENYmneg| *a!01/G7A: )BP*a!S\\agbj )-!4;:< (}@(gV(}!U^ ({((}!hk *1K),!gfj *9;),y+'S(}s(u!NPZvwp *j!*+%LN%~ *k!&'%.0%2 (ud(v>(u!xkq (v!F& (u|(v!K2yzQ|WLm (w'(v}(w!MO,>.[ (x)(w!epW} (x7*4p(x!l]9< (y!'T (xt(y!;= (xz(y!ILZ?OAEr (z!'&BGP (|!sz (z!ju ({*(z!acr *~!?ABDIGJKORTZ\\]`be%gijlmoq *.!9;=?BC *k!34%:<%~ *l!&'%: *.!GJXZ%\\cefjnquz{ */!),/023N7;<?B%DHILMPRSXZ]\\`b%hk%np%tv )*i)l|)(|)l;*at)g!HKh\\Y )h0)g|)h2)g!qmz )h!*)F: *x\\)h!kJH? )gt)h!Sp )i!2c.-0864 *l!;<%IK%vx%~ *m!&'%7DIKz *n!)-.4@Uvz )h!|{ )i!Id_]a )j&)iu)j!-K=/06:MWX?V )k()ji*v!|}~ )D!18C-N )E1)D!lOX} )E3)DZ)E!4*9 )D!p\\a )E|)F<)Ed)F=)E!u< )F?)E!eAf?i )F3)E!ODn )FA)EM)F!0ef )G!:;(< )Fw)G!>] )FP)G!/@ )Ft)GA)F!sq}|\\ )H6)G!iNQmE )HC)J=)H})I!GH )Hz*o!(4>DILV[aouvx%~ *p!&(%s )IL)Hq)I!3) )J&)Hd)I8)J@)Ia)J/)Ij)J!,S:OgG )I\\)KB)J!VW )KD)J!X52Hjv )K1)J!z| )K!J'7@U )Jd)KV)J\\)Ku)LL)Kc)L!45 )M))Kh)L!a[ )Md)L!mxR )M!R= )L!ZEu )M!@UTm[o )f!Je )P!:;@=KLFSTZc *^!UW[%]_`bacdfhklnqu *p!tu%~ *q!&'%6;NVbgjmor%xz%|~ *r!&-%0479@DEG%IL%PR%TVY[\\ac%gin%z} *s!&' *^!wxy *_!)+ *\\j)5!'37;>=A@H *7`)k!EJUegi )>/)@!789Sb )DW)@!L^I )^`)C5)@!f}z )A&)@~*2<)A!OD1?FQGgt| )B!>4Urs} )C'*X!236;=@EFHIGMUY *N!AD%FH%K )d!3d )c{)d!+4CDIPRTW )7r)8C)9h*s!)+.%02378:%CE%LNOQRTUWX\\_`eghmnpqs%|~ *t!&'%+/%24%689<>%ACFGIN%PT%VXY[%_acd );E)=,*2:)Q!JS]UYegfmux%z )R!(0+19 )>!0Pf )c!kptN *DV(`0*3!|yp *4@)CH*4!A5/18;k%n_FH]Q[ )CN*4!aouxq *5!89 *4v*5')CS*5=*Ue*5!aIWC]sw~ *6!F+,C2;NO?9 (q~(xw*6!ZTc )Ym*6!u| *7E)Cd*7!C4 *t!ef%moprsuw%{~ *u!&'(*%<?@BCEGHJNOQ%SU%]`b%fh%oq%uwy%{~ *v!'()+%/ *7:*6x)O!6IKUXk *y!XYZ\\`a )Pl),})P{*Nm)?2+3=)?!5^hfenptx )^![wqx )_!=B9-3jL )`!9<?XZ )a!C,8 )`n)aB)`s)a!HJh )b!*, )a!xp )b!WK^p )c!;F )^G)`A)a6)b0)5!ZY_de )w!ejps )x!,- )w})x!+3(1@8KV[kx )y+).!\\[ *v!01346%<>@BCEG%wz *w!'(%+-0%G )/n)0!63@ )/s)0!2< )1+)2!-4 )3!+wk )4!@F{ *3!]\\ )SA)TK)WF)t!+-5>LMF )?M)t!bQRn%pTqZaX^ )u!*I23 )t[)u,)t|)u!(Fwovcx} )v!&5<(W\\Lou )w/)vw)w!=NH^ +4.+2!>@A )q!1DM9GHZbYmfux )r!78.*AO *w!HI%~ *x!&'%N )r!ILftdgsx )s!-.>CK )l!7=KHEXov )m'*0!@IG *Oi*0!P\\Yaif )p!f~ *Ii*m!89:>=?@BCGJHM%OVW^]`_bcegi%moprw{%~ *n!&'(*%,/%13258%:<>?ABD *x!OP%Tknruy *y!*/%TVW[]^b%dg%mp%~ *z!&'%5 *n!CEHIM%OQSVWY]\\`acdg%il%pruw%y| *o!+,*-2357%9=?@C6E%GJMOPS%UW%Z\\_`^bce%mpr%t; )s!uz *sf)y!Me[c~ )'A)y!{z )z!=3 *z!67%:<=?%[]%~ *{!&'(+%79;HMNPSWX^ )z!XVp +1m*{z){6)oz)p!',2= )k!46 )l)+/!prx%| +0!)(-/.01589;=%@BCEHLNQ%SUZ]%chdj )m!68:DAPGWX\\hUTgfzq )n!.31/62N<GJ[KPWbUpc`d *{!aco%y{|~ *|!&'%u )nf)o.)n!mk )o2)n!x{ )o!1'50 )n~)o!?PFNH]a *1Y)|S){!>?FLN[lfrnsy *J!BGP[]` *K!'K<ANgShjv *L!F( *Km*L**Ku*L!ME?G6`Wbm *M!9N )m/*4i)p!KM )sj*2!HJLRVX[%]_^gAky| *3!*/FN *MV*x!X`c *|!vw%~ *}!&'%| *x!ilmotz{~ *y!&(),- *D!AH`bsnpo *E!C(&G8B>E.DQ_PiKULJdjO *F!+34/5 *Ek*FU*Ey*F6*E!zsl *F!EI:JLOKe}`gp\\ *G!'1 *F!vsky *G!(k *Fd*G!fgdIY5Wt<LeMBN| *H!?8b *}!}~ *~!&'%5<MSWX^_cps%y|%~ +&!&*,.%0457%;>%ACE%HJ%OQS%VX%[]_a%ikm%su%w *HV*G!qn *H!=' *Gl*H!;u<EC[cMaPZkzp~ *I!MJ5ARXps */w*0!*,- *80)|!gjupq )}))|w)}?)||)}![L>-BE498GR2lnY )~0)}!`qt )~!)6 )}v)~!-,KabsgXc@eW]fo *&3)~|*&!.?<GHLn`^qxm +&!xz%~ +'!&(%*,%68%:<%FHIK%RU%X^b%dfhjkm%~ +(!&'%: *'!(3/AJI *7!wz{}e *I{*8!ABCMOHKX[ST^dikoz *9!&/ *J!\\cf *K!]d *M1*1!,.6>?A *(,)>D*(!AMLNRblmqw|}xu *)!.? *95)B?*1!N]dtpux} *2)*)O**u*+!KS *-:*.5+1!VR *Xs*Y!+;8X *X!gm *U!RT *c!w}{| *d8+(!;<%~ +)!&'%A *d!65D=CQRFHM`Ydaevw~ *e!()*0/5 *U`+0u*Y_*Z!9S *[!N^ *Y!\\fcak}~ *Z!(, *Y!uv *Z)*Ym*Z!:EF1GI2WKbkmz|q} *[!/5.*2&>67FG?ekqdiz *\\!+0,8: *V!*4<7JF )?=*N!PXTV +)!BC%~ +*!&'%H *N!_ei *O_*R<*u>*t!-73JELSRnqt *u)+3!loq%vx +2!CPR *s!VYZko )sM*s}*g!Ww *h8*iU*j(*k/*jM*l!Jw ++!369%< )zB++!?BD%FHINOR%WY%]_abd%kn%qx%{~ +,&+*!IJ%~ ++!&'%/12478=>@CGJ%MQ^`cmr%v|} +,!,-56;<'%+.%02%478:= *u!gp|} *v!&A=5DF *~!{z +&(+0O+&!'+-2163<=B +'!][_a`ei *yo*z!;\\ *{!*) +&!PRW`\\l^jy +'!'+7; +1![\\ *-.+0!y~ +1!&)0 *k;+1!;=y%{~} +2!'.,*/4gqt~| +3!)*0 +,!>?%~ +-!&'%~ +.!&'%~ +/!&'%ntw~ +0!'+237DGI%KMPTV%Y\\efik%twxz%} +1!'(*%/2%:<>%CE%QS%UWXZ]%ac%fh%jnpqs%uwx| +2!&()+-0%35%=?BD%OQTVWY%[]_%dfh%prsu%{} +3!&(+%/1%;>%jmny%~ +4!&'%+/%14%8 .*f.+!Zv .,!oy .-!;<%>@BCGN%PRSV%X -R!XY%~ -S!&'%N"
+		));
+		return arr;
+	}
+
+
+}
\ No newline at end of file
diff --git a/utils/loading.js b/utils/loading.js
new file mode 100644
index 0000000..01258bd
--- /dev/null
+++ b/utils/loading.js
@@ -0,0 +1,44 @@
+// utils/loading.js
+
+// 显示loading
+export const showLoading = (ev,options) => {
+	if(!ev){
+		return;
+	}
+	
+	if(!options){
+		options={a:1};
+	}
+	if(!options.text && options.title){
+		options.text=options.title;
+	}
+	  if(!options.text){
+		  options.text="请稍候...";
+	  }
+	   ev.$refs.loading.show(options);
+   
+	
+}
+
+// 隐藏loading
+export const hideLoading = (ev) => {
+	
+	if(!ev){
+		return;
+	}
+	 ev.$refs.loading.hide();
+    
+  
+}
+
+// 更新loading配置
+export const updateLoading = (ev,options) => {
+	if(!ev){
+		return;
+	}
+	if(!options){
+		options={a:1};
+	}
+    ev.$refs.loading.update(options)
+  
+}
\ No newline at end of file
diff --git a/utils/mqtt.js b/utils/mqtt.js
index 7281ada..0e93404 100644
--- a/utils/mqtt.js
+++ b/utils/mqtt.js
@@ -119,7 +119,7 @@ import Paho from 'paho-mqtt';
 import allConfigs from '../config/index.js';
 
 // 根据环境选择正确的配置
-const env = 'production'; //production  //开发of线上 改这里就行
+const env = 'development'; //production  //开发of线上 改这里就行
 const config = allConfigs[env];
 
 class MqttClient {
diff --git a/utils/request.js b/utils/request.js
index b113555..23ad91f 100644
--- a/utils/request.js
+++ b/utils/request.js
@@ -1,5 +1,5 @@
 import config from '../config/index.js';
-const env = 'production'; //production development  //开发of线上 改这里就行
+const env = 'development'; //production development  //开发of线上 改这里就行
 const BASE = config[env];
 const request = (options) => {
 	console.log("options"+JSON.stringify(options),BASE.BASE_URL)
diff --git a/utils/update.js b/utils/update.js
new file mode 100644
index 0000000..ceb5613
--- /dev/null
+++ b/utils/update.js
@@ -0,0 +1,153 @@
+/**
+ * 检查并执行wgt热更新
+ * @param {String} updateUrl - 检查更新的接口地址
+ */
+function checkAndUpdateWgt(updateUrl) {
+	if(!plus){
+		return;
+	}
+	// 显示加载提示
+
+
+	// 1. 获取当前应用版本信息
+	plus.runtime.getProperty(plus.runtime.appid, (widgetInfo) => {
+		const currentVersion = widgetInfo.version;
+		console.log("当前版本:" + currentVersion);
+		// 2. 调用后端接口检查是否有更新
+		uni.request({
+			url: updateUrl,
+			method: 'GET',
+			data: {
+				currentVersion: currentVersion,
+				platform: uni.getSystemInfoSync().platform
+			},
+			success: (res) => {
+				uni.hideLoading();
+				console.log("res=", res)
+				if (res.statusCode === 200) {
+
+					const updateInfo = res.data.data;
+					if (!updateInfo.hasUpdate) {
+						return;
+					}
+					// 3. 显示更新提示
+					uni.showModal({
+						title: '检测到更新',
+						content: updateInfo.description || '有新版本可用，是否立即更新？',
+						confirmText: '立即更新',
+						cancelText: '稍后更新',
+						success: (modalRes) => {
+							if (modalRes.confirm) {
+								downloadAndInstallWgt(updateInfo.downloadUrl);
+							}
+						}
+					});
+				} else {
+					uni.showToast({
+						title: '当前已是最新版本',
+						icon: 'none',
+						duration: 2000
+					});
+				}
+			},
+			fail: (err) => {
+				uni.hideLoading();
+				uni.showToast({
+					title: '检查更新失败',
+					icon: 'none',
+					duration: 2000
+				});
+				console.error('检查更新失败:', err);
+			}
+		});
+	});
+}
+
+/**
+ * 下载并安装wgt更新包
+ * @param {String} wgtUrl - wgt包下载地址
+ */
+function downloadAndInstallWgt(wgtUrl) {
+	// 显示下载进度
+	var wating=plus.nativeUI.showWaiting({
+		title:"下载中0%"		
+	});
+	// uni.showLoading({
+	// 	title: '更新下载中...',
+	// 	mask: true
+	// });
+
+	// 1. 下载wgt包
+	const downloadTask = uni.downloadFile({
+		url: wgtUrl,
+		success: (downloadRes) => {
+			wating.setTitle("下载完成,正在安装");
+			if (downloadRes.statusCode === 200) {
+				// 2. 安装wgt包
+				plus.runtime.install(downloadRes.tempFilePath, {
+					force: true // 是否强制安装
+				}, () => {
+					uni.removeSavedFile({
+						filePath: downloadRes.tempFilePath,
+						success() {
+							console.log("临时文件已删除");
+						},
+						fail() {
+							console.log("无法删除临时文件");
+						},
+						complete() {
+							wating.close();
+							uni.showModal({
+								title: '更新完成',
+								content: '应用已更新，是否重启应用？',
+								showCancel: false,
+								success: () => {
+									// 3. 重启应用
+									plus.runtime.restart();
+								}
+							});
+						}
+					});
+
+				}, (error) => {
+
+					wating.close();
+					uni.showToast({
+						title: '安装失败: ' + error.message,
+						icon: 'none',
+						duration: 3000
+					});
+					console.error('wgt安装失败:', error);
+				});
+
+			} else {
+				wating.close();
+				uni.showToast({
+					title: '下载失败',
+					icon: 'none',
+					duration: 2000
+				});
+			}
+		},
+		fail: (err) => {
+			uni.hideLoading();
+			uni.showToast({
+				title: '下载失败: ' + err.errMsg,
+				icon: 'none',
+				duration: 2000
+			});
+			console.error('wgt下载失败:', err);
+		}
+	});
+
+	// 监听下载进度
+	downloadTask.onProgressUpdate((progress) => {
+		console.log('下载进度: ' + progress.progress + '%');
+		wating.setTitle("下载中"+ progress.progress + '%');
+		// 可以在这里更新自定义进度条
+	});
+}
+
+export default {
+	checkAndUpdateWgt
+};
\ No newline at end of file