diff --git a/UI/UI_global.c b/UI/UI_global.c index 1877a03..e5735bd 100644 --- a/UI/UI_global.c +++ b/UI/UI_global.c @@ -375,53 +375,33 @@ void UI_GotoCurrentModePage(void) } } -/* 暂无禁用蓝牙素材:开态图改灰 + 斜杠;后续替换 gImage 禁用图标即可 */ -static void Show_BL_Icon_DrawDisabled(void) -{ - const unsigned char *data = gImage_UI0902_Bluetooth_11x17; - uint16_t x = UI0902_BT_X; - uint16_t y = UI0902_BT_Y; - uint16_t w = UI0902_BT_W; - uint16_t h = UI0902_BT_H; - uint32_t total = (uint32_t)w * (uint32_t)h; - uint32_t i; - - for (i = 0; i < total; i++) - { - uint16_t c = (uint16_t)(((uint16_t)data[i * 2] << 8) | data[i * 2 + 1]); - uint8_t r = (uint8_t)((c >> 11) & 0x1F); - uint8_t g = (uint8_t)((c >> 5) & 0x3F); - uint8_t b = (uint8_t)(c & 0x1F); - /* 近黑视为透明(与 LCD_WR_PIC_Trans 一致) */ - if (r <= 1 && g <= 2 && b <= 1) - continue; - LCD_DrawPoint((uint16_t)(x + (i % w)), (uint16_t)(y + (i / w)), GRAY); - } - /* 禁用斜杠(左下→右上,略加粗) */ - LCD_DrawLine(x, (uint16_t)(y + h - 1), (uint16_t)(x + w - 1), y, WHITE); - LCD_DrawLine(x, (uint16_t)(y + h - 2), (uint16_t)(x + w - 2), y, WHITE); - LCD_DrawLine((uint16_t)(x + 1), (uint16_t)(y + h - 1), (uint16_t)(x + w - 1), (uint16_t)(y + 1), WHITE); -} - -/* 蓝牙图标:开=素材;关=自绘灰图标+斜杠(待换禁用素材) */ +/* Bluetooth status icons from 0923 pack (on 13x20 / off 19x20) */ void Show_BL_Icon(uint8_t value) { static int8_t s_bt_pwr = -1; uint8_t on = value ? 1u : 0u; + uint16_t draw_w; + uint16_t draw_h; + uint16_t draw_x; + const unsigned char *pic; - /* Fill 终点为开区间,传 W/H 本身;高度须停在分割线之上 */ LCD_FillByColor(UI0902_BT_X, UI0902_BT_Y, UI0902_BT_X + UI0902_BT_W, UI0902_BT_Y + UI0902_BT_H, UI0902_BG_COLOR); if (on) { - LCD_WR_PIC_Trans(UI0902_BT_X, UI0902_BT_Y, UI0902_BT_W, UI0902_BT_H, - gImage_UI0902_Bluetooth_11x17, BLACK); + draw_w = UI0902_BT_ON_W; + draw_h = UI0902_BT_ON_H; + pic = gImage_UI0902_Bluetooth_On_13x20; } else { - Show_BL_Icon_DrawDisabled(); + draw_w = UI0902_BT_OFF_W; + draw_h = UI0902_BT_OFF_H; + pic = gImage_UI0902_Bluetooth_Off_19x20; } + draw_x = (uint16_t)((240 - draw_w) / 2); + LCD_WR_PIC_Trans(draw_x, UI0902_BT_Y, draw_w, draw_h, pic, BLACK); if (s_bt_pwr != (int8_t)on) { s_bt_pwr = (int8_t)on; diff --git a/UI/UI_global.h b/UI/UI_global.h index dc45480..7d165fb 100644 --- a/UI/UI_global.h +++ b/UI/UI_global.h @@ -124,8 +124,13 @@ void CallUI_RestoreSelect(void); /* 0902 状态栏:左音量条 / 中蓝牙 / 右电池+百分比(对齐屏幕参考 0902-01) */ #define UI0902_VOL_X 8 #define UI0902_VOL_Y 3 -#define UI0902_BT_W 11 -#define UI0902_BT_H 17 +/* 0923:开 13x20 / 关 19x20;擦除区取最大宽度并居中 */ +#define UI0902_BT_ON_W 13 +#define UI0902_BT_ON_H 20 +#define UI0902_BT_OFF_W 19 +#define UI0902_BT_OFF_H 20 +#define UI0902_BT_W UI0902_BT_OFF_W +#define UI0902_BT_H UI0902_BT_OFF_H #define UI0902_BT_X ((240 - UI0902_BT_W) / 2) /* 居中 */ #define UI0902_BT_Y 5 /* 状态栏蓝牙点击热区:略大于图标,便于点按 */ diff --git a/device/LCD_ILI9341/Drv_ILI9341_Lcd_Image_UI0902.c b/device/LCD_ILI9341/Drv_ILI9341_Lcd_Image_UI0902.c index 75d1cc7..96aa1cd 100644 --- a/device/LCD_ILI9341/Drv_ILI9341_Lcd_Image_UI0902.c +++ b/device/LCD_ILI9341/Drv_ILI9341_Lcd_Image_UI0902.c @@ -90,31 +90,91 @@ const unsigned char gImage_UI0902_Volume_20x15[600] = { /* 20x15 RGB565 BE */ 0x00,0x21,0x5A,0xEC,0x94,0xD3,0x08,0x82, }; -const unsigned char gImage_UI0902_Bluetooth_11x17[374] = { /* 11x17 RGB565 BE */ -0x00,0x21,0x00,0x42,0x00,0x42,0x00,0x42,0x52,0xAB,0xFF,0xFF,0x63,0x2D,0x00,0x42, -0x00,0x42,0x00,0x42,0x00,0x21,0x00,0x21,0x00,0x42,0x00,0x42,0x00,0x42,0x84,0x31, -0xFF,0xFF,0xFF,0xFF,0x94,0x93,0x00,0x42,0x00,0x42,0x00,0x21,0x00,0x21,0x00,0x42, -0x00,0x42,0x00,0x42,0x84,0x31,0xFF,0xFF,0xF7,0x9E,0xFF,0xFF,0xA5,0x14,0x00,0x42, -0x00,0x21,0x00,0x21,0x00,0x42,0x00,0x42,0x00,0x42,0x84,0x31,0xFF,0xFF,0x52,0xAB, -0xD6,0x9A,0xFF,0xFF,0xA5,0x14,0x00,0x21,0x84,0x10,0xFF,0xFF,0x63,0x2D,0x00,0x42, -0x84,0x31,0xFF,0xFF,0x42,0x29,0x10,0xA4,0xF7,0x9E,0xFF,0xFF,0x42,0x08,0x31,0xA7, -0xF7,0x9E,0xFF,0xFF,0x63,0x2D,0x84,0x31,0xFF,0xFF,0x42,0x29,0xA5,0x14,0xFF,0xFF, -0xD6,0x9A,0x10,0x83,0x00,0x21,0x31,0xA7,0xF7,0x9E,0xFF,0xFF,0xF7,0x9E,0xFF,0xFF, -0xE7,0x1C,0xFF,0xFF,0xD6,0x9A,0x10,0xA4,0x00,0x21,0x00,0x21,0x00,0x42,0x21,0x26, -0xD6,0x9A,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xC6,0x18,0x10,0xA4,0x00,0x42,0x00,0x21, -0x00,0x21,0x00,0x42,0x00,0x42,0x21,0x26,0xFF,0xFF,0xFF,0xFF,0xE7,0x1C,0x00,0x42, -0x00,0x42,0x00,0x42,0x00,0x21,0x00,0x21,0x00,0x42,0x31,0xA7,0xD6,0x9A,0xFF,0xFF, -0xFF,0xFF,0xFF,0xFF,0xD6,0x9A,0x10,0xA4,0x00,0x42,0x00,0x21,0x00,0x21,0x31,0xA7, -0xF7,0x9E,0xFF,0xFF,0xE7,0x1C,0xFF,0xFF,0xD6,0x9A,0xFF,0xFF,0xD6,0x9A,0x10,0xA4, -0x00,0x21,0x31,0xA7,0xF7,0x9E,0xFF,0xFF,0x63,0x2D,0x84,0x31,0xFF,0xFF,0x42,0x29, -0xA5,0x14,0xFF,0xFF,0xD6,0x9A,0x10,0x83,0x4A,0x8B,0xFF,0xFF,0x63,0x2D,0x00,0x42, -0x84,0x31,0xFF,0xFF,0x42,0x29,0x10,0xA4,0xF7,0x9E,0xFF,0xFF,0x5B,0x0C,0x00,0x21, -0x00,0x42,0x00,0x42,0x00,0x42,0x84,0x31,0xFF,0xFF,0x52,0xAB,0xD6,0x9A,0xFF,0xFF, -0xA5,0x14,0x00,0x21,0x00,0x21,0x00,0x42,0x00,0x42,0x00,0x42,0x84,0x31,0xFF,0xFF, -0xFF,0xFF,0xFF,0xFF,0xA5,0x14,0x00,0x42,0x00,0x21,0x00,0x21,0x00,0x42,0x00,0x42, -0x00,0x42,0x84,0x31,0xFF,0xFF,0xFF,0xFF,0x84,0x31,0x00,0x42,0x00,0x42,0x00,0x21, -0x00,0x21,0x00,0x42,0x00,0x42,0x00,0x42,0x63,0x2D,0xC6,0x18,0x63,0x2D,0x00,0x42, -0x00,0x42,0x00,0x42,0x00,0x21, +const unsigned char gImage_UI0902_Bluetooth_On_13x20[520] = { /* 13x20 RGB565 BE */ +0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x31,0x86,0xD6,0x9A,0x63,0x0C, +0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, +0x00,0x00,0x00,0x00,0x84,0x10,0xFF,0xFF,0xFF,0xFF,0x84,0x10,0x00,0x00,0x00,0x00, +0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x84,0x10, +0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xA5,0x14,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, +0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x84,0x10,0xFF,0xFF,0xC6,0x18,0xF7,0x9E, +0xFF,0xFF,0xA5,0x14,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, +0x00,0x00,0x84,0x10,0xFF,0xFF,0x84,0x10,0x31,0x86,0xF7,0x9E,0xFF,0xFF,0xA5,0x14, +0x00,0x00,0x31,0x86,0xFF,0xFF,0xFF,0xFF,0x63,0x0C,0x00,0x00,0x84,0x10,0xFF,0xFF, +0x84,0x10,0x00,0x00,0x84,0x10,0xFF,0xFF,0xFF,0xFF,0x00,0x00,0x00,0x00,0x94,0x92, +0xFF,0xFF,0xFF,0xFF,0x63,0x0C,0x84,0x10,0xFF,0xFF,0x84,0x10,0x63,0x0C,0xFF,0xFF, +0xFF,0xFF,0x84,0x10,0x00,0x00,0x00,0x00,0x00,0x00,0x63,0x0C,0xFF,0xFF,0xFF,0xFF, +0xD6,0x9A,0xFF,0xFF,0xD6,0x9A,0xFF,0xFF,0xFF,0xFF,0x63,0x0C,0x00,0x00,0x00,0x00, +0x00,0x00,0x00,0x00,0x00,0x00,0x63,0x0C,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF, +0xFF,0xFF,0x63,0x0C,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, +0x00,0x00,0x63,0x0C,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x63,0x0C,0x00,0x00,0x00,0x00, +0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xA5,0x14,0xFF,0xFF, +0xFF,0xFF,0xFF,0xFF,0xA5,0x14,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, +0x00,0x00,0x00,0x00,0xD6,0x9A,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF, +0xC6,0x18,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xD6,0x9A,0xFF,0xFF, +0xE7,0x1C,0xB5,0x96,0xFF,0xFF,0xB5,0x96,0xF7,0x9E,0xFF,0xFF,0xD6,0x9A,0x00,0x00, +0x00,0x00,0x00,0x00,0xD6,0x9A,0xFF,0xFF,0xD6,0x9A,0x00,0x00,0x84,0x10,0xFF,0xFF, +0x84,0x10,0x00,0x00,0xD6,0x9A,0xFF,0xFF,0xD6,0x9A,0x00,0x00,0x00,0x00,0xE7,0x1C, +0xD6,0x9A,0x00,0x00,0x00,0x00,0x84,0x10,0xFF,0xFF,0x84,0x10,0x00,0x00,0xA5,0x14, +0xFF,0xFF,0xFF,0xFF,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, +0x84,0x10,0xFF,0xFF,0x84,0x10,0xA5,0x14,0xFF,0xFF,0xFF,0xFF,0x63,0x0C,0x00,0x00, +0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x84,0x10,0xFF,0xFF,0xF7,0x9E, +0xFF,0xFF,0xF7,0x9E,0x42,0x08,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, +0x00,0x00,0x00,0x00,0x84,0x10,0xFF,0xFF,0xFF,0xFF,0xF7,0x9E,0x31,0x86,0x00,0x00, +0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x84,0x10, +0xFF,0xFF,0xF7,0x9E,0x31,0x86,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, +0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x42,0x08,0x00,0x00,0x00,0x00, +0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, +}; + +const unsigned char gImage_UI0902_Bluetooth_Off_19x20[760] = { /* 19x20 RGB565 BE */ +0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, +0x21,0x25,0x5B,0x4F,0x29,0x66,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, +0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, +0x00,0x00,0x00,0x00,0x00,0x00,0x31,0xE8,0x6B,0xD1,0x6B,0xD1,0x3A,0x09,0x00,0x00, +0x00,0x00,0x00,0x00,0x00,0x00,0x10,0xA3,0x31,0xE8,0x00,0x00,0x00,0x00,0x00,0x00, +0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x31,0xE8,0x6B,0xD1, +0x6B,0xD1,0x6B,0xD1,0x42,0x4A,0x00,0x00,0x00,0x00,0x10,0xA3,0x63,0x90,0x6B,0xD1, +0x18,0xE4,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, +0x00,0x00,0x31,0xE8,0x6B,0xD1,0x4A,0x8C,0x63,0x90,0x63,0x90,0x00,0x00,0x29,0x66, +0x6B,0xD1,0x6B,0xD1,0x42,0x4A,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, +0x10,0xA3,0x10,0xA3,0x00,0x00,0x00,0x00,0x31,0xE8,0x6B,0xD1,0x31,0xE8,0x10,0xA3, +0x10,0xA3,0x29,0x66,0x6B,0xD1,0x6B,0xD1,0x42,0x4A,0x00,0x00,0x00,0x00,0x00,0x00, +0x00,0x00,0x00,0x00,0x10,0xA3,0x6B,0xD1,0x6B,0xD1,0x29,0x66,0x00,0x00,0x31,0xE8, +0x6B,0xD1,0x31,0xE8,0x00,0x00,0x29,0x66,0x6B,0xD1,0x6B,0xD1,0x42,0x4A,0x00,0x00, +0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x31,0xE8,0x6B,0xD1, +0x6B,0xD1,0x29,0x66,0x31,0xE8,0x5B,0x0E,0x00,0x00,0x3A,0x09,0x6B,0xD1,0x6B,0xD1, +0x31,0xE8,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, +0x00,0x00,0x00,0x00,0x29,0x66,0x6B,0xD1,0x6B,0xD1,0x31,0xC8,0x00,0x00,0x42,0x4A, +0x6B,0xD1,0x6B,0xD1,0x29,0x66,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, +0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x29,0x66,0x4A,0x8C, +0x00,0x00,0x42,0x4A,0x6B,0xD1,0x6B,0xD1,0x29,0x66,0x00,0x00,0x00,0x00,0x00,0x00, +0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, +0x00,0x00,0x00,0x00,0x00,0x00,0x52,0xCD,0x6B,0xD1,0x63,0x90,0x29,0x66,0x00,0x00, +0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, +0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x5B,0x0E,0x6B,0xD1,0x63,0x90, +0x10,0xA3,0x10,0xA3,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, +0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x5B,0x0E, +0x6B,0xD1,0x63,0x90,0x10,0xA3,0x21,0x25,0x6B,0xD1,0x5B,0x0E,0x00,0x00,0x00,0x00, +0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, +0x10,0xA3,0x5B,0x0E,0x6B,0xD1,0x5B,0x4F,0x10,0xA3,0x29,0x66,0x4A,0x8C,0x5B,0x4F, +0x6B,0xD1,0x5B,0x0E,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, +0x00,0x00,0x00,0x00,0x10,0xA3,0x63,0x90,0x6B,0xD1,0x5B,0x0E,0x00,0x00,0x21,0x25, +0x6B,0xD1,0x31,0xE8,0x00,0x00,0x5B,0x0E,0x6B,0xD1,0x5B,0x0E,0x00,0x00,0x00,0x00, +0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x10,0xA3,0x63,0x90,0x6B,0xD1,0x5B,0x0E, +0x00,0x00,0x00,0x00,0x31,0xE8,0x6B,0xD1,0x31,0xE8,0x00,0x00,0x42,0x4A,0x6B,0xD1, +0x6B,0xD1,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x18,0xE4,0x63,0x90, +0x6B,0xD1,0x5B,0x0E,0x00,0x00,0x00,0x00,0x00,0x00,0x31,0xE8,0x6B,0xD1,0x31,0xE8, +0x42,0x4A,0x6B,0xD1,0x63,0x90,0x18,0xE4,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, +0x10,0xA3,0x6B,0xD1,0x6B,0xD1,0x42,0x4A,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, +0x31,0xE8,0x6B,0xD1,0x63,0x90,0x6B,0xD1,0x63,0x90,0x10,0xA3,0x00,0x00,0x00,0x00, +0x00,0x00,0x00,0x00,0x00,0x00,0x18,0xE4,0x6B,0xD1,0x42,0x4A,0x00,0x00,0x00,0x00, +0x00,0x00,0x00,0x00,0x00,0x00,0x31,0xE8,0x6B,0xD1,0x6B,0xD1,0x63,0x90,0x10,0xA3, +0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x10,0xA3, +0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x31,0xE8,0x6B,0xD1, +0x5B,0x0E,0x10,0xA3,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, +0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, +0x00,0x00,0x00,0x00,0x18,0xE4,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, +0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, }; const unsigned char gImage_UI0902_BatteryFill_22x9[396] = { /* 22x9 RGB565 BE */ diff --git a/device/LCD_ILI9341/Drv_ILI9341_Lcd_Image_UI0902.h b/device/LCD_ILI9341/Drv_ILI9341_Lcd_Image_UI0902.h index 020ac0c..bdfd05e 100644 --- a/device/LCD_ILI9341/Drv_ILI9341_Lcd_Image_UI0902.h +++ b/device/LCD_ILI9341/Drv_ILI9341_Lcd_Image_UI0902.h @@ -5,7 +5,8 @@ extern const unsigned char gImage_UI0902_BatteryOutline_29x12[]; extern const unsigned char gImage_UI0902_Volume_20x15[600]; -extern const unsigned char gImage_UI0902_Bluetooth_11x17[374]; +extern const unsigned char gImage_UI0902_Bluetooth_On_13x20[520]; +extern const unsigned char gImage_UI0902_Bluetooth_Off_19x20[760]; extern const unsigned char gImage_UI0902_BatteryFill_22x9[396]; extern const unsigned char gImage_UI0902_BatteryCharging_28x13[728]; extern const unsigned char gImage_UI0902_TabSetting_Sel_40x32[2560]; diff --git a/tools/assets_0902/02_顶部图标/蓝牙图标-10.png b/tools/assets_0902/02_顶部图标/蓝牙图标-10.png index 3c49d73..bff7056 100644 Binary files a/tools/assets_0902/02_顶部图标/蓝牙图标-10.png and b/tools/assets_0902/02_顶部图标/蓝牙图标-10.png differ diff --git a/tools/assets_0902/02_顶部图标/蓝牙图标-开启-0923.png b/tools/assets_0902/02_顶部图标/蓝牙图标-开启-0923.png new file mode 100644 index 0000000..bff7056 Binary files /dev/null and b/tools/assets_0902/02_顶部图标/蓝牙图标-开启-0923.png differ diff --git a/tools/assets_0902/02_顶部图标/蓝牙图标-未开启-0923.png b/tools/assets_0902/02_顶部图标/蓝牙图标-未开启-0923.png new file mode 100644 index 0000000..1e001b6 Binary files /dev/null and b/tools/assets_0902/02_顶部图标/蓝牙图标-未开启-0923.png differ diff --git a/tools/gen_ui0902_assets.py b/tools/gen_ui0902_assets.py index d34070d..7cdda63 100644 --- a/tools/gen_ui0902_assets.py +++ b/tools/gen_ui0902_assets.py @@ -135,7 +135,8 @@ def make_cancel_button(): # without wiping those arrays. INTERNAL = [ ("gImage_UI0902_Volume_20x15", "02_顶部图标/音量图标-10.png"), - ("gImage_UI0902_Bluetooth_11x17", "02_顶部图标/蓝牙图标-10.png"), + ("gImage_UI0902_Bluetooth_On_13x20", "02_顶部图标/蓝牙图标-开启-0923.png"), + ("gImage_UI0902_Bluetooth_Off_19x20", "02_顶部图标/蓝牙图标-未开启-0923.png"), ("gImage_UI0902_BatteryCharging_28x13", "02_顶部图标/电池图标-充电状态-0918.png"), # 0918 充电闪电电池 # BatteryFill generated by make_battery_fill() — not from mockup PNG ("gImage_UI0902_TabSetting_Sel_40x32", "03_底部图标/底部图标-10.png"), # 万能白 diff --git a/tools/gen_ui0902_previews.py b/tools/gen_ui0902_previews.py index 7a9ad0a..f991fd8 100644 --- a/tools/gen_ui0902_previews.py +++ b/tools/gen_ui0902_previews.py @@ -22,7 +22,7 @@ def draw_status_bar(page, d, bt_on=True, pct=75, vol=3): d.rectangle([0, 0, 239, 25], fill=PAGE_BG) paste_trans(page, load("02_顶部图标/音量图标-10.png"), 8, 6) if bt_on: - paste_trans(page, load("02_顶部图标/蓝牙图标-10.png"), 36, 5) + paste_trans(page, load("02_顶部图标/蓝牙图标-开启-0923.png"), 36, 5) # volume level bars x=55.., 5 bars for i in range(5): h = 4 + i * 2