feature: 构建君正配网界面

app.json

@@ -10,6 +10,7 @@
     "pages/deviceConnect0/deviceConnect0",
     "pages/deviceConnect2/deviceConnect2",
     "pages/deviceConnect1/deviceConnect1",
+    "pages/deviceConnect4/deviceConnect4",
     "pages/download/download",
     "pages/wakeList/wakeList",
     "pages/aboutInfo/aboutInfo",

pages/deviceConnect2/deviceConnect2.js

@@ -2,6 +2,7 @@ const app = getApp();
 let xBlufi = require("../../utils/blufi/xBlufi.js");
 import strings from '../../utils/strings.js';
 import lexin_devices from '../../utils/lexin/devices';
+import junzheng_util from '../../utils/junzheng/util';
 Page({
 
   data: {
@@ -103,7 +104,11 @@ Page({
         // 搜索到蓝牙
         if (options.result) {
           var devicesList = options.data.filter((v) => {
-            return v.name.indexOf(lexin_devices.leXin) !== -1;
+            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 || isJungzheng1 || isJungzheng2;
           });
 
           if (!strings.isEmpty(devicesList)) {

pages/deviceConnect3/deviceConnect3.js

@@ -38,6 +38,7 @@ Page({
       });
     }
 
+    // AIrSMArT_861210052356337===D0:31:10:86:AC:9A
     that.setData({
       name: options.name,
       connectedDeviceId: options.deviceId,
@@ -70,10 +71,12 @@ Page({
   // {"type":"4","result":true,"data":{"progress":100,"ssid":"muzen\u0000"}}
   funListenDeviceMsgEvent: function (options) {
     var that = this;
+    console.log("gadfqwerqwerqr==1111==" + options.type + "===" + JSON.stringify(options));
     switch (options.type) {
       // {"type":"2","result":true,"data":{"deviceId":"7C:DF:A1:FD:3A:F2","serviceId":"0000FFFF-0000-1000-8000-00805F9B34FB",
       // "characteristicId":"0000FF01-0000-1000-8000-00805F9B34FB"}}
       case xBlufi.XBLUFI_TYPE.TYPE_INIT_ESP32_RESULT:
+        console.log("gadfqwerqwerqr==222==" + JSON.stringify(options.result));
         if (options.result) {
           console.log('初始化成功');
           that.OnClickStart();
@@ -92,6 +95,7 @@ Page({
         // {"type":"4","result":true,"data":{"progress":100,"ssid":"muzen\u0000"}}
         ///连接结果
       case xBlufi.XBLUFI_TYPE.TYPE_CONNECT_ROUTER_RESULT:
+        console.log("gadfqwerqwerqr==2222==" + JSON.stringify(options.result));
         if (!options.result) {
           errTi = setTimeout(() => {
             that.setData({
@@ -139,6 +143,7 @@ Page({
 
         ///设备连接状态回调
       case xBlufi.XBLUFI_TYPE.TYPE_STATUS_CONNECTED:
+        console.log("gadfqwerqwerqr==4444==" + JSON.stringify(options.result));
         that.setData({
           connected: options.result
         });