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

feat: M6.44+M6.45 收编 — 真机 0.8.45 现场保全(reader章节/key_router按键路由/WiFi连接修复/ncm bench+IME修复)

Browse Source 
脏工作区现场收编：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 2026-11-04 20:02:28 +08:00
1 parent e87ccdf061
commit 7c7d891570
59 files changed
+5305 -590
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

patch_v2/reader_app/app/reader.c
+478 -42
View File
@@ -10,6 +10,7 @@
#include "book.h"
#include "progress.h"
#include "reader_conf.h"
#include "rdchapter.h" /* RDCHAP_TITLE_MAX（章节标题） */
#include <dirent.h>
#include <stdio.h>
#include <stdlib.h>
@@ -18,7 +19,7 @@
#include <time.h>
#define RD_MENU_H 64
#define RD_MENU_BTN 4 /* 返回 | 目录 | 界面 | 设置（MVP 单条） */
#define RD_MENU_BTN 5 /* 返回 | 目录 | 跳转 | 界面 | 设置（R3.3 加「跳转」） */
#define RD_HEADER_H 30 /* 页头条高（书名+章节名） */
#define RD_FOOT_H 18 /* 页底条高（章节+页码） */
#define RD_UI_H 268 /* 「界面」排版面板高 */
@@ -36,6 +37,13 @@ static int g_menu_open;
static int g_ui_open; /* 「界面」排版面板（B） */
static int g_dir_open; /* 目录覆盖层 */
static int g_dir_top, g_dir_row_h; /* 目录列表几何（rdsrc 目录项） */
static int g_jump_open; /* 跳转覆盖层（R3.3） */
static int g_jump_mode; /* 1=章节模式; 2=文件/段模式; 0=未定 */
static int g_jump_sel; /* 当前选中章节/段下标 */
static int g_jump_scroll; /* 列表滚动（首行项下标） */
static char g_jump_buf[8]; /* 章内/段内页码输入缓冲（ASCII 数字） */
static int g_chap_cache_idx = -1; /* 章节范围缓存（章起/止页；随字号/行距重排失效） */
static int g_chap_cache_start, g_chap_cache_end;
static char g_font_path[400];
static int g_notice_ms;
@@ -48,12 +56,13 @@ static int g_anim_dir; /* 1=下一页(旧左移/新右入)；-
#define RD_SCRUB_W 26 /* 右缘刮擦条宽度 */
static int g_scrub; /* 1=刮擦中 */
static int g_scrub_page; /* 刮擦目标页（实时预览用） */
static int g_scrub_moved; /* 本次刮擦是否发生了拖动（无拖动=点按，不当翻页跳页） */
/* ---- R3 编码切换（TXT；Big5 繁体书手动选定） ---- */
static int g_enc_idx; /* g_enc_cycle[] 下标（当前有效编码） */
static uint32_t g_page_bg, g_page_fg; /* 正文页底/字色（24bit） */
static char g_chapter[128]; /* 顶栏章节名（TXT 无章节=文件名） */
static char g_chapter[RDCHAP_TITLE_MAX]; /* 顶栏章节名（TXT 无章节=文件名） */
static int g_show_header, g_show_footer; /* 页头条/底条显隐（rdconf.rd.header/footer） */
static volatile int g_volpage_pending; /* 系统翻页信号待消费（IPC 线程置位，UI tick 消费，E） */
static int g_prog_dirty; /* 阅读进度变更待写（翻页/刮擦/字号/编码；R3.2 定时落盘防崩溃丢进度） */
@@ -168,7 +177,21 @@ static const char *resolve_font(void)
static void chapter_name(void)
{
/* TXT 无章节 → 文件名；R1 固定。 */
/* TXT 有章节（已解析）→ 当前页所属章名；否则文件名（R1 固定）。
* 仅在章节已就绪时用章名（rd_book_chapter_ready 不触发扫描），首屏/未解析时用文件名，
* 避免开书即整书扫描占 UI 线程。 */
if (!g_book) { g_chapter[0] = 0; return; }
if (rd_book_chapter_ready(g_book) && !rd_book_is_image(g_book)) {
int page = rd_book_current(g_book);
int idx = -1;
if (rd_book_chapter_for_page(g_book, page, &idx) == 0 && idx >= 0) {
char t[RDCHAP_TITLE_MAX];
if (rd_book_chapter(g_book, idx, t, sizeof t, NULL, NULL, NULL, NULL) == 0) {
snprintf(g_chapter, sizeof g_chapter, "%s", t);
return;
}
}
}
snprintf(g_chapter, sizeof g_chapter, "%s", rd_book_basename(g_book));
}
@@ -176,6 +199,7 @@ static void reader_reflow(void)
{
if (!g_book) return;
if (g_anim) { meow_anim_cancel(g_anim); g_anim = NULL; } /* 重排/雷字号时终止翻页动画 */
g_chap_cache_idx = -1; /* 页索引随字号/行距变 → 章范围缓存失效 */
int seg = 0; int32_t ch = 0;
rd_book_anchor(g_book, &seg, &ch); /* 记录当前锚，重排后回锚 */
g_prog_dirty = 1;
@@ -266,6 +290,354 @@ static void reader_draw_scrub(const meow_theme *th)
}
}
/* ---------------- R3.3 跳转弹层（章节模式 / 文件·段模式） ----------------
* 复用 g_dir 系列「半透明底 + 条目列表 + 当前高亮」；顶部提供：当前章节/段信息、页码输入
* （自绘数字键盘 0-9 + ⌫ + 跳）、快捷（首 / ±10 / ±100 / 末）。只对 TXT（seg 模式）启用：
* rd_book_chapter_n>0 → 章节模式；否则 rd_book_seg_n>0 → 文件/段模式。 */
#define J_SHORTCUT_N 6
#define J_SHORTCUT_X0 16
#define J_SHORTCUT_GAP 6
#define J_SHORTCUT_H 32
#define J_KEY_W 64
#define J_KEY_H 42
#define J_KEY_GAP 8
#define J_ROW 30
enum {
J_NONE = 0,
J_GO_FIRST = 1, J_GO_M100 = 2, J_GO_M10 = 3,
J_GO_P10 = 4, J_GO_P100 = 5, J_GO_LAST = 6,
J_DIG_0 = 10, J_DIG_1 = 11, J_DIG_2 = 12, J_DIG_3 = 13, J_DIG_4 = 14,
J_DIG_5 = 15, J_DIG_6 = 16, J_DIG_7 = 17, J_DIG_8 = 18, J_DIG_9 = 19,
J_BACK = 30, J_JUMP = 31,
J_ITEM = 100, /* 100 + i = 列表第 i 项 */
};
static int jump_hdr_y(void) { return g_top; }
static int jump_info_y(void) { return g_top + 30; }
static int jump_shortcut_y(void){ return g_top + 56; }
static int jump_input_y(void) { return g_top + 92; }
static int jump_pad_y(void) { return g_top + 128; }
static int jump_list_y(void) { return g_top + 128 + 4 * (J_KEY_H + J_KEY_GAP) + 10; }
static int chapter_range(int idx, int *start, int *end)
{
if (!g_book || idx < 0) return -1;
if (g_chap_cache_idx == idx) { if (start) *start = g_chap_cache_start; if (end) *end = g_chap_cache_end; return 0; }
int64_t co = 0;
if (rd_book_chapter(g_book, idx, NULL, 0, &co, NULL, NULL, NULL) != 0) return -1;
int s = rd_book_page_for_char(g_book, co);
if (s < 0) return -1;
int n = rd_book_chapter_n(g_book);
int e;
if (idx + 1 < n) {
int64_t co2 = 0;
if (rd_book_chapter(g_book, idx + 1, NULL, 0, &co2, NULL, NULL, NULL) != 0) return -1;
e = rd_book_page_for_char(g_book, co2) - 1;
} else {
e = rd_book_pages(g_book) - 1;
}
if (e < s) e = s;
g_chap_cache_idx = idx; g_chap_cache_start = s; g_chap_cache_end = e;
if (start) *start = s;
if (end) *end = e;
return 0;
}
/* 跳转选中项 idx 的页区间（章节模式=章范围；文件模式=段范围）。 */
static int jump_region(int idx, int *start, int *end, int *inp, int *ofp)
{
if (!g_book) return -1;
int s, e;
if (g_jump_mode == 1) {
if (chapter_range(idx, &s, &e) != 0) return -1;
} else if (g_jump_mode == 2) {
int nseg = rd_book_seg_n(g_book);
if (idx < 0 || idx >= nseg) return -1;
s = rd_book_seg_page(g_book, idx);
if (s < 0) return -1;
e = s + rd_book_seg_page_count(g_book, idx) - 1;
if (e < s) e = s;
} else return -1;
int cur = rd_book_current(g_book);
if (cur < s) cur = s;
if (cur > e) cur = e;
if (start) *start = s;
if (end) *end = e;
if (inp) *inp = cur - s + 1;
if (ofp) *ofp = e - s + 1;
return 0;
}
/* 页底条右侧文本：章内 y/Z · 全书 x/M（章节就绪且范围可算时），否则 全书 x/M。 */
static void footer_progress(char *out, int outsz)
{
int np = rd_book_pages(g_book);
int page = rd_book_current(g_book);
if (np <= 0) { snprintf(out, outsz, "0/0"); return; }
if (rd_book_chapter_ready(g_book) && !rd_book_is_image(g_book)) {
int idx = -1;
if (rd_book_chapter_for_page(g_book, page, &idx) == 0 && idx >= 0) {
int s = -1, e = -1;
if (chapter_range(idx, &s, &e) == 0 && e >= s) {
int inp = page - s + 1, ofp = e - s + 1;
if (inp > 0 && ofp > 0) { snprintf(out, outsz, "%d/%d · %d/%d", inp, ofp, page + 1, np); return; }
}
}
}
snprintf(out, outsz, "%d/%d", page + 1, np);
}
static void jump_chip(int x, int y, int w, int h, const char *label, int active, const meow_theme *th)
{
if (active) meow_ui_fill_rect(x, y, w, h, th->primaryContainer);
else meow_ui_fill_rect(x, y, w, h, th->surfaceContainerHighest);
uint32_t tc = active ? th->onPrimaryContainer : th->fg;
meow_ui_text_center(x + w / 2, y + (h - 20) / 2, label, 20, tc);
}
static void reader_draw_jump(const meow_theme *th)
{
if (!g_book) return;
int page = rd_book_current(g_book);
int np = rd_book_pages(g_book);
int n = (g_jump_mode == 1) ? rd_book_chapter_n(g_book) : rd_book_seg_n(g_book);
meow_ui_fill_rect_alpha(0, g_top, g_pw, g_ph - g_top, 0x000000, 150);
/* 头栏 */
int y0 = jump_hdr_y();
meow_ui_fill_rect(0, y0, g_pw, 30, th->surfaceContainer);
char hdr[48];
snprintf(hdr, sizeof hdr, "跳转 · %s", (g_jump_mode == 1) ? "章节" : "文件/段");
meow_ui_text(16, y0 + 5, hdr, 20, th->onSurface);
meow_ui_draw_rect(0, y0 + 29, g_pw, 1, th->outlineVariant);
if (n <= 0) {
meow_ui_text(20, jump_info_y() + 12, "本书无可用跳转目标", 20, th->dim);
meow_ui_text(20, g_ph - 30, "点空白关闭", 16, th->dim);
return;
}
/* 信息行 */
char info[256]; info[0] = 0;
int s, e, inp, ofp;
if (g_jump_mode == 1) {
char lab[RDCHAP_TITLE_MAX];
int num = -1;
if (rd_book_chapter(g_book, g_jump_sel, lab, sizeof lab, NULL, NULL, NULL, &num) == 0 &&
jump_region(g_jump_sel, &s, &e, &inp, &ofp) == 0) {
char prefix[24]; prefix[0] = 0;
if (num >= 0) snprintf(prefix, sizeof prefix, "第%d章 ", num);
snprintf(info, sizeof info, "%s%s · 章内 %d/%d · 全书 %d/%d", prefix, lab, inp, ofp, page + 1, np);
}
} else {
if (jump_region(g_jump_sel, &s, &e, &inp, &ofp) == 0)
snprintf(info, sizeof info, "段 %d/%d · 段内 %d/%d · 全书 %d/%d", g_jump_sel + 1, n, inp, ofp, page + 1, np);
}
meow_ui_text(16, jump_info_y() + 3, info[0] ? info : "—", 16, th->fg);
/* 快捷 chips */
static const char *sc_lbl[J_SHORTCUT_N] = { "首", "-100", "-10", "+10", "+100", "末" };
int x = J_SHORTCUT_X0;
int cw = (g_pw - 2 * J_SHORTCUT_X0 - (J_SHORTCUT_N - 1) * J_SHORTCUT_GAP) / J_SHORTCUT_N;
for (int i = 0; i < J_SHORTCUT_N; i++) {
jump_chip(x, jump_shortcut_y(), cw, J_SHORTCUT_H, sc_lbl[i], 0, th);
x += cw + J_SHORTCUT_GAP;
}
/* 输入行 */
meow_ui_text(16, jump_input_y() + 5, (g_jump_mode == 1) ? "章内页" : "段内页", 20, th->fg);
char ib[48];
snprintf(ib, sizeof ib, "%s", g_jump_buf[0] ? g_jump_buf : "_");
meow_ui_text(120, jump_input_y() + 3, ib, 24, th->primary);
meow_ui_text_right(g_pw - 16, jump_input_y() + 7, "输页码点「跳」 · ⌫退格", 16, th->dim);
/* 数字键盘 1..9 / ⌫ 0 跳 */
static const char *pad[4][3] = {
{ "1", "2", "3" }, { "4", "5", "6" }, { "7", "8", "9" }, { "⌫", "0", "跳" },
};
int pad_w = 3 * J_KEY_W + 2 * J_KEY_GAP;
int pad_x = (g_pw - pad_w) / 2;
for (int r = 0; r < 4; r++) {
for (int c = 0; c < 3; c++) {
int kx = pad_x + c * (J_KEY_W + J_KEY_GAP);
int ky = jump_pad_y() + r * (J_KEY_H + J_KEY_GAP);
jump_chip(kx, ky, J_KEY_W, J_KEY_H, pad[r][c], (r == 3 && c == 2), th);
}
}
/* 条目列表（当前选中高亮） */
int top = jump_list_y();
int maxshow = (g_ph - top - 8) / J_ROW;
if (maxshow < 1) maxshow = 1;
/* 让当前选中项进入可视区 */
if (g_jump_sel >= 0) {
if (g_jump_sel < g_jump_scroll) g_jump_scroll = g_jump_sel;
else if (g_jump_sel >= g_jump_scroll + maxshow) g_jump_scroll = g_jump_sel - maxshow + 1;
}
if (g_jump_scroll + maxshow > n) g_jump_scroll = (n - maxshow < 0 ? 0 : n - maxshow);
if (g_jump_scroll < 0) g_jump_scroll = 0;
for (int i = 0; i < maxshow; i++) {
int item = g_jump_scroll + i;
if (item >= n) break;
char t[96];
if (g_jump_mode == 1) {
if (rd_book_chapter(g_book, item, t, sizeof t, NULL, NULL, NULL, NULL) != 0) continue;
} else {
snprintf(t, sizeof t, "段 %d", item + 1);
}
int yy = top + i * J_ROW;
if (item == g_jump_sel) meow_ui_fill_rect(0, yy, g_pw, J_ROW - 4, th->surfaceContainer);
meow_ui_text(24, yy + 4, t, 20, th->fg);
meow_ui_draw_rect(12, yy + J_ROW - 6, g_pw - 24, 1, th->outline);
}
meow_ui_text(20, g_ph - 30, "点条目跳转 · 点空白关闭", 16, th->dim);
}
static int reader_jump_hit(int x, int y)
{
int n = (g_jump_mode == 1) ? rd_book_chapter_n(g_book) : rd_book_seg_n(g_book);
if (n <= 0) return J_NONE;
/* 快捷 chips */
int sy = jump_shortcut_y();
if (y >= sy && y < sy + J_SHORTCUT_H) {
int cw = (g_pw - 2 * J_SHORTCUT_X0 - (J_SHORTCUT_N - 1) * J_SHORTCUT_GAP) / J_SHORTCUT_N;
if (x >= J_SHORTCUT_X0) {
int k = (x - J_SHORTCUT_X0) / (cw + J_SHORTCUT_GAP);
if (k >= 0 && k < J_SHORTCUT_N) return J_GO_FIRST + k;
}
return J_NONE;
}
/* 键盘 */
int py = jump_pad_y();
int pad_w = 3 * J_KEY_W + 2 * J_KEY_GAP;
int pad_x = (g_pw - pad_w) / 2;
for (int r = 0; r < 4; r++) {
int ky = py + r * (J_KEY_H + J_KEY_GAP);
if (y >= ky && y < ky + J_KEY_H) {
for (int c = 0; c < 3; c++) {
int kx = pad_x + c * (J_KEY_W + J_KEY_GAP);
if (x >= kx && x < kx + J_KEY_W) {
if (r == 3) {
if (c == 2) return J_JUMP;
if (c == 0) return J_BACK;
return J_DIG_0; /* 第三行 c==1 → 数字 0 */
}
return J_DIG_0 + (r * 3 + c) + 1; /* 0..2 行：1 2 3 / 4 5 6 / 7 8 9 */
}
}
return J_NONE;
}
}
/* 条目列表 */
int top = jump_list_y();
if (y >= top) {
int idx = (y - top) / J_ROW + g_jump_scroll;
if (idx < n) return J_ITEM + idx;
return J_NONE;
}
return J_NONE;
}
static void reader_jump_to(int page)
{
if (!g_book) return;
int np = rd_book_pages(g_book);
if (np <= 0) return;
int cur = rd_book_current(g_book);
(void)cur;
rd_book_set_page(g_book, page);
g_prog_dirty = 1;
reader_refill_page();
reader_redraw();
reader_reflow_persist();
}
static void reader_jump_action(int a)
{
if (a == J_NONE) { g_jump_open = 0; reader_redraw(); return; }
int s, e, inp, ofp;
if (a >= J_GO_FIRST && a <= J_GO_LAST) {
if (jump_region(g_jump_sel, &s, &e, &inp, &ofp) != 0) return;
int target = rd_book_current(g_book);
switch (a) {
case J_GO_FIRST: target = s; break;
case J_GO_M100: target -= 100; break;
case J_GO_M10: target -= 10; break;
case J_GO_P10: target += 10; break;
case J_GO_P100: target += 100; break;
case J_GO_LAST: target = e; break;
}
if (target < s) target = s;
if (target > e) target = e;
reader_jump_to(target);
return;
}
if (a >= J_DIG_0 && a <= J_DIG_9) {
size_t len = strlen(g_jump_buf);
if (len + 1 < sizeof g_jump_buf) { g_jump_buf[len] = (char)('0' + (a - J_DIG_0)); g_jump_buf[len + 1] = 0; }
reader_redraw();
return;
}
if (a == J_BACK) {
size_t len = strlen(g_jump_buf);
if (len > 0) g_jump_buf[len - 1] = 0;
reader_redraw();
return;
}
if (a == J_JUMP) {
if (g_jump_buf[0]) {
int tpage = atoi(g_jump_buf);
if (tpage < 1) tpage = 1;
if (jump_region(g_jump_sel, &s, &e, &inp, &ofp) == 0) {
int t = s + (tpage - 1);
if (t < s) t = s;
if (t > e) t = e;
reader_jump_to(t);
}
}
return;
}
if (a >= J_ITEM) {
int item = a - J_ITEM;
if (g_jump_mode == 1) {
if (jump_region(item, &s, &e, &inp, &ofp) == 0) {
g_jump_sel = item;
reader_jump_to(s);
}
} else {
int sp = rd_book_seg_page(g_book, item);
if (sp >= 0) { g_jump_sel = item; reader_jump_to(sp); }
}
return;
}
g_jump_open = 0; reader_redraw();
}
/* 打开跳转弹层：解析章节（首次会扫描+缓存），按是否有章节选章节/文件·段模式。 */
static void reader_jump_open(void)
{
if (!g_book) return;
g_jump_buf[0] = 0;
g_jump_scroll = 0;
int nc = rd_book_chapter_n(g_book);
if (nc > 0) {
g_jump_mode = 1;
int idx = -1;
rd_book_chapter_for_page(g_book, rd_book_current(g_book), &idx);
g_jump_sel = (idx >= 0) ? idx : 0;
} else if (rd_book_seg_n(g_book) > 0) {
g_jump_mode = 2;
int seg = rd_book_seg_of_page(g_book, rd_book_current(g_book));
g_jump_sel = (seg >= 0) ? seg : 0;
} else {
g_jump_mode = 2;
g_jump_sel = 0;
}
g_jump_open = 1;
g_menu_open = 0;
reader_redraw();
}
/* ----------------「界面」排版面板（B：字号/行距/背景/顶底栏/编码） ----------------
* 自绘 + 自制命中（README §5.2 建议：W_CUSTOM 画布 + 自制 hit，零 SDK widget 协同）。
* 几何 draw/hit 共用（常量）。 */
@@ -416,6 +788,7 @@ static void reader_canvas_render(meow_widget *w, const meow_theme *th, void *ctx
{
(void)w; (void)ctx;
meow_ui_clear(g_page_bg);
chapter_name(); /* 每帧同步顶栏/页底章节名（就绪后取章名，否则文件名） */
if (g_book) {
int page = rd_book_current(g_book);
if ((g_has_font || rd_book_is_image(g_book)) && g_page_buf[RD_PAGE_SLOT_CUR]) {
@@ -427,8 +800,6 @@ static void reader_canvas_render(meow_widget *w, const meow_theme *th, void *ctx
}
/* 页头条（书名 + 章节名；可选，rd.header） */
int sbh = meow_ui_statusbar_height();
int pages = g_book ? rd_book_pages(g_book) : 0;
int page = g_book ? rd_book_current(g_book) : 0;
const char *bk = g_book ? rd_book_basename(g_book) : "阅读";
if (g_show_header) {
meow_ui_fill_rect(0, sbh, g_pw, RD_HEADER_H, g_page_bg);
@@ -438,24 +809,23 @@ static void reader_canvas_render(meow_widget *w, const meow_theme *th, void *ctx
}
/* 页底条（章节 + 页码；可选，rd.footer） */
if (g_show_footer) {
char ft[48];
if (pages > 0) snprintf(ft, sizeof ft, "%d/%d", page + 1, pages);
else snprintf(ft, sizeof ft, "0/0");
char ft[64];
footer_progress(ft, sizeof ft);
int fy = g_ph - RD_FOOT_H;
meow_ui_fill_rect(0, fy, g_pw, RD_FOOT_H, g_page_bg);
meow_ui_text(16, fy + 1, g_chapter[0] ? g_chapter : bk, 16, g_page_fg);
meow_ui_text_right(g_pw - 16, fy + 1, ft, 16, g_page_fg);
}
/* R3 刮擦指示条（非目录/面板覆盖时显示；菜单为底部条，与右缘条并存即可） */
if (g_book && !g_dir_open && !g_ui_open) reader_draw_scrub(th);
/* R3 刮擦指示条（非目录/面板/跳转覆盖时显示；菜单为底部条，与右缘条并存即可） */
if (g_book && !g_dir_open && !g_ui_open && !g_jump_open) reader_draw_scrub(th);
if (g_menu_open) {
int y = g_ph - RD_MENU_H;
meow_ui_fill_rect_alpha(0, y, g_pw, RD_MENU_H, 0x000000, 160);
/* 4 按钮（MVP 单条）：返回 | 目录 | 界面 | 设置 */
/* 5 按钮：返回 | 目录 | 跳转 | 界面 | 设置 */
int bw = g_pw / RD_MENU_BTN;
const char *labels[RD_MENU_BTN] = { "返回", "目录", "界面", "设置" };
const char *labels[RD_MENU_BTN] = { "返回", "目录", "跳转", "界面", "设置" };
for (int i = 0; i < RD_MENU_BTN; i++) {
int bx = i * bw;
meow_ui_fill_rect(bx + 4, y + 12, bw - 8, RD_MENU_H - 24, th->surfaceContainer);
@@ -463,9 +833,13 @@ static void reader_canvas_render(meow_widget *w, const meow_theme *th, void *ctx
}
}
if (g_ui_open && g_book) reader_draw_ui_panel(th);
if (g_jump_open && g_book) reader_draw_jump(th);
if (g_dir_open && g_book) {
/* 目录覆盖层：半透明底 + 条目列表（当前行高亮） */
int n = rd_book_toc_n(g_book);
/* 目录覆盖层：TXT 有章节 → 章节列表（复用 rd_book 章节数据，与跳转共享）；否则 rdsrc 目录；无则「无章节」。 */
int nchap = 0;
if (!rd_book_is_image(g_book) && rd_book_chapter_n(g_book) > 0) nchap = rd_book_chapter_n(g_book);
int ntoc = (nchap == 0) ? rd_book_toc_n(g_book) : 0;
int n = (nchap > 0) ? nchap : ntoc;
if (n > 0) {
int top = g_top + 8;
int row = 34;
@@ -474,19 +848,29 @@ static void reader_canvas_render(meow_widget *w, const meow_theme *th, void *ctx
if (maxshow > n) maxshow = n;
g_dir_top = top; g_dir_row_h = row;
meow_ui_fill_rect_alpha(0, g_top, g_pw, g_ph - g_top, 0x000000, 150);
char t[96]; int sg; int32_t cch;
char t[160];
int page = rd_book_current(g_book);
int curchap = -1;
if (nchap > 0) rd_book_chapter_for_page(g_book, page, &curchap);
for (int i = 0; i < maxshow; i++) {
if (rd_book_toc(g_book, i, t, sizeof t, &sg, &cch) != 0) continue;
int hl = 0;
if (nchap > 0) {
if (rd_book_chapter(g_book, i, t, sizeof t, NULL, NULL, NULL, NULL) != 0) continue;
hl = (i == curchap);
} else {
int sg = -1; int32_t cch = 0;
if (rd_book_toc(g_book, i, t, sizeof t, &sg, &cch) != 0) continue;
hl = (page == sg);
}
int y0 = top + i * row;
if (page == sg) meow_ui_fill_rect(0, y0, g_pw, row - 4, th->surfaceContainer);
if (hl) meow_ui_fill_rect(0, y0, g_pw, row - 4, th->surfaceContainer);
meow_ui_text(24, y0, t, 20, th->fg);
meow_ui_draw_rect(12, y0 + row - 6, g_pw - 24, 1, th->outline);
}
meow_ui_text(20, g_ph - 34, "点条目跳转 · 点空白关闭", 16, th->dim);
} else {
g_dir_open = 0;
meow_ui_text(20, g_top + 40, "本书无目录", 20, th->dim);
meow_ui_text(20, g_top + 40, (rd_book_chapter_n(g_book) == 0) ? "本书无章节" : "本书无目录", 20, th->dim);
}
}
}
@@ -629,12 +1013,13 @@ static void reader_scrub_preview(int page)
static void reader_scrub_begin(int x, int y)
{
(void)x;
if (!g_book || g_menu_open || g_dir_open) return;
if (!g_book || g_menu_open || g_dir_open || g_jump_open) return;
if (g_pw - x > RD_SCRUB_W) return;
if (y < rect_y0() || y >= rect_y1()) return;
int np = rd_book_pages(g_book);
if (np <= 1) return;
g_scrub = 1;
g_scrub_moved = 0; /* 每次触控重置；拖动（touch_move）才置 1，区分点按/刮擦 */
if (g_anim) { meow_anim_cancel(g_anim); g_anim = NULL; }
reader_scrub_preview(scrub_page_for_y(y));
}
@@ -710,9 +1095,10 @@ int reader_open(const char *path)
reader_alloc_page_bufs(); /* 重建 cur+next 两槽；g_anim_old 翻页时懒分配 */
}
/* 复位动画/刮擦状态（跨书） */
/* 复位动画/刮擦/覆盖层状态（跨书） */
if (g_anim) { meow_anim_cancel(g_anim); g_anim = NULL; }
g_scrub = 0; g_menu_open = 0; g_dir_open = 0; g_ui_open = 0;
g_scrub = 0; g_menu_open = 0; g_dir_open = 0; g_ui_open = 0; g_jump_open = 0;
g_chap_cache_idx = -1;
/* 编码：初始 = 打开探测结果；进度里的显式编码（Big5 用户选定）优先重开 */
if (g_book && !rd_book_is_image(g_book)) {
@@ -739,6 +1125,23 @@ int reader_open(const char *path)
return 0;
}
/* ---------- R3.4 章节重解析（app/settings.c 调用） ---------- */
int reader_has_chapter_book(void)
{
if (!g_book || rd_book_is_image(g_book)) return 0;
/* TXT + 分段流式（seg 模式）即支持章节解析；用 rd_book_seg_n（不触发扫描）判定。 */
return (rd_book_seg_n(g_book) > 0) ? 1 : 0;
}
int reader_reparse_chapters(void)
{
if (!g_book) return -1;
int rc = rd_book_reparse_chapters(g_book);
if (rc >= 0) g_chap_cache_idx = -1; /* 章节列表变化 → 章范围缓存失效 */
if (g_reader_active) reader_redraw();
return rc;
}
/* ---------- 视图生命周期 ---------- */
static void reader_on_create(meow_view *v, void *ctx) { (void)v; (void)ctx; }
static void reader_on_enter(meow_view *v, void *ctx)
@@ -766,7 +1169,8 @@ static void reader_on_destroy(meow_view *v, void *ctx)
if (g_book) rd_book_close(g_book);
g_book = NULL;
reader_free_page_bufs();
g_menu_open = 0; g_dir_open = 0; g_ui_open = 0; g_scrub = 0; g_reader_active = 0;
g_menu_open = 0; g_dir_open = 0; g_ui_open = 0; g_jump_open = 0; g_scrub = 0; g_reader_active = 0;
g_chap_cache_idx = -1;
}
meow_view *reader_view_create(void)
@@ -785,28 +1189,52 @@ void reader_on_tap(int x, int y)
{
(void)x;
if (!g_book) { return; }
if (g_scrub) { /* 刮擦抬手 → 跳到目标页收尾 */
if (g_scrub) { /* 刮擦抬手 → 跳到目标页收尾（仅真实拖动过才跳；点按右缘=翻下一页） */
g_scrub = 0;
reader_scrub_jump(g_scrub_page);
if (g_scrub_moved) { reader_scrub_jump(g_scrub_page); return; }
/* 未拖动：当作点按，落到下方三区翻页逻辑（右 1/3 下一页），避免右缘误触跳远页 */
}
if (g_jump_open) {
/* 跳转弹层：快捷/键盘/条目 → 执行；点空白关闭 */
int a = reader_jump_hit(x, y);
reader_jump_action(a);
return;
}
if (g_dir_open) {
/* 目录覆盖层：点条目跳转，点空白关闭 */
int n = rd_book_toc_n(g_book);
/* 目录覆盖层：TXT 章节（复用 rd_book 章节数据）或 rdsrc 目录；点条目跳转，点空白关闭 */
int nchap = 0;
if (!rd_book_is_image(g_book) && rd_book_chapter_n(g_book) > 0) nchap = rd_book_chapter_n(g_book);
int n = (nchap > 0) ? nchap : rd_book_toc_n(g_book);
if (n > 0 && x >= 0 && y >= g_dir_top) {
int row = g_dir_row_h > 0 ? g_dir_row_h : 34;
int idx = (y - g_dir_top) / row;
if (idx < n && idx >= 0) {
char t[96]; int sg; int32_t cch;
if (rd_book_toc(g_book, idx, t, sizeof t, &sg, &cch) == 0) {
if (g_book && sg >= 0) {
rd_book_jump_to_anchor(g_book, sg, cch, g_fs, g_ls);
g_dir_open = 0; g_menu_open = 0;
snprintf(g_chapter, sizeof g_chapter, "%s", t);
reader_refill_page();
reader_redraw();
reader_reflow_persist();
return;
if (nchap > 0) {
int64_t co = 0;
if (rd_book_chapter(g_book, idx, NULL, 0, &co, NULL, NULL, NULL) == 0) {
int sp = rd_book_page_for_char(g_book, co);
if (sp >= 0) {
rd_book_set_page(g_book, sp);
g_dir_open = 0; g_menu_open = 0;
g_chap_cache_idx = -1;
reader_refill_page();
reader_redraw();
reader_reflow_persist();
return;
}
}
} else {
char t[96]; int sg; int32_t cch;
if (rd_book_toc(g_book, idx, t, sizeof t, &sg, &cch) == 0) {
if (g_book && sg >= 0) {
rd_book_jump_to_anchor(g_book, sg, cch, g_fs, g_ls);
g_dir_open = 0; g_menu_open = 0;
snprintf(g_chapter, sizeof g_chapter, "%s", t);
reader_refill_page();
reader_redraw();
reader_reflow_persist();
return;
}
}
}
}
@@ -865,14 +1293,18 @@ void reader_on_tap(int x, int y)
reader_reflow_persist();
meow_view_page_pop();
return;
case 1: /* 目录 */
if (rd_book_toc_n(g_book) > 0) { g_dir_open = 1; g_menu_open = 0; reader_redraw(); }
case 1: /* 目录（TXT 章节 → 章节列表；无章节显示「本书无章节」） */
g_dir_open = 1; g_menu_open = 0; reader_redraw();
return;
case 2: /* 跳转（章节/文件·段模式） */
if (rd_book_chapter_n(g_book) > 0 || rd_book_seg_n(g_book) > 0) { reader_jump_open(); }
else if (rd_book_toc_n(g_book) > 0) { g_dir_open = 1; g_menu_open = 0; reader_redraw(); }
else { g_menu_open = 0; reader_redraw(); }
return;
case 2: /* 界面（阅读排版设置） */
case 3: /* 界面（阅读排版设置） */
g_ui_open = 1; g_menu_open = 0; reader_redraw();
return;
case 3: /* 设置 → App 设置页 */
case 4: /* 设置 → App 设置页 */
reader_reflow_persist();
meow_view_page_push(ACT_SETTINGS);
return;
@@ -901,6 +1333,7 @@ void reader_on_swipe(int dir, int dx, int dy)
* 刮擦（reader_scrub_begin，由 touch_down/move 驱动）两条既有路径。 */
if (g_ui_open) { g_ui_open = 0; reader_redraw(); return; }
if (g_dir_open) { g_dir_open = 0; reader_redraw(); return; }
if (g_jump_open) { g_jump_open = 0; reader_redraw(); return; }
if (g_menu_open) { g_menu_open = 0; reader_redraw(); return; }
if (dir == MEOW_SWIPE_LEFT || dir == MEOW_SWIPE_RIGHT) {
reader_reflow_persist();
@@ -913,7 +1346,7 @@ void reader_on_touch_down(int x, int y) { reader_scrub_begin(x, y); }
void reader_on_touch_move(int x, int y)
{
(void)x;
if (g_scrub && g_book) reader_scrub_preview(scrub_page_for_y(y));
if (g_scrub && g_book) { g_scrub_moved = 1; reader_scrub_preview(scrub_page_for_y(y)); }
}
/* 系统翻页信号（E）：reader_ipc 线程收到 MSG_KEY_PAGEUP/PAGEDOWN 后置 pending 计数；
@@ -932,9 +1365,12 @@ void reader_on_tick(uint64_t now)
if (g_volpage_pending) {
int dir = g_volpage_pending > 0 ? 1 : -1;
g_volpage_pending = 0;
if (g_book && !g_menu_open && !g_dir_open && !g_ui_open)
if (g_book && !g_menu_open && !g_dir_open && !g_ui_open && !g_jump_open)
reader_turn_animated(dir);
}
/* Phase 2C：空闲预取下一段（距段界 ≤2% 时提前解码进窗口，翻段界零突发） */
if (g_book && !g_menu_open && !g_dir_open && !g_ui_open && !g_jump_open)
rd_book_prefetch(g_book);
/* R3.2：进度实时落盘（翻页/刮擦/字号/编码变更后，节流 ~1s 定时写）——意外崩溃重开不丢进度 */
if (g_prog_dirty && now - g_prog_last_save_ms >= 1000) {
g_prog_last_save_ms = now;