kicer/ws2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

fix issues

Browse Source
This commit is contained in:
kicer
2026-02-01 22:16:03 +08:00
parent b068b9cf49
commit a84ff1ea49
2 changed files with 133 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/rom/app.py
View File

@@ -81,7 +81,6 @@ def authenticate(credentials):
return decorator return decorator
# /status: 获取系统状态 # /status: 获取系统状态
@authenticate(credentials=CREDENTIALS) @authenticate(credentials=CREDENTIALS)
async def sys_status(request): async def sys_status(request):
@@ -92,8 +91,9 @@ async def sys_status(request):
"time": "{}-{:02d}-{:02d} {:02d}:{:02d}:{:02d}".format( "time": "{}-{:02d}-{:02d} {:02d}:{:02d}:{:02d}".format(
*time.localtime() *time.localtime()
), ),
"uptime": str(f"{time.ticks_ms() // 1000} sec"), "uptime": time.ticks_ms(),
"memory": str(f"{gc.mem_free() // 1000} KB"), "mem_free": gc.mem_free(),
"mem_alloc": gc.mem_alloc(),
"uuid": uuid(), "uuid": uuid(),
"platform": str(sys.platform), "platform": str(sys.platform),
"version": str(sys.version), "version": str(sys.version),

238
src/rom/www/index.html
View File

@@ -48,10 +48,20 @@
<div class="card"> <div class="card">
<div class="header"> <div class="header">
<h1>WS2桌面气象站</h1> <h1>WS2桌面气象站</h1>
<button class="btn" id="logout-btn">退出</button>
</div> </div>
<div class="alert hidden" id="message"></div> <div
class="alert"
style="
position: fixed;
top: 25px;
left: 50%;
transform: translateX(-50%);
z-index: 1000;
display: none;
"
id="message"
></div>
<!-- 导航选项卡 --> <!-- 导航选项卡 -->
<div class="nav-tabs"> <div class="nav-tabs">
@@ -78,7 +88,7 @@
</div> </div>
<div> <div>
<strong>可用内存:</strong> <strong>可用内存:</strong>
<span data-bind="memory">-</span> <span data-bind="mem_free">-</span>
</div> </div>
<div> <div>
<strong>UUID:</strong> <span data-bind="uuid">-</span> <strong>UUID:</strong> <span data-bind="uuid">-</span>
@@ -92,52 +102,40 @@
<span data-bind="version">-</span> <span data-bind="version">-</span>
</div> </div>
</div> </div>
<button class="btn" id="refresh-status-btn">刷新状态</button>
</div> </div>
<!-- 屏幕显示选项卡 --> <!-- 屏幕显示选项卡 -->
<div id="display-tab" class="tab-content"> <div id="display-tab" class="tab-content">
<h3>LCD状态</h3> <h3>LCD显示设置</h3>
<div class="row"> <div class="form-group">
<div class="col"> <div
<div class="list"> style="
<div class="list-item"> display: flex;
<strong>就绪状态:</strong> justify-content: space-between;
<span id="lcd-ready-display">-</span> align-items: center;
<span "
id="lcd-ready-badge-display" >
class="badge badge-warning" <label class="form-label mb-0">显示状态</label>
></span> <span
</div> id="lcd-ready-badge"
<div class="list-item"> class="badge badge-warning"
<strong>当前亮度:</strong> ></span>
<span id="lcd-brightness-display">-</span>%
</div>
<div class="list-item">
<strong>UI类型:</strong>
<span id="lcd-ui-type-display">-</span>
</div>
<div class="list-item">
<strong>数据内容:</strong>
<span id="lcd-data-display">-</span>
</div>
</div>
</div> </div>
</div> </div>
<h3 class="mt-3">显示设置</h3>
<div class="form-group"> <div class="form-group">
<label class="form-label">亮度 (0-100)</label> <label class="form-label">屏幕亮度</label>
<input <div style="display: flex; align-items: center">
type="range" <input
id="brightness-slider" type="range"
min="0" id="brightness-slider"
max="100" min="0"
class="form-control" max="100"
style="padding:10px 0" class="form-control"
/> style="margin-right: 10px; padding: 10px 0"
<div>当前值: <span id="brightness-value">-</span></div> />
<span id="brightness-value">-</span>%
</div>
</div> </div>
<div class="form-group"> <div class="form-group">
@@ -151,6 +149,14 @@
<button class="btn btn-success" id="apply-display-btn"> <button class="btn btn-success" id="apply-display-btn">
应用设置 应用设置
</button> </button>
<h3 class="mt-3">LCD数据内容</h3>
<table class="table" id="lcd-data-table">
<tr>
<th>属性</th>
<th>值</th>
</tr>
</table>
</div> </div>
<!-- 系统配置选项卡 --> <!-- 系统配置选项卡 -->
@@ -216,7 +222,8 @@
<span class="badge badge-info">彩色</span> <span class="badge badge-info">彩色</span>
</div> </div>
<div class="list-item"> <div class="list-item">
<strong>环境参数:</strong> 温度、湿度、PM2.5、气压、AQI <strong>环境参数:</strong>
温度、湿度、PM2.5、气压、AQI
</div> </div>
</div> </div>
</div> </div>
@@ -225,7 +232,12 @@
<div class="list"> <div class="list">
<div class="list-item"> <div class="list-item">
<strong>固件:</strong> <strong>固件:</strong>
<a href="https://iot.foresh.com/git/kicer/ws2" target="_blank"> ws2-v1.3.0 </a> <a
href="https://iot.foresh.com/git/kicer/ws2"
target="_blank"
>
ws2-v1.3.0
</a>
<span class="badge badge-success">开源</span> <span class="badge badge-success">开源</span>
</div> </div>
<div class="list-item"> <div class="list-item">
@@ -239,8 +251,20 @@
</div> </div>
<h3 class="mt-3">开放源码</h3> <h3 class="mt-3">开放源码</h3>
<a href="https://github.com/kicer/ws2" target="_blank" class="btn btn-outline"> Kicer@Github: ws2 </a> <a
<a href="https://iot.foresh.com/git/kicer/ws2" target="_blank" class="btn btn-outline"> Kicer@foresh: ws2（国内访问）</a> href="https://github.com/kicer/ws2"
target="_blank"
class="btn btn-outline"
>
kicer@Github: ws2
</a>
<a
href="https://iot.foresh.com/git/kicer/ws2"
target="_blank"
class="btn btn-outline"
>
kicer@Foresh: ws2（国内访问）</a
>
<h3 class="mt-3">软件许可</h3> <h3 class="mt-3">软件许可</h3>
<p>本项目采用MIT许可证开源，欢迎自由使用和修改。</p> <p>本项目采用MIT许可证开源，欢迎自由使用和修改。</p>
@@ -257,13 +281,11 @@
initTabSwitching(); initTabSwitching();
initEventHandlers(); initEventHandlers();
refreshStatus(); refreshStatus();
loadConfig();
updateDisplaySettings();
}); });
// 初始化选项卡切换 // 初始化选项卡切换
function initTabSwitching() { function initTabSwitching() {
mw.$$(".nav-tab").forEach(tab => { mw.$$(".nav-tab").forEach((tab) => {
mw.on(tab, "click", function () { mw.on(tab, "click", function () {
const tabName = mw.attr(this, "data-tab"); const tabName = mw.attr(this, "data-tab");
showTab(tabName); showTab(tabName);
@@ -273,19 +295,11 @@
// 初始化事件处理器 // 初始化事件处理器
function initEventHandlers() { function initEventHandlers() {
// 退出按钮
mw.on(mw.$("#logout-btn"), "click", function () {
alert("退出功能暂未实现");
});
// 亮度滑块 // 亮度滑块
mw.on(mw.$("#brightness-slider"), "input", function () { mw.on(mw.$("#brightness-slider"), "input", function () {
mw.text(mw.$("#brightness-value"), mw.val(this)); mw.text(mw.$("#brightness-value"), mw.val(this));
}); });
// 刷新状态按钮
mw.on(mw.$("#refresh-status-btn"), "click", refreshStatus);
// 应用显示设置按钮 // 应用显示设置按钮
mw.on( mw.on(
mw.$("#apply-display-btn"), mw.$("#apply-display-btn"),
@@ -299,19 +313,14 @@
// 更新LCD状态徽章 // 更新LCD状态徽章
function updateLcdBadges(isReady) { function updateLcdBadges(isReady) {
const badge1 = mw.$("#lcd-ready-badge"); const badge = mw.$("#lcd-ready-badge");
const badge2 = mw.$("#lcd-ready-badge-display");
if (isReady) { if (isReady) {
mw.text(badge1, "正常"); mw.text(badge, "正常");
mw.text(badge2, "正常"); mw.replaceClass(badge, "badge-warning", "badge-success");
mw.replaceClass(badge1, "badge-warning", "badge-success");
mw.replaceClass(badge2, "badge-warning", "badge-success");
} else { } else {
mw.text(badge1, "未就绪"); mw.text(badge, "未就绪");
mw.text(badge2, "未就绪"); mw.replaceClass(badge, "badge-success", "badge-warning");
mw.replaceClass(badge1, "badge-success", "badge-warning");
mw.replaceClass(badge2, "badge-success", "badge-warning");
} }
} }
@@ -347,14 +356,14 @@
async function refreshStatus() { async function refreshStatus() {
try { try {
// 获取系统状态 // 获取系统状态
const statusResponse = await mw.ajax.get("/status"); const response = await mw.ajax.get("/status");
const statusData = JSON.parse(statusResponse); const data = JSON.parse(response);
// 使用数据绑定更新系统状态 // 使用数据绑定更新系统状态
mw.bind(statusData); mw.bind(data);
// 更新内存仪表盘 // 更新内存仪表盘
updateMemoryGauge(statusData.memory); updateMemoryGauge(data.mem_free, data.mem_alloc);
showMessage("状态已更新", "success"); showMessage("状态已更新", "success");
} catch (error) { } catch (error) {
@@ -363,34 +372,24 @@
} }
// 更新内存仪表盘 // 更新内存仪表盘
function updateMemoryGauge(memoryStr) { function updateMemoryGauge(free, alloc) {
// 从内存字符串中提取数值，例如 "100 KB" -> 100 const maxMemory = parseInt(free) + parseInt(alloc);
const match = memoryStr.match(/(\d+)/); const memoryValue = parseInt(alloc);
if (match) { const percentage = Math.min(
// 这里简化处理，假设最大可用内存为50KB 100,
const maxMemory = 50; Math.round((memoryValue / maxMemory) * 100),
const memoryValue = parseInt(match[1]); );
const percentage = Math.min(
100,
Math.round((memoryValue / maxMemory) * 100),
);
// 使用micro.js的图表功能创建仪表盘 // 使用micro.js的图表功能创建仪表盘
mw.chart.createGauge( mw.chart.createGauge(mw.$("#memory-gauge"), percentage, 100, {
mw.$("#memory-gauge"), label: "内存使用率",
percentage, color:
100, percentage > 80
{ ? "#e74c3c"
label: "内存使用率", : percentage > 50
color: ? "#f39c12"
percentage > 80 : "#27ae60",
? "#e74c3c" });
: percentage > 50
? "#f39c12"
: "#27ae60",
},
);
}
} }
// 更新显示设置 // 更新显示设置
@@ -399,21 +398,18 @@
const response = await mw.ajax.get("/lcd"); const response = await mw.ajax.get("/lcd");
const data = JSON.parse(response); const data = JSON.parse(response);
// 更新LCD状态 // 更新亮度滑块和显示值
const lcdBindings = {
"lcd-ready": data.ready ? "就绪" : "未就绪",
"lcd-brightness": data.brightness,
"lcd-ui-type": data.ui_type,
"lcd-data": JSON.stringify(data.data),
};
mw.bind(lcdBindings);
// 更新亮度滑块
mw.val(mw.$("#brightness-slider"), data.brightness); mw.val(mw.$("#brightness-slider"), data.brightness);
mw.text(mw.$("#brightness-value"), data.brightness); mw.text(mw.$("#brightness-value"), data.brightness);
// 更新UI类型选择框 // 更新UI类型选择框
mw.val(mw.$("#ui-type-select"), data.ui_type); mw.val(mw.$("#ui-type-select"), data.ui_type);
// 更新LCD状态徽章
updateLcdBadges(data.ready);
// 更新LCD数据表格
updateLcdDataTable(data.data);
} catch (error) { } catch (error) {
showMessage("获取LCD状态失败: " + error.message, "error"); showMessage("获取LCD状态失败: " + error.message, "error");
} }
@@ -434,7 +430,8 @@
if (data.status === "success") { if (data.status === "success") {
showMessage("显示设置已应用", "success"); showMessage("显示设置已应用", "success");
refreshStatus(); // 刷新显示设置
await updateDisplaySettings();
} else { } else {
showMessage( showMessage(
"设置失败: " + (data.message || "未知错误"), "设置失败: " + (data.message || "未知错误"),
@@ -493,6 +490,31 @@
} }
} }
// 更新LCD数据表格
function updateLcdDataTable(data) {
const dataTable = mw.$("#lcd-data-table");
// 清除现有行（保留标题行）
while (dataTable.rows.length > 1) {
dataTable.deleteRow(1);
}
// 添加数据行
for (const key in data) {
const row = dataTable.insertRow();
const cell1 = row.insertCell(0);
const cell2 = row.insertCell(1);
mw.text(cell1, key);
let value = data[key];
// 如果值是对象，则转换为JSON字符串
if (typeof value === "object") {
value = JSON.stringify(value);
}
mw.text(cell2, value);
}
}
// 保存配置 // 保存配置
async function saveConfig() { async function saveConfig() {
try { try {