修改App图标、名称、蓝牙加入断线重连
This commit is contained in:
liub
@ -173,6 +173,11 @@
|
||||
hideLoading,
|
||||
updateLoading
|
||||
} from '@/utils/loading.js'
|
||||
import {request,baseURL} from '../../utils/request';
|
||||
import {
|
||||
registerPersonInfo
|
||||
} from '@/api/6170/deviceControl.js';
|
||||
|
||||
const pagePath = "pages/650/HBY650";
|
||||
var ble = null;
|
||||
var these = null;
|
||||
@ -259,7 +264,26 @@
|
||||
iswarn: false
|
||||
},
|
||||
rgb565Data: [],
|
||||
videoHexArray: []
|
||||
videoHexArray: [],
|
||||
device: {
|
||||
id: "",
|
||||
deviceName: "",
|
||||
deviceImei: "",
|
||||
deviceMac: "",
|
||||
communicationMode: 0,
|
||||
devicePic: "",
|
||||
typeName: "",
|
||||
bluetoothName: null,
|
||||
deviceStatus: null,
|
||||
bindingTime: "",
|
||||
onlineStatus: 0,
|
||||
battery: "0",
|
||||
latitude: null,
|
||||
longitude: null,
|
||||
alarmStatus: null,
|
||||
detailPageUrl: "/pages/650/HBY650",
|
||||
showConfirm: false
|
||||
},
|
||||
}
|
||||
},
|
||||
|
||||
@ -278,7 +302,7 @@
|
||||
|
||||
console.log("收到父页面的参数：" + JSON.stringify(data));
|
||||
var device = data.data;
|
||||
|
||||
these.device=device;
|
||||
let f = ble.data.LinkedList.find((v) => {
|
||||
if (v.macAddress == device.deviceMac) {
|
||||
console.log("找到设备了", v);
|
||||
@ -374,9 +398,9 @@
|
||||
return className;
|
||||
},
|
||||
bleValueNotify: function(receive, device, path) { //订阅消息
|
||||
|
||||
console.log("收到设备的数据", data)
|
||||
let data = recei.ReceiveData(receive, device, pagePath);
|
||||
console.log("收到设备的数据",data)
|
||||
|
||||
if (data) {
|
||||
if ("staBlue_picture" in data) {
|
||||
//重发图片
|
||||
@ -403,10 +427,10 @@ console.log("收到设备的数据",data)
|
||||
let keys = Object.keys(data);
|
||||
for (var i = 0; i < keys.length; i++) {
|
||||
let key = keys[i];
|
||||
if(key in these.formData){
|
||||
these.formData[key] = data[key];
|
||||
if (key in these.formData) {
|
||||
these.formData[key] = data[key];
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
if (these.formData.iswarn) {
|
||||
@ -434,7 +458,7 @@ console.log("收到设备的数据",data)
|
||||
// console.log("LinkedList=", ble.data.LinkedList);
|
||||
// console.log("formData=", these.formData);
|
||||
let f = ble.data.LinkedList.find((v) => {
|
||||
return v.deviceId == these.formData.deviceId;
|
||||
return v.macAddress == these.device.deviceMac;
|
||||
});
|
||||
|
||||
return f;
|
||||
@ -606,11 +630,12 @@ console.log("收到设备的数据",data)
|
||||
iconUrl: "/static/images/6155/DeviceDetail/uploadSuccess.png",
|
||||
});
|
||||
if (!ReSendNo) {
|
||||
setTimeout(()=>{
|
||||
these.HoldYouHand("transmit complete", 0, f.deviceId, f
|
||||
setTimeout(() => {
|
||||
these.HoldYouHand("transmit complete", 0, f
|
||||
.deviceId, f
|
||||
.writeServiceId, f.wirteCharactId);
|
||||
},500);
|
||||
|
||||
}, 500);
|
||||
|
||||
}
|
||||
|
||||
resolve();
|
||||
@ -635,7 +660,7 @@ console.log("收到设备的数据",data)
|
||||
const packetData = these.rgb565Data.slice(startIndex,
|
||||
endIndex);
|
||||
// 构建数据包
|
||||
const bufferSize =505;// 5 + packetData.length * 2; // 头部5字节 + 数据部分
|
||||
const bufferSize = 505; // 5 + packetData.length * 2; // 头部5字节 + 数据部分
|
||||
const buffer = new ArrayBuffer(bufferSize);
|
||||
const dataView = new DataView(buffer);
|
||||
|
||||
@ -771,18 +796,20 @@ console.log("收到设备的数据",data)
|
||||
this.totalPackets = totalPackets;
|
||||
// 发送单个数据包
|
||||
const sendNextVideoPacket = () => {
|
||||
console.log("准备发送一段数据");
|
||||
console.log("准备发送一段数据");
|
||||
if (currentPacket > totalPackets) {
|
||||
if (!ReSendNo) {
|
||||
setTimeout(()=>{
|
||||
these.HoldYouHand("transmit complete", 0, f.deviceId, f
|
||||
.writeServiceId, f.wirteCharactId).then(()=>{
|
||||
setTimeout(() => {
|
||||
these.HoldYouHand("transmit complete", 0, f
|
||||
.deviceId, f
|
||||
.writeServiceId, f.wirteCharactId).then(
|
||||
() => {
|
||||
console.log("全部发送完毕")
|
||||
}).catch((ex)=>{
|
||||
console.log("出现异常",ex);
|
||||
});
|
||||
},500);
|
||||
|
||||
}).catch((ex) => {
|
||||
console.log("出现异常", ex);
|
||||
});
|
||||
}, 500);
|
||||
|
||||
}
|
||||
these.Status.BottomMenu.show = false;
|
||||
hideLoading(these);
|
||||
@ -793,7 +820,7 @@ console.log("收到设备的数据",data)
|
||||
});
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
resolve();
|
||||
|
||||
@ -837,10 +864,10 @@ console.log("收到设备的数据",data)
|
||||
}
|
||||
|
||||
let inteval = 50;
|
||||
console.log("开始发送一段视频"); //
|
||||
console.log("开始发送一段视频"); //
|
||||
ble.sendData(f.deviceId, buffer, f.writeServiceId, f
|
||||
.wirteCharactId, 10).then(() => {
|
||||
|
||||
|
||||
updateLoading(these, {
|
||||
text: "正在发送:" + currentPacket + "/" +
|
||||
totalPackets
|
||||
@ -902,13 +929,28 @@ console.log("收到设备的数据",data)
|
||||
let p1 = these.HoldYouHand("video transmit start", 2200, f.deviceId, f.writeServiceId,
|
||||
f.wirteCharactId);
|
||||
let p2 = new Promise((succ, err) => {
|
||||
|
||||
const token = uni.getStorageSync('token');
|
||||
const clientid = uni.getStorageSync('clientID');
|
||||
if (!token) {
|
||||
err({
|
||||
code: 401,
|
||||
msg: "请先登陆后再试"
|
||||
});
|
||||
hideLoading(these);
|
||||
return;
|
||||
}
|
||||
|
||||
uni.uploadFile({
|
||||
url: 'http://114.55.111.217/video/upload',
|
||||
// url: 'http://114.55.111.217/video/upload',
|
||||
url: baseURL+"app/video/upload",
|
||||
filePath: videoPath,
|
||||
name: 'file',
|
||||
header: {
|
||||
"Method": "POST",
|
||||
"Content-Type": "multipart/form-data"
|
||||
"Content-Type": "multipart/form-data",
|
||||
"Authorization": 'Bearer ' + token,
|
||||
"clientid": clientid
|
||||
},
|
||||
timeout: 600000,
|
||||
fail: (ex) => {
|
||||
@ -1127,14 +1169,15 @@ console.log("收到设备的数据",data)
|
||||
// console.log("currentPacket=",currentPacket);
|
||||
// 发送单个数据包
|
||||
const sendNextPacket = () => {
|
||||
|
||||
|
||||
if (currentPacket > totalPackets) {
|
||||
if (!ReSendNo) {
|
||||
setTimeout(()=>{
|
||||
these.HoldYouHand("transmit complete", 0, f.deviceId, f.writeServiceId, f
|
||||
.wirteCharactId);
|
||||
},500);
|
||||
|
||||
setTimeout(() => {
|
||||
these.HoldYouHand("transmit complete", 0, f.deviceId, f
|
||||
.writeServiceId, f
|
||||
.wirteCharactId);
|
||||
}, 500);
|
||||
|
||||
}
|
||||
|
||||
these.showPop({
|
||||
@ -1155,6 +1198,16 @@ console.log("收到设备的数据",data)
|
||||
visibleClose: true
|
||||
});
|
||||
these.setBleFormData();
|
||||
|
||||
// let formdata = {
|
||||
// code: these.formData.id,
|
||||
// name: these.formData.name,
|
||||
// position: these.formData.job,
|
||||
// unitName: these.formData.company,
|
||||
// deviceId: these.device.id,
|
||||
// deviceImei: these.device.deviceImei
|
||||
// };
|
||||
// registerPersonInfo(formdata);
|
||||
return;
|
||||
}
|
||||
|
||||
@ -1163,7 +1216,7 @@ console.log("收到设备的数据",data)
|
||||
let arr = gbk.encode(text)
|
||||
let gbkData = gbk.arr2hex(arr);
|
||||
|
||||
|
||||
|
||||
// 构建数据包
|
||||
const bufferSize = 5 + gbkData.length / 2; // 头部4字节 + 数据部分
|
||||
const buffer = new ArrayBuffer(bufferSize);
|
||||
@ -1174,7 +1227,7 @@ console.log("收到设备的数据",data)
|
||||
dataView.setUint8(1, 0x03); // 帧类型：文字
|
||||
dataView.setUint8(2, currentPacket.toString(16)); // 包序号
|
||||
dataView.setUint16(3, (text.length * 2).toString(16)); // 数据长度
|
||||
|
||||
|
||||
// 填充数据
|
||||
let index = 0;
|
||||
for (var i = 0; i < gbkData.length; i += 2) {
|
||||
@ -1182,8 +1235,8 @@ console.log("收到设备的数据",data)
|
||||
dataView.setUint8(5 + index, value);
|
||||
index++;
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
// 发送数据包
|
||||
|
||||
|
||||
@ -1219,7 +1272,7 @@ console.log("收到设备的数据",data)
|
||||
}
|
||||
|
||||
|
||||
if(ReSendNo){
|
||||
if (ReSendNo) {
|
||||
sendText(ReSendNo);
|
||||
return;
|
||||
}
|
||||
@ -1261,16 +1314,26 @@ console.log("收到设备的数据",data)
|
||||
}
|
||||
console.log("开始握手");
|
||||
|
||||
ble.sendData(deviceid, buffer, serviceid, characid, 10).then(
|
||||
() => {
|
||||
setTimeout(() => {
|
||||
console.log("握手成功并完成了等待");
|
||||
resolve(true);
|
||||
}, pauseTime);
|
||||
}).catch(err => {
|
||||
console.log("握手没有成功", )
|
||||
reject(err);
|
||||
});
|
||||
let send = () => {
|
||||
ble.sendData(deviceid, buffer, serviceid, characid, 10).then(
|
||||
() => {
|
||||
setTimeout(() => {
|
||||
console.log("握手成功并完成了等待");
|
||||
resolve(true);
|
||||
}, pauseTime);
|
||||
}).catch(err => {
|
||||
if (err.code == 10007) {
|
||||
send();
|
||||
} else {
|
||||
console.log("握手没有成功", err)
|
||||
reject(err);
|
||||
}
|
||||
|
||||
});
|
||||
}
|
||||
|
||||
send();
|
||||
|
||||
|
||||
|
||||
});
|
||||
|
||||
Reference in New Issue
Block a user