Merge branch 'liubiao-new-20250827'

components/TextToHex/textToDotMatrixFor7305.vue

@@ -7,7 +7,7 @@
 
 <script>
 	export default {
-		name: "textToDotMatrix",
+		name: "textToDotMatrixFor7305",
 		props: {
 			txts: {
 				type: Array,

manifest.json

@@ -2,7 +2,7 @@
     "name" : "星汉物联",
     "appid" : "__UNI__A21EF43",
     "description" : "设备管控",
-    "versionName" : "1.0.3",
+    "versionName" : "1.0.6",
     "versionCode" : "100",
     "transformPx" : false,
     /* 5+App特有相关 */
@@ -22,8 +22,7 @@
             "Bluetooth" : {},
             "Camera" : {},
             "Geolocation" : {},
-            "Maps" : {},
+            "Maps" : {}
-            "Record" : {}
         },
         /* 应用发布信息 */
         "distribute" : {

pages.json

@@ -264,6 +264,20 @@
 			{
 				"navigationBarTitleText" : "语音管理"
 			}
+		},
+		{
+			"path" : "pages/4877/BJQ4877",
+			"style" : 
+			{
+				"navigationBarTitleText" : "BJQ 4877"
+			}
+		},
+		{
+			"path" : "pages/100/HBY100",
+			"style" : 
+			{
+				"navigationBarTitleText" : "HBY 100"
+			}
 		}
 		
 

pages/6155/deviceDetail.vue

@@ -357,6 +357,7 @@
 				these.formData.img = device.devicePic;
 				these.formData.id = device.id;
 				these.formData.deviceId = f.deviceId;
+				these.formData.bleStatu = false;
 				ble.LinkBlue(f.deviceId, f.writeServiceId, f.wirteCharactId, f.notifyCharactId).then(res => {
 					these.formData.bleStatu = true;
 				});
@@ -515,6 +516,9 @@
 				return f;
 			},
 			bleValueNotify: function(receive, device, path, recArr) {
+				if (receive.deviceId !== this.formData.deviceId) {
+					return;
+				}
 				if (this.Status.pageHide) {
 					return;
 				}
@@ -571,6 +575,7 @@
 					borderColor: "#e034344d",
 					buttonBgColor: "#E03434",
 					buttonText: '去连接',
+					buttonTextColor: '#232323de',
 					okCallback: function() {
 						// console.log("1111");
 						uni.navigateTo({
@@ -1027,39 +1032,52 @@
 				this.Status.Pop.showPop = false;
 			},
 			showPop: function(option) {
-
 				hideLoading(this);
-				let defaultCfg = {
+				let def = {
-					showHeader: false,
+					showPop: true, //是否显示弹窗
-					headerTxt: "",
-					showHeader: false,
-					showCancel: false,
-					borderColor: '#BBE600',
-					buttonBgColor: '#BBE600',
-					okCallback: null,
-					cancelCallback: null,
 					popType: 'custom',
+					bgColor: '#383934bd',
+					borderColor: '#BBE600',
+					textColor: '#ffffffde',
+					buttonBgColor: '#BBE600',
+					buttonTextColor: '#232323DE',
+					iconUrl: '',
+					message: '',
 					buttonText: '确定',
-					clickEvt: ''
+					clickEvt: '',
-				};
+					visiblePrompt: false,
-				if (!option) {
+					promptTitle: '',
+					modelValue: '',
+					visibleClose: false,
+					okCallback: null,
+					showSlot: false,
+					buttonCancelText: '',
+					showCancel: false,
+				}
 
-				}
+				let keys = Object.keys(def);
-				let keys = Object.keys(option);
+
-				for (var i = 0; i < keys.length; i++) {
+				for (let i = 0; i < keys.length; i++) {
-					let key = keys[i];
-					this.Status.Pop[key] = option[key];
-				}
-				keys = Object.keys(defaultCfg);
-				for (var i = 0; i < keys.length; i++) {
 					let key = keys[i];
 					if (key in option) {
 						continue;
 					}
-					this.Status.Pop[key] = defaultCfg[key];
+					this.Status.Pop[key] = def[key];
+				}
+				if (option) {
+					keys = Object.keys(option);
+					for (let i = 0; i < keys.length; i++) {
+						let key = keys[i];
+
+						this.Status.Pop[key] = option[key];
+					}
 				}
 
-				this.Status.Pop.showPop = true;
+				if (!option.borderColor) {
+					option.borderColor = '#BBE600';
+					option.buttonBgColor = '#BBE600';
+				}
+				these.Status.Pop.showPop = true;
 			},
 			sendUsr() {
 				let f = this.getDevice();

pages/6331/BJQ6331.vue

@@ -247,6 +247,7 @@
 		data() {
 			return {
 				Status: {
+					pageHide: false,
 					showLightingSet: false,
 					showVolumeSet: false,
 					Pop: {
@@ -675,6 +676,9 @@
 			},
 
 			bleValueNotify: function(receive, device, path) { //订阅消息
+				if (receive.deviceId !== this.formData.deviceId) {
+					return;
+				}
 				console.log("收到设备的数据", receive)
 				let data = recei.ReceiveData(receive, device, pagePath);
 
@@ -717,13 +721,13 @@
 
 			showBleUnConnect() {
 
-				these.showPop({
+				this.showPop({
 					message: "蓝牙未连接过该设备,请使用蓝牙重新添加该设备",
 					iconUrl: "/static/images/6155/DeviceDetail/uploadErr.png",
 					borderColor: "#e034344d",
 					buttonBgColor: "#E03434",
 					buttonText: '去连接',
-					buttonTextColor: '#FFFFFFde',
+					buttonTextColor: '#232323de',
 					okCallback: function() {
 
 						uni.navigateTo({
@@ -797,6 +801,7 @@
 				}
 			},
 			showPop: function(option) {
+				hideLoading(this);
 				let def = {
 					showPop: true, //是否显示弹窗
 					popType: 'custom',
@@ -807,14 +812,16 @@
 					buttonTextColor: '#232323DE',
 					iconUrl: '',
 					message: '',
-					buttonText: '',
+					buttonText: '确定',
 					clickEvt: '',
 					visiblePrompt: false,
 					promptTitle: '',
 					modelValue: '',
 					visibleClose: false,
 					okCallback: null,
-					showSlot: false
+					showSlot: false,
+					buttonCancelText: '',
+					showCancel: false,
 				}
 
 				let keys = Object.keys(def);
@@ -824,14 +831,14 @@
 					if (key in option) {
 						continue;
 					}
-					these.Status.Pop[key] = def[key];
+					this.Status.Pop[key] = def[key];
 				}
 				if (option) {
 					keys = Object.keys(option);
 					for (let i = 0; i < keys.length; i++) {
 						let key = keys[i];
 
-						these.Status.Pop[key] = option[key];
+						this.Status.Pop[key] = option[key];
 					}
 				}
 

pages/650/HBY650.vue

@@ -192,7 +192,7 @@
 		data() {
 			return {
 				Status: {
-
+					pageHide: false,
 					Pop: {
 						showPop: false, //是否显示弹窗
 						popType: 'custom',
@@ -345,7 +345,7 @@
 				these.formData.blename = f.name ? f.name : "Unname";
 				these.formData.deviceName = device.deviceName;
 				these.formData.img = device.devicePic;
-				
+				these.formData.bleStatu = false;
 				these.formData.deviceId = f.deviceId;
 				ble.LinkBlue(f.deviceId, f.writeServiceId, f.wirteCharactId, f.notifyCharactId).then(res => {
 					these.formData.bleStatu = true;
@@ -491,6 +491,9 @@
 				return className;
 			},
 			bleValueNotify: function(receive, device, path, recArr) { //订阅消息
+				if (receive.deviceId !== this.formData.deviceId) {
+					return;
+				}
 				console.log("收到设备的数据", receive)
 				let data = recei.ReceiveData(receive, device, pagePath, recArr);
 
@@ -684,7 +687,7 @@ console.log("res=",res);
 					borderColor: "#e034344d",
 					buttonBgColor: "#E03434",
 					buttonText: '去连接',
-					buttonTextColor: '#FFFFFFde',
+					buttonTextColor: '#232323de',
 					okCallback: function() {
 
 						uni.navigateTo({
@@ -1261,17 +1264,47 @@ console.log("res=",res);
 				}
 			},
 			showPop: function(option) {
+				hideLoading(this);
+				let def = {
+					showPop: true, //是否显示弹窗
+					popType: 'custom',
+					bgColor: '#383934bd',
+					borderColor: '#BBE600',
+					textColor: '#ffffffde',
+					buttonBgColor: '#BBE600',
+					buttonTextColor: '#232323DE',
+					iconUrl: '',
+					message: '',
+					buttonText: '确定',
+					clickEvt: '',
+					visiblePrompt: false,
+					promptTitle: '',
+					modelValue: '',
+					visibleClose: false,
+					okCallback: null,
+					showSlot: false,
+					buttonCancelText: '',
+					showCancel: false,
+				}
 
-				if (!option) {
+				let keys = Object.keys(def);
-					option = {
+
-						a: 1
+				for (let i = 0; i < keys.length; i++) {
-					};
-				}
-				let keys = Object.keys(option);
-				for (var i = 0; i < keys.length; i++) {
 					let key = keys[i];
-					these.Status.Pop[key] = option[key];
+					if (key in option) {
+						continue;
 					}
+					this.Status.Pop[key] = def[key];
+				}
+				if (option) {
+					keys = Object.keys(option);
+					for (let i = 0; i < keys.length; i++) {
+						let key = keys[i];
+
+						this.Status.Pop[key] = option[key];
+					}
+				}
+
 				if (!option.borderColor) {
 					option.borderColor = '#BBE600';
 					option.buttonBgColor = '#BBE600';

pages/670/HBY670.vue

@@ -523,6 +523,7 @@
 					these.formData['imei'] = these.device.deviceImei;
 				}
 				these.getDetail();
+				these.formData.bleStatu = false;
 				ble.LinkBlue(f.deviceId, f.writeServiceId, f.wirteCharactId, f.notifyCharactId).then(res => {
 					these.formData.bleStatu = true;
 				});
@@ -632,6 +633,7 @@
 					borderColor: "#e034344d",
 					buttonBgColor: "#E03434",
 					buttonText: '去连接',
+					buttonTextColor: '#232323de',
 					showCancel: true,
 					cancelCallback: () => {
 						// this.closePop();
@@ -983,7 +985,9 @@
 				return receiveData;
 			},
 			bleValueNotify: function(receive, device, path, recArr) { //订阅消息
-
+				if (receive.deviceId !== this.formData.deviceId) {
+					return;
+				}
 				let data = recei.ReceiveData(receive, device, pagePath, recArr);
 				console.log("收到设备的数据", data)
 				if (data) {
@@ -1432,7 +1436,8 @@
 							this.Status.staticWarn.time = 0;
 							return;
 						}
-						if (these.formData.qzwarn && these.Status.staticWarn.inteval && these.Status.staticWarn.time) {
+						if (these.formData.qzwarn && these.Status.staticWarn.inteval && these.Status.staticWarn
+							.time) {
 							console.log("222222");
 							this.Status.Pop.okCallback = null;
 							these.showQzWarn(sendRb);
@@ -2169,39 +2174,51 @@
 			},
 			showPop: function(option) {
 				hideLoading(this);
-				let defaultCfg = {
+				let def = {
-					showHeader: false,
+					showPop: true, //是否显示弹窗
-					headerTxt: "",
-					showHeader: false,
-					showCancel: false,
-					borderColor: '#BBE600',
-					buttonBgColor: '#BBE600',
-					okCallback: null,
-					cancelCallback: null,
 					popType: 'custom',
+					bgColor: '#383934bd',
+					borderColor: '#BBE600',
+					textColor: '#ffffffde',
+					buttonBgColor: '#BBE600',
+					buttonTextColor: '#232323DE',
+					iconUrl: '',
+					message: '',
 					buttonText: '确定',
+					clickEvt: '',
+					visiblePrompt: false,
+					promptTitle: '',
+					modelValue: '',
+					visibleClose: false,
+					okCallback: null,
+					showSlot: false,
+					buttonCancelText: '',
 					showCancel: false,
-					buttonCancelText: '取消',
+				}
-					clickEvt: ''
-				};
-				if (!option) {
 
-				}
+				let keys = Object.keys(def);
-				let keys = Object.keys(option);
+
-				for (var i = 0; i < keys.length; i++) {
+				for (let i = 0; i < keys.length; i++) {
-					let key = keys[i];
-					this.Status.Pop[key] = option[key];
-				}
-				keys = Object.keys(defaultCfg);
-				for (var i = 0; i < keys.length; i++) {
 					let key = keys[i];
 					if (key in option) {
 						continue;
 					}
-					this.Status.Pop[key] = defaultCfg[key];
+					this.Status.Pop[key] = def[key];
+				}
+				if (option) {
+					keys = Object.keys(option);
+					for (let i = 0; i < keys.length; i++) {
+						let key = keys[i];
+
+						this.Status.Pop[key] = option[key];
+					}
 				}
 
-				this.Status.Pop.showPop = true;
+				if (!option.borderColor) {
+					option.borderColor = '#BBE600';
+					option.buttonBgColor = '#BBE600';
+				}
+				these.Status.Pop.showPop = true;
 			},
 			sendUsr: function(ReSendNo) {
 

pages/7305/BJQ7305.vue

@@ -93,15 +93,18 @@
 
 					<view class="item">
 						<text class="lbl">单位：</text>
-				<input class="value" v-model="formData.textLines[0]" placeholder="请输入单位" placeholder-class="usrplace" />
+						<input class="value" v-model="formData.textLines[0]" placeholder="请输入单位"
+							placeholder-class="usrplace" />
 					</view>
 					<view class="item">
 						<text class="lbl">部门：</text>
-				<input class="value" v-model="formData.textLines[1]" placeholder="请输入姓名" placeholder-class="usrplace" />
+						<input class="value" v-model="formData.textLines[1]" placeholder="请输入姓名"
+							placeholder-class="usrplace" />
 					</view>
 					<view class="item">
 						<text class="lbl">姓名：</text>
-				<input class="value" v-model="formData.textLines[2]" placeholder="请输入职位" placeholder-class="usrplace" />
+						<input class="value" v-model="formData.textLines[2]" placeholder="请输入职位"
+							placeholder-class="usrplace" />
 					</view>
 
 			</view>

pages/common/addBLE/LinkBle.vue

@@ -156,14 +156,39 @@
 				if (these.device.deviceId == receive.deviceId) {
 					console.log("11111:", receive);
 					these.device.imei = f.imei;
-					if (receive.bytes[0] == 0xFC || receive.str.indexOf('mac address:') == 0) {
+					let flag=false;
+					if (receive.bytes && receive.bytes.length && receive.bytes[0] == 0xFC)   {//6155 7305
 						if (f && f.macAddress) {
+							 flag=true;							
+						}						
+					}
+					else if(receive.str.indexOf('mac address:') == 0){//650 670
+						if (f && f.macAddress) {
+							 flag=true;							
+						}	
+					}
+					else{
+						try{
+							let json=JSON.parse(receive.str);
+							let key = "sta_address"; 
+							if (key in json) {//100
+								if (f && f.macAddress) {
+									 flag=true;
+								}
+							}
+						}catch(err){
+							console.log("出现异常,",err);
+						}
+					}
+					
+					
+					if(flag){
 						these.device.macAddress = f.macAddress;
 						console.log("222222");
 						these.Statu.isSearch = false;
 						these.initDevice();
 					}
-					}
+					
 				}
 			}, pagePath);
 			eventChannel = this.getOpenerEventChannel();

pages/common/addBLE/addEquip.vue

@@ -27,7 +27,8 @@
 
 					<view class="item " v-for="item, index in PairEquip" v-show="PairEquip.length>0">
 						<view class="leftImg ">
-							<image src="/static/images/common/bluetooth.png" class="titleIco" mode="heightFix">
+							<image src="/static/images/common/bluetooth.png" class="titleIco filterNone"
+								mode="heightFix">
 							</image>
 						</view>
 						<view class="centertxt ">
@@ -172,40 +173,47 @@
 			let search = option.search;
 			these = this;
 			eventChannel = this.getOpenerEventChannel();
-			// this.EquipMents = [{
+			const systemInfo = uni.getSystemInfoSync();
-			// 		"RSSI": -55,
+			if (systemInfo.uniPlatform == 'web') {
-			// 		"advertisData": "",
-			// 		"advertisServiceUUIDs": [
-			// 			"0000FFE0-0000-1000-8000-00805F9B34FB"
-			// 		],
-			// 		"deviceId": "EBDA4E6F-3A28-FF65-A845-AE8CC7B78375",
-			// 		"name": "HBY670-BF74EA",
-			// 		"linkStatu": false
-			// 	},
-			// 	{
-			// 		"RSSI": -61,
-			// 		"advertisData": "",
-			// 		"advertisServiceUUIDs": [
-			// 			"0000FFE0-0000-1000-8000-00805F9B34FB"
-			// 		],
-			// 		"deviceId": "469FB381-B47E-1E40-8073-EF50B5704AAB",
-			// 		"name": "EF4651",
-			// 		"linkStatu": false,
-			// 		"isTarget": true
-			// 	},
-			// 	{
-			// 		"RSSI": -69,
-			// 		"advertisData": "",
-			// 		"advertisServiceUUIDs": [
-			// 			"0000FFE0-0000-1000-8000-00805F9B34FB"
-			// 		],
-			// 		"deviceId": "4F0DAC91-4391-CB07-905E-72D7F03EFCD3",
-			// 		"name": "4877-BF743D",
-			// 		"linkStatu": false
-			// 	}
-			// ];
 
 
+				this.EquipMents = [{
+						"RSSI": -55,
+						"advertisData": "",
+						"advertisServiceUUIDs": [
+							"0000FFE0-0000-1000-8000-00805F9B34FB"
+						],
+						"deviceId": "EBDA4E6F-3A28-FF65-A845-AE8CC7B78375",
+						"name": "HBY670-BF74EA",
+						"linkStatu": false
+					},
+					{
+						"RSSI": -61,
+						"advertisData": "",
+						"advertisServiceUUIDs": [
+							"0000FFE0-0000-1000-8000-00805F9B34FB"
+						],
+						"deviceId": "469FB381-B47E-1E40-8073-EF50B5704AAB",
+						"name": "EF4651",
+						"linkStatu": false,
+						"isTarget": true
+					},
+					{
+						"RSSI": -69,
+						"advertisData": "",
+						"advertisServiceUUIDs": [
+							"0000FFE0-0000-1000-8000-00805F9B34FB"
+						],
+						"deviceId": "4F0DAC91-4391-CB07-905E-72D7F03EFCD3",
+						"name": "4877-BF743D",
+						"linkStatu": false
+					}
+				];
+
+
+				these.PairEquip = [this.EquipMents[0]];
+				return;
+			}
 			let StartSubsrib = () => {
 				these.EquipMents = [];
 				ble = bleTool.getBleTool();
@@ -941,4 +949,9 @@
 		color: #232323;
 
 	}
+
+	.filterNone {
+		filter: none !important;
+		-webkit-filter: none !important;
+	}
 </style>

utils/BleHelper.js

@@ -42,6 +42,9 @@ class BleHelper {
 		}
 
 
+		const systemInfo = uni.getSystemInfoSync();
+
+
 
 		setTimeout(() => {
 			this.OpenBlue().then(() => {
@@ -55,8 +58,8 @@ class BleHelper {
 			discovering: false, //蓝牙是否正在搜索
 			searchList: [], //已搜索到的设备列表,
 			isSubscribe: false, //是否开启了订阅
-			LinkedList: linkedDevices //已连接的设备列表 
+			LinkedList: linkedDevices, //已连接的设备列表 
-
+			platform: systemInfo.uniPlatform
 		}
 		this.cfg = {
 			onDeviceFound: [], //发现新设备的事件
@@ -169,7 +172,9 @@ class BleHelper {
 	//连接所有已连接过的设备
 	linkAllDevices() {
 		// console.log("模块启动时，自动连接已连接过的设备", this.data.LinkedList);
-
+		if (this.data.platform == 'web') {
+			return;
+		}
 		if (this.data.LinkedList && this.data.LinkedList.length > 0) {
 			let flag = false;
 			for (var i = 0; i < this.data.LinkedList.length; i++) {
@@ -424,7 +429,12 @@ class BleHelper {
 
 	//获取蓝牙适配器状态
 	CheckBlue() {
-
+		if (this.data.platform == 'web') {
+			return Promise.resolve({
+				available: true,
+				discovering: false
+			});
+		}
 		return new Promise((resolve, reject) => {
 			if (this.data.available) {
 				// console.log("蓝牙模块是可用状态");
@@ -463,6 +473,12 @@ class BleHelper {
 	//打开蓝牙适配器
 	OpenBlue() {
 
+		if (this.data.platform == 'web') {
+			this.data.isOpenBlue = true;
+			this.data.available = true;
+			this.data.isSubscribe = true;
+			return Promise.resolve(true);
+		}
 		var init = () => {
 			return new Promise((resolve, reject) => {
 				if (this.data.isOpenBlue) {
@@ -678,6 +694,7 @@ class BleHelper {
 								}
 
 								let header = "mac address:";
+								let isUpdate = false;
 								if (str.indexOf(header) == 0) { //650以文本传输mac
 									console.log("str=", str);
 									this.data.LinkedList.find((v) => {
@@ -698,10 +715,11 @@ class BleHelper {
 												.macAddress)
 										}
 									});
-									this.updateCache();
+									isUpdate = true;
+
 								}
 
-								if (str.indexOf('imei:') == 0) {
+								if (str.indexOf('imei:') == 0) { //670以此方式传输imei
 									let imei = str.split(':')[1];
 
 
@@ -709,9 +727,10 @@ class BleHelper {
 										if (v.deviceId == receive
 											.deviceId) {
 											v.imei = imei;
+											isUpdate = true;
 										}
 									});
-									this.updateCache();
+
 
 								}
 
@@ -725,12 +744,43 @@ class BleHelper {
 											if (v.deviceId == receive
 												.deviceId) {
 												v.macAddress = mac;
-												// console.log("收到mac地址:", str)
+												isUpdate = true;
 											}
 										});
-										this.updateCache();
+
 									}
 								}
+
+								try {
+									let receivJson = JSON.parse(str);
+									let key = "sta_address"; //HBY100以此方式上传mac地址
+									if (key in receivJson) {
+										this.data.LinkedList.find((v) => {
+											if (v.deviceId == receive
+												.deviceId) {
+												let macStr = receivJson[
+													key];
+												if (macStr.includes(':')) {
+													v.macAddress = macStr;
+												} else {
+													v.macAddress = macStr
+														.replace(/(.{2})/g,
+															'$1:').slice(0,
+															-1)
+												}
+
+												isUpdate = true;
+											}
+										});
+
+									}
+								} catch (convertException) {
+									console.error("文本无法转json", convertException)
+								}
+
+								if (isUpdate) {
+									this.updateCache();
+								}
 								// console.log("str1=", str);
 							} catch (ex) {
 								console.error("将数据转文本失败", ex);
@@ -811,6 +861,14 @@ class BleHelper {
 	}
 	//关闭蓝牙适配器
 	CloseBlue() {
+		if (this.data.platform == 'web') {
+			this.data.available = false;
+			this.data.discovering = false;
+			this.data.isOpenBlue = false;
+			this.data.searchList = [];
+
+			return Promise.resolve();
+		}
 		return new Promise((resolve, reject) => {
 			this.data.available = false;
 			this.data.discovering = false;
@@ -842,6 +900,9 @@ class BleHelper {
 
 	//开始搜索新设备
 	StartSearch() {
+		if (this.data.platform == 'web') {
+			return Promise.resolve({});
+		}
 		this.data.searchList = [];
 		var these = this;
 		//开始搜索
@@ -902,6 +963,9 @@ class BleHelper {
 
 	//停止搜索
 	StopSearch() {
+		if (this.data.platform == 'web') {
+			return Promise.resolve();
+		}
 		let p1 = new Promise((resolve, reject) => {
 			uni.stopBluetoothDevicesDiscovery({
 				success: (res) => {
@@ -1341,7 +1405,9 @@ class BleHelper {
 
 	//连接某个设备
 	LinkBlue(deviceId, targetServiceId, writeCharId, notifyCharId, maxRetries) {
-
+		if (this.data.platform == 'web') {
+			return Promise.resolve(true);
+		}
 		if (maxRetries === undefined) {
 			maxRetries = 0; // 最大重试次数
 		}
@@ -1519,7 +1585,8 @@ class BleHelper {
 					_err(
 						ex
 					); // MTU设置失败不影响连接成功
-				},complete(){
+				},
+				complete() {
 					console.log("设置mtu完毕");
 				}
 			});
@@ -1528,6 +1595,9 @@ class BleHelper {
 	}
 	//断开连接
 	disconnectDevice(deviceId) {
+		if (this.data.platform == 'web') {
+			return Promise.resolve();
+		}
 		var disconnect = (id) => {
 			return new Promise((resolve, reject) => {
 				uni.closeBLEConnection({
@@ -1546,16 +1616,7 @@ class BleHelper {
 
 		}
 		if (deviceId) {
-			disconnect(deviceId);
+			return disconnect(deviceId);
-
-			this.data.LinkedList.find(v => {
-				if (v.deviceId === deviceId) {
-					return true;
-				}
-				return false;
-			});
-
-			return;
 		}
 
 		if (this.data.LinkedList.length > 0) {
@@ -1567,10 +1628,8 @@ class BleHelper {
 				}
 
 			}
-			if (arr.length == 0) {
+			if (arr.length) {
-				return;
+				return new Promise((_succ, _err) => {
-			}
-
 					Promise.allSettled(arr).then((results) => {
 						results.forEach((result, index) => {
 							if (result.status === 'fulfilled') {
@@ -1579,15 +1638,24 @@ class BleHelper {
 								////console.log(`第${index + 1}个Promise失败:`, result.reason.message);
 							}
 						});
+						_succ()
+					}).catch((ex) => {
+						_err();
+					});
 				});
-
-		} else {
-			////console.log("无已连接设备");
 			}
 		}
+
+		return Promise.resolve();
+
+	}
 	//向蓝牙设备发送一个字符串的ASCII码
 	sendString(deviceid, str, writeServiceId, wirteCharactId, ms) {
-		if (str && str.length) {
+		if (str && typeof(str) == 'object') {
+			str = JSON.stringify(str);
+		}
+		if (str) {
+
 			let buffer = new ArrayBuffer(str.length);
 			let dataView = new DataView(buffer);
 
@@ -1627,7 +1695,9 @@ class BleHelper {
 	}
 	//向蓝牙设备发送数据，如果没连接将自动连接后再发
 	sendData(deviceid, buffer, writeServiceId, wirteCharactId, ms) {
-
+		if (this.data.platform == 'web') {
+			return Promise.resolve("h5平台默认成功");
+		}
 		// console.log("deviceid=" + deviceid + ",writeServiceId=" + writeServiceId + ",wirteCharactId=" +
 		// 	wirteCharactId + ",timeout=" + ms)
 		if (ms === undefined) {

utils/BleReceive.js

@@ -5,7 +5,9 @@ class BleReceive {
 			'/pages/6155/deviceDetail': this.Receive_6155.bind(this),
 			'/pages/7305/BJQ7305': this.Receive_6155.bind(this),
 			'/pages/650/HBY650': this.Receive_650.bind(this),
-			'/pages/670/HBY670': this.Receive_670.bind(this)
+			'/pages/670/HBY670': this.Receive_670.bind(this),
+			'/pages/4877/BJQ4877': this.Receive_4877.bind(this),			
+			'/pages/100/HBY100': this.Receive_4877.bind(this)
 		};
 	}
 
@@ -490,6 +492,36 @@ class BleReceive {
 		}
 	}
 
+	Receive_4877(receive,f,path,recArr){
+		let receiveData={};
+		
+		try {
+	
+			console.log("str=",receive.str);
+			receiveData = JSON.parse(receive.str);
+				
+				let recCnt = recArr.find(v => {
+					return v.key.replaceAll('/', '').toLowerCase() == f.device.detailPageUrl
+						.replaceAll('/', '').toLowerCase();
+				});
+				if (!recCnt) {
+					if (receiveData.sta_PowerPercent<=20) { 
+						uni.showModal({
+							title: "提示",
+							content: "设备电量低",
+							showCancel: false
+						});
+					}
+				}
+		} catch (error) {
+			receiveData = {};
+			 console.log("文本解析失败",error)
+		}
+		return receiveData;
+		
+	}
+	
+	
 
 }
 

utils/Common.js

@@ -280,5 +280,33 @@ export default {
 			}
 		}
 		return arr;
+	},
+	//10进制转换为16进制字符串
+	decimalToHexLittleEndian(num, byteCount,revers) {
+	    // 处理负数（如果需要支持负数，可先转为补码）
+	    if (num < 0) {
+	        num = 0xFFFFFFFF + num + 1;
+	    }
+	    
+	    // 转为16进制，去除前缀0x，转为大写
+	    let hex = num.toString(16).toUpperCase();
+	    
+	    // 计算需要补充的0的数量，确保每个字节占2位
+	    let padLength = (byteCount || Math.ceil(hex.length / 2) * 2) - hex.length;
+	    if (padLength > 0) {
+	        hex = '0'.repeat(padLength) + hex;
+	    }
+	    
+	    // 分割为字节数组（每2位一个字节）
+	    const bytes = [];
+	    for (let i = 0; i < hex.length; i += 2) {
+	        bytes.push(hex.substr(i, 2));
+	    }
+	    
+	    // 是否反转字节顺序（低位在前）并拼接
+		if(revers){
+			return bytes.reverse().join('');
+		}
+	    return bytes.join('');
 	}
 }