feature: 设置设备列表的网络图片

devices/bt_helper.js

@@ -141,18 +141,18 @@ class BtHelper {
         mDevice.volume = volume;
         break;
 
-      ///电量
+        ///电量
       case EnumCmdEvent.battery:
         mDevice.kwh = event.kwh;
         break;
 
-      ///低时延模式  低时延模式开启 1:音乐 , 2: 游戏 , 3: movie
+        ///低时延模式  低时延模式开启 1:音乐 , 2: 游戏 , 3: movie
       case EnumCmdEvent.lowDelayMode:
         mDevice.lowDelayMode = event.lowDelayMode;
         mDevice.lowDelayModeOpen = event.lowDelayModeOpen;
         break;
 
-      ///电量 耳机电量
+        ///电量 耳机电量
       case EnumCmdEvent.batteryEarphone:
         mDevice.kwh = event.kwh;
         mDevice.kwhLeft = event.kwhLeft;
@@ -160,12 +160,12 @@ class BtHelper {
         mDevice.kwhBox = event.kwhBox;
         break;
 
-      ///是否支持TTS
+        ///是否支持TTS
       case EnumCmdEvent.enableTTS:
         mDevice.enableTTS = event.enableTTS;
         break;
 
-      ///切换设备连接模式 0:未知 1：低功耗蓝牙 2：wifi类型 3：经典蓝牙(不做任何操作) 4：4G类型
+        ///切换设备连接模式 0:未知 1：低功耗蓝牙 2：wifi类型 3：经典蓝牙(不做任何操作) 4：4G类型
       case EnumCmdEvent.switchDeviceMode:
         var deviceMode = event.deviceMode.index;
         if (deviceMode != null) {
@@ -174,14 +174,14 @@ class BtHelper {
         }
         break;
 
-      ///4G外插卡  4G虚拟卡 当前使用的sim卡
+        ///4G外插卡  4G虚拟卡 当前使用的sim卡
       case EnumCmdEvent.sim:
         mDevice.sim = event.sim;
         mDevice.eSim = event.eSim;
         mDevice.simIndex = event.simIndex;
         break;
 
-      ///闹钟是否开启  闹钟周期 闹钟唤醒时间
+        ///闹钟是否开启  闹钟周期 闹钟唤醒时间
       case EnumCmdEvent.wake:
         mDevice.wakeSwitch = event.wakeSwitch;
         mDevice.wakeCycle = event.wakeCycle;
@@ -189,14 +189,14 @@ class BtHelper {
         mDevice.wakeMinutes = event.wakeMinutes;
         break;
 
-      ///休眠是否开启 休眠时间
+        ///休眠是否开启 休眠时间
       case EnumCmdEvent.sleep:
         mDevice.sleepSwitch = event.sleepSwitch;
         mDevice.sleepHour = event.sleepHour;
         mDevice.sleepMinutes = event.sleepMinutes;
         break;
 
-      ///版本和型号
+        ///版本和型号
       case EnumCmdEvent.version:
         mDevice.version = event.version;
         var clientType = mDevice.clientType ?? "";
@@ -229,7 +229,7 @@ class BtHelper {
         // }
         break;
 
-      ///云小微授权
+        ///云小微授权
       case EnumCmdEvent.auth:
         var authInfo = event.authInfo;
         mDevice.authInfo = authInfo;
@@ -245,17 +245,17 @@ class BtHelper {
         // });
         break;
 
-      ///EQ音效
+        ///EQ音效
       case EnumCmdEvent.eq:
         mDevice.eqs = event.eqs;
         break;
 
-      ///payId 充流量使用
+        ///payId 充流量使用
       case EnumCmdEvent.payId:
         mDevice.payId = event.payId;
         break;
 
-      ///QQ音乐使用dsn授权
+        ///QQ音乐使用dsn授权
       case EnumCmdEvent.dsn:
         var dsn = event.dsn;
         mDevice.dsn = dsn;
@@ -264,13 +264,13 @@ class BtHelper {
         // ProviderUtil.twelvePublic.wifiDeviceConnected();
         break;
 
-      ///自动切换 0，1不能
-      ///
+        ///自动切换 0，1不能
+        ///
       case EnumCmdEvent.netModeAuto:
         mDevice.netModeAuto = event.netModeAuto;
         break;
 
-      ///解绑设备
+        ///解绑设备
       case EnumCmdEvent.unbind:
         //   let unbindAddress = event.item.address ?? "";
         //     if (unbindAddress != mDevice.address) {
@@ -286,7 +286,7 @@ class BtHelper {
 
         break;
 
-      ///解绑设备
+        ///解绑设备
       case EnumCmdEvent.ctrlStatus:
         // List < int > ctrlList = event.ctrlStatus;
         // if (ctrlList.length == 3) {
@@ -308,7 +308,7 @@ class BtHelper {
         // notifyListeners();
         break;
 
-      ///设备信息
+        ///设备信息
       case EnumCmdEvent.getDeviceInfo:
         //   List list = [];
         //   String userId = ProviderUtil.user.userModel.uid ?? "";
@@ -368,20 +368,17 @@ class BtHelper {
   }
 
   async connect(device, onChanged) {
-    // await this._helper.connect({ data, onChanged, isClick });
     var that = this;
     await that.disconnect(device);
     clearTimeout(that.timer);
     that.timer = null;
     that.bleManager.stopSearch()
     var res = await that.bleManager.connectToDevice(device);
-    console.log(res ? '连接成功' : '连接失败');
-    // that.setData({ connectedDeviceId: deviceId });
     if (res === false) {
       console.log("连接失败")
       that.disconnect(device)
       if (onChanged) {
-        onChanged(false)
+        onChanged(false, device)
       }
       return
     }
@@ -391,7 +388,7 @@ class BtHelper {
       console.log("连接失败")
       that.disconnect(device)
       if (onChanged) {
-        onChanged(false)
+        onChanged(false, device)
       }
       return
     }
@@ -402,7 +399,7 @@ class BtHelper {
       console.log("连接失败")
       that.disconnect(device)
       if (onChanged) {
-        onChanged(false)
+        onChanged(false, device)
       }
       return
     }
@@ -442,7 +439,7 @@ class BtHelper {
         }
 
         if (onChanged) {
-          onChanged(true)
+          onChanged(true, device);
         }
       }
 

pages/connectBle/connectBle.js

@@ -37,8 +37,8 @@ Page({
   async startSearch() {
     var that = this;
     that.setStatus(0);
-    BtHelper.getInstance().startScan(
-      that.data.connectDevice,
+    var connectDevice = that.data.connectDevice;
+    BtHelper.getInstance().startScan(connectDevice,
       async function (b) {
           if (!b) {
             that.setStatus(1);
@@ -57,7 +57,8 @@ Page({
   async connectToDvice() {
     var that = this;
     ///当前的同一个蓝牙
-    var isTheSame = getCurrentPages()[0].isTheSameBlue(that.data.connectDevice);
+    var connectDevice = that.data.connectDevice;
+    var isTheSame = getCurrentPages()[0].isTheSameBlue(connectDevice);
     if (isTheSame) {
       route_util.goBackRoute(route_constant.indexRoot);
       return;
@@ -65,17 +66,17 @@ Page({
 
     ///断开蓝牙连接
     wx.showLoading({
-      title: '请稍后'
+      title: '请稍后',
     });
-    // await getCurrentPages()[0].cancelCurrent();
-    BtHelper.getInstance().connect(that.data.connectDevice, function (data) {
-      console.log("连接成功：", data)
+
+    BtHelper.getInstance().connect(connectDevice, function (isConnected, device) {
       wx.hideLoading();
-      that.setStatus(data ? 3 : 4)
-      if (data) {
-        that.data.connectDevice.connectType = 1;
-        that.data.connectDevice.state = 'online';
-        getCurrentPages()[0].addBlueDevice(that.data.connectDevice);
+      that.setStatus(isConnected ? 3 : 4)
+      if (isConnected) {
+        device.connectType = 1;
+        device.state = 'online';
+        device.imageUrl = device.img;
+        getCurrentPages()[0].addBlueDevice(device);
         route_util.goBackRoute(route_constant.indexRoot);
       }
     });

pages/deviceConnect3/deviceConnect3.js

@@ -120,7 +120,7 @@ Page({
               name: deviceId,
               deviceId: deviceId,
               mac: deviceId,
-              image: "./../../img/min.png",
+              imageUrl: "./../../img/min.png",
             }
             getCurrentPages()[0].addWifiDevice(device);
           }

pages/index/index.js

@@ -371,9 +371,9 @@ Page({
     } else {
       // {"connectType":1,"deviceId":"E4:9F:80:09:40:EC","name":"E4:9F:80:09:40:EC","state":"online","ProdModel":"MW-SR1(4G_WIFI)","devName":"猫王音响x阿基米德 SR1 妙播收音机"}
       device.name = device.devName;
-      BtHelper.getInstance().connect(device, function (data) {
-        if (data) {
-          that.addBlueDevice(device);
+      BtHelper.getInstance().connect(device, function (isConnected, d) {
+        if (isConnected) {
+          that.addBlueDevice(d);
         }
       });
     }
@@ -414,7 +414,7 @@ Page({
 
 
   ///是否是同一个蓝牙
-  isTheSameBlue(connectDevice) {
+  isTheSameBlue(device) {
     var that = this;
     var deviceList = that.getDeviceList();
     var deviceListSelect = that.getDeviceListSelect();
@@ -425,7 +425,7 @@ Page({
     if (deviceList[deviceListSelect].connectType == 3) {
       return false;
     } else {
-      if (deviceList[deviceListSelect].deviceId == connectDevice.deviceId) {
+      if (deviceList[deviceListSelect].deviceId == device.deviceId) {
         return true;
       } else {
         return false;
@@ -499,6 +499,17 @@ Page({
     });
   },
 
+  /// 新添加蓝牙设备
+  addBlueDevice(device) {
+    var that = this;
+    var addDeviceList = lexin_add.addBlueDevice(device);
+    that.updateDeviceList(addDeviceList, false, false);
+    that.setData({
+      deviceListSelect: 0,
+      autoConnected: true,
+    });
+  },
+
   // 新添加Wifi设备
   addWifiDevice(device) {
     var that = this;
@@ -543,17 +554,6 @@ Page({
     }
   },
 
-  /// 新添加蓝牙设备
-  addBlueDevice(device) {
-    var that = this;
-    var addDeviceList = lexin_add.addBlueDevice(device);
-    that.updateDeviceList(addDeviceList, false, false);
-    that.setData({
-      deviceListSelect: 0,
-      autoConnected: true,
-    });
-  },
-
   /// 手机关闭蓝牙，所有蓝牙设备离线
   closeBlueResetOffline(isInit, closeAllBlue) {
     var that = this;

utils/lexin/message.js

@@ -47,10 +47,29 @@ function getDeviceInfo(payloads) {
         ///彻底连接成功
         if (index !== -1) {
           currentDeviceId = deviceId;
-          var ProdModel = other.ProdModel;
           var devName = other.devName;
-          if (device.ProdModel != ProdModel || device.devName != devName) {
+          var ProdModel = other.ProdModel;
+
+          if (device.devName != devName) {
             device.devName = devName;
+          }
+
+          if (!strings.isEmpty(ProdModel)) {
+            ///设置图片
+            var classifyProducts = app.globalData.classifyProducts;
+            if (!strings.isEmpty(classifyProducts)) {
+              for (var i = 0; i < classifyProducts.length; i++) {
+                if (classifyProducts.clientType == ProdModel) {
+                  if (!strings.isEmpty(classifyProducts.img) && device.imageUrl != classifyProducts.img) {
+                    device.imageUrl = classifyProducts.img;
+                  }
+                  break;
+                }
+              }
+            }
+          }
+
+          if (device.ProdModel != ProdModel) {
             device.ProdModel = ProdModel;
           }
           break;

utils/lexin/scan.js

@@ -65,9 +65,9 @@ function compareList(changeCallback, addBlueCallback) {
             var item = list[i];
             if (item.connectType == 1 && item.state == "online") {
               item.name = item.devName;
-              BtHelper.getInstance().connect(item, function (data) {
-                if (data) {
-                  addBlueCallback(item);
+              BtHelper.getInstance().connect(item, function (isConnected, device) {
+                if (isConnected) {
+                  addBlueCallback(device);
                 }
               });
               break;