diff --git a/components/global-loading/global-loading.vue b/components/global-loading/global-loading.vue
index 0848bec..2a73aab 100644
--- a/components/global-loading/global-loading.vue
+++ b/components/global-loading/global-loading.vue
@@ -100,6 +100,7 @@
 				if (options.dotColors) {
 					this.colorIndex = 0
 				}
+				this.visible = true;
 			},
 
 			// 阻止触摸移动事件
diff --git a/manifest.json b/manifest.json
index 9058167..e142c32 100644
--- a/manifest.json
+++ b/manifest.json
@@ -24,7 +24,8 @@
             "Geolocation" : {},
             "Maps" : {},
             "Record" : {},
-            "VideoPlayer" : {}
+            "VideoPlayer" : {},
+            "Push" : {}
         },
         /* 应用发布信息 */
         "distribute" : {
diff --git a/pages/102/HBY102.vue b/pages/102/HBY102.vue
index c11daab..6b0816d 100644
--- a/pages/102/HBY102.vue
+++ b/pages/102/HBY102.vue
@@ -48,8 +48,9 @@
 
 		<view class="warnnig" :class="{'displayNone':formData.sta_sosadd===''}">
 			<view>闯入报警！</view>
-			<view class="netContent">
+			<view>
 				{{getWarDevice(formData.sta_sosadd)}}
+
 			</view>
 		</view>
 
@@ -171,10 +172,9 @@
 		hideLoading,
 		updateLoading
 	} from '@/utils/loading.js'
-	import {
-		request,
+	import request, {
 		baseURL
-	} from '../../utils/request';
+	} from '@/utils/request.js'
 
 	import Common from '@/utils/Common.js'
 	const pagePath = "/pages/102/HBY102";
@@ -432,6 +432,7 @@
 
 		},
 		methods: {
+
 			actionSett(item, index) {
 				if (item.group == 'sta_LedType') {
 					this.sosSetting(item, index);
@@ -736,20 +737,7 @@
 					urls: [img]
 				})
 			},
-			getWarDevice(macStr){//获取正在报警的设备名
-				let f = this.groupDevices.find(v => {
-					return v.deviceMac === macStr;
-				});
-				if (f) {
-					return f.deviceName;
-				}
-				
-				if(macStr == this.device.deviceMac) {
-					return this.device.deviceName;
-				}
-				
-				return '';
-			},
+
 			bleValueNotify(receive, device, path, recArr) { //订阅消息
 				if (receive.deviceId !== this.formData.deviceId) {
 					return;
@@ -770,14 +758,21 @@
 						this.formData[key] = json[key];
 					}
 				});
+
 				let msg = [];
 				if (this.formData.sta_PowerPercent <= 20) {
 					msg.push("设备电量低");
 				}
-
+				if (json.sta_sosadd_off == this.formData.sta_sosadd) {
+					this.formData.sta_sosadd = "";
+					let name=this.getWarDevice(json.sta_sosadd_off);
+					msg.push('"' + name + '"取消报警');
+				}
 
 				if (this.formData.sta_sosadd !== "") {
+					console.log("查询设备中");
 					this.searchDevice(this.formData.sta_sosadd).catch(ex => {}).then(dev => {
+						console.log("dev=", dev);
 						if (dev) {
 							msg.push('"' + dev.deviceName + '"闯入报警中');
 						} else {
@@ -798,9 +793,9 @@
 					// 	this.formData.sta_IntrusTime=instrusionTime;
 					// }, 1000);
 				} else {
-					clearInterval(instrusionTime);
-					instrusionTime = 0;
-					this.formData.sta_IntrusTime = 0;
+					// clearInterval(instrusionTime);
+					// instrusionTime = 0;
+					// this.formData.sta_IntrusTime = 0;
 				}
 				if (msg.length > 0) {
 					this.showMsg(msg.join(','));
@@ -808,6 +803,26 @@
 
 
 			},
+
+			getWarDevice(macStr) {
+				if (macStr) {
+
+					if (!macStr.includes(':')) {
+						macStr = macStr.replace(/(.{2})/g, '$1:').slice(0, -1)
+					}
+
+					let f = this.groupDevices.find(v => {
+						return v.deviceMac === macStr;
+					});
+
+					if (f) {
+						return f.deviceName;
+					}
+				}
+
+				return "";
+			},
+
 			searchDevice(macStr) {
 				return new Promise((resolve, reject) => {
 					if (macStr.includes(':')) {
@@ -819,45 +834,59 @@
 					let f = this.groupDevices.find(v => {
 						return v.deviceMac === macStr;
 					});
+					console.log("111111111");
 					if (f) {
+						console.log("找到设备", f);
 						resolve(f);
 						return;
 					}
-
+					console.log("111111111");
 					if (macStr == this.device.deviceMac) {
+						console.log("当前设备", this.device);
 						resolve(this.device);
 						return;
 					}
+					console.log("111111111");
+					try {
 
-					request({
-						url: '/app/device/getDeviceInfoByDeviceMac',
-						method: 'GET',
-						data: {
-							deviceMac: these.device.macAddress
-						}
-					}).then(res => {
 
-						console.log("获取设备信息", res);
-						if (res && res.code == 200) {
-							console.log("res=", res);
-							let data = res.data;
-							if (data) {
-								this.groupDevices.push({
-									deviceMac: data.deviceMac,
-									deviceName: data.deviceName
-								})
-								resolve(data);
-								return;
+						request({
+							url: '/app/device/getDeviceInfoByDeviceMac',
+							method: 'GET',
+							data: {
+								deviceMac: macStr
 							}
-						}
+						}).then(res => {
 
+							console.log("获取设备信息", res);
+							if (res && res.code == 200) {
+								console.log("res=", res);
+								let data = res.data;
+								if (data) {
+									this.groupDevices.push({
+										deviceMac: data.deviceMac,
+										deviceName: data.deviceName
+									})
+									resolve(data);
+									return;
+								}
+							} else {
+								console.log("222222222");
+							}
+
+							resolve(null);
+
+						}).catch(ex => {
+							console.error("查询设备出现异常:", ex);
+							resolve(null);
+
+						}).finally(com => {
+							console.log("complete")
+						});
+					} catch (err) {
+						console.error("err=", err);
 						resolve(null);
-
-					}).catch(ex => {
-
-						resolve(null);
-
-					});
+					}
 
 				});
 			},
diff --git a/pages/6155/deviceDetail.vue b/pages/6155/deviceDetail.vue
index 20b608c..d07fd03 100644
--- a/pages/6155/deviceDetail.vue
+++ b/pages/6155/deviceDetail.vue
@@ -175,7 +175,7 @@
 		baseURL
 	} from '@/utils/request.js';
 
-	var pagePath = "/pages/6155/HBY6155";
+	var pagePath = "/pages/6155/deviceDetail";
 
 	var ble = null;
 	var these = null;
@@ -575,7 +575,7 @@
 				keys.forEach((key) => {
 					if (key in these.formData) {
 						// 确保响应式更新
-						console.log(`更新字段 ${key}: ${these.formData[key]} -> ${json[key]}`);
+						// console.log(`更新字段 ${key}: ${these.formData[key]} -> ${json[key]}`);
 						these.$set(these.formData, key, json[key]);
 					} else {
 						console.log(`字段 ${key} 不在 formData 中，跳过更新`);
@@ -584,7 +584,7 @@
 
 				// 强制触发视图更新，确保电量显示同步
 				these.$forceUpdate();
-				console.log("更新后的电量:", these.formData.battary);
+				// console.log("更新后的电量:", these.formData.battary);
 
 				if (this.formData.battary <= 20) {
 					this.showPop({
@@ -911,7 +911,7 @@
 								"clientid": clientid
 							},
 							formData: {
-								code: 2,
+								code: 1,
 								width: width,
 								height: height
 							},
@@ -942,6 +942,8 @@
 										resolve(res.data);
 
 										return;
+									}else{
+										console.log("res.data=",res.data);
 									}
 
 								}
@@ -1087,7 +1089,7 @@
 									dataView.setUint8(packetSize - 1, 0xFF);
 								}
 								let inteval = parseInt(this.inteval ? this.inteval : 80);
-								console.log(inteval, 'intevalinteval');
+								// console.log(inteval, 'intevalinteval');
 								ble.sendData(f.deviceId, buffer, f.writeServiceId, f
 									.wirteCharactId).then(() => {
 									if (ReSendNo) {
diff --git a/pages/BlueTooth/ModeSetting/HBY6155.vue b/pages/BlueTooth/ModeSetting/HBY6155.vue
deleted file mode 100644
index 3ff9f9a..0000000
--- a/pages/BlueTooth/ModeSetting/HBY6155.vue
+++ /dev/null
@@ -1,1947 +0,0 @@
-<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
deleted file mode 100644
index 06aa86a..0000000
--- a/pages/BlueTooth/ModeSetting/HBY6155V1.vue
+++ /dev/null
@@ -1,1925 +0,0 @@
-<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
deleted file mode 100644
index 07ebe45..0000000
--- a/pages/BlueTooth/ModeSetting/HBY650.vue
+++ /dev/null
@@ -1,1892 +0,0 @@
-<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
deleted file mode 100644
index 8338463..0000000
--- a/pages/BlueTooth/ModeSetting/HBY650_1.vue
+++ /dev/null
@@ -1,1899 +0,0 @@
-<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
deleted file mode 100644
index c457ae4..0000000
--- a/pages/BlueTooth/ModeSetting/HBY670V1.vue
+++ /dev/null
@@ -1,2837 +0,0 @@
-<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
deleted file mode 100644
index c464993..0000000
--- a/pages/BlueTooth/ModeSetting/ModeSetting.vue
+++ /dev/null
@@ -1,1499 +0,0 @@
-<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
deleted file mode 100644
index 3ea69bb..0000000
--- a/pages/BlueTooth/ModeSetting/VideoSend.vue
+++ /dev/null
@@ -1,472 +0,0 @@
-<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
deleted file mode 100644
index 1c1eadb..0000000
--- a/pages/BlueTooth/ModeSetting/VideoSend_1.vue
+++ /dev/null
@@ -1,517 +0,0 @@
-<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
deleted file mode 100644
index 1e8bc89..0000000
--- a/pages/BlueTooth/ModeSetting/VideoSend_670.vue
+++ /dev/null
@@ -1,537 +0,0 @@
-<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
deleted file mode 100644
index d0edfba..0000000
--- a/pages/BlueTooth/ModeSetting/index.vue
+++ /dev/null
@@ -1,115 +0,0 @@
-<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
deleted file mode 100644
index e814728..0000000
--- a/pages/BlueTooth/ModeSetting/update.vue
+++ /dev/null
@@ -1,273 +0,0 @@
-<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/addEquip.vue b/pages/common/addBLE/addEquip.vue
index d30efab..f91c2be 100644
--- a/pages/common/addBLE/addEquip.vue
+++ b/pages/common/addBLE/addEquip.vue
@@ -51,9 +51,13 @@
 					<text>搜索设备</text>
 					<view @click="refreshBleList()">刷新</view>
 				</view>
+				<view class="lblTitle">
+					<uni-easyinput :styles="{color:'#ffffff'}" :clearable="true" class="uni-mt-5" :trim="'both'"
+						prefixIcon="search" v-model="search" placeholder="名称筛选"></uni-easyinput>
+				</view>
 				<view class="list searchList">
 					<view class="item" v-on:click="Link(item,index)" v-for="item, index in EquipMents"
-						v-show="!item['linkStatu']">
+						v-show="item.name.indexOf(search)>-1">
 						<view class="before" v-if="item.isTarget"></view>
 						<view class="leftImg ">
 							<image src="/static/images/BLEAdd/bluetooth.png" class="titleIco" mode="heightFix">
@@ -148,6 +152,7 @@
 					}
 
 				},
+				search:'',//筛选
 				PairEquip: [], //已配对设备
 				EquipMents: [], //搜索出来的设备
 				device: null,
@@ -171,6 +176,7 @@
 			}
 		},
 		onLoad(option) {
+			debugger;
 			let search = option.search;
 			these = this;
 			eventChannel = this.getOpenerEventChannel();
@@ -256,61 +262,7 @@
 
 				}, pagePath);
 
-				// --- Start: Logic for Pairing Mode Only ---
-				if (these.device) {
-					console.log("进入配对模式，启用连接恢复和验证逻辑。");
-					//蓝牙连接已恢复的回调
-					ble.addRecoveryCallback(res => {
-						if (these.Status.isPageHidden) {
-							return;
-						}
-						// hideLoading(these);
-						these.EquipMents.find(function(v, ind) {
-							if (v.deviceId == res.deviceId) {
-								these.PairEquip.push(v);
-								return true;
-							}
-							return false;
-						});
-						if (these.device) {
-							clearInterval(this.Status.intval);
-							showLoading(these, {
-								text: '蓝牙连接已恢复,正在验证设备'
-							});
-
-							setTimeout(() => {
-								these.DeviceVerdict(res.deviceId);
-							}, 0);
-						} else {
-							hideLoading(these);
-						}
-
-
-					}, pagePath);
-
-					//收到设备的消息回调
-					ble.addReceiveCallback((receivData, f, path, arr) => {
-						if (these.Status.isPageHidden) {
-							return;
-						}
-						if (f.macAddress && these.device) {
-							clearInterval(this.Status.intval);
-							this.Status.intval = null;
-							this.Status.time = null;
-
-							showLoading(these, {
-								text: '正在验证设备'
-							});
-
-							setTimeout(() => {
-								these.DeviceVerdict(f.deviceId);
-							}, 0);
-						}
-
-
-					}, pagePath);
-				}
-				// --- End: Logic for Pairing Mode Only ---
+		
 
 				//搜索到新设备的回调 (Always active)
 				ble.addDeviceFound((arr) => {
@@ -356,13 +308,76 @@
 					}
 				}, pagePath);
 			}
+			
+			let startValidDevice=()=>{
+				if (these.device) {
+					console.log("进入配对模式，启用连接恢复和验证逻辑。");
+					//蓝牙连接已恢复的回调
+					ble.addRecoveryCallback(res => {
+						if (these.Status.isPageHidden) {
+							return;
+						}
+						// hideLoading(these);
+						these.EquipMents.find(function(v, ind) {
+							if (v.deviceId == res.deviceId) {
+								these.PairEquip.push(v);
+								return true;
+							}
+							return false;
+						});
+						if (these.device) {
+							clearInterval(this.Status.intval);
+							showLoading(these, {
+								text: '蓝牙连接已恢复,正在验证设备'
+							});
+				
+							setTimeout(() => {
+								these.DeviceVerdict(res.deviceId);
+							}, 0);
+						} else {
+							hideLoading(these);
+						}
+				
+				
+					}, pagePath);
+				
+					//收到设备的消息回调
+					ble.addReceiveCallback((receivData, f, path, arr) => {
+						console.log("000000");
+						if (these.Status.isPageHidden) {
+							return;
+						}
+						console.log("1111111");
+						if (f.macAddress && these.device) {
+							console.log("222222");
+							clearInterval(this.Status.intval);
+							this.Status.intval = null;
+							this.Status.time = null;
+				
+							showLoading(these, {
+								text: '正在验证设备'
+							});
+				
+							setTimeout(() => {
+								these.DeviceVerdict(f.deviceId);
+							}, 0);
+						}
+				
+				
+					}, pagePath);
+				}
+			}
 
 			StartSubsrib();
 
 			eventChannel.on('detailData', function(rec) {
 				console.log("接收到父页面的参数:", rec);
 				these.device = rec.data;
-
+				if(rec.data.bluetoothName){
+					these.search=rec.data.bluetoothName.replace('JQZM-','');
+				}
+				
+				startValidDevice();
 				these.refreshBleList();
 			});
 
@@ -800,10 +815,10 @@
 		padding: 30rpx;
 		box-sizing: border-box;
 		width: 100%;
-		height: calc(100% - 300rpx);
+		height: calc(100% - 240rpx);
 		overflow-y: scroll;
 		position: absolute;
-		top: 300rpx;
+		top: 240rpx;
 		left: 0rpx;
 	}
 
@@ -825,16 +840,17 @@
 		align-content: center;
 		align-items: center;
 		justify-content: space-between;
-		margin-bottom: 20rpx;
+		margin-bottom:30rpx;
 	}
 
 	.list {
 		min-height: 120rpx;
+		
 	}
 
 	.searchList {
 		width: 100%;
-		height: calc(100% - 186rpx);
+		height: calc(100% - 260rpx);
 		overflow-y: scroll;
 	}
 
@@ -1005,4 +1021,12 @@
 		filter: none !important;
 		-webkit-filter: none !important;
 	}
+	
+	.uni-mt-5 {
+		background-color: #000000;
+	}
+	
+	.uni-easyinput__content {
+		background-color: #121212 !important;
+	}
 </style>
\ No newline at end of file
diff --git a/static/images/common/BJQ4877.png b/static/images/common/BJQ4877.png
index dff8be2..a8db8a6 100644
Binary files a/static/images/common/BJQ4877.png and b/static/images/common/BJQ4877.png differ
diff --git a/utils/BleHelper.js b/utils/BleHelper.js
index cd65153..a03532b 100644
--- a/utils/BleHelper.js
+++ b/utils/BleHelper.js
@@ -74,9 +74,9 @@ class BleHelper {
 			stateRecoveryCallback: [], //蓝牙适配器恢复可用事件
 			stateBreakCallback: [] //蓝牙适配器不可用事件
 		}
-		// this.addReceiveCallback((a, b, c) => {
-		// 	recei.ReceiveData(a, b, c);
-		// }, "BleReceiveData");
+		this.addReceiveCallback((receive, f, path, recArr) => {
+			recei.ReceiveData(receive, f, path, recArr);
+		}, "BleReceiveData");
 		this.dic = {
 			errRemarks: [{
 					key: '10000',
@@ -639,7 +639,7 @@ class BleHelper {
 
 						console.log("111111111")
 						uni.onBluetoothDeviceFound((res) => {
-							 // console.log("发现新设备:" + JSON.stringify(res,'name'));
+							  //console.log("发现新设备:" + JSON.stringify(res,'name'));
 							let arr = [];
 							for (var i = 0; i < res.devices.length; i++) {
 								let item = res.devices[i];
@@ -653,7 +653,7 @@ class BleHelper {
 								});
 								if (f) {
 
-									// console.log("发现目标设备:", item);
+									 // console.log("发现目标设备:", item);
 									arr.push(item);
 								}
 
@@ -678,12 +678,14 @@ class BleHelper {
 									});
 								}
 
+							}else{
+								console.error("无人订阅发现设备的回调");
 							}
 						});
 
 						uni.onBLECharacteristicValueChange((receive) => {
 							//订阅消息
-							console.log("收到订阅消息", receive);
+							// console.log("收到订阅消息", receive);
 							let f = this.data.LinkedList.find((v) => {
 								return v.deviceId == receive.deviceId;
 							})
@@ -838,10 +840,10 @@ class BleHelper {
 											}
 										})
 									} else {
-										console.log("无人订阅消息");
+										console.error("无人订阅消息");
 									}
 								} else {
-									console.log("无人订阅receivDataCallback,不处理数据");
+									console.error("无人订阅receivDataCallback,不处理数据");
 								}
 							} catch (ex) {
 								console.error("处理订阅消息失败,ex=", ex);
diff --git a/utils/BleReceive.js b/utils/BleReceive.js
index 36aaea6..45ef6f7 100644
--- a/utils/BleReceive.js
+++ b/utils/BleReceive.js
@@ -46,20 +46,20 @@ class BleReceive {
 			let handler = null;
 			let keys = Object.keys(this.HandlerMap);
 			let devKey = f.device.detailPageUrl ? f.device.detailPageUrl.replace(/\//g, '').toLowerCase() : '';
-			console.log("查找handler - detailPageUrl:", f.device.detailPageUrl, "转换后:", devKey);
+			// console.log("查找handler - detailPageUrl:", f.device.detailPageUrl, "转换后:", devKey);
 			for (let index = 0; index < keys.length; index++) {
 				let devKey = f.device.detailPageUrl ? f.device.detailPageUrl.replace(/\//g, "").toLowerCase() : '';
 				let key = keys[index].replace(/\//g, '').toLowerCase();
 				if (key == devKey) {
 					handler = this.HandlerMap[keys[index]];
-					console.log("找到匹配的handler:", keys[index]);
+					// console.log("找到匹配的handler:", keys[index]);
 					break;
 				}
 			}
 
 			if (handler) {
 				let data = handler(receive, f, path, recArr);
-				console.log("设备"+f.device.deviceName+"收到消息,handler返回的数据:", data);
+				 // console.log("设备"+f.device.deviceName+"收到消息,数据:", data);
 				return data;
 			} else {
 				console.error("已收到消息,但无指定处理程序, deviceUrl:", f.device.detailPageUrl, "可用handlers:", keys);
@@ -162,7 +162,7 @@ class BleReceive {
 
 						if (iswarn) {
 							uni.showModal({
-								content: "环境存在漏电电源",
+								content: "'"+f.device.deviceName+"'环境存在漏电电源",
 								title: "警告",
 								success(res) {
 									if (res.confirm) {
@@ -330,7 +330,7 @@ class BleReceive {
 						if (this.formData.staticWarn) { //有静止报警
 							uni.showModal({
 								title: "警告",
-								content: "设备静止报警中",
+								content: "设备'"+f.device.deviceName+"'静止报警中",
 								showCancel: false
 							});
 						}
@@ -420,19 +420,23 @@ class BleReceive {
 					let name = "";
 					switch (type) {
 						case 0x02:
-							name = '弱光';
+							// name = '弱光';
+							name=1;
 							break;
 						case 0x04:
 							name = '工作光';
 							break;
 						case 0x01:
-							name = '强光';
+							// name = '强光';
+							name=0;
 							break;
 						case 0x03:
-							name = '爆闪';
+							// name = '爆闪';
+							name=2;
 							break;
 						case 0x00:
-							name = '关闭';
+							// name = '关闭';
+							name=3;
 							break;
 					}
 					return name;
@@ -472,8 +476,7 @@ class BleReceive {
 				formData.statu = warn;
 				formData.xuhang = lightingTime;
 				
-				console.log("7305解析结果 - 电量:", batteryLevel, "续航:", lightingTime, "完整数据:", formData);
-
+	
 				let recCnt = recArr.find(v => {
 
 					return v.key.replace(/\//g, "").toLowerCase() === f.device.detailPageUrl.replace(/\//g, '').toLowerCase();
@@ -484,10 +487,10 @@ class BleReceive {
 				if (!recCnt) {
 					if (batteryLevel <= 20) {
                           // 会弹出两个框,暂且注释掉这段代码
-						// uni.showModal({
-						// 	content: "设备电量低",
-						// 	title: "提示"
-						// });
+						uni.showModal({
+							content: "设备'"+f.device.deviceName+"'电量低",
+							title: "提示"
+						});
 					}
 				}
 
@@ -518,7 +521,7 @@ class BleReceive {
 					if (receiveData.sta_PowerPercent<=20) { 
 						uni.showModal({
 							title: "提示",
-							content: "设备电量低",
+							content: "设备'"+f.device.deviceName+"'电量低",
 							showCancel: false
 						});
 					}
@@ -547,7 +550,7 @@ class BleReceive {
 					if (receiveData.sta_battery<=20) { 
 						uni.showModal({
 							title: "提示",
-							content: "设备电量低",
+							content: "设备'"+f.device.deviceName+"'电量低",
 							showCancel: false
 						});
 					}
@@ -577,7 +580,7 @@ class BleReceive {
 					if (receiveData.sta_PowerPercent<=20) { 
 						uni.showModal({
 							title: "提示",
-							content: "设备电量低",
+							content: "设备'"+f.device.deviceName+"'电量低",
 							showCancel: false
 						});
 					}
diff --git a/utils/request.js b/utils/request.js
index a25cc90..6faf71e 100644
--- a/utils/request.js
+++ b/utils/request.js
@@ -1,5 +1,5 @@
 import config from '../config/index.js';
-export const env = 'production'; //production development  //开发of线上 改这里就行
+export const env = 'development'; //production development  //开发of线上 改这里就行
 const BASE = config[env];
 const request = (options) => {
 	console.log("options" + JSON.stringify(options), BASE.BASE_URL)