优化蓝牙搜索页面的动画闪烁感,优化从设备页面去匹配蓝牙时给出目标设备的提示
This commit is contained in:
@ -303,12 +303,12 @@
|
||||
|
||||
eventChannel.on('detailData', function(data) {
|
||||
|
||||
console.log("收到父页面的参数:" + JSON.stringify(data));
|
||||
// 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);
|
||||
// console.log("找到设备了", v);
|
||||
these.formData.deviceId = v.deviceId;
|
||||
return true;
|
||||
}
|
||||
@ -591,7 +591,7 @@
|
||||
buttonBgColor: "#E03434",
|
||||
buttonText: '去连接',
|
||||
okCallback: function() {
|
||||
console.log("1111");
|
||||
|
||||
uni.navigateTo({
|
||||
url: "/pages/common/addBLE/addEquip",
|
||||
events: {
|
||||
@ -1157,7 +1157,7 @@
|
||||
if (this.Status.Pop.clickEvt == 'SendUsr') {
|
||||
|
||||
}
|
||||
console.log("1111");
|
||||
|
||||
|
||||
this.Status.Pop.showPop = false;
|
||||
if (this.Status.Pop.okCallback) {
|
||||
@ -1246,14 +1246,14 @@
|
||||
these.setBleFormData();
|
||||
|
||||
|
||||
// let json = {
|
||||
// deviceId: these.device.id,
|
||||
// name: these.formData.company,
|
||||
// position: these.formData.name,
|
||||
// unitName: these.formData.job,
|
||||
// code: these.formData.id
|
||||
// };
|
||||
// usrApi.sendUsr(json)
|
||||
let json = {
|
||||
deviceId: these.device.id,
|
||||
name: these.formData.name,
|
||||
position: these.formData.job,
|
||||
unitName: these.formData.company,
|
||||
code: these.formData.id
|
||||
};
|
||||
usrApi.sendUsr(json)
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user