diff --git a/App.vue b/App.vue
index 7861e4d..f9538fe 100644
--- a/App.vue
+++ b/App.vue
@@ -27,7 +27,7 @@
// uni.removeStorageSync(val);
// }
// });
- // uni.clearStorageSync();
+ uni.clearStorageSync();
//以上代码仅在开发时使用,否则会出现不可预知的问题。
// #ifdef APP|APP-PLUS
diff --git a/components/TextToHex/textToDotMatrixFor7305.vue b/components/TextToHex/textToDotMatrixFor7305.vue
index 48fbea8..ddf0847 100644
--- a/components/TextToHex/textToDotMatrixFor7305.vue
+++ b/components/TextToHex/textToDotMatrixFor7305.vue
@@ -14,7 +14,7 @@
default: () => [],
validator: (value) => value.every(item => typeof item === 'string')
},
-
+
fontSize: {
type: Number,
default: 16,
@@ -27,6 +27,10 @@
color: {
type: String,
default: "#000000"
+ },
+ maxLength: {
+ type: Number,
+ default: 5
}
},
data() {
@@ -145,13 +149,21 @@
return hexString;
}
- let convertCharToMatrix = (imageData, item) => {
+ let convertCharToMatrix = (imageData) => {
const charWidth = 13;
const charHeight = 13;
const pixels = [];
for (let i = 0; i < imageData.length; i += 4) {
+ // const R = imageData[i];
+ // pixels.push(R < 128 ? 1 : 0);
+
+
const R = imageData[i];
- pixels.push(R < 128 ? 1 : 0);
+ const G = imageData[i + 1];
+ const B = imageData[i + 2];
+ const gray = 0.299 * R + 0.587 * G + 0.114 * B; // 灰度转换
+ pixels.push(gray < 128 ? 1 : 0);
+
}
const lowBytes = new Array(charWidth).fill(0);
@@ -173,11 +185,12 @@
}
let drawTxt = async (textLine) => {
+ debugger;
let result = {};
let ctx = this.ctx;
// 1. 动态调整Canvas尺寸
- this.currentCanvasWidth = 13;
+ this.currentCanvasWidth = 13 * this.maxLength;
this.currentCanvasHeight = 13;
// 2. 清空Canvas（绘制背景）
@@ -191,16 +204,15 @@
ctx.font = `${this.fontSize}px "PingFangBold", "PingFang SC", Arial, sans-serif`;
// 4. 绘制当前行文本
- let currentX = 0;
- let currentY = this.fontSize / 2 + 1;
- for (let j = 0; j < textLine.length; j++) {
- let char = textLine[j];
- ctx.fillText(char, currentX, currentY);
- // 按实际字符宽度计算间距
- let charWidth = ctx.measureText(char).width;
- currentX += charWidth;
- }
+ debugger;
+
+ let currentX =(this.maxLength - textLine.length) * this.fontSize / 2;
+
+
+ let currentY = this.fontSize / 2 + 1;
+ ctx.fillText(textLine, currentX, currentY);
+
// 5. 异步绘制并获取像素数据（串行处理避免冲突）
await new Promise((resolve, reject) => {
ctx.draw(false, () => {
@@ -212,11 +224,14 @@
width: this.currentCanvasWidth,
height: this.currentCanvasHeight,
success: res => {
+ debugger;
result = {
line: textLine,
pixelData: res.data,
- width: this.currentCanvasWidth,
- height: this.currentCanvasHeight
+ width: this
+ .currentCanvasWidth,
+ height: this
+ .currentCanvasHeight
};
resolve();
},
@@ -234,15 +249,34 @@
let arr = [];
// 循环处理每行文本
for (let i = 0; i < this.validTxts.length; i++) {
-
+ debugger;
let linePixls = [];
let item = this.validTxts[i];
- // console.log("item=", item);
- for (var j = 0; j < item.length; j++) {
- let result = await drawTxt(item[j]);
- linePixls.push(convertCharToMatrix(result.pixelData, item));
+ let res = await drawTxt(item);
+ let rawData= res.pixelData;
+
+
+ let result = [[], [], [], [], []];
+
+
+
+ for (let char = 0; char < 5; char++) {
+ for (let row = 0; row < 13; row++) {
+ let start = row * (5 * 52) + char * 52 + 1;
+ let end = start + 51;
+
+ for (let i = 0; i < 52; i++) {
+ result[char].push(rawData[start + i]);
+ }
+
+ }
}
- // console.log("hexs=", linePixls.join(","));
+ debugger;
+ for (var j = 0; j < result.length; j++) {
+
+ linePixls.push(convertCharToMatrix(result[j]));
+ }
+
arr.push(linePixls);
}
diff --git a/pages/6155/BJQ6155.vue b/pages/6155/BJQ6155.vue
index 5cab1a7..6c788e6 100644
--- a/pages/6155/BJQ6155.vue
+++ b/pages/6155/BJQ6155.vue
@@ -75,7 +75,7 @@
+ class="custom-slider" />
@@ -129,17 +129,17 @@
单位：
-
部门：
-
姓名：
-
@@ -286,7 +286,7 @@
light: null,
bleStatu: ''
},
- inteval: 80,
+ inteval: 150,
device: {
id: "",
deviceName: "",
@@ -426,15 +426,15 @@
},
onShow() {
this.Status.pageHide = false;
-
- let f=this.getDevice();
- if(f){
- these.formData.bleStatu = 'connecting';
- ble.LinkBlue(f.deviceId, f.writeServiceId, f.wirteCharactId, f.notifyCharactId).then(res => {
- console.log("连接成功")
- these.formData.bleStatu = true;
- });
- }
+
+ let f = this.getDevice();
+ if (f) {
+ these.formData.bleStatu = 'connecting';
+ ble.LinkBlue(f.deviceId, f.writeServiceId, f.wirteCharactId, f.notifyCharactId).then(res => {
+ console.log("连接成功")
+ these.formData.bleStatu = true;
+ });
+ }
},
onBackPress(e) {
@@ -594,9 +594,9 @@
// return;
// }
if (res.deviceId == these.formData.deviceId) {
- if(res.device){
+ if (res.device) {
these.formData.bleStatu = 'connecting';
- }else{
+ } else {
this.formData.bleStatu = false;
}
setTimeout(() => {
@@ -768,14 +768,14 @@
these.showBleUnConnect();
return;
}
-
+ let os = plus.os.name;
// 分包发送图片数据
var sendImagePackets = function(ReSendNo) {
return new Promise((resolve, reject) => {
// 总数据包数
- let totalPackets = 52;
+ let totalPackets = os=='Android'?52:200;
let currentPacket = 1;
if (ReSendNo) {
@@ -794,19 +794,20 @@
message: "上传成功",
iconUrl: "/static/images/common/success.png",
});
-
- setTimeout(()=>{
- ble.sendString(f.deviceId, "transmit complete", f.writeServiceId, f
- .wirteCharactId);
- },1000);
-
+
+ setTimeout(() => {
+ ble.sendString(f.deviceId, "transmit complete", f
+ .writeServiceId, f
+ .wirteCharactId);
+ }, 1000);
+
these.rgb565Data = null;
resolve();
return;
}
// 计算当前包的数据
- let packetSize = 250;
+ let packetSize = os == 'Android' ? 250 : 64;
// if (currentPacket <= 51) {
// packetSize = 250; // 前51个包每个500字节
// } else {
@@ -814,77 +815,59 @@
// }
// 创建数据包
- const startIndex = (currentPacket - 1) * packetSize;
- const endIndex = Math.min(startIndex + packetSize, these.rgb565Data
+ let startIndex = (currentPacket - 1) * packetSize;
+ let endIndex = Math.min(startIndex + packetSize, these.rgb565Data
.length);
if (startIndex > endIndex) {
return;
}
- const packetData = these.rgb565Data.slice(startIndex,
+ let packetData = these.rgb565Data.slice(startIndex,
endIndex);
// 构建数据包
- const bufferSize = 505; // 5 + packetData.length * 2; // 头部5字节 + 数据部分
- const buffer = new ArrayBuffer(bufferSize);
- const dataView = new DataView(buffer);
+ let bufferSize = os == 'Android' ? 505 :133; // 5 + packetData.length * 2; // 头部5字节 + 数据部分
+ let buffer = new ArrayBuffer(bufferSize);
+ let dataView = new DataView(buffer);
// 填充头部
- dataView.setUint8(0, 0x55); // 帧头
+ dataView.setUint8(0, os == 'Android' ? 0x55 : 0x56); // 帧头
dataView.setUint8(1, 0x02); // 帧类型：开机画面
- dataView.setUint8(2, '0x' + currentPacket.toString(16).padStart(2,
- '0')); // 包序号
-
-
- if (packetData.length == 250) {
- dataView.setUint8(3, 0x01);
- dataView.setUint8(4, 0xF4);
- } else {
- dataView.setUint8(3, 0x00);
- dataView.setUint8(4, 0x64);
- }
-
+ dataView.setUint8(2, currentPacket); // 包序号
+ dataView.setUint16(3, packetData.length*2,false);
+
// 填充数据（每个RGB565值占2字节）
for (let i = 0; i < packetData.length; i++) {
dataView.setUint16(5 + i * 2, packetData[i], false); // 大端字节序
}
- if (currentPacket > 51) { //第52包补FF
- for (var i = 105; i < bufferSize; i++) {
- dataView.setUint8(i, 0xFF);
- }
- }
-
-
-
//发送数据包
ble.sendData(f.deviceId, buffer, f.writeServiceId, f.wirteCharactId,
- 10)
- .then(() => {
+ 10).then(() => {
- updateLoading(these, {
- text: "正在发送:" + currentPacket + "/" +
- totalPackets
- })
- currentPacket++;
+ updateLoading(these, {
+ text: "正在发送:" + currentPacket + "/" +
+ totalPackets
+ })
+ currentPacket++;
+ setTimeout(sendNextPacket,os=='Android'? these.inteval:these.inteval/2);
+ }).catch(err => {
+ console.log("发送数据包失败了" + JSON.stringify(err));
+ if (err.code == '10007') {
setTimeout(sendNextPacket, these.inteval);
- }).catch(err => {
- console.log("发送数据包失败了" + JSON.stringify(err));
- if (err.code == '10007') {
- setTimeout(sendNextPacket, these.inteval);
- return;
- }
- these.Status.BottomMenu.show = false;
- these.showPop({
- message: err.msg,
- iconUrl: "/static/images/6155/DeviceDetail/uploadErr.png",
- borderColor: "#e034344d",
- buttonBgColor: "#E03434",
- });
- hideLoading(these);
- these.rgb565Data = null;
- reject(err);
+ return;
+ }
+ these.Status.BottomMenu.show = false;
+ these.showPop({
+ message: err.msg,
+ iconUrl: "/static/images/6155/DeviceDetail/uploadErr.png",
+ borderColor: "#e034344d",
+ buttonBgColor: "#E03434",
});
+ hideLoading(these);
+ these.rgb565Data = null;
+ reject(err);
+ });
}
if (ReSendNo) {
@@ -923,7 +906,7 @@
ImgCutOver: function(data) {
showLoading(these, {
- text: "正在发送0/52"
+ text: "正在发送..."
});
console.log("data=", data);
these.Status.BottomMenu.show = false;
@@ -964,6 +947,8 @@
})
return;
}
+ let os=plus.os.name;
+ // os='Android';
let f = these.getDevice();
if (!f) {
@@ -983,7 +968,7 @@
return new Promise((resolve, reject) => {
if (f) {
// 总数据包数
- var totalPackets = 1536; //36;
+ var totalPackets =os=='Android' ? 1536 : 6000; //36;
let currentPacket = 1;
console.log("发送数据准备中,总共" + totalPackets);
@@ -996,27 +981,30 @@
const sendNextVideoPacket = () => {
// console.log("准备发送一段数据");
if (currentPacket > totalPackets) {
+ updateLoading(these,{text:'发送完毕,正在处理'})
if (!ReSendNo) {
setTimeout(() => {
-
- ble.sendString(f.deviceId, "transmit complete", f
- .writeServiceId, f.wirteCharactId, 20)
+
+ ble.sendString(f.deviceId, "transmit complete", f.writeServiceId, f.wirteCharactId, 20)
.then(
() => {
console.log("全部发送完毕")
+
+ hideLoading(these);
+ these.showPop({
+ showPop: true,
+ message: "上传成功",
+ iconUrl: "/static/images/common/success.png"
+ });
+
}).catch((ex) => {
console.log("出现异常", ex);
});
- }, 500);
+ }, os=='Android'?500:15000);
}
these.Status.BottomMenu.show = false;
- hideLoading(these);
- these.showPop({
- showPop: true,
- message: "上传成功",
- iconUrl: "/static/images/common/success.png"
- });
+
these.videoHexArray = null;
resolve();
@@ -1024,7 +1012,7 @@
}
// 计算当前包的数据
- let packetSize = 500;
+ let packetSize =os=='Android'? 500:128;
// 创建数据包
@@ -1040,33 +1028,28 @@
// 构建数据包
////console.log("packetData.length"+packetData.length);
- const bufferSize = 504; // 头部5字节 + 数据部分
+ const bufferSize =packetSize+4; // 头部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(0, os=='Android'?0x55:0x56); // 帧头
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);
-
+ dataView.setUint16(2, currentPacket,false); // 包序号
+
for (let i = 0; i < packetData.length; i++) {
- dataView.setUint8(4 + i, '0x' + packetData[i]);
+ dataView.setUint8(4 + i, parseInt(packetData[i],16));
}
- let inteval = 40;
+ let inteval = os=='Android'? 100:40;
ble.sendData(f.deviceId, buffer, f.writeServiceId, f
.wirteCharactId, 10).then(() => {
-
+
updateLoading(these, {
- text: "正在发送:" + currentPacket + "/" +
- totalPackets
+ text: "正在发送:" +currentPacket+'/'+totalPackets
})
currentPacket++;
@@ -1078,7 +1061,7 @@
if (err.code == '10007') { //遇到这个错误自动重新发送
console.log(err.errMsg + ",发送失败了,正在补偿：" +
currentPacket);
- setTimeout(sendNextVideoPacket, inteval);
+ setTimeout(sendNextVideoPacket, 500);
} else {
these.Status.BottomMenu.show = false;
hideLoading(these);
@@ -1192,7 +1175,7 @@
if (res.data) {
these.videoHexArray = res.data;
updateLoading(these, {
- text: "正在发送:0/1536"
+ text: "正在发送..."
});
these.Status.BottomMenu.show = false;
@@ -1236,7 +1219,7 @@
}).catch((ex1) => {
//console.log("出现了异常", ex1)
}).finally(() => {
- hideLoading(these);
+
});
}
@@ -1592,7 +1575,7 @@
let err = false;
this.formData.textLines.find((txt) => {
- if (txt.length === 0 || txt.length > 7) {
+ if (txt.length === 0 || txt.length > 8) {
console.log("txt=", txt);
err = true;
return true;
@@ -1601,7 +1584,7 @@
})
if (err) {
this.showPop({
- message: "单位、部门、姓名必须填写且最多7字",
+ message: "单位、部门、姓名必须填写且最多8字",
iconUrl: "/static/images/6155/DeviceDetail/uploadErr.png",
borderColor: "#e034344d",
buttonBgColor: "#E03434",
@@ -1656,11 +1639,12 @@
linePixels.push(0x00);
}
- linePixels = [0xFA, 0x06, 0x03, i + 1].concat(linePixels);
+ combinedData.push([0xFA, 0x06, i + 1, 1].concat(linePixels.slice(0, 128)));
+ combinedData.push([0xFA, 0x06, i + 1, 2].concat(linePixels.slice(128, 256)));
+
+
- linePixels.push(0xFF)
- combinedData.push(linePixels);
}
combinedData.push([0x74, 0x72, 0x61, 0x6E, 0x73, 0x6D, 0x69, 0x74, 0x20, 0x63, 0x6F, 0x6D,
0x70, 0x6C, 0x65, 0x74, 0x65
@@ -1712,11 +1696,11 @@
text: '正在发送' + curr + '/' + len
});
curr++;
- setTimeout(sendPacket, 150);
+ setTimeout(sendPacket, 300);
}).catch(err => {
if (err.code == '10007') {
- setTimeout(sendPacket, 150);
+ setTimeout(sendPacket, 300);
} else {
console.log("err:", err);
hideLoading(these);
@@ -1750,6 +1734,7 @@
setTimeout(() => {
Promise.allSettled([holdHand(), drawText()]).then(results => {
+ console.log("results=", results)
if (results[0].status == 'rejected') {
updateLoading(these, {
text: results[0].reason
diff --git a/pages/6170/deviceControl/index.vue b/pages/6170/deviceControl/index.vue
index 36b73b9..3552f41 100644
--- a/pages/6170/deviceControl/index.vue
+++ b/pages/6170/deviceControl/index.vue
@@ -52,9 +52,9 @@
{{ deviceInfo.onlineStatus === 0 ? '离线' : deviceInfo.onlineStatus === 2 ? '故障' : '在线' }}
-
+
蓝牙状态
-
+
{{getbleStatu}}
@@ -404,7 +404,8 @@
},
Status: {
pageHide: null
- }
+ },
+ inteval: 120
}
},
computed: {
@@ -432,20 +433,48 @@
}
},
methods: {
+ bleStatuToggle() {
+ let f = this.getDevice();
+ if (!f) {
+ this.showBleUnConnect();
+ return;
+ }
+ if (this.formData.bleStatu === true) {
+ this.formData.bleStatu = 'dicconnect';
+ ble.disconnectDevice(f.deviceId).finally(r => {
+ this.formData.bleStatu = false;
+ });
+ return;
+ }
+
+ if (this.formData.bleStatu === false || this.formData.bleStatu === 'err') {
+ these.formData.bleStatu = 'connecting';
+ ble.LinkBlue(f.deviceId, f.writeServiceId, f.wirteCharactId, f.notifyCharactId).then(res => {
+ these.formData.bleStatu = true;
+ }).catch(ex => {
+ these.formData.bleStatu = 'err';
+ });
+ return;
+ }
+
+
+ },
getDevice: function() {
+ if (ble) {
+ console.log("LinkedList=", ble.data.LinkedList);
+ console.log("this.device=", this.itemInfo);
+ let f = ble.data.LinkedList.find((v) => {
+ if (v.macAddress == this.itemInfo.deviceMac) {
+ if (!this.formData.deviceId) {
+ this.formData.deviceId = v.deviceId
+ };
+ return true;
+ }
+ });
- console.log("LinkedList=", ble.data.LinkedList);
- console.log("this.device=", this.device);
- let f = ble.data.LinkedList.find((v) => {
- if (v.macAddress == this.itemInfo.deviceMac) {
- if (!this.formData.deviceId) {
- this.formData.deviceId = v.deviceId
- };
- return true;
- }
- });
-
- return f;
+ return f;
+ }
+ return null;
},
initBle() {
if (this.itemInfo.deviceMac) {
@@ -1259,9 +1288,11 @@
});
}
- setTimeout(function() {
+ setTimeout(()=> {
sendImagePackets().catch(() => {
+ }).finally(()=>{
+ this.lightModeB=false;
});
}, 0)
}
@@ -1938,12 +1969,13 @@
},
onShow() {
+ debugger;
let f = this.getDevice();
if (f) {
- these.formData.bleStatu = 'connecting';
+ this.formData.bleStatu = 'connecting';
ble.LinkBlue(f.deviceId, f.writeServiceId, f.wirteCharactId, f.notifyCharactId).then(res => {
console.log("连接成功")
- these.formData.bleStatu = true;
+ this.formData.bleStatu = true;
});
}
},
diff --git a/pages/7305/BJQ7305.vue b/pages/7305/BJQ7305.vue
index efcb034..6c4481c 100644
--- a/pages/7305/BJQ7305.vue
+++ b/pages/7305/BJQ7305.vue
@@ -114,20 +114,20 @@
发送
+ :bgColor="'#FFFFFF'" :color="'#000000'" :fontSize="13" />
单位：
-
+
部门：
-
+
姓名：
-
+
@@ -272,9 +272,10 @@
liangDu: '100',
id: '',
deviceId: '',
- textLines: ['', '', ''],
+ textLines: [],
mode: '',
- bleStatu: ''
+ bleStatu: '',
+ inputLines:[]
},
inteval: 500,
device: {
@@ -1195,8 +1196,9 @@ debugger;
these.showBleUnConnect()
return;
}
+ debugger;
let err = false;
- this.formData.textLines.find((txt) => {
+ this.formData.inputLines.find((txt) => {
if (txt.length === 0 || txt.length > 5) {
console.log("txt=", txt);
err = true;
@@ -1213,12 +1215,16 @@ debugger;
});
return;
}
+
+
+ this.formData.textLines=[this.formData.inputLines[0],this.formData.inputLines[1],this.formData.inputLines[2]];
+
showLoading(these, {
- text: "请稍候..."
+ text: "发送中..."
});
this.setBleFormData();
let task = async () => {
- var sendTxtPackge = (rgbdata, type, str) => {
+ var sendTxtPackge = (rgbdata, type, str,index) => {
var promise = new Promise((resolve, reject) => {
try {
@@ -1261,7 +1267,7 @@ debugger;
.toString(16).padStart(2, '0'));
console.log(`发送数据块 ${chunkIndex + 1}/${numChunks}:`, hexArray
.join(' '));
-
+ updateLoading(these,{text:'正在发送'+((index-1)*14+chunkIndex + 1)+'/42'})
ble.sendData(f.deviceId, chunk, f.writeServiceId, f
.wirteCharactId, 100).then(() => {
chunkIndex++;
@@ -1318,7 +1324,7 @@ debugger;
try {
// console.log("1111");
- await sendTxtPackge(rgb, h3dic[i], str);
+ await sendTxtPackge(rgb, h3dic[i], str,i+1);
// console.log("222222");
} catch (ex) {
flag = false;
@@ -1371,9 +1377,9 @@ debugger;
res = res.data;
let personnelInfo = res.personnelInfo;
if (personnelInfo) {
- these.formData.textLines[2] = personnelInfo.unitName;
- these.formData.textLines[1] = personnelInfo.name;
- these.formData.textLines[0] = personnelInfo.position;
+ these.formData.inputLines[2] = personnelInfo.unitName;
+ these.formData.inputLines[1] = personnelInfo.name;
+ these.formData.inputLines[0] = personnelInfo.position;
}
}
diff --git a/pages/common/addBLE/addEquip.vue b/pages/common/addBLE/addEquip.vue
index fe24c19..5606d56 100644
--- a/pages/common/addBLE/addEquip.vue
+++ b/pages/common/addBLE/addEquip.vue
@@ -336,6 +336,21 @@
these.showOpenSetting();
}, pagePath);
+
+ //蓝牙恢复可用的回调
+ ble.addStateRecoveryCallback(res=>{
+ if (these.Status.isPageHidden) {
+ return;
+ }
+ these.Status.BottomMenu.show = false;
+ these.PairEquip = [];
+ these.EquipMents = [];
+ uni.showToast({
+ icon: 'fail',
+ title: '蓝牙恢复可用'
+ });
+ these.refreshBleList();
+ }),pagePath;
//蓝牙断开连接的回调
ble.addDisposeCallback(res => {
diff --git a/pages/common/login/index.vue b/pages/common/login/index.vue
index 546e8c9..54c97b8 100644
--- a/pages/common/login/index.vue
+++ b/pages/common/login/index.vue
@@ -106,6 +106,18 @@
}
}
+ let appid='';
+ // #ifdef APP|APP-PLUS
+ appid = plus.runtime.appid;
+ // #endif
+ // #ifdef WEB
+ appid='HBuilder';
+ // #endif
+ if (appid === 'HBuilder') {
+ this.phone='17671332251';
+ this.password='123456';
+ this.isChecked=true;
+ }
},
methods: {
diff --git a/utils/BleHelper.js b/utils/BleHelper.js
index cc90d94..7c0c55b 100644
--- a/utils/BleHelper.js
+++ b/utils/BleHelper.js
@@ -448,9 +448,9 @@ class BleHelper {
}
getError(ex) {
-
- ex.msg =ex.code+':'+ ex.errMsg;
-
+
+ ex.msg = ex.code + ':' + ex.errMsg;
+
let f = this.dic.errRemarks.find((v) => {
return v.key == ex.code;
});
@@ -750,10 +750,10 @@ class BleHelper {
-1)
}
}
-
- let sta_imei=receivJson["sta_imei"];
- if(sta_imei){
- v.imei=sta_imei;
+
+ let sta_imei = receivJson["sta_imei"];
+ if (sta_imei) {
+ v.imei = sta_imei;
}
isUpdate = true;
@@ -1637,7 +1637,7 @@ class BleHelper {
if (fIndex > -1) {
this.data.LinkedList[fIndex].Linked = true;
this.data.LinkedList[fIndex].linkId =
- linkId;
+ linkId;
} else {
this.data.LinkedList.push(cr);
}
@@ -1852,7 +1852,7 @@ class BleHelper {
}
//向蓝牙设备发送一个字符串的ASCII码
- sendString(deviceid, str, writeServiceId, wirteCharactId, ms) {
+ sendString(deviceid, str, writeServiceId, wirteCharactId, ms, iosIsChuck, chunkSize) {
if (str && typeof(str) == 'object') {
str = JSON.stringify(str);
}
@@ -1876,7 +1876,7 @@ class BleHelper {
}
//向蓝牙设备发送一个16进制的数组数据
- sendHexs(deviceid, array, writeServiceId, wirteCharactId, ms) {
+ sendHexs(deviceid, array, writeServiceId, wirteCharactId, ms, iosIsChuck, chunkSize) {
if (array && array.length) {
let bufferSize = array.length;
let buffer = new ArrayBuffer(bufferSize);
@@ -1885,7 +1885,7 @@ class BleHelper {
dataView.setUint8(i, array[i]);
}
- return this.sendData(deviceid, buffer, writeServiceId, wirteCharactId, ms);
+ return this.sendData(deviceid, buffer, writeServiceId, wirteCharactId, ms, iosIsChuck, chunkSize);
} else {
return Promise.resolve({
@@ -1896,33 +1896,33 @@ class BleHelper {
}
//向蓝牙设备发送数据，如果没连接将自动连接后再发
- sendData(deviceid, buffer, writeServiceId, wirteCharactId, ms) {
+ sendData(deviceid, buffer, writeServiceId, wirteCharactId, ms, iosIsChuck, chunkSize) {
if (this.data.platform == 'web') {
return Promise.resolve("h5平台默认成功");
}
// 打印发送的蓝牙指令
- let bufferHex = '';
- if (buffer) {
- let bytes = [];
- // 处理不同类型的buffer（ArrayBuffer、Uint8Array等）
- if (buffer instanceof ArrayBuffer) {
- let dataView = new DataView(buffer);
- for (let i = 0; i < buffer.byteLength; i++) {
- bytes.push(dataView.getUint8(i));
- }
- } else if (buffer.byteLength !== undefined) {
- // 如果是 Uint8Array 或其他类型
- for (let i = 0; i < buffer.byteLength; i++) {
- bytes.push(buffer[i] || 0);
- }
- } else if (Array.isArray(buffer)) {
- bytes = buffer;
- }
- if (bytes.length > 0) {
- bufferHex = bytes.map(b => '0x' + b.toString(16).padStart(2, '0').toUpperCase()).join(' ');
- }
- }
+ // let bufferHex = '';
+ // if (buffer) {
+ // let bytes = [];
+ // // 处理不同类型的buffer（ArrayBuffer、Uint8Array等）
+ // if (buffer instanceof ArrayBuffer) {
+ // let dataView = new DataView(buffer);
+ // for (let i = 0; i < buffer.byteLength; i++) {
+ // bytes.push(dataView.getUint8(i));
+ // }
+ // } else if (buffer.byteLength !== undefined) {
+ // // 如果是 Uint8Array 或其他类型
+ // for (let i = 0; i < buffer.byteLength; i++) {
+ // bytes.push(buffer[i] || 0);
+ // }
+ // } else if (Array.isArray(buffer)) {
+ // bytes = buffer;
+ // }
+ // if (bytes.length > 0) {
+ // bufferHex = bytes.map(b => '0x' + b.toString(16).padStart(2, '0').toUpperCase()).join(' ');
+ // }
+ // }
// console.log("准备发送蓝牙指令 - deviceId:", deviceid, "writeServiceId:", writeServiceId, "writeCharactId:", wirteCharactId);
// console.log("发送数据(Hex):", bufferHex || "(空数据)");
// console.log("发送数据(原始buffer长度):", buffer ? (buffer.byteLength || buffer.length || 0) : 0);
@@ -1952,9 +1952,11 @@ class BleHelper {
+
let sendBuffer = () => {
- return new Promise(async (resolve, reject) => {
+ return new Promise((resolve, reject) => {
+ let os = plus.os.name;
var promise = new Promise((succ, err) => {
if (!c) {
@@ -1963,31 +1965,128 @@ class BleHelper {
})); //没有找到指定设备
return;
}
- // console.log("device=", device);
- uni.writeBLECharacteristicValue({
- deviceId: device.deviceId,
- serviceId: device.writeServiceId,
- characteristicId: device.wirteCharactId,
- value: buffer,
- writeType: 'write',
- success: () => {
- console.log("✓ 蓝牙指令发送成功 - deviceId:", device
- .deviceId);
- succ();
- },
- fail: (ex) => {
- ex = this.getError(ex);
- console.error("✗ 蓝牙指令发送失败 - deviceId:", device
- .deviceId, "错误:", ex);
+ let sendPacket = (data) => {
+ return new Promise((_succ, _err) => {
+ uni.writeBLECharacteristicValue({
+ deviceId: device.deviceId,
+ serviceId: device.writeServiceId,
+ characteristicId: device.wirteCharactId,
+ value: data,
+ writeType: 'write',
+ success: () => {
+ // console.log("✓ 蓝牙指令发送成功 - deviceId:",device.deviceId);
+ _succ();
+ },
+ fail: (ex) => {
+ ex = this.getError(ex);
+ console.error("✗ 蓝牙指令发送失败 - deviceId:",device.deviceId, "错误:", ex);
- err(ex);
+ _err(ex);
+ }
+ });
+ });
+
+ }
+ if (os === 'iOS' && iosIsChuck) {
+ console.error("正在分包发送");
+ let splitArrayBuffer = (buffer) => {
+ if (!chunkSize) {
+ chunkSize = 150;
+ }
+ const chunks = [];
+ const uint8Array = new Uint8Array(buffer);
+
+ for (let i = 0; i < uint8Array.length; i += chunkSize) {
+ const end = Math.min(i + chunkSize, uint8Array.length);
+ const chunk = uint8Array.slice(i, end).buffer;
+ chunks.push(chunk);
+ }
+
+ return chunks;
}
- });
+
+ let arrs = splitArrayBuffer(buffer);
+ console.error("分包数量", arrs.length);
+ // 如果数据块数量小于2，直接发送原始数据或第一个数据块
+ if (arrs.length < 2) {
+ return sendPacket(buffer).then(resolve).catch(reject);
+ }
+
+ // 多块数据需要按顺序发送
+ let index = 0;
+
+ const sendNext = () => {
+ return new Promise((_resolve, _reject) => {
+ console.log("正在发送分包" + index);
+
+ if (index >= arrs.length) {
+ return _resolve();
+ }
+
+
+
+ Promise.race([this.timeOut(ms), sendPacket(arrs[
+ index])]).then((
+ result) => {
+ console.log(
+ `✗ 第${index + 1}/${arrs.length}个数据包发送成功`
+ );
+ index++;
+ if (index < arrs.length) {
+ // iOS平台需要延迟发送，避免数据包发送过快
+ return new Promise(resolve1 => {
+ setTimeout(() => {
+ resolve1(
+ sendNext()
+ );
+ },
+ 20
+ ); // 20ms延迟，可根据需要调整
+ });
+ }
+ _resolve(result);
+ }).catch((ex) => {
+ // console.error("ex=", ex);
+ if (ex.code == -1) {
+ console.log(
+ `✗ 第${index + 1}/${arrs.length}个数据包发送成功`
+ );
+ index++;
+ if (index < arrs.length) {
+ // iOS平台需要延迟发送，避免数据包发送过快
+ return new Promise(resolve1 => {
+ setTimeout(() => {
+ resolve1
+ (
+ sendNext()
+ );
+ },
+ 20
+ ); // 20ms延迟，可根据需要调整
+ });
+ }
+ _resolve(ex);
+ } else {
+ console.error(
+ `✗ 第${index + 1}/${arrs.length}个数据包发送失败:`,
+ error);
+ _reject(ex);
+ }
+
+ });
+
+ });
+ };
+
+ return sendNext();
+ } else {
+
+ return sendPacket(buffer).then(resolve).catch(reject);
+ }
+
+
});
- if (plus.os.name == 'iOS') {
-
-
-
+ if (os == 'iOS') {
Promise.race([this.timeOut(ms), promise]).then(resolve).catch((ex) => {
// console.error("ex=", ex);
if (ex.code == -1) {