From 958a74101ea4c3c2b094d6c0aa09cccf04e97a7a Mon Sep 17 00:00:00 2001
From: liub <itliubiao@qq.com>
Date: Thu, 14 Aug 2025 17:25:53 +0800
Subject: [PATCH] =?UTF-8?q?650=E5=85=A8=E5=B1=80=E8=93=9D=E7=89=99?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 App.vue                                      |   8 +-
 components/global-loading/global-loading.vue | 198 +++++
 pages/6155/deviceDetail.vue                  |   6 +-
 pages/650/HBY650.vue                         | 854 +++++++++++--------
 static/images/6155/DeviceDetail/warnning.png | Bin 0 -> 2519 bytes
 static/images/BLEAdd/addBleDevice.png        | Bin 0 -> 867 bytes
 utils/BleHelper.js                           |  77 +-
 utils/loading.js                             |  38 +
 8 files changed, 776 insertions(+), 405 deletions(-)
 create mode 100644 components/global-loading/global-loading.vue
 create mode 100644 static/images/6155/DeviceDetail/warnning.png
 create mode 100644 static/images/BLEAdd/addBleDevice.png
 create mode 100644 utils/loading.js

diff --git a/App.vue b/App.vue
index c790493..3a29b8e 100644
--- a/App.vue
+++ b/App.vue
@@ -1,12 +1,12 @@
 <script>
 	import request from '@/utils/request.js';
-	import bleTool from '@/utils/BleHelper.js';
+	 import bleTool from '@/utils/BleHelper.js';
 	
 	export default {
-
+		
 		onLaunch: function() {
-			uni.clearStorageSync();
-			var ble = bleTool.getBleTool();
+		
+			 var ble = bleTool.getBleTool();
 		},
 		onShow: function() {
 			console.log('App Show')
diff --git a/components/global-loading/global-loading.vue b/components/global-loading/global-loading.vue
new file mode 100644
index 0000000..d0966dc
--- /dev/null
+++ b/components/global-loading/global-loading.vue
@@ -0,0 +1,198 @@
+<template>
+	<view v-if="visible" class="loading-container" @touchmove.stop.prevent="handleTouchMove">
+		<view class="loading-content">
+			<!-- 刻度点容器 -->
+			<view class="clock-container">
+				<view v-for="(dot, index) in dots" :key="index" class="clock-dot" :style="{
+            transform: `rotate(${index * angle}deg) translateY(-${radius}px)`,
+            backgroundColor: getDotColor(index),
+            animationDuration: `${duration}ms`,
+            animationDelay: `${index * (duration / dotsCount)}ms`
+          }"></view>
+			</view>
+
+			<!-- 提示文本 -->
+			<text class="loading-text" :class="text?'':'displayNone'" :style="{ color: textColor }">{{ text }}</text>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				visible: false,
+				dotsCount: 12,
+				dotColors: ['#CEF231c2'], 
+				text: '请稍候...',//文本文字
+				textColor: '#FFFFFFde',//文本颜色
+				radius: 50,//圆的半径
+				duration: 1200,//动画的播放速度
+				colorIndex: 0
+			}
+		},
+		computed: {
+			// 计算每个点之间的角度
+			angle() {
+				return 360 / this.dotsCount
+			},
+			// 生成刻度点数组
+			dots() {
+				return Array.from({
+					length: this.dotsCount
+				})
+			}
+		},
+		methods: {
+			// 获取刻度点颜色（实现无限循环变色）			
+			getDotColor(index) {
+				// 根据当前颜色索引和刻度点位置计算颜色
+				const colorIndex = (index + this.colorIndex) % this.dotColors.length
+				return this.dotColors[colorIndex]
+			},
+
+			// 更新颜色索引（实现循环变色）
+			updateColorIndex() {
+				this.colorIndex = (this.colorIndex + 1) % this.dotColors.length
+			},
+
+			// 显示loading
+			show(options) {
+			
+				if(!options){
+					options={};
+				}
+				
+				this.update(options)
+				this.visible = true
+				
+				// 启动颜色循环
+				if (!this.colorTimer) {
+					this.colorTimer = setInterval(() => {
+						this.updateColorIndex()
+					}, this.duration / this.dotColors.length)
+				}
+			},
+
+			// 隐藏loading
+			hide() {
+			
+				this.visible = false
+				// 清除颜色循环定时器
+				if (this.colorTimer) {
+					clearInterval(this.colorTimer)
+					this.colorTimer = null
+				}
+			},
+
+			// 更新loading配置
+			update(options) {
+				if(!options){
+					options={a:1};
+				}
+				Object.keys(options).forEach(key => {
+					if (this[key] !== undefined) {
+						this[key] = options[key]
+					}
+				})
+
+				// 如果更新了颜色数组，重置颜色索引
+				if (options.dotColors) {
+					this.colorIndex = 0
+				}
+			},
+
+			// 阻止触摸移动事件
+			handleTouchMove() {}
+		},
+
+		beforeDestroy() {
+			// 组件销毁前清除定时器
+			if (this.colorTimer) {
+				clearInterval(this.colorTimer)
+				this.colorTimer = null
+			}
+		}
+	}
+</script>
+
+<style scoped>
+	/* 全屏遮罩层 */
+	.loading-container {
+		position: fixed;
+		top: 0;
+		left: 0;
+		right: 0;
+		bottom: 0;
+		background-color: #000000c2;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		z-index: 99999999999;
+		pointer-events: auto;
+
+	}
+
+	/* 内容居中 */
+	.loading-content {
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		justify-content: center;
+		transform: translateZ(0);
+		/* 启用GPU加速 */
+		margin-top: -150rpx;
+	}
+
+	/* 刻度容器 */
+	.clock-container {
+		position: relative;
+		width: 200rpx;
+		height: 200rpx;
+		margin-bottom: 30rpx;
+	}
+
+	/* 单个刻度点 */
+	.clock-dot {
+		position: absolute;
+		top: 50%;
+		left: 50%;
+		width: 14rpx;
+		height: 52rpx;
+		border-radius: 12rpx;
+	/* 	margin-top: -4rpx;
+		margin-left: -4rpx; */
+		transform-origin: 0 0;
+		animation: colorScale infinite ease-in-out;
+		box-shadow: 0 0 8rpx rgba(0, 0, 0, 0.2);
+	}
+
+	/* 刻度点动画 - 颜色和大小变化 */
+	@keyframes colorScale {
+		0% {
+			opacity: 0.05;
+
+		}
+
+		100% {
+			opacity: 1;
+
+		}
+	}
+
+	/* 提示文本 */
+	.loading-text {
+		font-size: 32rpx;
+		font-weight: 400;
+		letter-spacing: 1.4rpx;
+		text-align: center;
+		max-width: 80vw;
+		padding: 0 20px;
+		line-height: 1.5;
+		font-family: 'PingFang SC';
+	}
+	
+	.displayNone{
+		display: none !important;
+	}
+</style>
\ No newline at end of file
diff --git a/pages/6155/deviceDetail.vue b/pages/6155/deviceDetail.vue
index ef5ba38..6f5c539 100644
--- a/pages/6155/deviceDetail.vue
+++ b/pages/6155/deviceDetail.vue
@@ -247,12 +247,14 @@
 				}
 			}
 		},
-
+		onUnload() {
+			ble.removeReceiveCallback(this);
+		},
 		onLoad: function() {
 			var these = this;
 			let eventChannel = this.getOpenerEventChannel();
 
-			//eventChannel.on('detailData', function(data) {
+			//eventChannel.on('deviceControl', function(data) {
 
 				let data = {
 					data: {
diff --git a/pages/650/HBY650.vue b/pages/650/HBY650.vue
index f79f23a..ee115e4 100644
--- a/pages/650/HBY650.vue
+++ b/pages/650/HBY650.vue
@@ -2,7 +2,7 @@
 	<view class="content contentBg">
 		<view class="eq">
 			<view class="leftImg">
-				<image class="img" src="/static/images/6155/DeviceDetail/Hby650.png" mode="aspectFit"></image>
+				<image class="img" :src="formData.img" mode="aspectFit"></image>
 			</view>
 			<view class="rightTxt">
 				<view class="row">
@@ -22,57 +22,51 @@
 			</view>
 		</view>
 		<view class="eqinfo">
-			<!-- <view class="item">
+			<view class="item">
 				<text class="lbl">蓝牙名称</text>
 				<text class="value">{{formData.name}}</text>
-			</view> -->
-			<view class="item">
-				<text class="lbl">照明档位</text>
-				<text class="value">{{formData.RSSI}}</text>
 			</view>
 			<view class="item">
-				<text class="lbl">探测档位</text>
-				<text class="value">{{formData.statu}}</text>
+				<text class="lbl">设备名称</text>
+				<text class="value">{{formData.deviceName}}</text>
 			</view>
 			<view class="item">
 				<text class="lbl">预警级别</text>
 				<text class="value">{{formData.warnLevel}}</text>
 			</view>
 		</view>
-		<!-- 	<view class="lamp">
-			<view class="title">
-				<text>灯光亮度</text>
-				<text>{{formData.liangDu}}%</text>
-			</view>
-
-			<view class="slider-container">
-				<slider min="1" max="100" step="1" :disabled="false" :value="formData.liangDu" activeColor="#bbe600"
-					backgroundColor="#00000000" block-size="20" block-color="#ffffffde" @change="sliderChange"
-					@changing="sliderChange" class="custom-slider" />
 
+		<view class="warnnig" v-bind:class="formData.iswarn?'':'displayNone'">
+			<view>警告!环境存在漏电电源！</view>
+			<view class="netContent">
+				<view v-bind:class="getWarnStyle(1)" class="net netone"></view>
+				<view v-bind:class="getWarnStyle(2)" class="net nettwo"></view>
+				<view v-bind:class="getWarnStyle(3)" class="net netsiri"></view>
+				<view v-bind:class="getWarnStyle(4)" class="net netfour"></view>
+				<view v-bind:class="getWarnStyle(5)" class="net netfive"></view>
 			</view>
-		</view> -->
+		</view>
 
 		<view class="modeSetting">
-			<view class="item" :class="Status.modeCurr=='low'?'active':''"
+			<view class="item" :class="formData.modeCurr=='low'?'active':''"
 				@click="MainModeSetting('low','staticBattery')">
 				<view class="p100 center">低档</view>
 			</view>
-			<view class="item " :class="Status.modeCurr=='center'?'active':''"
+			<view class="item " :class="formData.modeCurr=='center'?'active':''"
 				@click="MainModeSetting('center','staticBattery')">
 				<view class="p100 center">中档</view>
 			</view>
-			<view class="item " :class="Status.modeCurr=='hight'?'active':''"
+			<view class="item " :class="formData.modeCurr=='hight'?'active':''"
 				@click="MainModeSetting('hight','staticBattery')">
 				<view class="p100 center">高档</view>
 			</view>
-			<view class="item " :class="Status.modeCurr=='close'?'active':''"
+			<view class="item " :class="formData.modeCurr=='close'?'active':''"
 				@click="MainModeSetting('close','staticBattery')">
 				<view class="p100 center">关闭</view>
 			</view>
 		</view>
 		<view class="lampMode">
-			<view class="mode fleft" :class="Status.cMode?'active':''" v-on:click.stop="LampToggle()">
+			<view class="mode fleft" :class="formData.cMode?'active':''" v-on:click.stop="LampToggle()">
 				<view class="leftImg">
 					<image class="img" src="/static/images/6155/DeviceDetail/mainLamp.png" mode="aspectFit"></image>
 				</view>
@@ -82,7 +76,7 @@
 				</view>
 			</view>
 
-			<view class="mode marginLeft fleft" :class="Status.cMode=='mode'?'':'active'"
+			<view class="mode marginLeft fleft" :class="formData.cMode=='mode'?'':'active'"
 				v-on:click.stop="UploadOpenImg()">
 				<view class="leftImg">
 					<image class="img" src="/static/images/6155/DeviceDetail/open.png" mode="aspectFit"></image>
@@ -95,16 +89,16 @@
 			<view class="clear"></view>
 		</view>
 		<view class="usrinfo">
-			<view @click="Status.usrToggle=!Status.usrToggle">
+			<view @click="formData.usrToggle=!formData.usrToggle">
 				<text class="usrtitle fleft">人员信息登记</text>
-				<view class="image fright" :style="{transform:Status.usrToggle?'rotate(0deg)':'rotate(180deg)' }">
+				<view class="image fright" :style="{transform:formData.usrToggle?'rotate(0deg)':'rotate(180deg)' }">
 
 					<image class="img" src="/static/images/6155/DeviceDetail/slideToggle.png" mode="aspectFit"></image>
 
 				</view>
 				<view class="clear"></view>
 			</view>
-			<view :class="Status.usrToggle?'':'displayNone'">
+			<view :class="formData.usrToggle?'':'displayNone'">
 				<view style="margin: 20rpx 0rpx;">
 
 					<view class="btnSend fright" v-on:click.stop="sendUsr">发送</view>
@@ -112,19 +106,19 @@
 				</view>
 				<view class="item">
 					<text class="lbl">单位：</text>
-					<input class="value" v-model="user.company" placeholder="请输入单位" placeholder-class="usrplace" />
+					<input class="value" v-model="formData.company" placeholder="请输入单位" placeholder-class="usrplace" />
 				</view>
 				<view class="item">
 					<text class="lbl">姓名：</text>
-					<input class="value" v-model="user.name" placeholder="请输入姓名" placeholder-class="usrplace" />
+					<input class="value" v-model="formData.name" placeholder="请输入姓名" placeholder-class="usrplace" />
 				</view>
 				<view class="item">
 					<text class="lbl">职位：</text>
-					<input class="value" v-model="user.job" placeholder="请输入职位" placeholder-class="usrplace" />
+					<input class="value" v-model="formData.job" placeholder="请输入职位" placeholder-class="usrplace" />
 				</view>
 				<view class="item">
 					<text class="lbl">ID号：</text>
-					<input class="value" v-model="user.id" placeholder="请输入ID" placeholder-class="usrplace" />
+					<input class="value" v-model="formData.id" placeholder="请输入ID" placeholder-class="usrplace" />
 				</view>
 			</view>
 		</view>
@@ -165,21 +159,25 @@
 			</view>
 		</BottomSlideMenuPlus>
 
-		<Progress :config="Status.Progress"></Progress>
+		<global-loading ref="loading" />
 	</view>
 </template>
 
 <script>
 	import gbk from '@/utils/gbk.js'
 	import BleTool from '@/utils/BleHelper.js'
+	import {
+		showLoading,
+		hideLoading,
+		updateLoading
+	} from '@/utils/loading.js'
 	var ble = null;
+	var these = null;
 	export default {
 		data() {
 			return {
 				Status: {
-					cMode: false,
-					modeCurr: 'low',
-					usrToggle: true,
+
 					Pop: {
 						showPop: false, //是否显示弹窗
 						popType: 'custom',
@@ -233,90 +231,88 @@
 						maskBgColor: '#00000066',
 						showClose: false
 					},
-					Progress: {
-						show: false, //是否显示
-						height: '20rpx',
-						showMask: true, //是否显示mask
-						maskBgColor: '#00000000', //mask背景颜色
-						contentBgColor: '#121212', //总背景颜色
-						showText: true, //是否显示当前进度的文字
-						txtColor: '#ffffffde', //文字的颜色
-						curr: 20, //当前进度
-						total: 100, //总进度
-						proBgColor: '#2a2a2a', //进度条底色,
-						proBorder: '', //进度条border
-						currBgColor: '#bbe600', //当前进度底色
-						currBorder: '', //当前进度border
-						borderRadius: '10rpx'
-					}
+
 				},
 				formData: {
 					img: '/static/images/6155/DeviceDetail/equip.png',
 					battary: '',
-					xuhang: '1',
-					name: 'JQZM-EF4651',
-					RSSI: '-30',
-					statu: '运行中',
-					liangDu: '50',
+					xuhang: '',
+					name: '',
+					deviceId: '',
+					deviceName: '',
+					RSSI: '',
+					statu: '',
+					liangDu: '',
 					warnLevel: '',
-					macAddress: ''
-				},
-				cEdit: {
-					mode: ''
-				},
-				user: {
+					macAddress: '',
+					cMode: false,
+					modeCurr: 'low',
+					usrToggle: true,
 					company: '黄石消防支队',
 					name: '菜英俊',
 					job: '小队长',
-					id: 'HSXF01061'
-				},
-				device: {
-					deviceId: '',
-					writeServiceId: '',
-					wirteCharactId: '',
-					notifyServiceid: '',
-					notifyCharactId: ''
+					id: 'HSXF01061',
+					iswarn: false
+
 				},
+
+
+
 				videoHexArray: []
 			}
 		},
 
+		onUnload() {
+			console.log("页面卸载,释放资源");
+			ble.removeReceiveCallback(this);
+		},
 		onLoad: function() {
-			var these = this;
+			these = this;
 			ble = BleTool.getBleTool();
+			ble.addReceiveCallback(these.bleValueNotify);
 			let eventChannel = this.getOpenerEventChannel();
 
-			eventChannel.on('detailData', function(data) {
-			
-							console.log("收到父页面的参数：" + JSON.stringify(data));
-							var device = data.data;
-			
-							let f = ble.data.LinkedList.find((v) => {
-								if (v.macAddress == device.deviceMac) {
-									console.log("找到设备了");
-									these.device.deviceId = v.deviceId;
-									return true;
-								}
-								return false;
-							});
-							if (!f) {
-								uni.showModal({
-									title: '提示',
-									content: "当前手机未连接过此设备,请删除后重新使用蓝牙添加"
-								})
-								return;
-							}
-			
-							these.formData.name = device.bluetoothName ? device.bluetoothName : device.deviceName;
-							these.formData.img = device.devicePic;
-							these.formData.id = device.id;
-							if (f) {
-								
-									ble.LinkBlue(f.deviceId, f.writeServiceId, f.wirteCharactId, f.notifyCharactId);
-							
-			
-							}
-						});
+			eventChannel.on('deviceControl', function(data) {
+
+				console.log("收到父页面的参数：" + JSON.stringify(data));
+				var device = data.data;
+
+				let f = ble.data.LinkedList.find((v) => {
+					if (v.macAddress == device.deviceMac) {
+						console.log("找到设备了", v);
+						these.formData.deviceId = v.deviceId;
+						return true;
+					}
+					return false;
+				});
+				if (!f) {
+
+
+					these.showPop({
+						message: "蓝牙未连接过该设备,请使用蓝牙重新添加该设备",
+						iconUrl: "/static/images/6155/DeviceDetail/uploadErr.png",
+						borderColor: "#e034344d",
+						buttonBgColor: "#E03434",
+					});
+					return;
+				}
+				let form = f.formData;
+				if (form) {
+					let keys = Object.keys(form);
+					for (var i = keys.length; i >= 0; i--) {
+						let key = keys[i];
+						these.formData[key] = form[key];
+					}
+				}
+				these.formData.name = device.bluetoothName ? device.bluetoothName : "Unname";
+				these.formData.deviceName = device.deviceName;
+				these.formData.img = device.devicePic;
+				these.formData.id = device.id;
+
+
+				ble.LinkBlue(f.deviceId, f.writeServiceId, f.wirteCharactId, f.notifyCharactId);
+
+			});
 
 		},
 		onHide: function() {
@@ -324,49 +320,8 @@
 		},
 		onBackPress(e) {
 
-			var these = this;
-			console.log("these.device=" + JSON.stringify(these.device));
-			if (these.device.deviceId) {
-				if (e.from === 'backbutton') {
-					
 
 
-						let res = {
-							devices: ble.data.LinkedList
-						};
-						
-						if (res.devices.length == 0) {
-							console.log("没有已连接的蓝牙设备")
-							uni.navigateBack();
-							return false;
-						}
-						let f = res.devices.find(function(v) {
-							return v.deviceId == these.device.deviceId;
-						});
-						if (!f) {
-							console.log("该设备没有连接")
-							uni.navigateBack();
-							return false;
-						}
-						
-						uni.showModal({
-							title: '提示',
-							content: '是否断开与设备的蓝牙连接？',
-							success: function(res) {
-								if (res.confirm) {
-									ble.disconnectDevice(these.device.deviceId);
-						
-								}
-								uni.navigateBack();
-							}
-						});
-
-					
-					return true;
-				}
-			}
-			return false;
-
 		},
 		computed: {
 			RSSIRemark: function() {
@@ -387,13 +342,39 @@
 			}
 		},
 		methods: {
+			getWarnStyle(index) {
+				let className = "";
+				switch (this.formData.warnLevel) {
+					case "无预警":
+						break;
+					case "弱预警":
+						if (index <= 1) {
+							className = "active";
+						}
+						break;
+					case "中预警":
+						if (index <= 3) {
+							className = "active";
+						}
+						break;
+					case "强预警":
+						if (index <= 4) {
+							className = "active";
+						}
+						break;
+					case "非常强预警":
+						if (index <= 5) {
+							className = "active";
+						}
+						break;
+				}
+
+				return className;
+			},
 			bleValueNotify: function(receive) { //订阅消息
 				console.log("收到订阅消息", receive);
-				var these = this;
-
-
 				var parseData = () => {
-					let bytes=receive.bytes;
+					let bytes = receive.bytes;
 					if (bytes[0] == 0x55) {
 						try {
 							let staticLevelByte = bytes[1];
@@ -421,10 +402,10 @@
 							// 解析照明档位
 							let lightingLevelByte = bytes[2];
 							let lightingLevelText = lightingLevelByte === 0x6e ? '开启' : '关闭';
-							
-							
+
+
 							// 解析剩余照明时间（第三和第四字节，大端序）
-							let lightingTime =(bytes[3] <<8) | bytes[4];
+							let lightingTime = (bytes[3] << 8) | bytes[4];
 							let hours = Math.floor(lightingTime / 60);
 							let remainingMinutes = lightingTime % 60;
 							let xuhang = '0分';
@@ -441,36 +422,47 @@
 							let batteryLevelByte = bytes[5];
 							// 电量百分比范围检查
 							let batteryLevel = Math.max(0, Math.min(100, batteryLevelByte));
-
+							let iswarn = false;
 							let warn = bytes[6];
 							if (warn == 0x00) {
 								warn = '无预警';
 							} else if (warn == 0x01) {
 								warn = '弱预警';
 							} else if (warn == 0x02) {
+								iswarn = true;
 								warn = '中预警';
 							} else if (warn == 0x03) {
+								iswarn = true;
 								warn = '强预警';
 							} else if (warn == 0x04) {
+								iswarn = true;
 								warn = '非常强预警';
 							}
 
 							these.formData.battary = batteryLevel;
 							these.formData.xuhang = xuhang;
-							these.Status.cMode = lightingLevelByte === 0x6e;
-							these.Status.modeCurr = modeCurr;
+							these.formData.cMode = lightingLevelByte === 0x6e;
+							these.formData.modeCurr = modeCurr;
 							these.formData.warnLevel = warn;
-
+							these.formData.iswarn = iswarn;
+							these.setBleFormData();
+							if (iswarn) {
+								these.showPop({
+									message: "环境存在漏电电源",
+									iconUrl: "/static/images/6155/DeviceDetail/warnning.png",
+									borderColor: "#e034344d",
+									buttonBgColor: "#E03434",
+								});
+							}
 						} catch (error) {
 							console.error('数据解析错误:', error);
 						}
 					}
-					if(receive.str)
-					{
+					if (receive.str) {
 						try {
-							
+
 							let str = receive.str;
-							
+
 							if (str.indexOf('mac address:') == 0) {
 								these.formData.macAddress = str.split(':')[1];
 								console.log("收到mac地址:", )
@@ -493,138 +485,155 @@
 
 			},
 			getDevice: function() {
-				var these = this;
-			
+
+
 				let f = ble.data.LinkedList.find((v) => {
-					return v.deviceId == these.device.deviceId;
+					return v.deviceId == these.formData.deviceId;
 				});
 
 				return f;
 			},
+			setBleFormData() {
+				ble.data.LinkedList.find((v) => {
+					if (v.deviceId == these.formData.deviceId) {
+						v.formData = these.formData;
+
+						return true;
+					}
+					return false;
+				});
+
+				uni.setStorageSync(ble.StorageKey, ble.data.LinkedList);
+			},
 			MainModeSetting: function(type, byteType) {
-				if (this.Status.modeCurr == type) {
+				if (this.formData.modeCurr == type) {
 					return;
 				}
+				showLoading(this, {
+					text: "请稍候..."
+				});
+				let task = () => {
+					this.formData.modeCurr = type;
+					let dataValue = 0x00;
+					let btype = 0x00;
+					switch (type) {
+						case "low": //低档
+							dataValue = 0x67;
+							break;
+						case "center": //中档
+							dataValue = 0x66;
+							break;
+						case "hight": //高档
+							dataValue = 0x65;
+							break;
+						case "close": //关闭
+							dataValue = 0x68;
+							break;
+						case true: //开灯
+							dataValue = 0x6E;
+							break;
+						case false: //关灯 
+							dataValue = 0x6F;
+							break;
+						default: //未知
+							dataValue = 0x00;
+							break;
+					}
+					switch (byteType) {
+						case "staticBattery":
+							btype = 0x00;
+							break;
+						case "lamp":
+							btype = 0x01;
+							break;
+						default:
+							break;
+					}
+
+					let buffer = new ArrayBuffer(6);
+					let dataView = new DataView(buffer);
+
+					dataView.setUint8(0, 0x55); // 帧头
+					dataView.setUint8(1, btype); // 帧类型
+					dataView.setUint8(2, 0x01); // 包序号
+					dataView.setUint8(3, 0x00); // 数据长度
+					dataView.setUint8(4, 0x01); // 数据长度
+					dataView.setUint8(5, dataValue); // 数据
 
 
-				this.Status.modeCurr = type;
-				let dataValue = 0x00;
-				let btype = 0x00;
-				switch (type) {
-					case "low": //低档
-						dataValue = 0x67;
-						break;
-					case "center": //中档
-						dataValue = 0x66;
-						break;
-					case "hight": //高档
-						dataValue = 0x65;
-						break;
-					case "close": //关闭
-						dataValue = 0x68;
-						break;
-					case true: //开灯
-						dataValue = 0x6E;
-						break;
-					case false: //关灯 
-						dataValue = 0x6F;
-						break;
-					default: //未知
-						dataValue = 0x00;
-						break;
-				}
-				switch (byteType) {
-					case "staticBattery":
-						btype = 0x00;
-						break;
-					case "lamp":
-						btype = 0x01;
-						break;
-					default:
-						break;
-				}
-
-				let buffer = new ArrayBuffer(6);
-				let dataView = new DataView(buffer);
-
-				dataView.setUint8(0, 0x55); // 帧头
-				dataView.setUint8(1, btype); // 帧类型
-				dataView.setUint8(2, 0x01); // 包序号
-				dataView.setUint8(3, 0x00); // 数据长度
-				dataView.setUint8(4, 0x01); // 数据长度
-				dataView.setUint8(5, dataValue); // 数据
-
-
-			
-				let f = this.getDevice();
-
-				if (f) {
-					// 发送数据		
-					
-					ble.sendData(f.deviceId, buffer, f.writeServiceId, f.wirteCharactId, 50).then(()=>{
-						console.log("发送成功了");
-					}).catch((ex)=>{
-						uni.showModal({
-							title:'提示',
-							content:ex.msg
-						})
-					});
-
-				} else {
-					console.log("333333");
+
+					let f = this.getDevice();
+
+					if (f) {
+						// 发送数据		
+
+						ble.sendData(f.deviceId, buffer, f.writeServiceId, f.wirteCharactId, 10).then(() => {
+
+
+							console.log("发送成功了");
+						}).catch((ex) => {
+
+							these.showPop({
+								message: ex.msg,
+								iconUrl: "/static/images/6155/DeviceDetail/uploadErr.png",
+								borderColor: "#e034344d",
+								buttonBgColor: "#E03434",
+							});
+
+						}).finally(() => {
+
+							hideLoading(these);
+
+							these.setBleFormData();
+						});
+					} else {
+						these.showPop({
+							message: "蓝牙未连接过该设备,请使用蓝牙重新添加该设备",
+							iconUrl: "/static/images/6155/DeviceDetail/uploadErr.png",
+							borderColor: "#e034344d",
+							buttonBgColor: "#E03434",
+						});
+						hideLoading(these);
+					}
 				}
 
+				setTimeout(task, 0);
 
 
 			},
 			LampToggle: function() {
 
-				this.Status.cMode = !this.Status.cMode;
-				this.MainModeSetting(this.Status.cMode, "lamp");
+				this.formData.cMode = !this.formData.cMode;
+				this.MainModeSetting(this.formData.cMode, "lamp");
 			},
 			proParam: function() {
 
 				uni.navigateTo({
-					url: '/pages/common/productDes/index?id=' + this.device.deviceId,
+					url: '/pages/common/productDes/index?id=' + this.formData.id,
 					success(ev) {
 
-					},
-					fail() {
-						uni.showToast({
-							title: '敬请期待'
-						})
 					}
 				});
 			},
 			handRemark: function() {
 				uni.navigateTo({
-					url: '/pages/common/operatingInstruct/index?id=' + this.device.deviceId,
+					url: '/pages/common/operatingInstruct/index?id=' + this.formData.id,
 					success(ev) {
 
-					},
-					fail() {
-						uni.showToast({
-							title: '敬请期待'
-						})
 					}
 				});
 			},
 			handVideo: function() {
 				uni.navigateTo({
-					url: '/pages/common/operationVideo/index?id=' + this.device.deviceId,
+					url: '/pages/common/operationVideo/index?id=' + this.formData.id,
 					success(ev) {
 
-					},
-					fail() {
-						uni.showToast({
-							title: '敬请期待'
-						})
 					}
 				});
 			},
 			checkImgUpload: function() {
 				console.log("123213213213");
-				var these = this;
+
 
 				// 处理像素数据并发送
 				var processAndSendImageData = function(pixels) {
@@ -637,33 +646,31 @@
 					});
 				}
 
-				
+
 
 				// 分包发送图片数据
 				var sendImagePackets = function(imageData) {
 
 					return new Promise((resolve, reject) => {
-						// this.isSending = true;
-						// this.progress = 0;
-						// this.currentPacket = 0;
 
 						// 总数据包数
 						const totalPackets = 52;
 						let currentPacket = 1;
 
 						let f = these.getDevice();
-						
+
 						if (f) {
 							// 发送单个数据包
 							const sendNextPacket = () => {
 								if (currentPacket > totalPackets) {
-									uni.hideLoading();
+									hideLoading(these);
 									these.Status.BottomMenu.show = false;
-									these.Status.Progress.show = false;
-									these.Status.Pop.showPop = true;
-									these.Status.Pop.message = "上传成功";
-									these.Status.Pop.iconUrl =
-										"/static/images/6155/DeviceDetail/uploadSuccess.png";
+									these.showPop({
+										showPop: true,
+										message: "上传成功",
+										iconUrl: "/static/images/6155/DeviceDetail/uploadSuccess.png",
+									});
+
 									resolve();
 									return;
 								}
@@ -684,13 +691,7 @@
 									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);
+									endIndex);
 								// 构建数据包
 								const bufferSize = 5 + packetData.length * 2; // 头部5字节 + 数据部分
 								const buffer = new ArrayBuffer(bufferSize);
@@ -701,11 +702,7 @@
 								dataView.setUint8(1, 0x02); // 帧类型：开机画面
 								dataView.setUint8(2, '0x' + currentPacket.toString(16).padStart(2,
 									'0')); // 包序号
-								// if(packetData.length==250)
-								// {
-								// dataView.setUint8(3, 0x01);
-								// dataView.setUint8(4, 0xFF);
-								// }
+
 
 								if (packetData.length == 250) {
 									dataView.setUint8(3, 0x01);
@@ -719,18 +716,20 @@
 								for (let i = 0; i < packetData.length; i++) {
 									dataView.setUint16(5 + i * 2, packetData[i], false); // 大端字节序
 								}
-								console.log(
-									`发送数据包${currentPacket}/${totalPackets},${dataView.getUint8(0)} ${dataView.getUint8(1)} ${dataView.getUint8(2)}`
-								)
 
 
 
 
 								//发送数据包
-								ble.sendData(f.deviceId, buffer, f.writeServiceId, f.wirteCharactId, 50)
+								ble.sendData(f.deviceId, buffer, f.writeServiceId, f.wirteCharactId,
+										10)
 									.then(() => {
 
-										these.Status.Progress.curr = currentPacket;
+
+										updateLoading(these, {
+											text: "正在发送:" + currentPacket + "/" +
+												totalPackets
+										})
 										currentPacket++;
 
 										setTimeout(sendNextPacket, 0);
@@ -741,14 +740,16 @@
 											return;
 										}
 										these.Status.BottomMenu.show = false;
-										these.Status.Progress.show = false;
-										
-											uni.showModal({
-												title:'提示',
-												content:err.msg
-											})
-										
-										uni.hideLoading();
+
+
+
+										these.showPop({
+											message: err.msg,
+											iconUrl: "/static/images/6155/DeviceDetail/uploadErr.png",
+											borderColor: "#e034344d",
+											buttonBgColor: "#E03434",
+										});
+										hideLoading(these);
 										reject(err);
 									});
 							}
@@ -760,17 +761,16 @@
 								sendNextPacket();
 							}).catch((err) => {
 								console.log("握手没有成功");
+								these.showPop({
+									message: err.msg,
+									iconUrl: "/static/images/6155/DeviceDetail/uploadErr.png",
+									borderColor: "#e034344d",
+									buttonBgColor: "#E03434",
+								});
+								hideLoading(these);
 								reject(err);
 							});
-
-
 						}
-
-
-
-
-
-
 					});
 				}
 				//去图片裁剪
@@ -780,13 +780,11 @@
 						url: "/pages/6155/ImgCrop",
 						events: {
 							ImgCutOver: function(data) {
-								console.log("我收到裁剪后的图片了，感谢老铁," + data)
-								uni.showLoading({
-									title: "正在发送..."
+								// console.log("我收到裁剪后的图片了，感谢老铁," + data)
+								showLoading(these, {
+									text: "正在发送..."
 								});
-								these.Status.Progress.show = true;
-								these.Status.Progress.curr = 0;
-								these.Status.Progress.total = 52;
+
 								these.Status.BottomMenu.show = false;
 								setTimeout(function() {
 									processAndSendImageData(data).catch(() => {
@@ -800,6 +798,7 @@
 							ev.eventChannel.emit('checkImg', {
 								data: imgPath
 							});
+							these.Status.BottomMenu.show = false;
 						}
 					});
 				}
@@ -815,8 +814,8 @@
 						}
 						console.log("开始处理,正在上传");
 						let f = this.getDevice();
-						uni.showLoading({
-							title: "上传中"
+						showLoading(these, {
+							text: "上传中"
 						});
 						let p1 = these.HoldYouHand("video transmit start", 2200, f.deviceId, f.writeServiceId,
 							f.wirteCharactId);
@@ -831,16 +830,12 @@
 								},
 								timeout: 600000,
 								fail: (ex) => {
-									//console.log("上传视频失败" + JSON.stringify(ex));
-									uni.showToast({
-										title: "视频上传失败,请检查网络连接",
-										icon: 'fail'
-									})
-									uni.hideLoading();
+									console.log("上传视频失败" + JSON.stringify(ex));
+
 									err(ex);
 								},
 								success: (res) => {
-									uni.hideLoading();
+
 									console.log("上传完成，向蓝牙设备发送");
 									succ(res);
 								}
@@ -854,27 +849,35 @@
 							res = JSON.parse(res.data);
 							if (res.data) {
 								these.videoHexArray = res.data;
+								updateLoading(these, {
+									text: "正在发送:0/1536"
+								});
 
-								these.Status.Progress.show = true;
-								these.Status.Progress.curr = 0;
-								these.Status.Progress.total = 1536;
 								these.Status.BottomMenu.show = false;
-								setTimeout(() => {
-									shotVideoClick(res.data);
-								}, 0)
+
+								shotVideoClick(res.data);
+
 
 							} else {
 								console.log("服务器未返回正确的数据");
-								uni.showToast({
-									title: "与服务器连接出现异常",
-									icon: 'fail'
-								})
+
+
+								these.showPop({
+									message: "与服务器连接出现异常,请检查网络设置",
+									iconUrl: "/static/images/6155/DeviceDetail/uploadErr.png",
+									borderColor: "#e034344d",
+									buttonBgColor: "#E03434",
+								});
 							}
 
 						}).catch((ex) => {
-							uni.showModal({
-								title: "提示",
-								content: "出现异常"
+
+							hideLoading(these);
+							these.showPop({
+								message: "出现异常," + ex.msg,
+								iconUrl: "/static/images/6155/DeviceDetail/uploadErr.png",
+								borderColor: "#e034344d",
+								buttonBgColor: "#E03434",
 							});
 						})
 					}
@@ -895,12 +898,16 @@
 									console.log("准备发送一段数据");
 									if (currentPacket > totalPackets) {
 										these.Status.BottomMenu.show = false;
-										these.Status.Progress.show = false;
-										these.Status.Pop.showPop = true;
-										these.Status.Pop.message = "上传成功";
+										hideLoading(these);
+										these.showPop({
+											showPop: true,
+											message: "上传成功",
+											iconUrl: "/static/images/6155/DeviceDetail/uploadSuccess.png"
+										});
+
+
 										these.videoHexArray = [];
-										these.Status.Pop.iconUrl =
-											"/static/images/6155/DeviceDetail/uploadSuccess.png";
+
 										resolve();
 
 										return;
@@ -945,29 +952,33 @@
 									let inteval = 50;
 									console.log("开始发送一段视频"); //
 									ble.sendData(f.deviceId, buffer, f.writeServiceId, f
-										.wirteCharactId, inteval).then(() => {
+										.wirteCharactId, 10).then(() => {
+										updateLoading(these, {
+											text: "正在发送:" + currentPacket + "/" +
+												totalPackets
+										})
 
-										these.Status.Progress.curr = currentPacket;
 										currentPacket++;
 
 										console.log("发送一段成功,发送下一段");
 										setTimeout(sendNextVideoPacket, inteval);
 									}).catch(err => {
-										if(err.code=='10007'){//遇到这个错误自动重新发送
+										if (err.code == '10007') { //遇到这个错误自动重新发送
 											console.log(err.errMsg + ",发送失败了,正在补偿：" +
 												currentPacket);
-											setTimeout(sendNextVideoPacket, inteval);	
-										}
-										else{
+											setTimeout(sendNextVideoPacket, inteval);
+										} else {
 											these.Status.BottomMenu.show = false;
-											these.Status.Progress.show = false;
-											these.Status.Pop.showPop = true;
-											these.Status.Pop.message = err.msg+",发送失败了";
-											these.Status.Pop.borderColor="#e034344d";
-											these.Status.Pop.buttonBgColor="#E03434";
-											these.Status.Pop.buttonText="确定";
-											these.Status.Pop.iconUrl =
-												"/static/images/6155/DeviceDetail/uploadErr.png";
+											hideLoading(these);
+
+											these.showPop({
+												showPop: true,
+												message: err.msg + ",发送失败了",
+												borderColor: "#e034344d",
+												buttonBgColor: "#E03434",
+												buttonText: "确定",
+												iconUrl: "/static/images/6155/DeviceDetail/uploadErr.png"
+											});
 											reject(err);
 											return;
 										}
@@ -993,7 +1004,7 @@
 						}).catch((ex1) => {
 							//console.log("出现了异常", ex1)
 						}).finally(() => {
-							uni.hideLoading();
+							hideLoading(these);
 						});
 					}
 
@@ -1045,7 +1056,7 @@
 				this.Status.BottomMenu.title = "上传开机画面";
 				this.Status.BottomMenu.type = "checkImg";
 				this.Status.BottomMenu.show = true;
-				this.Status.cMode = "img";
+				this.formData.cMode = "img";
 			},
 
 			showMenu(flag) {
@@ -1087,20 +1098,45 @@
 
 				this.Status.Pop.showPop = false;
 			},
+			showPop: function(option) {
+
+				if (!option) {
+					option = {
+						a: 1
+					};
+				}
+				let keys = Object.keys(option);
+				for (var i = 0; i < keys.length; i++) {
+					let key = keys[i];
+					these.Status.Pop[key] = option[key];
+				}
+				these.Status.Pop.showPop = true;
+			},
 			sendUsr: function() {
 
 
-				var these = this;
+
 				var textLines = [
-					this.user.company,
-					this.user.name,
-					this.user.job,
-					this.user.id
+					this.formData.company,
+					this.formData.name,
+					this.formData.job,
+					this.formData.id
 
 				];
 
-				let f = this.getDevice();
 
+				let f = this.getDevice();
+				if (!f) {
+					these.showPop({
+						message: "蓝牙未连接过该设备,请使用蓝牙重新添加该设备",
+						iconUrl: "/static/images/6155/DeviceDetail/uploadErr.png",
+						borderColor: "#e034344d",
+						buttonBgColor: "#E03434",
+					});
+				}
+				showLoading(this, {
+					text: "请稍候..."
+				});
 				var sendText = function() {
 
 
@@ -1113,7 +1149,7 @@
 					// 发送单个数据包
 					const sendNextPacket = () => {
 						if (currentPacket > totalPackets) {
-							these.Status.Pop = {
+							these.showPop({
 								showPop: true, //是否显示弹窗
 								popType: 'custom',
 								bgColor: '#383934bd',
@@ -1129,8 +1165,8 @@
 								promptTitle: '',
 								modelValue: '',
 								visibleClose: true
-							}
-
+							});
+							these.setBleFormData();
 							return;
 						}
 
@@ -1166,7 +1202,7 @@
 						// 发送数据包
 
 
-						ble.sendData(f.deviceId, buffer, f.writeServiceId, f.wirteCharactId, 50).then(() => {
+						ble.sendData(f.deviceId, buffer, f.writeServiceId, f.wirteCharactId, 10).then(() => {
 							// 更新进度
 							console.log(
 								`发送文字数据包 ${currentPacket}/${totalPackets}: ${text}`
@@ -1176,11 +1212,15 @@
 							currentPacket++;
 							setTimeout(sendNextPacket, 0);
 						}).catch(err => {
-							// this.isSendingText = false;
-							uni.showToast({
-								title: '文字发送失败',
-								icon: 'none'
+
+							these.showPop({
+								message: "文字发送失败," + err.msg,
+								iconUrl: "/static/images/6155/DeviceDetail/uploadErr.png",
+								borderColor: "#e034344d",
+								buttonBgColor: "#E03434",
 							});
+						}).finally(() => {
+							hideLoading(these);
 						});
 
 
@@ -1195,19 +1235,23 @@
 
 
 
+				setTimeout(() => {
+					these.HoldYouHand("word transmit start", 120, f.deviceId, f.writeServiceId, f
+						.wirteCharactId).then(
+						() => {
 
-				these.HoldYouHand("word transmit start", 120, f.deviceId, f.writeServiceId, f.wirteCharactId).then(
-					() => {
-
-						setTimeout(sendText, 200);
-					}).catch((ex) => {
-					console.log("握手没有成功", ex);
-					uni.showToast({
-						title: '握手没有成功',
-						icon: 'none'
+							setTimeout(sendText, 200);
+						}).catch((ex) => {
+						console.log("握手没有成功", ex);
+						hideLoading(these);
+						these.showPop({
+							message: ex.msg,
+							iconUrl: "/static/images/6155/DeviceDetail/uploadErr.png",
+							borderColor: "#e034344d",
+							buttonBgColor: "#E03434",
+						});
 					});
-				});
-
+				}, 0);
 
 
 
@@ -1229,14 +1273,14 @@
 					}
 					console.log("开始握手");
 
-					ble.sendData(deviceid, buffer, serviceid, characid, 50).then(
+					ble.sendData(deviceid, buffer, serviceid, characid, 10).then(
 						() => {
 							setTimeout(() => {
 								console.log("握手成功并完成了等待");
 								resolve(true);
 							}, pauseTime);
 						}).catch(err => {
-							console.log("握手没有成功",)
+						console.log("握手没有成功", )
 						reject(err);
 					});
 
@@ -1250,7 +1294,7 @@
 
 			ack: function() {
 
-				var these = this;
+
 				let eventChannel = this.getOpenerEventChannel();
 				eventChannel.emit('ack', {
 					data: '我已收到了您的消息,谢谢。'
@@ -1497,15 +1541,15 @@
 	}
 
 	.usrinfo .btnSend {
-		line-height: 44rpx;
+		line-height: 65rpx;
 		border-radius: 8px;
-		width: 82rpx;
-		height: 44rpx;
+		width: 120rpx;
+		height: 65rpx;
 		color: rgba(35, 35, 35, 0.87);
 		font-family: PingFang SC;
 		font-size: 24rpx;
 		font-weight: 400;
-		letter-spacing: 0.07px;
+		letter-spacing: 0.15rpx;
 		text-align: center;
 		background-color: #BBE600;
 	}
@@ -1690,7 +1734,7 @@
 		border-radius: 50%;
 
 		color: rgba(255, 255, 255, 0.87);
-		margin-top: 40rpx;
+		margin-top: 20rpx;
 		font-family: PingFang SC;
 		font-size: 28rpx;
 		font-weight: 400;
@@ -1774,4 +1818,64 @@
 		justify-content: flex-start;
 		align-items: center;
 	}
+
+	.warnnig {
+		border-radius: 16rpx;
+		width: 100%;
+		height: 70rpx;
+		line-height: 70rpx;
+		background: rgba(224, 52, 52, 1);
+		box-sizing: border-box;
+		padding: 0rpx 30rpx;
+		margin-top: 20rpx;
+		color: rgba(255, 255, 255, 0.87);
+		font-family: 'PingFang SC';
+		font-size: 28rpx;
+		font-weight: 400;
+		display: flex;
+		flex-direction: row;
+		flex-wrap: nowrap;
+		align-content: center;
+		justify-content: space-between;
+		align-items: center;
+	}
+
+	.netContent {
+		display: flex;
+		flex-direction: row;
+		flex-wrap: nowrap;
+		align-content: flex-end;
+		justify-content: space-around;
+		align-items: flex-end;
+		width: 50rpx;
+	}
+
+	.net {
+		width: 7rpx;
+		background: rgba(255, 255, 255, 0.3);
+	}
+
+	.net.netone {
+		height: 11rpx;
+	}
+
+	.net.nettwo {
+		height: 17rpx;
+	}
+
+	.net.netsiri {
+		height: 23rpx;
+	}
+
+	.net.netfour {
+		height: 29rpx;
+	}
+
+	.net.netfive {
+		height: 35rpx;
+	}
+
+	.net.active {
+		background: #FFFFFF !important;
+	}
 </style>
\ No newline at end of file
diff --git a/static/images/6155/DeviceDetail/warnning.png b/static/images/6155/DeviceDetail/warnning.png
new file mode 100644
index 0000000000000000000000000000000000000000..562696d8f8be180623e8839510c9b6c211618d50
GIT binary patch
literal 2519
zcmcImZ%h++7%s(9rQ$W36*OC+&TPpP!TrHt&>K*7EC!bSV+##MXUYd<)v2R^atKQ6
z8Z+V-LQuN+VOt=h9|!`%JeYN|AiHHtWPn>s9aKSMkIKA~<9@sQv3t+Ne%vkrl3(7u
zf1dYwo|kj)6z)w*+>oeJsgerbGQTVSwMaiJ6U5(lAN~4~O0}x3z?}QOBko}!u4z-j
zg-r!(-R&*?d(CE>&Gz93;#VnsPj3Am-*G8*aj{gzX4|vJe5Sv(C6U=@E3Q0ISy{wL
zCHGzKou$_X+tJ&u4q>yYbJ2U|KYc)F+l2WHG(Ko2|6&l|6ZLCYdiXc1Fin<(KhCL}
zI%b>?QNlR?sE)G+?q{HRZ#tJ=s=6M^k>b0e9)czBNb%N^a0#zl?TIvzD8kH8Sw3{6
z=NdnP4B?4^mCE~8A1W)NqRr^=P&w-j2S{{`C6j~Hx8KnG2z@2c!xg`J^5=YkXUJC6
zqDT3EEQ$@53?7Qu%eae9KI);eP$W&zRxggwe7SCyn{sMV)Z<1~dK51O+l5O?IfD;n
z%5CskN7#e<IFE)U@r<}<?KUWvtw#-a<Z`LQ;cOxrA<<!>{7s%<A2(A`#&FVrRvGya
zwG}@eog1MCqD2Rwu_dtw$lw_c@4y)<gc_63x^rpTDs*e;8`L#_t=LF(F6`H_{s*_k
z#C~;YD^fQyRm0+YdBm?}{r4oaJ?Y#QLAR4*kcEGe%WuEBFm3&lPks$rHoDMDFyHn}
zc&~P$1PNxUV#qG$8lr?ykTwSCq3^`3v}Pa+od=L;Ly-Pm-Z@V!@5HKOt+)kg;eu1i
zyu*d^pdz7+{)Qgy#$=kP_Xnx3mUptjg*HO)O|GKtVRy7r+3!ggQUe)M2W7b0?!)Yt
zR(mm{{4*j+$Z=qr78(kDhL`YER*MTAgreHa0n8?<_1{23p^?a#bI>yBnmU2WKAF>8
zA`+U?IVyzs91MLZmw#D;Ug)VCn~5EmvMXc~LH3MNYkbrNiOkfMKo>_GbX<~1i?Wz$
zSacdJI+b8OAS<C^eJM^tj~?rTYQHofp1DEg_^5hlD`sF5i1lV3udR{faY$F|Mk^Y}
zFs<wn%crMA;iU(<qr~4>c&R!zRpDREKpSxTs2-hOc8hu@NS=#<);a}*)jp~T6kQYx
zgiVAHA(PQIJ<5f)Vg~|RkDMG4mUK8~;0@>}phjOT$(_=pI3=+y#v05@;s&k~{6y5@
zvw#&TIDGD+oG@C(ff$L^%cDtwurhbbv%94gf1OMd&I1+crWoM50bEhX{(C^Cycpej
zBa>1K)C<Cbe%S}G-CA#f!bZRc&VmnEwXF9sz?&2UUh4yFBvRmUQFXjM&O1uQU!TLr
zpr>l9q`Fp=0JvVx=Qrno?X8oqMpYf?!wv?LvB5|G09}1wI~mTluoEKH=y9w7cLKW+
zcGS`41h$XpGwS7i^v-IkvBx)?N>|7pU|CSFm({6ra>>vU(l;_wU-%PB#aqV{`(>tQ
zqy();<nfRSrcr^Rl0Mv$uF+uvMNlqmd7-=DT~B!w!K#(2X_y|&O~rEe1BrC38puoz
z<0=v9%3!F`^YoIa+sN2dm8tDZd1fy4NBL426)$nZSqq(U>;fTp?)M~lu0JQ5`WC^7
zp>h<uLi6%*D_-gcsJcu_y3R%76B(Z3G-E(!Ux$#7kCWxJ<7>H}-dXaZyc|`qMK0Yp
zOWu&?(WK$+OQ&9pJTFJ8du7LKN3Y9}qZe<ld8MZ7>U(qIKWwUk-G%1Pyt4X#0GFII
AjsO4v

literal 0
HcmV?d00001

diff --git a/static/images/BLEAdd/addBleDevice.png b/static/images/BLEAdd/addBleDevice.png
new file mode 100644
index 0000000000000000000000000000000000000000..d96d0b2e0b8e90302f33e37eae4c25cfba6b8d40
GIT binary patch
literal 867
zcmV-p1DyPcP)<h;3K|Lk000e1NJLTq004LZ004Ld0{{R3%StQZ00001b5ch_0olnc
ze*gdg8&FJCMF0Q*|NsC0|NsC0|NsC0|NsC0|NsC0|NsC0>rFnw00009bW%=J0N($m
zZ#aOzK<CMy`2YX{;Ymb6RCt{2nXz)CFc5}?4a8+U*!_)*+?CPb^k|OsW@7gqsw;0?
z<gU!P$mOx`0BN-nE0E00rD3ah(Wl-0wID$l8@A+B<~-Y%r;%}#y{wgG&w=QPuaRvI
zw}q8fOke|Og7v0J){|b+tQVbt&RJfb$}-oQkHeKhpVVyMy+g-x;2te)%soSkZrl^;
z-43%$l4XhTNt}}`WIh-=cGf1f7;19iPOe*p$FabU-1vy#?d;j$%w$%r4PO?6p<_Gn
z$NP^rJG4u(cItch`DfSI!x<cWNHSyQ)nzB`Rb5{W$Qk3BH2W{O^d$p&Mp&+ThwQg>
zR_>zPl8t)7&M0rXXq5HJWL4scv*;LQU0bjUEnG#TlI_3{I&u{)bk>WG`1QfqdyPZK
zuA+tRkPFthqrY`OxC7RcrpEe6TEm25i7vU#`YT-N=K9(GUD1lgdX;OWZ(~=T_mYMq
zaHqH>8(Zm2mbBavh@I*zan)~7Tpt!7#lp&(u{(eny;gdqYAb7*cb5yjRsy^Y{KdR@
z0hb_QJtZpnD9gKo+^Cf-xPTnbYGk*0ETEE#gx3b#x?aF{2WwT4Ed~QqfH~a0KJdYS
z+coVPCj~g7;KYF2fpWVwv(dd|!%Pi)K=488p!>7GYjEXUDL7i|?FZD3Nwq6*)^epV
ze1)aw<ZdQ%*%9gGmD#ZJHD`qWxq&bY2ipwK@Mpti?lj)P@Voa`C=cO&wwb_MhxmAW
zylKVlfsF@H63XJLoiBcF(|Jcz;3^!}yKAssSTP<BZ+q}FJKhX8A~@dGN8v1_1RLIl
zC~w1$A#HBM#T57u(&u#KNwDWlV#D`S;7v%MlO5*!K<dGne_-Oq$o8Hn1qav+e=a;f
z0E6IS3Oqjm1L64r_<!IV&S8^aeTb{VVSRkO;oz#_;Df&LH7l6KAK`)(!{4KV^EST0
tO?fp!|041+`^!vnbiWQ-w#To7e*sC<VnnrqB$xmI002ovPDHLkV1m<Gyk!6Y

literal 0
HcmV?d00001

diff --git a/utils/BleHelper.js b/utils/BleHelper.js
index 3164f40..6a6b055 100644
--- a/utils/BleHelper.js
+++ b/utils/BleHelper.js
@@ -53,23 +53,23 @@ class BleHelper {
 				},
 				{
 					key: '10003',
-					remark: '连接失败'
+					remark: '蓝牙设备连接失败'
 				},
 				{
 					key: '10004',
-					remark: '没有找到指定服务'
+					remark: '蓝牙设备没有找到指定服务'
 				},
 				{
 					key: '10005',
-					remark: '没有找到指定特征值'
+					remark: '蓝牙设备没有找到指定特征值'
 				},
 				{
 					key: '10006',
-					remark: '当前连接已断开'
+					remark: '蓝牙连接已断开'
 				},
 				{
 					key: '10007',
-					remark: '当前特征值不支持此操作'
+					remark: '蓝牙设备当前特征值不支持此操作'
 				},
 				{
 					key: '10008',
@@ -77,7 +77,7 @@ class BleHelper {
 				},
 				{
 					key: '10009',
-					remark: '系统不支持 BLE低功耗蓝牙'
+					remark: '蓝牙设备不支持BLE低功耗蓝牙'
 				},
 				{
 					key: '10010',
@@ -85,11 +85,11 @@ class BleHelper {
 				},
 				{
 					key: '10011',
-					remark: '配对设备需要配对码'
+					remark: '蓝牙设备配对设备需要配对码'
 				},
 				{
 					key: '10012',
-					remark: '连接超时'
+					remark: '蓝牙设备连接超时'
 				},
 				{
 					key: '10013',
@@ -119,18 +119,22 @@ class BleHelper {
 		const pages = getCurrentPages();
 
 		if (pages.length === 0) {
-			return '';
+			return "";
 		}
 
 		const currentPage = pages[pages.length - 1];
-
+		console.log("currentPage=",currentPage.route);
 		return currentPage.route;
 	}
 
 	//设置发现新设备的回调
 	addDeviceFound(callback) {
 		let key = this.getCurrentPagePath();
+		if(!key){
+			key=new Date().getTime();
+		}
 		if (key) {
+			console.log("key="+key);
 			let f = this.cfg.onDeviceFound.findIndex((v) => {
 				return v.key == key;
 			});
@@ -148,19 +152,29 @@ class BleHelper {
 	//移除发现新设备的回调
 	removeDeviceFound() {
 		let key = this.getCurrentPagePath();
+		
 		if (key) {
+			console.log("key="+key);
 			let f = this.cfg.onDeviceFound.findIndex((v) => {
 				return v.key == key;
 			});
 			if (f > -1) {
 				this.cfg.onDeviceFound.splice(f, 1);
 			}
+		}else{
+			if(this.cfg.onDeviceFound.length>0){
+			this.cfg.onDeviceFound.splice(this.cfg.onDeviceFound.length-1, 1);	
+			}
+			
 		}
 	}
 
 	//添加接收到数据的回调
 	addReceiveCallback(callback) {
 		let key = this.getCurrentPagePath();
+		if(!key){
+			key=new Date().getTime();
+		}
 		if (key) {
 			let f = this.cfg.receivDataCallback.findIndex((v) => {
 				return v.key == key;
@@ -179,9 +193,10 @@ class BleHelper {
 
 
 	//设置接收到数据的回调
-	removeReceiveCallback() {
+	removeReceiveCallback(ev) {
 		let key = this.getCurrentPagePath();
 		if (key) {
+			 console.log("key="+key);
 			let f = this.cfg.receivDataCallback.findIndex((v) => {
 				return v.key == key;
 			});
@@ -190,6 +205,10 @@ class BleHelper {
 				this.cfg.receivDataCallback.splice(f, 1);
 			}
 
+		}else{
+			if(this.cfg.receivDataCallback.length>0){
+			this.cfg.receivDataCallback.splice(this.cfg.receivDataCallback.length-1, 1);	
+			}			
 		}
 	}
 
@@ -432,12 +451,13 @@ class BleHelper {
 									this.data.LinkedList.find((v) => {
 										if (v.deviceId == receive.deviceId) {												
 											v.macAddress = str.replace(header,"");
+											console.log("收到mac地址:", str)
 										}
 									});
 									uni.setStorageSync(this.StorageKey, this.data
 										.LinkedList);
 								}
-								//////console.log("收到的字符串:", str)
+								
 
 							} catch (ex) {
 								////console.log("将数据转文本失败", ex);
@@ -854,7 +874,7 @@ class BleHelper {
 
 	//连接某个设备
 	LinkBlue(deviceId, targetServiceId, writeCharId, notifyCharId) {
-		this.StopSearch();
+		
 
 		if (!writeCharId) {
 			writeCharId = "xxxx"; // "FFE1";
@@ -890,7 +910,7 @@ class BleHelper {
 				console.log("正在连接" + deviceId);
 				uni.createBLEConnection({
 					deviceId: deviceId,
-					timeout: 5000,
+					timeout: 3000,
 					success: (info) => {
 
 						console.log("新连接成功", this.data.LinkedList);
@@ -955,7 +975,7 @@ class BleHelper {
 			}).then((res) => {
 				////console.log("11111111");
 				if (res) { //新连接
-					console.log("开始获取服务")
+					console.log("开始获取服务",targetServiceId)
 					return this.getService(deviceId, targetServiceId, writeCharId,
 						notifyCharId); //获取服务	
 				} else { //已连接过，直接订阅消息					
@@ -969,7 +989,9 @@ class BleHelper {
 			}).then(() => {
 
 
-				return resolve();
+				setTimeout(()=>{
+					resolve();
+				},500);
 			}).catch((ex) => {
 				////console.log("出现异常", ex);
 				reject(ex);
@@ -1041,8 +1063,8 @@ class BleHelper {
 	//向蓝牙设备发送数据，如果没连接将自动连接后再发
 	sendData(deviceid, buffer, writeServiceId, wirteCharactId, ms) {
 
-		console.log("deviceid=" + deviceid + ",writeServiceId=" + writeServiceId + ",wirteCharactId=" +
-			wirteCharactId + ",timeout=" + ms)
+		// console.log("deviceid=" + deviceid + ",writeServiceId=" + writeServiceId + ",wirteCharactId=" +
+		// 	wirteCharactId + ",timeout=" + ms)
 		if (ms === undefined) {
 			ms = 50;
 		}
@@ -1080,7 +1102,7 @@ class BleHelper {
 						})); //没有找到指定设备
 						return;
 					}
-
+					console.log("device=",device);
 					uni.writeBLECharacteristicValue({
 						deviceId: device.deviceId,
 						serviceId: device.writeServiceId,
@@ -1114,7 +1136,7 @@ class BleHelper {
 					Promise.race([timeOut(ms), promise]).then(resolve).catch((ex) => {
 						console.log("ex=", ex);
 						if (ex.code == -1) {
-							resolve();
+							resolve(ex);
 						} else {
 							reject(ex);
 						}
@@ -1129,12 +1151,19 @@ class BleHelper {
 
 		}
 		if (c.Linked) {
-			console.log("蓝牙已连接，直接发送");
+			// console.log("蓝牙已连接，直接发送");
 			return sendBuffer();
 		} else {
-			console.log("先连接蓝牙再发送");
+			// console.log("先连接蓝牙再发送");
 			return new Promise((resolve, reject) => {
-				this.LinkBlue(deviceid).then((res) => {
+				let f=this.data.LinkedList.find((v)=>{
+					return v.deviceId==deviceid;
+				});
+				if(!f){
+					reject({code:'-9',msg:'蓝牙未连接过此设备,请重新使用蓝牙添加该设备'});
+					retrn;
+				}
+				this.LinkBlue(f.deviceId,f.writeServiceId,f.wirteCharactId,f.notifyCharactId).then((res) => {
 					console.log("连接成功");
 					return sendBuffer();
 				}).then(() => {
@@ -1178,7 +1207,7 @@ export default {
 	getBleTool: function(found, receive) {
 		if (!instance) {
 			instance = new BleHelper();
-			////console.log("第一次初始化");
+			
 		} else {
 			////console.log("调用现有实例");
 		}
diff --git a/utils/loading.js b/utils/loading.js
new file mode 100644
index 0000000..0e82921
--- /dev/null
+++ b/utils/loading.js
@@ -0,0 +1,38 @@
+// utils/loading.js
+
+// 显示loading
+export const showLoading = (ev,options) => {
+	if(!ev){
+		return;
+	}
+	
+	if(!options){
+		options={a:1};
+	}
+    ev.$refs.loading.show(options)
+	
+}
+
+// 隐藏loading
+export const hideLoading = (ev) => {
+	
+	if(!ev){
+		return;
+	}
+	console.log("hide.....")
+	 ev.$refs.loading.hide();
+    
+  
+}
+
+// 更新loading配置
+export const updateLoading = (ev,options) => {
+	if(!ev){
+		return;
+	}
+	if(!options){
+		options={a:1};
+	}
+    ev.$refs.loading.update(options)
+  
+}
\ No newline at end of file