diff --git a/TC1/http_server/web/demo.html b/TC1/http_server/web/demo.html index f91f113..f1a031b 100644 --- a/TC1/http_server/web/demo.html +++ b/TC1/http_server/web/demo.html @@ -290,23 +290,23 @@ - + - + - + - + - +
Versionv1.0.33v1.0.33
IP192.168.33.222192.168.33.222
Mask255.255.255.0255.255.255.0
Gateway192.168.33.1192.168.33.1
Uptime10:13:4310:13:43
@@ -403,6 +403,35 @@ function HttpDel(url, onsuccess, data) { } //Ajax-end +var info_station_name; +var info_wifi_password; + +HttpGet("/status", function (re) { + var status = JSON.parse(re); + var status_arr = status.sockets.split(","); + // for (var i = 0; i < status_arr.length; i++) { + // checkboxs[i].checked = status_arr[i] == "1"; + // } + + if(status.mode == 1) { + $("#custom_station").click(); + info_station_name = status.station_ssid; + info_wifi_password = status.station_pwd; + } else { + $("#custom_ap").click(); + $("#custom_ssid")[0].parentElement.MaterialTextfield.change(status.ap_ssid); + info_wifi_password = status.ap_pwd; + } + + $("#mqtt_addr")[0].parentElement.MaterialTextfield.change(status.mqtt_addr); + $("#mqtt_port")[0].parentElement.MaterialTextfield.change(status.mqtt_port); + $("#info_version").html(status.version); + $("#info_ip").html(status.ip); + $("#info_mask").html(status.mask); + $("#info_gateway").html(status.gateway); + $("#uptime").html(status.start_time); +}); + //Menu-start var chart_par = document.getElementById("ct-chart-par"); chart_par.scrollTo(chart_par.scrollWidth, 0); @@ -423,8 +452,8 @@ function ShowPage(id) { if(id == 2) { Rescan(); - } - else { + $("#custom_password")[0].parentElement.MaterialTextfield.change(info_wifi_password); + } else { window.clearTimeout(rescan_timer); } } @@ -467,20 +496,21 @@ function Rescan() { function GetScanResult() { HttpGet("/wifi/scan", function (re) { if (re != "NO") { - var wifi_sel_name = $("#wifi_sel")[0]; - var wifi_sel_id = $("input[name='wifi_sel']")[0]; - var ret = JSON.parse(re.replace(/'/g, '"')); //TODO: Fix this later - if(wifi_sel_id.value === "0") { - var html = "
  • Manual
  • "; + var wifi_sel_name = $("#wifi_sel").val(); + if(!wifi_sel_name) { + wifi_sel_name = info_station_name; } - else { + var wifi_sel_id = $("input[name='wifi_sel']").val(); + var ret = JSON.parse(re.replace(/'/g, '"')); //TODO: Fix this later + if(wifi_sel_id === "0") { + var html = "
  • Manual
  • "; + } else { var html = "
  • Manual
  • "; } for (var i = 0; i < ret.ssids.length; i++) { - if(wifi_sel_name.value == ret.ssids[i]) { + if(wifi_sel_name == ret.ssids[i]) { html += "
  • "+ret.ssids[i]+"
  • "; - } - else { + } else { html += "
  • "+ret.ssids[i]+"
  • "; } } @@ -563,6 +593,7 @@ function GetPowerRecord() { if (power.powers.length != 0 && x < 100) { chart_par.scrollTo(chart_par.scrollWidth, 0); } + $("#uptime").html(power.up_time); window.setTimeout(GetPowerRecord, 3000); }, power_idx.toString()); }