feature: 添加M4设备相关数据适配

pages/deviceWake/deviceWake.js

@@ -444,7 +444,6 @@ Page({
     var that = this;
     var deviceId = that.data.deviceId;
     var clientType = that.data.clientType;
-    // var deviceMac = that.data.deviceMac;
     ///唤醒的设置特殊，智能这样用
     var deviceMac = lexin_util.getMacByDeviceId(deviceId);
     wx.navigateTo({

utils/lexin/devices.js

@@ -18,5 +18,8 @@ const clientTypes = ["MW-2AX(WIFI)", "MW-2AX(WIFI-N)", "MW-2AX(A)",
 
 module.exports = {
   leXin: leXin,
+  junZheng1: junZheng1,
+  junZheng2: junZheng2,
+  junZheng3: junZheng3,
   clientTypes: clientTypes,
 }

utils/lexin/util.js

@@ -16,22 +16,49 @@ function getMacBySplitDeviceId(splitDeviceId) {
 
 function getMacByDeviceId(deviceId) {
   const lexin_devices = require('../lexin/devices');
-  var splitDeviceId = deviceId.split(lexin_devices.leXin);
-  if (splitDeviceId.length != 2) {
+  var deviceIdLeXin = deviceId.split(lexin_devices.leXin);
+  var deviceIdJunZheng1 = deviceId.split(lexin_devices.junZheng1);
+  var deviceIdJunZheng2 = deviceId.split(lexin_devices.junZheng2);
+  var deviceIdJunZheng3 = deviceId.split(lexin_devices.junZheng13);
+  var isLeXin = deviceIdLeXin.length == 2;
+  var isJunZheng1 = deviceIdJunZheng1.length == 2;
+  var isJunZheng2 = deviceIdJunZheng2.length == 2;
+  var isJunZheng3 = deviceIdJunZheng3.length == 2;
+  if (!isLeXin && !(isJunZheng1 && !isJunZheng3) && !(isJunZheng2 && !isJunZheng3)) {
+    return "";
+  }
+
+  if (isLeXin) {
+    return getMacBySplitDeviceId(deviceIdLeXin[1]);
+  } else if ((isJunZheng1 && !isJunZheng3)) {
+    return getMacBySplitDeviceId(deviceIdJunZheng1[1]);
+  } else if ((isJunZheng2 && !isJunZheng3)) {
+    return getMacBySplitDeviceId(deviceIdJunZheng2[1]);
+  } else {
     return "";
   }
-  return getMacBySplitDeviceId(splitDeviceId[1]);
 };
 
 ///获取设备mac相关
 function getDeviceMacId(deviceId) {
   const lexin_devices = require('../lexin/devices');
-  var splitDeviceId = deviceId.split(lexin_devices.leXin);
-  if (splitDeviceId.length != 2) {
+  var deviceIdLeXin = deviceId.split(lexin_devices.leXin);
+  var deviceIdJunZheng1 = deviceId.split(lexin_devices.junZheng1);
+  var deviceIdJunZheng2 = deviceId.split(lexin_devices.junZheng2);
+  var deviceIdJunZheng3 = deviceId.split(lexin_devices.junZheng13);
+  var isLeXin = deviceIdLeXin.length == 2;
+  var isJunZheng1 = deviceIdJunZheng1.length == 2;
+  var isJunZheng2 = deviceIdJunZheng2.length == 2;
+  var isJunZheng3 = deviceIdJunZheng3.length == 2;
+  if (isLeXin) {
+    return `${lexin_devices.junZheng1}${getMacBySplitDeviceId(deviceIdLeXin[1])}`
+  } else if ((isJunZheng1 && !isJunZheng3)) {
+    return `${lexin_devices.junZheng1}${getMacBySplitDeviceId(isJunZheng1[1])}`
+  } else if ((isJunZheng2 && !isJunZheng3)) {
+    return `${lexin_devices.junZheng1}${getMacBySplitDeviceId(isJunZheng2[1])}`
+  } else {
     return "";
   }
-  var mac = getMacBySplitDeviceId(splitDeviceId[1]);
-  return `AIrSMArT_${mac}`
 };
 
 ///通过设备id获取mac地址