fix: 解决命名冲突

lcui-dev · Jan 26, 2025 · affb31f · affb31f
1 parent 7a4460c
commit affb31f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/src/app-plugin/index.ts b/src/app-plugin/index.ts
@@ -42,13 +42,13 @@ export default class AppPlugin {
 
 int main(int argc, char *argv[])
 {
-        lcui_app_init();
+        app_init();
 ${router.initCode.map((line) => `        ${line}`).join("\n")}
         // Write code here to initialize your application,
         // such as loading configuration files, initializing functional modules
         // ...
 
-        return lcui_app_run();
+        return app_run();
 }
 `
         );
@@ -62,7 +62,7 @@ ${[...router.includeCode, ...components.includeCode, ...router.globalCode].join(
   "\n"
 )}
 
-static void lcui_app_init(void)
+static void app_init(void)
 {
         lcui_init();
 ${[
@@ -76,7 +76,7 @@ ${[
   .join("\n")}
 }
 
-static int lcui_app_run(void)
+static int app_run(void)
 {
         return lcui_run();
 }

diff --git a/src/app-plugin/router.ts b/src/app-plugin/router.ts
@@ -114,7 +114,7 @@ function compileAppRoute(appRoute: RouteConfig, context: string) {
   compileRoute({ page: appRoute.page, children: [] }, "", "NULL");
   return [
     "",
-    "static void lcui_app_router_init(void)",
+    "static void app_router_init(void)",
     "{",
     [
       `router_config_t *config`,
@@ -157,7 +157,7 @@ export class AppRouterCompiler {
     }
     return {
       includeCode: ["#include <router.h>"],
-      baseInitCode: ["lcui_app_router_init();"],
+      baseInitCode: ["app_router_init();"],
       componentsInitCode: [],
       initCode: [
         'ui_widget_set_attr(ui_root(), "router", "AppRouter");',