From a2510a8378832126ffc3c951eff1ac389da3de98 Mon Sep 17 00:00:00 2001 From: coffee Date: Fri, 8 Aug 2025 20:23:29 +0800 Subject: [PATCH] =?UTF-8?q?1.=20=E9=A1=B5=E9=9D=A2=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E5=88=87=E6=8D=A2=E4=BA=8B=E4=BB=B6=E6=94=AF=E6=8C=81=E5=8F=82?= =?UTF-8?q?=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- include/HUIPageManage.h | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/include/HUIPageManage.h b/include/HUIPageManage.h index e15e507..8fe6e27 100644 --- a/include/HUIPageManage.h +++ b/include/HUIPageManage.h @@ -32,20 +32,20 @@ #define UIPAGE_CMD cmd #if 1 -#define UIPAGE_CASE(page, func) case page: { LogD("current page[%d], event[%s]", page, #page); func(); LogD("event End"); } break -#define UIPAGE_CASE_RET(page, func) case page: { LogD("current page[%d], event[%s]", page, #page); return func(); LogD("event End"); } break +#define UIPAGE_CASE(page, func, ...) case page: { LogD("current page[%d], event[%s]", page, #page); func(__VA_ARGS__); LogD("event End"); } break +#define UIPAGE_CASE_RET(page, func, ...) case page: { LogD("current page[%d], event[%s]", page, #page); return func(__VA_ARGS__); LogD("event End"); } break #else -#define UIPAGE_CASE(page, func) case page: { func(); } break -#define UIPAGE_CASE_RET(page, func) case page: { return func(); } break +#define UIPAGE_CASE(page, func, ...) case page: { func(__VA_ARGS__); } break +#define UIPAGE_CASE_RET(page, func, ...) case page: { return func(__VA_ARGS__); } break #endif -#define UIPAGE_INIT_FUNC(func) UIPAGE_CASE(kCallInitPage, func) -#define UIPAGE_FREE_FUNC(func) UIPAGE_CASE(kCallFreePage, func) -#define UIPAGE_SHOW_FUNC(func) UIPAGE_CASE(kCallShowPage, func) -#define UIPAGE_HIDE_FUNC(func) UIPAGE_CASE(kCallHidePage, func) +#define UIPAGE_INIT_FUNC(func, ...) UIPAGE_CASE(kCallInitPage, func, __VA_ARGS__) +#define UIPAGE_FREE_FUNC(func, ...) UIPAGE_CASE(kCallFreePage, func, __VA_ARGS__) +#define UIPAGE_SHOW_FUNC(func, ...) UIPAGE_CASE(kCallShowPage, func, __VA_ARGS__) +#define UIPAGE_HIDE_FUNC(func, ...) UIPAGE_CASE(kCallHidePage, func, __VA_ARGS__) -#define UIPAGE_SWITCH_FUNC(func) UIPAGE_CASE_RET(kCallSwitchPage, func) -#define UIPAGE_INDEX_FUNC(func) UIPAGE_CASE(kCallIndexSave, func) +#define UIPAGE_SWITCH_FUNC(func, ...) UIPAGE_CASE_RET(kCallSwitchPage, func, __VA_ARGS__) +#define UIPAGE_INDEX_FUNC(func, ...) UIPAGE_CASE(kCallIndexSave, func, __VA_ARGS__) #define UIPAGE_INIT_SHOW_FUNC(init, show) UIPAGE_INIT_FUNC(init); UIPAGE_SHOW_FUNC(show) #define UIPAGE_DEINIT_HIDE_FUNC(deinit, hide) UIPAGE_FREE_FUNC(deinit); UIPAGE_HIDE_FUNC(hide)