Skip to content

Commit affb31f

Browse files
committed
fix: 解决命名冲突
1 parent 7a4460c commit affb31f

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

src/app-plugin/index.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,13 +42,13 @@ export default class AppPlugin {
4242
4343
int main(int argc, char *argv[])
4444
{
45-
lcui_app_init();
45+
app_init();
4646
${router.initCode.map((line) => ` ${line}`).join("\n")}
4747
// Write code here to initialize your application,
4848
// such as loading configuration files, initializing functional modules
4949
// ...
5050
51-
return lcui_app_run();
51+
return app_run();
5252
}
5353
`
5454
);
@@ -62,7 +62,7 @@ ${[...router.includeCode, ...components.includeCode, ...router.globalCode].join(
6262
"\n"
6363
)}
6464
65-
static void lcui_app_init(void)
65+
static void app_init(void)
6666
{
6767
lcui_init();
6868
${[
@@ -76,7 +76,7 @@ ${[
7676
.join("\n")}
7777
}
7878
79-
static int lcui_app_run(void)
79+
static int app_run(void)
8080
{
8181
return lcui_run();
8282
}

src/app-plugin/router.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ function compileAppRoute(appRoute: RouteConfig, context: string) {
114114
compileRoute({ page: appRoute.page, children: [] }, "", "NULL");
115115
return [
116116
"",
117-
"static void lcui_app_router_init(void)",
117+
"static void app_router_init(void)",
118118
"{",
119119
[
120120
`router_config_t *config`,
@@ -157,7 +157,7 @@ export class AppRouterCompiler {
157157
}
158158
return {
159159
includeCode: ["#include <router.h>"],
160-
baseInitCode: ["lcui_app_router_init();"],
160+
baseInitCode: ["app_router_init();"],
161161
componentsInitCode: [],
162162
initCode: [
163163
'ui_widget_set_attr(ui_root(), "router", "AppRouter");',

0 commit comments

Comments
 (0)