diff --git a/multimedia/BUILD.gn b/multimedia/BUILD.gn index 7034c349d99fb498179237d820ba6b51636f6339..fcb389f05e38723aa77d4414bddbf44694f2ed80 100755 --- a/multimedia/BUILD.gn +++ b/multimedia/BUILD.gn @@ -18,9 +18,8 @@ group("multimedia") { if (is_standard_system) { deps = [ "audio/audio_js_standard/audioManager:audio_manager_js_hap", - "audio/audio_js_standard/audioPlayer:audio_player_js_hap", - "audio/audio_js_standard/audioPlayer_API:audio_player_api_js_hap", - "audio/audio_js_standard/audioRecorder:audio_recorder_js_hap", + "media/media_js_standard/audioPlayer:audio_player_js_hap", + "media/media_js_standard/audioRecorder:audio_recorder_js_hap", ] } else { deps = [ diff --git a/multimedia/audio/audio_js_standard/audioPlayer_API/BUILD.gn b/multimedia/audio/audio_js_standard/audioPlayer_API/BUILD.gn deleted file mode 100755 index 4d3aab8342b227f19d411e68e8ee77aba5bab778..0000000000000000000000000000000000000000 --- a/multimedia/audio/audio_js_standard/audioPlayer_API/BUILD.gn +++ /dev/null @@ -1,31 +0,0 @@ -# Copyright (C) 2021 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("//test/xts/tools/build/suite.gni") - -ohos_js_hap_suite("audio_player_api_js_hap") { - hap_profile = "./src/main/config.json" - deps = [ - ":audio_player_api_js_assets", - ":audio_player_api_resources", - ] - certificate_profile = "./signature/openharmony_sx.p7b" - hap_name = "ActsAudioPlayerApiJsTest" -} -ohos_js_assets("audio_player_api_js_assets") { - source_dir = "./src/main/js/default" -} -ohos_resources("audio_player_api_resources") { - sources = [ "./src/main/resources" ] - hap_profile = "./src/main/config.json" -} diff --git a/multimedia/audio/audio_js_standard/audioPlayer_API/Test.json b/multimedia/audio/audio_js_standard/audioPlayer_API/Test.json deleted file mode 100755 index e4952766f2abed8a3c7f31b38f59acbd773913aa..0000000000000000000000000000000000000000 --- a/multimedia/audio/audio_js_standard/audioPlayer_API/Test.json +++ /dev/null @@ -1,59 +0,0 @@ -{ - "description": "Configuration for audioPlayerApi Tests", - "driver": { - "type": "JSUnitTest", - "test-timeout": "2000000", - "package": "ohos.acts.multimedia.audio.audioplayerapi", - "shell-timeout": "60000" - }, - "kits": [ - { - "type": "PushKit", - "pre-push": [ - ], - "push": [ - "./resource/audio/01.mp3 ->/data/media/", - "./resource/audio/02.mp3 ->/data/media/", - "./resource/audio/03.mp3 ->/data/media/", - "./resource/audio/04.mp3 ->/data/media/", - "./resource/audio/47.mp4 ->/data/media/", - "./resource/audio/49.mp4 ->/data/media/", - "./resource/audio/50.mp4 ->/data/media/", - "./resource/audio/51.mp4 ->/data/media/", - "./resource/audio/54.mp4 ->/data/media/", - "./resource/audio/55.m4a ->/data/media/", - "./resource/audio/57.m4a ->/data/media/", - "./resource/audio/58.m4a ->/data/media/", - "./resource/audio/59.m4a ->/data/media/", - "./resource/audio/62.m4a ->/data/media/", - "./resource/audio/64.mp4 ->/data/media/", - "./resource/audio/65.mp4 ->/data/media/", - "./resource/audio/66.mp4 ->/data/media/", - "./resource/audio/67.mp4 ->/data/media/", - "./resource/audio/92.mp4 ->/data/media/", - "./resource/audio/93.mp4 ->/data/media/", - "./resource/audio/94.mp4 ->/data/media/", - "./resource/audio/96.mp4 ->/data/media/", - "./resource/audio/97.mp4 ->/data/media/", - "./resource/audio/98.mp4 ->/data/media/" - ] - }, - { - "type": "ShellKit", - "run-command": [ - "chmod -R 666 /data/media/*", - "setenforce 0" - ], - "teardown-command":[ - "setenforce 1" - ] - }, - { - "test-file-name": [ - "ActsAudioPlayerApiJsTest.hap" - ], - "type": "AppInstallKit", - "cleanup-apps": true - } - ] -} \ No newline at end of file diff --git a/multimedia/audio/audio_js_standard/audioPlayer_API/src/main/config.json b/multimedia/audio/audio_js_standard/audioPlayer_API/src/main/config.json deleted file mode 100755 index 79cbba9484460328d6259c480dbcc11841fa55f0..0000000000000000000000000000000000000000 --- a/multimedia/audio/audio_js_standard/audioPlayer_API/src/main/config.json +++ /dev/null @@ -1,74 +0,0 @@ -{ - "app": { - "apiVersion": { - "compatible": 6, - "releaseType": "Beta1", - "target": 7 - }, - "vendor": "acts", - "bundleName": "ohos.acts.multimedia.audio.audioplayerapi", - "version": { - "code": 1000000, - "name": "1.0.0" - } - }, - "deviceConfig": { - "default": { - "debug": true - } - }, - "module": { - "abilities": [ - { - "iconId": 16777218, - "skills": [ - { - "entities": [ - "entity.system.home" - ], - "actions": [ - "action.system.home" - ] - } - ], - "descriptionId": 16777217, - "visible": true, - "labelId": 16777216, - "icon": "$media:icon", - "name": "ohos.acts.multimedia.audio.audioplayerapi.MainAbility", - "description": "$string:mainability_description", - "label": "$string:entry_MainAbility", - "type": "page", - "homeAbility": true, - "launchType": "standard" - } - ], - "deviceType": [ - "phone", - "tablet", - "tv", - "wearable" - ], - "mainAbility": "ohos.acts.multimedia.audio.audioplayerapi.MainAbility", - "distro": { - "moduleType": "entry", - "installationFree": false, - "deliveryWithInstall": true, - "moduleName": "entry" - }, - "package": "ohos.acts.multimedia.audio.audioplayerapi", - "name": ".MyApplication", - "js": [ - { - "pages": [ - "pages/index/index" - ], - "name": "default", - "window": { - "designWidth": 720, - "autoDesignWidth": true - } - } - ] - } -} \ No newline at end of file diff --git a/multimedia/audio/audio_js_standard/audioPlayer_API/src/main/java/ohos/acts/multimedia/audio/audioplayerapi/MainAbility.java b/multimedia/audio/audio_js_standard/audioPlayer_API/src/main/java/ohos/acts/multimedia/audio/audioplayerapi/MainAbility.java deleted file mode 100644 index 4ef720132f1f38774c2e743e090a78bda6182787..0000000000000000000000000000000000000000 --- a/multimedia/audio/audio_js_standard/audioPlayer_API/src/main/java/ohos/acts/multimedia/audio/audioplayerapi/MainAbility.java +++ /dev/null @@ -1,35 +0,0 @@ -/* - * Copyright (C) 2021 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. - */ - - package ohos.acts.multimedia.audio.audioplayerapi; - - import ohos.ace.ability.AceAbility; - import ohos.aafwk.content.Intent; - -/* - * java MainAbility - */ - - public class MainAbility extends AceAbility { - @Override - public void onStart(Intent intent) { - super.onStart(intent); - } - - @Override - public void onStop() { - super.onStop(); - } - } diff --git a/multimedia/audio/audio_js_standard/audioPlayer_API/src/main/java/ohos/acts/multimedia/audio/audioplayerapi/MyApplication.java b/multimedia/audio/audio_js_standard/audioPlayer_API/src/main/java/ohos/acts/multimedia/audio/audioplayerapi/MyApplication.java deleted file mode 100644 index 30836c8d15b281d30fd2f559ac6e5fcf46e09ba9..0000000000000000000000000000000000000000 --- a/multimedia/audio/audio_js_standard/audioPlayer_API/src/main/java/ohos/acts/multimedia/audio/audioplayerapi/MyApplication.java +++ /dev/null @@ -1,29 +0,0 @@ -/* - * Copyright (C) 2021 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. - */ - - package ohos.acts.multimedia.audio.audioplayerapi; - - import ohos.aafwk.ability.AbilityPackage; - -/* - * java MyApplication - */ - - public class MyApplication extends AbilityPackage { - @Override - public void onInitialize() { - super.onInitialize(); - } - } diff --git a/multimedia/audio/audio_js_standard/audioPlayer_API/src/main/js/test/List.test.js b/multimedia/audio/audio_js_standard/audioPlayer_API/src/main/js/test/List.test.js deleted file mode 100755 index adda94a055de2bada294b2152fb6f0d38dbfd5b9..0000000000000000000000000000000000000000 --- a/multimedia/audio/audio_js_standard/audioPlayer_API/src/main/js/test/List.test.js +++ /dev/null @@ -1,16 +0,0 @@ -/* - * Copyright (C) 2021 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. - */ - -require('./PlayerLocalTestAudioAPI.test.js') \ No newline at end of file diff --git a/multimedia/audio/audio_js_standard/audioRecorder/signature/openharmony_sx.p7b b/multimedia/audio/audio_js_standard/audioRecorder/signature/openharmony_sx.p7b deleted file mode 100644 index 9be1e98fa4c0c28ca997ed660112fa16b194f0f5..0000000000000000000000000000000000000000 Binary files a/multimedia/audio/audio_js_standard/audioRecorder/signature/openharmony_sx.p7b and /dev/null differ diff --git a/multimedia/audio/audio_js_standard/audioRecorder/src/main/js/default/app.js b/multimedia/audio/audio_js_standard/audioRecorder/src/main/js/default/app.js deleted file mode 100644 index e423f4bce4698ec1d7dc86c3eea3990a5e7b1085..0000000000000000000000000000000000000000 --- a/multimedia/audio/audio_js_standard/audioRecorder/src/main/js/default/app.js +++ /dev/null @@ -1,23 +0,0 @@ -/* - * Copyright (C) 2021 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -export default { - onCreate() { - console.info('AceApplication onCreate'); - }, - onDestroy() { - console.info('AceApplication onDestroy'); - } -}; diff --git a/multimedia/audio/audio_js_standard/audioRecorder/src/main/js/default/i18n/en-US.json b/multimedia/audio/audio_js_standard/audioRecorder/src/main/js/default/i18n/en-US.json deleted file mode 100644 index e63c70d978a3a53be988388c87182f81785e170c..0000000000000000000000000000000000000000 --- a/multimedia/audio/audio_js_standard/audioRecorder/src/main/js/default/i18n/en-US.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "strings": { - "hello": "Hello", - "world": "World" - } -} \ No newline at end of file diff --git a/multimedia/audio/audio_js_standard/audioRecorder/src/main/js/default/i18n/zh-CN.json b/multimedia/audio/audio_js_standard/audioRecorder/src/main/js/default/i18n/zh-CN.json deleted file mode 100644 index de6ee5748322f44942c1b003319d8e66c837675f..0000000000000000000000000000000000000000 --- a/multimedia/audio/audio_js_standard/audioRecorder/src/main/js/default/i18n/zh-CN.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "strings": { - "hello": "您好", - "world": "世界" - } -} \ No newline at end of file diff --git a/multimedia/audio/audio_js_standard/audioRecorder/src/main/js/default/pages/index/index.css b/multimedia/audio/audio_js_standard/audioRecorder/src/main/js/default/pages/index/index.css deleted file mode 100644 index 5bd7567028568bd522193b2519d545ca6dcf397d..0000000000000000000000000000000000000000 --- a/multimedia/audio/audio_js_standard/audioRecorder/src/main/js/default/pages/index/index.css +++ /dev/null @@ -1,46 +0,0 @@ -.container { - flex-direction: column; - justify-content: center; - align-items: center; - width: 100%; - height: 100%; -} - -.title { - font-size: 40px; - color: #000000; - opacity: 0.9; -} - -@media screen and (device-type: tablet) and (orientation: landscape) { - .title { - font-size: 100px; - } -} - -@media screen and (device-type: wearable) { - .title { - font-size: 28px; - color: #FFFFFF; - } -} - -@media screen and (device-type: tv) { - .container { - background-image: url("/common/images/Wallpaper.png"); - background-size: cover; - background-repeat: no-repeat; - background-position: center; - } - - .title { - font-size: 100px; - color: #FFFFFF; - } -} - -@media screen and (device-type: phone) and (orientation: landscape) { - .title { - font-size: 60px; - } -} diff --git a/multimedia/audio/audio_js_standard/audioRecorder/src/main/js/default/pages/index/index.hml b/multimedia/audio/audio_js_standard/audioRecorder/src/main/js/default/pages/index/index.hml deleted file mode 100644 index f64b040a5ae394dbaa5e185e1ecd4f4556b92184..0000000000000000000000000000000000000000 --- a/multimedia/audio/audio_js_standard/audioRecorder/src/main/js/default/pages/index/index.hml +++ /dev/null @@ -1,5 +0,0 @@ -
- - {{ $t('strings.hello') }} {{ title }} - -
diff --git a/multimedia/audio/audio_js_standard/audioRecorder/src/main/js/default/pages/index/index.js b/multimedia/audio/audio_js_standard/audioRecorder/src/main/js/default/pages/index/index.js deleted file mode 100644 index a0719cee588ac4b0f56efbf784b19647bc6645de..0000000000000000000000000000000000000000 --- a/multimedia/audio/audio_js_standard/audioRecorder/src/main/js/default/pages/index/index.js +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Copyright (C) 2021 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 {Core, ExpectExtend} from 'deccjsunit/index' - -export default { - data: { - title: "" - }, - onInit() { - this.title = this.$t('strings.world'); - }, - onShow() { - console.info('onShow finish') - const core = Core.getInstance() - const expectExtend = new ExpectExtend({ - 'id': 'extend' - }) - core.addService('expect', expectExtend) - core.init() - const configService = core.getDefaultService('config') - this.timeout = 60000 - configService.setConfig(this) - require('../../../test/List.test') - core.execute() - }, - onReady() { - }, -} \ No newline at end of file diff --git a/multimedia/audio/audio_js_standard/audioRecorder/src/main/resources/base/element/string.json b/multimedia/audio/audio_js_standard/audioRecorder/src/main/resources/base/element/string.json deleted file mode 100644 index 0bae6bd40f7360d5d818998221b199d3ec0f69c0..0000000000000000000000000000000000000000 --- a/multimedia/audio/audio_js_standard/audioRecorder/src/main/resources/base/element/string.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "string": [ - { - "name": "entry_MainAbility", - "value": "entry_MainAbility" - }, - { - "name": "mainability_description", - "value": "JS_Empty Ability" - } - ] -} \ No newline at end of file diff --git a/multimedia/audio/audio_js_standard/audioRecorder/src/main/resources/base/media/icon.png b/multimedia/audio/audio_js_standard/audioRecorder/src/main/resources/base/media/icon.png deleted file mode 100644 index ce307a8827bd75456441ceb57d530e4c8d45d36c..0000000000000000000000000000000000000000 Binary files a/multimedia/audio/audio_js_standard/audioRecorder/src/main/resources/base/media/icon.png and /dev/null differ diff --git a/multimedia/audio/audio_js_standard/audioPlayer/BUILD.gn b/multimedia/media/media_js_standard/audioPlayer/BUILD.gn old mode 100755 new mode 100644 similarity index 100% rename from multimedia/audio/audio_js_standard/audioPlayer/BUILD.gn rename to multimedia/media/media_js_standard/audioPlayer/BUILD.gn diff --git a/multimedia/audio/audio_js_standard/audioPlayer/Test.json b/multimedia/media/media_js_standard/audioPlayer/Test.json old mode 100755 new mode 100644 similarity index 100% rename from multimedia/audio/audio_js_standard/audioPlayer/Test.json rename to multimedia/media/media_js_standard/audioPlayer/Test.json diff --git a/multimedia/audio/audio_js_standard/audioPlayer/signature/openharmony_sx.p7b b/multimedia/media/media_js_standard/audioPlayer/signature/openharmony_sx.p7b old mode 100755 new mode 100644 similarity index 100% rename from multimedia/audio/audio_js_standard/audioPlayer/signature/openharmony_sx.p7b rename to multimedia/media/media_js_standard/audioPlayer/signature/openharmony_sx.p7b diff --git a/multimedia/audio/audio_js_standard/audioPlayer/src/main/config.json b/multimedia/media/media_js_standard/audioPlayer/src/main/config.json old mode 100755 new mode 100644 similarity index 100% rename from multimedia/audio/audio_js_standard/audioPlayer/src/main/config.json rename to multimedia/media/media_js_standard/audioPlayer/src/main/config.json diff --git a/multimedia/audio/audio_js_standard/audioPlayer/src/main/java/ohos/acts/multimedia/audio/audioplayer/MainAbility.java b/multimedia/media/media_js_standard/audioPlayer/src/main/java/ohos/acts/multimedia/audio/audioplayer/MainAbility.java similarity index 100% rename from multimedia/audio/audio_js_standard/audioPlayer/src/main/java/ohos/acts/multimedia/audio/audioplayer/MainAbility.java rename to multimedia/media/media_js_standard/audioPlayer/src/main/java/ohos/acts/multimedia/audio/audioplayer/MainAbility.java diff --git a/multimedia/audio/audio_js_standard/audioPlayer/src/main/java/ohos/acts/multimedia/audio/audioplayer/MyApplication.java b/multimedia/media/media_js_standard/audioPlayer/src/main/java/ohos/acts/multimedia/audio/audioplayer/MyApplication.java similarity index 100% rename from multimedia/audio/audio_js_standard/audioPlayer/src/main/java/ohos/acts/multimedia/audio/audioplayer/MyApplication.java rename to multimedia/media/media_js_standard/audioPlayer/src/main/java/ohos/acts/multimedia/audio/audioplayer/MyApplication.java diff --git a/multimedia/audio/audio_js_standard/audioPlayer/src/main/js/default/app.js b/multimedia/media/media_js_standard/audioPlayer/src/main/js/default/app.js old mode 100755 new mode 100644 similarity index 100% rename from multimedia/audio/audio_js_standard/audioPlayer/src/main/js/default/app.js rename to multimedia/media/media_js_standard/audioPlayer/src/main/js/default/app.js diff --git a/multimedia/audio/audio_js_standard/audioPlayer/src/main/js/default/i18n/en-US.json b/multimedia/media/media_js_standard/audioPlayer/src/main/js/default/i18n/en-US.json old mode 100755 new mode 100644 similarity index 100% rename from multimedia/audio/audio_js_standard/audioPlayer/src/main/js/default/i18n/en-US.json rename to multimedia/media/media_js_standard/audioPlayer/src/main/js/default/i18n/en-US.json diff --git a/multimedia/audio/audio_js_standard/audioPlayer/src/main/js/default/i18n/zh-CN.json b/multimedia/media/media_js_standard/audioPlayer/src/main/js/default/i18n/zh-CN.json old mode 100755 new mode 100644 similarity index 100% rename from multimedia/audio/audio_js_standard/audioPlayer/src/main/js/default/i18n/zh-CN.json rename to multimedia/media/media_js_standard/audioPlayer/src/main/js/default/i18n/zh-CN.json diff --git a/multimedia/audio/audio_js_standard/audioPlayer/src/main/js/default/pages/index/index.css b/multimedia/media/media_js_standard/audioPlayer/src/main/js/default/pages/index/index.css old mode 100755 new mode 100644 similarity index 100% rename from multimedia/audio/audio_js_standard/audioPlayer/src/main/js/default/pages/index/index.css rename to multimedia/media/media_js_standard/audioPlayer/src/main/js/default/pages/index/index.css diff --git a/multimedia/audio/audio_js_standard/audioPlayer/src/main/js/default/pages/index/index.hml b/multimedia/media/media_js_standard/audioPlayer/src/main/js/default/pages/index/index.hml old mode 100755 new mode 100644 similarity index 100% rename from multimedia/audio/audio_js_standard/audioPlayer/src/main/js/default/pages/index/index.hml rename to multimedia/media/media_js_standard/audioPlayer/src/main/js/default/pages/index/index.hml diff --git a/multimedia/audio/audio_js_standard/audioPlayer/src/main/js/default/pages/index/index.js b/multimedia/media/media_js_standard/audioPlayer/src/main/js/default/pages/index/index.js old mode 100755 new mode 100644 similarity index 100% rename from multimedia/audio/audio_js_standard/audioPlayer/src/main/js/default/pages/index/index.js rename to multimedia/media/media_js_standard/audioPlayer/src/main/js/default/pages/index/index.js diff --git a/multimedia/audio/audio_js_standard/audioPlayer/src/main/js/test/List.test.js b/multimedia/media/media_js_standard/audioPlayer/src/main/js/test/List.test.js old mode 100755 new mode 100644 similarity index 87% rename from multimedia/audio/audio_js_standard/audioPlayer/src/main/js/test/List.test.js rename to multimedia/media/media_js_standard/audioPlayer/src/main/js/test/List.test.js index 45c53b8fa399175972ae0282c04b863a7ec58b22..7ac6af3fe49e7bbfaf3f510f8894599cead42251 --- a/multimedia/audio/audio_js_standard/audioPlayer/src/main/js/test/List.test.js +++ b/multimedia/media/media_js_standard/audioPlayer/src/main/js/test/List.test.js @@ -14,4 +14,5 @@ */ require('./PlayerLocalTestAudioFUNC.test.js') -require('./PlayerLocalTestAudioFormat.test.js') \ No newline at end of file +require('./PlayerLocalTestAudioFormat.test.js') +require('./PlayerLocalTestAudioAPI.test.js') \ No newline at end of file diff --git a/multimedia/audio/audio_js_standard/audioPlayer_API/src/main/js/test/PlayerLocalTestAudioAPI.test.js b/multimedia/media/media_js_standard/audioPlayer/src/main/js/test/PlayerLocalTestAudioAPI.test.js similarity index 100% rename from multimedia/audio/audio_js_standard/audioPlayer_API/src/main/js/test/PlayerLocalTestAudioAPI.test.js rename to multimedia/media/media_js_standard/audioPlayer/src/main/js/test/PlayerLocalTestAudioAPI.test.js diff --git a/multimedia/audio/audio_js_standard/audioPlayer/src/main/js/test/PlayerLocalTestAudioFUNC.test.js b/multimedia/media/media_js_standard/audioPlayer/src/main/js/test/PlayerLocalTestAudioFUNC.test.js similarity index 100% rename from multimedia/audio/audio_js_standard/audioPlayer/src/main/js/test/PlayerLocalTestAudioFUNC.test.js rename to multimedia/media/media_js_standard/audioPlayer/src/main/js/test/PlayerLocalTestAudioFUNC.test.js diff --git a/multimedia/audio/audio_js_standard/audioPlayer/src/main/js/test/PlayerLocalTestAudioFormat.test.js b/multimedia/media/media_js_standard/audioPlayer/src/main/js/test/PlayerLocalTestAudioFormat.test.js similarity index 100% rename from multimedia/audio/audio_js_standard/audioPlayer/src/main/js/test/PlayerLocalTestAudioFormat.test.js rename to multimedia/media/media_js_standard/audioPlayer/src/main/js/test/PlayerLocalTestAudioFormat.test.js diff --git a/multimedia/audio/audio_js_standard/audioPlayer/src/main/resources/base/element/string.json b/multimedia/media/media_js_standard/audioPlayer/src/main/resources/base/element/string.json old mode 100755 new mode 100644 similarity index 100% rename from multimedia/audio/audio_js_standard/audioPlayer/src/main/resources/base/element/string.json rename to multimedia/media/media_js_standard/audioPlayer/src/main/resources/base/element/string.json diff --git a/multimedia/audio/audio_js_standard/audioPlayer/src/main/resources/base/media/icon.png b/multimedia/media/media_js_standard/audioPlayer/src/main/resources/base/media/icon.png old mode 100755 new mode 100644 similarity index 100% rename from multimedia/audio/audio_js_standard/audioPlayer/src/main/resources/base/media/icon.png rename to multimedia/media/media_js_standard/audioPlayer/src/main/resources/base/media/icon.png diff --git a/multimedia/audio/audio_js_standard/audioRecorder/BUILD.gn b/multimedia/media/media_js_standard/audioRecorder/BUILD.gn similarity index 100% rename from multimedia/audio/audio_js_standard/audioRecorder/BUILD.gn rename to multimedia/media/media_js_standard/audioRecorder/BUILD.gn diff --git a/multimedia/audio/audio_js_standard/audioRecorder/Test.json b/multimedia/media/media_js_standard/audioRecorder/Test.json similarity index 100% rename from multimedia/audio/audio_js_standard/audioRecorder/Test.json rename to multimedia/media/media_js_standard/audioRecorder/Test.json diff --git a/multimedia/audio/audio_js_standard/audioPlayer_API/signature/openharmony_sx.p7b b/multimedia/media/media_js_standard/audioRecorder/signature/openharmony_sx.p7b old mode 100755 new mode 100644 similarity index 100% rename from multimedia/audio/audio_js_standard/audioPlayer_API/signature/openharmony_sx.p7b rename to multimedia/media/media_js_standard/audioRecorder/signature/openharmony_sx.p7b diff --git a/multimedia/audio/audio_js_standard/audioRecorder/src/main/config.json b/multimedia/media/media_js_standard/audioRecorder/src/main/config.json similarity index 100% rename from multimedia/audio/audio_js_standard/audioRecorder/src/main/config.json rename to multimedia/media/media_js_standard/audioRecorder/src/main/config.json diff --git a/multimedia/audio/audio_js_standard/audioRecorder/src/main/java/ohos/acts/multimedia/audio/audioplayer/MainAbility.java b/multimedia/media/media_js_standard/audioRecorder/src/main/java/ohos/acts/multimedia/audio/audioplayer/MainAbility.java similarity index 100% rename from multimedia/audio/audio_js_standard/audioRecorder/src/main/java/ohos/acts/multimedia/audio/audioplayer/MainAbility.java rename to multimedia/media/media_js_standard/audioRecorder/src/main/java/ohos/acts/multimedia/audio/audioplayer/MainAbility.java diff --git a/multimedia/audio/audio_js_standard/audioRecorder/src/main/java/ohos/acts/multimedia/audio/audioplayer/MyApplication.java b/multimedia/media/media_js_standard/audioRecorder/src/main/java/ohos/acts/multimedia/audio/audioplayer/MyApplication.java similarity index 100% rename from multimedia/audio/audio_js_standard/audioRecorder/src/main/java/ohos/acts/multimedia/audio/audioplayer/MyApplication.java rename to multimedia/media/media_js_standard/audioRecorder/src/main/java/ohos/acts/multimedia/audio/audioplayer/MyApplication.java diff --git a/multimedia/audio/audio_js_standard/audioPlayer_API/src/main/js/default/app.js b/multimedia/media/media_js_standard/audioRecorder/src/main/js/default/app.js old mode 100755 new mode 100644 similarity index 100% rename from multimedia/audio/audio_js_standard/audioPlayer_API/src/main/js/default/app.js rename to multimedia/media/media_js_standard/audioRecorder/src/main/js/default/app.js diff --git a/multimedia/audio/audio_js_standard/audioPlayer_API/src/main/js/default/i18n/en-US.json b/multimedia/media/media_js_standard/audioRecorder/src/main/js/default/i18n/en-US.json old mode 100755 new mode 100644 similarity index 100% rename from multimedia/audio/audio_js_standard/audioPlayer_API/src/main/js/default/i18n/en-US.json rename to multimedia/media/media_js_standard/audioRecorder/src/main/js/default/i18n/en-US.json diff --git a/multimedia/audio/audio_js_standard/audioPlayer_API/src/main/js/default/i18n/zh-CN.json b/multimedia/media/media_js_standard/audioRecorder/src/main/js/default/i18n/zh-CN.json old mode 100755 new mode 100644 similarity index 100% rename from multimedia/audio/audio_js_standard/audioPlayer_API/src/main/js/default/i18n/zh-CN.json rename to multimedia/media/media_js_standard/audioRecorder/src/main/js/default/i18n/zh-CN.json diff --git a/multimedia/audio/audio_js_standard/audioPlayer_API/src/main/js/default/pages/index/index.css b/multimedia/media/media_js_standard/audioRecorder/src/main/js/default/pages/index/index.css old mode 100755 new mode 100644 similarity index 100% rename from multimedia/audio/audio_js_standard/audioPlayer_API/src/main/js/default/pages/index/index.css rename to multimedia/media/media_js_standard/audioRecorder/src/main/js/default/pages/index/index.css diff --git a/multimedia/audio/audio_js_standard/audioPlayer_API/src/main/js/default/pages/index/index.hml b/multimedia/media/media_js_standard/audioRecorder/src/main/js/default/pages/index/index.hml old mode 100755 new mode 100644 similarity index 100% rename from multimedia/audio/audio_js_standard/audioPlayer_API/src/main/js/default/pages/index/index.hml rename to multimedia/media/media_js_standard/audioRecorder/src/main/js/default/pages/index/index.hml diff --git a/multimedia/audio/audio_js_standard/audioPlayer_API/src/main/js/default/pages/index/index.js b/multimedia/media/media_js_standard/audioRecorder/src/main/js/default/pages/index/index.js old mode 100755 new mode 100644 similarity index 100% rename from multimedia/audio/audio_js_standard/audioPlayer_API/src/main/js/default/pages/index/index.js rename to multimedia/media/media_js_standard/audioRecorder/src/main/js/default/pages/index/index.js diff --git a/multimedia/audio/audio_js_standard/audioRecorder/src/main/js/test/List.test.js b/multimedia/media/media_js_standard/audioRecorder/src/main/js/test/List.test.js similarity index 100% rename from multimedia/audio/audio_js_standard/audioRecorder/src/main/js/test/List.test.js rename to multimedia/media/media_js_standard/audioRecorder/src/main/js/test/List.test.js diff --git a/multimedia/audio/audio_js_standard/audioRecorder/src/main/js/test/RecorderLocalTestAudioAPI.test.js b/multimedia/media/media_js_standard/audioRecorder/src/main/js/test/RecorderLocalTestAudioAPI.test.js similarity index 100% rename from multimedia/audio/audio_js_standard/audioRecorder/src/main/js/test/RecorderLocalTestAudioAPI.test.js rename to multimedia/media/media_js_standard/audioRecorder/src/main/js/test/RecorderLocalTestAudioAPI.test.js diff --git a/multimedia/audio/audio_js_standard/audioRecorder/src/main/js/test/RecorderLocalTestAudioFUNC.test.js b/multimedia/media/media_js_standard/audioRecorder/src/main/js/test/RecorderLocalTestAudioFUNC.test.js similarity index 100% rename from multimedia/audio/audio_js_standard/audioRecorder/src/main/js/test/RecorderLocalTestAudioFUNC.test.js rename to multimedia/media/media_js_standard/audioRecorder/src/main/js/test/RecorderLocalTestAudioFUNC.test.js diff --git a/multimedia/audio/audio_js_standard/audioPlayer_API/src/main/resources/base/element/string.json b/multimedia/media/media_js_standard/audioRecorder/src/main/resources/base/element/string.json old mode 100755 new mode 100644 similarity index 100% rename from multimedia/audio/audio_js_standard/audioPlayer_API/src/main/resources/base/element/string.json rename to multimedia/media/media_js_standard/audioRecorder/src/main/resources/base/element/string.json diff --git a/multimedia/audio/audio_js_standard/audioPlayer_API/src/main/resources/base/media/icon.png b/multimedia/media/media_js_standard/audioRecorder/src/main/resources/base/media/icon.png old mode 100755 new mode 100644 similarity index 100% rename from multimedia/audio/audio_js_standard/audioPlayer_API/src/main/resources/base/media/icon.png rename to multimedia/media/media_js_standard/audioRecorder/src/main/resources/base/media/icon.png