主仓 SDK 的图片层原本是 220 行 stb 直通(整幅解码后重采样)。公开仓 MeowOS-SDK 的同一子系统已被真实 App(tuku 阅读器)驱动并做过峰值实测与像素比对,故以公开仓 为权威方向并入主仓 meow_ui.a,两个方向的新功能都保留(逐文件 diff 确认公开仓是 严格超集:无一处「双方互有增减」)。 - 新增 meow_jpeg.c / meow_jpeg.h:DCT 域缩解 1/8、1/4、1/2(N=1/2/4 点 IDCT), 渐进式只解到首个精细化扫描;不支持项(CMYK/YCCK、算术编码、过订阅 DHT、16bit 量化表)返回 0 由调用方回退 stb - 新增 meow_png_stream.c:libz 逐行 inflate + 反滤波,按步长丢行丢列直写目标尺寸; BMP 按目标行 seek + 行内跳列(8/16/24/32bpp) - meow_ui_img.c + include/meow_ui_image.h:新增 meow_img_pick_scale / load_file_step / load_file_step_ex / resample 四个公开入口;_dim 与 _mem_dim 先进后端,失败/不支持才回退 stb(对外语义不变) - include/meow_ui_draw.h + meow_ui_gfx.c:M32 RGB565 页图 5 函数 (meow_gfx_rgb565 / rgba_to_rgb565 / blit_rgb565 / _scaled)。gfx 保留主仓的 `#include "../meow_launcherd/meow_font.h"` 与 <time.h>(公开仓自 vendored meow_font.h 且无 <time.h>,机械覆盖会丢这两行) - meow_jpeg.h 保持内部:不进 meow_ui.h 伞头,include/ 下无任何头暴露 meow_jpeg_* - build_sdk.sh:OBJS 插入 meow_jpeg / meow_png_stream(32→34);成员数 76→78(+meow_font.o +43 freetype),--verify 全为 ELF32 MIPS32 rel2/o32 - 测试:新增 test_meow_img_stream.c(S1-S16),test_meow_img_budget.c 同步公开仓 版(B9 断言收紧为 p_new <= p_old);22 个既有宿主测试的编译注释行补 meow_jpeg.c / meow_png_stream.c / -lz(meow_ui_img.c 现引用后端符号,不加即 undefined reference) 宿主实测:S1-S16 全绿(S7 与 stb 网格像素一致:JPEG mad 4.35-13.69、PNG/BMP mad 0.00;S9 回退矩阵 CMYK/1bpp BMP/Adam7 均拒绝且 stb 仍成功),B1-B9 全绿 (B9 PNG 峰值 25.65→0.61 MiB、BMP 14.65→0.59 MiB)。回归 test_meow_ui_widgets / scroll / ime_fix / test_umbrella 全过。zlib 在应用链接期解析:meow_ui.a 只留 inflate* 未定义符号,四个 App 构建脚本原本就带 $SYSROOT/lib/libz.a,静态 linkcheck(meow_ui.a + libz.a -lpthread)通过。 注:主仓 patch_v2/reader_app 仍自带 vendored stb、不用 meow_img_*,本单不改变 阅读器的内存占用;RGB565 页图接入 reader_app 是另一个任务。
197 lines
9.2 KiB
C
197 lines
9.2 KiB
C
/* test_meow_ui_home_gesture.c — 批② SDK 全局「App 内底部热区上滑回桌面」宿主验证。
|
||
*
|
||
* 覆盖(并同 meow_ui_input_is_home_swipe 判据、touch_release 分类、meow_ui_run 分发三层):
|
||
* T1 判定矩阵(meow_ui_input_is_home_swipe,镜像 launcher np_gesture.h np_home_gesture):
|
||
* 底部热区上滑=1;底部左缘上滑=0(左缘返回互斥);中部上滑=0(App 滚动);底部横向=0;
|
||
* 底部下滑=0;上移不足=0;横向主导=0;屏底边界(down_y=fb_h-HOME_EDGE_H)之外=0。
|
||
* T2 触摸状态机分类(真实 touch_release → 队列 pop 断言):
|
||
* 底部热区上滑→MEOW_EV_HOME(a=MEOW_SWIPE_UP);中部上滑→MEOW_EV_SWIPE(UP)(不被剥回桌面);
|
||
* 底部左缘横滑→MEOW_EV_SWIPE(LEFT)(原左缘返回,不被剥)。
|
||
* T3 分发(meow_ui_run 主循环,run-loop 复用 test_meow_ui_view_event 的 driver 线程范式):
|
||
* 3a 未注册 on_swipe:注入 MEOW_EV_HOME → meow_ui_nav_request_exit 被触发(一次)——回桌面;
|
||
* 3b 未注册 on_swipe:注入 MEOW_EV_SWIPE(UP)(中部上滑)→ nav_request_exit 不触发(App 滚动);
|
||
* 3c 注册 on_swipe:注入 MEOW_EV_HOME → nav_request_exit 触发(系统级手势优先于 App on_swipe),
|
||
* on_swipe 不被调用——屏底热区上滑是系统保留手势,任意 App 内生效(用户 2026-09-04 批②)。
|
||
*
|
||
* 编译(宿主 gcc,链真实 SDK 源全集 + 打桩 font/global;**不链 meow_ui_nav.c**——本测以测试内
|
||
* meow_ui_nav_request_exit 桩计数验证触发):
|
||
* gcc -Wall -Wextra -o test_meow_ui_home_gesture test_meow_ui_home_gesture.c test_host_stub.c \
|
||
* meow_ui_gfx.c meow_ui_time.c meow_ui_sys.c meow_ui_theme.c meow_ui_vol.c meow_ui_log.c \
|
||
* meow_ui_widget.c meow_ui_input.c meow_ui_activity.c meow_ui_dialog.c meow_ui_ime.c meow_ui_str.c \
|
||
* meow_pinyin.c meow_ui_draw.c meow_ui_view.c meow_ui_box.c meow_ui_anim.c meow_ui_scroll.c \
|
||
* meow_ui_img.c meow_ui_media.c meow_notify_ipc.c stb_image.c meow_jpeg.c meow_png_stream.c \
|
||
* -I. -I../meow_launcherd -DMEOW_UI_HOST_TEST -pthread -lm -lz
|
||
* 运行:./test_meow_ui_home_gesture
|
||
*/
|
||
#include "meow_ui.h"
|
||
#include "meow_ui_internal.h" /* meow_input_touch_set/move/release + meow_input_pop + MEOW_EV_* */
|
||
#include "meow_ui_nav.h" /* meow_ui_nav_request_exit 原型(本测以桩计数验证) */
|
||
|
||
#include <stdio.h>
|
||
#include <string.h>
|
||
#include <unistd.h>
|
||
#include <pthread.h>
|
||
#include <assert.h>
|
||
|
||
/* MEOW_EV_HOME 是 meow_ui_input.c 内部常量(未入公共头,同 MEOW_EV_NOTIF_PULL 惯例),按同值声明。 */
|
||
#ifndef MEOW_EV_HOME
|
||
#define MEOW_EV_HOME 9
|
||
#endif
|
||
|
||
static int g_pass = 0, g_fail = 0;
|
||
#define CHECK(cond, ...) do { \
|
||
if (cond) { g_pass++; } \
|
||
else { g_fail++; printf("FAIL %s:%d ", __FILE__, __LINE__); printf(__VA_ARGS__); printf("\n"); } \
|
||
} while (0)
|
||
|
||
/* fb 高度(宿主 480x720) */
|
||
#define FBW 480
|
||
#define FBH 720
|
||
/* 判据常量镜像(np_gesture.h NP_HOME_EDGE_H=28 / NP_HOME_SWIPE=65 / NP_EDGE_W=24)。 */
|
||
#define H_EDGE 28
|
||
#define H_SWIPE 65
|
||
#define EDGE_W 24
|
||
|
||
/* ---- nav_request_exit 桩(不链 meow_ui_nav.c;计数验证 SDK 触发) ---- */
|
||
static int g_nav_exit_calls = 0;
|
||
void meow_ui_nav_request_exit(void) { g_nav_exit_calls++; }
|
||
|
||
/* ---- on_swipe 桩(App 接管验证) ---- */
|
||
static int g_swipe_calls = 0;
|
||
static int g_swipe_dir = -1;
|
||
static int g_swipe_dx = 0;
|
||
static void app_on_swipe(int dir, int dx, int dy) { (void)dy; g_swipe_calls++; g_swipe_dir = dir; g_swipe_dx = dx; }
|
||
|
||
/* 从队列 pop 一个事件并回填 (type,a,b);无事件返回 0。 */
|
||
static int pop_ev(int *type, int *a, int *b)
|
||
{
|
||
meow_input_ev e;
|
||
if (!meow_input_pop(&e)) return 0;
|
||
*type = e.type; *a = e.a; *b = e.b;
|
||
return 1;
|
||
}
|
||
|
||
/* ============ T1 判定矩阵(meow_ui_input_is_home_swipe) ============ */
|
||
static void test_predicate(void)
|
||
{
|
||
printf("T1 meow_ui_input_is_home_swipe matrix\n");
|
||
int bz = FBH - H_EDGE; /* 底部热区上边界 y = 720-28 = 692 */
|
||
|
||
CHECK(meow_ui_input_is_home_swipe(240, bz + 10, 0, -120, FBH) == 1, "T1 bottom-hotzone up -> 1");
|
||
CHECK(meow_ui_input_is_home_swipe(100, FBH - 1, 20, -80, FBH) == 1, "T1 screen-bottom up (x>EDGE_W) -> 1");
|
||
CHECK(meow_ui_input_is_home_swipe(240, bz + 10, 0, -H_SWIPE, FBH) == 1, "T1 exactly threshold up -> 1");
|
||
CHECK(meow_ui_input_is_home_swipe(240, bz + 10, -30, -70, FBH) == 1, "T1 up w/ small left dx (adx<dy) -> 1");
|
||
|
||
/* 左缘互斥(down_x<EDGE_W) */
|
||
CHECK(meow_ui_input_is_home_swipe(10, bz + 10, 0, -120, FBH) == 0, "T1 left-edge origin -> 0 (edge-back reserved)");
|
||
/* 中部上滑(App 滚动) */
|
||
CHECK(meow_ui_input_is_home_swipe(240, 300, 0, -120, FBH) == 0, "T1 mid-screen up -> 0 (App scroll)");
|
||
/* 底部横向(左缘返回/横向逻辑保留) */
|
||
CHECK(meow_ui_input_is_home_swipe(240, bz + 10, 120, 0, FBH) == 0, "T1 bottom horizontal -> 0");
|
||
/* 底部下滑 */
|
||
CHECK(meow_ui_input_is_home_swipe(240, bz + 10, 0, 120, FBH) == 0, "T1 bottom down -> 0");
|
||
/* 上移不足(<H_SWIPE) */
|
||
CHECK(meow_ui_input_is_home_swipe(240, bz + 10, 0, -(H_SWIPE - 1), FBH) == 0, "T1 up below threshold -> 0");
|
||
/* 竖向未主导(横向位移≥上移量,adx>=dy) */
|
||
CHECK(meow_ui_input_is_home_swipe(240, bz + 10, -120, -80, FBH) == 0, "T1 up w/ big dx (not vertical-dominant) -> 0");
|
||
/* 热区边界之外(down_y < bz) */
|
||
CHECK(meow_ui_input_is_home_swipe(240, bz - 1, 0, -120, FBH) == 0, "T1 just above hotzone -> 0");
|
||
}
|
||
|
||
/* ============ T2 触摸状态机分类(touch_release → 队列) ============ */
|
||
static void test_touch_classify(void)
|
||
{
|
||
printf("T2 touch_release classification\n");
|
||
meow_input_drain();
|
||
|
||
/* 底部热区上滑 → MEOW_EV_HOME */
|
||
meow_input_touch_set(1, 240, FBH - 5, 0); /* 起点 y=715 ∈ [692,720) */
|
||
meow_input_touch_move(240, FBH - 5 - 130); /* 上移 130 */
|
||
meow_input_touch_release();
|
||
{
|
||
int t, a, b;
|
||
CHECK(pop_ev(&t, &a, &b) == 1 && t == MEOW_EV_HOME && a == MEOW_SWIPE_UP,
|
||
"T2 bottom-hotzone up -> MEOW_EV_HOME(UP) got type=%d a=%d", t, a);
|
||
}
|
||
|
||
/* 中部上滑 → 普通 MEOW_EV_SWIPE(UP)(不被剥回桌面) */
|
||
meow_input_touch_set(1, 240, 300, 0);
|
||
meow_input_touch_move(240, 300 - 130);
|
||
meow_input_touch_release();
|
||
{
|
||
int t, a, b;
|
||
CHECK(pop_ev(&t, &a, &b) == 1 && t == MEOW_EV_SWIPE && a == MEOW_SWIPE_UP,
|
||
"T2 mid up -> SWIPE(UP) got type=%d a=%d", t, a);
|
||
}
|
||
|
||
/* 底部左缘横滑 → 原有左缘返回(不被剥) */
|
||
meow_input_touch_set(1, 5, FBH - 5, 0);
|
||
meow_input_touch_move(5 + 100, FBH - 5);
|
||
meow_input_touch_release();
|
||
{
|
||
int t, a, b;
|
||
CHECK(pop_ev(&t, &a, &b) == 1 && t == MEOW_EV_SWIPE && a == MEOW_SWIPE_LEFT,
|
||
"T2 bottom-left horizontal -> SWIPE(LEFT) got type=%d a=%d", t, a);
|
||
}
|
||
}
|
||
|
||
/* ============ T3 分发(meow_ui_run 主循环) ============ */
|
||
static int g_inj_type, g_inj_a, g_inj_b;
|
||
static void *driver(void *arg)
|
||
{
|
||
(void)arg;
|
||
usleep(700000); /* 等 startup cooldown(500ms) 过后再注入 */
|
||
meow_input_inject(g_inj_type, g_inj_a, g_inj_b);
|
||
usleep(80000);
|
||
meow_ui_request_exit();
|
||
return NULL;
|
||
}
|
||
|
||
static void run_scenario(int inj_type, int inj_a, int inj_b, int register_swipe)
|
||
{
|
||
g_inj_type = inj_type; g_inj_a = inj_a; g_inj_b = inj_b;
|
||
g_nav_exit_calls = 0;
|
||
g_swipe_calls = 0; g_swipe_dir = -1; g_swipe_dx = 0;
|
||
meow_input_drain(); /* 防上一次残留事件影响本次分发 */
|
||
|
||
meow_ui_events ev; memset(&ev, 0, sizeof ev);
|
||
if (register_swipe) ev.on_swipe = app_on_swipe;
|
||
|
||
pthread_t thd; pthread_create(&thd, NULL, driver, NULL);
|
||
meow_ui_run(&ev);
|
||
pthread_join(thd, NULL);
|
||
}
|
||
|
||
static void test_dispatch(void)
|
||
{
|
||
printf("T3 meow_ui_run dispatch (home = nav_request_exit fallback)\n");
|
||
|
||
/* 3a 未注册 on_swipe:底部热区上滑 → nav_request_exit 触发一次(回桌面) */
|
||
run_scenario(MEOW_EV_HOME, MEOW_SWIPE_UP, 120, 0);
|
||
CHECK(g_nav_exit_calls == 1, "T3a no-on_swipe MEOW_EV_HOME -> nav_request_exit fired (got %d)", g_nav_exit_calls);
|
||
CHECK(g_swipe_calls == 0, "T3a no-on_swipe -> on_swipe NOT called");
|
||
|
||
/* 3b 未注册 on_swipe:中部上滑(普通 MEOW_EV_SWIPE UP)→ nav_request_exit 不触发(App 滚动) */
|
||
run_scenario(MEOW_EV_SWIPE, MEOW_SWIPE_UP, 120, 0);
|
||
CHECK(g_nav_exit_calls == 0, "T3b mid-swipe-up -> nav_request_exit NOT fired (App scroll), got %d", g_nav_exit_calls);
|
||
|
||
/* 3c 注册 on_swipe:底部热区上滑 → 系统优先,nav_request_exit 触发(回桌面),on_swipe 不被调用 */
|
||
run_scenario(MEOW_EV_HOME, MEOW_SWIPE_UP, 120, 1);
|
||
CHECK(g_nav_exit_calls == 1, "T3c on_swipe registered -> nav_request_exit STILL fired (system gesture wins), got %d", g_nav_exit_calls);
|
||
CHECK(g_swipe_calls == 0, "T3c system-priority home -> on_swipe NOT called");
|
||
}
|
||
|
||
int main(void)
|
||
{
|
||
meow_ui_opts o = { FBW, FBH };
|
||
if (meow_ui_init(&o) != 0) { printf("init failed\n"); return 1; }
|
||
|
||
test_predicate();
|
||
test_touch_classify();
|
||
test_dispatch();
|
||
|
||
meow_ui_shutdown();
|
||
printf("home_gesture: %d pass / %d fail\n", g_pass, g_fail);
|
||
return g_fail ? 1 : 0;
|
||
}
|