新增OTA网页显示

This commit is contained in:
Yu-886 2025-03-17 17:32:09 +08:00
parent 64e786cf1c
commit 98dfc91e52
6 changed files with 177 additions and 116 deletions

View File

@ -230,6 +230,7 @@ void app_main(void)
home_html.html_data = load_html2Ram(home_html); home_html.html_data = load_html2Ram(home_html);
wifi_config_html.html_data = load_html2Ram(wifi_config_html); wifi_config_html.html_data = load_html2Ram(wifi_config_html);
upload_ota_html.html_data = load_html2Ram(upload_ota_html);
// favicon_ico.html_data = load_html2Ram(favicon_ico); // favicon_ico.html_data = load_html2Ram(favicon_ico);
// ESP_LOGI(TAG, "ESP_WIFI_MODE_STA"); // ESP_LOGI(TAG, "ESP_WIFI_MODE_STA");
// ESP_LOGI(TAG,"def_name:%s",Sys_wifi_config.def_AP_Name); // ESP_LOGI(TAG,"def_name:%s",Sys_wifi_config.def_AP_Name);

View File

@ -18,16 +18,29 @@ wifi_html_t home_html = {
wifi_html_t wifi_config_html = { wifi_html_t wifi_config_html = {
.html_name = "wifi_config.html", .html_name = "wifi_config.html",
.html_addr = 0x44b9, .html_addr = 0x4115,
.html_size = 6671, .html_size = 6671,
}; };
wifi_html_t upload_ota_html = {
.html_name = "upload_script.html",
.html_addr = 0x1b75,
.html_size = 4951,
};
wifi_html_t favicon_ico = { wifi_html_t favicon_ico = {
.html_name = "favicon.ico", .html_name = "favicon.ico",
.html_addr = 0, .html_addr = 0,
.html_size = 106008, .html_size = 106008,
}; };
static esp_err_t ota_get_handler(httpd_req_t *req)
{
/* Add file upload form and script which on execution sends a POST request to /upload */
httpd_resp_set_type(req,HTTPD_TYPE_TEXT);
httpd_resp_send(req, (const char *)upload_ota_html.html_data, upload_ota_html.html_size);
return ESP_OK;
}
static esp_err_t index_get_handler(httpd_req_t *req) static esp_err_t index_get_handler(httpd_req_t *req)
{ {
@ -271,6 +284,16 @@ esp_err_t start_web_server(void)
}; };
httpd_register_uri_handler(server, &home_page); httpd_register_uri_handler(server, &home_page);
httpd_uri_t ota_page = {
.uri = "/ota", //192.168.1.4
.method = HTTP_GET,
.handler = ota_get_handler,
/* Let's pass response string in user
* context to demonstrate it's usage */
.user_ctx = NULL,
};
httpd_register_uri_handler(server, &ota_page);
httpd_uri_t echo = { httpd_uri_t echo = {
.uri = "/config", .uri = "/config",
.method = HTTP_POST, .method = HTTP_POST,

View File

@ -1,5 +1,5 @@
#include "wifi_task.h" #include "wifi_task.h"
#include "bsp_flash.h"
static const char *TAG = "wifi_sta"; static const char *TAG = "wifi_sta";

View File

@ -49,6 +49,7 @@ extern wifi_Save_info_t Sys_wifi_config;
extern wifi_html_t home_html; extern wifi_html_t home_html;
extern wifi_html_t wifi_config_html; extern wifi_html_t wifi_config_html;
extern wifi_html_t favicon_ico; extern wifi_html_t favicon_ico;
extern wifi_html_t upload_ota_html;
void wifi_init_station(void); void wifi_init_station(void);
void wifi_init_softap(void); void wifi_init_softap(void);

View File

@ -13,7 +13,7 @@
}, },
{ {
"url": "/upload_script.html", "url": "/upload_script.html",
"size": 5883, "size": 4951,
"name": "upload_script.html", "name": "upload_script.html",
"address": "0x1b75" "address": "0x1b75"
}, },
@ -21,18 +21,18 @@
"url": "/upload_script_copy.html", "url": "/upload_script_copy.html",
"size": 3046, "size": 3046,
"name": "upload_script_copy.html", "name": "upload_script_copy.html",
"address": "0x3270" "address": "0x2ecc"
}, },
{ {
"url": "/wifi.html", "url": "/wifi.html",
"size": 1635, "size": 1635,
"name": "wifi.html", "name": "wifi.html",
"address": "0x3e56" "address": "0x3ab2"
}, },
{ {
"url": "/wifi_config.html", "url": "/wifi_config.html",
"size": 6671, "size": 6671,
"name": "wifi_config.html", "name": "wifi_config.html",
"address": "0x44b9" "address": "0x4115"
} }
] ]

View File

@ -177,131 +177,167 @@ function upload() {
<!DOCTYPE html> <!DOCTYPE html>
<head> <head>
<meta charset='UTF-8'> <meta charset='UTF-8'>
<meta name="viewport" content="width=device-width,initial-scale=1.0,maximum-scale=1.0,minimum-scale=1.0,user-scalable=no"> <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0, user-scalable=no">
<title>在线配置</title> <title>在线配置</title>
<style type="text/css"> <style type="text/css">
* { margin: 0; padding: 0; } * { margin: 0; padding: 0; box-sizing: border-box; }
html { height: 100%; } html, body { height: 100%; background-color: #1F6F4A; display: flex; align-items: center; justify-content: center; }
h2 {text-align: center;color: #fff;line-height: 2.2;}
body { height: 100%; background-color: #1F6F4A; 50% 50% no-repeat; background-size: cover;} h2, label { text-align: center; color: #fff; line-height: 2.2; }
.dowebok { position: absolute; left: 50%; top: 30%; width: 380px; height: 500px; margin: -200px 0 0 -200px; border: 3px solid #fff; border-radius: 10px; overflow: hidden;}
.dowebok {
.form-item { position: relative; width: 360px; margin: 0 auto; padding-bottom: 20px;} width: 380px;
.form-item input { width: 288px; height: 48px; padding-left: 10px; border: 1px solid #fff; border-radius: 25px; font-size: 18px; color: #fff; background-color: transparent; outline: none;} height: 500px;
.send_button { width: 360px; height: 50px; border: 0; border-radius: 25px; font-size: 18px; color: #1f6f4a; outline: none; cursor: pointer; background-color: #fff; } border: 3px solid #fff;
border-radius: 10px;
.tip { display: none; position: absolute; left: 20px; top: 52px; font-size: 14px; color: #f50; } padding: 20px;
.reg-bar { width: 360px; margin: 20px auto 0; font-size: 14px; overflow: hidden;} text-align: center;
.reg-bar a { color: #fff; text-decoration: none; } }
.reg-bar a:hover { text-decoration: underline; }
.reg-bar .reg { float: left; } .form-item {
.reg-bar .forget { float: right; } width: 100%;
.dowebok ::-webkit-input-placeholder { font-size: 18px; line-height: 1.4; color: #fff;} margin-bottom: 20px;
.dowebok :-moz-placeholder { font-size: 18px; line-height: 1.4; color: #fff;} }
.dowebok ::-moz-placeholder { font-size: 18px; line-height: 1.4; color: #fff;}
.dowebok :-ms-input-placeholder { font-size: 18px; line-height: 1.4; color: #fff;} /* 自定义文件上传区域 */
.custom-file {
@media screen and (max-width: 500px) { display: flex;
* { box-sizing: border-box; } align-items: center;
.dowebok { position: static; width: auto; height: auto; margin: 0 30px; border: 0; border-radius: 0; } justify-content: space-between;
.logo { margin: 50px auto; } gap: 10px;
.form-item { width: auto; } border: 1px solid #fff;
.form-item input, .form-item button, .reg-bar { width: 100%; } border-radius: 5px;
} padding: 8px 12px;
}
.custom-file span {
color: white;
font-size: 16px;
flex-grow: 1;
text-align: left;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
}
.custom-file label {
background-color: #fff;
color: #1F6F4A;
padding: 6px 12px;
border-radius: 5px;
cursor: pointer;
font-size: 16px;
font-weight: bold;
white-space: nowrap;
}
.custom-file input {
display: none; /* 隐藏原始文件选择框 */
}
input[type="text"] {
width: 100%;
height: 40px;
border: 1px solid #fff;
border-radius: 5px;
padding-left: 10px;
color: #fff;
background-color: transparent;
outline: none;
}
button {
width: 100%;
height: 40px;
border: none;
border-radius: 5px;
background-color: #fff;
color: #1F6F4A;
font-size: 16px;
cursor: pointer;
}
button:hover {
background-color: #ddd;
}
/* 响应式调整 */
@media screen and (max-width: 500px) {
.dowebok { width: 90%; height: auto; padding: 10px; }
}
</style> </style>
</head> </head>
<body> <body>
<div class="dowebok"> <div class="dowebok">
<h2>ESP32S2 OTA Bin Server</h2> <h2>ESP32S2 OTA Bin Server</h2>
<!-- <table border="0">
</table> --> <!-- 自定义文件选择框 -->
<tr> <div class="form-item">
<td> <div class="custom-file">
<label for="newfile">Upload a file</label> <span id="file-name">未选择文件</span>
</td> <label for="newfile">选择文件</label>
<td colspan="2"> <input id="newfile" type="file" accept=".bin" onchange="updateFileName()">
<input id="newfile" type="file" accept=".bin" onchange="setpath()" style="width:100%;"> </div>
</td> </div>
</tr>
<tr> <div class="form-item">
<td> <label for="filepath">Set path on server</label>
<label for="filepath">Set path on server </label> <input id="filepath" type="text" readonly>
</td> </div>
<td>
<input id="filepath" type="text" style="width:100%;"> <button id="upload" type="button" onclick="upload()">Upload</button>
</td> <br><br>
<td> <button onclick="window.location.href='/'">返回</button>
<button id="upload" type="button" onclick="upload()">Upload</button>
</td>
</tr>
<!-- <form style='text-align: center;padding-top: 20px' action='/ota' method='POST'>
<td>
<button id="upload" type="button" onclick="upload()">Upload</button>
</td>
</form> -->
<form style='text-align: center;padding-top: 20px' name='input' action='/config' method='POST'>
<div class="form-item">
<div id="">
<input id="return_page" type='button' value='返回' onclick="location.href='/'">
</div>
</div>
</form>
</div> </div>
</body> </body>
<script> <script>
function setpath() { function updateFileName() {
var default_path = document.getElementById("newfile").files[0].name; var fileInput = document.getElementById("newfile");
document.getElementById("filepath").value = default_path; var fileNameSpan = document.getElementById("file-name");
} var filePathInput = document.getElementById("filepath");
function upload() {
var filePath = document.getElementById("filepath").value;
var upload_path = "/upload/" + filePath;
var fileInput = document.getElementById("newfile").files;
/* Max size of an individual file. Make sure this if (fileInput.files.length > 0) {
* value is same as that set in file_server.c */ var file = fileInput.files[0];
var MAX_FILE_SIZE = 20*1024*1024; var fileSize = formatFileSize(file.size);
var MAX_FILE_SIZE_STR = "20MB"; fileNameSpan.textContent = file.name;
filePathInput.value = `${file.name} (${fileSize})`;
if (fileInput.length == 0) {
alert("No file selected!");
} else if (filePath.length == 0) {
alert("File path on server is not set!");
} else if (filePath.indexOf(' ') >= 0) {
alert("File path on server cannot have spaces!");
} else if (filePath[filePath.length-1] == '/') {
alert("File name not specified after path!");
} else if (fileInput[0].size > MAX_FILE_SIZE) {
alert("File size must be less than " + MAX_FILE_SIZE_STR);
} else { } else {
document.getElementById("newfile").disabled = true; fileNameSpan.textContent = "未选择文件";
document.getElementById("filepath").disabled = true; filePathInput.value = "";
document.getElementById("upload").disabled = true;
var file = fileInput[0];
var xhttp = new XMLHttpRequest();
xhttp.onreadystatechange = function() {
if (xhttp.readyState == 4) {
if (xhttp.status == 200) {
document.open();
document.write(xhttp.responseText);
document.close();
} else if (xhttp.status == 0) {
alert("Server closed the connection abruptly!");
location.reload()
} else {
alert(xhttp.status + " Error!\n" + xhttp.responseText);
location.reload()
}
}
};
xhttp.open("POST", upload_path, true);
xhttp.send(file);
} }
} }
// 文件大小格式化
function formatFileSize(size) {
if (size < 1024) return size + " B";
else if (size < 1024 * 1024) return (size / 1024).toFixed(2) + " KB";
else return (size / (1024 * 1024)).toFixed(2) + " MB";
}
function upload() {
var fileInput = document.getElementById("newfile");
var filePath = document.getElementById("filepath").value;
if (fileInput.files.length === 0) {
alert("请先选择一个文件!");
return;
}
var formData = new FormData();
formData.append("file", fileInput.files[0]);
formData.append("path", filePath);
fetch("/upload", {
method: "POST",
body: formData,
headers: {
"Accept": "application/json"
}
}).then(response => response.text())
.then(data => alert("上传成功:" + data))
.catch(error => alert("上传失败:" + error));
}
</script> </script>
<table class="fixed" border="0"> <table class="fixed" border="0">
<col width="1000px" /><col width="500px" /> <col width="1000px" /><col width="500px" />