From 3ab91745be6d7db68b3aa08ed33579bbde27cb6f Mon Sep 17 00:00:00 2001
From: MeowOS <meowos@local>
Date: Tue, 1 Sep 2026 04:40:34 +0800
Subject: [PATCH] =?UTF-8?q?fix(launcher):=20Now=20Playing=20=E6=AD=BB?=
 =?UTF-8?q?=E5=BE=AA=E7=8E=AF=E4=BF=AE=E5=A4=8D(=E7=A9=BA=E6=80=81?=
 =?UTF-8?q?=E4=B8=8D=E5=86=8D=E6=AF=8F=E5=B8=A7=E6=95=B4=E9=A1=B5=E9=87=8D?=
 =?UTF-8?q?=E7=94=BB,=E4=BF=AE100%CPU/=E5=8D=A1=E6=AD=BB)=20+=20NP?=
 =?UTF-8?q?=E9=A1=B5=E6=8E=A5=E7=AE=A1=E7=94=B5=E6=BA=90=E9=94=AE(?=
 =?UTF-8?q?=E5=8D=95=E5=87=BB=E6=81=AF=E5=B1=8F/=E4=BA=AE=E5=B1=8F)=20+=20?=
 =?UTF-8?q?NP=E9=A1=B5=E8=87=AA=E5=8A=A8=E6=81=AF=E5=B1=8F=20+=20=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81=E6=A0=8F=E5=85=85=E7=94=B5=E9=97=AA=E7=94=B5=E5=9B=BE?=
 =?UTF-8?q?=E6=A0=87(sb=5Ficons=20=E6=96=B0=E5=A2=9E=20bolt,=20charging=20?=
 =?UTF-8?q?=E6=97=B6=E7=94=B5=E9=87=8F=E5=9B=BE=E6=A0=87=E5=B7=A6=E9=82=BB?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA)=E3=80=82=E5=AE=BF=E4=B8=BB=20test=5Fsb=5Fst?=
 =?UTF-8?q?atusbar=20PASS;=20launcher=206de97628=20=E5=BE=85=E5=85=A5=20M2?=
 =?UTF-8?q?.92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 meow_ui_internal.h | 1 +
 meow_ui_sys.c      | 2 ++
 sb_icons.h         | 8 +++++++-
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/meow_ui_internal.h b/meow_ui_internal.h
index a091f01..013c73c 100644
--- a/meow_ui_internal.h
+++ b/meow_ui_internal.h
@@ -62,6 +62,7 @@ void meow_ui_sys_statusbar_render_off(int yoff);
 #define MEOW_SB_ICON_BT_CONN     11
 #define MEOW_SB_ICON_BT_DIS      12
 #define MEOW_SB_ICON_BT_SEARCH   13
+#define MEOW_SB_ICON_BATT_CHG    14
 
 /* 状态栏右下布局常量（与 launcher SB_* 对齐）：图标右缘↔文字间隙 / 相邻项间隙 / 图标目标 ink 高 /
  * 右簇左缘相对时钟右缘安全间距 / 图标 ink 垂直中心（=状态栏文字中心，28px 栏约 14）。 */
diff --git a/meow_ui_sys.c b/meow_ui_sys.c
index 3df3327..6bce425 100644
--- a/meow_ui_sys.c
+++ b/meow_ui_sys.c
@@ -371,6 +371,8 @@ void meow_ui_sys_statusbar_render_off(int yoff)
     if (g_sys.batt >= 0) {                                  /* 电量：图标+%（未知不画）——最右项 */
         snprintf(val, sizeof val, "%d%%", g_sys.batt);
         sb_r_place(&xr, MEOW_SB_ICON_BATT, val, col, MEOW_SB_ICON_INK, ty, ycy);
+        if (g_sys.charging)                                 /* 充电中：电量图标左邻加闪电（M2.92） */
+            sb_r_place(&xr, MEOW_SB_ICON_BATT_CHG, NULL, col, MEOW_SB_ICON_INK, ty, ycy);
     }
     snprintf(val, sizeof val, "%d%%", g_sys.vol);
     sb_r_place(&xr, MEOW_SB_ICON_VOL, val, col, MEOW_SB_ICON_INK, ty, ycy);   /* 音量：图标+% */
diff --git a/sb_icons.h b/sb_icons.h
index c082b26..db7570f 100644
--- a/sb_icons.h
+++ b/sb_icons.h
@@ -191,6 +191,11 @@ static const unsigned char SB_ICON_BT_SEARCH[1024]={
 0,0,0,0,0,2,3,2,0,0,2,0,190,252,251,252,81,0,4,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,0,190,255,251,83,0,4,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,0,64,178,77,0,4,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,3,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 };
 
+
+static const unsigned char SB_ICON_BATT_CHG[1024]={
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,31,63,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,191,63,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,63,255,47,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,207,255,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,95,255,255,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,15,239,255,255,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,127,255,255,223,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,31,255,255,255,191,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,159,255,255,255,191,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,63,255,255,255,255,207,63,63,63,63,63,63,15,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,191,255,255,255,255,255,255,255,255,255,255,191,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,95,255,255,255,255,255,255,255,255,255,255,239,31,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,15,223,255,255,255,255,255,255,255,255,255,255,111,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,127,255,255,255,255,255,255,255,255,255,255,191,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,15,239,255,255,255,255,255,255,255,255,255,239,31,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,111,255,255,255,255,79,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,175,255,255,255,175,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,239,255,255,239,15,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,47,255,255,255,79,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,95,255,255,175,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,159,255,239,15,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,223,255,63,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,31,255,143,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,79,223,15,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,143,63,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,95,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,15,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+};
+
 static const sb_icon_t sb_icons[] = {
     { SB_ICON_WIFI },
     { SB_ICON_BT },
@@ -206,11 +211,12 @@ static const sb_icon_t sb_icons[] = {
     { SB_ICON_BT_CONN },
     { SB_ICON_BT_DIS },
     { SB_ICON_BT_SEARCH },
+    { SB_ICON_BATT_CHG },
 };
 
 /* 枚举索引（与 sb_icons[] 对应） */
 enum { SB_I_WIFI=0, SB_I_BT=1, SB_I_BATT=2, SB_I_VOL=3, SB_I_BRIGHT=4,
        SB_I_WIFI_STRONG=5, SB_I_WIFI_MEDIUM=6, SB_I_WIFI_WEAK=7,
        SB_I_WIFI_NO=8, SB_I_WIFI_OFF=9, SB_I_BT_NO=10, SB_I_BT_CONN=11,
-       SB_I_BT_DIS=12, SB_I_BT_SEARCH=13 };
+       SB_I_BT_DIS=12, SB_I_BT_SEARCH=13, SB_I_BATT_CHG=14 };
 #endif /* SB_ICONS_H */
\ No newline at end of file