From bd5e307ffb4ace025a5c85e286a277aea65c8057 Mon Sep 17 00:00:00 2001 From: zhangboren Date: Mon, 8 Sep 2025 16:38:52 +0800 Subject: [PATCH] ArkTS1.2 move EntryPoint to customComponent.ets. Signed-off-by: zhangboren --- .../arkts_frontend/arkts_dynamic_frontend.cpp | 2 +- .../bridge/arkts_frontend/arkts_frontend.cpp | 2 +- .../arkts_frontend/arkts_plugin_frontend.cpp | 2 +- .../arkui-ohos/src/ArkUIEntry.ets | 3 +- .../arkoala-arkts/arkui-ohos/src/UserView.ets | 21 +------------ .../arkui-ohos/src/base/Router.ets | 3 +- .../src/component/customComponent.ets | 31 +++++++++++++++---- 7 files changed, 33 insertions(+), 31 deletions(-) diff --git a/frameworks/bridge/arkts_frontend/arkts_dynamic_frontend.cpp b/frameworks/bridge/arkts_frontend/arkts_dynamic_frontend.cpp index 3a2a42bf39f..8fc9be6bdc3 100644 --- a/frameworks/bridge/arkts_frontend/arkts_dynamic_frontend.cpp +++ b/frameworks/bridge/arkts_frontend/arkts_dynamic_frontend.cpp @@ -47,7 +47,7 @@ struct AppInfo { const AppInfo KOALA_APP_INFO = { "arkui.ArkUIEntry.Application", "createApplication", - "C{std.core.String}C{std.core.String}zC{std.core.String}C{arkui.UserView.UserView}C{arkui.UserView.EntryPoint}" + "C{std.core.String}C{std.core.String}zC{std.core.String}C{arkui.UserView.UserView}C{arkui.component.customComponent.EntryPoint}" ":C{arkui.ArkUIEntry.Application}", "start", ":l", diff --git a/frameworks/bridge/arkts_frontend/arkts_frontend.cpp b/frameworks/bridge/arkts_frontend/arkts_frontend.cpp index b29cf551aa9..3483c0c8b22 100644 --- a/frameworks/bridge/arkts_frontend/arkts_frontend.cpp +++ b/frameworks/bridge/arkts_frontend/arkts_frontend.cpp @@ -55,7 +55,7 @@ struct AppInfo { const AppInfo KOALA_APP_INFO = { "arkui.ArkUIEntry.Application", "createApplication", - "C{std.core.String}C{std.core.String}zC{std.core.String}C{arkui.UserView.UserView}C{arkui.UserView.EntryPoint}" + "C{std.core.String}C{std.core.String}zC{std.core.String}C{arkui.UserView.UserView}C{arkui.component.customComponent.EntryPoint}" ":C{arkui.ArkUIEntry.Application}", "start", ":l", diff --git a/frameworks/bridge/arkts_frontend/arkts_plugin_frontend.cpp b/frameworks/bridge/arkts_frontend/arkts_plugin_frontend.cpp index 771338776e4..04025a87555 100644 --- a/frameworks/bridge/arkts_frontend/arkts_plugin_frontend.cpp +++ b/frameworks/bridge/arkts_frontend/arkts_plugin_frontend.cpp @@ -41,7 +41,7 @@ struct AppInfo { const AppInfo KOALA_APP_INFO = { "arkui.ArkUIEntry.Application", "createApplication", - "C{std.core.String}C{std.core.String}zC{std.core.String}C{arkui.UserView.UserView}C{arkui.UserView.EntryPoint}" + "C{std.core.String}C{std.core.String}zC{std.core.String}C{arkui.UserView.UserView}C{arkui.component.customComponent.EntryPoint}" ":C{arkui.ArkUIEntry.Application}", "start", ":l", diff --git a/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/ArkUIEntry.ets b/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/ArkUIEntry.ets index d12c50d0d3e..ccffc399613 100644 --- a/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/ArkUIEntry.ets +++ b/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/ArkUIEntry.ets @@ -20,7 +20,8 @@ import { DeserializerBase, pointer, nullptr, KPointer, InteropNativeModule, regi import { PeerNode } from "./PeerNode" import { ArkUINativeModule } from "#components" import { EventEmulator } from "#generated" -import { UserView, UserViewBuilder, EntryPoint } from "./UserView" +import { UserView, UserViewBuilder } from "./UserView" +import { EntryPoint } from './component/customComponent'; import { ClickEvent, ClickEventInternal } from "#generated" import { checkEvents, setCustomEventsChecker } from "./Events" import { checkArkoalaCallbacks } from "./CallbacksChecker" diff --git a/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/UserView.ets b/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/UserView.ets index 705335f8118..ed62f6641b5 100644 --- a/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/UserView.ets +++ b/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/UserView.ets @@ -63,23 +63,4 @@ export function UserMemoWrapper( @memo const wrapper = () => { page_() } return wrapper -} - -export interface NavInterface { - bundleName: string; - moduleName: string; - pagePath: string; - pageFullPath: string; - integratedHsp: string; -} - -export class EntryPoint { - constructor() {} - /** @memo */ - entry(): void { - } - - public static RegisterNamedRouter(routerName: string, instance: EntryPoint, param: NavInterface) { - - } -} +} \ No newline at end of file diff --git a/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/base/Router.ets b/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/base/Router.ets index b37b4c32a54..e4807972704 100644 --- a/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/base/Router.ets +++ b/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/base/Router.ets @@ -33,7 +33,8 @@ import { IncrementalNode } from "@koalaui/runtime" import { KPointer, runtimeType, RuntimeType } from "@koalaui/interop" -import { UserViewBuilder, UserView, EntryPoint } from "../UserView" +import { UserViewBuilder, UserView } from "../UserView" +import { EntryPoint } from '../component/customComponent'; import { ArkUINativeModule } from "#components" import { CommonMethod, CustomBuilder, Dimension, LayoutSafeAreaEdge, LayoutSafeAreaType, Length, NavBarPosition, NavContentInfo, NavigationAnimatedTransition, NavigationCommonTitle, NavigationCustomTitle, NavigationMenuItem, NavigationMode, NavigationOperation, NavigationTitleMode, NavigationTitleOptions, NavigationToolbarOptions, PixelMap, Resource, ResourceStr, SystemBarStyle, ToolbarItem } from "#generated" import { RouteType } from "#generated" diff --git a/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/component/customComponent.ets b/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/component/customComponent.ets index b0e5d836197..d4e44963de1 100644 --- a/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/component/customComponent.ets +++ b/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/component/customComponent.ets @@ -36,7 +36,7 @@ export interface PageLifeCycle { onNewParam(param: object | undefined | null): void {} } -export interface LayoutCallback { +export interface LayoutCallbacks { onPlaceChildren(selfLayoutInfo: GeometryInfo, children: Array, constraint: ConstraintSizeOptions): void {} onMeasureSize(selfLayoutInfo: GeometryInfo, children: Array, constraint: ConstraintSizeOptions): SizeResult { return {width: 0, height: 0} as SizeResult @@ -57,7 +57,7 @@ export class CustomDelegate extends } get isCustomLayout(): boolean { - return this.instance instanceof LayoutCallback; + return this.instance instanceof LayoutCallbacks; } queryNavigationInfo(): uiObserver.NavigationInfo { @@ -171,16 +171,16 @@ export class CustomDelegate extends // Custom layout onPlaceChildren(selfLayoutInfo: GeometryInfo, children: Array, constraint: ConstraintSizeOptions): void { - if (this.instance instanceof LayoutCallback) { - const layout = this.instance as LayoutCallback; + if (this.instance instanceof LayoutCallbacks) { + const layout = this.instance as LayoutCallbacks; layout.onPlaceChildren(selfLayoutInfo, children, constraint); } else { throw new Error('not a custom layout component'); } } onMeasureSize(selfLayoutInfo: GeometryInfo, children: Array, constraint: ConstraintSizeOptions): SizeResult { - if (this.instance instanceof LayoutCallback) { - const layout = this.instance as LayoutCallback; + if (this.instance instanceof LayoutCallbacks) { + const layout = this.instance as LayoutCallbacks; return layout.onMeasureSize(selfLayoutInfo, children, constraint); } else { throw new Error('not a custom layout component'); @@ -344,3 +344,22 @@ export abstract class CustomComponentV2