From 4391d30f86d17d1cd27adcc68d256631a6a5b4e3 Mon Sep 17 00:00:00 2001
From: liub <itliubiao@qq.com>
Date: Thu, 2 Apr 2026 08:45:36 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8A=A0=E5=85=A5008A=E6=96=B0=E4=BA=A7?=
 =?UTF-8?q?=E5=93=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/MsgBox/MsgBox.vue       |    2 +-
 pages.json                         |    7 +
 pages/008A/HBY008A.vue             | 1268 ++++++++++++++++++++++++++++
 pages/6075J/BJQ6075J.vue           |    8 +-
 pages/6170/deviceControl/index.vue |   16 +-
 pages/650/HBY650.vue               |   11 +-
 pages/670/HBY670.vue               |    8 +-
 pages/common/addDevice/addBle.vue  |   17 +-
 8 files changed, 1298 insertions(+), 39 deletions(-)
 create mode 100644 pages/008A/HBY008A.vue

diff --git a/components/MsgBox/MsgBox.vue b/components/MsgBox/MsgBox.vue
index c7a7d52..41f8d0c 100644
--- a/components/MsgBox/MsgBox.vue
+++ b/components/MsgBox/MsgBox.vue
@@ -130,7 +130,7 @@
 
 				return json;
 			},
-			//弹出预定好的三种弹窗			
+			//弹出预定好的四种弹窗			
 			showMsg(msg, btnTxt, type, okCallback) {
 
 				let cfg = {
diff --git a/pages.json b/pages.json
index 772c296..e06e62d 100644
--- a/pages.json
+++ b/pages.json
@@ -446,6 +446,13 @@
 				"navigationStyle": "custom",
 				"fullscreen": true
 			}
+		},
+		{
+			"path" : "pages/008A/HBY008A",
+			"style" : 
+			{
+				"navigationBarTitleText" : "HBY008A"
+			}
 		}
 
 	],
diff --git a/pages/008A/HBY008A.vue b/pages/008A/HBY008A.vue
new file mode 100644
index 0000000..6293c63
--- /dev/null
+++ b/pages/008A/HBY008A.vue
@@ -0,0 +1,1268 @@
+<template>
+	<view class="maincontent contentBg">
+
+		<uni-nav-bar :border="false" @clickLeft="prevPage" fixed="true" statusBar="true" background-color="#121212"
+			color="#FFFFFF" :title="Status.navbar.title">
+			<template v-slot:left>
+				<view>
+					<uni-icons type="left" size="24" color="#FFFFFF"></uni-icons>
+				</view>
+			</template>
+			<block slot="right">
+				<view class="navbarRight center">
+					<image @click.stop="handleRightClick(index,item)" v-for="item,index in Status.navbar.icons"
+						class="img" :src="item.src" mode="aspectFit"></image>
+				</view>
+
+			</block>
+		</uni-nav-bar>
+
+		<view class="eq" :style="{marginTop:Status.navbar.height+'px'}">
+			<view class="leftImg" @click.stop="previewImg(device.devicePic?device.devicePic:formData.img)">
+				<image class="img" :src="device.devicePic?device.devicePic:formData.img" mode="aspectFit"></image>
+			</view>
+			<view class="rightTxt">
+				<view class="row">
+					<image class="img" src="/static/images/6155/DeviceDetail/battry.png" mode="aspectFit"></image>
+					<view class="txt">
+						<view class="bigTxt">{{formData.battary}}%</view>
+						<view class="smallTxt">电量</view>
+					</view>
+				</view>
+				<view class="row">
+					<image class="img" src="/static/images/6155/DeviceDetail/time.png" mode="aspectFit"></image>
+					<view class="txt">
+						<view class="bigTxt">{{formData.xuhang}}</view>
+						<view class="smallTxt">续航时间</view>
+					</view>
+				</view>
+			</view>
+		</view>
+		<view class="eqinfo">
+			<view class="item">
+				<text class="lbl">设备名称</text>
+				<text class="value valueFont">{{device.deviceName}}</text>
+			</view>
+			<view class="item">
+				<text class="lbl">设备IMEI</text>
+				<text class="value valueFont">{{device.deviceImei}}</text>
+			</view>
+
+			<view class="item">
+				<text class="lbl">Mac地址</text>
+				<text class="value">{{device.deviceMac}}</text>
+			</view>
+			<view class="item">
+				<text class="lbl">蓝牙名称</text>
+				<text class="value valueFont">{{device.bluetoothName}}</text>
+			</view>
+			<view class="item" @click.top="bleStatuToggle">
+				<text class="lbl">蓝牙状态</text>
+				<text class="value" :class="formData.bleStatu?'green':'red'">{{getbleStatu}}</text>
+			</view>
+			<view class="item">
+				<text class="lbl">设备状态</text>
+				<text class="value valueFont">{{formData.sta_system}}</text>
+			</view>
+
+			<view class="item">
+				<text class="lbl">定位信息</text>
+				<view class="multiValue" @click.stop="gotoMap()">
+					<view class="valueItem valueFont">
+						{{formData.Lon}}
+
+					</view>
+					<view class="valueItem valueFont">
+
+						{{formData.Lat}}
+
+					</view>
+					<view class="valueItem">
+
+						<view style="width:80%;float: right;text-align: right;" class="valueFont">
+							<uni-icons type="location" size="17" color="rgba(255, 255, 255, 0.8)"
+								style="vertical-align: bottom;" />
+							{{formData.address}}
+						</view>
+						<view class="clear"></view>
+					</view>
+				</view>
+
+
+			</view>
+		</view>
+
+
+
+
+
+		<view class="proinfo lamp">
+			<text class="title">产品信息</text>
+			<view class="itemcontent">
+				<view class="item" @click="proDetail('productDes')">
+					<image class="img" src="/static/images/6155/DeviceDetail/param.png" mode="aspectFit"></image>
+					<text class="txt">产品参数</text>
+				</view>
+				<view class="item" @click="proDetail('operatingInstruct')">
+					<image class="img" src="/static/images/6155/DeviceDetail/remark.png" mode="aspectFit"></image>
+					<text class="txt">操作说明</text>
+				</view>
+				<view class="item" @click="proDetail('operationVideo')">
+					<image class="img" src="/static/images/6155/DeviceDetail/video.png" mode="aspectFit"></image>
+					<text class="txt">操作视频</text>
+				</view>
+			</view>
+		</view>
+
+		<MsgBox ref="msgPop" />
+		<global-loading ref="loading" />
+	</view>
+</template>
+
+<script>
+	import request from '@/utils/request.js';
+	import {
+		showLoading,
+		hideLoading,
+		updateLoading
+	} from '@/utils/loading.js';
+
+	import {
+		MsgSuccess,
+		MsgError,
+		MsgClose,
+		MsgWarning,
+		showPop,
+		MsgInfo
+	} from '@/utils/MsgPops.js'
+	import Common from '@/utils/Common.js';
+	import BleTool from '@/utils/BleHelper.js'
+	import BleReceive from '@/utils/BleReceive';
+
+
+	var eventChannel = null;
+	var these = null;
+	var ble = null;
+	var rec = null;
+	var mq = null;
+
+
+	export default {
+		data() {
+			return {
+				Status: {
+					msgOkIntval: null, //紧急通知等待的时间
+					msgOkTime: null, //
+					pageHide: false,
+					apiType: "listA",
+					navbar: {
+						icons: [{
+								src: '/static/images/common/msg.png'
+							},
+							{
+								src: '/static/images/common/shape.png'
+							}
+						],
+						title: 'BJQ6075',
+						showBack: true,
+						height: 90
+					},
+					usrToggle: true,
+					bleLinkCnt: 0
+				},
+				formData: {
+					img: '/static/images/common/BJQ6075.png',
+					battary: "", //电量
+					xuhang: "", //续航
+					imei: "", //imei
+					Lon: "", //经度
+					Lat: "", //纬度 
+					address: "", //地址
+					modeCurr: "", //档位
+					SOS: "", //sos
+					lightCurr: "qiang", //照明模式
+					company: "湖北消防总队", //单位
+					usrname: "胡红军", //姓名 
+					job: "中队长", //职位
+					usrid: "", //id
+					msgTxt: "", //消息1    
+					qzwarn: false, //是否强制报警
+					warnLevel: "", //报警级别
+					staticWarn: false, //静止报警
+					fourGStrenth: 0, //4G信号强度
+					deviceId: "",
+					sta_system: "", //设备状态，0关机，1仅充电，2开机未充电,3，开机且充电
+					bleStatu: false
+				},
+				device: {
+					id: "",
+					deviceName: "",
+					deviceImei: "",
+					deviceMac: "",
+					communicationMode: 0,
+					devicePic: "",
+					typeName: "",
+					bluetoothName: null,
+					deviceStatus: null,
+					bindingTime: "",
+					onlineStatus: 0,
+					battery: "0",
+					latitude: null,
+					longitude: null,
+					alarmStatus: null,
+					detailPageUrl: "/pages/670/HBY670",
+					showConfirm: false
+				},
+
+				permissions: []
+
+			}
+		},
+		computed: {
+			getbleStatu() {
+				if (this.formData.bleStatu === true) {
+					return '已连接';
+				}
+				if (this.formData.bleStatu === 'connecting') {
+					return '连接中';
+				}
+				if (this.formData.bleStatu === 'dicconnect') {
+					return '正在断开';
+				}
+				if (this.formData.bleStatu === 'err') {
+					return '连接异常';
+				}
+				return '未连接';
+			}
+		},
+		created() {
+			this.Status.navbar.height = uni.getSystemInfoSync().statusBarHeight + 20;
+		},
+		onUnload() {
+			console.log("页面卸载,释放资源");
+			let statusTopic = `A/${this.formData.imei?this.formData.imei:this.device.deviceImei}`;
+
+			ble.removeAllCallback(pagePath);
+			ble.removeReceiveCallback(pagePath);
+			if (mq) {
+				mq.unsubscribe(statusTopic);
+				mq.disconnect();
+				mq = null;
+			}
+
+		},
+		onShow() {
+			this.Status.pageHide = false;
+		},
+		onHide: function() {
+			this.Status.pageHide = true;
+		},
+
+		onload() {
+			these = this;
+			recei = BleReceive.getBleReceive();
+			ble = BleTool.getBleTool();
+
+
+			ble.addReceiveCallback(these.bleValueNotify, pagePath);
+			ble.addStateBreakCallback(these.bleStateBreak, pagePath);
+			ble.addStateRecoveryCallback(these.bleStateRecovry, pagePath);
+			ble.addDisposeCallback(these.deviceDispose, pagePath);
+			ble.addRecoveryCallback(these.deviceRecovry, pagePath);
+
+			let eventChannel = this.getOpenerEventChannel();
+
+			eventChannel.on('detailData', function(data) {
+
+				console.log("收到父页面的参数：" + JSON.stringify(data));
+				var device = data.data;
+				these.Status.apiType = data.apiType;
+				these.device = device;
+
+
+				these.formData.usrid = device.deviceImei;
+				if (data.apiType !== 'listA') {
+					Common.getdeviceShareId(data.data.id).then(res => {
+						if (res.code == 200) {
+							if (res.data.permission) {
+								these.permissions = res.data.permission.split(',');
+							}
+						}
+					});
+				}
+				if (these.device.deviceImei) {
+					these.initMQ();
+				}
+				let f = ble.data.LinkedList.find((v) => {
+					if (v.macAddress == device.deviceMac) {
+						console.log("找到设备了", v);
+						these.formData.deviceId = v.deviceId;
+						return true;
+					}
+					return false;
+				});
+				if (!f) {
+					these.showBleUnConnect();
+					these.getDetail();
+					return;
+				}
+				let form = f.formData;
+				if (form) {
+					let keys = Object.keys(form);
+					for (var i = keys.length; i >= 0; i--) {
+						let key = keys[i];
+
+						these.formData[key] = form[key];
+					}
+				}
+				if (these.formData['imei'] && !these.device.deviceImei) {
+					these.initMQ();
+				} else if (these.device.deviceImei) {
+					these.formData['imei'] = these.device.deviceImei;
+				}
+				these.getDetail();
+
+				these.formData.bleStatu = 'connecting';
+				ble.LinkBlue(f.deviceId, f.writeServiceId, f.wirteCharactId, f.notifyCharactId).then(res => {
+					these.formData.bleStatu = true;
+				});
+			});
+
+
+		},
+		methods: {
+			bleStatuToggle() {
+				let f = this.getDevice();
+				if (!f) {
+					this.showBleUnConnect();
+					return;
+				}
+				if (this.formData.bleStatu === true) {
+					this.formData.bleStatu = 'dicconnect';
+					ble.disconnectDevice(f.deviceId).finally(r => {
+						this.formData.bleStatu = false;
+					});
+					return;
+				}
+
+				if (this.formData.bleStatu === false || this.formData.bleStatu === 'err') {
+					this.formData.bleStatu = 'connecting';
+					ble.LinkBlue(f.deviceId, f.writeServiceId, f.wirteCharactId, f.notifyCharactId).then(res => {
+						these.formData.bleStatu = true;
+					}).catch(ex => {
+						these.formData.bleStatu = 'err';
+					});
+					return;
+				}
+
+
+			},
+			initMQ() {
+
+
+				return new Promise((resolve, reject) => {
+					if (mq) {
+
+						resolve();
+						return;
+					}
+					console.log("正在初始化MQtt")
+					mq = new MqttClient();
+					mq.connect(() => {
+						console.log("连接成功，开始订阅消息")
+						// 订阅来自设备的状态更新
+						const statusTopic =
+							`A/${this.formData.imei?this.formData.imei:this.device.deviceImei}`;
+						mq.subscribe(statusTopic, (payload, receive) => {
+							console.log("mq收到消息", payload)
+							let json = JSON.parse(payload);
+							this.receivData(json);
+						});
+						resolve();
+					});
+				});
+
+			},
+			bleValueNotify: function(receive, device, path, recArr) { //订阅消息
+				if (receive.deviceId !== this.formData.deviceId) {
+					return;
+				}
+				let data = recei.ReceiveData(receive, device, pagePath, recArr);
+				console.log("蓝牙收到消息", data)
+				this.receivData(data);
+			},
+			receivData(data) { //处理蓝牙/MQ的数据
+				let keys = Object.keys(data);
+				keys.forEach(key => {
+					this.formData[key] = data[key];
+				});
+				this.setBleFormData();
+			},
+			setBleFormData() {
+				let f = ble.data.LinkedList.find((v) => {
+					if (v.deviceId == these.formData.deviceId) {
+						v.formData = these.formData;
+
+						return true;
+					}
+					return false;
+				});
+				if (f) {
+					uni.setStorageSync(ble.StorageKey, ble.data.LinkedList);
+				}
+
+			},
+			deviceRecovry(res) {
+				if (this.Status.pageHide) {
+					return;
+				}
+				if (res.deviceId == these.formData.deviceId) {
+					this.formData.bleStatu = true;
+					setTimeout(() => {
+						hideLoading(these, 1000);
+					});
+					uni.showToast({
+						icon: 'success',
+						title: '蓝牙连接成功'
+					});
+				}
+
+			},
+			deviceDispose(res) {
+				if (this.Status.pageHide) {
+					return;
+				}
+				if (res.deviceId == these.formData.deviceId) {
+					if (res.device) {
+						these.formData.bleStatu = 'connecting';
+					} else {
+						this.formData.bleStatu = false;
+					}
+					setTimeout(() => {
+						hideLoading(these, 1000);
+					});
+					uni.showToast({
+						icon: 'fail',
+						title: '蓝牙连接已断开'
+					});
+				}
+
+			},
+			bleStateBreak() {
+				if (this.Status.pageHide) {
+					return;
+				}
+				//蓝牙适配器不可用
+				this.formData.bleStatu = false;
+				uni.showToast({
+					icon: 'fail',
+					title: '蓝牙已不可用'
+				})
+				hideLoading(this);
+			},
+			bleStateRecovry() {
+				console.log("蓝牙可用");
+				if (this.Status.pageHide) {
+					return;
+				}
+				console.log("蓝牙可用");
+				//蓝牙适配器再次可用,尝试恢复连接
+				showLoading(this, {
+					text: "蓝牙恢复可用,正在连接设备"
+				});
+				this.formData.bleStatu = 'connecting';
+				ble.LinkBlue(these.formData.deviceId).then(() => {
+					these.formData.bleStatu = true;
+					updateLoading(these, {
+						text: '连接成功'
+					});
+				}).catch(ex => {
+					updateLoading(these, {
+						text: ex.msg
+					})
+				}).finally(() => {
+					setTimeout(() => {
+						hideLoading(these);
+					}, 1000);
+
+				});
+			},
+			proDetail: function(pgetpe) {
+				debugger;
+				if (!this.permissions.includes('41') && this.Status.apiType !== 'listA') {
+
+					MsgError("无操作权限", "确定", this);
+
+					return;
+				}
+				let url = '/pages/common/' + pgetpe + '/index?id=' + (this.device.id ? this.device.id : 0);
+
+				uni.navigateTo({
+					url: url,
+					fail(ex) {
+						console.error(ex);
+					}
+				});
+			},
+			prevPage() {
+				uni.navigateBack({
+
+				});
+			},
+			handleRightClick: function(s, e) {
+
+				if (s === 0) {
+
+					return;
+				} else if (s === 1) {
+					console.log("分享");
+					uni.navigateTo({
+						url: '/pages/common/share/index',
+						events: {
+							ack: function(data) {}
+						},
+						success: (res) => {
+							let json = {
+								persissonType: '6075'
+							};
+							Object.assign(json, this.device);
+							res.eventChannel.emit('share', {
+								data: json
+							});
+						}
+					})
+				}
+			},
+
+		}
+	}
+</script>
+
+<style>
+	.content {
+		padding: 30rpx;
+		box-sizing: border-box;
+	}
+
+	.eq {
+		width: 100%;
+		height: 250rpx;
+		border-radius: 8px;
+		background: rgba(26, 26, 26, 1);
+		box-sizing: border-box;
+		padding: 24rpx 28rpx;
+		display: flex;
+		flex-direction: row;
+		flex-wrap: nowrap;
+		align-content: center;
+		justify-content: center;
+		align-items: center;
+		margin-bottom: 24rpx;
+	}
+
+	.eq .leftImg {
+		box-sizing: border-box;
+		padding: 36rpx;
+		border-radius: 16rpx;
+		background: rgba(42, 42, 42, 0.5);
+	}
+
+	.eq .leftImg,
+	.eq .rightTxt {
+		width: 50%;
+		height: 100%;
+	}
+
+	.eq .rightTxt {
+		display: flex;
+		flex-direction: column;
+		flex-wrap: nowrap;
+		align-content: flex-start;
+		justify-content: space-evenly;
+		align-items: flex-start;
+	}
+
+	.eq .leftImg .img {
+		width: 100%;
+		height: 100%;
+	}
+
+	.eq .rightTxt .img {
+		width: 52rpx;
+		height: 52rpx;
+	}
+
+	.eq .rightTxt .row {
+		width: 100%;
+		display: flex;
+		flex-direction: row;
+		flex-wrap: nowrap;
+		align-content: center;
+		justify-content: flex-start;
+		align-items: center;
+		box-sizing: border-box;
+		padding-left: 50rpx;
+	}
+
+	.eq .rightTxt .row .txt {
+		padding-left: 20rpx;
+	}
+
+	.eq .bigTxt {
+		color: rgba(255, 255, 255, 0.87);
+		font-family: PingFang SC;
+		font-size: 28rpx;
+		font-weight: 400;
+	}
+
+	.eq .smallTxt {
+		color: rgba(255, 255, 255, 0.6);
+		font-family: PingFang SC;
+		font-size: 24rpx;
+		font-weight: 400;
+	}
+
+
+	.eqinfo {
+		border-radius: 16rpx;
+		background: rgba(26, 26, 26, 1);
+		box-sizing: border-box;
+		padding: 14rpx 0rpx;
+	}
+
+	.eqinfo .item {
+		width: 100%;
+		min-height: 60rpx;
+		height: auto;
+		line-height: 60rpx;
+		padding: 0rpx 28rpx;
+		box-sizing: border-box;
+		display: flex;
+		flex-direction: row;
+		flex-wrap: nowrap;
+		align-content: center;
+		justify-content: space-between;
+		align-items: center;
+	}
+
+	.eqinfo .lbl {
+		color: rgba(255, 255, 255, 0.87);
+		font-family: PingFang SC;
+		font-size: 28rpx;
+		font-weight: 400;
+		width: 140rpx;
+		letter-spacing: 0.07px;
+		text-align: left;
+	}
+
+	.eqinfo .value {
+		color: rgba(255, 255, 255, 0.6);
+		font-family: 'PingFang SC';
+		font-size: 28rpx !important;
+		font-weight: 400;
+
+		letter-spacing: 0.07px;
+		text-align: left;
+	}
+
+
+	.eqinfo .valueFont {
+		font-family: 'PingFang SC';
+		font-size: 28rpx !important;
+		font-weight: 400;
+		color: rgba(255, 255, 255, 0.6);
+	}
+
+	.eqinfo .multiValue {
+		display: flex;
+		flex-direction: column;
+		flex-wrap: wrap;
+		align-content: flex-end;
+		align-items: flex-end;
+		justify-content: flex-start;
+		width: calc(100% - 140rpx)
+	}
+
+	.eqinfo .valueItem {
+		height: auto;
+		line-height: 40rpx;
+		color: rgba(255, 255, 255, 0.6);
+		font-family: PingFang SC;
+		font-size: 14px;
+		font-weight: 400;
+		letter-spacing: 0.07px;
+	}
+
+	.lamp {
+		margin-top: 24rpx;
+	}
+
+	.lamp .title {
+		width: 100%;
+		height: 60rpx;
+		line-height: 60rpx;
+		padding: 0rpx 28rpx;
+		box-sizing: border-box;
+		display: flex;
+		flex-direction: row;
+		flex-wrap: nowrap;
+		align-content: center;
+		justify-content: space-between;
+		align-items: center;
+		font-size: 28rpx;
+	}
+
+	.lampMode {
+		padding: 30rpx 0rpx;
+		width: 100%;
+		box-sizing: border-box;
+
+	}
+
+	.lampMode .mode {
+		width: calc(calc(100% - 34rpx) / 2);
+		border-radius: 8px;
+		margin-top: 20rpx;
+		background: rgba(26, 26, 26, 1);
+		display: flex;
+		flex-direction: row;
+		flex-wrap: nowrap;
+		align-content: center;
+		align-items: center;
+		justify-content: flex-start;
+		padding: 30rpx;
+		box-sizing: border-box;
+	}
+
+	.lampMode .mode.active {
+
+		border: 1px solid rgba(174, 214, 0, 1);
+	}
+
+	.lampMode .mode.active .bigTxt {
+
+		color: rgba(174, 214, 0, 1) !important;
+	}
+
+	.mode.marginLeft {
+		margin-left: 34rpx !important;
+	}
+
+	.mode .leftImg .img {
+		width: 70rpx;
+		height: 70rpx;
+	}
+
+	.mode .rightTxt {
+		display: flex;
+		flex-direction: column;
+		flex-wrap: nowrap;
+		align-content: flex-start;
+		justify-content: center;
+		align-items: flex-start;
+		padding-left: 20rpx;
+	}
+
+	.mode .bigTxt {
+		color: rgba(255, 255, 255, 0.87);
+		font-family: PingFang SC;
+		font-size: 28rpx;
+		font-weight: 400;
+
+		letter-spacing: 0.07px;
+
+	}
+
+	.mode .smallTxt {
+		color: rgba(255, 255, 255, 0.6);
+		font-family: PingFang SC;
+		font-size: 24rpx;
+		font-weight: 400;
+
+		letter-spacing: 0.07px;
+
+	}
+
+	.usrinfo {
+		border-radius: 8px;
+		width: 100%;
+		box-sizing: border-box;
+		padding: 24rpx 28rpx;
+		background: rgba(26, 26, 26, 1);
+		margin-bottom: 20rpx;
+	}
+
+	.usrtitle {
+		color: rgba(255, 255, 255, 0.87);
+		font-family: PingFang SC;
+		font-size: 28rpx;
+		font-weight: 400;
+		height: 40rpx;
+		line-height: 40rpx;
+		letter-spacing: 0.07px;
+
+	}
+
+	.usrinfo .btnSend {
+		line-height: 65rpx;
+		border-radius: 8px;
+		width: 120rpx;
+		height: 65rpx;
+		color: rgba(35, 35, 35, 0.87);
+		font-family: PingFang SC;
+		font-size: 24rpx;
+		font-weight: 400;
+		letter-spacing: 0.15rpx;
+		text-align: center;
+		background-color: #BBE600;
+	}
+
+	.usrinfo .item {
+		border-radius: 8px;
+		width: 100%;
+		box-sizing: border-box;
+		line-height: 90rpx;
+		height: 90rpx;
+		background: rgba(42, 42, 42, 1);
+		margin-top: 24rpx;
+		display: flex;
+		flex-direction: row;
+		flex-wrap: nowrap;
+		align-content: center;
+		justify-content: flex-start;
+		align-items: center;
+	}
+
+	.usrinfo .lbl {
+		width: 120rpx;
+		height: 100%;
+		padding-left: 24rpx;
+		box-sizing: border-box;
+
+		text-align: right;
+
+		color: rgba(255, 255, 255, 0.87);
+		font-family: PingFang SC;
+		font-size: 28rpx;
+		font-weight: 400;
+
+		letter-spacing: 0.07px;
+
+	}
+
+	.usrinfo .value {
+		width: calc(100% - 120rpx);
+		height: 100%;
+
+		font-size: 28rpx;
+		font-weight: 400;
+
+		letter-spacing: 0.07px;
+		text-align: left;
+
+	}
+
+	.usrinfo .value .uni-input-input {
+		color: rgba(255, 255, 255, 0.87);
+		font-family: PingFang SC;
+
+	}
+
+
+	.usrplace {
+		color: rgba(255, 255, 255, 0.4);
+		font-family: PingFang SC;
+		font-size: 28rpx;
+		font-weight: 400;
+		letter-spacing: 0.07px;
+		text-align: left;
+	}
+
+	.proinfo .itemcontent {
+		display: flex;
+		display: flex;
+		flex-direction: row;
+		flex-wrap: nowrap;
+		align-content: center;
+		justify-content: space-evenly;
+	}
+
+	.proinfo .item {
+		width: 180rpx;
+		height: 180rpx;
+		box-sizing: border-box;
+		padding: 40rpx;
+		border-radius: 16rpx;
+		background: rgba(26, 26, 26, 1);
+		display: flex;
+		flex-direction: column;
+		flex-wrap: nowrap;
+		align-content: center;
+		justify-content: center;
+		align-items: center;
+	}
+
+	.proinfo .item .img {
+		width: 50rpx;
+		height: 50rpx;
+
+
+	}
+
+	.proinfo .item .txt {
+		color: rgba(255, 255, 255, 0.6);
+		font-family: PingFang SC;
+		font-size: 24rpx;
+		font-weight: 400;
+		margin-top: 20rpx;
+		letter-spacing: 0.07px;
+		text-align: left;
+	}
+
+
+	.slider-container {
+		padding: 0px;
+	}
+
+
+
+
+	.addIco {
+		width: 100%;
+		height: 360rpx;
+		display: flex;
+		flex-direction: row;
+		flex-wrap: nowrap;
+		align-content: center;
+		justify-content: center;
+		align-items: center;
+	}
+
+	.icoContent {
+		width: 240rpx;
+		height: 240rpx;
+		border-radius: 8rpx;
+
+
+		background: rgba(58, 58, 58, 1);
+	}
+
+	.icoContent .img {
+		width: 70rpx;
+		height: 70rpx;
+	}
+
+	.modeSetting {
+		display: flex;
+		flex-direction: row;
+		flex-wrap: nowrap;
+		align-content: center;
+		justify-content: space-around;
+		align-items: center;
+		border-radius: 8px;
+		background: rgba(26, 26, 26, 1);
+		box-sizing: border-box;
+		padding: 30rpx 0rpx;
+	}
+
+	.modeSetting .item {
+		width: 120rpx;
+		height: 120rpx;
+		background: rgba(42, 42, 42, 1);
+		border-radius: 50%;
+
+		color: rgba(255, 255, 255, 0.87);
+
+		font-family: PingFang SC;
+		font-size: 28rpx;
+		font-weight: 400;
+		line-height: 0px;
+
+		box-sizing: border-box;
+	}
+
+	.modeSetting .item.active {
+		border: 4rpx solid rgba(174, 214, 0, 1);
+		background: rgba(26, 26, 26, 1);
+		padding: 6rpx;
+		color: rgba(26, 26, 26, 0.87);
+	}
+
+	.modeSetting .item.active .p100 {
+		background: rgba(174, 214, 0, 1);
+		border-radius: 50%;
+
+	}
+
+
+	.usrinfo .image {
+		width: 30rpx;
+		height: 40rpx;
+	}
+
+	.usrinfo .img {
+		width: 30rpx;
+		height: 40rpx;
+	}
+
+	.content {
+
+		box-sizing: border-box;
+		width: 100%;
+		min-height: 100vh;
+		height: auto;
+	}
+
+	.contentBg {
+		background-color: #121212;
+		color: #ffffffde;
+	}
+
+	.fleft {
+		float: left;
+	}
+
+	.fright {
+		float: right;
+	}
+
+	.clear {
+		clear: both;
+	}
+
+	.displayNone {
+		display: none !important;
+	}
+
+	.p100 {
+		width: 100%;
+		height: 100%;
+	}
+
+	.center {
+		display: flex;
+		flex-direction: row;
+		flex-wrap: nowrap;
+		align-content: center;
+		justify-content: center;
+		align-items: center;
+	}
+
+	.centerLeft {
+		display: flex;
+		flex-direction: row;
+		flex-wrap: nowrap;
+		align-content: center;
+		justify-content: flex-start;
+		align-items: center;
+	}
+
+	.warnnig {
+		border-radius: 16rpx;
+		width: 100%;
+		height: 70rpx;
+		line-height: 70rpx;
+		background: rgba(224, 52, 52, 1);
+		box-sizing: border-box;
+		padding: 0rpx 30rpx;
+		margin-top: 20rpx;
+		color: rgba(255, 255, 255, 0.87);
+		font-family: 'PingFang SC';
+		font-size: 28rpx;
+		font-weight: 400;
+		display: flex;
+		flex-direction: row;
+		flex-wrap: nowrap;
+		align-content: center;
+		justify-content: space-between;
+		align-items: center;
+	}
+
+	.optTitle {
+		color: rgba(255, 255, 255, 0.87);
+
+		font-family: 'PingFang SC';
+		font-size: 28rpx;
+		font-weight: 400;
+
+		letter-spacing: 0.14rpx;
+		text-align: left;
+		width: 100%;
+		box-sizing: border-box;
+		padding: 30rpx 0rpx 10rpx 30rpx;
+	}
+
+	.sosContent {
+		width: 100%;
+		height: 130rpx;
+
+		display: flex;
+		flex-direction: row;
+		flex-wrap: nowrap;
+		align-content: center;
+		justify-content: space-between;
+		align-items: center;
+	}
+
+	.sosContent .item {
+		width: calc(calc(100% - 80rpx) / 2);
+		height: 100%;
+		box-sizing: border-box;
+		border-radius: 16rpx;
+		background: rgba(26, 26, 26, 1);
+		color: rgba(255, 255, 255, 0.87);
+		font-family: 'PingFang SC';
+		font-size: 28rpx;
+		font-weight: 400;
+		letter-spacing: 0.14rpx;
+		display: flex;
+		flex-direction: row;
+		flex-wrap: nowrap;
+		align-content: center;
+		justify-content: center;
+		align-items: center;
+	}
+
+	.sosContent .item.active {
+		border: 1px solid rgba(224, 52, 52, 1);
+		color: rgba(224, 52, 52, 1);
+	}
+
+	.sosContent .imgContent {
+		width: 55rpx;
+		height: 55rpx;
+		background-color: #232323;
+		border-radius: 4rpx;
+		margin-right: 30rpx;
+	}
+
+	.sosContent .imgContent .img {
+		width: 70%;
+		height: 70%;
+
+	}
+
+	.sosContent .item.active .imgContent {
+		background-color: #E034340F;
+	}
+
+	.lightMode {
+		width: 100%;
+		height: 180rpx;
+		border-radius: 16rpx;
+		background: rgba(26, 26, 26, 1);
+		margin-bottom: 30rpx;
+		display: flex;
+		flex-direction: row;
+		flex-wrap: nowrap;
+		align-content: center;
+		justify-content: space-between;
+		align-items: center;
+	}
+
+
+	.lightMode .item {
+		width: calc(calc(100% - 90rpx) / 3);
+		height: 100%;
+		box-sizing: border-box;
+		border-radius: 16rpx;
+
+		color: rgba(255, 255, 255, 0.87);
+		font-family: 'PingFang SC';
+		font-size: 28rpx;
+		font-weight: 400;
+		letter-spacing: 0.14rpx;
+		display: flex;
+		flex-direction: column;
+		flex-wrap: nowrap;
+		align-content: center;
+		justify-content: space-evenly;
+		align-items: center;
+	}
+
+	.lightMode .item.active {
+
+		color: #AED600;
+	}
+
+	.lightMode .imgContent {
+		width: 80rpx;
+		height: 100rpx;
+	}
+
+	.lightMode .imgContent .img {
+		width: 100%;
+		height: 100%;
+
+	}
+
+	.picVideo .btnImg {
+		width: 100%;
+		height: 100rpx;
+		border-radius: 16rpx;
+		background: rgba(42, 42, 42, 1);
+	}
+
+	.picVideo .btnImg .img {
+		width: 40rpx;
+		height: 40rpx;
+	}
+
+
+	.netContent {
+		display: flex;
+		flex-direction: row;
+		flex-wrap: nowrap;
+		align-content: flex-end;
+		justify-content: space-around;
+		align-items: flex-end;
+		width: 50rpx;
+	}
+
+	.net {
+		width: 7rpx;
+		background: rgba(255, 255, 255, 0.3);
+	}
+
+	.net.netone {
+		height: 11rpx;
+	}
+
+	.net.nettwo {
+		height: 17rpx;
+	}
+
+	.net.netsiri {
+		height: 23rpx;
+	}
+
+	.net.netfour {
+		height: 29rpx;
+	}
+
+	.net.netfive {
+		height: 35rpx;
+	}
+
+	.net.active {
+		background: #FFFFFF !important;
+	}
+
+	.navbarRight .img {
+		width: 35rpx;
+		height: 35rpx;
+		margin-right: 20rpx;
+	}
+
+	.uni-navbar--fixed {
+		top: 0rpx;
+	}
+
+	/deep/ .uni-navbar--fixed {
+		top: 0px;
+	}
+
+	/deep/ .uni-navbar__placeholder {
+		display: none !important;
+	}
+</style>
\ No newline at end of file
diff --git a/pages/6075J/BJQ6075J.vue b/pages/6075J/BJQ6075J.vue
index d6310a2..9017abb 100644
--- a/pages/6075J/BJQ6075J.vue
+++ b/pages/6075J/BJQ6075J.vue
@@ -1067,13 +1067,7 @@
 									'0')); // 包序号
 
 
-								if (packetData.length == 250) {
-									dataView.setUint8(3, 0x01);
-									dataView.setUint8(4, 0xF4);
-								} else {
-									dataView.setUint8(3, 0x00);
-									dataView.setUint8(4, 0x64);
-								}
+								dataView.setUint16(3, packetData.length*2,false); // 包t长度
 
 								// 填充数据（每个RGB565值占2字节）
 								for (let i = 0; i < packetData.length; i++) {
diff --git a/pages/6170/deviceControl/index.vue b/pages/6170/deviceControl/index.vue
index 37b46ba..49e0c3c 100644
--- a/pages/6170/deviceControl/index.vue
+++ b/pages/6170/deviceControl/index.vue
@@ -141,7 +141,7 @@
 				<!-- 人员信息登记 -->
 				<view class="form-section" v-if="hasPermission('4')">
 					<TextToHexV2 class="TextToHex" ref="textToHex" :txts="formData.textLines" :bgColor="'#FFFFFF'"
-						:color="'#000000'" :fontSize="12" :returnType="10" />
+						:color="'#000000'" :fontSize="14" :returnType="10" />
 
 					<view class="mode-buttons">
 						<view class="section-title">人员信息登记</view>
@@ -423,7 +423,7 @@
 				Status: {
 					pageHide: null
 				},
-				inteval: 1000
+				inteval: 200
 			}
 		},
 		computed: {
@@ -921,7 +921,7 @@
 						json.instruct[1] = parseInt(selectedItem.instructValue);
 
 						ble.sendString(f.deviceId, json).then(res => {
-							console.log("ble send success")
+							console.log("ble send success",json);
 							this.lightModeA = false;
 						}).catch(ex => {
 							console.error("ble send fail,mqsending....")
@@ -1226,15 +1226,9 @@
 									dataView.setUint8(0, 0x55); // 帧头
 									dataView.setUint8(1, 0x02); // 帧类型：开机画面
 									dataView.setUint8(2, currentPacket); // 包序号
+									dataView.setUint16(3, packetData.length*2,false); // 包t长度
 
-
-									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++) {
diff --git a/pages/650/HBY650.vue b/pages/650/HBY650.vue
index a42aa07..25866bc 100644
--- a/pages/650/HBY650.vue
+++ b/pages/650/HBY650.vue
@@ -975,17 +975,10 @@ import request, { baseURL } from '@/utils/request.js';
 								// 填充头部
 								dataView.setUint8(0, 0x55); // 帧头
 								dataView.setUint8(1, 0x02); // 帧类型：开机画面
-								dataView.setUint8(2, '0x' + currentPacket.toString(16).padStart(2,
-									'0')); // 包序号
+								dataView.setUint8(2, currentPacket); // 包序号
 
 
-								if (packetData.length == 250) {
-									dataView.setUint8(3, 0x01);
-									dataView.setUint8(4, 0xF4);
-								} else {
-									dataView.setUint8(3, 0x00);
-									dataView.setUint8(4, 0x64);
-								}
+								dataView.setUint16(3, packetData.length*2,false); // 包t长度
 
 								// 填充数据（每个RGB565值占2字节）
 								for (let i = 0; i < packetData.length; i++) {
diff --git a/pages/670/HBY670.vue b/pages/670/HBY670.vue
index dd054e8..51c0e12 100644
--- a/pages/670/HBY670.vue
+++ b/pages/670/HBY670.vue
@@ -1799,13 +1799,7 @@
 									'0')); // 包序号
 
 
-								if (packetData.length == 250) {
-									dataView.setUint8(3, 0x01);
-									dataView.setUint8(4, 0xF4);
-								} else {
-									dataView.setUint8(3, 0x00);
-									dataView.setUint8(4, 0x64);
-								}
+								dataView.setUint16(3, packetData.length*2,false); // 包t长度
 
 								// 填充数据（每个RGB565值占2字节）
 								for (let i = 0; i < packetData.length; i++) {
diff --git a/pages/common/addDevice/addBle.vue b/pages/common/addDevice/addBle.vue
index 509d0b2..6b76de8 100644
--- a/pages/common/addDevice/addBle.vue
+++ b/pages/common/addDevice/addBle.vue
@@ -125,7 +125,8 @@
 		MsgClose,
 		MsgWarning,
 		showPop,
-		MsgClear
+		MsgClear,
+		MsgInfo
 	} from '@/utils/MsgPops.js';
 	import MQTT from '@/utils/MqHelper.js';
 
@@ -412,8 +413,7 @@
 					}
 
 
-					arr[i].name = arr[i].name.replace(/\r\n/g, '').replace(/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g,
-						'');
+					arr[i].name = arr[i].name.replace(/\r\n/g, '').replace(/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g,'');
 
 
 
@@ -557,13 +557,22 @@
 			
 			
 			setTimeout(()=>{
-				MsgSuccess("如需要在PC上查看此数据,请复制链接后在PC端打开，然后点右上角扫码授权","复制链接",these,()=>{
+				MsgInfo("如需要在PC上查看此数据,请复制链接后通过微信发送到PC,在PC端打开，然后点右上角扫码授权","复制链接",these,true,()=>{
+					console.log("执行复制");
 					uni.setClipboardData({
 						data:'https://static-mp-5b7c35fc-f6fe-4100-a2e1-3669e4d4bfc9.next.bspapp.com/AppTools/views/index.html',
 						success(){
 							uni.showToast({
 								title:'已复制链接'
 							});
+							
+							
+							plus.runtime.openURL('weixin://', (err) => {
+							  MsgError("打开微信失败,请手动打开微信粘贴");
+							});
+						},
+						fail(ex){
+							console.error("无法复制",ex)
 						}
 					});
 				});