102完成真机实测

components/BottomSlideMenuPlus/BottomSlideMenuPlus.vue

@@ -26,7 +26,7 @@
 					<view class="p100" :style="{backgroundColor:config.activeIndex==index?config.itemBgColor:'',
 				justifyContent:config.textAlign
 				}">
-						<view class="imgContent" :style="{ 					
+						<view class="imgContent" v-if="item.icon" :style="{ 					
 				height:config.itemHeight,
 				width:config.itemHeight
 				}">

pages.json

@@ -107,7 +107,7 @@
 		},
 
 		{
-			"path": "pages/210/deviceControl/index",
+			"path": "pages/210/HBY210",
 			"style": {
 				"navigationStyle": "custom"
 			}

pages/102/HBY102.vue

@@ -16,7 +16,7 @@
 				<view class="row">
 					<image class="img" src="/static/images/6155/DeviceDetail/time.png" mode="aspectFit"></image>
 					<view class="txt">
-						<view class="bigTxt">{{formData.sta_charge?dic.sta_charge[formData.sta_charge]:"" }}</view>
+						<view class="bigTxt">{{formData.sta_charge?dic.sta_charge[formData.sta_charge+'']:"未充电" }}</view>
 						<view class="smallTxt">设备状态</view>
 					</view>
 				</view>
@@ -46,10 +46,10 @@
 			</view> -->
 		</view>
 
-		<view class="warnnig" :class="{'displayNone':formData.sta_sosadd===''}">
+		<view class="warnnig"  v-for="item,index in warnDevices">
 			<view>闯入报警！</view>
 			<view>
-				{{getWarDevice(formData.sta_sosadd)}}
+				{{item.name}}
 
 			</view>
 		</view>
@@ -114,6 +114,7 @@
 				</view>
 				<view class="rightTxt">
 					<text class="bigTxt">{{item.name}}</text>
+					<text class="smallTxt" v-if="item.group==='sta_RadarType'">{{Distance}}</text>
 
 				</view>
 			</view>
@@ -160,6 +161,10 @@
 
 
 		<global-loading ref="loading" />
+		
+		<BottomSlideMenuPlus :config="Status.BottomMenu" @itemClick="btnClick" @close="closeActionSheet">
+			
+		</BottomSlideMenuPlus>
 	</view>
 </template>
 
@@ -218,9 +223,31 @@
 						show: false,
 						showHeader: true,
 						menuItems: [{
-							text: '强光',
-							icon: '/static/images/6155/DeviceDetail/qiang.png'
-						}],
+							text: '2M',
+							value:'status_2M',
+							icon: ''
+						},
+						{
+							text: '4M',
+								value:'status_4M',
+							icon: ''
+						},
+						{
+							text: '7M',
+								value:'status_7M',
+							icon: ''
+						},
+						{
+							text: '10M',
+								value:'status_10M',
+							icon: ''
+						},
+						{
+							text: '关闭',
+								value:'status_off',
+							icon: ''
+						}
+						],
 						activeIndex: -1,
 						bgColor: '#2a2a2a',
 						itemBgColor: '#3a3a3a',
@@ -254,12 +281,13 @@
 					statu: '',
 					sta_address: '',
 					bleStatu: false,
-
+					sta_charge:'',
 					sta_LedType: '',
 					sta_RadarType: '',
 					sta_Online: '',
 					warnTime: '',
 					sta_sosadd: "",
+					sta_sosName:'',
 					sta_IntrusTime: ''
 
 				},
@@ -349,10 +377,7 @@
 					showConfirm: false
 				},
 				groupDevices: [],
-				audioData: {
-					packetCtn: 0,
-					hexs: []
-				}
+				warnDevices:[]
 			}
 		},
 
@@ -429,7 +454,28 @@
 			this.Status.pageHide = false;
 		},
 		computed: {
-
+			Distance:function(){
+				let f=this.Status.BottomMenu.menuItems.find((item,index)=>{
+					
+					return item.value===this.formData.sta_RadarType;
+						
+					
+				});
+				if(f){
+					return f.text;
+				}
+				return '关闭';
+			},
+			activeIndex:function(){
+				let active=4;
+				let f=this.Status.BottomMenu.menuItems.find((item,index)=>{
+					
+					if(item.value===this.formData.sta_RadarType){
+						active=index;
+					}
+				});
+				return active;
+			}
 		},
 		methods: {
 
@@ -441,7 +487,8 @@
 
 
 				if (item.group == 'sta_RadarType') {
-					this.toggleRedar(item, index);
+					// this.toggleRedar(item, index);
+					this.showRedarSetting(item,index);
 					return;
 				}
 
@@ -507,6 +554,25 @@
 				}
 
 
+			},
+			showRedarSetting(){
+				this.Status.BottomMenu.show=true;
+				this.Status.BottomMenu.showBtn=false;
+			
+				this.Status.BottomMenu.title="感应距离设置";
+				
+				this.Status.BottomMenu.textAlign="center";
+				
+				this.Status.BottomMenu.showMask=true;
+				this.Status.BottomMenu.activeIndex=this.activeIndex;							
+			},
+			btnClick(item,index){
+				this.Status.BottomMenu.show=false;
+				console.log("选中的项:"+index+",值:"+JSON.stringify(item));
+				this.toggleRedar(item,index);
+			},
+			closeActionSheet(){
+				this.Status.BottomMenu.show=false;
 			},
 			toggleRedar(item, index) { //雷达启停
 				let f = this.getDevice();
@@ -521,7 +587,7 @@
 					deviceId: '12345'
 				}
 				// #endif
-				let val = item.key;
+				let val = item.value;
 				if (this.formData.sta_RadarType === val) {
 					val = 'status_off';
 				}
@@ -533,7 +599,9 @@
 
 						ble.sendString(f.deviceId, json, f.writeServiceId, f.wirteCharactId, 30)
 							.then(res => {
+								debugger;
 								this.formData.sta_RadarType = val;
+								this.Status.BottomMenu.activeIndex=index;
 								these.setBleFormData();
 								resolve();
 							})
@@ -750,33 +818,58 @@
 
 				console.log("json=", json)
 
-				let keys = Object.keys(json);
+				
+				
+				let active=-1;
+				let f=this.Status.BottomMenu.menuItems.find((item,index)=>{
+					
+					if(item.value===json.sta_RadarType){
+						active=index;
+					}
+				});
+				this.Status.BottomMenu.activeIndex=active;			
 
+				let msg = [];
+				if (json.sta_PowerPercent <= 20 && (json.sta_charge===0 || json.sta_charge==='0')) {
+					msg.push("设备电量低");
+				}
+				
+				if(json.sta_sosadd_off){//某个设备解除报警
+					this.warnDevices.filter((d,index)=>{
+						if(d.mac===json.sta_sosadd_off){
+							this.warnDevices.splice(index,1);
+						}
+					});
+				}
+				
+				
+				let keys = Object.keys(json);
+				
 				keys.forEach(key => {
 					if (key in this.formData) {
 						// console.log("key=",key+",value=",json[key]);
 						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 => {
+				if (json.sta_sosadd) {//某个设备闯入报警
+					 console.log("查询设备中",json.sta_sosadd);
+					this.searchDevice(json.sta_sosadd).catch(ex => {}).then(dev => {
 						console.log("dev=", dev);
+						let d=this.warnDevices.find(v=>{return v.mac===json.sta_sosadd});
+						let deviceName="";
 						if (dev) {
+							// this.formData.sta_sosName=dev.deviceName;
 							msg.push('"' + dev.deviceName + '"闯入报警中');
+							deviceName=dev.deviceName;
+							
 						} else {
 							msg.push('闯入报警中');
+							// this.formData.sta_sosName="";
+						}
+						if(!d){
+							this.warnDevices.push({mac:json.sta_sosadd,name:deviceName});
 						}
 						this.showMsg(msg.join(','));
 					});
@@ -805,6 +898,7 @@
 			},
 
 			getWarDevice(macStr) {
+				console.log("macStr=",macStr);
 				if (macStr) {
 
 					if (!macStr.includes(':')) {
@@ -834,13 +928,13 @@
 					let f = this.groupDevices.find(v => {
 						return v.deviceMac === macStr;
 					});
-					console.log("111111111");
+					// console.log("111111111");
 					if (f) {
 						console.log("找到设备", f);
 						resolve(f);
 						return;
 					}
-					console.log("111111111");
+					// console.log("111111111");
 					if (macStr == this.device.deviceMac) {
 						console.log("当前设备", this.device);
 						resolve(this.device);
@@ -1058,9 +1152,6 @@
 					buttonText: '确定',
 					okCallback: null
 				});
-			},
-			btnClick() {
-
 			}
 		}
 	}

pages/210/HBY210.vue

@@ -69,69 +69,14 @@
 						</view>
 					</view>
 				</view>
-				<!-- 灯光模式选择 -->
-				<!-- 	<view class="mode-section">
-					<view class="mode-buttons">
-						<view class="mode-v1">
-							<view class="mode-v2" @click="selectMode">
-								<image src="/static/images/210/lj.png" class="setIMG"></image>
-								<view>
-									<view class="battery-v2">联机设备</view>
-								</view>
-							</view>
-						</view>
-						<view class="mode-v1">
-							<view class="mode-v2" @click="uploadStartup">
-								<image src="/static/images/common/path7.png" class="setIMG" mode="aspectFit"></image>
-								<view>
-									<view class="battery-v2">开机画面</view>
-									<view class="mode-v3">上传</view>
-								</view>
-							</view>
-						</view>
-						<view class="mode-v1">
-							<view class="mode-v2" @click="automaticAlarm">
-								<image src="/static/images/210/zd.png" class="setIMG" mode="aspectFit"></image>
-								<view>
-									<view class="battery-v2">自动报警</view>
-								</view>
-							</view>
-						</view>
-						<view class="mode-v1">
-							<view class="mode-v2" @click="anualAlarm">
-								<image src="/static/images/210/zd-HL.png" class="setIMG" mode="aspectFit"></image>
-								<view>
-									<view class="battery-v2">手动报警</view>
-								</view>
-							</view>
-						</view>
-						<view class="mode-v1">
-							<view class="mode-v2">
-								<image src="/static/images/210/bj.png" class="setIMG" mode="aspectFit"></image>
-								<view>
-									<view class="battery-v2">报警声音</view>
-									<view class="mode-v3">上传</view>
-								</view>
-							</view>
-						</view>
-						<view class="mode-v1">
-							<view class="mode-v2" @click="alarmTime">
-								<image src="/static/images/210/time.png" class="setIMG" mode="aspectFit"></image>
-								<view>
-									<view class="battery-v2">报警时长</view>
-									<view class="mode-v3">{{alarmTimeDisplay }}</view>
-								</view>
-							</view>
-						</view>
-
-					</view>
-				</view> -->
+				<!-- ============灯光模式选择================ -->
 				<view class="mode-section">
 					<view class="mode-buttons">
-						<view v-for="(item, index) in modeItems" :key="index" class="mode-v1" :class="{ 'active-mode': selectedIndex === index }">
-							<view class="mode-v2" 
-								@click="handleModeClick(index)">
-								<image :src="item.image" class="setIMG" mode="aspectFit"></image>
+						<view v-for="(item, index) in modeItems" :key="index" class="mode-v1"
+							:class="{ 'active-mode': selectedIndex === index }">
+							<view class="mode-v2" @click="handleModeClick(index)">
+								<image :src="selectedIndex === index ? item.activeImage : item.image" class="setIMG"
+									mode="aspectFit"></image>
 								<view>
 									<view class="battery-v2">{{ item.title }}</view>
 									<view class="mode-v3" v-if="item.subTitle">{{ item.subTitle }}</view>
@@ -239,6 +184,29 @@
 					</view>
 				</view>
 			</view>
+			<!-- =====报警声音上传======= -->
+			<view class="agreement-mask" v-if="lightModeC" @click.stop="closePopup">
+				<view class="agreement-popupB" @click.stop>
+					<!-- 标题 -->
+					<view class="popup-title">报警声音</view>
+					<view class="popup-content">
+						<view>
+							<view class="upload_flex" @click="uploadFile">
+								<image src="/static/images/210/upload.png" mode="aspectFit" class="uploadIMG"></image>
+								<text>点击选择上传文件</text>
+							</view>
+							<view class="upload_flex" @click="deleteQ">
+								<image src="/static/images/210/delete.png" mode="aspectFit" class="uploadIMG"></image>
+								<text>删除文件</text>
+							</view>
+						</view>
+					</view>
+					<!-- 按钮组 -->
+					<view class="popup-buttons">
+						<button class="agree" @click="handleupload">确定</button>
+					</view>
+				</view>
+			</view>
 			<!-- ======各个弹框类型======= -->
 			<CustomPopup :show="currentPopup.show" v-bind="currentPopup.config" @confirm="handleConfirm"
 				@cancel="handleCancel" />
@@ -340,7 +308,7 @@
 	} from '@/api/6170/deviceControl.js'
 	import {
 		getDeviceId
-	} from '../../../store/BLETools';
+	} from '../../store/BLETools';
 	import {
 		baseURL,
 		getToken,
@@ -352,31 +320,39 @@
 				selectedIndex: -1, // Track currently selected index
 				modeItems: [{
 						image: "/static/images/210/lj.png",
+						activeImage: "/static/images/210/lj-HL.png",
 						title: "联机设备",
 						subTitle: ""
 					},
 					{
-						image: "/static/images/common/path7.png",
-						title: "开机画面",
+						image: "/static/images/210/bj.png",
+						activeImage: "/static/images/210/bj-HL.png",
+						title: "报警声音",
 						subTitle: "上传"
 					},
+
 					{
 						image: "/static/images/210/zd.png",
+						activeImage: "/static/images/210/zd-HL.png",
 						title: "自动报警",
 						subTitle: ""
 					},
 					{
-						image: "/static/images/210/zd-HL.png",
+						image: "/static/images/210/zd.png",
+						activeImage: "/static/images/210/zd-HL.png",
 						title: "手动报警",
 						subTitle: ""
 					},
+
 					{
-						image: "/static/images/210/bj.png",
-						title: "报警声音",
+						image: "/static/images/common/path7.png",
+						activeImage: "/static/images/210/path-HL.png",
+						title: "开机画面",
 						subTitle: "上传"
 					},
 					{
 						image: "/static/images/210/time.png",
+						activeImage: "/static/images/210/time-HL.png",
 						title: "报警时长",
 						subTitle: "30秒"
 					}
@@ -424,6 +400,7 @@
 				radioSelected: 0, // -1表示未选中任何项
 				deviceType: '',
 				popupType: '', //弹框类型
+				lightModeC: false
 			}
 		},
 		methods: {
@@ -432,6 +409,10 @@
 				this.lightModeA = false;
 				this.lightModeB = false;
 			},
+			// 上传文件
+			uploadFile(){},
+			// 删除文件
+			deleteQ(){},
 			// 打开弹框
 			showPopup(type) {
 				this.currentPopup = {
@@ -455,13 +436,16 @@
 						this.selectMode();
 						break;
 					case 1:
-						this.uploadStartup();
+						this.soundAlarm();
 						break;
 					case 2:
-						this.automaticAlarm();
+						this.manualAlarm();
 						break;
 					case 3:
-						this.manualAlarm();
+						this.automaticAlarm();
+						break;
+					case 4:
+						this.uploadStartup();
 						break;
 					case 5:
 						this.alarmTime();
@@ -486,6 +470,10 @@
 					url: '/pages/common/map/index'
 				})
 			},
+			// 报警声音
+			soundAlarm() {
+				this.lightModeC = true
+			},
 			// 联机设备
 			selectMode() {
 				uni.navigateTo({
@@ -888,7 +876,8 @@
 	.mode-v1.active-mode .battery-v2 {
 		color: #BBE600 !important;
 	}
-	.mode-v1.active-mode .mode-v3{
+
+	.mode-v1.active-mode .mode-v3 {
 		color: #BBE600 !important;
 	}
 
@@ -1291,6 +1280,18 @@
 		margin-bottom: 50rpx;
 	}
 
+	.upload_flex {
+		display: flex;
+		cursor: pointer;
+		align-items: center;
+		margin-bottom:20rpx;
+	}
+	.uploadIMG{
+		width:68rpx;
+		height:68rpx;
+		margin-right: 20rpx;
+	}
+
 	.item {
 		padding: 10px;
 		margin: 5px 0;

pages/6155/deviceDetail.vue

@@ -108,15 +108,15 @@
 
 			<view class="item">
 				<text class="lbl">单位：</text>
-				<input class="value" v-model="formData.textLines[0]" placeholder="请输入单位" placeholder-class="usrplace" />
+				<input class="value" v-model.trim="formData.textLines[0]" placeholder="请输入单位" placeholder-class="usrplace" />
 			</view>
 			<view class="item">
 				<text class="lbl">部门：</text>
-				<input class="value" v-model="formData.textLines[1]" placeholder="请输入姓名" placeholder-class="usrplace" />
+				<input class="value" v-model.trim="formData.textLines[1]" placeholder="请输入姓名" placeholder-class="usrplace" />
 			</view>
 			<view class="item">
 				<text class="lbl">姓名：</text>
-				<input class="value" v-model="formData.textLines[2]" placeholder="请输入职位" placeholder-class="usrplace" />
+				<input class="value" v-model.trim="formData.textLines[2]" placeholder="请输入职位" placeholder-class="usrplace" />
 			</view>
 
 		</view>
@@ -579,7 +579,7 @@
 						these.$set(these.formData, key, json[key]);
 					} else {
 						console.log(`字段 ${key} 不在 formData 中，跳过更新`);
-					}
+					}  
 				});
 
 				// 强制触发视图更新，确保电量显示同步
@@ -919,7 +919,7 @@
 							fail: (ex) => {
 
 								updateLoading(these, {
-									text: '视频文件上传失败了,请检查网络连接'
+									text  : '视频文件上传失败了,请检查网络连接'
 								});
 
 								reject(ex);
@@ -1295,9 +1295,14 @@
 					case "fu":
 						title = '辅灯模式';
 						items = [{
-							text: '泛光',
-							icon: '/static/images/6155/DeviceDetail/fan.png'
-						}];
+								text: '泛光',
+								icon: '/static/images/6155/DeviceDetail/fan.png'
+							},
+							{
+								text: '强+泛光',
+								icon: '/static/images/6155/DeviceDetail/fan.png'
+							},
+						];
 						break;
 				}
 
@@ -1332,29 +1337,22 @@
 			},
 
 			setMode(mode, type) {
-
 				let dataValue = 0;
-
-
 				switch (mode) {
 					case 0:
-
-
 						if (type == 'main') {
-
 							dataValue = 0x01;
 						} else if (type == 'fu') {
-
 							dataValue = 0x04;
 						}
-
 						break;
 					case 1:
-						dataValue = 0x02;
+						if (type == 'main') {
+							dataValue = 0x02;
+						} else if (type == 'fu') {
+							dataValue = 0x0A; //强泛光
+						}
 						break;
-						// case 2:
-						// 	dataValue = 0x02;
-						// 	break;
 					case 2:
 						dataValue = 0x03;
 						break;
@@ -1363,7 +1361,7 @@
 						break;
 
 				}
-				// console.log("dataValue=", dataValue)
+				console.log("dataValue=", dataValue)
 				// 构建数据包
 				var buffer = new ArrayBuffer(6);
 				var dataView = new DataView(buffer);
@@ -1526,156 +1524,73 @@
 				});
 				this.setBleFormData();
 				let task = async () => {
-					var sendTxtPackge = (rgbdata, type, str) => {
-
-						var promise = new Promise((resolve, reject) => {
-							try {
-								// 设备协议：FA 06/07/08 01 00 + 256字节数据 + FF
-								// 每个文本行只需要一个261字节的包
-								const bufferSize = 261;
-								const dataSize = 256; // 数据部分固定256字节
-
-								let buffer = new ArrayBuffer(bufferSize);
-								let dataView = new DataView(buffer);
-
-								// 写入头部：FA 06/07/08 01 00
-								dataView.setUint8(0, 0xFA);
-								dataView.setUint8(1, type);
-								dataView.setUint8(2, 0x01);
-								dataView.setUint8(3, 0x00);
-
-								// 写入数据（最多256字节），确保数据是数字格式
-								let actualDataSize = Math.min(rgbdata.length, dataSize);
-								for (let i = 0; i < actualDataSize; i++) {
-									// 确保数据是数字格式，如果是字符串则转换
-									let byteValue = typeof rgbdata[i] === 'string' ? these.toByteValue(rgbdata[i]) : rgbdata[i];
-									dataView.setUint8(4 + i, byteValue);
-								}
-
-								// 用0填充剩余数据部分（如果数据不足256字节）
-								for (let i = 4 + actualDataSize; i < bufferSize - 1; i++) {
-									dataView.setUint8(i, 0x00);
-								}
-
-								// 写入尾部：FF
-								dataView.setUint8(bufferSize - 1, 0xFF);
-
-								console.log(`发送文本数据包: type=0x${type.toString(16)}, 数据长度=${actualDataSize}, 总长度=${bufferSize}`);
-
-								// 发送数据包
-								ble.sendData(f.deviceId, buffer, f.writeServiceId, f
-									.wirteCharactId, 100).then(() => {
-									resolve();
-								}).catch(err => {
-									if (err.code == '10007') {
-										// 重试
-										setTimeout(() => {
-											ble.sendData(f.deviceId, buffer, f.writeServiceId, f
-												.wirteCharactId, 100).then(() => {
-												resolve();
-											}).catch(reject);
-										}, 100);
-									} else {
-										reject(err);
-									}
-								});
-
-							} catch (ex) {
-								console.log("构建数据包异常:", ex);
-								reject(ex);
-							}
-						});
-
-						return promise;
-
-					}
-
-					console.log("11111");
-					var result = null;
 					try {
-						console.log("this.$refs.textToHex=", this.$refs.textToHex);
-						// 获取像素数据（组件内部会自动预热画布）
-						result = await this.$refs.textToHex.drawAndGetPixels();
-					} catch (ex) {
-						console.log("获取画布数据异常:", ex);
-					}
-					if (!result) {
-						hideLoading(this);
-						return;
-					}
-					console.log("result=", result);
-					result = result.map(level1 => {
-						return level1.flat(Infinity).map(item => {
-							// 确保数据转换为数字格式，避免字符串格式导致的问题
-							return typeof item === 'string' ? these.toByteValue(item) : item;
-						});
-					});
-					console.log("result=", result);
+						// 预热画布，确保画布和字体完全准备好（解决APP重新打开后第一次获取数据不完整的问题）
+						console.log("预热画布...");
+						await this.$refs.textToHex.drawAndGetPixels();
+						await new Promise(resolve => setTimeout(resolve, 200)); // 等待预热完成
 
-					// var str1="FA 06 01 00 FF FF F7 9F EF 6F EC F7 EA 09 CF FF AF FB EF EB EF EB EC 6B EF EB EC 6B EF EB EF FB EE 63 FF FF FF FF F7 9F EF 6F EC F7 EA 09 CF FF AF FB EF EB EF EB EC 6B EF EB EC 6B EF EB EF FB EE 63 FF FF FF FF F7 FF 81 03 ED BB DD B7 CB CF F3 C7 CD 39 BE FF FE FF C0 03 FE FB FD FB F3 F7 8F 87 FF FF FF FF FE FF FE FF FE FF C0 03 FF FB FD FB FD FB FD FB FD FB FB FB FB FF F7 F7 EF F7 9F 8F FF FF 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 FF"
-					// var str2="FA 07 01 00 FF FF EE DD EE DF EF 5B AB DF AA 03 AE FF AE FF EE 03 EE FF EE FF EE 03 EE FF EE FF EE E3 FF FF FF FF EE DD EE DF EF 5B AB DF AA 03 AE FF AE FF EE 03 EE FF EE FF EE 03 EE FF EE FF EE E3 FF FF FF FF EF 77 EF 73 EF 7F 80 01 EF 7F EF 7F EF 03 E7 3B 8E BB EE D7 EE EF ED E7 ED 9B 8B 7D FF FF FF FF FF FF F7 EF F7 F7 EF F7 DF FB FF FF FF FF FE FF 80 01 FE 7F FD BF FB DF F7 E7 9F F9 FF FF 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 FF"
-					// var str3="FA 08 01 00 FF FF EF DF EC 01 EF FF AB FF AA 03 AA FB AE FB EE 03 EF DF EF DF EE DB ED DF ED DD EF 1F FF FF FF FF EF BF EF 87 81 77 EE F7 EC 03 81 7F EF 7F EF 7F EF 03 81 7F EF 7F EF 7D EF 7D EF 03 FF FF FF FF F9 F1 CF BF DF FF DF FF C1 FF DD 81 DD F7 DD F7 C1 F7 DF 77 FF 77 BF 77 BF 77 FF F7 FF FF FF FF FD FF FD FF FB FF FB FF F0 07 E7 F7 EF F7 D8 07 BF F7 FF F7 F8 07 FF F7 FF F7 FF C7 FF FF FF FF FF FF FF FF FF FF FE FF FE 7F FE 7F FE FF FD BF FD FF FB DF F7 EF EF F7 DF FB BF FD FF FF 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 FF"
-
-					// let arr1=('0x'+(str1.split(' ').join(",0x"))).split(',');
-					// let arr2=('0x'+(str2.split(' ').join(",0x"))).split(',');
-					// let arr3=('0x'+(str3.split(' ').join(",0x"))).split(',');
-
-					// result=[arr1,arr2,arr3];
-
-
-					// 	console.log("result=",result);
-
-
-					let h3dic = [0x06, 0x07, 0x08];
-					let pros = [];
-					let flag = true;
-					// 在开始发送前添加延迟，确保数据完全准备好（解决第一次发送第一个字缺失的问题）
-					await new Promise(resolve => setTimeout(resolve, 500));
-					
-					for (var i = 0; i < result.length; i++) {
-
-						let str = this.formData.textLines[i];
-
-						if (str.length > 0) {
-
-							let width = str.length * 16;
-							var rgb = result[i];
-							
-							// 确保数据是数组且已转换
-							if (!Array.isArray(rgb)) {
-								console.error(`第${i+1}行数据格式错误:`, rgb);
-								flag = false;
-								break;
-							}
-							
-							// 第一次发送前额外延迟，确保设备完全准备好
-							if (i === 0) {
-								console.log("准备发送第一个文本行，等待设备准备好...");
-								await new Promise(resolve => setTimeout(resolve, 500));
-							}
-
-							try {
-								console.log(`开始发送第${i+1}个文本行 (type=0x${h3dic[i].toString(16)})`);
-								await sendTxtPackge(rgb, h3dic[i], str);
-								console.log(`第${i+1}个文本行发送完成`);
-								
-								// 每个文本行发送完成后，添加延迟确保设备处理完成
-								if (i < result.length - 1) {
-									await new Promise(resolve => setTimeout(resolve, 300));
-								}
-							} catch (ex) {
-								flag = false;
-								console.error(`发送第${i+1}个文本行出现异常:`, ex);
-								break;
-							}
+						// 1. 获取所有文本行的像素数据
+						const allPixels = await this.$refs.textToHex.drawAndGetPixels();
+						if (!allPixels) {
+							throw new Error("无法生成像素数据");
 						}
 
+						// 2. 将所有像素数据合并到一个大数组中
+						let combinedData = [];
+						for (let i = 0; i < 3; i++) {
+							const linePixels = (allPixels[i] || []).flat(Infinity).map(item =>
+								typeof item === 'string' ? these.toByteValue(item) : item
+							);
+							// 补齐到256字节
+							while (linePixels.length < 256) {
+								linePixels.push(0x00);
+							}
+							combinedData = combinedData.concat(linePixels.slice(0, 256));
+						}
 
-					}
+						// 3. 构建完整的逻辑大包
+						const logicalPacketSize = 4 + combinedData.length + 1; // Header + Data + Footer
+						const logicalBuffer = new ArrayBuffer(logicalPacketSize);
+						const logicalDataView = new DataView(logicalBuffer);
 
-					hideLoading(these);
-					if (flag) {
-						console.log("发送成功");
+						// 写入头部
+						logicalDataView.setUint8(0, 0xFA);
+						logicalDataView.setUint8(1, 0x06);
+						logicalDataView.setUint8(2, 0x03);
+						logicalDataView.setUint8(3, 0x00);
+
+						// 写入数据
+						for (let i = 0; i < combinedData.length; i++) {
+							logicalDataView.setUint8(4 + i, combinedData[i]);
+						}
+
+						// 写入尾部
+						logicalDataView.setUint8(logicalPacketSize - 1, 0xFF);
+
+						// 4. 将逻辑大包分包发送
+						const CHUNK_SIZE = 20; // 每个物理包的大小
+						const totalChunks = Math.ceil(logicalPacketSize / CHUNK_SIZE);
+
+						updateLoading(these, {
+							text: `准备发送，共 ${totalChunks} 个数据包...`
+						});
+
+						for (let i = 0; i < totalChunks; i++) {
+							const start = i * CHUNK_SIZE;
+							const end = Math.min(start + CHUNK_SIZE, logicalPacketSize);
+							const chunk = logicalBuffer.slice(start, end);
+
+							updateLoading(these, {
+								text: `正在发送 ${i + 1} / ${totalChunks}`
+							});
+
+							await ble.sendData(f.deviceId, chunk, f.writeServiceId, f.wirteCharactId, 50);
+							await new Promise(resolve => setTimeout(resolve, 50)); // 包之间延迟
+						}
+
+						// 5. 发送成功处理
+						hideLoading(these);
 						this.showPop({
 							message: "发送成功",
 							iconUrl: "/static/images/6155/DeviceDetail/uploadSuccess.png",
@@ -1683,9 +1598,6 @@
 							buttonBgColor: '#BBE600'
 						});
 
-
-
-
 						let json = {
 							deviceId: these.device.id,
 							name: these.formData.textLines[1],
@@ -1693,17 +1605,18 @@
 							unitName: these.formData.textLines[2],
 							code: ""
 						};
-						usrApi.sendUsr(json)
-					} else {
+						usrApi.sendUsr(json);
+
+					} catch (ex) {
+						hideLoading(these);
 						this.showPop({
-							message: "出现异常发送失败",
+							message: "发送失败: " + (ex.msg || ex.message),
 							iconUrl: "/static/images/6155/DeviceDetail/uploadErr.png",
 							borderColor: "#e034344d",
 							buttonBgColor: "#E03434",
 						});
 					}
-				}
-
+				};
 				setTimeout(task, 0);
 			},
 			getDetail() {

pages/common/addBLE/addEquip.vue

@@ -51,9 +51,14 @@
 					<text>搜索设备</text>
 					<view @click="refreshBleList()">刷新</view>
 				</view>
+				<view class="lblTitle">
+					<input class="uni-input" v-model="search" placeholder="名称筛选" />
+					<!-- <uni-easyinput :styles="{color:'#ffffffde',borderColor:'#cbcbcba8'}" :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 +153,7 @@
 					}
 
 				},
+				search: '', //筛选
 				PairEquip: [], //已配对设备
 				EquipMents: [], //搜索出来的设备
 				device: null,
@@ -165,16 +171,20 @@
 		},
 
 		onUnload() {
-			ble.StopSearch();
-			ble.removeAllCallback(pagePath);
-
+			if (ble) {
+				ble.StopSearch();
+				ble.removeAllCallback(pagePath);
+			}
 		},
 		onLoad(option) {
+			debugger;
 			let search = option.search;
-			ble = bleTool.getBleTool();
 			these = this;
 			eventChannel = this.getOpenerEventChannel();
 			const systemInfo = uni.getSystemInfoSync();
+
+			ble = bleTool.getBleTool(); // Ensure ble is initialized
+
 			if (systemInfo.uniPlatform == 'web') {
 
 
@@ -199,6 +209,67 @@
 						"linkStatu": false,
 						"isTarget": true
 					},
+					{
+						"RSSI": -69,
+						"advertisData": "",
+						"advertisServiceUUIDs": [
+							"0000FFE0-0000-1000-8000-00805F9B34FB"
+						],
+						"deviceId": "4F0DAC91-4391-CB07-905E-72D7F03EFCD3",
+						"name": "4877-BF743D",
+						"linkStatu": false
+					},
+					{
+							"RSSI": -55,
+							"advertisData": "",
+							"advertisServiceUUIDs": [
+								"0000FFE0-0000-1000-8000-00805F9B34FB"
+							],
+							"deviceId": "EBDA4E6F-3A28-FF65-A845-AE8CC7B78375",
+							"name": "HBY670-BF74EA",
+							"linkStatu": false
+						},
+						{
+							"RSSI": -61,
+							"advertisData": "",
+							"advertisServiceUUIDs": [
+								"0000FFE0-0000-1000-8000-00805F9B34FB"
+							],
+							"deviceId": "469FB381-B47E-1E40-8073-EF50B5704AAB",
+							"name": "EF4651",
+							"linkStatu": false,
+							"isTarget": true
+						},
+						{
+							"RSSI": -69,
+							"advertisData": "",
+							"advertisServiceUUIDs": [
+								"0000FFE0-0000-1000-8000-00805F9B34FB"
+							],
+							"deviceId": "4F0DAC91-4391-CB07-905E-72D7F03EFCD3",
+							"name": "4877-BF743D",
+							"linkStatu": false
+						},{
+						"RSSI": -55,
+						"advertisData": "",
+						"advertisServiceUUIDs": [
+							"0000FFE0-0000-1000-8000-00805F9B34FB"
+						],
+						"deviceId": "EBDA4E6F-3A28-FF65-A845-AE8CC7B78375",
+						"name": "HBY670-BF74EA",
+						"linkStatu": false
+					},
+					{
+						"RSSI": -61,
+						"advertisData": "",
+						"advertisServiceUUIDs": [
+							"0000FFE0-0000-1000-8000-00805F9B34FB"
+						],
+						"deviceId": "469FB381-B47E-1E40-8073-EF50B5704AAB",
+						"name": "EF4651",
+						"linkStatu": false,
+						"isTarget": true
+					},
 					{
 						"RSSI": -69,
 						"advertisData": "",
@@ -213,11 +284,14 @@
 
 
 				these.PairEquip = [this.EquipMents[0]];
+				this.$forceUpdate();
 				return;
 			}
 			let StartSubsrib = () => {
 				these.EquipMents = [];
-
+				if (!ble) {
+					ble = bleTool.getBleTool();
+				}
 				//蓝牙不可用的回调
 				ble.addStateBreakCallback(res => {
 					if (these.Status.isPageHidden) {
@@ -234,19 +308,6 @@
 					these.showOpenSetting();
 
 				}, pagePath);
-				//蓝牙再次可用的回调
-				ble.addStateRecoveryCallback(res => {
-					if (these.Status.isPageHidden) {
-						return;
-					}
-					uni.showToast({
-						icon: 'success',
-						title: '蓝牙恢复可用'
-					});
-					these.Status.BottomMenu.show = false;
-					these.EquipMents = [];
-					these.refreshBleList();
-				}, pagePath);
 
 				//蓝牙断开连接的回调
 				ble.addDisposeCallback(res => {
@@ -263,110 +324,127 @@
 
 
 				}, pagePath);
-				//蓝牙连接已恢复的回调
-				ble.addRecoveryCallback(res => {
+
+
+
+				//搜索到新设备的回调 (Always active)
+				ble.addDeviceFound((arr) => {
+					console.log("--- 收到原始扫描数据 ---", JSON.stringify(arr));
 					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.addDeviceFound((arr) => {
-					// console.log("发现设备", arr);
-					if (these.Status.isPageHidden) {
+					if (!arr || !arr.devices) {
 						return;
 					}
 					arr = arr.devices;
 
-					for (var i = 0; i < arr.length; i++) {
+					console.log(`本次扫描批次发现 ${arr.length} 个设备`);
 
-						arr[i].linkStatu = false;
-						if (!arr[i].name) {
-							continue;
-						}
+					for (var i = 0; i < arr.length; i++) {
+						let device = arr[i];
+						device.linkStatu = false;
 
 						let f = these.EquipMents.find((v, index) => {
-							if (v.deviceId == arr[i].deviceId) {
-
-								these.$set(these.EquipMents[index], 'RSSI', arr[i].RSSI);
-
+							if (v.deviceId == device.deviceId) {
+								console.log(
+									`更新设备信号: ${device.name || device.deviceId}, RSSI: ${device.RSSI}`
+								);
+								these.$set(these.EquipMents[index], 'RSSI', device.RSSI);
 								return true;
 							}
 							return false;
 						});
 
 						if (!f) {
-							console.log("发现新设备，", arr[i]);
+							console.log("+++ 发现新设备，准备添加到列表:", JSON.stringify(device));
 
-							if (these.device && these.device.bluetoothName) {
-								if (these.device.bluetoothName === arr[i].name || arr[i].name.indexOf(these
-										.device.bluetoothName) > -1 || these.device.bluetoothName.indexOf(arr[
-										i].name) > -1) {
-									arr[i].isTarget = true;
+							if (these.device && these.device.bluetoothName && device.name) {
+								if (these.device.bluetoothName === device.name || (device.name && device.name
+										.indexOf(these
+											.device.bluetoothName) > -1) || (device.name && this.device
+										.bluetoothName.indexOf(
+											device.name) > -1)) {
+									device.isTarget = true;
 								}
 							}
-							arr[i].name = arr[i].name.replace('JQZM-', '');
-							these.EquipMents.push(arr[i]);
+							if (device.name) {
+								device.name = device.name.replace('JQZM-', '');
+							}
+							these.EquipMents.push(device);
 						}
 					}
-					// console.log("EquipMents=", these.EquipMents)
 				}, 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);
-
 			}
 
+			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;
-				console.log("11111")
+				if (rec.data.bluetoothName) {
+					these.search = rec.data.bluetoothName.replace('JQZM-', '');
+				}
 
+				startValidDevice();
 				these.refreshBleList();
 			});
 
@@ -377,41 +455,95 @@
 			this.refreshBleList();
 		},
 		methods: {
-			refreshBleList() {
-				if (!ble) {
+			checkAndRequestLocationPermission() {
+				return new Promise((resolve) => {
+
+					if (uni.getSystemInfoSync().platform !== 'android') {
+						return resolve(true);
+					}
+
+					plus.android.requestPermissions(
+						['android.permission.ACCESS_FINE_LOCATION'],
+						(result) => {
+							if (result.granted.length > 0) {
+								console.log('定位权限已授予');
+								resolve(true);
+							} else {
+								console.warn('定位权限被拒绝');
+								uni.showModal({
+									title: '权限提醒',
+									content: '为了正常扫描蓝牙设备，需要您开启定位权限',
+									showCancel: false,
+									success: () => {
+										uni.openSetting(); // 引导用户去设置页
+									}
+								});
+								resolve(false);
+							}
+						},
+						(error) => {
+							console.error('请求定位权限失败:', error);
+							uni.showToast({
+								title: '权限请求异常',
+								icon: 'none'
+							});
+							resolve(false);
+						}
+					);
+
+					resolve(true);
+				});
+			},
+			async refreshBleList() {
+				const systemInfo = uni.getSystemInfoSync();
+				if (systemInfo.uniPlatform == 'web') {
 					return;
 				}
-				let promis = [];
-				for (let index = 0; index < this.PairEquip.length; index++) {
-					let item = this.PairEquip[index];
-					promis.push(ble.disconnectDevice(item.deviceId));
-
+				const hasPermission = await this.checkAndRequestLocationPermission();
+				if (!hasPermission) {
+					console.log("缺少定位权限，已中止蓝牙扫描。");
+					return;
 				}
 
-				Promise.allSettled(promis).finally(() => {
-					ble.StopSearch().finally(res => {
-						console.log("停止搜索成功");
+
+				if (!ble) {
+					ble = bleTool.getBleTool();
+					if (!ble) {
+						console.error("BLE helper not initialized!");
+						return;
+					}
+				}
+
+				ble.StopSearch().finally(() => {
+
+					let disconnectPromises = [];
+					if (ble.data && ble.data.LinkedList) {
+						ble.data.LinkedList.forEach(device => {
+							console.log(`Requesting disconnect for ${device.deviceId}`);
+							disconnectPromises.push(ble.disconnectDevice(device.deviceId));
+						});
+					}
+
+					Promise.allSettled(disconnectPromises).finally(() => {
+
 						these.EquipMents = [];
 						these.PairEquip = [];
+
 						ble.StartSearch().then(result => {
-							console.log("开始搜索成功");
+							console.log("Fresh scan started successfully.");
 						}).catch(err => {
-							console.error("开始搜索失败,err=", err);
+							console.error("Failed to start fresh scan:", err);
 							if (err.code === 10001) {
 								these.showOpenSetting();
 							} else {
 								uni.showModal({
 									title: '提示',
-									content: '出现异常:' + err.msg
+									content: '开始搜索失败:' + err.msg
 								});
 							}
 						});
-					}).catch(ex => {
-						console.error("ex=", ex);
 					});
-
 				});
-
 			},
 			isItemLink: function(item, index) {
 				let src = '/static/images/BLEAdd/noLink.png';
@@ -753,11 +885,12 @@
 		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;
+		/* border: 1px solid #BBE600; */
 	}
 
 
@@ -778,17 +911,20 @@
 		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% - 300rpx);
 		overflow-y: scroll;
+		box-sizing: border-box;
+		/* border: 1px solid red; */
 	}
 
 	.list .item {
@@ -958,4 +1094,21 @@
 		filter: none !important;
 		-webkit-filter: none !important;
 	}
+
+	
+	
+	.uni-input{
+		background-color: #121212;
+		width:100%;
+		height: 60rpx;
+		color: #ffffffde;
+		border:1rpx solid #cbcbcbde;
+		border-radius: 8rpx;
+		font-size: 26rpx;
+		text-indent: 8rpx;
+		font-family: "PingFang SC";
+		line-height: 60rpx;
+		caret-color:#BBE600;
+		font-weight: 200;
+	}
 </style>

utils/BleHelper.js

@@ -685,7 +685,7 @@ class BleHelper {
 
 						uni.onBLECharacteristicValueChange((receive) => {
 							//订阅消息
-							// console.log("收到订阅消息", receive);
+							 // console.log("收到订阅消息", receive);
 							let f = this.data.LinkedList.find((v) => {
 								return v.deviceId == receive.deviceId;
 							})
@@ -1714,7 +1714,7 @@ class BleHelper {
 			let buffer = new ArrayBuffer(bufferSize);
 			let dataView = new DataView(buffer);
 			for (let i = 0; i < array.length; i++) {
-				dataView.setUint8(i, array);
+				dataView.setUint8(i, array[i]);
 			}
 
 			return this.sendData(deviceid, buffer, writeServiceId, wirteCharactId, ms);

utils/BleReceive.js

@@ -569,7 +569,7 @@ class BleReceive {
 		
 		try {
 	
-			 console.log("str=",receive.str);
+			 // console.log("str=",receive.str);
 			receiveData = JSON.parse(receive.str);
 				
 				let recCnt = recArr.find(v => {

utils/request.js

@@ -1,5 +1,5 @@
 import config from '../config/index.js';
-export const env = 'development'; //production development  //开发of线上 改这里就行
+export const env = 'production'; //production development  //开发of线上 改这里就行
 const BASE = config[env];
 const request = (options) => {
 	console.log("options" + JSON.stringify(options), BASE.BASE_URL)