fix: 继电器不动作的问题

fix: 优化网页生成方式(上传缺少的问题)
a2633063 · Nov 22, 2020 · efe7c68 · efe7c68
1 parent d89ea36
commit efe7c68
Show file tree

Hide file tree

Showing 13 changed files with 185,935 additions and 185,396 deletions.
diff --git a/Makefile b/Makefile
@@ -23,7 +23,7 @@ else
 endif
 
 BOOT?=new
-APP?=2
+APP?=1
 SPI_SPEED?=40
 SPI_MODE?=QIO
 SPI_SIZE_MAP?=2

diff --git a/app/user/user_key.c b/app/user/user_key.c
@@ -99,7 +99,7 @@ LOCAL void key_intr_handler(void *arg) {
 void ICACHE_FLASH_ATTR
 user_key_init(void) {
 
-//	PIN_FUNC_SELECT(GPIO_RELAY_IO_MUX, GPIO_RELAY_IO_FUNC);
+	PIN_FUNC_SELECT(GPIO_RELAY_IO_MUX, GPIO_RELAY_IO_FUNC);
 //	single_key[0] = key_init_single(GPIO_KEY_0_IO_NUM, GPIO_KEY_0_IO_MUX,
 //	GPIO_KEY_0_IO_FUNC, user_key_long_press, user_key_short_press);
 //

diff --git a/app/user/web/wififail.html b/app/user/web/wififail.html
@@ -0,0 +1,128 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="content-type" content="text/html" charset="utf-8">
+<meta content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0" name="viewport">
+<title>上网设置</title>
+<style>
+ body, p, h1, h2, h3, h4, h5, h6, ul, ol, li, dl, dt, dd, table, th, td, form, fieldset, legend, input, textarea, button, select, img, blockquote {
+	margin: 0;
+	padding: 0;
+	border: 0;
+	font-size: 100%;
+	vertical-align: baseline;
+	font-family: "Microsoft YaHei","iconfont","FontAwesome"  !important;
+}
+h1, h2, h3, h4, h5, h6 {
+	font-weight: normal;
+}
+body{
+	background: #f5f5f5
+	}
+body, html {
+	height: 100%;
+	max-height: 100%;
+}
+html{font-size:62.5%;}
+
+.main{
+	width:100%;
+	min-height:100%;
+	position:relative;
+	box-sizing: border-box;
+	-webkit-box-sizing:border-box;
+	display:-webkit-box;
+	-webkit-box-orient:vertical;
+}
+.header {
+	background: #f56c6c;
+	height:48px;
+	line-height:48px;
+	overflow: hidden;
+	width: 100%;
+	box-sizing: border-box;
+	position: relative;
+}
+.header h3 {
+	font-size: 18px;
+	line-height: 48px;
+	text-align: center;
+	color: #fff;
+}
+.btn-return {
+	background: center no-repeat;
+	background-size: 12px 20px;
+	width: 44px;
+	height: 48px;
+	display: inline-block;
+	font-size: 0px;
+	line-height: 0px;
+	overflow: hidden;
+}
+.header .btn-return {
+	position: absolute;
+	left: 0px;
+	top: 0px;
+}
+.wifi-fail .content{
+	-webkit-box-flex: 1;    
+	-moz-box-flex: 1;        
+	-webkit-flex: 1;       
+	-ms-flex: 1;            
+	flex: 1; 
+	padding:10px;
+	background-color:#FFF;
+}
+.wifi-fail h2{
+	color: #f56c6c;
+	font-size:30px;
+	text-align:center;
+	padding:30px 0;
+	line-height:30px;
+}
+.wifi-fail {
+	text-indent:2rem;
+	font-size:16px;
+	line-height:28px;
+}
+.btn{
+	text-decoration: none;
+	height:40px;
+	line-height:40px;
+	font-size:14px;
+	display:block;
+	border: 0 none;
+	color: #FFF;
+	border-radius: 5px;
+	-moz-border-radius: 5px;
+	-webkit-border-radius: 5px;
+	outline: none;
+	cursor: pointer;
+	text-align:center;
+	min-width:70px;
+	padding:0 10px;
+}
+.btn-red{
+	background-color:#f56c6c;
+}
+.geteway-btn button {
+    width: 100%;
+	margin:35px 0;
+}
+</style>
+</head>
+
+<body>
+<div class="main wifi-fail">
+  <header class="header">
+        <a href="#" class="btn-return">上一页</a>
+        <h3>上网设置</h3>
+    </header>
+    <div class="content">
+       <h2>设置失败！</h2>
+       <section class="geteway-btn"><a href="/setting.htm" class="btn btn-red btn-try">再次重试</a></section>
+    </div>
+</div>
+
+</body>
+</html>
diff --git a/app/user/web/wifisetting.html b/app/user/web/wifisetting.html
@@ -0,0 +1,132 @@
+<!doctype html>
+<html>
+<head>
+<meta http-equiv="content-type" content="text/html" charset="utf-8">
+<meta content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0" name="viewport">
+<title>上网设置</title>
+<style>
+  body, p, h1, h2, h3, h4, h5, h6, ul, ol, li, dl, dt, dd, table, th, td, form, fieldset, legend, input, textarea, button, select, img, blockquote {
+	margin: 0;
+	padding: 0;
+	border: 0;
+	font-size: 100%;
+	vertical-align: baseline;
+	font-family: "Microsoft YaHei","iconfont","FontAwesome"  !important;
+}
+h1, h2, h3, h4, h5, h6 {
+	font-weight: normal;
+}
+body{
+	background: #f5f5f5
+	}
+body, html {
+	height: 100%;
+	max-height: 100%;
+}
+html{font-size:62.5%;}
+
+.header {
+	background: #f56c6c;
+	height:48px;
+	line-height:48px;
+	overflow: hidden;
+	width: 100%;
+	box-sizing: border-box;
+	position: relative;
+}
+.header h3 {
+	font-size: 18px;
+	line-height: 48px;
+	text-align: center;
+	color: #fff;
+}
+
+.header .btn-return {
+	position: absolute;
+	left: 0px;
+	top: 0px;
+}
+.wifi-set .content{
+	margin:10px;
+	-webkit-box-flex: 1;
+    -moz-box-flex: 1;
+    -webkit-flex: 1;
+    -ms-flex: 1;
+    flex: 1;
+}
+.geteway-info-box .input-field{
+	line-height:20px;
+	vertical-align:middle;
+	border: 1px solid #d7d7d7;
+    height: 58px;
+    background: #fff;
+    box-sizing: border-box;
+    position: relative;
+    margin-bottom: -1px;
+    padding: 19px 15px 19px 18px;
+}
+.input-field input {
+    height: 20px;
+    line-height: 20px;
+    font-size: 14px;
+    width: 100%;
+    border: 0 none;
+    background: transparent;
+	outline: medium;
+}
+.input-field:first-of-type {
+    border-top-left-radius: 5px;
+    border-top-right-radius: 5px;
+}
+.input-field:last-of-type {
+    border-bottom-left-radius: 5px;
+    border-bottom-right-radius: 5px;
+}
+.btn{
+	height:40px;
+	line-height:40px;
+	font-size:14px;
+	display:block;
+	border: 0 none;
+	color: #FFF;
+	border-radius: 5px;
+	-moz-border-radius: 5px;
+	-webkit-border-radius: 5px;
+	outline: none;
+	cursor: pointer;
+	text-align:center;
+	min-width:70px;
+	padding:0 10px;
+}
+.btn-red{
+	background-color:#f56c6c;
+}
+.geteway-btn button {
+    width: 100%;
+	margin:35px 0;
+}
+</style>
+
+</head>
+
+<body>
+<div class="main wifi-set">
+    <header  class="header">
+        <h3>上网设置</h3>
+    </header>
+    <div class="content">
+	<form action="result.htm" method="post">
+       <section class="geteway-info-box">
+          <div class="input-field">
+             <input id="ssid" type="text" name="SSID" value="" placeholder="WIFI名称">
+          </div>
+          <div class="input-field">
+             <input type="text" name="PASS" value="" placeholder="输入密码">
+          </div>
+        </section>
+        <section class="geteway-btn"><button type="submit" name="next" class="btn btn-red btn-next">下一步</button></section>
+	</form>
+    </div>
+</div>
+</body>
+</html>