diff --git a/code/DocsSample/Media/Image/ImageEffect/README.md b/code/DocsSample/Media/Image/ImageEffect/README.md index 9b092ba8b9702615b023d6e2759b0cf3b21edb8a..6420cb5cfff8e46b1ae8c154e16e60904a3660da 100644 --- a/code/DocsSample/Media/Image/ImageEffect/README.md +++ b/code/DocsSample/Media/Image/ImageEffect/README.md @@ -79,10 +79,9 @@ entry/src/ohosTest/ets/ ## 约束和限制 1. 本示例支持标准系统上运行，支持设备：RK3568; -2. 本示例支持API12版本SDK，版本号：5.0.0.71； +2. 本示例支持API14版本SDK，版本号：5.0.2.57； 3. 本示例已支持使DevEco Studio 5.0.1 Release (构建版本：5.0.5.306，构建 2024年12月6日)编译运行 4. 本示例涉及系统相机，由相机功能异常导致的OHNativeWindow场景无画面问题，可通过更换相机功能正常的镜像解决。 -5. 本示例在RK3568开发板API14及以上版本的镜像中，存在界面卡顿现象，实际功能与自动化测试用例均可正常运行。 ## 下载 diff --git a/code/DocsSample/Media/Image/ImageEffect/build-profile.json5 b/code/DocsSample/Media/Image/ImageEffect/build-profile.json5 index ce24e79a265066f1e3309c112faa82851138e0a9..ff26e9971549d3bcec8a78c7fa5e3b68accdd6d1 100644 --- a/code/DocsSample/Media/Image/ImageEffect/build-profile.json5 +++ b/code/DocsSample/Media/Image/ImageEffect/build-profile.json5 @@ -19,9 +19,9 @@ { "name": "default", "signingConfig": "default", - "compileSdkVersion": 12, - "compatibleSdkVersion": 12, - "targetSdkVersion": 12, + "compileSdkVersion": 14, + "compatibleSdkVersion": 14, + "targetSdkVersion": 14, "runtimeOS": "OpenHarmony" } ], diff --git a/code/DocsSample/Media/Image/ImageEffect/entry/src/main/ets/pages/ImageEditPage.ets b/code/DocsSample/Media/Image/ImageEffect/entry/src/main/ets/pages/ImageEditPage.ets index 9fc7adca86193321119a465ce3e90f89354ad67c..dde0a01bf36c14e7d08d1cf6709cb82bd6bba0fb 100644 --- a/code/DocsSample/Media/Image/ImageEffect/entry/src/main/ets/pages/ImageEditPage.ets +++ b/code/DocsSample/Media/Image/ImageEffect/entry/src/main/ets/pages/ImageEditPage.ets @@ -312,12 +312,12 @@ struct ImageEditPage { private confirmInfo() { this.filterOptions = []; - if (this.brightnessSelect) { + if (this.brightnessSelect && this.inputType != 'URI') { let brightnessArray: (string | number)[] = []; brightnessArray.push('Brightness', this.brightnessSetValue); this.filterOptions.push(brightnessArray); } - if (this.contrastSelect) { + if (this.contrastSelect && this.inputType != 'URI') { let contrastArray: (string | number)[] = []; contrastArray.push('Contrast', this.contrastSetValue); this.filterOptions.push(contrastArray); @@ -444,94 +444,98 @@ struct CustomDialogExample { Row() { Column() { - Flex({ justifyContent: FlexAlign.Start, alignItems: ItemAlign.Center }) { - Checkbox({ name: 'brightnessCheckbox', group: 'filterCheckboxGroup' }) - .selectedColor(0x39a2db) - .select(this.brightnessSelect) - .onChange((value: boolean) => { - this.brightnessSelect = value; - }) - .width($r('app.float.check_box_width')) - .height($r('app.float.check_box_height')) - .id('checkbox_brightness') - Text('Brightness').fontSize($r('app.float.filter_text_size')).width('18%') - Slider({ - value: this.brightnessSetValue, - min: VALUE_MIN_MINUS, - max: VALUE_MAX, - style: SliderStyle.OutSet - }) - .showTips(true, this.brightnessSetValue.toFixed()) - .onChange((value: number, mode: SliderChangeMode) => { - this.brightnessSetValue = value; - console.info('value:' + value + 'mode:' + mode.toString()); + if (this.inputType != 'URI') { + Flex({ justifyContent: FlexAlign.Start, alignItems: ItemAlign.Center }) { + Checkbox({ name: 'brightnessCheckbox', group: 'filterCheckboxGroup' }) + .selectedColor(0x39a2db) + .select(this.brightnessSelect) + .onChange((value: boolean) => { + this.brightnessSelect = value; + }) + .width($r('app.float.check_box_width')) + .height($r('app.float.check_box_height')) + .id('checkbox_brightness') + Text('Brightness').fontSize($r('app.float.filter_text_size')).width('18%') + Slider({ + value: this.brightnessSetValue, + min: VALUE_MIN_MINUS, + max: VALUE_MAX, + style: SliderStyle.OutSet }) - .width('60%') - .id('slider_brightness') - // toFixed()将滑动条返回值处理为整数精度 - Column() { - Text(this.brightnessSetValue.toFixed()).fontSize($r('app.float.filter_number_size')) - }.width('8%') + .showTips(true, this.brightnessSetValue.toFixed()) + .onChange((value: number, mode: SliderChangeMode) => { + this.brightnessSetValue = value; + console.info('value:' + value + 'mode:' + mode.toString()); + }) + .width('60%') + .id('slider_brightness') + // toFixed()将滑动条返回值处理为整数精度 + Column() { + Text(this.brightnessSetValue.toFixed()).fontSize($r('app.float.filter_number_size')) + }.width('8%') - Column() { - Image($r('app.media.ic_public_search')) - .width('5%') - .height('3.7%') - }.bindMenu(this.filterInfoMenu, { - onAppear: () => { - this.doLookFilterInfo('Brightness'); - }, - onDisappear: () => { - this.filterInfo = ''; - } - }) - .margin({ left: $r('app.float.margin_left') }) - .id('btn_search_brightness') + Column() { + Image($r('app.media.ic_public_search')) + .width('5%') + .height('3.7%') + }.bindMenu(this.filterInfoMenu, { + onAppear: () => { + this.doLookFilterInfo('Brightness'); + }, + onDisappear: () => { + this.filterInfo = ''; + } + }) + .margin({ left: $r('app.float.margin_left') }) + .id('btn_search_brightness') + } } - Flex({ justifyContent: FlexAlign.Start, alignItems: ItemAlign.Center }) { - Checkbox({ name: 'contrastCheckbox', group: 'filterCheckboxGroup' }) - .selectedColor(0x39a2db) - .select(this.contrastSelect) - .onChange((value: boolean) => { - this.contrastSelect = value; - }) - .width($r('app.float.check_box_width')) - .height($r('app.float.check_box_height')) - .id('checkbox_contrast') - Text('Contrast').fontSize($r('app.float.filter_text_size')).width('18%') - Slider({ - value: this.contrastSetValue, - min: VALUE_MIN_MINUS, - max: VALUE_MAX, - style: SliderStyle.OutSet - }) - .showTips(true, this.contrastSetValue.toFixed()) - .onChange((value: number, mode: SliderChangeMode) => { - this.contrastSetValue = value; - console.info('value:' + value + 'mode:' + mode.toString()); + if (this.inputType != 'URI') { + Flex({ justifyContent: FlexAlign.Start, alignItems: ItemAlign.Center }) { + Checkbox({ name: 'contrastCheckbox', group: 'filterCheckboxGroup' }) + .selectedColor(0x39a2db) + .select(this.contrastSelect) + .onChange((value: boolean) => { + this.contrastSelect = value; + }) + .width($r('app.float.check_box_width')) + .height($r('app.float.check_box_height')) + .id('checkbox_contrast') + Text('Contrast').fontSize($r('app.float.filter_text_size')).width('18%') + Slider({ + value: this.contrastSetValue, + min: VALUE_MIN_MINUS, + max: VALUE_MAX, + style: SliderStyle.OutSet }) - .width('60%') - .id('slider_contrast') - // toFixed()将滑动条返回值处理为整数精度 - Column() { - Text(this.contrastSetValue.toFixed()).fontSize($r('app.float.filter_number_size')) - }.width('8%') + .showTips(true, this.contrastSetValue.toFixed()) + .onChange((value: number, mode: SliderChangeMode) => { + this.contrastSetValue = value; + console.info('value:' + value + 'mode:' + mode.toString()); + }) + .width('60%') + .id('slider_contrast') + // toFixed()将滑动条返回值处理为整数精度 + Column() { + Text(this.contrastSetValue.toFixed()).fontSize($r('app.float.filter_number_size')) + }.width('8%') - Column() { - Image($r('app.media.ic_public_search')) - .width('5%') - .height('3.7%') - }.bindMenu(this.filterInfoMenu, { - onAppear: () => { - this.doLookFilterInfo('Contrast'); - }, - onDisappear: () => { - this.filterInfo = ''; - } - }) - .margin({ left: $r('app.float.margin_left') }) - .id('btn_search_contrast') + Column() { + Image($r('app.media.ic_public_search')) + .width('5%') + .height('3.7%') + }.bindMenu(this.filterInfoMenu, { + onAppear: () => { + this.doLookFilterInfo('Contrast'); + }, + onDisappear: () => { + this.filterInfo = ''; + } + }) + .margin({ left: $r('app.float.margin_left') }) + .id('btn_search_contrast') + } } if (this.inputType != 'NativeBuffer' && this.inputType != 'NativeWindow') { diff --git a/code/DocsSample/Media/Image/ImageEffect/screenshots/ImageEffect_FilterInfo.jpeg b/code/DocsSample/Media/Image/ImageEffect/screenshots/ImageEffect_FilterInfo.jpeg index c934fcff381c08a18025b7046081e1fb70d508f2..8a7fb829e15b2332705b9a54e01347e4c0062b53 100644 Binary files a/code/DocsSample/Media/Image/ImageEffect/screenshots/ImageEffect_FilterInfo.jpeg and b/code/DocsSample/Media/Image/ImageEffect/screenshots/ImageEffect_FilterInfo.jpeg differ diff --git a/code/DocsSample/Media/Image/ImageEffect/screenshots/ImageEffect_InputType.jpeg b/code/DocsSample/Media/Image/ImageEffect/screenshots/ImageEffect_InputType.jpeg index 6f2fe216f55d6797841319d678b29c47365b3001..2a3bdd0abb48d13e822bbb6da5ee360dfcd9f0f6 100644 Binary files a/code/DocsSample/Media/Image/ImageEffect/screenshots/ImageEffect_InputType.jpeg and b/code/DocsSample/Media/Image/ImageEffect/screenshots/ImageEffect_InputType.jpeg differ