feat: M6.44+M6.45 收编 — 真机 0.8.45 现场保全(reader章节/key_router按键路由/WiFi连接修复/ncm bench+IME修复)
脏工作区现场收编:devdocs/local/m6_44_45_dirty_tracked.patch(46 个已跟踪文本文件,
+3090/-585, 已对 M6.43 基线干净适配) + m6_44_45_untracked_src.tar.gz 中 patch_v2/ 下
13 个新增源文件, 合成单个提交, 内容与容器工作树(R3ProII/patch_v2)逐字节一致。
- reader 章节: 新增 core/rdchapter.{h,c} — TXT 章节规范解析器, 扫描 512KB 码位对齐段文件
逐段流式识别标题行(行首缩进≤4/显示宽≤40/行内标点≤1 三重约束防误判), 输出标题+全书字符
偏移+段号/段内偏移+阿拉伯章号(中文数字归一), 首章前内容归"卷首"; book/reader/rdenc/
rdlayout/settings 接入章节跳转与进度锚点, 附 chapter_smoke/turn_repro/build_turn_repro.sh
- key_router 按键路由: 新增 meow_launcherd/key_router.{h,c} — launcher-UI 页物理键统一路由
(P1 仅音量键), 把读取边沿+防抖+长按 held+ramp 推进从 5 个会话收敛为进程内单开;
各页每圈 key_router_pump() 取防抖后边沿, 动作(调音量/光标导航)仍由调用页决定,
保留 run_menu 的 meow_mode 分支; App 前台 volume_page 武装时边沿抑制;
main_menu/now_playing/notif_center/settings_page/subpage 接入, 附 test_key_router_vol/test_np_keys
- WiFi 连接修复: meow_netmgrd connect 有界等待 wpa_state=COMPLETED(普通 10s/隐藏网络 15s,
env 可调)修设置页连接无响应; list_networks/scan_results 的 \xNN 转义还原始字节, 修中文 SSID
永不命中致新建同名 open 记录顶影; launcher netmgr_ipc 配读超时; 附 test_wifi_connect(桩
wpa_cli 驱动 static wifi_connect_ex), test_netmgrd.sh 补用例; wifi_page 同步
- ncm bench: 新增 bench/lyric_sim.c、bench/plpage_sim.c, vol_sync_sim 与 ncm core/app 同步
- SDK IME 修复: shift 大小写、K_ENTER 只提交不关、阻塞 IME 循环喂 on_tick 不被遮挡、
IME 打开 ~200ms TAP 冷却窗吞 stray-TAP; 附 sdk/test_ime_fix.c
- 同期: meow_audiod 音量异步 ACK 线程(代际防 fd/槽复用竞态)、watchdog 音量收编(首选 audiod
权威, settings.conf 覆盖路径)、panel 文件搜索(F1-④)与蓝牙只读详情(F1-③)、各类 build 脚本同步
范围红线: third_party/legado-E-main 原开发者未跟踪, 本次不入库(保留 devdocs/local tar 参考);
二进制不入库(后续重编); devdocs/ 不入库。59 文件全部在 patch_v2/ 下, 无 third_party/devdocs。
验证: git apply --check 干净; 59 文件 md5 与容器 patch_v2 逐一比对 59/59 一致(含
key_router.c/rdchapter.c/meow_ui_ime.c/test_wifi_connect.c 抽查); 可执行位保守
(check_lgpl_release.sh 100755, build_turn_repro.sh 100644 与容器一致)。
This commit is contained in:
1 parent
e87ccdf061
commit
7c7d891570
59 files changed
+5305
-590
No files matched your search
@@ -234,6 +234,35 @@ static void test_eapi_musicu_hdr(void) {
|
||||
CHECK(strstr(h2, "MUSIC_U=") == NULL, "guest eapi has no MUSIC_U");
|
||||
}
|
||||
|
||||
static void test_eapi_song_detail_batch(void) {
|
||||
/* §NEW:NCM_SONG_BATCH=100 的 song_detail eapi 请求构建(不打网络)。
|
||||
* 旧 params[4096] 对 100 首的 AES-ECB hex(~5.1KB) 溢出 → NCM_ERR_CRYPTO(-8),
|
||||
* 真机 first-screen 因此 rc=-8。这里只构建请求验证 params/body 缓冲够。 */
|
||||
printf("== eapi 100-song detail batch ==\n");
|
||||
const char *device = "AA11BB22CC33DD44EE55FF6600112233445566778899AABB00";
|
||||
char clist[4096] = "[", tmp[64];
|
||||
for (int i = 0; i < 100 && strlen(clist) < sizeof clist - 80; i++) {
|
||||
snprintf(tmp, sizeof tmp, "%s{\\\"id\\\":%lld}", i ? "," : "",
|
||||
(long long)(2048962657LL + (long long)i));
|
||||
ncm_strlcat(clist, tmp, sizeof clist);
|
||||
}
|
||||
ncm_strlcat(clist, "]", sizeof clist);
|
||||
char json[4500];
|
||||
snprintf(json, sizeof json, "{\"c\":\"%s\"}", clist);
|
||||
|
||||
char params[8192];
|
||||
CHECKRC(ncm_crypto_eapi("/api/v3/song/detail", json, params, sizeof params),
|
||||
"eapi crypto 100-song");
|
||||
CHECK(strlen(params) > 4096, "params exceeds old 4096 cap (got %zu)", strlen(params));
|
||||
|
||||
char body[NCM_REQ_BODY_MAX], hdrs[NCM_REQ_HDRS_MAX], url[NCM_REQ_URL_MAX];
|
||||
CHECKRC(ncm_req_build(device, "", "/api/v3/song/detail", json, NCM_CRYPT_EAPI,
|
||||
body, sizeof body, hdrs, sizeof hdrs, url, sizeof url),
|
||||
"eapi req_build 100-song");
|
||||
CHECK(strstr(body, "params=") == body, "body starts with params=");
|
||||
CHECK(strlen(body) < NCM_REQ_BODY_MAX, "body fits NCM_REQ_BODY_MAX (got %zu)", strlen(body));
|
||||
}
|
||||
|
||||
static void test_network(void) {
|
||||
printf("== network (live) ==\n");
|
||||
int net_ok = 0;
|
||||
@@ -515,6 +544,7 @@ int main(int argc, char **argv) {
|
||||
test_qr();
|
||||
test_cookie_merge();
|
||||
test_eapi_musicu_hdr();
|
||||
test_eapi_song_detail_batch();
|
||||
test_network();
|
||||
test_track_all_parse();
|
||||
test_vip_parse();
|
||||
|
||||
Reference in new issue
Block a user