From 291e078af07eb976f0b794cf4a3f2c70e13b0c40 Mon Sep 17 00:00:00 2001 From: rex <1491721419@qq.com> Date: Fri, 17 Oct 2025 20:29:46 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BA=9F=E5=BC=83=E6=8E=A5=E5=8F=A3=E5=A4=84?= =?UTF-8?q?=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/ets/view/InTabComponent.ets | 4 +- .../src/main/ets/view/SwitchTabComponent.ets | 2 +- GesturesConfictPractice/README.md | 6 +- .../ets/controller/AvSessionController.ets | 2 +- .../src/main/ets/utils/ImageUtil.ets | 6 +- HDRVivid/AVPlayer/README.md | 6 +- HDRVivid/AVPlayer/build-profile.json5 | 4 +- .../entry/src/main/ets/view/AVPlayer.ets | 69 ++++++++----------- .../main/ets/utils/audioplayer/MediaTools.ets | 2 +- 9 files changed, 43 insertions(+), 58 deletions(-) diff --git a/ArkUI/PureTabsExt/entry/src/main/ets/view/InTabComponent.ets b/ArkUI/PureTabsExt/entry/src/main/ets/view/InTabComponent.ets index dc7f7154..81999269 100644 --- a/ArkUI/PureTabsExt/entry/src/main/ets/view/InTabComponent.ets +++ b/ArkUI/PureTabsExt/entry/src/main/ets/view/InTabComponent.ets @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { AbilityConstant,Configuration } from "@kit.AbilityKit"; +import { AbilityConstant, common,Configuration } from "@kit.AbilityKit"; import { BusinessError } from '@kit.BasicServicesKit'; import { hilog } from "@kit.PerformanceAnalysisKit"; @@ -40,7 +40,7 @@ export default struct InTabComponent { } private async updateTabItems(){ - await this.getUIContext().getHostContext()?.resourceManager.getStringArrayValue($r('app.strarray.in_tabs_items')) + await this.getUIContext().getHostContext()?.resourceManager.getStringArrayValue($r('app.strarray.in_tabs_items').id) .then((strarray: string[]) => { this.tabItems = strarray; }) diff --git a/ArkUI/PureTabsExt/entry/src/main/ets/view/SwitchTabComponent.ets b/ArkUI/PureTabsExt/entry/src/main/ets/view/SwitchTabComponent.ets index 31699074..e2528a29 100644 --- a/ArkUI/PureTabsExt/entry/src/main/ets/view/SwitchTabComponent.ets +++ b/ArkUI/PureTabsExt/entry/src/main/ets/view/SwitchTabComponent.ets @@ -33,7 +33,7 @@ export default struct SwitchTabComponent { private async updateTabItems() { await this.getUIContext() - .getHostContext()?.resourceManager.getStringArrayValue($r('app.strarray.switch_tabs_items')) + .getHostContext()?.resourceManager.getStringArrayValue($r('app.strarray.switch_tabs_items').id) .then((strarray: string[]) => { this.tabItems = strarray; }) diff --git a/GesturesConfictPractice/README.md b/GesturesConfictPractice/README.md index 650d4375..d7d91f02 100644 --- a/GesturesConfictPractice/README.md +++ b/GesturesConfictPractice/README.md @@ -4,11 +4,11 @@ 本代码示例展示了多个组件嵌套时同时绑定手势事件，或者同一个组件同时绑定多个手势等场景下，手势冲突问题的解决。 -#### 使用说明 +### 使用说明 安装运行应用，进入应用首页，点击不同的按钮跳转到不同的手势场景示例。 -## 工程目录 +### 工程目录 ``` ├──entry/src/main/ets @@ -35,7 +35,7 @@ 不涉及 -## 约束与限制 +### 约束与限制 * 本示例仅支持标准系统上运行，支持设备：华为手机。 * HarmonyOS系统：HarmonyOS 5.0.5 Release及以上。 diff --git a/HDRVivid/AVPlayer/MediaService/src/main/ets/controller/AvSessionController.ets b/HDRVivid/AVPlayer/MediaService/src/main/ets/controller/AvSessionController.ets index cbbd01ae..693cea3b 100644 --- a/HDRVivid/AVPlayer/MediaService/src/main/ets/controller/AvSessionController.ets +++ b/HDRVivid/AVPlayer/MediaService/src/main/ets/controller/AvSessionController.ets @@ -80,7 +80,7 @@ export class AvSessionController { try { let metadata: avSession.AVMetadata = { assetId: `${curSource.index}`, - title: this.context?.resourceManager.getStringSync(curSource.name), + title: this.context?.resourceManager.getStringSync(curSource.name.id), mediaImage: imagePixMap, duration: duration }; diff --git a/HDRVivid/AVPlayer/MediaService/src/main/ets/utils/ImageUtil.ets b/HDRVivid/AVPlayer/MediaService/src/main/ets/utils/ImageUtil.ets index b268d315..73e46703 100644 --- a/HDRVivid/AVPlayer/MediaService/src/main/ets/utils/ImageUtil.ets +++ b/HDRVivid/AVPlayer/MediaService/src/main/ets/utils/ImageUtil.ets @@ -22,11 +22,7 @@ export class ImageUtil { public static async getPixmapFromMedia(resource: Resource, UIContext: UIContext) { let unit8Array: Uint8Array | undefined = undefined; try { - unit8Array = await UIContext.getHostContext()?.resourceManager?.getMediaContent({ - bundleName: resource.bundleName, - moduleName: resource.moduleName, - id: resource.id - }); + unit8Array = await UIContext.getHostContext()?.resourceManager?.getMediaContent(resource.id); } catch (error) { Logger.error(`getMediaContent failed Cause: ${JSON.stringify(error)}`); } diff --git a/HDRVivid/AVPlayer/README.md b/HDRVivid/AVPlayer/README.md index 944700ac..b7beb422 100644 --- a/HDRVivid/AVPlayer/README.md +++ b/HDRVivid/AVPlayer/README.md @@ -65,11 +65,11 @@ 1. 本示例仅支持标准系统上运行，支持设备：华为手机。 -2. HarmonyOS系统：HarmonyOS 5.0.5 Release及以上。 +2. HarmonyOS系统：HarmonyOS 6.0.0 Release及以上。 -3. DevEco Studio版本：DevEco Studio 5.0.5 Release及以上。 +3. DevEco Studio版本：DevEco Studio 6.0.0 Release及以上。 -4. HarmonyOS SDK版本：HarmonyOS 5.0.5 Release SDK及以上。 +4. HarmonyOS SDK版本：HarmonyOS 6.0.0 Release SDK及以上。 ### 下载 diff --git a/HDRVivid/AVPlayer/build-profile.json5 b/HDRVivid/AVPlayer/build-profile.json5 index c564392d..748ebf8f 100644 --- a/HDRVivid/AVPlayer/build-profile.json5 +++ b/HDRVivid/AVPlayer/build-profile.json5 @@ -5,8 +5,8 @@ { "name": "default", "signingConfig": "default", - "compatibleSdkVersion": "5.0.5(17)", - "targetSdkVersion": "5.0.5(17)", + "compatibleSdkVersion": "6.0.0(20)", + "targetSdkVersion": "6.0.0(20)", "runtimeOS": "HarmonyOS", } ], diff --git a/HDRVivid/AVPlayer/entry/src/main/ets/view/AVPlayer.ets b/HDRVivid/AVPlayer/entry/src/main/ets/view/AVPlayer.ets index 5d1a6ab0..79d52674 100644 --- a/HDRVivid/AVPlayer/entry/src/main/ets/view/AVPlayer.ets +++ b/HDRVivid/AVPlayer/entry/src/main/ets/view/AVPlayer.ets @@ -96,38 +96,25 @@ export struct VideoPlayer { let audioManager = audio.getAudioManager(); let audioVolumeManger: audio.AudioVolumeManager = audioManager.getVolumeManager(); + try { + this.volume = audioVolumeManger.getVolumeByStream(audio.StreamUsage.STREAM_USAGE_MOVIE); + + let maxNum = audioVolumeManger.getMaxVolumeByStream(audio.StreamUsage.STREAM_USAGE_MUSIC); + hilog.info(0x0000, 'AVPlayer', `Callback invoked to indicate that the maximum volume is obtained. ${maxNum}`); + + let minNum = audioVolumeManger.getMinVolumeByStream(audio.StreamUsage.STREAM_USAGE_MUSIC); + hilog.info(0x0000, 'AVPlayer', `Callback invoked to indicate that the maximum volume is obtained. ${minNum}`); + } catch (err) { + let error = err as BusinessError; + hilog.error(0x0000, 'AVPlayer', `code=${error.code}, message=${error.message}`); + } + audioVolumeManger.getVolumeGroupManager(groupId, (err: BusinessError, value: audio.AudioVolumeGroupManager) => { if (err) { hilog.error(0x0000, 'AVPlayer', `Failed to obtain the colume group infos list. ${err}`); return; } - let audioVolumeGroupManager = value; hilog.info(0x0000, 'AVPlayer', `Callback invoked to indicate that the volume group infos list is obtained.`); - - audioVolumeGroupManager.getVolume(audio.AudioVolumeType.MEDIA, (err: BusinessError, value: number) => { - if (err) { - hilog.error(0x0000, 'AVPlayer', `Failed to obtain the volume. ${err}`); - return; - } - this.volume = value; - hilog.info(0x0000, 'AVPlayer', `Callback invoked to indicate that the volume is obtained. ${value}`); - }); - - audioVolumeGroupManager.getMaxVolume(audio.AudioVolumeType.MEDIA, (err: BusinessError, value: number) => { - if (err) { - hilog.error(0x0000, 'AVPlayer', `Failed to obtain the maximum volume. ${err}`); - return; - } - hilog.info(0x0000, 'AVPlayer', `Callback invoked to indicate that the maximum volume is obtained. ${value}`); - }); - - audioVolumeGroupManager.getMinVolume(audio.AudioVolumeType.MEDIA, (err: BusinessError, value: number) => { - if (err) { - hilog.error(0x0000, 'AVPlayer', `Failed to obtain the minimum volume. ${err}`); - return; - } - hilog.info(0x0000, 'AVPlayer', `Callback invoked to indicate that the minimum volume is obtained. ${value}`); - }); }); } @@ -198,7 +185,7 @@ export struct VideoPlayer { .width(this.isFloatWindow ? $r('app.float.size_24') : $r('app.float.icon_size_large')) .aspectRatio(1) .visibility(this.isFullScreen || this.isFullLandscapeScreen || this.isFloatWindow ? - Visibility.Visible : Visibility.Hidden) + Visibility.Visible : Visibility.Hidden) Image($r('app.media.ic_video_menu_forward')) .monopolizeEvents(true) .width(this.isFloatWindow ? $r('app.float.size_24') : $r('app.float.icon_size_large')) @@ -307,7 +294,8 @@ export struct VideoPlayer { .onActionUpdate((event: GestureEvent) => { if (event.fingerList[0].globalX > (820 / 2)) { this.visible = true; - let curBrightness = this.screenBrightness - this.uiContext.vp2px(event.offsetY) / this.uiContext.vp2px(this.screenHeight); + let curBrightness = + this.screenBrightness - this.uiContext.vp2px(event.offsetY) / this.uiContext.vp2px(this.screenHeight); curBrightness = curBrightness >= 1.0 ? 1.0 : curBrightness; curBrightness = curBrightness <= 0.0 ? 0.0 : curBrightness; this.screenBrightness = curBrightness; @@ -458,7 +446,7 @@ export struct VideoPlayer { Column() { Row() { Image(this.avPlayerController.isPlaying ? $r('sys.media.ohos_ic_public_pause') : - $r('app.media.ic_video_menu_play')) + $r('app.media.ic_video_menu_play')) .width($r('app.float.size_24')) .height($r('app.float.size_24')) .fillColor(Color.White) @@ -488,12 +476,13 @@ export struct VideoPlayer { .zIndex(CommonConstants.SLIDER_INDEX) .onAreaChange(() => { try { - let videoSlider: componentUtils.ComponentInfo = this.getUIContext().getComponentUtils().getRectangleById('video_slider'); + let videoSlider: componentUtils.ComponentInfo = + this.getUIContext().getComponentUtils().getRectangleById('video_slider'); this.slideWidth = this.uiContext.px2vp(videoSlider.size.width); this.offsetY = this.uiContext.px2vp(videoSlider.localOffset.y); this.beginX = this.uiContext.px2vp(videoSlider.localOffset.x); } catch (error) { - hilog.error(0x0000, 'testTag',`getRectangleById failed, Code:${error.code}, message:${error.message}`); + hilog.error(0x0000, 'testTag', `getRectangleById failed, Code:${error.code}, message:${error.message}`); } }) .onChange((value: number, mode: SliderChangeMode) => { @@ -571,14 +560,14 @@ export struct VideoPlayer { let context = this.uiContext.getHostContext() as common.UIAbilityContext; await window.getLastWindow(context) .then((windowClass: window.Window) => { - windowClass.setWindowKeepScreenOn(false) + windowClass.setWindowKeepScreenOn(false) .catch((err: BusinessError) => { - hilog.error(0x0000, 'testTag',`setWindowKeepScreenOn failed, Code:${err.code}, message:${err.message}`); + hilog.error(0x0000, 'testTag', `setWindowKeepScreenOn failed, Code:${err.code}, message:${err.message}`); }) }) - .catch((err: BusinessError) => { - hilog.error(0x0000, 'testTag',`getLastWindow failed, Code:${err.code}, message:${err.message}`); - }) + .catch((err: BusinessError) => { + hilog.error(0x0000, 'testTag', `getLastWindow failed, Code:${err.code}, message:${err.message}`); + }) return; } if (this.avPlayerController.isReady === true) { @@ -601,12 +590,12 @@ export struct VideoPlayer { await window.getLastWindow(context) .then((windowClass: window.Window) => { windowClass.setWindowKeepScreenOn(true) - .catch((err: BusinessError) => { - hilog.error(0x0000, 'testTag',`setWindowKeepScreenOn failed, Code:${err.code}, message:${err.message}`); - }) + .catch((err: BusinessError) => { + hilog.error(0x0000, 'testTag', `setWindowKeepScreenOn failed, Code:${err.code}, message:${err.message}`); + }) }) .catch((err: BusinessError) => { - hilog.error(0x0000, 'testTag',`getLastWindow failed, Code:${err.code}, message:${err.message}`); + hilog.error(0x0000, 'testTag', `getLastWindow failed, Code:${err.code}, message:${err.message}`); }) } diff --git a/XiaoyiAgentDemo/entry/src/main/ets/utils/audioplayer/MediaTools.ets b/XiaoyiAgentDemo/entry/src/main/ets/utils/audioplayer/MediaTools.ets index bfe8d509..3a9bc05c 100644 --- a/XiaoyiAgentDemo/entry/src/main/ets/utils/audioplayer/MediaTools.ets +++ b/XiaoyiAgentDemo/entry/src/main/ets/utils/audioplayer/MediaTools.ets @@ -24,7 +24,7 @@ export class MediaTools { name: resourceManager.Resource): Promise { let resourceMgr = context.resourceManager; let fileData: Uint8Array | null = null; - resourceMgr.getMediaContent(name) + resourceMgr.getMediaContent(name.id) .then((data: Uint8Array) => { fileData = data; }) -- Gitee