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:
AskaEth committed
1 parent
e87ccdf061
commit
7c7d891570
59 files changed
+5305
-590
No files matched your search
@@ -0,0 +1,83 @@
|
||||
/* test/turn_repro.c — 复现「翻页跳页」（R3.2 分段流式）。
|
||||
* 模拟真机序列：open → (可选 set_enc 到 UTF-16LE) → 跳页/翻页 → 渲染校验（非空/seg 边界正确）。
|
||||
* 跑于 qemu-mipsel（静态）。
|
||||
* 用法：qemu-mipsel ./test/turn_repro_mipsel <font.otf> <book.txt> <dirprefix> [enc] [turns]
|
||||
*/
|
||||
#include "book.h"
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
|
||||
static int render_buf(uint16_t *buf, int W, int H, rd_book *b, int page, uint16_t bg, uint16_t fg)
|
||||
{
|
||||
for (int i = 0; i < W * H; i++) buf[i] = bg;
|
||||
int rc = rd_book_render(b, page, buf, W * 2, bg, fg);
|
||||
if (rc != 0) return -100 + rc;
|
||||
int ink = 0;
|
||||
for (int i = 0; i < W * H; i++) if (buf[i] != bg) ink++;
|
||||
return ink;
|
||||
}
|
||||
|
||||
int main(int argc, char **argv)
|
||||
{
|
||||
const char *font = (argc > 1) ? argv[1] : "/home/Aska/Project/R3ProII/font/src/MiSans-Regular.otf";
|
||||
const char *book = (argc > 2) ? argv[2] : "/tmp/rdsample/tongyi.txt";
|
||||
const char *pref = (argc > 3) ? argv[3] : "/tmp/rdsample/repro";
|
||||
int force_enc = (argc > 4) ? atoi(argv[4]) : 0;
|
||||
int turns = (argc > 5) ? atoi(argv[5]) : 200;
|
||||
char segbase[420], idxdir[420];
|
||||
snprintf(segbase, sizeof segbase, "%s/segbase", pref);
|
||||
snprintf(idxdir, sizeof idxdir, "%s/index", pref);
|
||||
rd_book_set_seg_base(segbase);
|
||||
rd_book_set_index_dir(idxdir);
|
||||
|
||||
int fs = 16, ls = 135, pw = 480, ph = 724, mx = 16, my = 20, top = 62;
|
||||
uint16_t *buf = (uint16_t *)malloc((size_t)pw * ph * 2);
|
||||
|
||||
rd_book *b = NULL;
|
||||
int rc = rd_book_open(&b, book, font, fs, ls, pw, ph, mx, my, top);
|
||||
printf("open rc=%d enc=%s\n", rc, rc == 0 ? rd_book_encname(b) : "-");
|
||||
if (rc != 0) return 1;
|
||||
if (force_enc) { printf("set_enc(%d)->rc=%d\n", force_enc, rd_book_set_enc(b, (rd_enc_t)force_enc)); }
|
||||
int np = rd_book_pages(b);
|
||||
printf("npages=%d\n", np);
|
||||
|
||||
/* ① 翻页序列：跨段边界观察 cur 跳变 */
|
||||
rd_book_set_page(b, 2);
|
||||
int prev = rd_book_current(b), jumps = 0;
|
||||
for (int i = 0; i < turns; i++) {
|
||||
int nxt = rd_book_turn(b, 1);
|
||||
int d = nxt - prev;
|
||||
if (d != 1) { printf(" JUMP turn#%d %d->%d d=%d npages=%d\n", i, prev, nxt, d, rd_book_pages(b)); if (d > 1) jumps++; }
|
||||
prev = nxt;
|
||||
if (rd_book_pages(b) < 1) break;
|
||||
}
|
||||
printf("turn jumps>1=%d\n", jumps);
|
||||
|
||||
/* ② 渲染首页/第3页/中间页 校验非空 */
|
||||
int targets[3] = { 0, 2, np > 3 ? np / 2 : 0 };
|
||||
for (int t = 0; t < 3; t++) {
|
||||
if (targets[t] >= rd_book_pages(b)) continue;
|
||||
int ink = render_buf(buf, pw, ph, b, targets[t], 0xFFFF, 0x0000);
|
||||
printf("render page %d -> %s (ink=%d)\n", targets[t], ink < 0 ? "ERR" : (ink > 50 ? "OK" : "BLANK"), ink);
|
||||
}
|
||||
|
||||
/* ③ set_page 到远页（触发按需补段），渲染校验 + 观察是否落到目标 */
|
||||
int far = 316;
|
||||
int got = rd_book_set_page(b, far);
|
||||
printf("set_page(%d) -> cur=%d npages=%d\n", far, got, rd_book_pages(b));
|
||||
int ink = render_buf(buf, pw, ph, b, got, 0xFFFF, 0x0000);
|
||||
printf("render page %d -> %s (ink=%d)\n", got, ink < 0 ? "ERR" : (ink > 50 ? "OK" : "BLANK"), ink);
|
||||
|
||||
/* ④ 跳到更远（超过当前 npages，强制补段到 seg 20） */
|
||||
int far2 = 4000;
|
||||
int got2 = rd_book_set_page(b, far2);
|
||||
printf("set_page(%d) -> cur=%d npages=%d\n", far2, got2, rd_book_pages(b));
|
||||
ink = render_buf(buf, pw, ph, b, got2, 0xFFFF, 0x0000);
|
||||
printf("render page %d -> %s (ink=%d)\n", got2, ink < 0 ? "ERR" : (ink > 50 ? "OK" : "BLANK"), ink);
|
||||
|
||||
free(buf);
|
||||
rd_book_close(b);
|
||||
printf("done\n");
|
||||
return 0;
|
||||
}
|
||||
Reference in new issue
Block a user