From 61433fca05f3b3d68e63da7c57b382e1e0c95d34 Mon Sep 17 00:00:00 2001
From: liub <itliubiao@qq.com>
Date: Thu, 23 Oct 2025 08:46:44 +0800
Subject: [PATCH] =?UTF-8?q?7305=E4=BF=AE=E6=94=B9=E4=BA=BA=E5=91=98?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E7=9A=84=E7=82=B9=E9=98=B5=E6=96=B9=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 App.vue                |  4 +--
 pages/7305/BJQ7305.vue | 26 ++++++++++++++---
 utils/BleHelper.js     | 65 ++++++++++++++++++++++++------------------
 3 files changed, 62 insertions(+), 33 deletions(-)

diff --git a/App.vue b/App.vue
index be0e858..edb4820 100644
--- a/App.vue
+++ b/App.vue
@@ -36,10 +36,10 @@
 			//将检查更新换到onshow,因为苹果用户喜欢一直挂着
 			uni.getSystemInfo({success:function(res){
 					if(res.uniPlatform=='app'){		
+						 bleTool.getBleTool();
 						let appid=plus.runtime.appid;
 						if(appid!=='HBuilder'){
-							console.log("appid=",appid);
-							 bleTool.getBleTool();
+							console.log("appid=",appid);							
 							upgrade.checkAndUpdateWgt();
 						}
 						
diff --git a/pages/7305/BJQ7305.vue b/pages/7305/BJQ7305.vue
index 0b8f6c6..9ff3fa7 100644
--- a/pages/7305/BJQ7305.vue
+++ b/pages/7305/BJQ7305.vue
@@ -87,8 +87,8 @@
 				<text class="usrtitle fleft">人员信息登记</text>
 				<view class="btnSend fright" v-on:click.stop="sendUsr">发送</view>
 				<view class="clear"></view>
-				<textToDotMatrix class="TextToHex" ref="textToHex" :txts="formData.textLines" :bgColor="'#FFFFFF'"
-					:color="'#000000'" :fontSize="14" />
+				<textToDotMatrixV1 class="TextToHex" ref="textToHex" :txts="formData.textLines" :bgColor="'#FFFFFF'"
+					:color="'#000000'" :fontSize="13" />
 			</view>
 
 			<view class="item">
@@ -147,7 +147,7 @@
 </template>
 
 <script>
-	import textToDotMatrix from '@/components/TextToHex/textToDotMatrix.vue';
+	import textToDotMatrixV1 from '@/components/TextToHex/textToDotMatrixV1.vue';
 	import bleTool from '@/utils/BleHelper.js';
 	import usrApi from '@/api/670/HBY670.js'
 	import {
@@ -165,7 +165,7 @@
 	var pagePath = "pages/7305/BJQ7305";
 	export default {
 		components: {
-			textToDotMatrix
+			textToDotMatrixV1
 		},
 		data() {
 			return {
@@ -1023,6 +1023,24 @@
 					these.showBleUnConnect()
 					return;
 				}
+				let err=false;
+				this.formData.textLines.find((txt)=>{
+					if(txt.length===0 || txt.length>5){
+						console.log("txt=",txt);
+						err=true;
+						return true;
+					}
+					return false;
+				})
+				if(err){
+					this.showPop({
+						message: "单位、部门、姓名必须填写且最多5字",
+						iconUrl: "/static/images/6155/DeviceDetail/uploadErr.png",
+						borderColor: "#e034344d",
+						buttonBgColor: "#E03434",
+					});
+					return;
+				}
 				showLoading(these, {
 					text: "请稍候..."
 				});
diff --git a/utils/BleHelper.js b/utils/BleHelper.js
index 2bfc057..d218e38 100644
--- a/utils/BleHelper.js
+++ b/utils/BleHelper.js
@@ -733,16 +733,17 @@ class BleHelper {
 							} catch (ex) {
 								console.error("将数据转文本失败", ex);
 							}
-							let recData = {
-								deviceId: receive.deviceId,
-								serviceId: receive.serviceId,
-								characteristicId: receive.characteristicId,
-								bytes: bytes,
-								str: str,
-								hexs: hexs
-							};
-							// console.log("监听到特征值:" + JSON.stringify(recData));
+							
 							try {
+								let recData = {
+									deviceId: receive.deviceId,
+									serviceId: receive.serviceId,
+									characteristicId: receive.characteristicId,
+									bytes: bytes,
+									str: str,
+									hexs: hexs
+								};
+								 console.log("监听到特征值:" + JSON.stringify(recData));
 								if (this.cfg.receivDataCallback) {
 
 									if (this.cfg.receivDataCallback.length > 0) {
@@ -1409,25 +1410,11 @@ class BleHelper {
 								// 	.LinkedList);
 
 								// 处理 MTU 设置
-								if (plus.os.name === 'Android') {
-									uni.setBLEMTU({
-										deviceId: deviceId,
-										mtu: 512,
-										success: (mtu) => {
-
-											resolve(true);
-										},
-										fail: () => {
-											console.error(
-												"mtu设置失败");
-											resolve(
-												true
-											); // MTU设置失败不影响连接成功
-										}
-									});
-								} else {
+								if (plus.os.name === 'Android') {																
+									this.setMtu(deviceId);
+								} 
 									resolve(true);
-								}
+								
 							}).catch((ex) => {
 								reject(this.getError(ex));
 							});
@@ -1511,6 +1498,30 @@ class BleHelper {
 
 
 	}
+	
+	setMtu(deviceId){
+		let prom=new Promise((_succ,_err)=>{
+			uni.setBLEMTU({
+				deviceId: deviceId,
+				mtu: 512,
+				success: (mtuRes) => {
+					console.log("mtu约定成功");
+					_succ(mtuRes);
+				},
+				fail: (ex) => {
+					console.error(
+						"mtu设置失败",ex);
+						ex=this.getError(ex);
+					_err(
+						ex
+					); // MTU设置失败不影响连接成功
+				},complete(){
+					console.log("设置mtu完毕");
+				}
+			});
+		});
+		return prom;
+	}
 	//断开连接
 	disconnectDevice(deviceId) {
 		var disconnect = (id) => {