diff --git a/UI/UI_global.c b/UI/UI_global.c index 2c8035a..142bc34 100644 --- a/UI/UI_global.c +++ b/UI/UI_global.c @@ -237,9 +237,10 @@ uint8_t UI_SetFocus(uint8_t widget_id) void UI_DrawStatusSepLine(void) { - /* 与模式选择/各模式主页统一:需求稿分割线 y=36 */ - LCD_DrawLine(0, UI0902_STATUS_SEP_Y, 239, UI0902_STATUS_SEP_Y, - UI0902_STATUS_SEP_COLOR); + /* 与模式选择/各模式主页统一:需求稿分割线 y=36,2px 厚 */ + LCD_FillByColor(0, UI0902_STATUS_SEP_Y, 240, + (uint16_t)(UI0902_STATUS_SEP_Y + UI0902_SEP_LINE_THICK), + UI0902_STATUS_SEP_COLOR); } void label_top() @@ -859,9 +860,10 @@ void Draw_Bottom_Bar(uint8_t sel, uint8_t first_back) /* 从段落钮底边之下清屏,勿切掉按钮底圆角(钮 y=231..264) */ LCD_FillByColor(0, (uint16_t)(UI0902_SECTION_Y + UI0902_SECTION_BTN_H), 240, 320, UI0902_BG_COLOR); - /* mode.png:段落钮与底栏之间横线分隔 */ - LCD_DrawLine(0, UI0902_SEP_LINE_Y, 239, UI0902_SEP_LINE_Y, UI0902_SEP_LINE_COLOR); - LCD_DrawLine(0, UI0902_SEP_LINE_Y + 1, 239, UI0902_SEP_LINE_Y + 1, UI0902_SEP_LINE_COLOR); + /* mode.png:段落钮与底栏之间横线分隔(与顶栏同色同厚) */ + LCD_FillByColor(0, UI0902_SEP_LINE_Y, 240, + (uint16_t)(UI0902_SEP_LINE_Y + UI0902_SEP_LINE_THICK), + UI0902_SEP_LINE_COLOR); if (sel == UI0902_NAV_UNIVERSAL) { icons[0] = gImage_Nav_Universal_Sel; ws[0] = 36; hs[0] = 28; } else { icons[0] = gImage_Nav_Universal_Not; ws[0] = 36; hs[0] = 28; } diff --git a/UI/UI_global.h b/UI/UI_global.h index 4e8e9ef..4eb46d2 100644 --- a/UI/UI_global.h +++ b/UI/UI_global.h @@ -30,7 +30,10 @@ void CallUI_RestoreSelect(void); #define UI_STATUS_BAR_H 26 /* 0902-01/02 需求稿:分割线 y=36,居中于顶栏图标底与移调/速度控件顶之间 */ #define UI0902_STATUS_SEP_Y 36 -#define UI0902_STATUS_SEP_COLOR 0x52AA /* 比旧 0x2988 更清晰,避免在蓝牙下看成断开 */ +/* 顶/底共用:偏亮灰蓝,2px 厚,保证暗底上可辨 */ +#define UI0902_SEP_LINE_COLOR 0x94D5 /* RGB(144,152,168) */ +#define UI0902_SEP_LINE_THICK 2 +#define UI0902_STATUS_SEP_COLOR UI0902_SEP_LINE_COLOR /* 0902 设计稿配色与底栏导航 */ #define UI0902_BG_COLOR 0x0042 /* #000813 页面背景 */ #define UI0902_ROW_BG 0x2147 /* #242B3A 列表行背景 */ @@ -87,9 +90,8 @@ void CallUI_RestoreSelect(void); #define UI0902_CARD_SUB_H 9 #define UI0902_CARD_SUB_Y 89 -/* 段落钮与底栏分隔线(mode.png ≈ y274) */ +/* 段落钮与底栏分隔线(mode.png ≈ y274);颜色与顶栏共用 UI0902_SEP_LINE_COLOR */ #define UI0902_SEP_LINE_Y 274 -#define UI0902_SEP_LINE_COLOR 0x0883 /* #09111C */ /* 兼容旧相对偏移宏(= 绝对Y - CARD_Y) */ #define UI0902_CARD_LABEL_DY (UI0902_CARD_LABEL_Y - UI0902_CARD_Y)