From 4f75f72d800301bfb55d998a74c5376063ad9886 Mon Sep 17 00:00:00 2001 From: WX1379483 Date: Tue, 27 May 2025 15:48:59 +0800 Subject: [PATCH 1/3] =?UTF-8?q?feat=20(=E6=A0=87=E8=AF=86):=20=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=20ImageEditTaskPool=E3=80=81TaskPoolPractice=20?= =?UTF-8?q?=E4=BB=93=E5=BA=93=E6=A0=87=E8=AF=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entry/src/main/ets/view/AdjustContentView.ets | 5 ++++- .../entry/src/main/ets/pages/sample1/Sample1.ets | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/ImageEditTaskPool/entry/src/main/ets/view/AdjustContentView.ets b/ImageEditTaskPool/entry/src/main/ets/view/AdjustContentView.ets index ab5aef38..f6af18a1 100644 --- a/ImageEditTaskPool/entry/src/main/ets/view/AdjustContentView.ets +++ b/ImageEditTaskPool/entry/src/main/ets/view/AdjustContentView.ets @@ -189,6 +189,7 @@ struct SliderCustom { } // [Start postProcess_start] + // ImageEditTaskPool/entry/src/main/ets/view/AdjustContentView.ets async postProcess(type: AdjustId, value: number) { // [StartExclude postProcess_start] if (!this.pixelMap) { @@ -231,6 +232,8 @@ struct SliderCustom { this.deviceListDialogController.close(); this.postState = true; } + // [EndExclude postProcess_start] + // [End postProcess_start] } @CustomDialog @@ -247,7 +250,7 @@ export struct Dialog { } } -// [EndExclude postProcess_start] +// [Start postProcess_start] /** * Each task processes a portion of the pixel data and adds the task to the task group. * diff --git a/TaskPoolPractice/entry/src/main/ets/pages/sample1/Sample1.ets b/TaskPoolPractice/entry/src/main/ets/pages/sample1/Sample1.ets index e2a729c9..423e3d3c 100644 --- a/TaskPoolPractice/entry/src/main/ets/pages/sample1/Sample1.ets +++ b/TaskPoolPractice/entry/src/main/ets/pages/sample1/Sample1.ets @@ -42,7 +42,7 @@ struct Sample1 { .height(40) .width('100%') .onClick(() => { - // [Start sample_fun] + // [Start task_pool] // Sample1.ets taskpool.execute(wrongConcurrentFunc); // [End task_pool] -- Gitee From ac7f46cc523fbd97da26264b97808baffeb56f20 Mon Sep 17 00:00:00 2001 From: WX1379483 Date: Tue, 27 May 2025 20:49:08 +0800 Subject: [PATCH 2/3] =?UTF-8?q?feat=20(=E6=A0=87=E8=AF=86):=20=E4=BF=AE?= =?UTF-8?q?=E6=94=B9VideoPlayerSample=E4=BB=93=E5=BA=93=E6=A0=87=E8=AF=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- VideoPlayerSample/entry/src/main/ets/pages/IndexPage.ets | 3 +-- VideoPlayerSample/entry/src/main/ets/utils/WindowUtil.ets | 6 +++--- .../library/src/main/ets/components/customPlugin.ts | 8 ++++---- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/VideoPlayerSample/entry/src/main/ets/pages/IndexPage.ets b/VideoPlayerSample/entry/src/main/ets/pages/IndexPage.ets index b7190983..e068d7cc 100644 --- a/VideoPlayerSample/entry/src/main/ets/pages/IndexPage.ets +++ b/VideoPlayerSample/entry/src/main/ets/pages/IndexPage.ets @@ -89,7 +89,6 @@ struct IndexPage { } } // [End device_width] - onBackPress(): boolean | void { if (this.isFullScreen || this.isFullLandscapeScreen) { this.handleFullScreenExit(); @@ -117,7 +116,7 @@ struct IndexPage { Swiper(this.swiperController) { LazyForEach(new VideoSource(this.sources), (item: VideoData, index: number) => { Stack() { - // [EndExclude device_width] + // [EndExclude device_width] VideoPlayer({ // [StartExclude device_width] videoRightSide: (): void => this.rightSlide(item), diff --git a/VideoPlayerSample/entry/src/main/ets/utils/WindowUtil.ets b/VideoPlayerSample/entry/src/main/ets/utils/WindowUtil.ets index ba8bfb46..11343385 100644 --- a/VideoPlayerSample/entry/src/main/ets/utils/WindowUtil.ets +++ b/VideoPlayerSample/entry/src/main/ets/utils/WindowUtil.ets @@ -44,15 +44,15 @@ export class WindowUtil { } // [EndExclude set_stage1] this.mainWindowClass = windowClass; - const properties = windowClass.getWindowProperties(); // 获取窗口信息 + const properties = windowClass.getWindowProperties(); // Get window information // [StartExclude set_stage1] // Get status bar height. let area: window.AvoidArea = windowClass.getWindowAvoidArea(window.AvoidAreaType.TYPE_SYSTEM); let naviBarArea: window.AvoidArea = windowClass.getWindowAvoidArea(window.AvoidAreaType.TYPE_NAVIGATION_INDICATOR); // [EndExclude set_stage1] - AppStorage.setOrCreate('deviceWidth', properties.windowRect.width); // 设置窗口宽度 - AppStorage.setOrCreate('deviceHeight', properties.windowRect.height); // 设置窗口高度 + AppStorage.setOrCreate('deviceWidth', properties.windowRect.width); // Set the window width + AppStorage.setOrCreate('deviceHeight', properties.windowRect.height); // Set the window height // [StartExclude set_stage1] AppStorage.setOrCreate('statusBarHeight', uiContext.px2vp(area.topRect.height)); AppStorage.setOrCreate('navBarHeight', uiContext.px2vp(naviBarArea.bottomRect.height)); diff --git a/customPlugin/library/src/main/ets/components/customPlugin.ts b/customPlugin/library/src/main/ets/components/customPlugin.ts index 7803b7d4..c9db14f6 100644 --- a/customPlugin/library/src/main/ets/components/customPlugin.ts +++ b/customPlugin/library/src/main/ets/components/customPlugin.ts @@ -25,7 +25,7 @@ interface OhPackage { description: string; author: string; } -//[Start readFileSync] + function readFileSync(filePath: string): string { try { const fd = fs.openSync(filePath, fs.OpenMode.READ_ONLY).fd; @@ -49,9 +49,9 @@ function readFileSync(filePath: string): string { throw err; // 重新抛出错误以便上层处理 } } -//[End readFileSync] -//[Start renameHarTask] + + export function renameHarTask(str?: string) { return { pluginId: 'RenameHarTaskID', @@ -94,6 +94,6 @@ export function renameHarTask(str?: string) { }) } } - //[End renameHarTask] + } //[End custom_plugin] \ No newline at end of file -- Gitee From 9fd694dd7a48d82013667fc9ee7ff3cd898fea68 Mon Sep 17 00:00:00 2001 From: WX1379483 Date: Wed, 28 May 2025 11:22:05 +0800 Subject: [PATCH 3/3] =?UTF-8?q?feat=20(=E6=A0=87=E8=AF=86):=20=E4=BF=AE?= =?UTF-8?q?=E6=94=B9DealStrideSolution=E4=BB=93=E5=BA=93=E6=A0=87=E8=AF=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entry/src/main/ets/utils/CameraServiceOne.ets | 7 ------- .../entry/src/main/ets/utils/CameraServiceThree.ets | 4 ++-- .../entry/src/main/ets/utils/CameraServiceTwo.ets | 5 ++++- 3 files changed, 6 insertions(+), 10 deletions(-) diff --git a/DealStrideSolution/entry/src/main/ets/utils/CameraServiceOne.ets b/DealStrideSolution/entry/src/main/ets/utils/CameraServiceOne.ets index ef8d2f23..098d214f 100644 --- a/DealStrideSolution/entry/src/main/ets/utils/CameraServiceOne.ets +++ b/DealStrideSolution/entry/src/main/ets/utils/CameraServiceOne.ets @@ -42,20 +42,15 @@ class CameraService { } }; surfaceId: string = ''; - - // [Start onImageArrival_start] // [Start Case1_start] - // [Start Case2_start] onImageArrival(receiver: image.ImageReceiver): void { // [StartExclude Case1_start] - // [StartExclude Case2_start] receiver.on('imageArrival', () => { receiver.readNextImage((err: BusinessError, nextImage: image.Image) => { if (err || nextImage === undefined) { Logger.error(TAG, `requestPermissionsFromUser call Failed! error: ${err.code}`); return; } - // [EndExclude Case2_start] // [EndExclude Case1_start] if (nextImage) { nextImage.getComponent(image.ComponentType.JPEG, @@ -99,9 +94,7 @@ class CameraService { }); }) } - // [End Case2_start] // [End Case1_start] - // [End onImageArrival_start] getPreviewProfile(cameraOutputCapability: camera.CameraOutputCapability): camera.Profile | undefined { let previewProfiles = cameraOutputCapability.previewProfiles; diff --git a/DealStrideSolution/entry/src/main/ets/utils/CameraServiceThree.ets b/DealStrideSolution/entry/src/main/ets/utils/CameraServiceThree.ets index 8e0f6f9b..1932f7c8 100644 --- a/DealStrideSolution/entry/src/main/ets/utils/CameraServiceThree.ets +++ b/DealStrideSolution/entry/src/main/ets/utils/CameraServiceThree.ets @@ -42,7 +42,7 @@ class CameraService { } }; surfaceId: string = ''; - + // [Start onImageArrival_start] onImageArrival(receiver: image.ImageReceiver): void { receiver.on('imageArrival', () => { receiver.readNextImage((err: BusinessError, nextImage: image.Image) => { @@ -71,7 +71,7 @@ class CameraService { }); }) } - + // [End onImageArrival_start] getPreviewProfile(cameraOutputCapability: camera.CameraOutputCapability): camera.Profile | undefined { let previewProfiles = cameraOutputCapability.previewProfiles; if (previewProfiles.length < 1) { diff --git a/DealStrideSolution/entry/src/main/ets/utils/CameraServiceTwo.ets b/DealStrideSolution/entry/src/main/ets/utils/CameraServiceTwo.ets index 782596fc..1b0f536c 100644 --- a/DealStrideSolution/entry/src/main/ets/utils/CameraServiceTwo.ets +++ b/DealStrideSolution/entry/src/main/ets/utils/CameraServiceTwo.ets @@ -42,14 +42,16 @@ class CameraService { } }; surfaceId: string = ''; - + // [Start Case2_start] onImageArrival(receiver: image.ImageReceiver): void { receiver.on('imageArrival', () => { receiver.readNextImage((err: BusinessError, nextImage: image.Image) => { + // [StartExclude Case2_start] if (err || nextImage === undefined) { Logger.error(TAG, `requestPermissionsFromUser call Failed! error: ${err.code}`); return; } + // [EndExclude Case2_start] if (nextImage) { nextImage.getComponent(image.ComponentType.JPEG, async (_err, component: image.Component) => { let width = 1080; // Application create preview stream resolution corresponding to the width @@ -85,6 +87,7 @@ class CameraService { }); }) } + // [End Case2_start] getPreviewProfile(cameraOutputCapability: camera.CameraOutputCapability): camera.Profile | undefined { let previewProfiles = cameraOutputCapability.previewProfiles; -- Gitee