From 0491456b182a7ae278849d82159fc56d80df5cd9 Mon Sep 17 00:00:00 2001 From: lirismankarina Date: Fri, 20 Dec 2024 20:25:23 +0300 Subject: [PATCH] Fixes according to global PR Signed-off-by: lirismankarina --- .../arkui/arktsconfig-unmemoized.json | 24 ++++--- arkoala-arkts/arkui/src/Application.ts | 4 +- .../arkui/src/generated/arkts/NativeModule.ts | 2 + .../shopping/arktsconfig-run-unmemoized.json | 17 +++-- .../user/arktsconfig-run-unmemoized.json | 17 +++-- arkoala/arkui-common/arktsconfig.json | 28 +++++--- arkoala/arkui/arktsconfig.json | 1 + .../native/src/generated/bridge_custom.cc | 3 + incremental/common/arktsconfig.json | 7 +- incremental/compat/arktsconfig.json | 9 ++- .../runtime/arktsconfig-run-unmemoized.json | 10 +-- incremental/runtime/arktsconfig.json | 7 +- incremental/runtime/src/states/State.ts | 32 ++++++--- incremental/tools/panda/arkts/arktsc.js | 3 +- interop/arktsconfig.json | 12 ++-- interop/index.ts | 15 ----- interop/src/arkts/ResourceManager.ts | 67 +++++++++++++++++++ interop/src/arkts/index.sts | 2 +- interop/src/cpp/common-interop.cc | 3 +- interop/src/cpp/ets/convertors-ets.cc | 4 +- interop/src/cpp/ets/convertors-ets.h | 2 +- interop/src/cpp/vmloader.cc | 4 +- interop/src/interop/index.ts | 2 +- 23 files changed, 179 insertions(+), 96 deletions(-) delete mode 100644 interop/index.ts create mode 100644 interop/src/arkts/ResourceManager.ts diff --git a/arkoala-arkts/arkui/arktsconfig-unmemoized.json b/arkoala-arkts/arkui/arktsconfig-unmemoized.json index 858716f2c..8d8778552 100644 --- a/arkoala-arkts/arkui/arktsconfig-unmemoized.json +++ b/arkoala-arkts/arkui/arktsconfig-unmemoized.json @@ -1,23 +1,25 @@ { "compilerOptions": { + "package": "@koalaui/arkts-arkui", "outDir": "build/abc", - "baseUrl": ".", + "baseUrl": "./build/unmemoized/src", "paths": { - "#components": ["./build/unmemoized/src/generated/arkts"], - "#arkcompat/*": ["../../arkoala/arkui-common/build/unmemoized/src/arkts/*"], - "@koalaui/arkui-common": ["../../arkoala/arkui-common/build/unmemoized/src/arkts"], - "@koalaui/arkts-arkui": ["./build/unmemoized/src"], - "@koalaui/interop": ["../../interop/src/arkts"], - "@koalaui/common": ["../../incremental/common/src"], - "@koalaui/compat": ["../../incremental/compat/src/arkts"], - "@koalaui/runtime": ["../../incremental/runtime/build/unmemoized/src"] + "#components": ["./generated/arkts"], + "#arkcompat/*": ["../../../../../arkoala/arkui-common/build/unmemoized/src/arkts/*"], + "#arkstate": ["../../../../../arkoala/arkui-common/build/unmemoized/src"], + "@koalaui/arkui-common": ["../../../../../arkoala/arkui-common/build/unmemoized/src"], + "@koalaui/arkts-arkui": ["./../../../build/unmemoized/src"], + "@koalaui/interop": ["../../../../../interop/src/arkts"], + "@koalaui/common": ["../../../../../incremental/common/src"], + "@koalaui/compat": ["../../../../../incremental/compat/src/arkts"], + "@koalaui/runtime": ["../../../../../incremental/runtime/build/unmemoized/src"], + "#helpindexarkui": ["index.ts"] } }, "include": [ - "build/unmemoized/src/**/*.ts" + "build/unmemoized/src/**/*.ts", "build/unmemoized/src/*.ts" ], "exclude": [ - "**/index.ts", "build/unmemoized/src/generated/ts/*\\.ts", "build/unmemoized/generated/main.ts" ] diff --git a/arkoala-arkts/arkui/src/Application.ts b/arkoala-arkts/arkui/src/Application.ts index 9d4ddb78c..831b8906a 100644 --- a/arkoala-arkts/arkui/src/Application.ts +++ b/arkoala-arkts/arkui/src/Application.ts @@ -208,7 +208,6 @@ export class Application { private updateState() { // console.log("ARKTS: updateState") - this.updateStates(this.manager!, this.root!) // Here we request to draw a frame and call custom components JS callbacks. measureLayoutAndDraw(this.root!.value as PeerNode) @@ -364,4 +363,5 @@ function makeClickEvent(x: number, y: number): ClickEvent { y: y, preventDefault: () => {} } -} \ No newline at end of file +} + diff --git a/arkoala-arkts/arkui/src/generated/arkts/NativeModule.ts b/arkoala-arkts/arkui/src/generated/arkts/NativeModule.ts index 1a08bd326..95a7327b5 100644 --- a/arkoala-arkts/arkui/src/generated/arkts/NativeModule.ts +++ b/arkoala-arkts/arkui/src/generated/arkts/NativeModule.ts @@ -2332,6 +2332,8 @@ export class NativeModule { native static _InjectEvent(data: KUint8ArrayPtr, size: int32): int32 native static _EmulateTextInputEvent(nodeId: int32, text: string): void native static _CallCallback(callbackKind: int32, args: KUint8ArrayPtr, argsSize: int32): void + native static _CallCallbackSync(callbackKind: int32, args: KUint8ArrayPtr, argsSize: int32): void + native static _StdStringToString(text: KPointer): KStringPtr native static _CallCallbackResourceHolder(holder: KPointer, resourceId: int32): void native static _CallCallbackResourceReleaser(releaser: KPointer, resourceId: int32): void native static _CheckArkoalaCallbackEvent(buffer: KUint8ArrayPtr, bufferLength: int32): int32 diff --git a/arkoala-arkts/shopping/arktsconfig-run-unmemoized.json b/arkoala-arkts/shopping/arktsconfig-run-unmemoized.json index 0ff90ba8a..3b40efbfe 100644 --- a/arkoala-arkts/shopping/arktsconfig-run-unmemoized.json +++ b/arkoala-arkts/shopping/arktsconfig-run-unmemoized.json @@ -1,8 +1,6 @@ { - "include": [ - "./build/unmemoized/**/*.ts" - ], "compilerOptions": { + "package": "@koalaui/shopping", "outDir": "build/abc", "baseUrl": ".", "paths": { @@ -21,9 +19,6 @@ "@koalaui/arkts-arkui": [ "../arkui/build/unmemoized/src" ], - "@koalaui/arkts-arkui/ohos.router": [ - "../arkui/build/unmemoized/src/ohos.router.ts" - ], "@koalaui/interop": [ "../../interop/src/arkts" ], @@ -31,11 +26,15 @@ "../arkui/build/unmemoized/src/generated/arkts" ], "@koalaui/arkui-common": [ - "../../arkoala/arkui-common/build/unmemoized/src/arkts" + "../../arkoala/arkui-common/build/unmemoized/src", "../../arkoala/arkui-common/build/unmemoized/src/arkts" ], "#arkcompat": [ "../../arkoala/arkui-common/build/unmemoized/src/arkts" - ] + ], + "#arkstate": ["../../arkoala/arkui-common/build/unmemoized/src"] } - } + }, + "include": [ + "./build/unmemoized/**/*.ts" + ] } diff --git a/arkoala-arkts/user/arktsconfig-run-unmemoized.json b/arkoala-arkts/user/arktsconfig-run-unmemoized.json index 0ff90ba8a..663efbf66 100644 --- a/arkoala-arkts/user/arktsconfig-run-unmemoized.json +++ b/arkoala-arkts/user/arktsconfig-run-unmemoized.json @@ -1,8 +1,6 @@ { - "include": [ - "./build/unmemoized/**/*.ts" - ], "compilerOptions": { + "package": "@koalaui/user", "outDir": "build/abc", "baseUrl": ".", "paths": { @@ -21,9 +19,6 @@ "@koalaui/arkts-arkui": [ "../arkui/build/unmemoized/src" ], - "@koalaui/arkts-arkui/ohos.router": [ - "../arkui/build/unmemoized/src/ohos.router.ts" - ], "@koalaui/interop": [ "../../interop/src/arkts" ], @@ -31,11 +26,15 @@ "../arkui/build/unmemoized/src/generated/arkts" ], "@koalaui/arkui-common": [ - "../../arkoala/arkui-common/build/unmemoized/src/arkts" + "../../arkoala/arkui-common/build/unmemoized/src", "../../arkoala/arkui-common/build/unmemoized/src/arkts" ], "#arkcompat": [ "../../arkoala/arkui-common/build/unmemoized/src/arkts" - ] + ], + "#arkstate": ["../../arkoala/arkui-common/build/unmemoized/src"] } - } + }, + "include": [ + "./build/unmemoized/**/*.ts" + ] } diff --git a/arkoala/arkui-common/arktsconfig.json b/arkoala/arkui-common/arktsconfig.json index 5e154406a..ad2bb65c4 100644 --- a/arkoala/arkui-common/arktsconfig.json +++ b/arkoala/arkui-common/arktsconfig.json @@ -1,32 +1,35 @@ { "compilerOptions": { + "package": "@koalaui/arkui-common", "outDir": "./build/abc", - "baseUrl": ".", + "baseUrl": "./build/unmemoized/src", "paths": { "@koalaui/common": [ - "../../incremental/common/src" + "../../../../../incremental/common/src" ], "@koalaui/runtime": [ - "../../incremental/runtime/build/unmemoized/src" - ], - "@koalaui/compat": [ - "../../incremental/compat/src" + "../../../../../incremental/runtime/build/unmemoized/src" ], "#arkcompat/*": [ - "./build/unmemoized/src/arkts/*" + "./../../../build/unmemoized/src/arkts/*" ], "#platform": [ - "../../incremental/compat/src/arkts" - ] + "../../../../../incremental/compat/src/arkts" + ], + "@koalaui/compat": [ + "../../../../../incremental/compat/src/arkts", "../../../../../incremental/compat/src" + ], + "@koalaui/arkui-common": ["../"] } }, "include": [ "build/unmemoized/src/**/*.ts" ], "exclude": [ - "**/index.ts", "build/unmemoized/src/ts/**/*", - "build/unmemoized/src/typescript/**/*" + "build/unmemoized/src/typescript/**/*", + "build/unmemoized/src/arkts/index.ts", + "#platform" ], "references": [ { @@ -34,6 +37,9 @@ }, { "path": "../../incremental/runtime" + }, + { + "path": "../../incremental/compat" } ] } diff --git a/arkoala/arkui/arktsconfig.json b/arkoala/arkui/arktsconfig.json index cb77bc014..5964d8a7e 100644 --- a/arkoala/arkui/arktsconfig.json +++ b/arkoala/arkui/arktsconfig.json @@ -1,5 +1,6 @@ { "compilerOptions": { + "package": "@arkoala/arkui", "baseUrl": ".", "outDir": "build", "paths": { diff --git a/arkoala/framework/native/src/generated/bridge_custom.cc b/arkoala/framework/native/src/generated/bridge_custom.cc index 3bcbbba6a..bf8cd1a10 100644 --- a/arkoala/framework/native/src/generated/bridge_custom.cc +++ b/arkoala/framework/native/src/generated/bridge_custom.cc @@ -463,6 +463,8 @@ KVMObjectHandle impl_LoadUserView(KVMContext vm, const KStringPtr& viewClass, co std:: string className(viewClass.c_str()); // TODO: hack, fix it! if (className == "ViewLoaderApp") className = "Page.App"; + if (className == "Page.ViewShoppingApp") className = "@koalaui.shopping.build.unmemoized.src.Page.ViewShoppingApp"; + if (className == "Page.ViewTrivialApp") className = "@koalaui.user.build.unmemoized.src.Page.ViewTrivialApp"; std::replace(className.begin(), className.end(), '.', '/'); ets_class viewClassClass = env->FindClass(className.c_str()); if (!viewClassClass) { @@ -473,6 +475,7 @@ KVMObjectHandle impl_LoadUserView(KVMContext vm, const KStringPtr& viewClass, co } return nullptr; } + ets_method viewClassCtor = env->Getp_method(viewClassClass, "", "Lstd/core/String;:V"); if (!viewClassCtor) { fprintf(stderr, "Cannot find user class ctor\n"); diff --git a/incremental/common/arktsconfig.json b/incremental/common/arktsconfig.json index c5cf554c7..b3e50737d 100644 --- a/incremental/common/arktsconfig.json +++ b/incremental/common/arktsconfig.json @@ -1,13 +1,14 @@ { "compilerOptions": { + "package": "@koalaui/common", "outDir": "build/abc", - "baseUrl": ".", + "baseUrl": "./src", "paths": { - "@koalaui/compat": ["../compat/src/arkts"] + "@koalaui/compat": ["../../compat/src/arkts"], + "#helpindexcommon": ["./index.ts"] } }, "include": ["src/**/*.ts"], - "exclude": ["src/index.ts"], "references": [ { "path": "../compat" } ] diff --git a/incremental/compat/arktsconfig.json b/incremental/compat/arktsconfig.json index 617e2e88a..6b515b376 100644 --- a/incremental/compat/arktsconfig.json +++ b/incremental/compat/arktsconfig.json @@ -1,11 +1,14 @@ { "compilerOptions": { + "package": "@koalaui/compat", "outDir": "build/abc", - "rootDir": "./src", + "rootDir": "./src/arkts", + "baseUrl": "./src/arkts", "paths": { - "#platform": ["./src/arkts"] + "#platform": ["./"], + "@koalaui/compat": ["../"] } }, "include": ["src/index.ts", "src/arkts/**/*.ts"], - "exclude": ["src/arkts/index.ts"] + "exclude": ["./src/arkts/index.ts"] } diff --git a/incremental/runtime/arktsconfig-run-unmemoized.json b/incremental/runtime/arktsconfig-run-unmemoized.json index 40d8c5824..b2d38a278 100644 --- a/incremental/runtime/arktsconfig-run-unmemoized.json +++ b/incremental/runtime/arktsconfig-run-unmemoized.json @@ -1,14 +1,14 @@ { "compilerOptions": { + "package": "@koalaui/runtime", "outDir": "build/unmemoized/abc", - "baseUrl": ".", + "baseUrl": "./build/unmemoized/src", "paths": { - "@koalaui/common": ["../common/src"], - "@koalaui/compat": ["../compat/src/arkts"] + "@koalaui/common": ["../../../../common/src"], + "@koalaui/compat": ["../../../../compat/src/arkts"] } }, - "include": ["build/unmemoized/src/**/*.ts"], - "exclude": ["build/unmemoized/src/**/index.ts"], + "include": ["build/unmemoized/src/**/*.ts", "build/unmemoized/src/*.ts"], "references": [ { "path": "../common" }, { "path": "../compat" } diff --git a/incremental/runtime/arktsconfig.json b/incremental/runtime/arktsconfig.json index 7e914a99a..f2abbcdad 100644 --- a/incremental/runtime/arktsconfig.json +++ b/incremental/runtime/arktsconfig.json @@ -1,10 +1,11 @@ { "compilerOptions": { + "package": "@koalaui/runtime", "outDir": "build/abc", - "baseUrl": ".", + "baseUrl": "./src", "paths": { - "@koalaui/common": ["../common/src"], - "@koalaui/compat": ["../compat/src/arkts"] + "@koalaui/common": ["../../common/src"], + "@koalaui/compat": ["../../compat/src/arkts"] } }, "include": ["./src/**/*.ts"], diff --git a/incremental/runtime/src/states/State.ts b/incremental/runtime/src/states/State.ts index c0183bf14..812ad99ed 100644 --- a/incremental/runtime/src/states/State.ts +++ b/incremental/runtime/src/states/State.ts @@ -13,7 +13,7 @@ * limitations under the License. */ -import { Array_from_set, className, int32, KoalaCallsiteKey, KoalaCallsiteKeys, KoalaProfiler, markableQueue, refEqual, uint32 } from "@koalaui/common" +import { Array_from_set, className, int32, KoalaCallsiteKey, KoalaCallsiteKeys, KoalaProfiler, markableQueue, MarkableQueue, refEqual, uint32 } from "@koalaui/common" import { Dependencies, Dependency } from "./Dependency" import { Disposable, disposeContent, disposeContentBackward } from "./Disposable" import { Changes, Journal } from "./Journal" @@ -386,18 +386,30 @@ class ParameterImpl implements MutableState { } class StateManagerImpl implements StateManager { - private stateCreating: string | undefined = undefined - private readonly statesNamed = new Map() - private readonly statesCreated = new Set() - private readonly dirtyScopes = new Set() + private stateCreating: string | undefined + private readonly statesNamed: Map + private readonly statesCreated: Set + private readonly dirtyScopes: Set current: ManagedScope | undefined = undefined external: Dependency | undefined = undefined - updateNeeded = false - frozen = false - private readonly callbacks = markableQueue() - readonly journal = new Journal() - + updateNeeded: boolean + frozen: boolean + private readonly callbacks: MarkableQueue + readonly journal: Journal constructor() { + this.stateCreating = undefined; + this.statesNamed = new Map() + this.statesCreated = new Set() + this.dirtyScopes = new Set() + this.current = undefined + this.external = undefined + this.updateNeeded = false + this.frozen = false + if (markableQueue(false)) { + } else { + } + this.callbacks = markableQueue(false) + this.journal = new Journal() } reset(): void { diff --git a/incremental/tools/panda/arkts/arktsc.js b/incremental/tools/panda/arkts/arktsc.js index 70043517c..e86b1158c 100644 --- a/incremental/tools/panda/arkts/arktsc.js +++ b/incremental/tools/panda/arkts/arktsc.js @@ -72,4 +72,5 @@ child.on('exit', (code, signal) => { console.log(`Received signal: ${signal} from '${formatCommand(cmd.join(' '), process.cwd())}'`) process.exit(1) } -}) \ No newline at end of file +}) + diff --git a/interop/arktsconfig.json b/interop/arktsconfig.json index 65d20bf96..f2491e241 100644 --- a/interop/arktsconfig.json +++ b/interop/arktsconfig.json @@ -1,15 +1,15 @@ { "compilerOptions": { + "package": "@koalaui/interop", "outDir": "build/abc", - "baseUrl": ".", + "baseUrl": "./src/arkts", "paths": { - "@koalaui/compat": ["../incremental/compat/src/arkts"], - "@koalaui/common": ["../incremental/common/src"], - "#common/wrappers/*": ["./src/napi/wrappers/*"] + "@koalaui/compat": ["../../../incremental/compat/src/arkts"], + "@koalaui/common": ["../../../incremental/common/src"], + "#common/wrappers/*": ["./../../src/napi/wrappers/*"] } }, - "include": ["src/arkts/*.sts", "src/interop/ResourceManager.ts"], - "exclude": ["*/**/index.sts"], + "include": ["src/arkts/*.sts", "src/arkts/ResourceManager.ts", "./index.ts"], "references": [ { "path": "../incremental/common" }, { "path": "../incremental/compat" } diff --git a/interop/index.ts b/interop/index.ts deleted file mode 100644 index ac57d1240..000000000 --- a/interop/index.ts +++ /dev/null @@ -1,15 +0,0 @@ -/* - * Copyright (c) 2022-2023 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - diff --git a/interop/src/arkts/ResourceManager.ts b/interop/src/arkts/ResourceManager.ts new file mode 100644 index 000000000..beddeba39 --- /dev/null +++ b/interop/src/arkts/ResourceManager.ts @@ -0,0 +1,67 @@ +/* + * Copyright (c) 2022-2023 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +import { int32 } from "@koalaui/common" + +// todo maybe move this class to @koalaui/interop ? + +export type ResourceId = int32 + +interface ResourceInfo { + resource: object + holdersCount: int32 +} + +export class ResourceHolder { + private static nextResourceId: ResourceId = 100 + private resources: Map = new Map() + private static _instance: ResourceHolder|undefined = undefined + static instance(): ResourceHolder { + if (ResourceHolder._instance == undefined) { + ResourceHolder._instance = new ResourceHolder() + } + return ResourceHolder._instance! + } + + public hold(resourceId: ResourceId) { + if (!this.resources.has(resourceId)) + throw new Error(`Resource ${resourceId} does not exists, can not hold`) + this.resources.get(resourceId)!.holdersCount++ + } + + public release(resourceId: ResourceId) { + if (!this.resources.has(resourceId)) + throw new Error(`Resource ${resourceId} does not exists, can not release`) + const resource = this.resources.get(resourceId)! + resource.holdersCount-- + if (resource.holdersCount <= 0) + this.resources.delete(resourceId) + } + + public registerAndHold(resource: object): ResourceId { + const resourceId = ResourceHolder.nextResourceId++ + this.resources.set(resourceId, { + resource: resource, + holdersCount: 1, + }) + return resourceId + } + + public get(resourceId: ResourceId): object { + if (!this.resources.has(resourceId)) + throw new Error(`Resource ${resourceId} does not exists`) + return this.resources.get(resourceId)!.resource + } +} diff --git a/interop/src/arkts/index.sts b/interop/src/arkts/index.sts index 5fa6716eb..1fc5503fd 100644 --- a/interop/src/arkts/index.sts +++ b/interop/src/arkts/index.sts @@ -16,4 +16,4 @@ export * from "./InteropTypes" export * from "./callback" export * from "./buffer" -export * from "../interop/ResourceManager" +export * from "./ResourceManager" diff --git a/interop/src/cpp/common-interop.cc b/interop/src/cpp/common-interop.cc index 58bbf8596..11fa80690 100644 --- a/interop/src/cpp/common-interop.cc +++ b/interop/src/cpp/common-interop.cc @@ -411,4 +411,5 @@ KStringPtr impl_StdStringToString(KVMContext vmContext, KNativePointer stringPtr return result; } KOALA_INTEROP_CTX_1(StdStringToString, KStringPtr, KNativePointer) -#endif \ No newline at end of file +#endif + diff --git a/interop/src/cpp/ets/convertors-ets.cc b/interop/src/cpp/ets/convertors-ets.cc index cf02b92c6..de06ff5be 100644 --- a/interop/src/cpp/ets/convertors-ets.cc +++ b/interop/src/cpp/ets/convertors-ets.cc @@ -16,7 +16,7 @@ #include "convertors-ets.h" #include "signatures.h" -static const char* nativeModule = "NativeModule/NativeModule"; +static const char* nativeModule = "@koalaui/arkts-arkui/build/unmemoized/src/generated/arkts/NativeModule/NativeModule"; static const char* callCallbackFromNative = "callCallbackFromNative"; static const char* callCallbackFromNativeSig = "I[BI:I"; @@ -61,7 +61,7 @@ static bool registerNatives(EtsEnv *env, const ets_class clazz) //TODO: EtsNapiOnLoad() hook shall be used to register native, but unfortunately, env->FindClass("NativeModule.NativeModule") //returns null. -extern "C" ETS_EXPORT void NATIVE_MODULE_INIT(EtsEnv *env, ets_class clazz) { +extern "C" ETS_EXPORT void ETS__00040koalaui_arkts_0002darkui_generated_arkts_NativeModule_NativeModule_init__(EtsEnv *env, ets_class clazz) { registerNatives(env, clazz); setKoalaEtsNapiCallbackDispatcher(env, clazz, callCallbackFromNative, callCallbackFromNativeSig); } diff --git a/interop/src/cpp/ets/convertors-ets.h b/interop/src/cpp/ets/convertors-ets.h index eb58f972f..eeda4b185 100644 --- a/interop/src/cpp/ets/convertors-ets.h +++ b/interop/src/cpp/ets/convertors-ets.h @@ -127,7 +127,7 @@ struct InteropTypeConverter { const static ets_class double_class = env->FindClass("std/core/Double"); const static ets_class int_class = env->FindClass("std/core/Int"); const static ets_class string_class = env->FindClass("std/core/String"); - const static ets_class resource_class = env->FindClass("ArkResourceInterfaces/Resource"); + const static ets_class resource_class = env->FindClass("@koalaui/arkts-arkui/generated/ArkResourceInterfaces/Resource"); if (env->IsInstanceOf(value, double_class)) { const static ets_method double_p = env->Getp_method(double_class, "unboxed", ":D"); diff --git a/interop/src/cpp/vmloader.cc b/interop/src/cpp/vmloader.cc index 148133f5f..34662ea86 100644 --- a/interop/src/cpp/vmloader.cc +++ b/interop/src/cpp/vmloader.cc @@ -275,9 +275,9 @@ const AppInfo javaAppInfo = { #ifdef KOALA_ETS_NAPI const AppInfo pandaAppInfo = { - "Application/Application", + "@koalaui/arkts-arkui/Application/Application", "createApplication", - "Lstd/core/String;Lstd/core/String;Z:LApplication/Application;", + "Lstd/core/String;Lstd/core/String;Z:L@koalaui/arkts-arkui/Application/Application;", "start", ":J", "enter", diff --git a/interop/src/interop/index.ts b/interop/src/interop/index.ts index a6c5b6337..88264d419 100644 --- a/interop/src/interop/index.ts +++ b/interop/src/interop/index.ts @@ -64,4 +64,4 @@ export * from "./InteropTypes" export * from "./InteropOps" export * from "./buffer" -export * from "./ResourceManager" +export * from "../arkts/ResourceManager" -- Gitee