From 21eecf51e177c4e44ea955ff24ddb262b515b291 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BD=99=E5=A4=A7=E4=BE=A0?= <794397348@qq.com> Date: Thu, 22 May 2025 18:25:41 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E9=B8=BF=E8=92=99=E4=B8=96=E7=95=8C?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=95=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- MediaService/BuildProfile.ets | 17 ++++ audiointeractionlibrary/BuildProfile.ets | 17 ++++ audiointeractionlibrary/Index.ets | 1 + audiointeractionlibrary/build-profile.json5 | 31 +++++++ audiointeractionlibrary/consumer-rules.txt | 0 audiointeractionlibrary/hvigorfile.ts | 6 ++ audiointeractionlibrary/obfuscation-rules.txt | 23 ++++++ audiointeractionlibrary/oh-package.json5 | 9 +++ .../common/constants/BreakpointConstants.ets | 0 .../ets/common/constants/ContentConstants.ets | 0 .../ets/common/constants/PlayerConstants.ets | 0 .../ets/common/constants/RouterConstants.ets | 0 .../ets/common/constants/StyleConstants.ets | 0 .../ets/common/utils/BreakpointSystem.ets | 0 .../main/ets/common/utils/ColorConversion.ets | 0 .../ets/common/utils/ResourceConversion.ets | 0 .../src/main/ets/common/utils/WindowUtil.ets | 76 ++++++++++++++++++ .../ets/components/ControlAreaComponent.ets | 0 .../main/ets/components/LyricsComponent.ets | 0 .../ets/components/MusicInfoComponent.ets | 0 .../ets/components/PlayerInfoComponent.ets | 0 .../main/ets/components/TopAreaComponent.ets | 0 .../main/ets/datasource/SongDataSource.ets | 0 .../src/main/ets/datasource/SongListData.ets | 0 .../src/main/ets/lyric/LrcEntry.ets | 0 .../src/main/ets/lyric/LrcUtils.ets | 0 .../src/main/ets/lyric/LrcView.ets | 0 .../src/main/ets/lyric/LyricConst.ets | 0 .../main/ets/pages/AudioInteractionPage.ets | 4 +- .../src/main/ets/pages/PlayerPage.ets | 6 +- audiointeractionlibrary/src/main/module.json5 | 11 +++ .../main/resources/base/element/color.json | 0 .../main/resources/base/element/float.json | 0 .../main/resources/base/element/string.json | 0 .../src/main/resources/base/media/heart.svg | 2 +- .../main/resources/base/media/heart_fill.svg | 2 +- .../main/resources/base/media/ic_avatar1.png | Bin .../main/resources/base/media/ic_avatar10.png | Bin .../main/resources/base/media/ic_avatar11.png | Bin .../main/resources/base/media/ic_avatar12.png | Bin .../main/resources/base/media/ic_avatar13.png | Bin .../main/resources/base/media/ic_avatar14.png | Bin .../main/resources/base/media/ic_avatar15.png | Bin .../main/resources/base/media/ic_avatar16.png | Bin .../main/resources/base/media/ic_avatar17.png | Bin .../main/resources/base/media/ic_avatar2.png | Bin .../main/resources/base/media/ic_avatar4.png | Bin .../main/resources/base/media/ic_avatar5.png | Bin .../main/resources/base/media/ic_avatar6.png | Bin .../main/resources/base/media/ic_avatar8.png | Bin .../main/resources/base/media/ic_avatar9.png | Bin .../main/resources/base/media/ic_dream.png | Bin .../resources/base/media/ic_music_icon.png | Bin .../resources/base/media/ic_music_list.svg | 0 .../base/media/ic_public_forward.svg | 0 .../resources/base/media/ic_public_next.svg | 0 .../resources/base/media/ic_public_pause.svg | 0 .../resources/base/media/ic_public_play.svg | 0 .../src/main/resources/base/media/ic_ring.svg | 0 .../src/main/resources/base/media/ic_sq.svg | 0 .../src/main/resources/base/media/ic_vip.svg | 0 .../src/main/resources/base/media/icon.png | Bin .../main/resources/base/media/order_play.svg | 2 +- .../main/resources/base/media/repeat_1.svg | 2 +- .../src/main/resources/base/media/shuffle.svg | 2 +- .../src/main/resources/base/media/silence.svg | 0 .../resources/base/profile/route_map.json | 0 .../main/resources/en_US/element/string.json | 0 .../rawfile/Delacey - Dream It Possible.flac | Bin .../rawfile/Delacey - Dream It Possible.pcm | Bin .../src/main/resources/rawfile/boisterous.pcm | Bin .../src/main/resources/rawfile/boisterous.wav | Bin .../rawfile/lrcfiles/DreamItPossible.lrc | 0 .../src/main/resources/rawfile/power.pcm | Bin .../src/main/resources/rawfile/power.wav | Bin .../src/main/resources/rawfile/world.pcm | Bin .../src/main/resources/rawfile/world.wav | Bin .../main/resources/zh_CN/element/string.json | 0 .../build-profile.json5 | 0 .../hvigorfile.ts | 0 .../obfuscation-rules.txt | 0 .../oh-package.json5 | 5 +- .../AudioInteractionsampleAbility.ets | 4 +- .../entrybackupability/EntryBackupAbility.ets | 0 .../src/main/ets/pages/Index.ets | 36 +++++++++ .../src/main/module.json5 | 4 +- .../resources/base/profile/backup_config.json | 0 .../resources/base/profile/main_pages.json | 0 88 files changed, 243 insertions(+), 17 deletions(-) create mode 100644 MediaService/BuildProfile.ets create mode 100644 audiointeractionlibrary/BuildProfile.ets create mode 100644 audiointeractionlibrary/Index.ets create mode 100644 audiointeractionlibrary/build-profile.json5 create mode 100644 audiointeractionlibrary/consumer-rules.txt create mode 100644 audiointeractionlibrary/hvigorfile.ts create mode 100644 audiointeractionlibrary/obfuscation-rules.txt create mode 100644 audiointeractionlibrary/oh-package.json5 rename {entry => audiointeractionlibrary}/src/main/ets/common/constants/BreakpointConstants.ets (100%) rename {entry => audiointeractionlibrary}/src/main/ets/common/constants/ContentConstants.ets (100%) rename {entry => audiointeractionlibrary}/src/main/ets/common/constants/PlayerConstants.ets (100%) rename {entry => audiointeractionlibrary}/src/main/ets/common/constants/RouterConstants.ets (100%) rename {entry => audiointeractionlibrary}/src/main/ets/common/constants/StyleConstants.ets (100%) rename {entry => audiointeractionlibrary}/src/main/ets/common/utils/BreakpointSystem.ets (100%) rename {entry => audiointeractionlibrary}/src/main/ets/common/utils/ColorConversion.ets (100%) rename {entry => audiointeractionlibrary}/src/main/ets/common/utils/ResourceConversion.ets (100%) create mode 100644 audiointeractionlibrary/src/main/ets/common/utils/WindowUtil.ets rename {entry => audiointeractionlibrary}/src/main/ets/components/ControlAreaComponent.ets (100%) rename {entry => audiointeractionlibrary}/src/main/ets/components/LyricsComponent.ets (100%) rename {entry => audiointeractionlibrary}/src/main/ets/components/MusicInfoComponent.ets (100%) rename {entry => audiointeractionlibrary}/src/main/ets/components/PlayerInfoComponent.ets (100%) rename {entry => audiointeractionlibrary}/src/main/ets/components/TopAreaComponent.ets (100%) rename {entry => audiointeractionlibrary}/src/main/ets/datasource/SongDataSource.ets (100%) rename {entry => audiointeractionlibrary}/src/main/ets/datasource/SongListData.ets (100%) rename {entry => audiointeractionlibrary}/src/main/ets/lyric/LrcEntry.ets (100%) rename {entry => audiointeractionlibrary}/src/main/ets/lyric/LrcUtils.ets (100%) rename {entry => audiointeractionlibrary}/src/main/ets/lyric/LrcView.ets (100%) rename {entry => audiointeractionlibrary}/src/main/ets/lyric/LyricConst.ets (100%) rename entry/src/main/ets/pages/Root.ets => audiointeractionlibrary/src/main/ets/pages/AudioInteractionPage.ets (83%) rename {entry => audiointeractionlibrary}/src/main/ets/pages/PlayerPage.ets (82%) create mode 100644 audiointeractionlibrary/src/main/module.json5 rename {entry => audiointeractionlibrary}/src/main/resources/base/element/color.json (100%) rename {entry => audiointeractionlibrary}/src/main/resources/base/element/float.json (100%) rename {entry => audiointeractionlibrary}/src/main/resources/base/element/string.json (100%) rename {entry => audiointeractionlibrary}/src/main/resources/base/media/heart.svg (99%) rename {entry => audiointeractionlibrary}/src/main/resources/base/media/heart_fill.svg (99%) rename {entry => audiointeractionlibrary}/src/main/resources/base/media/ic_avatar1.png (100%) rename {entry => audiointeractionlibrary}/src/main/resources/base/media/ic_avatar10.png (100%) rename {entry => audiointeractionlibrary}/src/main/resources/base/media/ic_avatar11.png (100%) rename {entry => audiointeractionlibrary}/src/main/resources/base/media/ic_avatar12.png (100%) rename {entry => audiointeractionlibrary}/src/main/resources/base/media/ic_avatar13.png (100%) rename {entry => audiointeractionlibrary}/src/main/resources/base/media/ic_avatar14.png (100%) rename {entry => audiointeractionlibrary}/src/main/resources/base/media/ic_avatar15.png (100%) rename {entry => audiointeractionlibrary}/src/main/resources/base/media/ic_avatar16.png (100%) rename {entry => audiointeractionlibrary}/src/main/resources/base/media/ic_avatar17.png (100%) rename {entry => audiointeractionlibrary}/src/main/resources/base/media/ic_avatar2.png (100%) rename {entry => audiointeractionlibrary}/src/main/resources/base/media/ic_avatar4.png (100%) rename {entry => audiointeractionlibrary}/src/main/resources/base/media/ic_avatar5.png (100%) rename {entry => audiointeractionlibrary}/src/main/resources/base/media/ic_avatar6.png (100%) rename {entry => audiointeractionlibrary}/src/main/resources/base/media/ic_avatar8.png (100%) rename {entry => audiointeractionlibrary}/src/main/resources/base/media/ic_avatar9.png (100%) rename {entry => audiointeractionlibrary}/src/main/resources/base/media/ic_dream.png (100%) rename {entry => audiointeractionlibrary}/src/main/resources/base/media/ic_music_icon.png (100%) rename {entry => audiointeractionlibrary}/src/main/resources/base/media/ic_music_list.svg (100%) rename {entry => audiointeractionlibrary}/src/main/resources/base/media/ic_public_forward.svg (100%) rename {entry => audiointeractionlibrary}/src/main/resources/base/media/ic_public_next.svg (100%) rename {entry => audiointeractionlibrary}/src/main/resources/base/media/ic_public_pause.svg (100%) rename {entry => audiointeractionlibrary}/src/main/resources/base/media/ic_public_play.svg (100%) rename {entry => audiointeractionlibrary}/src/main/resources/base/media/ic_ring.svg (100%) rename {entry => audiointeractionlibrary}/src/main/resources/base/media/ic_sq.svg (100%) rename {entry => audiointeractionlibrary}/src/main/resources/base/media/ic_vip.svg (100%) rename {entry => audiointeractionlibrary}/src/main/resources/base/media/icon.png (100%) rename {entry => audiointeractionlibrary}/src/main/resources/base/media/order_play.svg (99%) rename {entry => audiointeractionlibrary}/src/main/resources/base/media/repeat_1.svg (99%) rename {entry => audiointeractionlibrary}/src/main/resources/base/media/shuffle.svg (99%) rename {entry => audiointeractionlibrary}/src/main/resources/base/media/silence.svg (100%) rename {entry => audiointeractionlibrary}/src/main/resources/base/profile/route_map.json (100%) rename {entry => audiointeractionlibrary}/src/main/resources/en_US/element/string.json (100%) rename {entry => audiointeractionlibrary}/src/main/resources/rawfile/Delacey - Dream It Possible.flac (100%) rename {entry => audiointeractionlibrary}/src/main/resources/rawfile/Delacey - Dream It Possible.pcm (100%) rename {entry => audiointeractionlibrary}/src/main/resources/rawfile/boisterous.pcm (100%) rename {entry => audiointeractionlibrary}/src/main/resources/rawfile/boisterous.wav (100%) rename {entry => audiointeractionlibrary}/src/main/resources/rawfile/lrcfiles/DreamItPossible.lrc (100%) rename {entry => audiointeractionlibrary}/src/main/resources/rawfile/power.pcm (100%) rename {entry => audiointeractionlibrary}/src/main/resources/rawfile/power.wav (100%) rename {entry => audiointeractionlibrary}/src/main/resources/rawfile/world.pcm (100%) rename {entry => audiointeractionlibrary}/src/main/resources/rawfile/world.wav (100%) rename {entry => audiointeractionlibrary}/src/main/resources/zh_CN/element/string.json (100%) rename {entry => audiointeractionsample}/build-profile.json5 (100%) rename {entry => audiointeractionsample}/hvigorfile.ts (100%) rename {entry => audiointeractionsample}/obfuscation-rules.txt (100%) rename {entry => audiointeractionsample}/oh-package.json5 (84%) rename entry/src/main/ets/entryability/EntryAbility.ets => audiointeractionsample/src/main/ets/entryability/AudioInteractionsampleAbility.ets (96%) rename {entry => audiointeractionsample}/src/main/ets/entrybackupability/EntryBackupAbility.ets (100%) create mode 100644 audiointeractionsample/src/main/ets/pages/Index.ets rename {entry => audiointeractionsample}/src/main/module.json5 (96%) rename {entry => audiointeractionsample}/src/main/resources/base/profile/backup_config.json (100%) rename {entry => audiointeractionsample}/src/main/resources/base/profile/main_pages.json (100%) diff --git a/MediaService/BuildProfile.ets b/MediaService/BuildProfile.ets new file mode 100644 index 0000000..3a501e5 --- /dev/null +++ b/MediaService/BuildProfile.ets @@ -0,0 +1,17 @@ +/** + * Use these variables when you tailor your ArkTS code. They must be of the const type. + */ +export const HAR_VERSION = '1.0.0'; +export const BUILD_MODE_NAME = 'debug'; +export const DEBUG = true; +export const TARGET_NAME = 'default'; + +/** + * BuildProfile Class is used only for compatibility purposes. + */ +export default class BuildProfile { + static readonly HAR_VERSION = HAR_VERSION; + static readonly BUILD_MODE_NAME = BUILD_MODE_NAME; + static readonly DEBUG = DEBUG; + static readonly TARGET_NAME = TARGET_NAME; +} \ No newline at end of file diff --git a/audiointeractionlibrary/BuildProfile.ets b/audiointeractionlibrary/BuildProfile.ets new file mode 100644 index 0000000..3a501e5 --- /dev/null +++ b/audiointeractionlibrary/BuildProfile.ets @@ -0,0 +1,17 @@ +/** + * Use these variables when you tailor your ArkTS code. They must be of the const type. + */ +export const HAR_VERSION = '1.0.0'; +export const BUILD_MODE_NAME = 'debug'; +export const DEBUG = true; +export const TARGET_NAME = 'default'; + +/** + * BuildProfile Class is used only for compatibility purposes. + */ +export default class BuildProfile { + static readonly HAR_VERSION = HAR_VERSION; + static readonly BUILD_MODE_NAME = BUILD_MODE_NAME; + static readonly DEBUG = DEBUG; + static readonly TARGET_NAME = TARGET_NAME; +} \ No newline at end of file diff --git a/audiointeractionlibrary/Index.ets b/audiointeractionlibrary/Index.ets new file mode 100644 index 0000000..42bf416 --- /dev/null +++ b/audiointeractionlibrary/Index.ets @@ -0,0 +1 @@ +export { MainPage } from './src/main/ets/components/MainPage'; diff --git a/audiointeractionlibrary/build-profile.json5 b/audiointeractionlibrary/build-profile.json5 new file mode 100644 index 0000000..e6773f9 --- /dev/null +++ b/audiointeractionlibrary/build-profile.json5 @@ -0,0 +1,31 @@ +{ + "apiType": "stageMode", + "buildOption": { + }, + "buildOptionSet": [ + { + "name": "release", + "arkOptions": { + "obfuscation": { + "ruleOptions": { + "enable": false, + "files": [ + "./obfuscation-rules.txt" + ] + }, + "consumerFiles": [ + "./consumer-rules.txt" + ] + } + }, + }, + ], + "targets": [ + { + "name": "default" + }, + { + "name": "ohosTest" + } + ] +} diff --git a/audiointeractionlibrary/consumer-rules.txt b/audiointeractionlibrary/consumer-rules.txt new file mode 100644 index 0000000..e69de29 diff --git a/audiointeractionlibrary/hvigorfile.ts b/audiointeractionlibrary/hvigorfile.ts new file mode 100644 index 0000000..4218707 --- /dev/null +++ b/audiointeractionlibrary/hvigorfile.ts @@ -0,0 +1,6 @@ +import { harTasks } from '@ohos/hvigor-ohos-plugin'; + +export default { + system: harTasks, /* Built-in plugin of Hvigor. It cannot be modified. */ + plugins:[] /* Custom plugin to extend the functionality of Hvigor. */ +} diff --git a/audiointeractionlibrary/obfuscation-rules.txt b/audiointeractionlibrary/obfuscation-rules.txt new file mode 100644 index 0000000..272efb6 --- /dev/null +++ b/audiointeractionlibrary/obfuscation-rules.txt @@ -0,0 +1,23 @@ +# Define project specific obfuscation rules here. +# You can include the obfuscation configuration files in the current module's build-profile.json5. +# +# For more details, see +# https://developer.huawei.com/consumer/cn/doc/harmonyos-guides-V5/source-obfuscation-V5 + +# Obfuscation options: +# -disable-obfuscation: disable all obfuscations +# -enable-property-obfuscation: obfuscate the property names +# -enable-toplevel-obfuscation: obfuscate the names in the global scope +# -compact: remove unnecessary blank spaces and all line feeds +# -remove-log: remove all console.* statements +# -print-namecache: print the name cache that contains the mapping from the old names to new names +# -apply-namecache: reuse the given cache file + +# Keep options: +# -keep-property-name: specifies property names that you want to keep +# -keep-global-name: specifies names that you want to keep in the global scope + +-enable-property-obfuscation +-enable-toplevel-obfuscation +-enable-filename-obfuscation +-enable-export-obfuscation \ No newline at end of file diff --git a/audiointeractionlibrary/oh-package.json5 b/audiointeractionlibrary/oh-package.json5 new file mode 100644 index 0000000..695244c --- /dev/null +++ b/audiointeractionlibrary/oh-package.json5 @@ -0,0 +1,9 @@ +{ + "name": "audiointeractionlibrary", + "version": "1.0.0", + "description": "Please describe the basic information.", + "main": "Index.ets", + "author": "", + "license": "Apache-2.0", + "dependencies": {} +} diff --git a/entry/src/main/ets/common/constants/BreakpointConstants.ets b/audiointeractionlibrary/src/main/ets/common/constants/BreakpointConstants.ets similarity index 100% rename from entry/src/main/ets/common/constants/BreakpointConstants.ets rename to audiointeractionlibrary/src/main/ets/common/constants/BreakpointConstants.ets diff --git a/entry/src/main/ets/common/constants/ContentConstants.ets b/audiointeractionlibrary/src/main/ets/common/constants/ContentConstants.ets similarity index 100% rename from entry/src/main/ets/common/constants/ContentConstants.ets rename to audiointeractionlibrary/src/main/ets/common/constants/ContentConstants.ets diff --git a/entry/src/main/ets/common/constants/PlayerConstants.ets b/audiointeractionlibrary/src/main/ets/common/constants/PlayerConstants.ets similarity index 100% rename from entry/src/main/ets/common/constants/PlayerConstants.ets rename to audiointeractionlibrary/src/main/ets/common/constants/PlayerConstants.ets diff --git a/entry/src/main/ets/common/constants/RouterConstants.ets b/audiointeractionlibrary/src/main/ets/common/constants/RouterConstants.ets similarity index 100% rename from entry/src/main/ets/common/constants/RouterConstants.ets rename to audiointeractionlibrary/src/main/ets/common/constants/RouterConstants.ets diff --git a/entry/src/main/ets/common/constants/StyleConstants.ets b/audiointeractionlibrary/src/main/ets/common/constants/StyleConstants.ets similarity index 100% rename from entry/src/main/ets/common/constants/StyleConstants.ets rename to audiointeractionlibrary/src/main/ets/common/constants/StyleConstants.ets diff --git a/entry/src/main/ets/common/utils/BreakpointSystem.ets b/audiointeractionlibrary/src/main/ets/common/utils/BreakpointSystem.ets similarity index 100% rename from entry/src/main/ets/common/utils/BreakpointSystem.ets rename to audiointeractionlibrary/src/main/ets/common/utils/BreakpointSystem.ets diff --git a/entry/src/main/ets/common/utils/ColorConversion.ets b/audiointeractionlibrary/src/main/ets/common/utils/ColorConversion.ets similarity index 100% rename from entry/src/main/ets/common/utils/ColorConversion.ets rename to audiointeractionlibrary/src/main/ets/common/utils/ColorConversion.ets diff --git a/entry/src/main/ets/common/utils/ResourceConversion.ets b/audiointeractionlibrary/src/main/ets/common/utils/ResourceConversion.ets similarity index 100% rename from entry/src/main/ets/common/utils/ResourceConversion.ets rename to audiointeractionlibrary/src/main/ets/common/utils/ResourceConversion.ets diff --git a/audiointeractionlibrary/src/main/ets/common/utils/WindowUtil.ets b/audiointeractionlibrary/src/main/ets/common/utils/WindowUtil.ets new file mode 100644 index 0000000..0e99803 --- /dev/null +++ b/audiointeractionlibrary/src/main/ets/common/utils/WindowUtil.ets @@ -0,0 +1,76 @@ +/* + * Copyright (c) 2024 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +import { window } from '@kit.ArkUI'; +import type { BusinessError } from '@kit.BasicServicesKit'; +import { BreakpointSystem } from './BreakpointSystem'; +import { hilog } from '@kit.PerformanceAnalysisKit'; + +const TAG: string = '[WindowUtil]'; + +export class WindowUtil { + public static requestFullScreen(windowStage: window.WindowStage): void { + windowStage.getMainWindow((err: BusinessError, data: window.Window) => { + if (err.code) { + return; + } + const windowClass: window.Window = data; + // Realize the immersive effect. + try { + const promise: Promise = windowClass.setWindowLayoutFullScreen(true); + promise.then(() => { + hilog.info(0x0000, TAG, 'Succeeded in setting the window layout to full-screen mode.'); + }).catch((err: BusinessError) => { + hilog.info(0x0000, TAG, + `Failed to set the window layout to full-screen mode. Cause: ${err.code}, ${err.message}`); + }); + } catch { + hilog.error(0x0000, TAG, 'Failed to set the window layout to full-screen mode. '); + } + }); + } + + public static registerBreakPoint(windowStage: window.WindowStage) { + windowStage.getMainWindow((err: BusinessError, data: window.Window) => { + if (err.code) { + hilog.error(0x0000, TAG, `Failed to get main window: ${err.message}`); + return; + } + let avoidArea = data.getWindowAvoidArea(window.AvoidAreaType.TYPE_NAVIGATION_INDICATOR); + let bottomRectHeight = avoidArea.bottomRect.height; + AppStorage.setOrCreate('bottomRectHeight', bottomRectHeight); + avoidArea = data.getWindowAvoidArea(window.AvoidAreaType.TYPE_SYSTEM); + let topRectHeight = avoidArea.topRect.height; + AppStorage.setOrCreate('topRectHeight', topRectHeight); + BreakpointSystem.getInstance().updateWidthBp(data); + data.on('windowSizeChange', () => BreakpointSystem.getInstance().onWindowSizeChange(data)); + data.on('avoidAreaChange', (avoidAreaOption) => { + if (avoidAreaOption.type === window.AvoidAreaType.TYPE_SYSTEM || + avoidAreaOption.type === window.AvoidAreaType.TYPE_NAVIGATION_INDICATOR) { + WindowUtil.setAvoidArea(avoidAreaOption.type, avoidAreaOption.area); + } + }); + }) + } + + // Get status bar height and indicator height. + public static setAvoidArea(type: window.AvoidAreaType, area: window.AvoidArea) { + if (type === window.AvoidAreaType.TYPE_SYSTEM) { + AppStorage.setOrCreate('statusBarHeight', px2vp(area.topRect.height)); + } else { + AppStorage.setOrCreate('naviIndicatorHeight', px2vp(area.bottomRect.height)); + } + } +} \ No newline at end of file diff --git a/entry/src/main/ets/components/ControlAreaComponent.ets b/audiointeractionlibrary/src/main/ets/components/ControlAreaComponent.ets similarity index 100% rename from entry/src/main/ets/components/ControlAreaComponent.ets rename to audiointeractionlibrary/src/main/ets/components/ControlAreaComponent.ets diff --git a/entry/src/main/ets/components/LyricsComponent.ets b/audiointeractionlibrary/src/main/ets/components/LyricsComponent.ets similarity index 100% rename from entry/src/main/ets/components/LyricsComponent.ets rename to audiointeractionlibrary/src/main/ets/components/LyricsComponent.ets diff --git a/entry/src/main/ets/components/MusicInfoComponent.ets b/audiointeractionlibrary/src/main/ets/components/MusicInfoComponent.ets similarity index 100% rename from entry/src/main/ets/components/MusicInfoComponent.ets rename to audiointeractionlibrary/src/main/ets/components/MusicInfoComponent.ets diff --git a/entry/src/main/ets/components/PlayerInfoComponent.ets b/audiointeractionlibrary/src/main/ets/components/PlayerInfoComponent.ets similarity index 100% rename from entry/src/main/ets/components/PlayerInfoComponent.ets rename to audiointeractionlibrary/src/main/ets/components/PlayerInfoComponent.ets diff --git a/entry/src/main/ets/components/TopAreaComponent.ets b/audiointeractionlibrary/src/main/ets/components/TopAreaComponent.ets similarity index 100% rename from entry/src/main/ets/components/TopAreaComponent.ets rename to audiointeractionlibrary/src/main/ets/components/TopAreaComponent.ets diff --git a/entry/src/main/ets/datasource/SongDataSource.ets b/audiointeractionlibrary/src/main/ets/datasource/SongDataSource.ets similarity index 100% rename from entry/src/main/ets/datasource/SongDataSource.ets rename to audiointeractionlibrary/src/main/ets/datasource/SongDataSource.ets diff --git a/entry/src/main/ets/datasource/SongListData.ets b/audiointeractionlibrary/src/main/ets/datasource/SongListData.ets similarity index 100% rename from entry/src/main/ets/datasource/SongListData.ets rename to audiointeractionlibrary/src/main/ets/datasource/SongListData.ets diff --git a/entry/src/main/ets/lyric/LrcEntry.ets b/audiointeractionlibrary/src/main/ets/lyric/LrcEntry.ets similarity index 100% rename from entry/src/main/ets/lyric/LrcEntry.ets rename to audiointeractionlibrary/src/main/ets/lyric/LrcEntry.ets diff --git a/entry/src/main/ets/lyric/LrcUtils.ets b/audiointeractionlibrary/src/main/ets/lyric/LrcUtils.ets similarity index 100% rename from entry/src/main/ets/lyric/LrcUtils.ets rename to audiointeractionlibrary/src/main/ets/lyric/LrcUtils.ets diff --git a/entry/src/main/ets/lyric/LrcView.ets b/audiointeractionlibrary/src/main/ets/lyric/LrcView.ets similarity index 100% rename from entry/src/main/ets/lyric/LrcView.ets rename to audiointeractionlibrary/src/main/ets/lyric/LrcView.ets diff --git a/entry/src/main/ets/lyric/LyricConst.ets b/audiointeractionlibrary/src/main/ets/lyric/LyricConst.ets similarity index 100% rename from entry/src/main/ets/lyric/LyricConst.ets rename to audiointeractionlibrary/src/main/ets/lyric/LyricConst.ets diff --git a/entry/src/main/ets/pages/Root.ets b/audiointeractionlibrary/src/main/ets/pages/AudioInteractionPage.ets similarity index 83% rename from entry/src/main/ets/pages/Root.ets rename to audiointeractionlibrary/src/main/ets/pages/AudioInteractionPage.ets index 5c23b25..1d1b65c 100644 --- a/entry/src/main/ets/pages/Root.ets +++ b/audiointeractionlibrary/src/main/ets/pages/AudioInteractionPage.ets @@ -13,8 +13,8 @@ * limitations under the License. */ -import { RouterConstants } from '../common/constants/RouterConstants'; -import { StyleConstants } from '../common/constants/StyleConstants'; +import { RouterConstants } from 'audiointeractionlibrary/src/main/ets/common/constants/RouterConstants'; +import { StyleConstants } from 'audiointeractionlibrary/src/main/ets/common/constants/StyleConstants'; @Entry @Component diff --git a/entry/src/main/ets/pages/PlayerPage.ets b/audiointeractionlibrary/src/main/ets/pages/PlayerPage.ets similarity index 82% rename from entry/src/main/ets/pages/PlayerPage.ets rename to audiointeractionlibrary/src/main/ets/pages/PlayerPage.ets index 6051c89..7923782 100644 --- a/entry/src/main/ets/pages/PlayerPage.ets +++ b/audiointeractionlibrary/src/main/ets/pages/PlayerPage.ets @@ -14,9 +14,9 @@ */ import { AudioRendererController } from '@ohos/MediaService'; -import { songList } from '../datasource/SongListData'; -import { BreakpointSystem } from '../common/utils/BreakpointSystem'; -import { PlayerInfoComponent } from '../components/PlayerInfoComponent'; +import { songList } from 'audiointeractionlibrary/src/main/ets/datasource/SongListData'; +import { BreakpointSystem } from 'audiointeractionlibrary/src/main/ets/common/utils/BreakpointSystem'; +import { PlayerInfoComponent } from 'audiointeractionlibrary/src/main/ets/components/PlayerInfoComponent'; @Builder export function PlayerPageBuilder() { diff --git a/audiointeractionlibrary/src/main/module.json5 b/audiointeractionlibrary/src/main/module.json5 new file mode 100644 index 0000000..4af755e --- /dev/null +++ b/audiointeractionlibrary/src/main/module.json5 @@ -0,0 +1,11 @@ +{ + "module": { + "name": "audiointeractionlibrary", + "type": "har", + "deviceTypes": [ + "default", + "tablet", + "2in1" + ] + } +} diff --git a/entry/src/main/resources/base/element/color.json b/audiointeractionlibrary/src/main/resources/base/element/color.json similarity index 100% rename from entry/src/main/resources/base/element/color.json rename to audiointeractionlibrary/src/main/resources/base/element/color.json diff --git a/entry/src/main/resources/base/element/float.json b/audiointeractionlibrary/src/main/resources/base/element/float.json similarity index 100% rename from entry/src/main/resources/base/element/float.json rename to audiointeractionlibrary/src/main/resources/base/element/float.json diff --git a/entry/src/main/resources/base/element/string.json b/audiointeractionlibrary/src/main/resources/base/element/string.json similarity index 100% rename from entry/src/main/resources/base/element/string.json rename to audiointeractionlibrary/src/main/resources/base/element/string.json diff --git a/entry/src/main/resources/base/media/heart.svg b/audiointeractionlibrary/src/main/resources/base/media/heart.svg similarity index 99% rename from entry/src/main/resources/base/media/heart.svg rename to audiointeractionlibrary/src/main/resources/base/media/heart.svg index de43b23..0cb86bd 100644 --- a/entry/src/main/resources/base/media/heart.svg +++ b/audiointeractionlibrary/src/main/resources/base/media/heart.svg @@ -1,2 +1,2 @@ - + \ No newline at end of file diff --git a/entry/src/main/resources/base/media/heart_fill.svg b/audiointeractionlibrary/src/main/resources/base/media/heart_fill.svg similarity index 99% rename from entry/src/main/resources/base/media/heart_fill.svg rename to audiointeractionlibrary/src/main/resources/base/media/heart_fill.svg index 7ea737d..93f2278 100644 --- a/entry/src/main/resources/base/media/heart_fill.svg +++ b/audiointeractionlibrary/src/main/resources/base/media/heart_fill.svg @@ -1,2 +1,2 @@ - + \ No newline at end of file diff --git a/entry/src/main/resources/base/media/ic_avatar1.png b/audiointeractionlibrary/src/main/resources/base/media/ic_avatar1.png similarity index 100% rename from entry/src/main/resources/base/media/ic_avatar1.png rename to audiointeractionlibrary/src/main/resources/base/media/ic_avatar1.png diff --git a/entry/src/main/resources/base/media/ic_avatar10.png b/audiointeractionlibrary/src/main/resources/base/media/ic_avatar10.png similarity index 100% rename from entry/src/main/resources/base/media/ic_avatar10.png rename to audiointeractionlibrary/src/main/resources/base/media/ic_avatar10.png diff --git a/entry/src/main/resources/base/media/ic_avatar11.png b/audiointeractionlibrary/src/main/resources/base/media/ic_avatar11.png similarity index 100% rename from entry/src/main/resources/base/media/ic_avatar11.png rename to audiointeractionlibrary/src/main/resources/base/media/ic_avatar11.png diff --git a/entry/src/main/resources/base/media/ic_avatar12.png b/audiointeractionlibrary/src/main/resources/base/media/ic_avatar12.png similarity index 100% rename from entry/src/main/resources/base/media/ic_avatar12.png rename to audiointeractionlibrary/src/main/resources/base/media/ic_avatar12.png diff --git a/entry/src/main/resources/base/media/ic_avatar13.png b/audiointeractionlibrary/src/main/resources/base/media/ic_avatar13.png similarity index 100% rename from entry/src/main/resources/base/media/ic_avatar13.png rename to audiointeractionlibrary/src/main/resources/base/media/ic_avatar13.png diff --git a/entry/src/main/resources/base/media/ic_avatar14.png b/audiointeractionlibrary/src/main/resources/base/media/ic_avatar14.png similarity index 100% rename from entry/src/main/resources/base/media/ic_avatar14.png rename to audiointeractionlibrary/src/main/resources/base/media/ic_avatar14.png diff --git a/entry/src/main/resources/base/media/ic_avatar15.png b/audiointeractionlibrary/src/main/resources/base/media/ic_avatar15.png similarity index 100% rename from entry/src/main/resources/base/media/ic_avatar15.png rename to audiointeractionlibrary/src/main/resources/base/media/ic_avatar15.png diff --git a/entry/src/main/resources/base/media/ic_avatar16.png b/audiointeractionlibrary/src/main/resources/base/media/ic_avatar16.png similarity index 100% rename from entry/src/main/resources/base/media/ic_avatar16.png rename to audiointeractionlibrary/src/main/resources/base/media/ic_avatar16.png diff --git a/entry/src/main/resources/base/media/ic_avatar17.png b/audiointeractionlibrary/src/main/resources/base/media/ic_avatar17.png similarity index 100% rename from entry/src/main/resources/base/media/ic_avatar17.png rename to audiointeractionlibrary/src/main/resources/base/media/ic_avatar17.png diff --git a/entry/src/main/resources/base/media/ic_avatar2.png b/audiointeractionlibrary/src/main/resources/base/media/ic_avatar2.png similarity index 100% rename from entry/src/main/resources/base/media/ic_avatar2.png rename to audiointeractionlibrary/src/main/resources/base/media/ic_avatar2.png diff --git a/entry/src/main/resources/base/media/ic_avatar4.png b/audiointeractionlibrary/src/main/resources/base/media/ic_avatar4.png similarity index 100% rename from entry/src/main/resources/base/media/ic_avatar4.png rename to audiointeractionlibrary/src/main/resources/base/media/ic_avatar4.png diff --git a/entry/src/main/resources/base/media/ic_avatar5.png b/audiointeractionlibrary/src/main/resources/base/media/ic_avatar5.png similarity index 100% rename from entry/src/main/resources/base/media/ic_avatar5.png rename to audiointeractionlibrary/src/main/resources/base/media/ic_avatar5.png diff --git a/entry/src/main/resources/base/media/ic_avatar6.png b/audiointeractionlibrary/src/main/resources/base/media/ic_avatar6.png similarity index 100% rename from entry/src/main/resources/base/media/ic_avatar6.png rename to audiointeractionlibrary/src/main/resources/base/media/ic_avatar6.png diff --git a/entry/src/main/resources/base/media/ic_avatar8.png b/audiointeractionlibrary/src/main/resources/base/media/ic_avatar8.png similarity index 100% rename from entry/src/main/resources/base/media/ic_avatar8.png rename to audiointeractionlibrary/src/main/resources/base/media/ic_avatar8.png diff --git a/entry/src/main/resources/base/media/ic_avatar9.png b/audiointeractionlibrary/src/main/resources/base/media/ic_avatar9.png similarity index 100% rename from entry/src/main/resources/base/media/ic_avatar9.png rename to audiointeractionlibrary/src/main/resources/base/media/ic_avatar9.png diff --git a/entry/src/main/resources/base/media/ic_dream.png b/audiointeractionlibrary/src/main/resources/base/media/ic_dream.png similarity index 100% rename from entry/src/main/resources/base/media/ic_dream.png rename to audiointeractionlibrary/src/main/resources/base/media/ic_dream.png diff --git a/entry/src/main/resources/base/media/ic_music_icon.png b/audiointeractionlibrary/src/main/resources/base/media/ic_music_icon.png similarity index 100% rename from entry/src/main/resources/base/media/ic_music_icon.png rename to audiointeractionlibrary/src/main/resources/base/media/ic_music_icon.png diff --git a/entry/src/main/resources/base/media/ic_music_list.svg b/audiointeractionlibrary/src/main/resources/base/media/ic_music_list.svg similarity index 100% rename from entry/src/main/resources/base/media/ic_music_list.svg rename to audiointeractionlibrary/src/main/resources/base/media/ic_music_list.svg diff --git a/entry/src/main/resources/base/media/ic_public_forward.svg b/audiointeractionlibrary/src/main/resources/base/media/ic_public_forward.svg similarity index 100% rename from entry/src/main/resources/base/media/ic_public_forward.svg rename to audiointeractionlibrary/src/main/resources/base/media/ic_public_forward.svg diff --git a/entry/src/main/resources/base/media/ic_public_next.svg b/audiointeractionlibrary/src/main/resources/base/media/ic_public_next.svg similarity index 100% rename from entry/src/main/resources/base/media/ic_public_next.svg rename to audiointeractionlibrary/src/main/resources/base/media/ic_public_next.svg diff --git a/entry/src/main/resources/base/media/ic_public_pause.svg b/audiointeractionlibrary/src/main/resources/base/media/ic_public_pause.svg similarity index 100% rename from entry/src/main/resources/base/media/ic_public_pause.svg rename to audiointeractionlibrary/src/main/resources/base/media/ic_public_pause.svg diff --git a/entry/src/main/resources/base/media/ic_public_play.svg b/audiointeractionlibrary/src/main/resources/base/media/ic_public_play.svg similarity index 100% rename from entry/src/main/resources/base/media/ic_public_play.svg rename to audiointeractionlibrary/src/main/resources/base/media/ic_public_play.svg diff --git a/entry/src/main/resources/base/media/ic_ring.svg b/audiointeractionlibrary/src/main/resources/base/media/ic_ring.svg similarity index 100% rename from entry/src/main/resources/base/media/ic_ring.svg rename to audiointeractionlibrary/src/main/resources/base/media/ic_ring.svg diff --git a/entry/src/main/resources/base/media/ic_sq.svg b/audiointeractionlibrary/src/main/resources/base/media/ic_sq.svg similarity index 100% rename from entry/src/main/resources/base/media/ic_sq.svg rename to audiointeractionlibrary/src/main/resources/base/media/ic_sq.svg diff --git a/entry/src/main/resources/base/media/ic_vip.svg b/audiointeractionlibrary/src/main/resources/base/media/ic_vip.svg similarity index 100% rename from entry/src/main/resources/base/media/ic_vip.svg rename to audiointeractionlibrary/src/main/resources/base/media/ic_vip.svg diff --git a/entry/src/main/resources/base/media/icon.png b/audiointeractionlibrary/src/main/resources/base/media/icon.png similarity index 100% rename from entry/src/main/resources/base/media/icon.png rename to audiointeractionlibrary/src/main/resources/base/media/icon.png diff --git a/entry/src/main/resources/base/media/order_play.svg b/audiointeractionlibrary/src/main/resources/base/media/order_play.svg similarity index 99% rename from entry/src/main/resources/base/media/order_play.svg rename to audiointeractionlibrary/src/main/resources/base/media/order_play.svg index bf5d96d..b1affe0 100644 --- a/entry/src/main/resources/base/media/order_play.svg +++ b/audiointeractionlibrary/src/main/resources/base/media/order_play.svg @@ -1,2 +1,2 @@ - + \ No newline at end of file diff --git a/entry/src/main/resources/base/media/repeat_1.svg b/audiointeractionlibrary/src/main/resources/base/media/repeat_1.svg similarity index 99% rename from entry/src/main/resources/base/media/repeat_1.svg rename to audiointeractionlibrary/src/main/resources/base/media/repeat_1.svg index d529fd9..3157659 100644 --- a/entry/src/main/resources/base/media/repeat_1.svg +++ b/audiointeractionlibrary/src/main/resources/base/media/repeat_1.svg @@ -1,2 +1,2 @@ - + \ No newline at end of file diff --git a/entry/src/main/resources/base/media/shuffle.svg b/audiointeractionlibrary/src/main/resources/base/media/shuffle.svg similarity index 99% rename from entry/src/main/resources/base/media/shuffle.svg rename to audiointeractionlibrary/src/main/resources/base/media/shuffle.svg index c3a7d60..58e60bc 100644 --- a/entry/src/main/resources/base/media/shuffle.svg +++ b/audiointeractionlibrary/src/main/resources/base/media/shuffle.svg @@ -1,2 +1,2 @@ - + \ No newline at end of file diff --git a/entry/src/main/resources/base/media/silence.svg b/audiointeractionlibrary/src/main/resources/base/media/silence.svg similarity index 100% rename from entry/src/main/resources/base/media/silence.svg rename to audiointeractionlibrary/src/main/resources/base/media/silence.svg diff --git a/entry/src/main/resources/base/profile/route_map.json b/audiointeractionlibrary/src/main/resources/base/profile/route_map.json similarity index 100% rename from entry/src/main/resources/base/profile/route_map.json rename to audiointeractionlibrary/src/main/resources/base/profile/route_map.json diff --git a/entry/src/main/resources/en_US/element/string.json b/audiointeractionlibrary/src/main/resources/en_US/element/string.json similarity index 100% rename from entry/src/main/resources/en_US/element/string.json rename to audiointeractionlibrary/src/main/resources/en_US/element/string.json diff --git a/entry/src/main/resources/rawfile/Delacey - Dream It Possible.flac b/audiointeractionlibrary/src/main/resources/rawfile/Delacey - Dream It Possible.flac similarity index 100% rename from entry/src/main/resources/rawfile/Delacey - Dream It Possible.flac rename to audiointeractionlibrary/src/main/resources/rawfile/Delacey - Dream It Possible.flac diff --git a/entry/src/main/resources/rawfile/Delacey - Dream It Possible.pcm b/audiointeractionlibrary/src/main/resources/rawfile/Delacey - Dream It Possible.pcm similarity index 100% rename from entry/src/main/resources/rawfile/Delacey - Dream It Possible.pcm rename to audiointeractionlibrary/src/main/resources/rawfile/Delacey - Dream It Possible.pcm diff --git a/entry/src/main/resources/rawfile/boisterous.pcm b/audiointeractionlibrary/src/main/resources/rawfile/boisterous.pcm similarity index 100% rename from entry/src/main/resources/rawfile/boisterous.pcm rename to audiointeractionlibrary/src/main/resources/rawfile/boisterous.pcm diff --git a/entry/src/main/resources/rawfile/boisterous.wav b/audiointeractionlibrary/src/main/resources/rawfile/boisterous.wav similarity index 100% rename from entry/src/main/resources/rawfile/boisterous.wav rename to audiointeractionlibrary/src/main/resources/rawfile/boisterous.wav diff --git a/entry/src/main/resources/rawfile/lrcfiles/DreamItPossible.lrc b/audiointeractionlibrary/src/main/resources/rawfile/lrcfiles/DreamItPossible.lrc similarity index 100% rename from entry/src/main/resources/rawfile/lrcfiles/DreamItPossible.lrc rename to audiointeractionlibrary/src/main/resources/rawfile/lrcfiles/DreamItPossible.lrc diff --git a/entry/src/main/resources/rawfile/power.pcm b/audiointeractionlibrary/src/main/resources/rawfile/power.pcm similarity index 100% rename from entry/src/main/resources/rawfile/power.pcm rename to audiointeractionlibrary/src/main/resources/rawfile/power.pcm diff --git a/entry/src/main/resources/rawfile/power.wav b/audiointeractionlibrary/src/main/resources/rawfile/power.wav similarity index 100% rename from entry/src/main/resources/rawfile/power.wav rename to audiointeractionlibrary/src/main/resources/rawfile/power.wav diff --git a/entry/src/main/resources/rawfile/world.pcm b/audiointeractionlibrary/src/main/resources/rawfile/world.pcm similarity index 100% rename from entry/src/main/resources/rawfile/world.pcm rename to audiointeractionlibrary/src/main/resources/rawfile/world.pcm diff --git a/entry/src/main/resources/rawfile/world.wav b/audiointeractionlibrary/src/main/resources/rawfile/world.wav similarity index 100% rename from entry/src/main/resources/rawfile/world.wav rename to audiointeractionlibrary/src/main/resources/rawfile/world.wav diff --git a/entry/src/main/resources/zh_CN/element/string.json b/audiointeractionlibrary/src/main/resources/zh_CN/element/string.json similarity index 100% rename from entry/src/main/resources/zh_CN/element/string.json rename to audiointeractionlibrary/src/main/resources/zh_CN/element/string.json diff --git a/entry/build-profile.json5 b/audiointeractionsample/build-profile.json5 similarity index 100% rename from entry/build-profile.json5 rename to audiointeractionsample/build-profile.json5 diff --git a/entry/hvigorfile.ts b/audiointeractionsample/hvigorfile.ts similarity index 100% rename from entry/hvigorfile.ts rename to audiointeractionsample/hvigorfile.ts diff --git a/entry/obfuscation-rules.txt b/audiointeractionsample/obfuscation-rules.txt similarity index 100% rename from entry/obfuscation-rules.txt rename to audiointeractionsample/obfuscation-rules.txt diff --git a/entry/oh-package.json5 b/audiointeractionsample/oh-package.json5 similarity index 84% rename from entry/oh-package.json5 rename to audiointeractionsample/oh-package.json5 index c4e22fa..ac686e8 100644 --- a/entry/oh-package.json5 +++ b/audiointeractionsample/oh-package.json5 @@ -1,5 +1,5 @@ { - "name": "entry", + "name": "audiointeractionsample", "version": "1.0.0", "description": "Please describe the basic information.", "main": "", @@ -8,5 +8,4 @@ "dependencies": { '@ohos/MediaService': "file:../MediaService" } -} - +} \ No newline at end of file diff --git a/entry/src/main/ets/entryability/EntryAbility.ets b/audiointeractionsample/src/main/ets/entryability/AudioInteractionsampleAbility.ets similarity index 96% rename from entry/src/main/ets/entryability/EntryAbility.ets rename to audiointeractionsample/src/main/ets/entryability/AudioInteractionsampleAbility.ets index 7a7d487..067808c 100644 --- a/entry/src/main/ets/entryability/EntryAbility.ets +++ b/audiointeractionsample/src/main/ets/entryability/AudioInteractionsampleAbility.ets @@ -17,7 +17,7 @@ import { Configuration, ConfigurationConstant, UIAbility } from '@kit.AbilityKit import { display, window } from '@kit.ArkUI'; import { BusinessError } from '@kit.BasicServicesKit'; import { hilog } from '@kit.PerformanceAnalysisKit'; -import { BreakpointConstants } from '../common/constants/BreakpointConstants'; +import { BreakpointConstants } from 'audiointeractionlibrary/src/main/ets/common/constants/BreakpointConstants'; const TAG: string = '[EntryAbility]'; @@ -71,7 +71,7 @@ export default class EntryAbility extends UIAbility { hilog.error(0x0000, TAG, '%{public}s', `Failed to get main window. code: ${error.code}, message: ${error.message}`); }); - windowStage.loadContent('pages/Root', (err: BusinessError) => { + windowStage.loadContent('pages/Index', (err: BusinessError) => { if (err.code) { hilog.error(0x0000, TAG, '%{public}s', `Failed to load the content. code: ${err.code}, message: ${err.message}`); diff --git a/entry/src/main/ets/entrybackupability/EntryBackupAbility.ets b/audiointeractionsample/src/main/ets/entrybackupability/EntryBackupAbility.ets similarity index 100% rename from entry/src/main/ets/entrybackupability/EntryBackupAbility.ets rename to audiointeractionsample/src/main/ets/entrybackupability/EntryBackupAbility.ets diff --git a/audiointeractionsample/src/main/ets/pages/Index.ets b/audiointeractionsample/src/main/ets/pages/Index.ets new file mode 100644 index 0000000..1d1b65c --- /dev/null +++ b/audiointeractionsample/src/main/ets/pages/Index.ets @@ -0,0 +1,36 @@ +/* + * Copyright (c) 2024 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +import { RouterConstants } from 'audiointeractionlibrary/src/main/ets/common/constants/RouterConstants'; +import { StyleConstants } from 'audiointeractionlibrary/src/main/ets/common/constants/StyleConstants'; + +@Entry +@Component +struct Index { + @Provide(RouterConstants.NAV_PATH_STACK_CONSTANTS) pageStack: NavPathStack = new NavPathStack() + + build() { + Navigation(this.pageStack) { + } + .onAppear(() => { + this.pageStack.pushPathByName(RouterConstants.PLAYER_PAGE, null, false); + }) + .height(StyleConstants.FULL_HEIGHT) + .hideNavBar(true) + .hideTitleBar(true) + .hideToolBar(true) + .mode(NavigationMode.Stack) + } +}; \ No newline at end of file diff --git a/entry/src/main/module.json5 b/audiointeractionsample/src/main/module.json5 similarity index 96% rename from entry/src/main/module.json5 rename to audiointeractionsample/src/main/module.json5 index c9d2fde..edad5cf 100644 --- a/entry/src/main/module.json5 +++ b/audiointeractionsample/src/main/module.json5 @@ -1,6 +1,6 @@ { "module": { - "name": "entry", + "name": "audiointeractionsample", "type": "entry", "description": "$string:module_desc", "mainElement": "EntryAbility", @@ -34,7 +34,7 @@ "label": "$string:EntryAbility_label", "startWindowIcon": "$media:icon", "startWindowBackground": "$color:start_window_background", - "exported": false, + "exported": true, "backgroundModes": [ "audioPlayback" ], diff --git a/entry/src/main/resources/base/profile/backup_config.json b/audiointeractionsample/src/main/resources/base/profile/backup_config.json similarity index 100% rename from entry/src/main/resources/base/profile/backup_config.json rename to audiointeractionsample/src/main/resources/base/profile/backup_config.json diff --git a/entry/src/main/resources/base/profile/main_pages.json b/audiointeractionsample/src/main/resources/base/profile/main_pages.json similarity index 100% rename from entry/src/main/resources/base/profile/main_pages.json rename to audiointeractionsample/src/main/resources/base/profile/main_pages.json -- Gitee From a0823a88a9e709714fdb3ffc142ebe0423f099a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BD=99=E5=A4=A7=E4=BE=A0?= <794397348@qq.com> Date: Mon, 26 May 2025 09:53:43 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- audiointeractionlibrary/.gitignore | 6 + audiointeractionlibrary/Index.ets | 3 +- audiointeractionlibrary/build-profile.json5 | 3 - audiointeractionlibrary/oh-package.json5 | 4 +- .../ets/common/utils/BreakpointSystem.ets | 142 ++++++++++++------ .../src/main/ets/common/utils/WindowUtil.ets | 10 +- .../main/ets/pages/AudioInteractionPage.ets | 7 +- .../src/main/ets/pages/PlayerPage.ets | 12 +- audiointeractionlibrary/src/main/module.json5 | 3 +- audiointeractionsample/build-profile.json5 | 3 - audiointeractionsample/oh-package.json5 | 2 +- ...tionsampleAbility.ets => EntryAbility.ets} | 42 +----- .../src/main/ets/pages/Index.ets | 17 +-- audiointeractionsample/src/main/module.json5 | 3 +- .../resources/base/profile/main_pages.json | 2 +- build-profile.json5 | 8 +- 16 files changed, 134 insertions(+), 133 deletions(-) create mode 100644 audiointeractionlibrary/.gitignore rename audiointeractionsample/src/main/ets/entryability/{AudioInteractionsampleAbility.ets => EntryAbility.ets} (61%) diff --git a/audiointeractionlibrary/.gitignore b/audiointeractionlibrary/.gitignore new file mode 100644 index 0000000..e2713a2 --- /dev/null +++ b/audiointeractionlibrary/.gitignore @@ -0,0 +1,6 @@ +/node_modules +/oh_modules +/.preview +/build +/.cxx +/.test \ No newline at end of file diff --git a/audiointeractionlibrary/Index.ets b/audiointeractionlibrary/Index.ets index 42bf416..5b55657 100644 --- a/audiointeractionlibrary/Index.ets +++ b/audiointeractionlibrary/Index.ets @@ -1 +1,2 @@ -export { MainPage } from './src/main/ets/components/MainPage'; +export { AudioInteractionPage } from './src/main/ets/pages/AudioInteractionPage'; +export { WindowUtil } from './src/main/ets/common/utils/WindowUtil'; \ No newline at end of file diff --git a/audiointeractionlibrary/build-profile.json5 b/audiointeractionlibrary/build-profile.json5 index e6773f9..cda3307 100644 --- a/audiointeractionlibrary/build-profile.json5 +++ b/audiointeractionlibrary/build-profile.json5 @@ -23,9 +23,6 @@ "targets": [ { "name": "default" - }, - { - "name": "ohosTest" } ] } diff --git a/audiointeractionlibrary/oh-package.json5 b/audiointeractionlibrary/oh-package.json5 index 695244c..6002408 100644 --- a/audiointeractionlibrary/oh-package.json5 +++ b/audiointeractionlibrary/oh-package.json5 @@ -5,5 +5,7 @@ "main": "Index.ets", "author": "", "license": "Apache-2.0", - "dependencies": {} + "dependencies": { + '@ohos/MediaService': "file:../MediaService" + } } diff --git a/audiointeractionlibrary/src/main/ets/common/utils/BreakpointSystem.ets b/audiointeractionlibrary/src/main/ets/common/utils/BreakpointSystem.ets index 2bf40ff..8b80179 100644 --- a/audiointeractionlibrary/src/main/ets/common/utils/BreakpointSystem.ets +++ b/audiointeractionlibrary/src/main/ets/common/utils/BreakpointSystem.ets @@ -16,71 +16,121 @@ import { mediaquery } from '@kit.ArkUI'; import { BreakpointConstants } from '../constants/BreakpointConstants'; -declare interface BreakPointTypeOption { - sm?: T, - md?: T, - lg?: T +/* + * Copyright (c) 2024 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +import { window } from '@kit.ArkUI'; +import type { BusinessError } from '@kit.BasicServicesKit'; +import { hilog } from '@kit.PerformanceAnalysisKit'; + +const TAG: string = '[BreakpointSystem]'; + +export enum BreakpointTypeEnum { + XS = 'xs', + SM = 'sm', + MD = 'md', + LG = 'lg', + XL = 'xl', +} + +export interface BreakpointTypes { + xs?: T; + sm: T; + md: T; + lg: T; + xl?: T; } export class BreakpointType { - private options: BreakPointTypeOption; + private xs: T; + private sm: T; + private md: T; + private lg: T; + private xl: T; - constructor(option: BreakPointTypeOption) { - this.options = option; + public constructor(param: BreakpointTypes) { + this.xs = param.xs || param.sm; + this.sm = param.sm; + this.md = param.md; + this.lg = param.lg; + this.xl = param.xl || param.lg; } - getValue(currentPoint: string): T { - if (currentPoint === 'sm') { - return this.options.sm as T; - } else if (currentPoint === 'md') { - return this.options.md as T; - } else { - return this.options.lg as T; + public getValue(currentBreakpoint: string): T { + if (currentBreakpoint === BreakpointTypeEnum.XS) { + return this.xs; + } + if (currentBreakpoint === BreakpointTypeEnum.SM) { + return this.sm; } + if (currentBreakpoint === BreakpointTypeEnum.MD) { + return this.md; + } + if (currentBreakpoint === BreakpointTypeEnum.XL) { + return this.xl; + } + return this.lg; } } export class BreakpointSystem { - private currentBreakpoint: string = BreakpointConstants.BREAKPOINT_SM; - private smListener: mediaquery.MediaQueryListener = mediaquery.matchMediaSync(BreakpointConstants.RANGE_SM); - private mdListener: mediaquery.MediaQueryListener = mediaquery.matchMediaSync(BreakpointConstants.RANGE_MD); - private lgListener: mediaquery.MediaQueryListener = mediaquery.matchMediaSync(BreakpointConstants.RANGE_LG); + private static instance: BreakpointSystem; + private currentBreakpoint: BreakpointTypeEnum = BreakpointTypeEnum.MD; - private updateCurrentBreakpoint(breakpoint: string): void { - if (this.currentBreakpoint !== breakpoint) { - this.currentBreakpoint = breakpoint; - AppStorage.setOrCreate(BreakpointConstants.CURRENT_BREAKPOINT, this.currentBreakpoint); - } + private constructor() { } - private isBreakpointSM = (mediaQueryResult: mediaquery.MediaQueryResult): void => { - if (mediaQueryResult.matches) { - this.updateCurrentBreakpoint(BreakpointConstants.BREAKPOINT_SM); - } - } - private isBreakpointMD = (mediaQueryResult: mediaquery.MediaQueryResult): void => { - if (mediaQueryResult.matches) { - this.updateCurrentBreakpoint(BreakpointConstants.BREAKPOINT_MD); + public static getInstance(): BreakpointSystem { + if (!BreakpointSystem.instance) { + BreakpointSystem.instance = new BreakpointSystem(); } + return BreakpointSystem.instance; } - private isBreakpointLG = (mediaQueryResult: mediaquery.MediaQueryResult): void => { - if (mediaQueryResult.matches) { - this.updateCurrentBreakpoint(BreakpointConstants.BREAKPOINT_LG); + + public updateCurrentBreakpoint(breakpoint: BreakpointTypeEnum): void { + if (this.currentBreakpoint !== breakpoint) { + this.currentBreakpoint = breakpoint; + AppStorage.setOrCreate('currentBreakpoint', this.currentBreakpoint); } } - public register(): void { - this.smListener = mediaquery.matchMediaSync(BreakpointConstants.RANGE_SM); - this.smListener.on('change', this.isBreakpointSM); - this.mdListener = mediaquery.matchMediaSync(BreakpointConstants.RANGE_MD); - this.mdListener.on('change', this.isBreakpointMD); - this.lgListener = mediaquery.matchMediaSync(BreakpointConstants.RANGE_LG); - this.lgListener.on('change', this.isBreakpointLG); + public onWindowSizeChange(window: window.Window): void { + this.updateWidthBp(window); } - public unregister(): void { - this.smListener.off('change', this.isBreakpointSM); - this.mdListener.off('change', this.isBreakpointMD); - this.lgListener.off('change', this.isBreakpointLG); + public updateWidthBp(window: window.Window): void { + try { + const mainWindow: window.WindowProperties = window.getWindowProperties(); + const windowWidth: number = mainWindow.windowRect.width; + const windowWidthVp = px2vp(windowWidth); + let widthBp: BreakpointTypeEnum = BreakpointTypeEnum.MD; + if (windowWidthVp < 320) { + widthBp = BreakpointTypeEnum.XS; + } else if (windowWidthVp >= 320 && windowWidthVp < 600) { + widthBp = BreakpointTypeEnum.SM; + } else if (windowWidthVp >= 600 && windowWidthVp < 840) { + widthBp = BreakpointTypeEnum.MD; + } else if (windowWidthVp >= 840 && windowWidthVp < 1440) { + widthBp = BreakpointTypeEnum.LG; + } else { + widthBp = BreakpointTypeEnum.XL; + } + this.updateCurrentBreakpoint(widthBp); + } catch (error) { + const err: BusinessError = error as BusinessError; + hilog.error(0x0000, TAG, `UpdateBreakpoint fail, error code: ${err.code}, message: ${err.message}`); + } } -} \ No newline at end of file +} diff --git a/audiointeractionlibrary/src/main/ets/common/utils/WindowUtil.ets b/audiointeractionlibrary/src/main/ets/common/utils/WindowUtil.ets index 0e99803..f87376f 100644 --- a/audiointeractionlibrary/src/main/ets/common/utils/WindowUtil.ets +++ b/audiointeractionlibrary/src/main/ets/common/utils/WindowUtil.ets @@ -48,12 +48,6 @@ export class WindowUtil { hilog.error(0x0000, TAG, `Failed to get main window: ${err.message}`); return; } - let avoidArea = data.getWindowAvoidArea(window.AvoidAreaType.TYPE_NAVIGATION_INDICATOR); - let bottomRectHeight = avoidArea.bottomRect.height; - AppStorage.setOrCreate('bottomRectHeight', bottomRectHeight); - avoidArea = data.getWindowAvoidArea(window.AvoidAreaType.TYPE_SYSTEM); - let topRectHeight = avoidArea.topRect.height; - AppStorage.setOrCreate('topRectHeight', topRectHeight); BreakpointSystem.getInstance().updateWidthBp(data); data.on('windowSizeChange', () => BreakpointSystem.getInstance().onWindowSizeChange(data)); data.on('avoidAreaChange', (avoidAreaOption) => { @@ -68,9 +62,9 @@ export class WindowUtil { // Get status bar height and indicator height. public static setAvoidArea(type: window.AvoidAreaType, area: window.AvoidArea) { if (type === window.AvoidAreaType.TYPE_SYSTEM) { - AppStorage.setOrCreate('statusBarHeight', px2vp(area.topRect.height)); + AppStorage.setOrCreate('topHeight', px2vp(area.topRect.height)); } else { - AppStorage.setOrCreate('naviIndicatorHeight', px2vp(area.bottomRect.height)); + AppStorage.setOrCreate('bottomHeight', px2vp(area.bottomRect.height)); } } } \ No newline at end of file diff --git a/audiointeractionlibrary/src/main/ets/pages/AudioInteractionPage.ets b/audiointeractionlibrary/src/main/ets/pages/AudioInteractionPage.ets index 1d1b65c..9fd86ee 100644 --- a/audiointeractionlibrary/src/main/ets/pages/AudioInteractionPage.ets +++ b/audiointeractionlibrary/src/main/ets/pages/AudioInteractionPage.ets @@ -12,13 +12,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +import { RouterConstants } from "../common/constants/RouterConstants"; +import { StyleConstants } from "../common/constants/StyleConstants"; -import { RouterConstants } from 'audiointeractionlibrary/src/main/ets/common/constants/RouterConstants'; -import { StyleConstants } from 'audiointeractionlibrary/src/main/ets/common/constants/StyleConstants'; -@Entry @Component -struct Index { +export struct AudioInteractionPage { @Provide(RouterConstants.NAV_PATH_STACK_CONSTANTS) pageStack: NavPathStack = new NavPathStack() build() { diff --git a/audiointeractionlibrary/src/main/ets/pages/PlayerPage.ets b/audiointeractionlibrary/src/main/ets/pages/PlayerPage.ets index 7923782..6bece06 100644 --- a/audiointeractionlibrary/src/main/ets/pages/PlayerPage.ets +++ b/audiointeractionlibrary/src/main/ets/pages/PlayerPage.ets @@ -12,11 +12,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +import { AudioRendererController } from "@ohos/MediaService"; +import { BreakpointSystem } from "../common/utils/BreakpointSystem"; +import { PlayerInfoComponent } from "../components/PlayerInfoComponent"; +import { songList } from "../datasource/SongListData"; -import { AudioRendererController } from '@ohos/MediaService'; -import { songList } from 'audiointeractionlibrary/src/main/ets/datasource/SongListData'; -import { BreakpointSystem } from 'audiointeractionlibrary/src/main/ets/common/utils/BreakpointSystem'; -import { PlayerInfoComponent } from 'audiointeractionlibrary/src/main/ets/components/PlayerInfoComponent'; @Builder export function PlayerPageBuilder() { @@ -26,16 +26,14 @@ export function PlayerPageBuilder() { @Component struct PlayerPage { @State isShowPlay: boolean = false; - private breakpointSystem: BreakpointSystem = new BreakpointSystem(); aboutToAppear(): void { AppStorage.setOrCreate('songList', songList); AudioRendererController.getInstance(); - this.breakpointSystem.register(); + } aboutToDisappear(): void { - this.breakpointSystem.unregister(); AudioRendererController.getInstance().release(); } diff --git a/audiointeractionlibrary/src/main/module.json5 b/audiointeractionlibrary/src/main/module.json5 index 4af755e..edc25d0 100644 --- a/audiointeractionlibrary/src/main/module.json5 +++ b/audiointeractionlibrary/src/main/module.json5 @@ -6,6 +6,7 @@ "default", "tablet", "2in1" - ] + ], + "routerMap": "$profile:route_map" } } diff --git a/audiointeractionsample/build-profile.json5 b/audiointeractionsample/build-profile.json5 index b695582..808380f 100644 --- a/audiointeractionsample/build-profile.json5 +++ b/audiointeractionsample/build-profile.json5 @@ -20,9 +20,6 @@ "targets": [ { "name": "default" - }, - { - "name": "ohosTest", } ] } \ No newline at end of file diff --git a/audiointeractionsample/oh-package.json5 b/audiointeractionsample/oh-package.json5 index ac686e8..bbc15c7 100644 --- a/audiointeractionsample/oh-package.json5 +++ b/audiointeractionsample/oh-package.json5 @@ -6,6 +6,6 @@ "author": "", "license": "", "dependencies": { - '@ohos/MediaService': "file:../MediaService" + "audiointeractionlibrary": "file:../audiointeractionlibrary" } } \ No newline at end of file diff --git a/audiointeractionsample/src/main/ets/entryability/AudioInteractionsampleAbility.ets b/audiointeractionsample/src/main/ets/entryability/EntryAbility.ets similarity index 61% rename from audiointeractionsample/src/main/ets/entryability/AudioInteractionsampleAbility.ets rename to audiointeractionsample/src/main/ets/entryability/EntryAbility.ets index 067808c..0081087 100644 --- a/audiointeractionsample/src/main/ets/entryability/AudioInteractionsampleAbility.ets +++ b/audiointeractionsample/src/main/ets/entryability/EntryAbility.ets @@ -17,6 +17,7 @@ import { Configuration, ConfigurationConstant, UIAbility } from '@kit.AbilityKit import { display, window } from '@kit.ArkUI'; import { BusinessError } from '@kit.BasicServicesKit'; import { hilog } from '@kit.PerformanceAnalysisKit'; +import { WindowUtil } from 'audiointeractionlibrary'; import { BreakpointConstants } from 'audiointeractionlibrary/src/main/ets/common/constants/BreakpointConstants'; const TAG: string = '[EntryAbility]'; @@ -49,28 +50,8 @@ export default class EntryAbility extends UIAbility { onWindowStageCreate(windowStage: window.WindowStage) { // Main window is created, set main page for this ability hilog.info(0x0000, TAG, '%{public}s', 'Ability onWindowStageCreate'); - windowStage.getMainWindow().then((data: window.Window) => { - try { - this.windowObj = data; - AppStorage.setOrCreate('window', data); - data.setWindowLayoutFullScreen(true); - let topArea = this.windowObj.getWindowAvoidArea(window.AvoidAreaType.TYPE_SYSTEM) - let topHeight = px2vp(topArea.topRect.height) - AppStorage.setOrCreate('topHeight', topHeight) - let bottomArea = this.windowObj.getWindowAvoidArea(window.AvoidAreaType.TYPE_NAVIGATION_INDICATOR) - let bottomHeight = px2vp(bottomArea.bottomRect.height) - AppStorage.setOrCreate('bottomHeight', bottomHeight) - this.updateBreakpoint(this.windowObj.getWindowProperties().windowRect.width); - this.windowObj.on('windowSizeChange', (windowSize: window.Size) => { - this.updateBreakpoint(windowSize.width); - }); - } catch (err) { - hilog.error(0x0000, 'testTag', `Set window properties err. Cause: ${err.code}`); - } - }).catch((error: BusinessError) => { - hilog.error(0x0000, TAG, '%{public}s', - `Failed to get main window. code: ${error.code}, message: ${error.message}`); - }); + WindowUtil.requestFullScreen(windowStage) + WindowUtil.registerBreakPoint(windowStage) windowStage.loadContent('pages/Index', (err: BusinessError) => { if (err.code) { hilog.error(0x0000, TAG, '%{public}s', @@ -81,23 +62,6 @@ export default class EntryAbility extends UIAbility { }); } - private updateBreakpoint(windowWidth: number): void { - try { - let windowWidthVp = windowWidth / display.getDefaultDisplaySync().densityPixels; - let curBp: string = ''; - if (windowWidthVp < BreakpointConstants.BREAKPOINT_VALUE_NUMBER[1]) { - curBp = BreakpointConstants.BREAKPOINT_SM; - } else if (windowWidthVp < BreakpointConstants.BREAKPOINT_VALUE_NUMBER[2]) { - curBp = BreakpointConstants.BREAKPOINT_MD; - } else { - curBp = BreakpointConstants.BREAKPOINT_LG; - } - AppStorage.setOrCreate('currentBreakpoint', curBp); - } catch (err) { - hilog.error(0X0000, TAG, '%{public}s', `updateBreakpoint catch err. code: ${err.code}, message: ${err.message}`); - } - } - onWindowStageDestroy() { // Main window is destroyed, release UI related resources hilog.info(0x0000, TAG, '%{public}s', 'Ability onWindowStageDestroy'); diff --git a/audiointeractionsample/src/main/ets/pages/Index.ets b/audiointeractionsample/src/main/ets/pages/Index.ets index 1d1b65c..64807e2 100644 --- a/audiointeractionsample/src/main/ets/pages/Index.ets +++ b/audiointeractionsample/src/main/ets/pages/Index.ets @@ -12,25 +12,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - -import { RouterConstants } from 'audiointeractionlibrary/src/main/ets/common/constants/RouterConstants'; -import { StyleConstants } from 'audiointeractionlibrary/src/main/ets/common/constants/StyleConstants'; +import { AudioInteractionPage } from 'audiointeractionlibrary' @Entry @Component struct Index { - @Provide(RouterConstants.NAV_PATH_STACK_CONSTANTS) pageStack: NavPathStack = new NavPathStack() - build() { - Navigation(this.pageStack) { + Stack() { + AudioInteractionPage() } - .onAppear(() => { - this.pageStack.pushPathByName(RouterConstants.PLAYER_PAGE, null, false); - }) - .height(StyleConstants.FULL_HEIGHT) - .hideNavBar(true) - .hideTitleBar(true) - .hideToolBar(true) - .mode(NavigationMode.Stack) } }; \ No newline at end of file diff --git a/audiointeractionsample/src/main/module.json5 b/audiointeractionsample/src/main/module.json5 index edad5cf..31e4e22 100644 --- a/audiointeractionsample/src/main/module.json5 +++ b/audiointeractionsample/src/main/module.json5 @@ -9,7 +9,6 @@ "tablet", "2in1" ], - "routerMap": "$profile:route_map", "deliveryWithInstall": true, "installationFree": false, "pages": "$profile:main_pages", @@ -27,7 +26,7 @@ ], "abilities": [ { - "name": "EntryAbility", + "name": "AudioInteractionsampleAbility", "srcEntry": "./ets/entryability/EntryAbility.ets", "description": "$string:EntryAbility_desc", "icon": "$media:ic_music_icon", diff --git a/audiointeractionsample/src/main/resources/base/profile/main_pages.json b/audiointeractionsample/src/main/resources/base/profile/main_pages.json index 9d44085..1898d94 100644 --- a/audiointeractionsample/src/main/resources/base/profile/main_pages.json +++ b/audiointeractionsample/src/main/resources/base/profile/main_pages.json @@ -1,5 +1,5 @@ { "src": [ - "pages/Root" + "pages/Index" ] } diff --git a/build-profile.json5 b/build-profile.json5 index a292460..450240f 100644 --- a/build-profile.json5 +++ b/build-profile.json5 @@ -25,8 +25,8 @@ }, "modules": [ { - "name": "entry", - "srcPath": "./entry", + "name": "audiointeractionsample", + "srcPath": "./audiointeractionsample", "targets": [ { "name": "default", @@ -39,6 +39,10 @@ { "name": "MediaService", "srcPath": "./MediaService", + }, + { + "name": "audiointeractionlibrary", + "srcPath": "./audiointeractionlibrary", } ] } \ No newline at end of file -- Gitee