Kaynağa Gözat

feature: 增加2AXD的适配

332777428@qq.com 4 ay önce
ebeveyn
işleme
caac19d4a9

+ 11 - 3
pages/deviceConnect2/deviceConnect2.js

@@ -107,10 +107,18 @@ Page({
           var devicesList = options.data.filter((v) => {
             var name = v.name;
             var isLexin = name.indexOf(lexin_devices.leXin) !== -1;
-            // var isJungzheng1 = junzheng_util.isJungzheng1(name);
-            // var isJungzheng2 = junzheng_util.isJungzheng2(name);
-            return isLexin;
+            var isJungzheng1 = junzheng_util.isJungzheng1(name);
+            var isJungzheng2 = junzheng_util.isJungzheng2(name);
+            if (isJungzheng1 || isJungzheng2) {
+              console.log("gasdfqwerqwerqrwqr===00==" + v.name);
+            } else if (isLexin) {
+              console.log("gasdfqwerqwerqrwqr===11==" + v.name);
+            }
+            // return isLexin;
             return isLexin || isJungzheng1 || isJungzheng2;
+            ///2AXD
+            // return v.name == "AIrSMArT_d0311004155e";
+            ///X4
             // return v.name == "AIrSMArT_861210052356337";
           });
 

+ 0 - 1
pages/deviceList/deviceList.js

@@ -27,7 +27,6 @@ Page({
       unShowLoad: true
     }).then((res) => {
       if (res) {
-        console.log("gadsfqwerqwerqr===" + JSON.stringify(res));
         that.setDeviceList(res, true);
       }
     });