feature: 处理乐鑫和君正多种情况下处理

utils/lexin/util.js

@@ -27,7 +27,16 @@ function getMacByDeviceId(deviceId) {
   if (!isLeXin && !(isJunZheng1 && !isJunZheng3) && !(isJunZheng2 && !isJunZheng3)) {
     return "";
   }
-  return getMacBySplitDeviceId(deviceIdLeXin[1]);
+
+  if (isLeXin) {
+    return getMacBySplitDeviceId(deviceIdLeXin[1]);
+  } else if ((isJunZheng1 && !isJunZheng3)) {
+    return getMacBySplitDeviceId(deviceIdJunZheng1[1]);
+  } else if ((isJunZheng2 && !isJunZheng3)) {
+    return getMacBySplitDeviceId(deviceIdJunZheng2[1]);
+  } else {
+    return "";
+  }
 };
 
 ///获取设备mac相关
@@ -41,11 +50,15 @@ function getDeviceMacId(deviceId) {
   var isJunZheng1 = deviceIdJunZheng1.length == 2;
   var isJunZheng2 = deviceIdJunZheng2.length == 2;
   var isJunZheng3 = deviceIdJunZheng3.length == 2;
-  if (!isLeXin && !(isJunZheng1 && !isJunZheng3) && !(isJunZheng2 && !isJunZheng3)) {
+  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地址