Merge branch 'main' of http://47.107.152.87:3000/dyf/APP

pages/6155/deviceDetail.vue

@@ -1091,7 +1091,7 @@
 									dataView.setUint8(packetSize - 1, 0xFF);
 								}
 								let inteval = parseInt(this.inteval ? this.inteval : 80);
-
+								console.log(inteval, 'intevalinteval');
 								ble.sendData(f.deviceId, buffer, f.writeServiceId, f
 									.wirteCharactId).then(() => {
 									if (ReSendNo) {
@@ -1156,7 +1156,8 @@
 						const platform = systemInfo.platform;
 						const isIOS = platform === 'ios';
 
-						console.log("平台:", platform, "uni.chooseVideo返回 - 宽度:", width, "高度:", height, "时长:", duration);
+						console.log("平台:", platform, "uni.chooseVideo返回 - 宽度:", width, "高度:", height,
+							"时长:", duration);
 
 						// iOS特殊处理：如果返回的是80*40，很可能是160*80的一半（iOS的bug）
 						if (isIOS && width === 80 && height === 40) {
@@ -1580,8 +1581,9 @@
 
 									dataView.setUint8(bufferSize - 1, 0xFF);
 
-									let inteval = parseInt(this.inteval ? this.inteval : 50);
-									console.log("inteval=", inteval)
+									let inteval = 100;
+									//parseInt(this.inteval ? this.inteval : 80);
+									//console.log("inteval=", inteval)
 									ble.sendData(f.deviceId, buffer, f.writeServiceId, f
 										.wirteCharactId, 30).then(() => {