refactor(factoryTest): 优化 WiFi 连接流程并添加退出功能

- 移除不必要的代码注释
- 调整 WiFi 连接参数传递方式
- 优化 WiFi 列表展示逻辑
- 添加退出测试功能
- 调整部分 UI 样式，如字体大小和位置

app.js

@@ -18,15 +18,15 @@ function initEventLister() {
     globalThis.eventEmitter = new EventEmitter();
 }
 function onCreate(uri) {
-      var evue = require("router.js");
-    var re860_router = require("router-re860.js").router;
-    re860_router.onClick = function (node, topNode, x, y) {
-        console.debug('==============================onClick')
-        var systemCtrl = require("systemCtrl.js");
-        systemCtrl.executeSystemCommand("/mnt/app/quicknode/shell/eAplay.sh /mnt/app/voice_click.wav");
-    }
-      // initEventLister();
-    
+    //    var evue = require("router.js");
+    //  var re860_router = require("router-re860.js").router;
+    //  re860_router.onClick = function (node, topNode, x, y) {
+    //      console.debug('==============================onClick')
+    //      var systemCtrl = require("systemCtrl.js");
+    //      systemCtrl.executeSystemCommand("/mnt/app/quicknode/shell/eAplay.sh /mnt/app/voice_click.wav");
+    //  }
+    // initEventLister();
+
     globalThis.Simu = {
         "En": 0,
     }
@@ -44,14 +44,14 @@ function onCreate(uri) {
     initEventLister();
     gc();
     console.log(showMemInfo());
-    // var evue = require("router.js");
-    // var router = evue.router;
+    var evue = require("router.js");
+    var router = evue.router;
 
-//  var dom = require("dom.js"); //要放在router后面，router会创建document
-    var router = re860_router;
+    //  var dom = require("dom.js"); //要放在router后面，router会创建document
+    //   var router = re860_router;
 
     var times = [];
-        var dom = require("dom.js"); //要放在router后面，router会创建document
+    var dom = require("dom.js"); //要放在router后面，router会创建document
     if (startUrl() == undefined) {
         times.push(clock());
         gc();
@@ -132,7 +132,7 @@ EvueApp({
     'onDestroy': onDestroy,
     'onMoveEvent': onMoveEvent,
     'onGestureEvent': onGestureEvent,
-    'paths': ["../RD190/", "../../enode_modules/","./../RE860A/logicJS/","./../RE860A/common/","./../RE860A/","./../re860a-v1.0/","./../re860a-v1.0/logicJS/","./../re860a-v1.0/common/","./factoryTest_plugin/", "./factoryTest_plugin/ref/", "./factoryTestItem/"],
+    'paths': ["../RD190/", "../../enode_modules/", "./../RE860A/logicJS/", "./../RE860A/common/", "./../RE860A/", "./../re860a-v1.0/", "./../re860a-v1.0/logicJS/", "./../re860a-v1.0/common/", "./factoryTest_plugin/", "./factoryTest_plugin/ref/", "./factoryTestItem/"],
     'uri': 'factory_testList',
     // 'uri': 'testLongTimeList',
     'minFreeJSHeapSize': 200

factoryTestItem/factoryTestWifi.evue

@@ -10,8 +10,8 @@
                 title_TEXT }}</text>
         </div>
 
-        <div style="left:0;top: 65;width: 480;height: 55; background-color: transparent;">
-            <text class="fontsize20" id="Reminder_TEXT"
+        <div style="left:0;top: 70;width: 480;height: 55; background-color: transparent;">
+            <text class="fontsize16" id="Reminder_TEXT"
                 style="left:0;top: 0;width: 480;height: 55;text-align: center; background-color: transparent;color: black;">{{
                 Reminder_TEXT }}</text>
         </div>
@@ -327,7 +327,7 @@
             Reminder_TEXT: "请配置SSID为Midea_WifiBT,密码为空的WIFI路由器,且确保路由器能连上外网",
             wifiInfo_TEXT: "Midea_WifiBT",
             wifiInfoWarn_TEXT: "Midea_WifiBT信号强度需要大于-38dB",
-            wifiInfoState_TEXT: "",
+            wifiInfoState_TEXT: " ",
             exit_TEXT: "退出",
 
             backPngSrc: "./../RE860A/images/settings/back.png",
@@ -1170,14 +1170,15 @@
                         console.log("okok");
                         this.$setY("id_yes", 0);
                         this.wifiInfoState_TEXT ="WIFI测试成功"
+                        return;
                     } else {
                         console.log("no");
                         this.$setY("id_yes", -480);
-                               this.wifiInfoState_TEXT ="WIFI测试失败"
+                              
                         //  this.wifiInfoState_TEXT = connectStatus + "但是信号强度需要大于-38dB"
                     }
                     //成功
-
+          
                 }
                 else {
                     this.$setY("id_yes", -480);
@@ -1185,6 +1186,7 @@
             } else {
                 console.log("No WiFi information available.");
             }
+             this.wifiInfoState_TEXT ="WIFI测试失败"
 
         },
         onShow: function () {
@@ -1323,7 +1325,7 @@
             wifiEventJS.connect_wifi(this.initWifissid, this.initWifipwd,this.initencryptedMode);
             setTimeout(() => {
                 this.hideShowConnectbutton(1);
-            }, 10000);
+            }, 5000);
 
         },
 
@@ -1350,7 +1352,7 @@
             wifiEventJS.enableWLANSwitch();
             setTimeout(() => {
                 this.hideShowConnectListbutton(1);
-            }, 10000);
+            }, 5000);
         },
 
         touchedDetailsBackButton: function (node, topNode, x, y) {
@@ -3715,6 +3717,13 @@
         color: #ffffff;
         background-color: transparent;
     }
+        .fontsize16 {
+        font-size: 16;
+        text-align: center;
+        text-overflow: ellipsis;
+        color: #ffffff;
+        background-color: transparent;
+    }
 
 
 

factoryTestItem/factory_testList.evue

@@ -144,15 +144,15 @@
           en: 1,
           index: 0,
         },
-        //{
-       //   id: "id_factoryTestTp",
-       //   name: "tp",
-       //   startup: "factoryTestTp",
-       //   top: 370,
-          //left: 350,
-      //    en: 1,
-        //  index: 0,
-    //    },
+        {
+          id: "id_factoryTestExit",
+          name: "退出",
+          startup: "factoryTestExit",
+          top: 370,
+          left: 350,
+          en: 1,
+          index: 0,
+        },
 
       ],
     },
@@ -318,6 +318,10 @@
         console.log("==============factoryTestStart================");
         url = "factoryTestColor";
       }
+      if(url ==  "factoryTestExit"){
+          var systemCtrl = require("systemCtrl.js");
+        systemCtrl.executeSystemCommand("/mnt/app/quicknode/shell/runFactory.sh 0");
+      }
       router.push({
         path: url,
       });

factoryTest_plugin/factoryDivPageJump.js

@@ -9,7 +9,7 @@ function commonInitPage(obj) {
 }
 function movePage (newPage) {
     console.log(that.activePage + "==========to==========" + newPage);
-    that.$hide(that.activePage); // תҳ֮ǰصtoast
+    that.$hide(that.activePage); // 跳转页面之前立即关掉toast
     that.$setY(that.activePage, -480); // hide
     that.$show(newPage)
     that.$setY(newPage, 0); // show

factoryTest_plugin/factory_testWifi.js

@@ -157,24 +157,28 @@ function onGotoWlanEnterPasswordPageEvent(value, signal, encrypted) {
 
 // function connect_wifi(ssid, psk) {
 function connect_wifi(ssid, psk, mode) {
+    console.log("===============connect_wifi: " + ssid + "===psk: " + psk + "===mode: " + mode);
+    writeWpaConf.set(ssid, psk, mode)
+    systemCtrl.executeSystemCommand("/tmp/wlanInit.sh &") //重启wifi连接
+    return
 
     // if (psk == "Open") {
-        systemCtrl.executeSystemCommand("killall -9 udhcpc")
-        systemCtrl.executeSystemCommand("wpa_cli -p /tmp/wpa_supplicant/sockets -i wlan0 set_network 0 ssid \'\"" + ssid + "\"\'")
-        systemCtrl.executeSystemCommand("usleep 10000") //10ms 用于缓冲
-        systemCtrl.executeSystemCommand("wpa_cli -p /tmp/wpa_supplicant/sockets -i wlan0 set_network 0 psk \'\"" + psk + "\"\'")
-        systemCtrl.executeSystemCommand("usleep 10000") //10ms 用于缓冲
-        systemCtrl.executeSystemCommand("wpa_cli -p /tmp/wpa_supplicant/sockets -i wlan0 save_config")
-        systemCtrl.executeSystemCommand("usleep 10000") //10ms 用于缓冲
-        systemCtrl.executeSystemCommand("wpa_cli -p /tmp/wpa_supplicant/sockets -i wlan0 reconfigure")
-        //启动wpa_supplicant进程
-        systemCtrl.executeSystemCommand("usleep 200000") //200ms 用于缓冲设置和执行
-        systemCtrl.executeSystemCommand("wpa_cli -p /tmp/wpa_supplicant/sockets -i wlan0 disable_network 0")
-        systemCtrl.executeSystemCommand("usleep 10000") //10ms 用于缓冲
-        systemCtrl.executeSystemCommand("wpa_cli -p /tmp/wpa_supplicant/sockets -i wlan0 enable_network 0")
-        systemCtrl.executeSystemCommand("usleep 500000") //500ms 用于缓冲联网状态
-        //启动udhcpc
-        systemCtrl.executeSystemCommand("udhcpc -b -i wlan0 -t 1 -A 1 -R -H test")
+    systemCtrl.executeSystemCommand("killall -9 udhcpc")
+    systemCtrl.executeSystemCommand("wpa_cli -p /tmp/wpa_supplicant/sockets -i wlan0 set_network 0 ssid \'\"" + ssid + "\"\'")
+    systemCtrl.executeSystemCommand("usleep 10000") //10ms 用于缓冲
+    systemCtrl.executeSystemCommand("wpa_cli -p /tmp/wpa_supplicant/sockets -i wlan0 set_network 0 psk \'\"" + psk + "\"\'")
+    systemCtrl.executeSystemCommand("usleep 10000") //10ms 用于缓冲
+    systemCtrl.executeSystemCommand("wpa_cli -p /tmp/wpa_supplicant/sockets -i wlan0 save_config")
+    systemCtrl.executeSystemCommand("usleep 10000") //10ms 用于缓冲
+    systemCtrl.executeSystemCommand("wpa_cli -p /tmp/wpa_supplicant/sockets -i wlan0 reconfigure")
+    //启动wpa_supplicant进程
+    systemCtrl.executeSystemCommand("usleep 200000") //200ms 用于缓冲设置和执行
+    systemCtrl.executeSystemCommand("wpa_cli -p /tmp/wpa_supplicant/sockets -i wlan0 disable_network 0")
+    systemCtrl.executeSystemCommand("usleep 10000") //10ms 用于缓冲
+    systemCtrl.executeSystemCommand("wpa_cli -p /tmp/wpa_supplicant/sockets -i wlan0 enable_network 0")
+    systemCtrl.executeSystemCommand("usleep 500000") //500ms 用于缓冲联网状态
+    //启动udhcpc
+    systemCtrl.executeSystemCommand("udhcpc -b -i wlan0 -t 1 -A 1 -R -H test")
     // }
     // else if(!(psk == null || psk == "" || psk == "null")) {
 
@@ -299,7 +303,7 @@ function refreshWifiList(wifi_list) {
             "events": {
                 onclick: function (node, topNode, x, y) {
                     // node.attributes.text = "selected";
-                    systemCtrl.executeSystemCommand("/mnt/app/quicknode/shell/eAplay.sh /mnt/app/voice_click.wav");
+                    // systemCtrl.executeSystemCommand("/mnt/app/quicknode/shell/eAplay.sh /mnt/app/voice_click.wav");
                     console.log("node.attributes.text = " + this.attributes.text + " node.attributes.signalValue = " + this.attributes.signalValue);
                     console.log("click wlan_list_item"); //需要添加一个点击事件
                     console.log("this.attributes.ssid = " + this.attributes.ssid);
@@ -341,6 +345,8 @@ function refreshWifiList(wifi_list) {
 
     wifi_list_div.setAttribute('height', top)
     wifi_div.setAttribute('height', top)
+    console.log("top=", top)
+    // that.$setHeight("id_enableWLANListItemTemplate",top);
 }
 
 
@@ -533,16 +539,16 @@ function ConnectWifi(value) {
     var ssid = connectWifiSSID;
     var pwd = value;
     var encrypte = _encryptedMode;
-    console.log("ConnectWifi: " + ssid + "pwd: " + pwd + "encrypte: " + encrypte);
+    // console.log("ConnectWifi: " + ssid + "pwd: " + pwd + "encrypte: " + encrypte);
     // var factory_wifi = require("factory_wifi.js");
     // factory_wifi.testWifiConnect(ssid, pwd);
     // connect_wifi(ssid,pwd);
     that.initWifissid = ssid;
     that.initWifipwd = pwd;
     that.initencryptedMode = encrypte;
-    console.log("that.initWifissid: " + that.initWifissid + "that.initWifipwd: " + that.initWifipwd + "that.initencryptedMode: " + that.initencryptedMode);
+    // console.log("that.initWifissid: " + that.initWifissid + "that.initWifipwd: " + that.initWifipwd + "that.initencryptedMode: " + that.initencryptedMode);
     that.InterValTime();
-    console.log("===================ConnectWifi: " + that.initWifissid + "--pwd: " + that.initWifipwd);
+    // console.log("===================ConnectWifi: " + that.initWifissid + "--pwd: " + that.initWifipwd);
 }
 
 function enableWLANScanValue() {

factoryTest_plugin/getPath.js

@@ -2,7 +2,7 @@
     var _userdata = require("userdata.js");
     var userData = _userdata.userData;
 
-    var env = 0; //0: Ի 1: ʽ
+    var env = 0; //0: 测试环境 1: 正式环境