refactor(event): replace global 60s inactivity timer with per-second tick event

Adds KEY_EVENT_SECOND_TICK, generated once per real second from
Clock_IncMS() via a new second_tick_flag and pushed through the normal
event queue, so every foreground App's onEvent() receives it and
decides independently whether to act. Removes the old global
inactivity_timer (60s sleep from anywhere) entirely. HomeApp now
accumulates its own idle-second counter and sleeps after 10s idle
specifically while on the home screen; MenuApp's existing 10s
auto-close is converted from onRun() polling to the same tick+reset
pattern for consistency. Any non-tick key event resets each app's own
counter to 0.
This commit is contained in:
edisondeng
2026-07-31 18:49:03 +08:00
parent cbd480eea3
commit 2a83079007
8 changed files with 70 additions and 54 deletions

View File

@@ -81,7 +81,8 @@ typedef enum {
KEY_EVENT_UP_DOWN_COMB, // ▲ 与 ▼ 双键组合按下事件
KEY_EVENT_CONFIRM_CLICK, // ■ 确认键短按事件 (保存设置或进入子菜单)
KEY_EVENT_CONFIRM_LONG, // ■ 确认键长按事件 (打开主菜单)
KEY_EVENT_POWER_OFF // 长按 KEY_DOWN 开关机触发事件
KEY_EVENT_POWER_OFF, // 长按 KEY_DOWN 开关机触发事件
KEY_EVENT_SECOND_TICK // 整秒滴答事件,每秒派发一次,各 App 自行决定是否用它累计闲置时长
} KeyEvent;
/* ====== 事件优先级枚举 ====== */
@@ -141,6 +142,7 @@ extern u8 current_hour; // 当前系统时间:小时
extern u8 current_min; // 当前系统时间:分钟
extern u8 current_sec; // 当前系统时间:秒
extern volatile u8 clock_updated; // 时钟分钟更新标志 (1表示需要刷新待机页时间)
extern volatile bit second_tick_flag; // 整秒滴答标志位,每秒置 1由主循环转换为 KEY_EVENT_SECOND_TICK 事件
extern u8 menu_select; // 当前菜单高亮的选中项索引
extern u32 captured_addr; // 对码或报警时,当前捕获到的传感器 24 位射频地址
@@ -151,7 +153,6 @@ extern Sensor_Slot xdata sensor_list[16];// 传感器数据库数组 (存储在
// 系统滴答与定时计数器 (均为 1ms 中断服务中更新)
extern volatile u16 ms_tick; // 毫秒滴答计数器 (0~999循环)
extern volatile u16 inactivity_timer; // 用户闲置计时器 (用作无操作自动休眠单位10ms)
extern volatile u32 pair_timeout_ms; // 对码等待搜寻超时毫秒计数器
extern volatile u16 alarm_timer_ms; // 报警振动与闪烁定时计数器
extern volatile u16 motor_timer_ms; // 马达单次震动定时计时器