移植6155、650、670

pages/6155/ImgCrop.vue

@@ -25,18 +25,21 @@
 		onLoad: function(option) {
 			const eventChannel = this.getOpenerEventChannel();
 			var these = this;
-			eventChannel.on('checkImg', function(data) {
+			eventChannel.on('checkImg', (data)=> {
 				console.log("我收到你的消息了，消息内容是：" + JSON.stringify(data));
-				these.src = data.data;
+				this.src = data.data;
+				console.log("我收到你的消息了，消息内容是：",data);
 			})
 		},
 		methods: {
 			handleCrop(e) {
+				
 				var these = this;
+				
 				this.Statu = true;
 				console.log("裁剪完成");
 				console.log(e.tempFilePath);
-
+				// 
 				const ctx = uni.createCanvasContext('splashCanvas', this);
 				ctx.drawImage(
 					e.tempFilePath,
@@ -53,11 +56,12 @@
 							height: 80,
 							success: (res) => {
 								// 处理像素数据并发送
+								const eventChannel = these.getOpenerEventChannel();
 								console.log("res.data.length="+res.data.length);
-								// this.processAndSendImageData(res.data).then(
-								// 	resolve).catch(reject);
-								 const eventChannel = these.getOpenerEventChannel();
-								 eventChannel.emit('ImgCutOver',res.data);
+						
+								 
+								 eventChannel.emit('ImgCutOver',{piexls:res.data,picPath:e.tempFilePath});
+								
 								 uni.navigateBack();
 							},
 							fail: (err) => {

pages/BlueTooth/ModeSetting/VideoSend.vue

@@ -0,0 +1,472 @@
+<template>
+	<view class="content">
+		<canvas canvas-id="flashCanvas"
+			style="width: 160px; height: 80px; z-index: 9999;position: fixed; top:-9999px;left:-9999px;"></canvas>
+
+		<f-video ref="compARef" :src="videoPath" :direction="-90" :autoplay="true" @shotVideoClick="shotVideoClick"
+			:videoWidth="videoWidth" :videoHeight="videoHeight"></f-video>
+
+
+		<view>
+			<text>发送间隔</text>
+			<input type="text" v-model="inteval" />
+		</view>
+		<view>
+			<button @click="checkVideo">选择视频</button>
+			<!-- <button @click="CutImg">发送</button> -->
+			<button @click="uploadVideo">发送</button>
+		</view>
+
+
+		<view class="sending-progress" v-if="isSending">
+			<view class="progress-bar">
+				<view class="progress-fill" :style="{ width: progress + '%' }"></view>
+			</view>
+			<text>正在发送: {{ progress }}% ({{ currentPacket }}/{{ totalPackets }})</text>
+		</view>
+
+	</view>
+</template>
+
+<script>
+import Common from '@/utils/Common';
+
+	export default {
+		data() {
+			return {
+				videoPath: '',
+				inteval: 0,
+				progress: 0,
+				currentPacket: 0,
+				totalPackets: 100,
+
+				connectedDeviceId: '',
+				serviceId: '0xFFE1',
+				writeCharacteristicId: '0xFFE1',
+				notifyCharacteristicId: '0xFFE2',
+				isSending: "",
+				textProgress: "",
+
+				imgs: [],
+				videoWidth: 320,
+				videoHeight: 160,
+				videoDuration: 2,
+
+				hexArray: []
+
+			}
+		},
+		onLoad() {
+			const eventChannel = this.getOpenerEventChannel();
+
+			eventChannel.on('receiveDevice', (data) => {
+				this.connectedDeviceId = data.connectedDeviceId;
+				this.serviceId = data.serviceId;
+				this.writeCharacteristicId = data.writeCharacteristicId;
+				this.notifyCharacteristicId = data.notifyCharacteristicId;
+			})
+		},
+		methods: {
+			checkVideo: function() {
+				uni.chooseVideo({
+					sourceType: ['album', 'camera'],
+					compressed: false,
+					maxDuration: 2,
+					camera: 'back',
+					success: (res) => {
+						this.videoPath = res.tempFilePath;
+
+						this.imgs = [];
+						this.hexArray = [];
+						this.$refs.compARef.base64 = [];
+						this.videoWidth = res.width;
+						this.videoHeight = res.height;
+						this.videoDuration = res.duration;
+						console.log("视频宽:" + res.width + ",视频高:" + res.height + ",视频时长:" + res.duration);
+					}
+				})
+			},
+
+			uploadVideo: function() {
+
+				if (this.hexArray.length > 0) {
+					console.log("开始处理,无需上传");
+					this.shotVideoClick(this.hexArray, 'rgb565');
+					return;
+
+				}
+				if(!this.videoPath){
+					uni.showToast({
+						title: "请选择视频",
+						icon: 'fail'
+					})
+					return;
+				}
+				
+				console.log("正在上传视频");
+				uni.showLoading({
+					title: "上传中"
+				});
+				
+				let p2=new Promise((resolve,reject)=>{
+					let start = new Date();
+					console.log("Common.baseURL="+Common.baseURL);
+					uni.uploadFile({
+						url:Common.baseURL+'video/upload',						
+						filePath: this.videoPath,
+						name: 'file',
+						header: {
+							"Method": "POST",
+							"Content-Type": "multipart/form-data"
+						},
+						timeout: 600000,
+						fail: (ex) => {
+							//console.log("上传视频失败" + JSON.stringify(ex));
+							uni.showToast({
+								title: "视频文件上传失败了,请检查网络连接",
+								icon: 'fail'
+							})
+							uni.hideLoading();
+							reject(ex);
+						},
+						success: (res) => {
+							let end = new Date();
+							var diff = (end.getTime() - start.getTime()) / 1000;
+							let s = diff % 60;
+							let m = (diff - s) / 60;
+							console.log("上传完成,耗时:" + m + "分" + s + "秒");
+							uni.hideLoading();
+							resolve(res);
+						}
+					
+					});
+				});
+				
+				let p1=this.HoldYouHand();
+				
+				Promise.all([p2,p1]).then((arr)=>{
+					
+					if(arr[1]===true){
+						let res=arr[0];
+						res = JSON.parse(res.data);
+											
+						if (res.data) {
+							this.hexArray = res.data;
+							uni.showLoading({
+								title: "正在发送"
+							});
+											
+							setTimeout(() => {
+								this.shotVideoClick(res.data, 'rgb565');
+							}, 0)
+											
+						} else {
+							console.log("res")
+							uni.showModal({
+								content: "服务器未返回RGB565数据",
+								title: '错误'
+							})
+						}
+					}else{
+						uni.showModal({
+							content:"与设备握手失败了",
+							title:"错误"
+						})
+					}
+					
+				});
+
+			},
+			
+			shotVideoClick: function(array, type) {
+				//console.log("处理视频完成", array);
+				//console.log("type=" + type)
+				//console.log("array=", array);
+				this.imgs = array;
+
+			
+
+				var sendImagePackets = (imageData) => {
+					return new Promise((resolve, reject) => {
+
+						this.isSending = true;
+						this.progress = 0;
+						this.currentPacket = 0;
+
+						// 总数据包数
+						const totalPackets = 1536;
+						this.totalPackets = totalPackets;
+						let currentPacket = 1;
+
+						// 发送单个数据包
+						const sendNextPacket = () => {
+							////console.log("currentPacket="+currentPacket+",imageData.length="+imageData.length);
+							if (currentPacket > totalPackets) {
+								this.isSending = false;
+								resolve();
+
+								return;
+							}
+
+							// 计算当前包的数据
+							let packetSize = 250;
+							if (type == 'rgb565') {
+								packetSize = 500;
+							}
+
+							// 创建数据包
+							const startIndex = (currentPacket - 1) * packetSize;
+							const endIndex = Math.min(startIndex + packetSize, imageData.length);
+							if (startIndex > endIndex) {
+								resolve();
+								return;
+							}
+							////console.log("111111");
+							const packetData = imageData.slice(startIndex, endIndex);
+
+							// 构建数据包
+							////console.log("packetData.length"+packetData.length);
+							const bufferSize = 506; // 头部5字节 + 数据部分
+							const buffer = new ArrayBuffer(bufferSize);
+							const dataView = new DataView(buffer);
+
+							let sortNo = currentPacket.toString(16).padStart(4, '0');
+
+							// 填充头部
+							dataView.setUint8(0, 0x55); // 帧头
+							dataView.setUint8(1, 0x04); // 帧类型：开机画面
+							dataView.setUint8(2, '0x' + sortNo.substring(0, 2)); // 包序号
+							dataView.setUint8(3, '0x' + sortNo.substring(2, 4)); // 包序号
+
+
+							dataView.setUint8(4, 0x01);
+							dataView.setUint8(5, 0xF4);
+
+
+							if (type == 'rgb565') {
+								for (let i = 0; i < packetData.length; i++) {
+									dataView.setUint8(6 + i, '0x' + packetData[i]);
+								}
+							} else {
+								for (let i = 0; i < packetData.length; i++) {
+									dataView.setUint16(6 + i * 2, packetData[i], false);
+								}
+							}
+
+
+							let inteval = parseInt(this.inteval ? this.inteval : 0);
+							this.sendData(buffer).then(() => {
+								// 更新进度
+								this.currentPacket = currentPacket;
+								this.progress = Math.round((currentPacket / totalPackets) *
+									100);
+								//console.log(`发送数据包完成 ${currentPacket}/${totalPackets}`);
+
+								// 发送下一个包（添加延迟避免蓝牙缓冲区溢出）
+								currentPacket++;
+
+
+								setTimeout(sendNextPacket, inteval);
+							}).catch(err => {
+
+								// console.log(err.errMsg + ",发送失败了,正在补偿：" + currentPacket);
+								setTimeout(sendNextPacket, inteval);
+								// uni.showToast({
+								// 	title:"发送失败"+JSON.stringify(err)
+								// })
+							});
+						};
+
+					
+					
+
+						sendNextPacket();
+
+					});
+				}
+
+
+				if (type == 'rgb565') {
+					let start = new Date();
+					console.log("开始发送");
+					sendImagePackets(array).then(() => {
+						console.log("发送完成");
+						let end = new Date();
+						var diff = (end.getTime() - start.getTime()) / 1000;
+						let s = diff % 60;
+						let m = (diff-s) / 60;
+						console.log("发送完成,耗时:" + m + "分" + s + "秒");
+						uni.showToast({
+							title: "发送完成,耗时:" + m + "分" + s + "秒",
+							icon: 'success'
+						})
+					}).catch((ex1) => {
+						//console.log("出现了异常", ex1)
+					}).finally(() => {
+						uni.hideLoading();
+					});
+
+					return;
+				}
+
+
+			},
+			HoldYouHand() {
+				
+				var promise=new Promise((resolve,reject)=>{
+					try{
+						let start=new Date();
+						var str = "video transmit start"; //握手的协议字符串
+						console.log("开始握手:"+str)
+						
+						// 1. 创建 ArrayBuffer 和 DataView
+						const buffer = new ArrayBuffer(str.length);
+						const dataView = new DataView(buffer);
+						
+						// 2. 将字符串转换为 ASCII 码并写入 DataView
+						for (let i = 0; i < str.length; i++) {
+							dataView.setUint8(i, str.charCodeAt(i));
+						}
+						//console.log("111111");
+						this.sendData(buffer).then(() => {
+							// 开始发送第一个包							
+							setTimeout(()=>{
+								
+								let end = new Date();
+								var diff = (end.getTime() - start.getTime()) / 1000;
+								let s = diff % 60;
+								let m = (diff - s) / 60;
+								
+								console.log("握手成功并完成2200ms等待,耗时"+m+"分"+s+"秒");
+								
+								resolve(true);							
+							}, 2200);
+						
+						}).catch(err => {
+							//console.log("握手没有成功");
+							reject(err);
+						});
+					}catch(ex){
+						reject(ex);
+					}
+					
+					
+				});
+				
+				return promise;
+			
+			},
+			sendData(buffer) {
+				////console.log("deviceId=" + this.connectedDeviceId);
+				////console.log("serviceId=" + this.serviceId);
+
+				return new Promise(async (resolve, reject) => {
+
+					// //console.log("开始发送数据，buffer");
+
+
+					var promise = new Promise((succ, err) => {
+						uni.writeBLECharacteristicValue({
+							deviceId: this.connectedDeviceId,
+							serviceId: this.serviceId,
+							characteristicId: this.writeCharacteristicId,
+							value: buffer,
+							writeType: plus.os.name == 'iOS' ? 'write' : 'writeNoResponse',
+							success: () => {
+								// //console.log("发送数据成功");
+								succ();
+							},
+							fail: (ex) => {
+								//console.log("发送数据失败", ex);
+								err(ex);
+							},
+							complete: function() {
+								// //console.log("123456");
+							}
+						});
+					});
+					if (plus.os.name == 'iOS') {
+
+						function timeout(ms) {
+							return new Promise((_, err) => {
+								setTimeout(() => {
+									err({
+										code: -1,
+										errMsg: '超时了'
+									})
+								}, ms);
+							});
+						}
+
+						let inteval = parseInt(this.inteval ? this.inteval : 0);
+
+						Promise.race([promise, timeout(inteval)]).then(resolve).catch((ex) => {
+							//console.log("ex=", ex);
+							if (ex.code == -1) {
+								resolve();
+							} else {
+								reject();
+							}
+
+						}).finally(() => {
+							//console.log("完成了")
+						});
+					} else {
+						promise.then(resolve).catch(reject);
+					}
+				});
+			},
+			CutImg: function() {
+				if (this.imgs.length == 30) {
+					this.shotVideoClick(this.imgs, 'img');
+					return;
+				}
+				//console.log("开始处理视频")
+				uni.showLoading({
+					title: '开始处理'
+				});
+				this.$refs.compARef.shotVideoClick(0);
+			}
+		}
+	}
+</script>
+
+<style>
+	.sending-progress {
+		margin-top: 30rpx;
+		width: 100%;
+	}
+
+	.progress-bar {
+		height: 12rpx;
+		background-color: #e0e0e0;
+		border-radius: 6rpx;
+		overflow: hidden;
+	}
+
+	.progress-fill {
+		height: 100%;
+		background-color: #409eff;
+		transition: width 0.3s;
+	}
+
+	input {
+		border: 2rpx solid #000000;
+	}
+
+	button {
+		height: 100rpx;
+		line-height: 100rpx;
+		font-size: 28rpx;
+		float: left;
+	}
+
+	.content {
+		width: 100vw;
+		height: 300px;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		justify-content: center;
+	}
+</style>

pages/BlueTooth/ModeSetting/VideoSend_1.vue

@@ -0,0 +1,517 @@
+<template>
+	<view class="content">
+		<canvas canvas-id="flashCanvas"
+			style="width: 160px; height: 80px; z-index: 9999;position: fixed; top:-9999px;left:-9999px;"></canvas>
+
+		<f-video ref="compARef" :src="videoPath" :direction="-90" :autoplay="true" @shotVideoClick="shotVideoClick"
+			:videoWidth="videoWidth" :videoHeight="videoHeight"></f-video>
+
+		<view>
+			<text>并发包数量</text>
+			<input type="text" v-model="packgeCnt" />
+		</view>
+		<view>
+			<text>发送间隔</text>
+			<input type="text" v-model="inteval" />
+		</view>
+		<view>
+			<button @click="checkVideo">选择视频</button>
+			<!-- <button @click="CutImg">发送</button> -->
+			<button @click="uploadVideo">发送</button>
+		</view>
+
+
+		<view class="sending-progress" v-if="isSending">
+			<view class="progress-bar">
+				<view class="progress-fill" :style="{ width: progress + '%' }"></view>
+			</view>
+			<text>正在发送: {{ progress }}% ({{ currentPacket }}/{{ totalPackets }})</text>
+		</view>
+
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				videoPath: '',
+				packgeCnt: 20,
+				inteval: 0,
+				progress: 0,
+				currentPacket: 0,
+				totalPackets: 100,
+
+				connectedDeviceId: '',
+				serviceId: '0xFFE1',
+				writeCharacteristicId: '0xFFE1',
+				notifyCharacteristicId: '0xFFE2',
+				isSending: "",
+				textProgress: "",
+
+				imgs: [],
+				videoWidth: 320,
+				videoHeight: 160,
+				videoDuration: 2,
+
+				hexArray: []
+
+			}
+		},
+		onLoad() {
+			const eventChannel = this.getOpenerEventChannel();
+
+			eventChannel.on('receiveDevice', (data) => {
+				this.connectedDeviceId = data.connectedDeviceId;
+				this.serviceId = data.serviceId;
+				this.writeCharacteristicId = data.writeCharacteristicId;
+				this.notifyCharacteristicId = data.notifyCharacteristicId;
+			})
+		},
+		methods: {
+			checkVideo: function() {
+				uni.chooseVideo({
+					sourceType: ['album', 'camera'],
+					compressed: false,
+					maxDuration: 2,
+					camera: 'back',
+					success: (res) => {
+						this.videoPath = res.tempFilePath;
+
+						this.imgs = [];
+						this.hexArray = [];
+						this.$refs.compARef.base64 = [];
+						this.videoWidth = res.width;
+						this.videoHeight = res.height;
+						this.videoDuration = res.duration;
+						console.log("视频宽:" + res.width + ",视频高:" + res.height + ",视频时长:" + res.duration);
+					}
+				})
+			},
+
+			uploadVideo: function() {
+
+				if (this.hexArray.length > 0) {
+					console.log("开始处理,无需上传");
+					this.shotVideoClick(this.hexArray, 'rgb565');
+					return;
+
+				}
+				if(!this.videoPath){
+					uni.showToast({
+						title: "请选择视频",
+						icon: 'fail'
+					})
+					return;
+				}
+				
+				console.log("正在上传视频");
+				uni.showLoading({
+					title: "上传中"
+				});
+				
+				let p2=new Promise((resolve,reject)=>{
+					console.log("Common.baseURL="+Common.baseURL);
+					let start = new Date();
+					uni.uploadFile({
+						url: Common.baseURL+'video/upload',
+						// url: 'http://192.168.110.169:5000/video/upload',
+						filePath: this.videoPath,
+						name: 'file',
+						header: {
+							"Method": "POST",
+							"Content-Type": "multipart/form-data"
+						},
+						timeout: 600000,
+						fail: (ex) => {
+							//console.log("上传视频失败" + JSON.stringify(ex));
+							uni.showToast({
+								title: "视频文件上传失败了,请检查网络连接",
+								icon: 'fail'
+							})
+							uni.hideLoading();
+							reject(ex);
+						},
+						success: (res) => {
+							let end = new Date();
+							var diff = (end.getTime() - start.getTime()) / 1000;
+							let s = diff % 60;
+							let m = (diff - s) / 60;
+							console.log("上传完成,耗时:" + m + "分" + s + "秒");
+							uni.hideLoading();
+							resolve(res);
+						}
+					
+					});
+				});
+				
+				let p1=this.HoldYouHand();
+				
+				Promise.all([p2,p1]).then((arr)=>{
+					if(arr[1]===true){
+						let res=arr[0];
+						res = JSON.parse(res.data);
+											
+						if (res.data) {
+							this.hexArray = res.data;
+							uni.showLoading({
+								title: "正在发送"
+							});
+											
+							setTimeout(() => {
+								this.shotVideoClick(res.data, 'rgb565');
+							}, 0)
+											
+						} else {
+							console.log("res")
+							uni.showModal({
+								content: "服务器未返回RGB565数据",
+								title: '错误'
+							})
+						}
+					}else{
+						uni.showModal({
+							content:"与设备握手失败了",
+							title:"错误"
+						})
+					}
+					
+				});
+
+			},
+			pause(e) {
+				////console.log('pause--------------------------', e);
+			},
+			shotVideoClick: function(array, type) {
+				//console.log("处理视频完成", array);
+				//console.log("type=" + type)
+				//console.log("array=", array);
+				this.imgs = array;
+
+
+
+				var sendImagePackets = (imageData) => {
+					return new Promise((resolve, reject) => {
+
+						this.isSending = true;
+						this.progress = 0;
+						this.currentPacket = 0;
+
+						// 总数据包数
+						const totalPackets = 1536;
+						this.totalPackets = totalPackets;
+						let currentPacket = 1;
+						let promises = [];
+						// 发送单个数据包
+						const sendNextPacket = () => {
+							////console.log("currentPacket="+currentPacket+",imageData.length="+imageData.length);
+							if (currentPacket > totalPackets) {
+								this.isSending = false;
+								resolve();
+
+								return;
+							}
+
+							// 计算当前包的数据
+							let packetSize = 250;
+							if (type == 'rgb565') {
+								packetSize = 500;
+							}
+
+							// 创建数据包
+							const startIndex = (currentPacket - 1) * packetSize;
+							const endIndex = Math.min(startIndex + packetSize, imageData.length);
+							if (startIndex > endIndex) {
+								resolve();
+								return;
+							}
+							////console.log("111111");
+							const packetData = imageData.slice(startIndex, endIndex);
+
+							// 构建数据包
+							////console.log("packetData.length"+packetData.length);
+							const bufferSize = 506; // 头部5字节 + 数据部分
+							const buffer = new ArrayBuffer(bufferSize);
+							const dataView = new DataView(buffer);
+
+							let sortNo = currentPacket.toString(16).padStart(4, '0');
+
+							// 填充头部
+							dataView.setUint8(0, 0x55); // 帧头
+							dataView.setUint8(1, 0x04); // 帧类型：开机画面
+							dataView.setUint8(2, '0x' + sortNo.substring(0, 2)); // 包序号
+							dataView.setUint8(3, '0x' + sortNo.substring(2, 4)); // 包序号
+
+
+							dataView.setUint8(4, 0x01);
+							dataView.setUint8(5, 0xF4);
+
+
+							if (type == 'rgb565') {
+								for (let i = 0; i < packetData.length; i++) {
+									dataView.setUint8(6 + i, '0x' + packetData[i]);
+								}
+							} else {
+								for (let i = 0; i < packetData.length; i++) {
+									dataView.setUint16(6 + i * 2, packetData[i], false);
+								}
+							}
+
+
+							let inteval = parseInt(this.inteval ? this.inteval : 0);
+							let promise = this.sendData(buffer);
+							promises.push(promise);
+							let packgeCnt = parseInt(this.packgeCnt || 20);
+							if (currentPacket % packgeCnt == 0 || (currentPacket >= totalPackets &&
+									promises.length > 0)) {
+								Promise.all(promises).then(() => {
+									if (currentPacket >= totalPackets) {
+										this.isSending = false;
+										resolve();
+										return;
+
+									}
+
+									this.currentPacket = currentPacket;
+									this.progress = Math.round((currentPacket / totalPackets) *
+										100);
+									currentPacket++;
+									setTimeout(sendNextPacket, inteval);
+								})
+							} else {
+								currentPacket++;
+								sendNextPacket();
+							}
+							// .then(() => {
+							// 	// 更新进度
+							// 	this.currentPacket = currentPacket;
+							// 	this.progress = Math.round((currentPacket / totalPackets) *
+							// 		100);
+
+							// 	currentPacket++;
+
+
+							// 	setTimeout(sendNextPacket, inteval);
+							// }).catch(err => {
+
+							// 	console.log(err.errMsg+",发送失败了,正在补偿：" + currentPacket);
+							// 	setTimeout(sendNextPacket, inteval);
+
+							// });
+						};
+
+						//
+						
+
+							sendNextPacket();
+
+					});
+				}
+
+
+				if (type == 'rgb565') {
+					let start = new Date();
+					console.log("开始发送");
+					sendImagePackets(array).then(() => {
+
+						let end = new Date();
+
+						var diff = (end.getTime() - start.getTime()) / 1000;
+						let s = diff % 60;
+						let m = (diff - s) / 60;
+						console.log("发送完成,耗时:" + m + "分" + s + "秒");
+						uni.showToast({
+							title: "发送完成,耗时:" + m + "分" + s + "秒",
+							icon: 'success',
+
+						})
+					}).catch((ex1) => {
+						//console.log("出现了异常", ex1)
+					}).finally(() => {
+						uni.hideLoading();
+					});
+
+					return;
+				}
+
+
+			},
+			HoldYouHand() {
+				
+				var promise=new Promise((resolve,reject)=>{
+					try{
+						let start=new Date();
+						var str = "video transmit start"; //握手的协议字符串
+						console.log("开始握手:"+str)
+						
+						// 1. 创建 ArrayBuffer 和 DataView
+						const buffer = new ArrayBuffer(str.length);
+						const dataView = new DataView(buffer);
+						
+						// 2. 将字符串转换为 ASCII 码并写入 DataView
+						for (let i = 0; i < str.length; i++) {
+							dataView.setUint8(i, str.charCodeAt(i));
+						}
+						//console.log("111111");
+						this.sendData(buffer).then(() => {
+							// 开始发送第一个包							
+							setTimeout(()=>{
+								
+								let end = new Date();
+								var diff = (end.getTime() - start.getTime()) / 1000;
+								let s = diff % 60;
+								let m = (diff - s) / 60;
+								
+								console.log("握手成功并完成2200ms等待,耗时"+m+"分"+s+"秒");
+								
+								resolve(true);							
+							}, 2200);
+						
+						}).catch(err => {
+							//console.log("握手没有成功");
+							reject(err);
+						});
+					}catch(ex){
+						reject(ex);
+					}
+					
+					
+				});
+				
+				return promise;
+
+			},
+			sendData(buffer) {
+				let sendBuffer = () => {
+					return new Promise((resolve, reject) => {
+
+						var promise = new Promise((succ, err) => {
+							uni.writeBLECharacteristicValue({
+								deviceId: this.connectedDeviceId,
+								serviceId: this.serviceId,
+								characteristicId: this.writeCharacteristicId,
+								value: buffer,
+								writeType: plus.os.name == 'iOS' ? 'write' : 'writeNoResponse',
+								success: () => {
+									// console.log("发送数据成功");
+									succ();
+								},
+								fail: (ex) => {
+									if (ex.code == '10007') {
+										// console.log("失败重试");
+										setTimeout(() => {
+											sendBuffer().then(succ).catch(err);
+										}, this.inteval || 0)
+										// succ()
+
+									} else
+
+									{
+										// console.log("发送数据失败",ex);
+										err(ex);
+									}
+								},
+								complete: function() {
+									//console.log("123456");
+								}
+							});
+						});
+						if (plus.os.name == 'iOS') {
+
+							function timeout(ms) {
+								return new Promise((_, err) => {
+									setTimeout(() => {
+										err({
+											code: -1,
+											errMsg: '超时了'
+										})
+									}, ms);
+								});
+							}
+
+							Promise.race([promise, timeout(this.inteval ? this.inteval : 0)]).then(() => {
+									// console.log("成功了");
+									resolve();
+								})
+								.catch((ex) => {
+
+									if (ex.code == -1) {
+										// console.log("超时了")
+										resolve();
+									} else {
+										reject(ex);
+										// console.log("异常了", ex);
+										//sendBuffer().then(resolve).catch(reject);
+									}
+
+								});
+						} else {
+
+							promise.then(() => {
+								//console.log("then........")
+								resolve();
+							}).catch(() => {
+								//console.log("catch.........")
+								reject()
+							});
+						}
+					});
+
+				}
+
+				return sendBuffer();
+			},
+			CutImg: function() {
+				if (this.imgs.length == 30) {
+					this.shotVideoClick(this.imgs, 'img');
+					return;
+				}
+				//console.log("开始处理视频")
+				uni.showLoading({
+					title: '开始处理'
+				});
+				this.$refs.compARef.shotVideoClick(0);
+			}
+		}
+	}
+</script>
+
+<style>
+	.sending-progress {
+		margin-top: 30rpx;
+		width: 100%;
+	}
+
+	.progress-bar {
+		height: 12rpx;
+		background-color: #e0e0e0;
+		border-radius: 6rpx;
+		overflow: hidden;
+	}
+
+	.progress-fill {
+		height: 100%;
+		background-color: #409eff;
+		transition: width 0.3s;
+	}
+
+	input {
+		border: 2rpx solid #000000;
+	}
+
+	button {
+		height: 100rpx;
+		line-height: 100rpx;
+		font-size: 28rpx;
+		float: left;
+	}
+
+	.content {
+		width: 100vw;
+		height: 300px;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		justify-content: center;
+	}
+</style>

pages/BlueTooth/ModeSetting/VideoSend_670.vue

@@ -0,0 +1,537 @@
+<template>
+	<view class="content">
+		<canvas canvas-id="flashCanvas"
+			style="width: 160px; height: 80px; z-index: 9999;position: fixed; top:-9999px;left:-9999px;"></canvas>
+
+		<view>
+			<view>
+			选择的视频:{{videoPath}}</view>
+			</view>
+			<view>
+				重发包序号:{{reSendNumber}}
+			</view>
+		<view>
+			<text>发送间隔</text>
+			<input type="text" v-model="inteval" />
+		</view>
+		<view>
+			<button @click="checkVideo">选择视频</button>
+			
+			<button @click="uploadVideo">发送</button>
+		</view>
+
+
+		<view class="sending-progress" v-if="isSending">
+			<view class="progress-bar">
+				<view class="progress-fill" :style="{ width: progress + '%' }"></view>
+			</view>
+			<text>正在发送: {{ progress }}% ({{ currentPacket }}/{{ totalPackets }})</text>
+		</view>
+
+	</view>
+</template>
+
+<script>
+import Common from '../../../utils/Common';
+var mqttClient=null;
+	export default {
+		data() {
+			return {
+				videoPath: '',
+				inteval: 0,
+				progress: 0,
+				currentPacket: 0,
+				totalPackets: 100,
+
+				connectedDeviceId: '',
+				serviceId: '0xFFE1',
+				writeCharacteristicId: '0xFFE1',
+				notifyCharacteristicId: '0xFFE2',
+				isSending: "",
+				textProgress: "",
+				netMode:"ble",
+				IMEI:"",
+				
+				
+				imgs: [],
+				videoWidth: 320,
+				videoHeight: 160,
+				videoDuration: 2,
+
+				hexArray: [],
+				reSendNumber:""
+			}
+		},
+		onLoad() {
+			const eventChannel = this.getOpenerEventChannel();
+
+			eventChannel.on('receiveDevice', (data) => {
+				this.connectedDeviceId = data.connectedDeviceId;
+				this.serviceId = data.serviceId;
+				this.writeCharacteristicId = data.writeCharacteristicId;
+				this.notifyCharacteristicId = data.notifyCharacteristicId;
+				this.netMode=data.netMode;
+				mqttClient=data.mqttClient;
+				this.IMEI=data.IMEI;
+			});
+			
+			eventChannel.on('ReSendVideo',(data)=>{
+				//重新发送某一包
+				this.reSendNumber=data.videoNo;
+				setTimeout(()=>{
+					  this.shotVideoClick(this.hexArray,'rgb565',data.videoNo);
+				},0);
+			
+			  
+			});
+		},
+		methods: {
+			checkVideo: function() {
+				uni.chooseVideo({
+					sourceType: ['album', 'camera'],
+					compressed: false,
+					maxDuration: 2,
+					camera: 'back',
+					success: (res) => {
+						this.videoPath = res.tempFilePath;
+
+						this.imgs = [];
+						this.hexArray = [];
+						
+						this.videoWidth = res.width;
+						this.videoHeight = res.height;
+						this.videoDuration = res.duration;
+						console.log("视频宽:" + res.width + ",视频高:" + res.height + ",视频时长:" + res.duration);
+					}
+				})
+			},
+
+			uploadVideo: function() {
+
+				if (this.hexArray.length > 0) {
+					console.log("开始处理,无需上传");
+					this.shotVideoClick(this.hexArray, 'rgb565');
+					return;
+
+				}
+				if(!this.videoPath){
+					uni.showToast({
+						title: "请选择视频",
+						icon: 'fail'
+					})
+					return;
+				}
+				
+				console.log("正在上传视频");
+				uni.showLoading({
+					title: "上传中"
+				});
+				
+				let p2=new Promise((resolve,reject)=>{
+					let start = new Date();
+					console.log("Common.baseURL="+Common.baseURL);
+					uni.uploadFile({
+						url:Common.baseURL+'video/upload',						
+						filePath: this.videoPath,
+						name: 'file',
+						header: {
+							"Method": "POST",
+							"Content-Type": "multipart/form-data"
+						},
+						timeout: 600000,
+						fail: (ex) => {
+							//console.log("上传视频失败" + JSON.stringify(ex));
+							uni.showToast({
+								title: "视频文件上传失败了,请检查网络连接",
+								icon: 'fail'
+							})
+							uni.hideLoading();
+							reject(ex);
+						},
+						success: (res) => {
+							let end = new Date();
+							var diff = (end.getTime() - start.getTime()) / 1000;
+							let s = diff % 60;
+							let m = (diff - s) / 60;
+							console.log("上传完成,耗时:" + m + "分" + s + "秒");
+							uni.hideLoading();
+							resolve(res);
+						}
+					
+					});
+				});
+				
+				let p1=this.HoldYouHand();
+				
+				Promise.all([p2,p1]).then((arr)=>{
+					
+					if(arr[1]===true){
+						let res=arr[0];
+						res = JSON.parse(res.data);
+											
+						if (res.data) {
+							this.hexArray = res.data;
+							uni.showLoading({
+								title: "正在发送"
+							});
+											
+							setTimeout(() => {
+								this.shotVideoClick(res.data, 'rgb565');
+							}, 0)
+											
+						} else {
+							console.log("res")
+							uni.showModal({
+								content: "服务器未返回RGB565数据",
+								title: '错误'
+							})
+						}
+					}else{
+						uni.showModal({
+							content:"与设备握手失败了",
+							title:"错误"
+						})
+					}
+					
+				});
+
+			},
+			
+			shotVideoClick: function(array, type,ReSendNo) {
+				//console.log("处理视频完成", array);
+				//console.log("type=" + type)
+				//console.log("array=", array);
+				this.imgs = array;
+
+			
+
+				var sendImagePackets = (imageData) => {
+					return new Promise((resolve, reject) => {
+
+						this.isSending = true;
+						this.progress = 0;
+						this.currentPacket = 0;
+
+						// 总数据包数
+						var totalPackets = 1536;
+						this.totalPackets = totalPackets;
+						let currentPacket = 1;
+						if(ReSendNo){
+							this.progress = ReSendNo-1;
+							this.currentPacket = ReSendNo-1;
+							currentPacket=ReSendNo;
+							totalPackets=ReSendNo;
+							this.totalPackets=ReSendNo;
+						}
+						// 发送单个数据包
+						const sendNextPacket = () => {
+							////console.log("currentPacket="+currentPacket+",imageData.length="+imageData.length);
+							if (currentPacket > totalPackets) {
+								this.isSending = false;
+								if(!ReSendNo){
+								this.bleSendComplete();	
+								}else{
+							// this.reSendNumber="";
+						}
+								
+								resolve();
+								
+								return;
+							}
+
+							// 计算当前包的数据
+							let packetSize = 250;
+							if (type == 'rgb565') {
+								packetSize = 500;
+							}
+
+							// 创建数据包
+							const startIndex = (currentPacket - 1) * packetSize;
+							const endIndex = Math.min(startIndex + packetSize, imageData.length);
+							if (startIndex > endIndex) {
+								resolve();
+								return;
+							}
+							////console.log("111111");
+							const packetData = imageData.slice(startIndex, endIndex);
+
+							// 构建数据包
+							////console.log("packetData.length"+packetData.length);
+							const bufferSize = 506; // 头部5字节 + 数据部分
+							const buffer = new ArrayBuffer(bufferSize);
+							const dataView = new DataView(buffer);
+
+							let sortNo = currentPacket.toString(16).padStart(4, '0');
+
+							// 填充头部
+							dataView.setUint8(0, 0x55); // 帧头
+							dataView.setUint8(1, 0x04); // 帧类型：开机画面
+							dataView.setUint8(2, '0x' + sortNo.substring(0, 2)); // 包序号
+							dataView.setUint8(3, '0x' + sortNo.substring(2, 4)); // 包序号
+
+
+							dataView.setUint8(4, 0x01);
+							dataView.setUint8(5, 0xF4);
+
+
+							if (type == 'rgb565') {
+								for (let i = 0; i < packetData.length; i++) {
+									dataView.setUint8(6 + i, '0x' + packetData[i]);
+								}
+							} else {
+								for (let i = 0; i < packetData.length; i++) {
+									dataView.setUint16(6 + i * 2, packetData[i], false);
+								}
+							}
+
+
+							let inteval = parseInt(this.inteval ? this.inteval : 0);
+							this.sendData(buffer).then(() => {
+								// 更新进度
+								this.currentPacket = currentPacket;
+								this.progress = Math.round((currentPacket / totalPackets) *
+									100);
+								console.log(`发送数据包完成 ${currentPacket}/${totalPackets}`);
+
+								// 发送下一个包（添加延迟避免蓝牙缓冲区溢出）
+								currentPacket++;
+
+
+								setTimeout(sendNextPacket, inteval);
+							}).catch(err => {
+
+								console.log(err.errMsg + ",发送失败了,正在补偿：" + currentPacket);
+								setTimeout(sendNextPacket, inteval);
+								// uni.showToast({
+								// 	title:"发送失败"+JSON.stringify(err)
+								// })
+							});
+						};
+
+					
+					
+
+						sendNextPacket();
+
+					});
+				}
+
+
+				if (type == 'rgb565') {
+					let start = new Date();
+					console.log("开始发送");
+					sendImagePackets(array).then(() => {
+						console.log("发送完成");
+						let end = new Date();
+						var diff = (end.getTime() - start.getTime()) / 1000;
+						let s = diff % 60;
+						let m = (diff-s) / 60;
+						console.log("发送完成,耗时:" + m + "分" + s + "秒");
+						uni.showModal({
+							content: "发送完成,耗时:" + m + "分" + s + "秒",
+							title: 'success'
+						});
+						
+					}).catch((ex1) => {
+						console.log("出现了异常", ex1)
+					}).finally(() => {
+						uni.hideLoading();
+					});
+
+					return;
+				}
+
+
+			},
+			HoldYouHand() {
+				
+				var promise=new Promise((resolve,reject)=>{
+					try{
+						let start=new Date();
+						var str = "video transmit start"; //握手的协议字符串
+						console.log("开始握手:"+str)
+						
+						// 1. 创建 ArrayBuffer 和 DataView
+						const buffer = new ArrayBuffer(str.length);
+						const dataView = new DataView(buffer);
+						
+						// 2. 将字符串转换为 ASCII 码并写入 DataView
+						for (let i = 0; i < str.length; i++) {
+							dataView.setUint8(i, str.charCodeAt(i));
+						}
+						//console.log("111111");
+						this.sendData(buffer).then(() => {
+							// 开始发送第一个包							
+							setTimeout(()=>{
+								
+								let end = new Date();
+								var diff = (end.getTime() - start.getTime()) / 1000;
+								let s = diff % 60;
+								let m = (diff - s) / 60;
+								
+								console.log("握手成功并完成2200ms等待,耗时"+m+"分"+s+"秒");
+								
+								resolve(true);							
+							}, 2200);
+						
+						}).catch(err => {
+							//console.log("握手没有成功");
+							reject(err);
+						});
+					}catch(ex){
+						reject(ex);
+					}
+					
+					
+				});
+				
+				return promise;
+			
+			},
+			bleSendComplete() {
+				var str = "transmit complete"; //握手的协议字符串
+				let buffer = new ArrayBuffer(str.length);
+				let dataView = new DataView(buffer);
+				for (let i = 0; i < str.length; i++) {
+					dataView.setUint8(i, str.charCodeAt(i));
+				}
+				setTimeout(()=>{
+					this.sendData(buffer).then(() => {
+						console.log("完成指令发送成功");
+					}).catch(err => {
+						console.log("完成指令发送失败");
+					});
+				},1500)
+				
+			},
+			sendData(buffer) {
+				if(this.netMode=='ble'){
+					return this.sendBle(buffer);
+					
+				}
+				
+				return this.sendMQ(buffer);
+			},
+			sendBle(buffer){
+				return new Promise(async (resolve, reject) => {
+				
+					// //console.log("开始发送数据，buffer");
+				
+				
+					var promise = new Promise((succ, err) => {
+						uni.writeBLECharacteristicValue({
+							deviceId: this.connectedDeviceId,
+							serviceId: this.serviceId,
+							characteristicId: this.writeCharacteristicId,
+							value: buffer,
+							writeType: plus.os.name == 'iOS' ? 'write' : 'writeNoResponse',
+							success: () => {
+								// //console.log("发送数据成功");
+								succ();
+							},
+							fail: (ex) => {
+								//console.log("发送数据失败", ex);
+								err(ex);
+							},
+							complete: function() {
+								// //console.log("123456");
+							}
+						});
+					});
+					if (plus.os.name == 'iOS') {
+				
+						function timeout(ms) {
+							return new Promise((_, err) => {
+								setTimeout(() => {
+									err({
+										code: -1,
+										errMsg: '超时了'
+									})
+								}, ms);
+							});
+						}
+				
+						let inteval = parseInt(this.inteval ? this.inteval : 0);
+				
+						Promise.race([promise, timeout(inteval)]).then(resolve).catch((ex) => {
+							//console.log("ex=", ex);
+							if (ex.code == -1) {
+								resolve();
+							} else {
+								reject();
+							}
+				
+						}).finally(() => {
+							//console.log("完成了")
+						});
+					} else {
+						promise.then(resolve).catch(reject);
+					}
+				});
+			},
+			sendMQ(message) {
+				
+				const topic = `B/${this.IMEI}`;
+				return new Promise((resolve, reject) => {
+					if(!mqttClient){
+						reject("MQTT未连接");
+						return;
+					}
+					try {
+						let flag=mqttClient.publish(topic, message, {
+							qos: 1
+						});
+						if(flag){
+							resolve();
+							return;
+						}
+						reject("MQTT未连接，无法发布消息");
+					} catch (error) {
+						reject(error);
+					}
+				});
+			}
+			
+		}
+	}
+</script>
+
+<style>
+	.sending-progress {
+		margin-top: 30rpx;
+		width: 100%;
+	}
+
+	.progress-bar {
+		height: 12rpx;
+		background-color: #e0e0e0;
+		border-radius: 6rpx;
+		overflow: hidden;
+	}
+
+	.progress-fill {
+		height: 100%;
+		background-color: #409eff;
+		transition: width 0.3s;
+	}
+
+	input {
+		border: 2rpx solid #000000;
+	}
+
+	button {
+		height: 100rpx;
+		line-height: 100rpx;
+		font-size: 28rpx;
+		float: left;
+	}
+
+	.content {
+		width: 100vw;
+		height: 300px;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		justify-content: center;
+	}
+</style>

pages/BlueTooth/ModeSetting/index.vue

@@ -0,0 +1,115 @@
+<template>
+	<view class="container">
+		<view class="grid">
+			<view class="cell" @click="goToDetail(item.name)" v-for="item,index in options">{{item.url}}</view>
+
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				options: [{
+						name: '/pages/BlueTooth/ModeSetting/ModeSetting',
+						url: '7307'
+					},
+					{
+						name: '/pages/BlueTooth/ModeSetting/HBY650',
+						url: 'HBY650'
+					},
+					{
+						name: '/pages/BlueTooth/ModeSetting/HBY650_1',
+						url: 'HBY650_V1'
+					},
+
+					{
+						name: '/pages/BlueTooth/ModeSetting/HBY6155',
+						url: '6155'
+					},
+					{
+						name: '/pages/BlueTooth/ModeSetting/HBY6155V1',
+						url: '6155_V1'
+					},
+					{
+						name: "/pages/BlueTooth/ModeSetting/HBY670V1",
+						url: 'HBY670'
+					},
+					
+					{
+						name: '/pages/MapTest/MapTest',
+						url: '地图测试'
+					},
+					{
+						name: '',
+						url: '更多'
+					}
+
+				]
+
+			}
+		},
+		onShow: () => {
+
+		},
+		methods: {
+			goToDetail: function(url) {
+				console.log("url=" + url)
+				let qd = () => {
+					uni.showToast({
+						title: '敬请期待',
+						duration: 2000,
+						icon: "none"
+					});
+
+				};
+				if (url) {
+					uni.navigateTo({
+						url: url,
+						success: () => {
+
+						},
+						fail: () => {
+							qd();
+						}
+					});
+				} else {
+					qd();
+				}
+
+
+
+			}
+		}
+	}
+</script>
+
+<style>
+	.container {
+		padding: 15px;
+		background-color: #f5f5f5;
+		min-height: 100vh;
+	}
+
+	.grid {
+		display: flex;
+		align-content: space-around;
+		align-items: stretch;
+		justify-items: center;
+		flex-direction: row;
+		flex-wrap: wrap;
+		justify-content: flex-start;
+	}
+
+	.cell {
+		padding: 0rpx 20rpx;
+		border: 2rpx solid rgba(0, 0, 0, 0.3);
+		border-radius: 15rpx;
+		font-size: 28rpx;
+		height: 70rpx;
+		line-height: 70rpx;
+		margin-left: 30rpx;
+		margin-top: 20rpx;
+	}
+</style>

pages/BlueTooth/ModeSetting/update.vue

@@ -0,0 +1,273 @@
+<template>
+  <view class="update-container">
+    <!-- 进度条 -->
+    <view v-if="showProgress" class="progress-container">
+      <view class="progress-title">正在更新 {{ progress }}%</view>
+      <view class="progress-bar">
+        <view class="progress" :style="{ width: progress + '%' }"></view>
+      </view>
+    </view>
+    
+    <!-- 更新提示弹窗 -->
+    <view v-if="showUpdateDialog" class="dialog-mask">
+      <view class="dialog">
+        <view class="dialog-title">发现新版本 v{{ newVersion }}</view>
+        <view class="dialog-content">{{ updateInfo.desc || '有新的功能和优化，建议立即更新' }}</view>
+        <view class="dialog-buttons">
+          <button v-if="!updateInfo.force" class="cancel-btn" @click="showUpdateDialog = false">稍后更新</button>
+          <button class="confirm-btn" @click="startUpdate">立即更新</button>
+        </view>
+      </view>
+    </view>
+  </view>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+      // 当前版本
+      currentVersion: '',
+      // 最新版本
+      newVersion: '',
+      // 更新信息
+      updateInfo: {},
+      // 是否显示更新弹窗
+      showUpdateDialog: false,
+      // 是否显示进度条
+      showProgress: false,
+      // 更新进度
+      progress: 0
+    };
+  },
+  
+  onLoad() {
+    // 初始化时检查版本
+    this.checkVersion();
+  },
+  
+  methods: {
+    /**
+     * 检查当前版本
+     */
+    async checkVersion() {
+      try {
+        // 获取当前应用版本
+        const versionInfo = plus.runtime.version;
+        this.currentVersion = versionInfo;
+        console.log('当前版本:', this.currentVersion);
+        
+        // 调用后端接口检查最新版本
+        // 这里替换为你的后端接口地址
+        const res = await this.$http.get('/api/checkVersion', {
+          platform: uni.getSystemInfoSync().platform,
+          version: this.currentVersion
+        });
+        
+        if (res.code === 0 && res.data.hasUpdate) {
+          this.newVersion = res.data.version;
+          this.updateInfo = res.data;
+          // 显示更新提示
+          this.showUpdateDialog = true;
+        } else {
+          console.log('当前已是最新版本');
+        }
+      } catch (error) {
+        console.error('版本检查失败:', error);
+      }
+    },
+    
+    /**
+     * 开始更新
+     */
+    startUpdate() {
+      if (!this.updateInfo.downloadUrl) {
+        uni.showToast({
+          title: '更新地址不存在',
+          icon: 'none'
+        });
+        return;
+      }
+      
+      this.showUpdateDialog = false;
+      this.showProgress = true;
+      this.downloadWgt(this.updateInfo.downloadUrl);
+    },
+    
+    /**
+     * 下载wgt包
+     */
+    downloadWgt(url) {
+      const downloadTask = uni.downloadFile({
+        url: url,
+        success: (downloadResult) => {
+          if (downloadResult.statusCode === 200) {
+            // 下载成功，安装wgt包
+            this.installWgt(downloadResult.tempFilePath);
+          } else {
+            this.showProgress = false;
+            uni.showToast({
+              title: '下载失败',
+              icon: 'none'
+            });
+          }
+        },
+        fail: (err) => {
+          this.showProgress = false;
+          console.error('下载失败:', err);
+          uni.showToast({
+            title: '下载失败，请稍后重试',
+            icon: 'none'
+          });
+        }
+      });
+      
+      // 监听下载进度
+      downloadTask.onProgressUpdate((res) => {
+        this.progress = res.progress;
+      });
+    },
+    
+    /**
+     * 安装wgt包
+     */
+    installWgt(path) {
+      plus.runtime.install(
+        path,
+        {
+          force: false // 是否强制安装
+        },
+        () => {
+          console.log('安装成功');
+          this.showProgress = false;
+          
+          // 安装成功后提示重启
+          uni.showModal({
+            title: '更新完成',
+            content: '应用已更新，是否立即重启？',
+            showCancel: !this.updateInfo.force,
+            success: (res) => {
+              if (res.confirm) {
+                // 重启应用
+                plus.runtime.restart();
+              }
+            }
+          });
+        },
+        (err) => {
+          console.error('安装失败:', err);
+          this.showProgress = false;
+          uni.showToast({
+            title: '更新失败: ' + err.message,
+            icon: 'none',
+            duration: 3000
+          });
+        }
+      );
+    }
+  }
+};
+</script>
+
+<style scoped>
+.update-container {
+  position: fixed;
+  top: 0;
+  left: 0;
+  width: 100%;
+  height: 100%;
+  pointer-events: none;
+  z-index: 9999;
+}
+
+/* 进度条样式 */
+.progress-container {
+  position: fixed;
+  top: 0;
+  left: 0;
+  width: 100%;
+  background-color: #fff;
+  padding: 10rpx 20rpx;
+  pointer-events: auto;
+}
+
+.progress-title {
+  font-size: 28rpx;
+  color: #333;
+  margin-bottom: 10rpx;
+  text-align: center;
+}
+
+.progress-bar {
+  height: 8rpx;
+  background-color: #eee;
+  border-radius: 4rpx;
+  overflow: hidden;
+}
+
+.progress {
+  height: 100%;
+  background-color: #007aff;
+  transition: width 0.3s ease;
+}
+
+/* 弹窗样式 */
+.dialog-mask {
+  position: fixed;
+  top: 0;
+  left: 0;
+  width: 100%;
+  height: 100%;
+  background-color: rgba(0, 0, 0, 0.5);
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  pointer-events: auto;
+}
+
+.dialog {
+  width: 600rpx;
+  background-color: #fff;
+  border-radius: 16rpx;
+  overflow: hidden;
+}
+
+.dialog-title {
+  font-size: 36rpx;
+  font-weight: bold;
+  color: #333;
+  padding: 30rpx;
+  text-align: center;
+  border-bottom: 1px solid #eee;
+}
+
+.dialog-content {
+  font-size: 32rpx;
+  color: #666;
+  padding: 40rpx 30rpx;
+  line-height: 1.6;
+}
+
+.dialog-buttons {
+  display: flex;
+  border-top: 1px solid #eee;
+}
+
+.cancel-btn, .confirm-btn {
+  flex: 1;
+  height: 100rpx;
+  line-height: 100rpx;
+  font-size: 32rpx;
+  border: none;
+  background-color: transparent;
+}
+
+.cancel-btn {
+  color: #666;
+  border-right: 1px solid #eee;
+}
+
+.confirm-btn {
+  color: #007aff;
+}
+</style>

pages/common/addBLE/LinkBle.vue

@@ -1,22 +1,296 @@
 <template>
-	<view>
-		
+	<view class="content">
+		<view class="deviceDetail">
+			<view class="imgContent">
+				<image src="/static/images/BLEAdd/addBleDevice.png" class="titleIco" mode="aspectFit">
+				</image>
+			</view>
+			<view class="deviceName">
+				蓝牙名:{{device.name}}
+			</view>
+			<view class="deviceName">
+				设备名:{{device.deviceName}}
+			</view>
+			<view class="deviceId">
+				ID:{{device.deviceId}}
+			</view>
+			<view class="bound" v-bind:class="boundStatu">
+				{{Statu.boundRemark}}
+			</view>
+		</view>
+		<view class="btnLink" @click="Link()">
+			连接
+		</view>
+
+		<global-loading ref="loading" />
 	</view>
 </template>
 
 <script>
+	import request from '@/utils/request.js';
+	import bleTool from '@/utils/BleHelper.js';
+	import {
+		showLoading,
+		hideLoading,
+		updateLoading
+	} from '@/utils/loading.js';
+	
+	const pagePath="pages/common/addBLE/LinkBle";
+	
+	var these = null;
+	var eventChannel = null;
+	var ble = null;
 	export default {
 		data() {
 			return {
-				
+				Statu: {
+					bound: null
+				},
+				device: {
+					"deviceId": "",
+					"name": "",
+					"deviceName": "",
+					"RSSI": -37,
+					"localName": "",
+					"advertisServiceUUIDs": [
+
+					],
+					"linkStatu": false,
+					"macAddress": ""
+				}
 			}
 		},
-		methods: {
+		computed: {
+			boundStatu: function() {
+				if (this.Statu.bound === null) {
+					return "displayNone"
+				}
+				if (this.Statu.bound) {
+					return "green"
+				} else {
+					return "red";
+				}
+			}
+		},
+		onBackPress() {
+			console.log("返回时断开蓝牙连接,取消订阅");
+			ble.disconnectDevice(these.device.deviceId);
+			ble.removeReceiveCallback(pagePath);
+		},
+		onUnload() {
+			ble.removeReceiveCallback(pagePath);
+		},
+		onLoad(option) {
+			these = this;
+			ble = bleTool.getBleTool();
+			ble.addReceiveCallback((receive,f,path) => {
+				console.log("收到设备消息，", receive);
+				if (these.device.deviceId == receive.deviceId) {
+					console.log("11111");
 			
+					if (receive.bytes[0] == 0xFC || receive.str.indexOf('mac address:') == 0) {
+						if (f && f.macAddress) {
+							these.device.macAddress = f.macAddress;
+							console.log("222222");
+							these.initDevice();
+						}
+					}
+				}
+			},pagePath);
+			eventChannel = this.getOpenerEventChannel();
+			eventChannel.on('LinkItem', function(data) {
+				let f = ble.data.LinkedList.find((v) => {
+					return v.deviceId = data.deviceId;
+				});
+				if (f) {
+					 these.device = Object.assign({}, these.device, f); 
+					console.log("获取到设备", f);
+
+				} else {
+					console.log("未获取到设备");
+				}
+			})
+		},
+		methods: {
+
+			initDevice: function() {
+				showLoading(these, {
+					text: '正在获取设备信息'
+				});
+				request({
+					url: '/app/device/getDeviceInfoByDeviceMac',
+					method: 'GET',
+					data: {
+						deviceMac: these.device.macAddress
+					}
+				}).then(res => {
+					console.log("获取设备信息", res);
+					if (res && res.code == 200) {
+						let data = res.data;
+						if (data) {
+							let keys = Object.keys(data);
+							ble.data.LinkedList.find((v) => {
+								if(v.deviceId = these.device.deviceId){
+									for (var i = 0; i < keys.length; i++) {
+										let key = keys[i];
+										v[key] = data[key];
+										console.log("key="+key);
+										console.log("value="+data[key]);
+									
+										
+										these.$set(these.device, key, data[key]);
+									
+									}
+									
+									ble.setBleData();
+								}
+							});
+							
+								console.log("device=",these.device);
+								console.log("LinkedList=",ble.data.LinkedList);
+							
+
+						}
+					}
+
+				}).catch((ex) => {
+					console.log("获取设备出现异常:", ex);
+				}).finally(() => {
+					hideLoading(these);
+				});
+			},
+			Link() {
+				// 调用绑定设备接口
+
+				let f = ble.data.LinkedList.find((v) => {
+					return v.deviceId = these.device.deviceId;
+				});
+				if (!f) {
+					these.Statu.bound = false;
+					these.Statu.boundRemark = "蓝牙连接不成功";
+					return;
+				}
+				if (!f.macAddress) {
+					these.Statu.bound = false;
+					these.Statu.boundRemark = "设备上报Mac地址异常";
+					return;
+				}
+				these.Statu.bound = null;
+				these.Statu.boundRemark = "";
+				showLoading(these, {
+
+					text: "连接中..."
+				})
+				let promise = request({
+					url: '/app/device/bind',
+					method: 'POST',
+					data: {
+						deviceImei: '',
+						deviceMac: these.device.macAddress,
+						communicationMode: '1', //0是4g,1是蓝牙
+					}
+				});
+				promise.then((res) => {
+					console.log("1111" + JSON.stringify(res));
+					if (res.code == 200) {
+						these.Statu.bound = true;
+						these.Statu.boundRemark = "设备绑定成功!";
+
+
+						uni.$emit("refreshDeviceList");
+						setTimeout(() => {
+							uni.switchTab({
+								url: "/pages/common/index/index"
+							});
+						}, 500);
+					} else {
+						these.Statu.bound = false;
+						these.Statu.boundRemark = res.msg;
+					}
+				}).catch((ex) => {
+					these.Statu.bound = false;
+					these.Statu.boundRemark = '出现了未知的异常,操作失败';
+				}).finally(() => {
+					hideLoading(this);
+				});
+			}
 		}
 	}
 </script>
 
 <style>
+	.content {
+		background-color: #1d1d1d;
+		color: #ffffffde;
+		box-sizing: border-box;
+		overflow: hidden;
+		width: 100%;
+		min-height: 100vh;
+		height: auto;
+		font-family: "PingFang SC";
+	}
 
-</style>
+	.deviceDetail {
+		margin: 200rpx auto;
+		display: flex;
+		flex-direction: column;
+		flex-wrap: nowrap;
+		align-content: center;
+		justify-content: center;
+		align-items: center;
+	}
+
+	.imgContent,
+	.titleIco {
+		width: 120rpx;
+		height: 120rpx;
+	}
+
+	.deviceId {
+		color: rgba(255, 255, 255, 0.87);
+		font-size: 32rpx;
+
+		line-height: 44rpx;
+		letter-spacing: 0.14rpx;
+		margin-top: 5rpx;
+	}
+
+	.btnLink {
+		position: fixed;
+		bottom: 30rpx;
+		left: 30rpx;
+		right: 30rpx;
+		width: calc(100% - 60rpx);
+		border-radius: 91px;
+		height: 90rpx;
+		background: rgba(187, 230, 0, 1);
+		color: rgba(35, 35, 35, 1);
+
+
+		font-size: 32rpx;
+		line-height: 90rpx;
+		letter-spacing: 12rpx;
+		text-align: center;
+	}
+
+	.bound,
+	.deviceName {
+		font-size: 32rpx;
+		font-weight: 400;
+		line-height: 44rpx;
+		letter-spacing: 0.14rpx;
+		margin-top: 5rpx;
+	}
+
+	.displayNone {
+		display: none !important;
+	}
+
+	.green {
+		color: rgba(187, 230, 0, 1);
+	}
+
+	.red {
+		color: rgba(245, 80, 80, 1);
+	}
+</style>

pages/common/addBLE/addEquip.vue

@@ -81,13 +81,22 @@
 				</view>
 			</view>
 		</BottomSlideMenuPlus>
+	
+	<global-loading ref="loading" />
 	</view>
 </template>
 
 <script>
-	import ble from '../../../api/6155/BlueHelper.js';
-	import request from '../../../utils/request.js';
-
+	import bleTool from '@/utils/BleHelper.js';
+	import request from '@/utils/request.js';
+	import {
+		showLoading,
+		hideLoading,
+		updateLoading
+	} from '@/utils/loading.js'
+	const pagePath="pages/common/addBLE/addEquip";
+	var ble = null;
+	var these = null;
 	export default {
 		data() {
 			return {
@@ -127,72 +136,71 @@
 		},
 		onHide: function() {
 			ble.StopSearch();
+			ble.removeReceiveCallback(pagePath);
 		},
 		onBackPress: (e) => {
 			ble.StopSearch();
-			ble.disconnectDevice();
+			ble.removeDeviceFound(pagePath);
+			ble.removeReceiveCallback(pagePath);
 		},
+		onUnload(){
+			ble.StopSearch();
+			ble.removeDeviceFound(pagePath);
+			ble.removeReceiveCallback(pagePath);
+		},
+		onLoad() {
+			these = this;
+			ble = bleTool.getBleTool();
+			ble.addDeviceFound((arr) => {
+				
+				arr = arr.devices;
+				for (var i = 0; i < arr.length; i++) {
 
-		onShow: function() {
-			// return;
-			var these = this;
-			uni.getStorage({
-				key: "linkedDevices",
-				success: (res) => {
-					this.PairEquip = JSON.parse(res.data);
-				},
-				fail: (ex) => {
-					this.PairEquip = [];
-				}
-			});
-
-			if (process.env.UNI_PLATFORM == 'mp-weixin' ||
-				process.env.UNI_PLATFORM == 'mp-alipay' ||
-				process.env.UNI_PLATFORM == 'app-plus' ||
-				process.env.UNI_PLATFORM == 'app'
-
-			) {
-				//打开蓝牙开始搜索设备
-				ble.OpenBlue(true, () => {
-						ble.StartSearch(function(arr) {
-
-							arr = arr.devices;
-							for (var i = 0; i < arr.length; i++) {
-
-								arr[i].linkStatu = false;
-								let f = these.EquipMents.find(function(v) {
-									return v.deviceId == arr[i].deviceId;
-								});
-
-								if (!f) {
-									these.EquipMents.push(arr[i]);
-								}
-
-
-
-							}
-
-							console.log("设备列表：" + JSON.stringify(these.EquipMents));
-						});
-					},
-					() => {
-						these.showOpenSetting();
+					arr[i].linkStatu = false;
+					if(!arr[i].name){
+						continue;
+					}
+					let f = these.EquipMents.find(function(v) {
+						return v.deviceId == arr[i].deviceId;
+					});
 
+					if (!f) {
+					
+						these.EquipMents.push(arr[i]);
+					} else {
 
 					}
-				)
+				}
+			},pagePath);
 
-
-
-			} else {
-				console.log('当前环境：' + process.env.UNI_PLATFORM + '不支持蓝牙');
-			}
+		},
+		
+		onShow: function() {
+			
+			
+			this.EquipMents=[];
+			this.PairEquip=[];
+			ble.StartSearch().catch((ex) => {
+				if (ex.code == 10001) {
+					these.showOpenSetting();
+				}
+			});
+			
+			
+			ble.addReceiveCallback((receivData) => {
+				console.log("收到数据了:", receivData);//数据格式:{bytes:[109,97],str:"",hexs:"FA 01"}
+				console.log("LinkedList=",ble.data.LinkedList);
+				 let data=uni.getStorageSync(ble.StorageKey);
+				 console.log("data=",data);
+			},pagePath);
+			
 
 		},
 		methods: {
 			isItemLink: function(item, index) {
 				let src = '/static/images/BLEAdd/noLink.png';
-				if (this.PairEquip && this.PairEquip instanceof Array) {
+				
+				if (this.PairEquip && this.PairEquip.length) {
 					if (this.PairEquip.length > 0) {
 						let f = this.PairEquip.find(function(v) {
 							return v.deviceId == item.deviceId;
@@ -206,114 +214,56 @@
 				}
 				return src;
 			},
-			alert: function(title, content, callback) {
-				if (!title) {
-					title = '提示'
-				}
-				if (!content) {
-					content = title;
-				}
-
-				uni.showModal({
-					title: title,
-					content: content,
-					success: function(res) {
-						if (res.confirm) {
-							console.log('用户点击确定');
-						} else if (res.cancel) {
-							console.log('用户点击取消');
-						}
-
-						if (callback) {
-							callback(res);
-						}
-					}
-				});
-			},
+			
 
 			showOpenSetting: function() {
 				this.Status.BottomMenu.show = true;
 			},
 			gotoSetting: function() {
 				this.Status.BottomMenu.show = false;
-				ble.showBluetoothGuide(false);
+				ble.showBlueSetting(false);
 			},
 			Link: function(item, index) {
-				var these = this;
-				if (process.env.UNI_PLATFORM == 'mp-weixin' ||
-					process.env.UNI_PLATFORM == 'mp-alipay' ||
-					process.env.UNI_PLATFORM == 'app-plus' ||
-					process.env.UNI_PLATFORM == 'app'
-				) {
-
-					uni.showLoading({
-						title: "正在连接",
-						mask: true
-					});
-					setTimeout(() => {
-
-
-						ble.LinkBlue(item.deviceId, function() {
-							let c = these.PairEquip.find(function(v) {
-								return v.deviceId == item.deviceId;
-							});
-							if (!c) {
-								these.PairEquip.push(item);
-								uni.setStorage({
-									key: 'linkedDevices',
-									data: JSON.stringify(these.PairEquip),
-									success: () => {}
-								});
-							}
-
-
-
-
-							// 调用绑定设备接口
-							let promise = request({
-								url: '/app/device/bind',
-								method: 'POST',
-								data: {
-									deviceImei: '',
-									deviceMac: item.deviceId,
-									communicationMode: '1', //0是4g,1是蓝牙
-								}
-							});
-							promise.then((res) => {
-								console.log("1111" + JSON.stringify(res));
-								if (res.code == 0) {
-
-									uni.hideLoading()
-									uni.showToast({
-										title: res.data,
-										icon: 'success'
-									});
-									
-									
-								} else {
-									uni.showToast({
-										title: res.msg,
-									});
-								}
-							}).catch((ex) => {
-
-								uni.showToast({
-									title: '出现了未知的异常,操作失败',
-								});
-							});
-
-
-
-
-
-						}, (ex) => {
-							uni.hideLoading();
+			
+				showLoading(this,{
+					text: "正在连接"
+				});
+				setTimeout(() => {
+					let serviceid=null;
+					if(item.advertisServiceUUIDs.length>0){
+						serviceid=item.advertisServiceUUIDs[0];
+					}
+					ble.LinkBlue(item.deviceId,serviceid).then((res) => {
+						let c = these.PairEquip.find(function(v) {
+							return v.deviceId == item.deviceId;
 						});
-					}, 0);
+						if (!c) {
+
+							these.PairEquip.push(item);
+						}
+						ble.removeReceiveCallback(pagePath);
+						uni.navigateTo({
+							url:"/pages/common/addBLE/LinkBle",
+							events:{
+								
+							},
+							success(res) {
+								
+								 res.eventChannel.emit('LinkItem', item);
+							}
+						});
+
+					}).catch((ex) => {
+						console.log("ex=",ex)
+						uni.showModal({
+							content:"连接失败:"+ex.msg
+						});
+					}).finally(()=>{
+						hideLoading(this);
+					});
+				}, 0);
+
 
-				} else {
-					these.alert("提示", "当前平台不支持蓝牙");
-				}
 			}
 		}
 	}
@@ -451,7 +401,7 @@
 
 	.mainContent .lblTitle {
 		color: #ffffffde;
-		font-family: PingFang SC;
+		font-family: "PingFang SC";
 		font-size: 28rpx;
 		font-weight: 700;
 		text-align: left;
@@ -516,7 +466,7 @@
 
 	.list .item .name {
 		color: #ffffffde;
-		font-family: PingFang SC;
+		font-family: "PingFang SC";
 		font-size: 26rpx;
 		font-weight: 400;
 		line-height: 50rpx;
@@ -525,7 +475,7 @@
 
 	.list .item .id {
 		color: #ffffff99;
-		font-family: PingFang SC;
+		font-family: "PingFang SC";
 		font-size: 24rpx;
 		font-weight: 400;
 		line-height: 30rpx;
@@ -547,7 +497,7 @@
 
 	.openBlue .txt {
 		color: rgba(255, 255, 255, 0.87);
-		font-family: PingFang SC;
+		font-family: "PingFang SC";
 		font-size: 28rpx;
 		font-weight: 400;
 		letter-spacing: 0.14rpx;
@@ -572,7 +522,7 @@
 		width: 25%;
 		height: 60rpx;
 		text-align: center;
-		font-family: PingFang SC;
+		font-family: "PingFang SC";
 		font-size: 28rpx;
 		letter-spacing: 12rpx;
 		display: flex !important;
@@ -584,10 +534,12 @@
 		justify-content: center;
 
 	}
+
 	.openBlue .cancel {
 		border: 1px solid rgba(255, 255, 255, 1);
 		color: rgba(255, 255, 255, 1);
 	}
+
 	.openBlue .ok {
 		background-color: #BBE600;
 		color: #232323;

pages/common/login/index.vue

@@ -60,7 +60,7 @@
 		data() {
 			return {
 				showView: false,
-				phone: '13800138002', //手机号码
+				phone: '17671332251', //手机号码
 				code: "123456", //验证码
 				agreed: false,
 				isCounting: false,
@@ -69,6 +69,29 @@
 				showAgreement: false, // 控制弹窗显示
 			}
 		},
+		onLoad(){
+					if(uni.getStorageSync("token") && uni.getStorageSync("clientID")){//免登陆
+						
+						let time=uni.getStorageSync("tokenTime");
+						if(!time){							
+							time=0;
+						}
+						let currTime=new Date().getTime();
+						if(currTime<time){
+							console.log("登陆过，并且没过期，自动进入设备页");
+							uni.switchTab({
+								url: '/pages/common/index/index'
+							});
+							return;
+						}else{
+							//token过期了
+							uni.removeStorageSync("token")
+							uni.removeStorageSync("clientID")
+							uni.removeStorageSync("tokenTime")
+						}
+						
+					}
+				},
 		methods: {
 			// 获取验证码
 			async getPhoneCode() {
@@ -158,6 +181,7 @@
 						uni.hideLoading()
 						uni.setStorageSync('token', res.data.access_token) // 缓存token
 						uni.setStorageSync('clientID', res.data.client_id) // 缓存token
+						uni.setStorageSync('tokenTime',new Date().getTime()+86400000);//过期时间
 						uni.showToast({
 							title: '登录成功',
 							icon: 'success'