AskaEth/MeowOS-For-R3P2
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: AskaEth/MeowOS-For-R3P2:4d0a8450e94e55393b67f57beed6ab369159e2e0
AskaEth/MeowOS-For-R3P2:main
...
compare: AskaEth/MeowOS-For-R3P2:b3ce7197423a2ac1cf1738aebf9b3d3213c9c4dd
AskaEth/MeowOS-For-R3P2:main
2 Commits
4d0a8450e9 ... b3ce719742
Author SHA1 Message Date
AskaEth b3ce719742 fix(fw): M6.37 收编SDK默认列表MD3容器化(meow_listview_create默认container=1)重编meow_ui.a重链四App — 推卡 
- meow_ui.a 重编 14f218d7(0warning): meow_listview_create默认container=1,行=surfaceContainer圆角卡+空隙+去分隔线+卡内tonal选中
- launcher e7fd28dd / hello c10a3ea5 / files 90a6e817 / reader 0d462111 / ncm 6f3967f8 (重链新meow_ui.a)
- 固件 r3proii_m6_37.upt a8dd8f54(0.8.37, rootfs 38715392<=45088768, unpack 0 diff)
- netmgrd 9c345b2e/audiod 9f47c8fd/meow_audio 6864ec38 未变; amsd 57e19cde 保持
 2026-09-04 12:29:23 +08:00
AskaEth 8e68254ce4 style(sdk): SDK默认列表MD3容器化 — meow_listview_create默认container=1(行=surfaceContainer圆角卡+空隙+去分隔线+卡内tonal选中)，hello/files/ncm/reader等用默认renderer的App开箱即MD3(用户2026-09-04反馈默认仍扁平)；需平坦宿主可set_container(0)回退(宿主测试test_meow_ui_widgets/listvirt补set_container(0)锁扁平基线)。0warning，宿主测试全过(widgets ALL PASS/md3 PASS/swipe 35-0/listvirt 44-0)。meow_ui.a变需重编+重链四App 2026-09-04 12:24:16 +08:00
4 changed files with 7 additions and 1 deletions
Expand all files Collapse all files

No files matched your search

patch_v2/sdk/meow_ui_widget.c
+3
View File
@@ -1191,6 +1191,9 @@ meow_widget *meow_listview_create(int x, int y, int w, int h, int count,
t->sel = -1; t->item_h = 56; t->scroll = 0; t->swipe_idx = -1; t->sel = -1; t->item_h = 56; t->scroll = 0; t->swipe_idx = -1;
t->sel_mode = (mode >= MEOW_LIST_SEL_NONE && mode <= MEOW_LIST_SEL_MULTI) ? mode : MEOW_LIST_SEL_NONE; t->sel_mode = (mode >= MEOW_LIST_SEL_NONE && mode <= MEOW_LIST_SEL_MULTI) ? mode : MEOW_LIST_SEL_NONE;
t->lines = 2; t->show_icon = 1; t->show_right = 1; /* 默认双行富 item + 图标 + 右尾件（src2 布局不变） */ t->lines = 2; t->show_icon = 1; t->show_right = 1; /* 默认双行富 item + 图标 + 右尾件（src2 布局不变） */
t->container = 1; /* M6.37 P1：SDK 默认列表走 MD3 容器模式——行=surfaceContainer 圆角卡 + 空隙 + 去分隔线 + 卡内 tonal 选中，
* 让 hello 示例 / files 及一切用 SDK 默认 renderer 的 App 开箱即 MD3（用户 2026-09-04 反馈默认仍扁平）。
* 需扁平的宿主可显式 meow_listview_set_container(lv,0) 回退（test_meow_ui_widgets 即用它锁扁平基线）。 */
if (t->sel_mode == MEOW_LIST_SEL_MULTI && t->count > 0) { if (t->sel_mode == MEOW_LIST_SEL_MULTI && t->count > 0) {
t->sel_bits_n = (t->count + 31) / 32; t->sel_bits_n = (t->count + 31) / 32;
t->sel_bits = (uint32_t *)calloc((size_t)t->sel_bits_n, sizeof(uint32_t)); t->sel_bits = (uint32_t *)calloc((size_t)t->sel_bits_n, sizeof(uint32_t));
patch_v2/sdk/test_meow_ui_listvirt.c
+2
View File
@@ -206,6 +206,7 @@ int main(void)
/* 双行（lines=2，默认）：行 0 title+subtitle + icon(FOLDER) + 尾件(ARROW) */ /* 双行（lines=2，默认）：行 0 title+subtitle + icon(FOLDER) + 尾件(ARROW) */
int lvx = 20, lvy = 50, lvw = 440, lvh = 120; int lvx = 20, lvy = 50, lvw = 440, lvh = 120;
meow_widget *lv = meow_listview_create(lvx, lvy, lvw, lvh, 0, NULL, NULL, MEOW_LIST_SEL_NONE); meow_widget *lv = meow_listview_create(lvx, lvy, lvw, lvh, 0, NULL, NULL, MEOW_LIST_SEL_NONE);
meow_listview_set_container(lv, 0); /* 锁扁平基线：SDK 默认已变 MD3 容器，本测试专测扁平虚拟化渲染路径 */
CHECK(meow_listview_set_item_h(lv, itemh) == itemh, "item_h"); CHECK(meow_listview_set_item_h(lv, itemh) == itemh, "item_h");
CHECK(meow_listview_set_vsource(lv, vcount, vbind, NULL) == 0, "vsource"); CHECK(meow_listview_set_vsource(lv, vcount, vbind, NULL) == 0, "vsource");
CHECK(meow_listview_set_item_renderer(lv, 2, 1, 1) == 0, "renderer"); CHECK(meow_listview_set_item_renderer(lv, 2, 1, 1) == 0, "renderer");
@@ -267,6 +268,7 @@ int main(void)
int lvx = 20, lvy = 50, lvw = 440, lvh = 120; int lvx = 20, lvy = 50, lvw = 440, lvh = 120;
g_count_override = 3; g_section_at = 1; g_count_override = 3; g_section_at = 1;
meow_widget *lv = meow_listview_create(lvx, lvy, lvw, lvh, 0, NULL, NULL, MEOW_LIST_SEL_NONE); meow_widget *lv = meow_listview_create(lvx, lvy, lvw, lvh, 0, NULL, NULL, MEOW_LIST_SEL_NONE);
meow_listview_set_container(lv, 0); /* 锁扁平基线：SDK 默认已变 MD3 容器，段头 band 断言按扁平 */
meow_listview_set_item_h(lv, itemh); meow_listview_set_item_h(lv, itemh);
meow_listview_set_vsource(lv, vcount, vbind, NULL); meow_listview_set_vsource(lv, vcount, vbind, NULL);
meow_ui_clear(th->bg); meow_ui_clear(th->bg);
patch_v2/sdk/test_meow_ui_widgets.c
+1
View File
@@ -318,6 +318,7 @@ int main(void)
* lv 位于 (20,240,320,112)item_h=56 → 行0 y240..296、行1 296..352。 * lv 位于 (20,240,320,112)item_h=56 → 行0 y240..296、行1 296..352。
* 断言全部「画完读 back_buf 像素」（region_has/px_near），非目检。 */ * 断言全部「画完读 back_buf 像素」（region_has/px_near），非目检。 */
meow_widget *lv = W(meow_listview_create(20, 240, 320, 112, 4, lv_src, NULL, MEOW_LIST_SEL_SINGLE)); meow_widget *lv = W(meow_listview_create(20, 240, 320, 112, 4, lv_src, NULL, MEOW_LIST_SEL_SINGLE));
meow_listview_set_container(lv, 0); /* 锁扁平基线：SDK 默认已变 MD3 容器，此测试专测 set_container(0) 扁平回退路径 */
assert(meow_listview_set_item_h(lv, 56) == 56); assert(meow_listview_set_item_h(lv, 56) == 56);
const meow_theme *lth = meow_theme_get(); const meow_theme *lth = meow_theme_get();
int lvx = 20, lvy = 240, lvw = 320, lvh = 112, itemh = 56; int lvx = 20, lvy = 240, lvw = 320, lvh = 112, itemh = 56;
scripts/build/fw_content.conf
+1 -1
View File
@@ -28,7 +28,7 @@
# ---- 用户态/服务守护二进制（usr/bin，全部 chmod 755 静态 MIPS）---- # ---- 用户态/服务守护二进制（usr/bin，全部 chmod 755 静态 MIPS）----
patch_v2/bootmenu/meow_bootmenu|/usr/bin/meow_bootmenu|8de51144538d698c3ff82ee6651b8b1a|引导选单 M6.25（开机菜单/第二屏亮度按用户设置恢复：显示前读 settings.conf 写回，方案A） patch_v2/bootmenu/meow_bootmenu|/usr/bin/meow_bootmenu|8de51144538d698c3ff82ee6651b8b1a|引导选单 M6.25（开机菜单/第二屏亮度按用户设置恢复：显示前读 settings.conf 写回，方案A）
patch_v2/meow_launcherd/meow_launcherd|/usr/bin/meow_launcherd|0c4f3c109e3c6657542e4822ecf93f51|M6.36 收编批①叠加/穿透根治(共享判定meow_ui_overlay_suppressed_active,launcher 7处转场)+MD3全面对齐(subpage/settings/bg/MENU列表圆角卡8px外距+按钮胶囊+状态层+shape令牌)+顶栏后台按钮图标+后台管理页圆角卡+批①后台常驻框架+批③后台管理页+i18n(settings/lock补抽);链meow_ui.a(sdk meow_lyric/lyric_view/meow_img_color,meow_img_pixels访问器);0warning patch_v2/meow_launcherd/meow_launcherd|/usr/bin/meow_launcherd|e7fd28ddc6374be1e2af2b653980842c|M6.37 收编SDK默认列表MD3容器化(meow_listview_create默认container=1:行=surfaceContainer圆角卡+空隙+去分隔线+卡内tonal选中)重链;继承M6.36(批①叠加/穿透根治+MD3全面对齐+顶栏后台按钮图标+后台管理页圆角卡+批①后台常驻框架+批③后台管理页+i18n);链meow_ui.a(sdk meow_lyric/lyric_view/meow_img_color,meow_img_pixels访问器);0warning
patch_v2/meow_watchdog/meow_watchdog|/usr/bin/meow_watchdog|34ddbf0275526eaf9be988134845c3af|应用看门狗 M6.23（亮屏亮度按用户设置 display.brightness 恢复，修 panel ON 固定60跳变） patch_v2/meow_watchdog/meow_watchdog|/usr/bin/meow_watchdog|34ddbf0275526eaf9be988134845c3af|应用看门狗 M6.23（亮屏亮度按用户设置 display.brightness 恢复，修 panel ON 固定60跳变）
patch_v2/meow_svcd/meow_svcd|/usr/bin/meow_svcd|605646c4cc93f2baf29071ea6bc870ea|服务管理器 M2.77（+崩溃上报 meow_crash agent-187） patch_v2/meow_svcd/meow_svcd|/usr/bin/meow_svcd|605646c4cc93f2baf29071ea6bc870ea|服务管理器 M2.77（+崩溃上报 meow_crash agent-187）
mips-repo/bins/meow_mdns/bin/meow_mdns|/usr/bin/meow_mdns|d6b0151bda26768f19952dae1342610d|mDNS 应答器 M2.78（启动竞态+换IP重检 agent-194） mips-repo/bins/meow_mdns/bin/meow_mdns|/usr/bin/meow_mdns|d6b0151bda26768f19952dae1342610d|mDNS 应答器 M2.78（启动竞态+换IP重检 agent-194）