|
@@ -90,9 +90,9 @@ class bleManager {
|
|
if (that.callBackConnect != null) {
|
|
if (that.callBackConnect != null) {
|
|
for (var i = 0; i < res.devices.length; i++) {
|
|
for (var i = 0; i < res.devices.length; i++) {
|
|
var temp = res.devices[i];
|
|
var temp = res.devices[i];
|
|
- if (temp.name == "MW-SR1(4G_WIFI)") {
|
|
|
|
- console.log("gadsfqewrqewrqwerqrqr==111==" + JSON.stringify(res.devices[i]));
|
|
|
|
- }
|
|
|
|
|
|
+// if (temp.name == "MW-SR1(4G_WIFI)") {
|
|
|
|
+// console.log("gadsfqewrqewrqwerqrqr==111==" + JSON.stringify(res.devices[i]));
|
|
|
|
+// }
|
|
if (that.connectWillDevice != null && temp.name == that.connectWillDevice.clientType) {
|
|
if (that.connectWillDevice != null && temp.name == that.connectWillDevice.clientType) {
|
|
temp.mac = temp.advertisData ? that.buf2hex(temp.advertisData) : '';
|
|
temp.mac = temp.advertisData ? that.buf2hex(temp.advertisData) : '';
|
|
if (that.callBackConnect != null) {
|
|
if (that.callBackConnect != null) {
|
|
@@ -210,9 +210,9 @@ class bleManager {
|
|
var has = false;
|
|
var has = false;
|
|
for (var j = 0; j < that.compareList.length; j++) {
|
|
for (var j = 0; j < that.compareList.length; j++) {
|
|
if (res.devices[i].name != "") {
|
|
if (res.devices[i].name != "") {
|
|
- if (res.devices[i].name == "MW-SR1(4G_WIFI)") {
|
|
|
|
- console.log("gadsfqewrqewrqwerqrqr==000==" + JSON.stringify(res.devices[i]));
|
|
|
|
- }
|
|
|
|
|
|
+// if (res.devices[i].name == "MW-SR1(4G_WIFI)") {
|
|
|
|
+// console.log("gadsfqewrqewrqwerqrqr==000==" + JSON.stringify(res.devices[i]));
|
|
|
|
+// }
|
|
if (res.devices[i].deviceId == that.compareList[j].deviceId) {
|
|
if (res.devices[i].deviceId == that.compareList[j].deviceId) {
|
|
has = true;
|
|
has = true;
|
|
break;
|
|
break;
|