diff --git a/TC1/http_server/web/demo.html b/TC1/http_server/web/demo.html index c288de7..f91f113 100644 --- a/TC1/http_server/web/demo.html +++ b/TC1/http_server/web/demo.html @@ -178,7 +178,7 @@
- +
@@ -194,7 +194,7 @@
- + Submit
@@ -207,17 +207,17 @@
- - + +
- - + +
- + Submit
@@ -432,17 +432,17 @@ ShowPage(3); //Menu-end $("#wifi_sel").on("change", function() { - var div_custom = $("#div_custom_ssid")[0]; - var wifi_sel_id = $("input[name='wifi_sel']")[0]; - var wifi_sel_name = $("#wifi_sel")[0]; - var custom_ssid = $("#custom_ssid")[0]; - if (wifi_sel_id.value == "0") { - div_custom.hidden = false; - custom_ssid.parentElement.MaterialTextfield.change(""); - } else { - div_custom.hidden = true; - custom_ssid.parentElement.MaterialTextfield.change(wifi_sel_name.value); - } + var div_custom = $("#div_custom_ssid")[0]; + var wifi_sel_id = $("input[name='wifi_sel']")[0]; + var wifi_sel_name = $("#wifi_sel")[0]; + var custom_ssid = $("#custom_ssid")[0]; + if (wifi_sel_id.value == "0") { + div_custom.hidden = false; + custom_ssid.parentElement.MaterialTextfield.change(""); + } else { + div_custom.hidden = true; + custom_ssid.parentElement.MaterialTextfield.change(wifi_sel_name.value); + } }); $("#custom_ap").on("change", function(){ @@ -455,44 +455,86 @@ $("#custom_station").on("change", function(){ }); function Rescan() { - HttpPost("/wifi/scan", function (re) { - if (re == "OK") { - window.setTimeout(GetScanResult, 1000); - } else { - alert(re); - } - }); + HttpPost("/wifi/scan", function (re) { + if (re == "OK") { + window.setTimeout(GetScanResult, 1000); + } else { + alert(re); + } + }); } 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
  • "; - } - else { - var html = "
  • Manual
  • "; - } - for (var i = 0; i < ret.ssids.length; i++) { - if(wifi_sel_name.value == ret.ssids[i]) { - html += "
  • "+ret.ssids[i]+"
  • "; - } - else { - html += "
  • "+ret.ssids[i]+"
  • "; - } - } - ssid_slt.innerHTML = html; - getmdlSelect.init(".getmdl-select"); - rescan_timer = window.setTimeout(Rescan, 20000); - return; + 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
  • "; + } + else { + var html = "
  • Manual
  • "; + } + for (var i = 0; i < ret.ssids.length; i++) { + if(wifi_sel_name.value == ret.ssids[i]) { + html += "
  • "+ret.ssids[i]+"
  • "; } - window.setTimeout(GetScanResult, 1000); - }); + else { + html += "
  • "+ret.ssids[i]+"
  • "; + } + } + ssid_slt.innerHTML = html; + getmdlSelect.init(".getmdl-select"); + rescan_timer = window.setTimeout(Rescan, 20000); + return; + } + window.setTimeout(GetScanResult, 1000); + }); } +$("#mqtt_submit").on("click", function() { + var mqtt_addr = $("#mqtt_addr").val(); + var mqtt_port = $("#mqtt_port").val(); + var params = mqtt_addr + " " + mqtt_port; + HttpPost("/mqtt/config", function (re) { + alert(re); + }, params); +}); + +//Quotation Marks +function ContainQM(str) { + if (str == "" + || str.indexOf("'") >= 0 + || str.indexOf('"') >= 0 + || str.indexOf(' ') >= 0 + || str.length > 32) { + return true; + } + return false; +} + +var qm_mess = "Sorry, can't use ' or \" or space or empty.\n\nAlso, length <= 32." +var le_mess = "Sorry, length < 8." + +$("#wifi_submit").on("click", function() { + var mode = $("#custom_station").prop("checked") ? 1 : 0; + var ssid = $("#custom_ssid").val(); + var passwd = $("#custom_password").val(); + if (ContainQM(ssid) || ContainQM(passwd)) { + alert(qm_mess); + return; + } + if (passwd.length < 8) { + alert(le_mess); + return; + } + var params = mode + " " + ssid + " " + passwd; + HttpPost("/wifi/config", function (re) { + alert(re); + }, params); +}); + var data = { series: [ []