zouhaitao/stc32g128k
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor(app): App-per-screen navigation, remove menu_level entirely

Browse Source 
Splits the ad-hoc menu_level state machine into standalone Apps with a
uniform parent/child exit convention (long-press CONFIRM -> parent):
clock_app renamed to home_app (boot-default), new set_clock_app
extracted from home_app's time-edit mode, new ipc_bind_app extracted
from menu_app's old level-2 screen, and the sensor-type selection step
merged into pair_app as its new initial state. menu_app now only holds
the 4-item top-level list (language toggle inline). Also makes both
menu_app and pair_app's up/down navigation cyclic (wraps at both ends).
This commit is contained in:
edisondeng
2026-07-31 18:05:23 +08:00
parent 655d29bbe1
commit 56b92a8ede
13 changed files with 462 additions and 393 deletions
Download Patch File Download Diff File Expand all files Collapse all files

94
App/app_pair.c
View File

@@ -12,10 +12,21 @@
extern SystemState current_state;
extern u8 captured_type;
extern u32 captured_addr;
extern u8 menu_select;
extern volatile u16 ms_tick;
// 二级传感器对码菜单中，各类传感器显示名称的字符串 ID，实际文案由 Lang_Get() 按当前语言取出
const StringID device_menu_ids[5] = {
STR_DEV_PORTE, // 0: 门磁探测器
STR_DEV_PIR, // 1: 红外探测器
STR_DEV_FUMEE, // 2: 烟雾传感器
STR_DEV_GAZ, // 3: 燃气探测器
STR_DEV_EAU // 4: 水浸探测器
};
// 对码状态机定义
enum {
PAIR_STATE_SELECT_TYPE, // 选择要学习的传感器类型 (门磁/PIR/烟感/气感/水浸)
PAIR_STATE_WAIT, // 等待射频探测器触发 (扩散雷达页面)
PAIR_STATE_CONFIRM, // 已捕获，进入分配防区确认页面
PAIR_STATE_SUCCESS, // 对码绑定成功界面 (SUCCESS)
@@ -48,13 +59,10 @@ WristbandApp pair_app = {
};
/**
* @brief PairApp 启动回调
* @brief 进入雷达搜索等待阶段 (选定传感器类型之后)
*/
static void PairApp_OnStart(void)
static void PairApp_EnterWait(void)
{
// 1. 为了防止后台射频监听与对码射频接收冲突，将后台射频监听应用暂时卸载
AppManager_DetachFromBackground(&rf_monitor_app);
pair_state = PAIR_STATE_WAIT;
last_radar_sec = 99; // 强制刷写
current_state = STATE_PAIR_WAIT;
@@ -62,14 +70,32 @@ static void PairApp_OnStart(void)
last_run_tick = ms_tick;
captured_zone = 1;
RF_SetMode(1); // 开启无线接收模式
// 初始化对码搜索页面绘制
UI_ShowPairWaitPage(0);
// 开启白色幻彩双灯珠常亮 (R=150, G=150, B=150)，作为对码状态视觉指示
RGB_Send(150, 150, 150, 150, 150, 150);
XTELL_LOG("[PairApp] Started (WAIT)\r\n");
XTELL_LOG("[PairApp] Entering WAIT\r\n");
}
/**
* @brief PairApp 启动回调
*/
static void PairApp_OnStart(void)
{
// 为了防止后台射频监听与对码射频接收冲突，将后台射频监听应用暂时卸载
AppManager_DetachFromBackground(&rf_monitor_app);
pair_state = PAIR_STATE_SELECT_TYPE;
menu_select = 0;
current_state = STATE_PAIR_MENU;
RF_SetMode(0); // 选类型阶段暂不需要天线，防止接收杂波干扰屏幕绘制
UI_ShowPairMenuPage(menu_select); // 绘制传感器类型选择页
RGB_Send(0, 0, 0, 0, 0, 0);
XTELL_LOG("[PairApp] Started (SELECT_TYPE)\r\n");
}
/**
@@ -103,7 +129,7 @@ static void PairApp_onRun(void)
last_radar_sec = frame;
UI_ShowPairWaitPage(frame);
}
// 累加计算 30 秒的对码时间上限
pair_pulse_timer += tick_diff;
if (pair_pulse_timer >= 30000UL) {
@@ -112,13 +138,13 @@ static void PairApp_onRun(void)
current_state = STATE_PAIR_FAIL;
fail_start_sec = current_sec;
UI_ShowPairFailPage(1); // 绘制超时大红叉页
// 红色双灯常亮警告
RGB_Send(200, 0, 0, 200, 0, 0);
XTELL_LOG("[PairApp] Timeout fail!\r\n");
return;
}
// ====== 物理射频包解调接收监听 ======
if (EV1527_Decode(&rx_addr, &rx_data)) {
// 保护机制：排除 SOS 码 (0x08)
@@ -142,14 +168,14 @@ static void PairApp_onRun(void)
else RGB_Send(0, 0, 0, 0, 0, 0);
}
else if (pair_state == PAIR_STATE_SUCCESS) {
// ====== 成功展示状态：延时 2 秒自动返回二级设置菜单 ======
// ====== 成功展示状态：延时 2 秒自动返回主菜单 ======
u8 elapsed = (current_sec >= success_start_sec) ? (current_sec - success_start_sec) : (60 + current_sec - success_start_sec);
if (elapsed >= 2) {
AppManager_SwitchToForeground(&menu_app);
}
}
else if (pair_state == PAIR_STATE_FAIL) {
// ====== 失败展示状态：延时 5 秒自动返回二级设置菜单 ======
// ====== 失败展示状态：延时 5 秒自动返回主菜单 ======
u8 elapsed = (current_sec >= fail_start_sec) ? (current_sec - fail_start_sec) : (60 + current_sec - fail_start_sec);
if (elapsed >= 5) {
AppManager_SwitchToForeground(&menu_app);
@@ -177,6 +203,30 @@ static void PairApp_onClose(void)
*/
static EventResult PairApp_onEvent(SystemEvent *evt)
{
if (pair_state == PAIR_STATE_SELECT_TYPE) {
if (evt->key_event == KEY_EVENT_UP_CLICK) {
// 短按 ▲ 键上移焦点，允许循环切换 (到顶绕到底)
menu_select = (menu_select == 0) ? 4 : (menu_select - 1);
UI_ShowPairMenuPage(menu_select);
return EVENT_HANDLED;
}
if (evt->key_event == KEY_EVENT_DOWN_CLICK) {
// 短按 ▼ 键下移焦点，允许循环切换 (到底绕到顶)
menu_select = (menu_select == 4) ? 0 : (menu_select + 1);
UI_ShowPairMenuPage(menu_select);
return EVENT_HANDLED;
}
if (evt->key_event == KEY_EVENT_CONFIRM_CLICK) {
// 确认选择：缓存用户选好的传感器类别，短震反馈并进入雷达搜索阶段
captured_type = menu_select;
MOTOR = 1;
Delay_ms(100);
MOTOR = 0;
PairApp_EnterWait();
return EVENT_HANDLED;
}
}
if (pair_state == PAIR_STATE_CONFIRM) {
if (evt->key_event == KEY_EVENT_UP_CLICK) {
// 短按 ▲ 键增加目标分配防区号 (上限 99)
@@ -197,31 +247,25 @@ static EventResult PairApp_onEvent(SystemEvent *evt)
if (evt->key_event == KEY_EVENT_CONFIRM_CLICK) {
// 短按 ■ 确认键，写入 EEPROM 传感器数据库并保存
Add_Sensor_With_Zone(captured_addr, captured_type, captured_zone);
pair_state = PAIR_STATE_SUCCESS;
current_state = STATE_PAIR_SUCCESS;
success_start_sec = current_sec;
UI_ShowPairSuccessPage(); // 绘制打勾页
// 绿色双灯珠常亮，震动马达长震 400ms 反馈
RGB_Send(0, 200, 0, 0, 200, 0);
MOTOR = 1;
Delay_ms(400);
MOTOR = 0;
XTELL_LOG("[PairApp] Sensor saved successfully.\r\n");
return EVENT_HANDLED;
}
if (evt->key_event == KEY_EVENT_CONFIRM_LONG) {
// 长按 ■ 确认键放弃本次捕获，直接返回二级主菜单
RGB_Send(0, 0, 0, 0, 0, 0);
AppManager_SwitchToForeground(&menu_app);
return EVENT_HANDLED;
}
}
// 在对码搜寻或确认防区期间，长按 ▼ 键均代表强行取消对码直接退回菜单页
if (evt->key_event == KEY_EVENT_DOWN_LONG) {
// 在任何阶段，长按 ■ 确认键或长按 ▼ 键都代表放弃/取消对码，统一退回主菜单 (父 App)
if (evt->key_event == KEY_EVENT_CONFIRM_LONG || evt->key_event == KEY_EVENT_DOWN_LONG) {
RGB_Send(0, 0, 0, 0, 0, 0);
AppManager_SwitchToForeground(&menu_app);
return EVENT_HANDLED;