|
@@ -272,7 +272,7 @@ Page({
|
|
|
return;
|
|
|
}
|
|
|
if (v) {
|
|
|
- let device = that.data.deviceList[0];
|
|
|
+ var device = that.data.deviceList[0];
|
|
|
console.log("开始连接设备0", device);
|
|
|
if (device.state === 'online' || device.connectType != 1) {
|
|
|
return;
|
|
@@ -280,11 +280,11 @@ Page({
|
|
|
// });
|
|
|
BtHelper.getInstance().connect(device, function (isConnected, d) {
|
|
|
if (isConnected) {
|
|
|
- d.connectType = 1;
|
|
|
- d.state = 'online';
|
|
|
- d.imageUrl = device.img;
|
|
|
- that.addBlueDevice(d);
|
|
|
+ device.state = 'online';
|
|
|
+ } else {
|
|
|
+ device.state = 'offline';
|
|
|
}
|
|
|
+ that.addBlueDevice(device);
|
|
|
});
|
|
|
|
|
|
} else {
|
|
@@ -578,7 +578,8 @@ Page({
|
|
|
device.name = device.devName;
|
|
|
BtHelper.getInstance().connect(device, function (isConnected, d) {
|
|
|
if (isConnected) {
|
|
|
- that.addBlueDevice(d);
|
|
|
+ device.state = "online";
|
|
|
+ that.addBlueDevice(device);
|
|
|
}
|
|
|
});
|
|
|
} else {
|