From 6edcde6ea9296c8fd745f7e77f53e399e31a02c8 Mon Sep 17 00:00:00 2001 From: yalixie Date: Thu, 7 Aug 2025 15:00:27 +0300 Subject: [PATCH 1/2] Add ohos.multimedia.image import --- arkoala-arkts/.gitlab-ci.yml | 11 ++-- .../arkui/sdk/handwritten/extractors.ets | 18 +++++++ arkoala-arkts/arkui/sdk/handwritten/index.ets | 2 + arkoala-arkts/arkui/src/extractors.ets | 19 +++++++ arkoala-arkts/arkui/ui2abcconfig.json | 1 + arkoala-arkts/cats/user/ui2abcconfig.json | 1 + .../ohos.multimedia.image/arktsconfig.json | 11 ++++ .../src/@ohos.multimedia.image.ets} | 53 +++++++++++++------ .../ohos.multimedia.image/src/index.ets | 20 +++++++ arkoala-arkts/modules/package.json | 17 ++++++ arkoala-arkts/package.json | 9 ++-- arkoala-arkts/shopping/user/ui2abcconfig.json | 1 + .../tools/peer-generator/config-arkui.json | 6 ++- arkoala-arkts/trivial/user/ui2abcconfig.json | 1 + ets-tests/golden-test-ui2abcconfig.json | 1 + ets-tests/ui2abcconfig.json | 1 + 16 files changed, 142 insertions(+), 30 deletions(-) create mode 100644 arkoala-arkts/arkui/sdk/handwritten/extractors.ets create mode 100644 arkoala-arkts/modules/ohos.multimedia.image/arktsconfig.json rename arkoala-arkts/{arkui/sdk/framework/ohos.multimedia.image.ets => modules/ohos.multimedia.image/src/@ohos.multimedia.image.ets} (43%) create mode 100644 arkoala-arkts/modules/ohos.multimedia.image/src/index.ets create mode 100644 arkoala-arkts/modules/package.json diff --git a/arkoala-arkts/.gitlab-ci.yml b/arkoala-arkts/.gitlab-ci.yml index cd45c89222..27e496f88b 100644 --- a/arkoala-arkts/.gitlab-ci.yml +++ b/arkoala-arkts/.gitlab-ci.yml @@ -167,13 +167,11 @@ build modules.abc: - build ui2abc-all M3 - annotate all script: - - npm run build:modules --prefix arkoala-arkts - - ls -l arkoala-arkts/modules/global.resource/build/src/resource.abc - - ls -l arkoala-arkts/modules/ohos/build/src/font.abc + - npm run build:modules --prefix arkoala-arkts/modules + - ls -l arkoala-arkts/modules/build/bootPandaFiles/modules.abc artifacts: paths: - - arkoala-arkts/modules/global.resource/build/src/resource.abc - - arkoala-arkts/modules/ohos/build/src/font.abc + - arkoala-arkts/modules/build/bootPandaFiles/modules.abc expire_in: 1 day build arkoala.abc: @@ -192,8 +190,7 @@ build arkoala.abc: - ls -l incremental/runtime/build/incremental.abc - ls -l interop/build/interop.abc - ls -l arkoala-arkts/arkui/build/arkui.abc - - ls -l arkoala-arkts/modules/global.resource/build/src/resource.abc - - ls -l arkoala-arkts/modules/ohos/build/src/font.abc + - ls -l arkoala-arkts/modules/build/bootPandaFiles/modules.abc script: - npm run link --prefix arkoala-arkts - ls -l arkoala-arkts/build/bootPandaFiles/arkoala.abc diff --git a/arkoala-arkts/arkui/sdk/handwritten/extractors.ets b/arkoala-arkts/arkui/sdk/handwritten/extractors.ets new file mode 100644 index 0000000000..0e24fc0d4e --- /dev/null +++ b/arkoala-arkts/arkui/sdk/handwritten/extractors.ets @@ -0,0 +1,18 @@ +/* + * Copyright (C) 2025 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. + */ + +export namespace extractors { +} + diff --git a/arkoala-arkts/arkui/sdk/handwritten/index.ets b/arkoala-arkts/arkui/sdk/handwritten/index.ets index 20290a3e23..2ead10c03a 100644 --- a/arkoala-arkts/arkui/sdk/handwritten/index.ets +++ b/arkoala-arkts/arkui/sdk/handwritten/index.ets @@ -25,3 +25,5 @@ export * from "./resources" export * from "./component/base" export * from "./component/common" export * from "./ContentModifierHooks" +export * from "./extractors" + diff --git a/arkoala-arkts/arkui/src/extractors.ets b/arkoala-arkts/arkui/src/extractors.ets index 4d1a3c5eac..d18f5a6041 100644 --- a/arkoala-arkts/arkui/src/extractors.ets +++ b/arkoala-arkts/arkui/src/extractors.ets @@ -13,6 +13,25 @@ * limitations under the License. */ +import { KPointer } from "@koalaui/interop" +import { image } from "@ohos.multimedia.image" + export namespace extractors { + + export function toImagePixelMapPtr(value: image.PixelMap): KPointer { + return toPointer(value, "image.PixelMap", "nativeObj") + } + + export function fromImagePixelMapPtr(ptr: KPointer): image.PixelMap { + return new image.PixelMapInner(ptr) + } + + function toPointer(obj: Object, declarationName: string, pointerPropName: string): long { + for (const entry of Object.entries(obj)) { + if (entry == undefined) continue + if (entry[0] == pointerPropName) return entry[1] as long + } + throw new Error(`native pointer for ${declarationName} declaration is not found!`) + } } diff --git a/arkoala-arkts/arkui/ui2abcconfig.json b/arkoala-arkts/arkui/ui2abcconfig.json index 26ee35a6fd..f8e1818425 100644 --- a/arkoala-arkts/arkui/ui2abcconfig.json +++ b/arkoala-arkts/arkui/ui2abcconfig.json @@ -11,6 +11,7 @@ "arkui.ani": ["./ani/arkts/ArkUIAniModule"], "global.resource": ["../../modules/global.resource/src/resource"], "@ohos.font": ["../../modules/ohos/src/font"], + "@ohos.multimedia.image": ["../../modules/ohos.multimedia.image/src"], "@ohos.arkui.stateManagement": ["./stateManagement"], "@koalaui/interop": ["../../../interop/src/arkts"], "@koalaui/common": ["../../../incremental/common/src"], diff --git a/arkoala-arkts/cats/user/ui2abcconfig.json b/arkoala-arkts/cats/user/ui2abcconfig.json index de4b31f4c5..e30c14a784 100644 --- a/arkoala-arkts/cats/user/ui2abcconfig.json +++ b/arkoala-arkts/cats/user/ui2abcconfig.json @@ -8,6 +8,7 @@ "@ohos.arkui.component": ["../../arkui/@ohos.arkui.component"], "global.resource": ["../../modules/global.resource/src/resource"], "@ohos.font": ["../../modules/ohos/src/font"], + "@ohos.multimedia.image": ["../../modules/ohos.multimedia.image/src"], "@ohos.arkui.stateManagement": ["../../arkui/@ohos.arkui.stateManagement"], "@ohos.arkui.inspector": ["../../arkui/@ohos.arkui.inspector"], "@ohos.arkui.theme": ["../../arkui/@ohos.arkui.theme"], diff --git a/arkoala-arkts/modules/ohos.multimedia.image/arktsconfig.json b/arkoala-arkts/modules/ohos.multimedia.image/arktsconfig.json new file mode 100644 index 0000000000..9672dbf4ad --- /dev/null +++ b/arkoala-arkts/modules/ohos.multimedia.image/arktsconfig.json @@ -0,0 +1,11 @@ +{ + "compilerOptions": { + "package": "@ohos.multimedia.image", + "baseUrl": "./src", + "outDir": "build", + "paths": { + } + }, + "include": ["./src/*.ets"] +} + diff --git a/arkoala-arkts/arkui/sdk/framework/ohos.multimedia.image.ets b/arkoala-arkts/modules/ohos.multimedia.image/src/@ohos.multimedia.image.ets similarity index 43% rename from arkoala-arkts/arkui/sdk/framework/ohos.multimedia.image.ets rename to arkoala-arkts/modules/ohos.multimedia.image/src/@ohos.multimedia.image.ets index 615b2d5fbe..ca7708abb4 100644 --- a/arkoala-arkts/arkui/sdk/framework/ohos.multimedia.image.ets +++ b/arkoala-arkts/modules/ohos.multimedia.image/src/@ohos.multimedia.image.ets @@ -1,10 +1,10 @@ /* - * Copyright (c) 2024-2025 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); + * Copyright (C) 2025 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 + * 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, @@ -12,24 +12,45 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +/** + * @file + * @kit ArkUI + */ +export namespace image { -// WARNING! THIS FILE IS AUTO-GENERATED, DO NOT MAKE CHANGES, THEY WILL BE LOST ON NEXT GENERATION! + export enum ResolutionQuality { + LOW = 1, + MEDIUM = 2, + HIGH = 3 + } -import { int32, int64, float32 } from "@koalaui/common" -import { KInt, KPointer, KBoolean, NativeBuffer } from "@koalaui/interop" -import { memo, memo_stable } from "@koalaui/runtime/annotations" -import { ComponentBuilder, Builder } from "@koalaui/builderLambda" -export declare namespace image { export interface PixelMap { - readonly isEditable: boolean; - readonly isStrideAlignment: boolean; + readonly isEditable: boolean + readonly isStrideAlignment: boolean readPixelsToBufferSync(dst: ArrayBuffer): void writeBufferToPixels(src: ArrayBuffer): void } - export enum ResolutionQuality { - LOW = 1, - MEDIUM = 2, - HIGH = 3 + + export class PixelMapInner implements PixelMap { + + private nativeObj: long = 0; + + readonly isEditable: boolean = true + readonly isStrideAlignment: boolean = true + + constructor(context: long) { + if (this.nativeObj == 0) { + this.nativeObj = context; + } + } + + readPixelsToBufferSync(dst: ArrayBuffer): void { + console.log(`call PixelMapInner.readPixelsToBufferSync(...)`) + } + + writeBufferToPixels(src: ArrayBuffer): void { + console.log(`call PixelMapInner.writeBufferToPixels(...)`) + } } -} +} \ No newline at end of file diff --git a/arkoala-arkts/modules/ohos.multimedia.image/src/index.ets b/arkoala-arkts/modules/ohos.multimedia.image/src/index.ets new file mode 100644 index 0000000000..c784340b79 --- /dev/null +++ b/arkoala-arkts/modules/ohos.multimedia.image/src/index.ets @@ -0,0 +1,20 @@ +/* + * Copyright (C) 2025 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. + */ +/** + * @file + * @kit ArkUI + */ + +export * from "./@ohos.multimedia.image" diff --git a/arkoala-arkts/modules/package.json b/arkoala-arkts/modules/package.json new file mode 100644 index 0000000000..795aac4d78 --- /dev/null +++ b/arkoala-arkts/modules/package.json @@ -0,0 +1,17 @@ +{ + "name": "modules", + "private": true, + "workspaces": [ + ], + "devDependencies": { + }, + "scripts": { + "clean": "rimraf ./build ./global.resource/build ./ohos/build ./ohos.multimedia.image/build", + "link:modules": "mkdir -p build/bootPandaFiles && ../../incremental/tools/panda/arkts/arklink --output build/bootPandaFiles/modules.abc -- ./global.resource/build/src/resource.abc ./ohos/build/src/font.abc ./ohos.multimedia.image/build/src/@ohos.multimedia.image.abc", + "build:resource": "../../incremental/tools/panda/arkts/arktsc --arktsconfig ./global.resource/arktsconfig.json", + "build:ohos": "../../incremental/tools/panda/arkts/arktsc --arktsconfig ./ohos/arktsconfig.json", + "build:image": "../../incremental/tools/panda/arkts/arktsc --arktsconfig ./ohos.multimedia.image/arktsconfig.json", + "build:modules": "npm run build:resource && npm run build:ohos && npm run build:image && npm run link:modules" + } +} + diff --git a/arkoala-arkts/package.json b/arkoala-arkts/package.json index bf9c894e9c..ed6b923040 100644 --- a/arkoala-arkts/package.json +++ b/arkoala-arkts/package.json @@ -120,7 +120,7 @@ "clean": "rimraf build", "clean:native": "npm run clean --prefix ./framework", - "clean:all": "npm run clean && npm run clean --prefix arkui && npm run clean:native && npm run clean --prefix har && npm run clean --prefix trivial/user && npm run clean:all --prefix shopping", + "clean:all": "npm run clean && npm run clean --prefix arkui && npm run clean:native && npm run clean --prefix har && npm run clean --prefix trivial/user && npm run clean:all --prefix shopping && npm run clean --prefix modules", "perf:trivial": "npm run perf --prefix trivial", "previewer:run": "node scripts/previewer-cli.mjs run", @@ -130,11 +130,8 @@ "previewer:list-remote": "node scripts/previewer-cli.mjs list-remote", "previewer:set-active": "node scripts/previewer-cli.mjs set-active", - "link": "mkdir -p build/bootPandaFiles && ../incremental/tools/panda/arkts/arklink --output build/bootPandaFiles/arkoala.abc -- ../incremental/runtime/build/incremental.abc ../interop/build/interop.abc ./arkui/build/arkui.abc ./modules/global.resource/build/src/resource.abc ./modules/ohos/build/src/font.abc", - "build:modules": "npm run build:modules:resource && npm run build:modules:ohos", - "build:modules:resource": "../incremental/tools/panda/arkts/arktsc --arktsconfig ./modules/global.resource/arktsconfig.json", - "build:modules:ohos": "../incremental/tools/panda/arkts/arktsc --arktsconfig ./modules/ohos/arktsconfig.json", - "build": "npm run build --prefix ../incremental && npm run build --prefix ../interop && npm run build --prefix arkui && npm run build:modules && npm run link" + "link": "mkdir -p build/bootPandaFiles && ../incremental/tools/panda/arkts/arklink --output build/bootPandaFiles/arkoala.abc -- ../incremental/runtime/build/incremental.abc ../interop/build/interop.abc ./arkui/build/arkui.abc modules/build/bootPandaFiles/modules.abc", + "build": "npm run build --prefix ../incremental && npm run build --prefix ../interop && npm run build --prefix arkui && npm run build:modules --prefix modules && npm run link" } } diff --git a/arkoala-arkts/shopping/user/ui2abcconfig.json b/arkoala-arkts/shopping/user/ui2abcconfig.json index 1ad793133b..d24ddc6ba7 100644 --- a/arkoala-arkts/shopping/user/ui2abcconfig.json +++ b/arkoala-arkts/shopping/user/ui2abcconfig.json @@ -8,6 +8,7 @@ "@ohos.arkui.component": ["../../arkui/@ohos.arkui.component"], "global.resource": ["../../modules/global.resource/src/resource"], "@ohos.font": ["../../modules/ohos/src/font"], + "@ohos.multimedia.image": ["../../modules/ohos.multimedia.image/src"], "@ohos.arkui.stateManagement": ["../../arkui/@ohos.arkui.stateManagement"], "@ohos.arkui.inspector": ["../../arkui/@ohos.arkui.inspector"], "@ohos.arkui.theme": ["../../arkui/@ohos.arkui.theme"], diff --git a/arkoala-arkts/tools/peer-generator/config-arkui.json b/arkoala-arkts/tools/peer-generator/config-arkui.json index ef3c99e18b..383d6ae6b7 100644 --- a/arkoala-arkts/tools/peer-generator/config-arkui.json +++ b/arkoala-arkts/tools/peer-generator/config-arkui.json @@ -11,6 +11,11 @@ "external": true, "packages": ["ohos.font"] }, + "ohos.multimedia.image": { + "name": "ohos.multimedia.image", + "external": true, + "packages": ["ohos.multimedia.image"] + }, "arkui": { "name": "arkui", "packages": [ @@ -31,7 +36,6 @@ "ohos.multimodalInput", "ohos.promptAction", "ohos.window", - "ohos.multimedia.image", "idlize.stdlib", "idlize.internal" ] diff --git a/arkoala-arkts/trivial/user/ui2abcconfig.json b/arkoala-arkts/trivial/user/ui2abcconfig.json index 6c1bd3c8cc..29ebb2bcb4 100644 --- a/arkoala-arkts/trivial/user/ui2abcconfig.json +++ b/arkoala-arkts/trivial/user/ui2abcconfig.json @@ -9,6 +9,7 @@ "global": ["../../modules/global.resource/src"], "global.resource": ["../../modules/global.resource/src/resource"], "@ohos.font": ["../../modules/ohos/src/font"], + "@ohos.multimedia.image": ["../../modules/ohos.multimedia.image/src"], "@ohos.arkui.stateManagement": ["../../arkui/@ohos.arkui.stateManagement"], "@ohos.arkui.inspector": ["../../arkui/@ohos.arkui.inspector"], "@ohos.arkui.theme": ["../../arkui/@ohos.arkui.theme"], diff --git a/ets-tests/golden-test-ui2abcconfig.json b/ets-tests/golden-test-ui2abcconfig.json index bc489e5341..a9153f5d18 100644 --- a/ets-tests/golden-test-ui2abcconfig.json +++ b/ets-tests/golden-test-ui2abcconfig.json @@ -8,6 +8,7 @@ "@ohos.arkui.component": ["../arkoala-arkts/arkui/@ohos.arkui.component"], "global.resource": ["../arkoala-arkts/modules/global.resource/src/resource"], "@ohos.font": ["../arkoala-arkts/modules/ohos/src/font"], + "@ohos.multimedia.image": ["../arkoala-arkts/modules/ohos.multimedia.image/src"], "@ohos.arkui.stateManagement": ["../arkoala-arkts/arkui/@ohos.arkui.stateManagement"], "@ohos.arkui.inspector": ["../arkoala-arkts/arkui/@ohos.arkui.inspector"], "@ohos.arkui.theme": ["../arkoala-arkts/arkui/@ohos.arkui.theme"], diff --git a/ets-tests/ui2abcconfig.json b/ets-tests/ui2abcconfig.json index 9121ab1490..72debd1496 100644 --- a/ets-tests/ui2abcconfig.json +++ b/ets-tests/ui2abcconfig.json @@ -8,6 +8,7 @@ "@ohos.arkui.component": ["../arkoala-arkts/arkui/@ohos.arkui.component"], "global.resource": ["../arkoala-arkts/modules/global.resource/src/resource"], "@ohos.font": ["../arkoala-arkts/modules/ohos/src/font"], + "@ohos.multimedia.image": ["../arkoala-arkts/modules/ohos.multimedia.image/src"], "@ohos.arkui.stateManagement": ["../arkoala-arkts/arkui/@ohos.arkui.stateManagement"], "@ohos.arkui.inspector": ["../arkoala-arkts/arkui/@ohos.arkui.inspector"], "@ohos.arkui.theme": ["../arkoala-arkts/arkui/@ohos.arkui.theme"], -- Gitee From bfe633c876e3699e74ebd7ab332270259e4562de Mon Sep 17 00:00:00 2001 From: yalixie Date: Thu, 7 Aug 2025 18:26:09 +0300 Subject: [PATCH 2/2] Regenerate code with the PixelMap --- .../arkui/generated/CommonMethodModifier.ets | 4 +- .../arkui/generated/ImageModifier.ets | 4 +- .../arkui/generated/ImageSpanModifier.ets | 4 +- .../generated/NavDestinationModifier.ets | 4 +- .../arkui/generated/NavigationModifier.ets | 4 +- .../arkui/generated/component/canvas.ets | 7 +- .../generated/component/styledString.ets | 7 +- .../arkts/ArkUIGeneratedNativeModule.ets | 12 --- .../generated/framework/arkts/type_check.ets | 4 +- .../ohos.arkui.drawableDescriptor.ets | 5 +- .../framework/ohos.graphics.drawing.ets | 13 +-- .../framework/ohos.multimedia.image.ets | 88 ++------------- .../peers/CallbackDeserializeCall.ets | 4 +- arkoala-arkts/arkui/sdk/component/canvas.ets | 4 +- arkoala-arkts/arkui/sdk/component/common.ets | 4 +- arkoala-arkts/arkui/sdk/component/idlize.ets | 4 +- arkoala-arkts/arkui/sdk/component/image.ets | 4 +- .../arkui/sdk/component/imageAnimator.ets | 4 +- .../arkui/sdk/component/imageSpan.ets | 4 +- .../arkui/sdk/component/mediaCachedImage.ets | 4 +- .../arkui/sdk/component/navDestination.ets | 4 +- .../arkui/sdk/component/navigation.ets | 4 +- .../arkui/sdk/component/richEditor.ets | 4 +- arkoala-arkts/arkui/sdk/component/shape.ets | 4 +- arkoala-arkts/arkui/sdk/component/sidebar.ets | 4 +- .../arkui/sdk/component/styledString.ets | 3 +- arkoala-arkts/arkui/sdk/component/video.ets | 4 +- .../ohos.arkui.drawableDescriptor.ets | 3 +- .../sdk/framework/ohos.graphics.drawing.ets | 3 +- .../src/generated/arkoala_api_generated.h | 13 --- .../native/src/generated/bridge_generated.cc | 32 ------ .../native/src/generated/dummy_impl.cc | 102 ------------------ .../native/src/generated/real_impl.cc | 51 --------- 33 files changed, 71 insertions(+), 348 deletions(-) diff --git a/arkoala-arkts/arkui/generated/CommonMethodModifier.ets b/arkoala-arkts/arkui/generated/CommonMethodModifier.ets index 39e3c22a0d..6392d85865 100644 --- a/arkoala-arkts/arkui/generated/CommonMethodModifier.ets +++ b/arkoala-arkts/arkui/generated/CommonMethodModifier.ets @@ -16,7 +16,7 @@ // WARNING! THIS FILE IS AUTO-GENERATED, DO NOT MAKE CHANGES, THEY WILL BE LOST ON NEXT GENERATION! -import { AttributeModifier, GestureModifier } from "#handwritten" +import { AttributeModifier, GestureModifier, extractors } from "#handwritten" import { AttributeUpdaterFlag } from "./AttributeUpdater" import { ArkCommonMethodPeer, LayoutPolicy, DrawModifier, Rectangle, TouchTestInfo, TouchResult, PixelRoundPolicy, BackgroundEffectOptions, ForegroundEffectOptions, BorderImageOption, OutlineStyle, ClickEvent, HoverEvent, AccessibilityCallback, AccessibilityHoverEvent, MouseEvent, TouchEvent, KeyEvent, CrownEvent, FocusAxisEvent, AxisEvent, FocusMovement, AnimateParam, TransitionEffect, MotionBlurOptions, InvertOptions, TranslateOptions, ScaleOptions, RotateOptions, AlignRuleOption, LocalizedAlignRuleOptions, ClickEffect, DragEvent, DragItemInfo, PreDragStatus, LinearGradientOptions, SweepGradientOptions, RadialGradientOptions, MotionPathOptions, ShadowOptions, ShadowStyle, ProgressMask, StateStyles, PixelStretchEffectOptions, AccessibilitySamePageMode, AccessibilityRoleType, AccessibilityFocusCallback, ReuseOptions, BackgroundBrightnessOptions, GestureRecognizerJudgeBeginCallback, ShouldBuiltInRecognizerParallelWithCallback, SizeChangeCallback, CustomProperty, SafeAreaType, SafeAreaEdge, BackgroundOptions, BackgroundImageOptions, BlurStyle, BackgroundBlurStyleOptions, SystemAdaptiveOptions, ForegroundBlurStyleOptions, TransitionFinishCallback, BlurOptions, LinearGradientBlurOptions, EffectType, sharedTransitionOptions, ChainStyle, OnDragEventCallback, DropOptions, PreviewConfiguration, DragPreviewOptions, DragInteractionOptions, OverlayOptions, BlendMode, BlendApplyType, GeometryTransitionOptions, TipsMessageType, TipsOptions, PopupOptions, CustomPopupOptions, MenuElement, MenuOptions, ContextMenuOptions, Bindable, ModalTransition, ContentCoverOptions, SheetOptions, VisibleAreaChangeCallback, VisibleAreaEventOptions, CommonMethod } from "./component/common" import { Length, SizeOptions, ConstraintSizeOptions, ChainWeightOptions, Padding, LocalizedPadding, ResourceColor, Position, BorderOptions, EdgeStyles, EdgeWidths, LocalizedEdgeWidths, EdgeColors, LocalizedEdgeColors, BorderRadiuses, LocalizedBorderRadiuses, OutlineOptions, EdgeOutlineStyles, Dimension, EdgeOutlineWidths, OutlineRadiuses, VoidCallback, Area, Edges, LocalizedEdges, LocalizedPosition, ResourceStr, AccessibilityOptions } from "./component/units" @@ -30,7 +30,7 @@ import { CustomBuilder } from "./component/builder" import { uniformTypeDescriptor } from "./framework/ohos.data.uniformTypeDescriptor" import { CircleShape, EllipseShape, PathShape, RectShape } from "./framework/ohos.arkui.shape" import { GestureInfo, BaseGestureEvent, GestureJudgeResult, GestureRecognizer, GestureType, Gesture, GestureMask } from "./component/gesture" -import { image } from "./framework/ohos.multimedia.image" +import { image } from "@ohos.multimedia.image" import { ComponentContent } from "./ComponentContent" import { StyledString } from "./component/styledString" export class CommonMethodModifier implements CommonMethod,AttributeModifier { diff --git a/arkoala-arkts/arkui/generated/ImageModifier.ets b/arkoala-arkts/arkui/generated/ImageModifier.ets index 11f9481a7a..4a562dcdad 100644 --- a/arkoala-arkts/arkui/generated/ImageModifier.ets +++ b/arkoala-arkts/arkui/generated/ImageModifier.ets @@ -17,12 +17,12 @@ // WARNING! THIS FILE IS AUTO-GENERATED, DO NOT MAKE CHANGES, THEY WILL BE LOST ON NEXT GENERATION! import { CommonMethodModifier } from "./CommonMethodModifier" -import { AttributeModifier } from "#handwritten" +import { AttributeModifier, extractors } from "#handwritten" import { AttributeUpdaterFlag } from "./AttributeUpdater" import { ArkImagePeer, ColorContent, ImageRenderMode, DynamicRangeMode, ImageInterpolation, ImageSourceSize, ImageOnCompleteCallback, ImageCompleteEvent, ImageErrorCallback, ImageError, ResizableOptions, ImageRotateOrientation, ImageAttribute } from "./component/image" import { CommonMethod, PointLightStyle } from "./component/common" import { Resource } from "global.resource" -import { image } from "./framework/ohos.multimedia.image" +import { image } from "@ohos.multimedia.image" import { ResourceColor, ColorFilter } from "./component/units" import { Color, ImageFit, ImageRepeat, CopyOptions } from "./component/enums" import { ColorMetrics } from "./Graphics" diff --git a/arkoala-arkts/arkui/generated/ImageSpanModifier.ets b/arkoala-arkts/arkui/generated/ImageSpanModifier.ets index 33f0278b76..02649c3dde 100644 --- a/arkoala-arkts/arkui/generated/ImageSpanModifier.ets +++ b/arkoala-arkts/arkui/generated/ImageSpanModifier.ets @@ -18,7 +18,7 @@ import { BaseSpanModifier } from "./BaseSpanModifier" import { CommonMethodModifier } from "./CommonMethodModifier" -import { AttributeModifier } from "#handwritten" +import { AttributeModifier, extractors } from "#handwritten" import { AttributeUpdaterFlag } from "./AttributeUpdater" import { ArkImageSpanPeer, ImageCompleteCallback, ImageLoadResult, ImageSpanAttribute } from "./component/imageSpan" import { BaseSpan } from "./component/span" @@ -26,7 +26,7 @@ import { ImageSpanAlignment, ImageFit } from "./component/enums" import { ColorFilter } from "./component/units" import { drawing } from "./framework/ohos.graphics.drawing" import { ImageErrorCallback, ImageError } from "./component/image" -import { image } from "./framework/ohos.multimedia.image" +import { image } from "@ohos.multimedia.image" import { CommonMethod } from "./component/common" export class ImageSpanModifier extends BaseSpanModifier implements ImageSpanAttribute,AttributeModifier { _instanceId: number = -1; diff --git a/arkoala-arkts/arkui/generated/NavDestinationModifier.ets b/arkoala-arkts/arkui/generated/NavDestinationModifier.ets index fff6a8cdf5..50f238619f 100644 --- a/arkoala-arkts/arkui/generated/NavDestinationModifier.ets +++ b/arkoala-arkts/arkui/generated/NavDestinationModifier.ets @@ -17,13 +17,13 @@ // WARNING! THIS FILE IS AUTO-GENERATED, DO NOT MAKE CHANGES, THEY WILL BE LOST ON NEXT GENERATION! import { CommonMethodModifier } from "./CommonMethodModifier" -import { AttributeModifier } from "#handwritten" +import { AttributeModifier, extractors } from "#handwritten" import { AttributeUpdaterFlag } from "./AttributeUpdater" import { ArkNavDestinationPeer, NavDestinationMode, NavDestinationContext, NavigationSystemTransitionType, NestedScrollInfo, NavDestinationActiveReason, NavDestinationTransitionDelegate, Orientation, NavDestinationAttribute, NavDestinationCommonTitle, NavDestinationCustomTitle } from "./component/navDestination" import { CommonMethod, LayoutSafeAreaType, LayoutSafeAreaEdge } from "./component/common" import { ResourceStr } from "./component/units" import { Resource } from "global.resource" -import { image } from "./framework/ohos.multimedia.image" +import { image } from "@ohos.multimedia.image" import { SymbolGlyphModifier } from "./SymbolGlyphModifier" import { NavigationMenuItem, NavigationOperation, NavigationTitleOptions, NavigationMenuOptions, ToolbarItem, NavigationToolbarOptions } from "./component/navigation" import { CustomBuilder } from "./component/builder" diff --git a/arkoala-arkts/arkui/generated/NavigationModifier.ets b/arkoala-arkts/arkui/generated/NavigationModifier.ets index a080cbd010..6834437604 100644 --- a/arkoala-arkts/arkui/generated/NavigationModifier.ets +++ b/arkoala-arkts/arkui/generated/NavigationModifier.ets @@ -17,13 +17,13 @@ // WARNING! THIS FILE IS AUTO-GENERATED, DO NOT MAKE CHANGES, THEY WILL BE LOST ON NEXT GENERATION! import { CommonMethodModifier } from "./CommonMethodModifier" -import { AttributeModifier } from "#handwritten" +import { AttributeModifier, extractors } from "#handwritten" import { AttributeUpdaterFlag } from "./AttributeUpdater" import { ArkNavigationPeer, NavBarPosition, NavigationMode, NavigationTitleMode, NavigationMenuItem, NavContentInfo, NavigationOperation, NavigationAnimatedTransition, NavigationAttribute, NavigationCommonTitle, NavigationCustomTitle, NavigationTitleOptions, NavigationMenuOptions, ToolbarItem, NavigationToolbarOptions } from "./component/navigation" import { CommonMethod, Bindable, LayoutSafeAreaType, LayoutSafeAreaEdge } from "./component/common" import { Length, Dimension, ResourceStr } from "./component/units" import { Resource } from "global.resource" -import { image } from "./framework/ohos.multimedia.image" +import { image } from "@ohos.multimedia.image" import { SymbolGlyphModifier } from "./SymbolGlyphModifier" import { CustomBuilder, PageMapBuilder } from "./component/builder" import { window } from "./framework/ohos.window" diff --git a/arkoala-arkts/arkui/generated/component/canvas.ets b/arkoala-arkts/arkui/generated/component/canvas.ets index 6e9327f5e0..e481073afe 100644 --- a/arkoala-arkts/arkui/generated/component/canvas.ets +++ b/arkoala-arkts/arkui/generated/component/canvas.ets @@ -22,13 +22,14 @@ import { unsafeCast, int32, int64, float32 } from "@koalaui/common" import { CallbackTransformer } from "./../CallbackTransformer" import { Matrix2D_serializer, Matrix2D, Matrix2DInternal } from "./matrix2d" import { Size_serializer, Size, LengthMetricsUnit, LengthMetrics_serializer, LengthMetrics, LengthMetricsInternal } from "./../Graphics" -import { image_PixelMap_serializer, image } from "./../framework/ohos.multimedia.image" +import { image_PixelMap_serializer } from "./../framework/ohos.multimedia.image" +import { extractors, AttributeModifier, AttributeUpdater } from "#handwritten" +import { image } from "@ohos.multimedia.image" import { ImageAIOptions_serializer, ImageAIOptions, ImageAnalyzerConfig_serializer, ImageAnalyzerConfig } from "./imageCommon" import { ComponentBase } from "./../ComponentBase" import { PeerNode } from "./../PeerNode" import { ArkCommonMethodPeer, CommonMethod, ArkCommonMethodComponent, ArkCommonMethodStyle } from "./common" import { VoidCallback } from "./units" -import { AttributeModifier, AttributeUpdater, extractors } from "#handwritten" import { CallbackKind } from "./../framework/peers/CallbackKind" import { memo, memo_stable } from "@koalaui/runtime/annotations" import { ComponentBuilder, Builder } from "@koalaui/builderLambda" @@ -1802,7 +1803,7 @@ export class CanvasRenderer extends CanvasPath implements MaterializedBase { } private getPixelMap_serialize(sx: number, sy: number, sw: number, sh: number): image.PixelMap { const retval = ArkUIGeneratedNativeModule._CanvasRenderer_getPixelMap(this.peer!.ptr, sx, sy, sw, sh) - const obj : image.PixelMap = image.PixelMapInternal.fromPtr(retval) + const obj : image.PixelMap = extractors.fromImagePixelMapPtr(retval) return obj } private putImageData0_serialize(imagedata: ImageData, dx: number | string, dy: number | string): void { diff --git a/arkoala-arkts/arkui/generated/component/styledString.ets b/arkoala-arkts/arkui/generated/component/styledString.ets index 1d7477137b..2317618539 100644 --- a/arkoala-arkts/arkui/generated/component/styledString.ets +++ b/arkoala-arkts/arkui/generated/component/styledString.ets @@ -27,13 +27,14 @@ import { TextDecorationType, Color, TextDecorationStyle, ImageSpanAlignment, Ima import { ResourceColor, SizeOptions_serializer, ColorFilter_serializer, SizeOptions, ColorFilter, ColorFilterInternal, ResourceStr, Padding, BorderRadiuses, Padding_serializer, BorderRadiuses_serializer } from "./units" import { Resource } from "global.resource" import { drawing_ColorFilter_serializer, drawing } from "./../framework/ohos.graphics.drawing" -import { image, image_PixelMap_serializer } from "./../framework/ohos.multimedia.image" +import { extractors } from "#handwritten" +import { image } from "@ohos.multimedia.image" import { LeadingMarginPlaceholder_serializer, LeadingMarginPlaceholder } from "./richEditor" import { ShadowOptions_serializer, ShadowOptions, ClickEvent, ClickEvent_serializer } from "./common" import { memo, memo_stable } from "@koalaui/runtime/annotations" import { ComponentBuilder, Builder } from "@koalaui/builderLambda" import { GestureEvent, GestureEvent_serializer } from "./gesture" -import { extractors } from "#handwritten" +import { image_PixelMap_serializer } from "./../framework/ohos.multimedia.image" export class BackgroundColorStyleInternal { public static fromPtr(ptr: KPointer): BackgroundColorStyle { return new BackgroundColorStyle(false, ptr) @@ -378,7 +379,7 @@ export class ImageAttachment implements MaterializedBase { } private getValue_serialize(): image.PixelMap { const retval = ArkUIGeneratedNativeModule._ImageAttachment_getValue(this.peer!.ptr) - const obj : image.PixelMap = image.PixelMapInternal.fromPtr(retval) + const obj : image.PixelMap = extractors.fromImagePixelMapPtr(retval) return obj } private getSize_serialize(): SizeOptions | undefined { diff --git a/arkoala-arkts/arkui/generated/framework/arkts/ArkUIGeneratedNativeModule.ets b/arkoala-arkts/arkui/generated/framework/arkts/ArkUIGeneratedNativeModule.ets index 5dfa7ed9ce..3d6e78b32e 100644 --- a/arkoala-arkts/arkui/generated/framework/arkts/ArkUIGeneratedNativeModule.ets +++ b/arkoala-arkts/arkui/generated/framework/arkts/ArkUIGeneratedNativeModule.ets @@ -4401,18 +4401,6 @@ export class ArkUIGeneratedNativeModule { @ani.unsafe.Direct native static _HoverEvent_setStopPropagation(ptr: KPointer, thisArray: KSerializerBuffer, thisLength: int32): void @ani.unsafe.Direct - native static _image_PixelMap_construct(): KPointer - @ani.unsafe.Direct - native static _image_PixelMap_getFinalizer(): KPointer - @ani.unsafe.Direct - native static _image_PixelMap_readPixelsToBufferSync(ptr: KPointer, thisArray: KSerializerBuffer, thisLength: int32): void - @ani.unsafe.Direct - native static _image_PixelMap_writeBufferToPixels(ptr: KPointer, thisArray: KSerializerBuffer, thisLength: int32): void - @ani.unsafe.Direct - native static _image_PixelMap_getIsEditable(ptr: KPointer): boolean - @ani.unsafe.Direct - native static _image_PixelMap_getIsStrideAlignment(ptr: KPointer): boolean - @ani.unsafe.Direct native static _ImageAnalyzerController_construct(): KPointer @ani.unsafe.Direct native static _ImageAnalyzerController_getFinalizer(): KPointer diff --git a/arkoala-arkts/arkui/generated/framework/arkts/type_check.ets b/arkoala-arkts/arkui/generated/framework/arkts/type_check.ets index 61f5899255..3b6c79c8ca 100644 --- a/arkoala-arkts/arkui/generated/framework/arkts/type_check.ets +++ b/arkoala-arkts/arkui/generated/framework/arkts/type_check.ets @@ -22,7 +22,7 @@ import { AccessibilityHoverType, Alignment, AnimationStatus, AppRotation, ArrowP import { AccessibilityRoleType, AccessibilitySamePageMode, AdaptiveColor, BlendApplyType, BlendMode, BlurStyle, BlurStyleActivePolicy, TouchEvent, ChainStyle, ContentClipMode, DismissReason, DragBehavior, DraggingSizeChangeEffect, DragPreviewMode, DragResult, EffectEdge, EffectType, FinishCallbackType, SourceTool, HapticFeedbackMode, HoverModeAreaType, KeyboardAvoidMode, Layoutable, Measurable, GeometryInfo, SizeResult, LayoutPolicy, LayoutSafeAreaEdge, LayoutSafeAreaType, RectResult, CommonConfiguration, TranslateOptions, ScaleOptions, RotateOptions, MenuPolicy, MenuPreviewMode, ModalTransition, NestedScrollOptions, OutlineStyle, PixelMapMock, PopupStateChangeParam, PreDragStatus, ProgressMask, PopupCommonOptions, MenuOptions, RepeatMode, SelectionOptions, SafeAreaEdge, SafeAreaType, ScrollResult, ScrollSizeMode, TextContentControllerBase, ShadowStyle, ShadowType, SheetKeyboardAvoidMode, SheetMode, SheetSize, SheetType, SourceType, CaretOffset, TextContentControllerOptions, ThemeColorMode, TouchTestInfo, TouchTestStrategy, TransitionEdge, TransitionEffect, AsymmetricTransitionOption, AnimateParam, TransitionHierarchyStrategy, UICommonEvent, ClickEvent, KeyEvent, HoverCallback, HoverEvent, MouseEvent, SizeChangeCallback, VisibleAreaEventOptions, VisibleAreaChangeCallback, SheetOptions, AlignRuleOption, BackgroundBrightnessOptions, BackgroundImageOptions, BackgroundOptions, Bindable, BlurOptions, ChildrenMainSize, ClickEffect, CrownEvent, DateRange, DismissContentCoverAction, DismissPopupAction, DismissSheetAction, DragEvent, ModifierKeyStateGetter, Rectangle, DragInteractionOptions, DragItemInfo, DrawModifier, DropOptions, EdgeEffectOptions, ExpectedFrameRateRange, FocusMovement, ForegroundEffectOptions, GeometryTransitionOptions, InputCounterOptions, InvertOptions, ItemDragInfo, FractionStop, LinearGradientBlurOptions, LinearGradientOptions, LocalizedHorizontalAlignParam, LocalizedVerticalAlignParam, MeasureResult, MotionBlurAnchor, MotionBlurOptions, MotionPathOptions, OverlayOffset, PixelRoundPolicy, PopupButton, PreviewConfiguration, SheetDismiss, SpringBackAction, StateStyles, SystemAdaptiveOptions, ShadowOptions, TouchObject, TouchResult, BackgroundBlurStyleOptions, BlurStyleOptions, BackgroundEffectOptions, ContentCoverOptions, BindOptions, ContextMenuAnimationOptions, AnimationNumberRange, MultiShadowOptions, DragPreviewOptions, FadingEdgeOptions, ForegroundBlurStyleOptions, HistoricalPoint, LightSource, LocalizedAlignRuleOptions, MenuElement, OverlayOptions, PopupMaskType, ReuseOptions, ReuseIdCallback, sharedTransitionOptions, SheetTitleOptions, TerminationInfo, TextDecorationOptions, DividerStyle, PixelStretchEffectOptions, PointLightStyle, RadialGradientOptions, SweepGradientOptions, TipsOptions, BorderImageOption, ContextMenuOptions, BorderRadiusType, CustomPopupOptions, PopupStateChangeCallback, EventTarget, FocusAxisEvent, BaseEvent, LayoutChild, PickerDialogButtonStyle, PickerTextStyle, PopupMessageOptions, TripleLengthDetents, AccessibilityHoverEvent, AxisEvent, PopupOptions } from "./../../component/common" import { AnimationMode, BarMode, BarPosition, LayoutStyle, TabContentTransitionProxy, TabsAnimationEvent, TabsCacheMode, TabsController, TabContentAnimatedTransition, TabsOptions, BarGridColumnOptions, ScrollableBarModeOptions } from "./../../component/tabs" import { ArrowPosition, AvoidanceMode, MenuAlignType, MenuItemConfiguration, SelectOption, MenuOutlineOptions } from "./../../component/select" -import { AttributeModifier, ContentModifier, GestureModifier, UIGestureEvent, CustomStyles } from "#handwritten" +import { AttributeModifier, ContentModifier, extractors, GestureModifier, UIGestureEvent, CustomStyles } from "#handwritten" import { AttributeUpdaterFlag } from "./../../AttributeUpdater" import { AutoCapitalizationMode, KeyboardAppearance, LayoutManager, PositionWithAffinity, MenuType, TextEditControllerEx, PreviewText, StyledStringController, StyledStringChangedListener, TextBaseController, TextRange, TextDataDetectorType, TextDeleteDirection, TextMenuOptions, TextMenuItemId, TextMenuShowMode, TextMenuItem, DeleteValue, EditMenuOptions, OnCreateMenuCallback, OnMenuItemClickCallback, FontSettingOptions, InsertValue, StyledStringChangeValue, OnDidChangeCallback, DecorationStyleResult, TextChangeOptions, CaretStyle, EditableTextChangeValue, TextDataDetectorConfig } from "./../../component/textCommon" import { BadgePosition, BadgeStyle, BadgeParamWithNumber, BadgeParam, BadgeParamWithString } from "./../../component/badge" @@ -56,7 +56,7 @@ import { DialogAlignment, DialogButtonDirection, AlertDialogButtonOptions } from import { DistributionType, DisturbanceFieldShape, ParticleEmitterShape, ParticleType, ParticleUpdater, ParticlePropertyAnimation } from "./../../component/particle" import { DpiFollowStrategy, UIExtensionProxy, WindowModeFollowStrategy, UIExtensionOptions } from "./../../component/uiExtensionComponent" import { DrawableDescriptor } from "./../ohos.arkui.drawableDescriptor" -import { image } from "./../ohos.multimedia.image" +import { image } from "@ohos.multimedia.image" import { drawing } from "./../ohos.graphics.drawing" import { common2D } from "./../ohos.graphics.common2D" import { EffectDirection, EffectFillStyle, EffectScope, SymbolEffect, SymbolEffectStrategy, SymbolRenderingStrategy, AppearSymbolEffect, BounceSymbolEffect, DisappearSymbolEffect, HierarchicalSymbolEffect, ReplaceSymbolEffect, ScaleSymbolEffect } from "./../../component/symbolglyph" diff --git a/arkoala-arkts/arkui/generated/framework/ohos.arkui.drawableDescriptor.ets b/arkoala-arkts/arkui/generated/framework/ohos.arkui.drawableDescriptor.ets index 943813d6f5..638ecb77ad 100644 --- a/arkoala-arkts/arkui/generated/framework/ohos.arkui.drawableDescriptor.ets +++ b/arkoala-arkts/arkui/generated/framework/ohos.arkui.drawableDescriptor.ets @@ -16,7 +16,8 @@ // WARNING! THIS FILE IS AUTO-GENERATED, DO NOT MAKE CHANGES, THEY WILL BE LOST ON NEXT GENERATION! -import { image } from "./ohos.multimedia.image" +import { extractors } from "#handwritten" +import { image } from "@ohos.multimedia.image" import { TypeChecker, ArkUIGeneratedNativeModule } from "#components" import { Finalizable, runtimeType, RuntimeType, SerializerBase, DeserializerBase, toPeerPtr, KPointer, MaterializedBase, NativeBuffer, CallbackResource, InteropNativeModule, Tags, nullptr, KSerializerBuffer, KUint8ArrayPtr } from "@koalaui/interop" import { unsafeCast, int32, int64, float32 } from "@koalaui/common" @@ -50,7 +51,7 @@ export class DrawableDescriptor implements MaterializedBase { } private getPixelMap_serialize(): image.PixelMap { const retval = ArkUIGeneratedNativeModule._DrawableDescriptor_getPixelMap(this.peer!.ptr) - const obj : image.PixelMap = image.PixelMapInternal.fromPtr(retval) + const obj : image.PixelMap = extractors.fromImagePixelMapPtr(retval) return obj } } diff --git a/arkoala-arkts/arkui/generated/framework/ohos.graphics.drawing.ets b/arkoala-arkts/arkui/generated/framework/ohos.graphics.drawing.ets index b1a8fc7c70..63d7fae94e 100644 --- a/arkoala-arkts/arkui/generated/framework/ohos.graphics.drawing.ets +++ b/arkoala-arkts/arkui/generated/framework/ohos.graphics.drawing.ets @@ -22,7 +22,8 @@ import { extractors } from "#handwritten" import { TypeChecker, ArkUIGeneratedNativeModule } from "#components" import { CallbackTransformer } from "./../CallbackTransformer" import { common2D_Color_serializer, common2D, common2D_Rect_serializer, common2D_Point3d_serializer, common2D_Point_serializer } from "./ohos.graphics.common2D" -import { image } from "./ohos.multimedia.image" +import { extractors } from "#handwritten" +import { image } from "@ohos.multimedia.image" import { memo, memo_stable } from "@koalaui/runtime/annotations" import { ComponentBuilder, Builder } from "@koalaui/builderLambda" export class drawing_Brush_serializer { @@ -618,7 +619,7 @@ export namespace drawing { this(false, Canvas.construct(pixelmap)) } static construct(pixelmap: image.PixelMap): KPointer { - const retval = ArkUIGeneratedNativeModule._drawing_Canvas_construct(toPeerPtr(pixelmap)) + const retval = ArkUIGeneratedNativeModule._drawing_Canvas_construct(extractors.toImagePixelMapPtr(pixelmap)) return retval } static getFinalizer(): KPointer { @@ -962,19 +963,19 @@ export namespace drawing { ArkUIGeneratedNativeModule._drawing_Canvas_drawCircle(this.peer!.ptr, x, y, radius) } private drawImage_serialize(pixelmap: image.PixelMap, left: number, top: number, samplingOptions: SamplingOptions): void { - ArkUIGeneratedNativeModule._drawing_Canvas_drawImage(this.peer!.ptr, toPeerPtr(pixelmap), left, top, toPeerPtr(samplingOptions)) + ArkUIGeneratedNativeModule._drawing_Canvas_drawImage(this.peer!.ptr, extractors.toImagePixelMapPtr(pixelmap), left, top, toPeerPtr(samplingOptions)) } private drawImageRect_serialize(pixelmap: image.PixelMap, dstRect: common2D.Rect, samplingOptions: SamplingOptions): void { const thisSerializer : SerializerBase = SerializerBase.hold() common2D_Rect_serializer.write(thisSerializer, dstRect) - ArkUIGeneratedNativeModule._drawing_Canvas_drawImageRect(this.peer!.ptr, toPeerPtr(pixelmap), thisSerializer.asBuffer(), thisSerializer.length(), toPeerPtr(samplingOptions)) + ArkUIGeneratedNativeModule._drawing_Canvas_drawImageRect(this.peer!.ptr, extractors.toImagePixelMapPtr(pixelmap), thisSerializer.asBuffer(), thisSerializer.length(), toPeerPtr(samplingOptions)) thisSerializer.release() } private drawImageRectWithSrc_serialize(pixelmap: image.PixelMap, srcRect: common2D.Rect, dstRect: common2D.Rect, samplingOptions: SamplingOptions, constraint: SrcRectConstraint): void { const thisSerializer : SerializerBase = SerializerBase.hold() common2D_Rect_serializer.write(thisSerializer, srcRect) common2D_Rect_serializer.write(thisSerializer, dstRect) - ArkUIGeneratedNativeModule._drawing_Canvas_drawImageRectWithSrc(this.peer!.ptr, toPeerPtr(pixelmap), thisSerializer.asBuffer(), thisSerializer.length(), toPeerPtr(samplingOptions), TypeChecker.drawing_SrcRectConstraint_ToNumeric(constraint)) + ArkUIGeneratedNativeModule._drawing_Canvas_drawImageRectWithSrc(this.peer!.ptr, extractors.toImagePixelMapPtr(pixelmap), thisSerializer.asBuffer(), thisSerializer.length(), toPeerPtr(samplingOptions), TypeChecker.drawing_SrcRectConstraint_ToNumeric(constraint)) thisSerializer.release() } private drawColor0_serialize(color: common2D.Color, blendMode: BlendMode): void { @@ -1038,7 +1039,7 @@ export namespace drawing { const colorsTmpElement : number = colors[colorsCounterI] thisSerializer.writeNumber(colorsTmpElement) } - ArkUIGeneratedNativeModule._drawing_Canvas_drawPixelMapMesh(this.peer!.ptr, toPeerPtr(pixelmap), meshWidth, meshHeight, thisSerializer.asBuffer(), thisSerializer.length(), vertOffset, colorOffset) + ArkUIGeneratedNativeModule._drawing_Canvas_drawPixelMapMesh(this.peer!.ptr, extractors.toImagePixelMapPtr(pixelmap), meshWidth, meshHeight, thisSerializer.asBuffer(), thisSerializer.length(), vertOffset, colorOffset) thisSerializer.release() } private drawRegion_serialize(region: Region): void { diff --git a/arkoala-arkts/arkui/generated/framework/ohos.multimedia.image.ets b/arkoala-arkts/arkui/generated/framework/ohos.multimedia.image.ets index 124c3f1214..8243753da1 100644 --- a/arkoala-arkts/arkui/generated/framework/ohos.multimedia.image.ets +++ b/arkoala-arkts/arkui/generated/framework/ohos.multimedia.image.ets @@ -16,96 +16,20 @@ // WARNING! THIS FILE IS AUTO-GENERATED, DO NOT MAKE CHANGES, THEY WILL BE LOST ON NEXT GENERATION! -import { SerializerBase, DeserializerBase, CallbackResource, InteropNativeModule, MaterializedBase, Tags, RuntimeType, runtimeType, toPeerPtr, nullptr, KPointer, NativeBuffer, KSerializerBuffer, KUint8ArrayPtr, Finalizable, KInt, KBoolean, KStringPtr } from "@koalaui/interop" -import { int32, int64, float32, unsafeCast } from "@koalaui/common" import { extractors } from "#handwritten" -import { TypeChecker, ArkUIGeneratedNativeModule } from "#components" +import { image } from "@ohos.multimedia.image" +import { SerializerBase, DeserializerBase, CallbackResource, InteropNativeModule, MaterializedBase, Tags, RuntimeType, runtimeType, toPeerPtr, nullptr, KPointer, NativeBuffer, KSerializerBuffer, KUint8ArrayPtr } from "@koalaui/interop" +import { int32, int64, float32, unsafeCast } from "@koalaui/common" +import { TypeChecker } from "#components" import { CallbackTransformer } from "./../CallbackTransformer" -import { memo, memo_stable } from "@koalaui/runtime/annotations" -import { ComponentBuilder, Builder } from "@koalaui/builderLambda" export class image_PixelMap_serializer { public static write(buffer: SerializerBase, value: image.PixelMap): void { let valueSerializer : SerializerBase = buffer - valueSerializer.writePointer(toPeerPtr(value)) + valueSerializer.writePointer(extractors.toImagePixelMapPtr(value)) } public static read(buffer: DeserializerBase): image.PixelMap { let valueDeserializer : DeserializerBase = buffer let ptr : KPointer = valueDeserializer.readPointer() - return image.PixelMapInternal.fromPtr(ptr) - } -} -export namespace image { - export interface PixelMap { - isEditable: boolean - isStrideAlignment: boolean - readPixelsToBufferSync(dst: ArrayBuffer): void - writeBufferToPixels(src: ArrayBuffer): void - } - export class PixelMapInternal implements MaterializedBase,PixelMap { - peer?: Finalizable | undefined = undefined - public getPeer(): Finalizable | undefined { - return this.peer - } - isEditable: boolean - isStrideAlignment: boolean - constructor(peerPtr: KPointer) { - this.peer = new Finalizable(peerPtr, PixelMapInternal.getFinalizer()) - this.isEditable = this.getIsEditable() - this.isStrideAlignment = this.getIsStrideAlignment() - } - constructor() { - this(PixelMapInternal.construct()) - } - static construct(): KPointer { - const retval = ArkUIGeneratedNativeModule._image_PixelMap_construct() - return retval - } - static getFinalizer(): KPointer { - return ArkUIGeneratedNativeModule._image_PixelMap_getFinalizer() - } - public static fromPtr(ptr: KPointer): PixelMapInternal { - return new PixelMapInternal(ptr) - } - public readPixelsToBufferSync(dst: ArrayBuffer): void { - const dst_casted = dst as (ArrayBuffer) - this.readPixelsToBufferSync_serialize(dst_casted) - return - } - public writeBufferToPixels(src: ArrayBuffer): void { - const src_casted = src as (ArrayBuffer) - this.writeBufferToPixels_serialize(src_casted) - return - } - private getIsEditable(): boolean { - return this.getIsEditable_serialize() - } - private getIsStrideAlignment(): boolean { - return this.getIsStrideAlignment_serialize() - } - private readPixelsToBufferSync_serialize(dst: ArrayBuffer): void { - const thisSerializer : SerializerBase = SerializerBase.hold() - thisSerializer.writeBuffer(dst) - ArkUIGeneratedNativeModule._image_PixelMap_readPixelsToBufferSync(this.peer!.ptr, thisSerializer.asBuffer(), thisSerializer.length()) - thisSerializer.release() - } - private writeBufferToPixels_serialize(src: ArrayBuffer): void { - const thisSerializer : SerializerBase = SerializerBase.hold() - thisSerializer.writeBuffer(src) - ArkUIGeneratedNativeModule._image_PixelMap_writeBufferToPixels(this.peer!.ptr, thisSerializer.asBuffer(), thisSerializer.length()) - thisSerializer.release() - } - private getIsEditable_serialize(): boolean { - const retval = ArkUIGeneratedNativeModule._image_PixelMap_getIsEditable(this.peer!.ptr) - return retval - } - private getIsStrideAlignment_serialize(): boolean { - const retval = ArkUIGeneratedNativeModule._image_PixelMap_getIsStrideAlignment(this.peer!.ptr) - return retval - } - } - export enum ResolutionQuality { - LOW = 1, - MEDIUM = 2, - HIGH = 3 + return extractors.fromImagePixelMapPtr(ptr) } } diff --git a/arkoala-arkts/arkui/generated/framework/peers/CallbackDeserializeCall.ets b/arkoala-arkts/arkui/generated/framework/peers/CallbackDeserializeCall.ets index b3bafe45c1..9c48d4371a 100644 --- a/arkoala-arkts/arkui/generated/framework/peers/CallbackDeserializeCall.ets +++ b/arkoala-arkts/arkui/generated/framework/peers/CallbackDeserializeCall.ets @@ -17,7 +17,7 @@ // WARNING! THIS FILE IS AUTO-GENERATED, DO NOT MAKE CHANGES, THEY WILL BE LOST ON NEXT GENERATION! import { AccessibilityHoverEvent_serializer, TouchTestInfo_serializer, TouchResult_serializer, AxisEvent_serializer, HoverEvent_serializer, ClickEvent_serializer, CrownEvent_serializer, DismissContentCoverAction_serializer, DismissPopupAction_serializer, DismissSheetAction_serializer, DragEvent_serializer, FocusAxisEvent_serializer, ItemDragInfo_serializer, KeyEvent_serializer, MouseEvent_serializer, GeometryInfo_serializer, Measurable_serializer, SizeResult_serializer, Layoutable_serializer, ScrollResult_serializer, SheetDismiss_serializer, SpringBackAction_serializer, TerminationInfo_serializer, TouchEvent_serializer, DragItemInfo_serializer, PopupStateChangeParam_serializer, AccessibilityCallback, AccessibilityHoverEvent, AccessibilityFocusCallback, TouchTestInfo, TouchResult, AxisEvent, HoverEvent, ClickEvent, CrownEvent, DismissContentCoverAction, DismissPopupAction, DismissSheetAction, DragEvent, FocusAxisEvent, ItemDragInfo, KeyEvent, MouseEvent, GeometryInfo, Measurable, SizeResult, Layoutable, ScrollResult, PreDragStatus, SheetDismiss, SheetType, SpringBackAction, TerminationInfo, TouchEvent, DragItemInfo, GestureRecognizerJudgeBeginCallback, HoverCallback, ModifierKeyStateGetter, OnDragEventCallback, OnItemDragStartCallback, OnMoveHandler, OnScrollCallback, OnWillScrollCallback, PopupStateChangeCallback, PopupStateChangeParam, ReuseIdCallback, ShouldBuiltInRecognizerParallelWithCallback, SizeChangeCallback, TransitionFinishCallback, VisibleAreaChangeCallback } from "./../../component/common" -import { image_PixelMap_serializer, image } from "./../ohos.multimedia.image" +import { image_PixelMap_serializer } from "./../ohos.multimedia.image" import { ButtonConfiguration_serializer, ButtonConfiguration, ButtonTriggerClickCallback } from "./../../component/button" import { Area_serializer, ConstraintSizeOptions_serializer, SizeOptions_serializer, Area, ConstraintSizeOptions, Length, ResourceStr, SizeOptions, VoidCallback } from "./../../component/units" import { TextMenuItem_serializer, DeleteValue_serializer, EditableTextChangeValue_serializer, InsertValue_serializer, StyledStringChangeValue_serializer, TextRange_serializer, PreviewText_serializer, TextChangeOptions_serializer, TextMenuItem, DeleteValue, EditableTextChangeValue, InsertValue, StyledStringChangeValue, TextRange, EditableTextOnChangeCallback, PreviewText, TextChangeOptions, OnCreateMenuCallback, OnDidChangeCallback, OnMenuItemClickCallback } from "./../../component/textCommon" @@ -64,6 +64,8 @@ import { ToggleConfiguration_serializer, ToggleConfiguration } from "./../../com import { int32, float32, int64 } from "@koalaui/common" import { ResourceHolder, KInt, KStringPtr, wrapSystemCallback, DeserializerBase, SerializerBase, CallbackResource, InteropNativeModule, KPointer, RuntimeType, KSerializerBuffer, NativeBuffer, runtimeType } from "@koalaui/interop" import { CallbackTransformer } from "./../../CallbackTransformer" +import { extractors } from "#handwritten" +import { image } from "@ohos.multimedia.image" import { PasteButtonOnClickResult } from "./../../component/pasteButton" import { SaveButtonOnClickResult } from "./../../component/saveButton" import { HitTestMode, Edge, ScrollSource } from "./../../component/enums" diff --git a/arkoala-arkts/arkui/sdk/component/canvas.ets b/arkoala-arkts/arkui/sdk/component/canvas.ets index 253f2be4b1..665afd1826 100644 --- a/arkoala-arkts/arkui/sdk/component/canvas.ets +++ b/arkoala-arkts/arkui/sdk/component/canvas.ets @@ -22,12 +22,12 @@ import { memo, memo_stable } from "@koalaui/runtime/annotations" import { ComponentBuilder, Builder } from "@koalaui/builderLambda" import { LengthMetricsUnit, LengthMetrics, Size } from "./../Graphics" import { Matrix2D } from "./matrix2d" -import { image } from "./../framework/ohos.multimedia.image" +import { extractors, AttributeModifier, AttributeUpdater } from "./../handwritten" +import { image } from "@ohos.multimedia.image" import { FrameNode } from "./../FrameNode" import { ImageAnalyzerConfig, ImageAIOptions } from "./imageCommon" import { CommonMethod, ArkCommonMethodStyle } from "./common" import { VoidCallback } from "./units" -import { AttributeModifier, AttributeUpdater } from "./../handwritten" export type CanvasFillRule = string; export type CanvasLineCap = string; export type CanvasLineJoin = string; diff --git a/arkoala-arkts/arkui/sdk/component/common.ets b/arkoala-arkts/arkui/sdk/component/common.ets index 92dbe21762..e5d29788df 100644 --- a/arkoala-arkts/arkui/sdk/component/common.ets +++ b/arkoala-arkts/arkui/sdk/component/common.ets @@ -26,7 +26,8 @@ import { Resource } from "global.resource" import { Context } from "./../framework/application.Context" import { curves } from "./../framework/ohos.curves" import { DrawContext, LengthMetrics } from "./../Graphics" -import { image } from "./../framework/ohos.multimedia.image" +import { extractors, CustomStyles, ContentModifier, GestureModifier, AttributeModifier, AttributeUpdater } from "./../handwritten" +import { image } from "@ohos.multimedia.image" import { CustomBuilder } from "./builder" import { pointer } from "./../framework/ohos.multimodalInput.pointer" import { ButtonType, ButtonStyleMode, ButtonRole } from "./button" @@ -35,7 +36,6 @@ import { unifiedDataChannel } from "./../framework/ohos.data.unifiedDataChannel" import { uniformTypeDescriptor } from "./../framework/ohos.data.uniformTypeDescriptor" import { IntentionCode } from "./../framework/ohos.multimodalInput.intentionCode" import { UIContext } from "./../framework/ohos.arkui.UIContext" -import { CustomStyles, ContentModifier, GestureModifier, AttributeModifier, AttributeUpdater } from "./../handwritten" import { SymbolGlyphModifier } from "./../SymbolGlyphModifier" import { StyledString } from "./styledString" import { ResizableOptions } from "./image" diff --git a/arkoala-arkts/arkui/sdk/component/idlize.ets b/arkoala-arkts/arkui/sdk/component/idlize.ets index 32e76e7f2f..5068112965 100644 --- a/arkoala-arkts/arkui/sdk/component/idlize.ets +++ b/arkoala-arkts/arkui/sdk/component/idlize.ets @@ -36,13 +36,13 @@ import { SliderConfiguration } from "./slider" import { TextClockConfiguration } from "./textClock" import { TextTimerConfiguration } from "./textTimer" import { ToggleConfiguration } from "./toggle" -import { ContentModifier, AttributeModifier, AttributeUpdater } from "./../handwritten" +import { ContentModifier, extractors, AttributeModifier, AttributeUpdater } from "./../handwritten" import { CustomDialogController } from "./customDialogController" import { CustomBuilder } from "./builder" import { Resource } from "global.resource" import { ResourceStr, ResourceColor, Position, Length, SizeOptions, ConstraintSizeOptions } from "./units" import { Color } from "./enums" -import { image } from "./../framework/ohos.multimedia.image" +import { image } from "@ohos.multimedia.image" import { FontOptions, FontInfo } from "@ohos.font" import { MeasureOptions } from "./../framework/ohos.measure" import { NavPathStack, NavPathInfo, NavigationOptions } from "./navigation" diff --git a/arkoala-arkts/arkui/sdk/component/image.ets b/arkoala-arkts/arkui/sdk/component/image.ets index 4737c5f562..ae19374b6a 100644 --- a/arkoala-arkts/arkui/sdk/component/image.ets +++ b/arkoala-arkts/arkui/sdk/component/image.ets @@ -21,15 +21,15 @@ import { KInt, KPointer, KBoolean, NativeBuffer, KStringPtr } from "@koalaui/int import { memo, memo_stable } from "@koalaui/runtime/annotations" import { ComponentBuilder, Builder } from "@koalaui/builderLambda" import { drawing } from "./../framework/ohos.graphics.drawing" -import { image } from "./../framework/ohos.multimedia.image" +import { image } from "@ohos.multimedia.image" import { matrix4 } from "./../framework/ohos.matrix4" import { CommonMethod, PointLightStyle, ArkCommonMethodStyle } from "./common" import { Resource } from "global.resource" +import { extractors, AttributeModifier, AttributeUpdater } from "./../handwritten" import { ResourceColor, ColorFilter, EdgeWidths, ResourceStr } from "./units" import { Color, ImageFit, ImageRepeat, CopyOptions } from "./enums" import { ColorMetrics } from "./../Graphics" import { ImageAnalyzerConfig, ImageAIOptions } from "./imageCommon" -import { AttributeModifier, AttributeUpdater } from "./../handwritten" import { BusinessError } from "./../framework/ohos.base" import { DrawableDescriptor } from "./../framework/ohos.arkui.drawableDescriptor" export type DrawingColorFilter = drawing.ColorFilter; diff --git a/arkoala-arkts/arkui/sdk/component/imageAnimator.ets b/arkoala-arkts/arkui/sdk/component/imageAnimator.ets index d7a6b7f153..7d5790028a 100644 --- a/arkoala-arkts/arkui/sdk/component/imageAnimator.ets +++ b/arkoala-arkts/arkui/sdk/component/imageAnimator.ets @@ -21,10 +21,10 @@ import { KInt, KPointer, KBoolean, NativeBuffer, KStringPtr } from "@koalaui/int import { memo, memo_stable } from "@koalaui/runtime/annotations" import { ComponentBuilder, Builder } from "@koalaui/builderLambda" import { Resource } from "global.resource" -import { image } from "./../framework/ohos.multimedia.image" +import { extractors, AttributeModifier, AttributeUpdater } from "./../handwritten" +import { image } from "@ohos.multimedia.image" import { CommonMethod, ArkCommonMethodStyle } from "./common" import { AnimationStatus, FillMode } from "./enums" -import { AttributeModifier, AttributeUpdater } from "./../handwritten" export declare interface ImageFrameInfo { src: string | Resource | image.PixelMap; width?: number | string; diff --git a/arkoala-arkts/arkui/sdk/component/imageSpan.ets b/arkoala-arkts/arkui/sdk/component/imageSpan.ets index 8ef825cb55..3926734a70 100644 --- a/arkoala-arkts/arkui/sdk/component/imageSpan.ets +++ b/arkoala-arkts/arkui/sdk/component/imageSpan.ets @@ -25,8 +25,8 @@ import { ImageSpanAlignment, ImageFit } from "./enums" import { ColorFilter, ResourceStr } from "./units" import { drawing } from "./../framework/ohos.graphics.drawing" import { ImageErrorCallback, ImageError } from "./image" -import { image } from "./../framework/ohos.multimedia.image" -import { AttributeModifier, AttributeUpdater } from "./../handwritten" +import { extractors, AttributeModifier, AttributeUpdater } from "./../handwritten" +import { image } from "@ohos.multimedia.image" import { CommonMethod, ArkCommonMethodStyle } from "./common" import { Resource } from "global.resource" export interface ImageSpanAttribute extends BaseSpan { diff --git a/arkoala-arkts/arkui/sdk/component/mediaCachedImage.ets b/arkoala-arkts/arkui/sdk/component/mediaCachedImage.ets index 4d987a3381..fc4b6e1b14 100644 --- a/arkoala-arkts/arkui/sdk/component/mediaCachedImage.ets +++ b/arkoala-arkts/arkui/sdk/component/mediaCachedImage.ets @@ -21,9 +21,9 @@ import { KInt, KPointer, KBoolean, NativeBuffer, KStringPtr } from "@koalaui/int import { memo, memo_stable } from "@koalaui/runtime/annotations" import { ComponentBuilder, Builder } from "@koalaui/builderLambda" import { ImageAttribute, ArkImageStyle } from "./image" -import { AttributeModifier, AttributeUpdater } from "./../handwritten" +import { AttributeModifier, extractors, AttributeUpdater } from "./../handwritten" import { CommonMethod, ArkCommonMethodStyle } from "./common" -import { image } from "./../framework/ohos.multimedia.image" +import { image } from "@ohos.multimedia.image" import { ResourceStr } from "./units" import { Resource } from "global.resource" import { DrawableDescriptor } from "./../framework/ohos.arkui.drawableDescriptor" diff --git a/arkoala-arkts/arkui/sdk/component/navDestination.ets b/arkoala-arkts/arkui/sdk/component/navDestination.ets index e45c4c9ca4..0f1da6dd4b 100644 --- a/arkoala-arkts/arkui/sdk/component/navDestination.ets +++ b/arkoala-arkts/arkui/sdk/component/navDestination.ets @@ -28,10 +28,10 @@ import { NavPathInfo, NavPathStack, NavigationMenuItem, NavigationOperation, Nav import { Scroller } from "./scroll" import { curves } from "./../framework/ohos.curves" import { CommonMethod, LayoutSafeAreaType, LayoutSafeAreaEdge, ArkCommonMethodStyle } from "./common" -import { image } from "./../framework/ohos.multimedia.image" +import { extractors, AttributeModifier, AttributeUpdater } from "./../handwritten" +import { image } from "@ohos.multimedia.image" import { SymbolGlyphModifier } from "./../SymbolGlyphModifier" import { window } from "./../framework/ohos.window" -import { AttributeModifier, AttributeUpdater } from "./../handwritten" export type Orientation = object; export declare interface NavDestinationCommonTitle { main: string | Resource; diff --git a/arkoala-arkts/arkui/sdk/component/navigation.ets b/arkoala-arkts/arkui/sdk/component/navigation.ets index 63b5b4d9c0..5f1dc64cea 100644 --- a/arkoala-arkts/arkui/sdk/component/navigation.ets +++ b/arkoala-arkts/arkui/sdk/component/navigation.ets @@ -30,8 +30,8 @@ import { NavDestinationContext, NavDestinationMode } from "./navDestination" import { BlurStyle, BackgroundBlurStyleOptions, BackgroundEffectOptions, CommonMethod, Bindable, LayoutSafeAreaType, LayoutSafeAreaEdge, ArkCommonMethodStyle } from "./common" import { LengthMetrics } from "./../Graphics" import { TextModifier } from "./../TextModifier" -import { image } from "./../framework/ohos.multimedia.image" -import { AttributeModifier, AttributeUpdater } from "./../handwritten" +import { extractors, AttributeModifier, AttributeUpdater } from "./../handwritten" +import { image } from "@ohos.multimedia.image" export type SystemBarStyle = window.SystemBarStyle; export declare interface NavigationCommonTitle { main: string | Resource; diff --git a/arkoala-arkts/arkui/sdk/component/richEditor.ets b/arkoala-arkts/arkui/sdk/component/richEditor.ets index d2446e73e5..2c886da2c1 100644 --- a/arkoala-arkts/arkui/sdk/component/richEditor.ets +++ b/arkoala-arkts/arkui/sdk/component/richEditor.ets @@ -26,14 +26,14 @@ import { Resource } from "global.resource" import { DecorationStyleInterface, StyledString, MutableStyledString } from "./styledString" import { ShadowOptions, ClickEvent, HoverEvent, HapticFeedbackMode, SelectionOptions, RectResult, CommonMethod, ArkCommonMethodStyle } from "./common" import { TextBackgroundStyle } from "./span" -import { image } from "./../framework/ohos.multimedia.image" +import { extractors, AttributeModifier, AttributeUpdater } from "./../handwritten" +import { image } from "@ohos.multimedia.image" import { SymbolEffectStrategy, SymbolRenderingStrategy } from "./symbolglyph" import { DecorationStyleResult, TextRange, MenuType, TextEditControllerEx, LayoutManager, PreviewText, StyledStringController, StyledStringChangedListener, TextDataDetectorConfig, OnDidChangeCallback, EditMenuOptions, KeyboardAppearance } from "./textCommon" import { GestureEvent } from "./gesture" import { ColorMetrics } from "./../Graphics" import { CustomBuilder } from "./builder" import { EnterKeyType, SubmitEvent } from "./textInput" -import { AttributeModifier, AttributeUpdater } from "./../handwritten" export enum RichEditorDeleteDirection { BACKWARD = 0, FORWARD = 1 diff --git a/arkoala-arkts/arkui/sdk/component/shape.ets b/arkoala-arkts/arkui/sdk/component/shape.ets index 44838ede7a..10046ddbad 100644 --- a/arkoala-arkts/arkui/sdk/component/shape.ets +++ b/arkoala-arkts/arkui/sdk/component/shape.ets @@ -24,8 +24,8 @@ import { Length, ResourceColor } from "./units" import { Resource } from "global.resource" import { CommonMethod, ArkCommonMethodStyle } from "./common" import { Color, LineCapStyle, LineJoinStyle } from "./enums" -import { AttributeModifier, AttributeUpdater } from "./../handwritten" -import { image } from "./../framework/ohos.multimedia.image" +import { AttributeModifier, extractors, AttributeUpdater } from "./../handwritten" +import { image } from "@ohos.multimedia.image" export declare interface ViewportRect { x?: Length; y?: Length; diff --git a/arkoala-arkts/arkui/sdk/component/sidebar.ets b/arkoala-arkts/arkui/sdk/component/sidebar.ets index 2037c66f2f..3c1b63baaf 100644 --- a/arkoala-arkts/arkui/sdk/component/sidebar.ets +++ b/arkoala-arkts/arkui/sdk/component/sidebar.ets @@ -20,11 +20,11 @@ import { int32, int64, float32 } from "@koalaui/common" import { KInt, KPointer, KBoolean, NativeBuffer, KStringPtr } from "@koalaui/interop" import { memo, memo_stable } from "@koalaui/runtime/annotations" import { ComponentBuilder, Builder } from "@koalaui/builderLambda" -import { image } from "./../framework/ohos.multimedia.image" +import { extractors, AttributeModifier, AttributeUpdater } from "./../handwritten" +import { image } from "@ohos.multimedia.image" import { Resource } from "global.resource" import { CommonMethod, Bindable, DividerStyle, ArkCommonMethodStyle } from "./common" import { Length, Dimension } from "./units" -import { AttributeModifier, AttributeUpdater } from "./../handwritten" export enum SideBarContainerType { EMBED = 0, Embed = 0, diff --git a/arkoala-arkts/arkui/sdk/component/styledString.ets b/arkoala-arkts/arkui/sdk/component/styledString.ets index eb559fe3ce..467b8fbac7 100644 --- a/arkoala-arkts/arkui/sdk/component/styledString.ets +++ b/arkoala-arkts/arkui/sdk/component/styledString.ets @@ -28,7 +28,8 @@ import { ShadowOptions, ClickEvent } from "./common" import { TextBackgroundStyle } from "./span" import { GestureEvent } from "./gesture" import { LeadingMarginPlaceholder } from "./richEditor" -import { image } from "./../framework/ohos.multimedia.image" +import { extractors } from "./../handwritten" +import { image } from "@ohos.multimedia.image" import { drawing } from "./../framework/ohos.graphics.drawing" export type StyledStringMarshallingValue = UserDataSpan; export type StyledStringMarshallCallback = (marshallableVal: UserDataSpan) => ArrayBuffer; diff --git a/arkoala-arkts/arkui/sdk/component/video.ets b/arkoala-arkts/arkui/sdk/component/video.ets index e56119c479..ccb762df94 100644 --- a/arkoala-arkts/arkui/sdk/component/video.ets +++ b/arkoala-arkts/arkui/sdk/component/video.ets @@ -21,13 +21,13 @@ import { KInt, KPointer, KBoolean, NativeBuffer, KStringPtr } from "@koalaui/int import { memo, memo_stable } from "@koalaui/runtime/annotations" import { ComponentBuilder, Builder } from "@koalaui/builderLambda" import { Resource } from "global.resource" -import { image } from "./../framework/ohos.multimedia.image" +import { extractors, AttributeModifier, AttributeUpdater } from "./../handwritten" +import { image } from "@ohos.multimedia.image" import { ImageAIOptions, ImageAnalyzerConfig } from "./imageCommon" import { CommonMethod, ArkCommonMethodStyle } from "./common" import { ImageFit } from "./enums" import { VoidCallback } from "./units" import { ColorMetrics } from "./../Graphics" -import { AttributeModifier, AttributeUpdater } from "./../handwritten" export enum SeekMode { PREVIOUS_KEYFRAME = 0, PreviousKeyframe = 0, diff --git a/arkoala-arkts/arkui/sdk/framework/ohos.arkui.drawableDescriptor.ets b/arkoala-arkts/arkui/sdk/framework/ohos.arkui.drawableDescriptor.ets index d2bafbfe2a..7125ff1f72 100644 --- a/arkoala-arkts/arkui/sdk/framework/ohos.arkui.drawableDescriptor.ets +++ b/arkoala-arkts/arkui/sdk/framework/ohos.arkui.drawableDescriptor.ets @@ -20,7 +20,8 @@ import { int32, int64, float32 } from "@koalaui/common" import { KInt, KPointer, KBoolean, NativeBuffer } from "@koalaui/interop" import { memo, memo_stable } from "@koalaui/runtime/annotations" import { ComponentBuilder, Builder } from "@koalaui/builderLambda" -import { image } from "./ohos.multimedia.image" +import { extractors } from "./../handwritten" +import { image } from "@ohos.multimedia.image" export declare class DrawableDescriptor { constructor() getPixelMap(): image.PixelMap diff --git a/arkoala-arkts/arkui/sdk/framework/ohos.graphics.drawing.ets b/arkoala-arkts/arkui/sdk/framework/ohos.graphics.drawing.ets index 6374f84fa0..684fae34cb 100644 --- a/arkoala-arkts/arkui/sdk/framework/ohos.graphics.drawing.ets +++ b/arkoala-arkts/arkui/sdk/framework/ohos.graphics.drawing.ets @@ -21,7 +21,8 @@ import { KInt, KPointer, KBoolean, NativeBuffer } from "@koalaui/interop" import { memo, memo_stable } from "@koalaui/runtime/annotations" import { ComponentBuilder, Builder } from "@koalaui/builderLambda" import { common2D } from "./ohos.graphics.common2D" -import { image } from "./ohos.multimedia.image" +import { extractors } from "./../handwritten" +import { image } from "@ohos.multimedia.image" export declare namespace drawing { export enum BlendMode { CLEAR = 0, diff --git a/arkoala-arkts/framework/native/src/generated/arkoala_api_generated.h b/arkoala-arkts/framework/native/src/generated/arkoala_api_generated.h index 1cdd5d9193..1207f2b31e 100644 --- a/arkoala-arkts/framework/native/src/generated/arkoala_api_generated.h +++ b/arkoala-arkts/framework/native/src/generated/arkoala_api_generated.h @@ -23631,18 +23631,6 @@ typedef struct GENERATED_ArkUIHoverEventAccessor { const Callback_Void* stopPropagation); } GENERATED_ArkUIHoverEventAccessor; -typedef struct GENERATED_ArkUIImage_PixelMapAccessor { - void (*destroyPeer)(Ark_image_PixelMap peer); - Ark_image_PixelMap (*construct)(); - Ark_NativePointer (*getFinalizer)(); - void (*readPixelsToBufferSync)(Ark_image_PixelMap peer, - const Ark_Buffer* dst); - void (*writeBufferToPixels)(Ark_image_PixelMap peer, - const Ark_Buffer* src); - Ark_Boolean (*getIsEditable)(Ark_image_PixelMap peer); - Ark_Boolean (*getIsStrideAlignment)(Ark_image_PixelMap peer); -} GENERATED_ArkUIImage_PixelMapAccessor; - typedef struct GENERATED_ArkUIImageAnalyzerControllerAccessor { void (*destroyPeer)(Ark_ImageAnalyzerController peer); Ark_ImageAnalyzerController (*construct)(); @@ -26169,7 +26157,6 @@ typedef struct GENERATED_ArkUIAccessors { const GENERATED_ArkUIGlobalScope_ohos_measure_utilsAccessor* (*getGlobalScope_ohos_measure_utilsAccessor)(); const GENERATED_ArkUIHierarchicalSymbolEffectAccessor* (*getHierarchicalSymbolEffectAccessor)(); const GENERATED_ArkUIHoverEventAccessor* (*getHoverEventAccessor)(); - const GENERATED_ArkUIImage_PixelMapAccessor* (*getImage_PixelMapAccessor)(); const GENERATED_ArkUIImageAnalyzerControllerAccessor* (*getImageAnalyzerControllerAccessor)(); const GENERATED_ArkUIImageAttachmentAccessor* (*getImageAttachmentAccessor)(); const GENERATED_ArkUIImageBitmapAccessor* (*getImageBitmapAccessor)(); diff --git a/arkoala-arkts/framework/native/src/generated/bridge_generated.cc b/arkoala-arkts/framework/native/src/generated/bridge_generated.cc index 961f4c029b..3746ced394 100644 --- a/arkoala-arkts/framework/native/src/generated/bridge_generated.cc +++ b/arkoala-arkts/framework/native/src/generated/bridge_generated.cc @@ -28709,38 +28709,6 @@ void impl_HoverEvent_setStopPropagation(Ark_NativePointer thisPtr, KSerializerBu GetAccessors()->getHoverEventAccessor()->setStopPropagation(self, static_cast(&stopPropagationValueTemp)); } KOALA_INTEROP_DIRECT_V3(HoverEvent_setStopPropagation, Ark_NativePointer, KSerializerBuffer, int32_t) -Ark_NativePointer impl_image_PixelMap_construct() { - return GetAccessors()->getImage_PixelMapAccessor()->construct(); -} -KOALA_INTEROP_DIRECT_0(image_PixelMap_construct, Ark_NativePointer) -Ark_NativePointer impl_image_PixelMap_getFinalizer() { - return GetAccessors()->getImage_PixelMapAccessor()->getFinalizer(); -} -KOALA_INTEROP_DIRECT_0(image_PixelMap_getFinalizer, Ark_NativePointer) -void impl_image_PixelMap_readPixelsToBufferSync(Ark_NativePointer thisPtr, KSerializerBuffer thisArray, int32_t thisLength) { - Ark_image_PixelMap self = reinterpret_cast(thisPtr); - DeserializerBase thisDeserializer(thisArray, thisLength); - Ark_Buffer dstValueTemp = static_cast(thisDeserializer.readBuffer());; - GetAccessors()->getImage_PixelMapAccessor()->readPixelsToBufferSync(self, static_cast(&dstValueTemp)); -} -KOALA_INTEROP_DIRECT_V3(image_PixelMap_readPixelsToBufferSync, Ark_NativePointer, KSerializerBuffer, int32_t) -void impl_image_PixelMap_writeBufferToPixels(Ark_NativePointer thisPtr, KSerializerBuffer thisArray, int32_t thisLength) { - Ark_image_PixelMap self = reinterpret_cast(thisPtr); - DeserializerBase thisDeserializer(thisArray, thisLength); - Ark_Buffer srcValueTemp = static_cast(thisDeserializer.readBuffer());; - GetAccessors()->getImage_PixelMapAccessor()->writeBufferToPixels(self, static_cast(&srcValueTemp)); -} -KOALA_INTEROP_DIRECT_V3(image_PixelMap_writeBufferToPixels, Ark_NativePointer, KSerializerBuffer, int32_t) -Ark_Boolean impl_image_PixelMap_getIsEditable(Ark_NativePointer thisPtr) { - Ark_image_PixelMap self = reinterpret_cast(thisPtr); - return GetAccessors()->getImage_PixelMapAccessor()->getIsEditable(self); -} -KOALA_INTEROP_DIRECT_1(image_PixelMap_getIsEditable, Ark_Boolean, Ark_NativePointer) -Ark_Boolean impl_image_PixelMap_getIsStrideAlignment(Ark_NativePointer thisPtr) { - Ark_image_PixelMap self = reinterpret_cast(thisPtr); - return GetAccessors()->getImage_PixelMapAccessor()->getIsStrideAlignment(self); -} -KOALA_INTEROP_DIRECT_1(image_PixelMap_getIsStrideAlignment, Ark_Boolean, Ark_NativePointer) Ark_NativePointer impl_ImageAnalyzerController_construct() { return GetAccessors()->getImageAnalyzerControllerAccessor()->construct(); } diff --git a/arkoala-arkts/framework/native/src/generated/dummy_impl.cc b/arkoala-arkts/framework/native/src/generated/dummy_impl.cc index d480281b14..731b6f7574 100644 --- a/arkoala-arkts/framework/native/src/generated/dummy_impl.cc +++ b/arkoala-arkts/framework/native/src/generated/dummy_impl.cc @@ -32892,90 +32892,6 @@ namespace OHOS::Ace::NG::GeneratedModifier { appendGroupedLog(1, out); } } // HoverEventAccessor - namespace image_PixelMapAccessor { - void DestroyPeerImpl(Ark_image_PixelMap peer) - { - if (!needGroupedLog(1)) - { - return; - } - string out("destroyPeer("); - out.append(") \n"); - appendGroupedLog(1, out); - } - Ark_image_PixelMap ConstructImpl() - { - if (!needGroupedLog(1)) - { - return reinterpret_cast(100); - } - string out("new PixelMap("); - out.append(") \n"); - out.append("[return reinterpret_cast(100)] \n"); - appendGroupedLog(1, out); - return reinterpret_cast(100); - } - Ark_NativePointer GetFinalizerImpl() - { - if (!needGroupedLog(1)) - { - return fnPtr(dummyClassFinalizer); - } - string out("getFinalizer("); - out.append(") \n"); - out.append("[return fnPtr(dummyClassFinalizer)] \n"); - appendGroupedLog(1, out); - return fnPtr(dummyClassFinalizer); - } - void ReadPixelsToBufferSyncImpl(Ark_image_PixelMap peer, - const Ark_Buffer* dst) - { - if (!needGroupedLog(1)) - { - return; - } - string out("readPixelsToBufferSync("); - WriteToString(&out, dst); - out.append(") \n"); - appendGroupedLog(1, out); - } - void WriteBufferToPixelsImpl(Ark_image_PixelMap peer, - const Ark_Buffer* src) - { - if (!needGroupedLog(1)) - { - return; - } - string out("writeBufferToPixels("); - WriteToString(&out, src); - out.append(") \n"); - appendGroupedLog(1, out); - } - Ark_Boolean GetIsEditableImpl(Ark_image_PixelMap peer) - { - if (!needGroupedLog(1)) - { - return 0; - } - string out("getIsEditable("); - out.append(") \n"); - out.append("[return 0] \n"); - appendGroupedLog(1, out); - return 0; - } - Ark_Boolean GetIsStrideAlignmentImpl(Ark_image_PixelMap peer) - { - if (!needGroupedLog(1)) - { - return 0; - } - string out("getIsStrideAlignment("); - out.append(") \n"); - out.append("[return 0] \n"); - appendGroupedLog(1, out); - return 0; - } - } // image_PixelMapAccessor namespace ImageAnalyzerControllerAccessor { void DestroyPeerImpl(Ark_ImageAnalyzerController peer) { @@ -50108,23 +50024,6 @@ namespace OHOS::Ace::NG::GeneratedModifier { struct HoverEventPeer { virtual ~HoverEventPeer() = default; }; - const GENERATED_ArkUIImage_PixelMapAccessor* GetImage_PixelMapAccessor() - { - static const GENERATED_ArkUIImage_PixelMapAccessor Image_PixelMapAccessorImpl { - image_PixelMapAccessor::DestroyPeerImpl, - image_PixelMapAccessor::ConstructImpl, - image_PixelMapAccessor::GetFinalizerImpl, - image_PixelMapAccessor::ReadPixelsToBufferSyncImpl, - image_PixelMapAccessor::WriteBufferToPixelsImpl, - image_PixelMapAccessor::GetIsEditableImpl, - image_PixelMapAccessor::GetIsStrideAlignmentImpl, - }; - return &Image_PixelMapAccessorImpl; - } - - struct Image_PixelMapPeer { - virtual ~Image_PixelMapPeer() = default; - }; const GENERATED_ArkUIImageAnalyzerControllerAccessor* GetImageAnalyzerControllerAccessor() { static const GENERATED_ArkUIImageAnalyzerControllerAccessor ImageAnalyzerControllerAccessorImpl { @@ -52718,7 +52617,6 @@ namespace OHOS::Ace::NG::GeneratedModifier { GetGlobalScope_ohos_measure_utilsAccessor, GetHierarchicalSymbolEffectAccessor, GetHoverEventAccessor, - GetImage_PixelMapAccessor, GetImageAnalyzerControllerAccessor, GetImageAttachmentAccessor, GetImageBitmapAccessor, diff --git a/arkoala-arkts/framework/native/src/generated/real_impl.cc b/arkoala-arkts/framework/native/src/generated/real_impl.cc index 438a2f4efe..620a1432d7 100644 --- a/arkoala-arkts/framework/native/src/generated/real_impl.cc +++ b/arkoala-arkts/framework/native/src/generated/real_impl.cc @@ -13929,39 +13929,6 @@ namespace OHOS::Ace::NG::GeneratedModifier { { } } // HoverEventAccessor - namespace image_PixelMapAccessor { - void DestroyPeerImpl(Ark_image_PixelMap peer) - { - auto peerImpl = reinterpret_cast(peer); - if (peerImpl) { - delete peerImpl; - } - } - Ark_image_PixelMap ConstructImpl() - { - return {}; - } - Ark_NativePointer GetFinalizerImpl() - { - return reinterpret_cast(&DestroyPeerImpl); - } - void ReadPixelsToBufferSyncImpl(Ark_image_PixelMap peer, - const Ark_Buffer* dst) - { - } - void WriteBufferToPixelsImpl(Ark_image_PixelMap peer, - const Ark_Buffer* src) - { - } - Ark_Boolean GetIsEditableImpl(Ark_image_PixelMap peer) - { - return {}; - } - Ark_Boolean GetIsStrideAlignmentImpl(Ark_image_PixelMap peer) - { - return {}; - } - } // image_PixelMapAccessor namespace ImageAnalyzerControllerAccessor { void DestroyPeerImpl(Ark_ImageAnalyzerController peer) { @@ -21465,23 +21432,6 @@ namespace OHOS::Ace::NG::GeneratedModifier { struct HoverEventPeer { virtual ~HoverEventPeer() = default; }; - const GENERATED_ArkUIImage_PixelMapAccessor* GetImage_PixelMapAccessor() - { - static const GENERATED_ArkUIImage_PixelMapAccessor Image_PixelMapAccessorImpl { - image_PixelMapAccessor::DestroyPeerImpl, - image_PixelMapAccessor::ConstructImpl, - image_PixelMapAccessor::GetFinalizerImpl, - image_PixelMapAccessor::ReadPixelsToBufferSyncImpl, - image_PixelMapAccessor::WriteBufferToPixelsImpl, - image_PixelMapAccessor::GetIsEditableImpl, - image_PixelMapAccessor::GetIsStrideAlignmentImpl, - }; - return &Image_PixelMapAccessorImpl; - } - - struct Image_PixelMapPeer { - virtual ~Image_PixelMapPeer() = default; - }; const GENERATED_ArkUIImageAnalyzerControllerAccessor* GetImageAnalyzerControllerAccessor() { static const GENERATED_ArkUIImageAnalyzerControllerAccessor ImageAnalyzerControllerAccessorImpl { @@ -24075,7 +24025,6 @@ namespace OHOS::Ace::NG::GeneratedModifier { GetGlobalScope_ohos_measure_utilsAccessor, GetHierarchicalSymbolEffectAccessor, GetHoverEventAccessor, - GetImage_PixelMapAccessor, GetImageAnalyzerControllerAccessor, GetImageAttachmentAccessor, GetImageBitmapAccessor, -- Gitee