From 9a7fdcca0aae74954451853a22f152f4185998ba Mon Sep 17 00:00:00 2001 From: NOBUGGERS Date: Sat, 7 May 2022 10:41:05 +0800 Subject: [PATCH] audioplayer base Signed-off-by: NOBUGGERS Signed-off-by: NOBUGGERS --- .../media_js_standard/AudioPlayerTestBase.js | 153 ++++++++ .../media_js_standard/VideoPlayerTestBase.js | 14 +- .../audioPlayer/src/main/config.json | 2 +- .../audioRecorder/src/main/config.json | 2 +- .../media_js_standard/recorderFormat/BUILD.gn | 31 ++ .../recorderFormat/Test.json | 25 ++ .../signature/openharmony_sx.p7b | Bin 0 -> 3458 bytes .../recorderFormat/src/main/config.json | 100 +++++ .../audio/audioplayer/MainAbility.java | 35 ++ .../audio/audioplayer/MyApplication.java | 29 ++ .../recorderFormat/src/main/js/default/app.js | 23 ++ .../src/main/js/default/i18n/en-US.json | 6 + .../src/main/js/default/i18n/zh-CN.json | 6 + .../src/main/js/default/pages/index/index.css | 61 +++ .../src/main/js/default/pages/index/index.hml | 20 + .../src/main/js/default/pages/index/index.js | 41 ++ ...dioRecorderFormatCompatibilityTest.test.js | 368 ++++++++++++++++++ .../src/main/js/test/List.test.js | 16 + .../main/resources/base/element/string.json | 12 + .../src/main/resources/base/media/icon.png | Bin 0 -> 6790 bytes .../videoPlayer/src/main/config.json | 2 +- .../videoRecorder/src/main/config.json | 2 +- 22 files changed, 938 insertions(+), 10 deletions(-) create mode 100644 multimedia/media/media_js_standard/AudioPlayerTestBase.js create mode 100644 multimedia/media/media_js_standard/recorderFormat/BUILD.gn create mode 100644 multimedia/media/media_js_standard/recorderFormat/Test.json create mode 100644 multimedia/media/media_js_standard/recorderFormat/signature/openharmony_sx.p7b create mode 100644 multimedia/media/media_js_standard/recorderFormat/src/main/config.json create mode 100644 multimedia/media/media_js_standard/recorderFormat/src/main/java/ohos/acts/multimedia/audio/audioplayer/MainAbility.java create mode 100644 multimedia/media/media_js_standard/recorderFormat/src/main/java/ohos/acts/multimedia/audio/audioplayer/MyApplication.java create mode 100644 multimedia/media/media_js_standard/recorderFormat/src/main/js/default/app.js create mode 100644 multimedia/media/media_js_standard/recorderFormat/src/main/js/default/i18n/en-US.json create mode 100644 multimedia/media/media_js_standard/recorderFormat/src/main/js/default/i18n/zh-CN.json create mode 100644 multimedia/media/media_js_standard/recorderFormat/src/main/js/default/pages/index/index.css create mode 100644 multimedia/media/media_js_standard/recorderFormat/src/main/js/default/pages/index/index.hml create mode 100644 multimedia/media/media_js_standard/recorderFormat/src/main/js/default/pages/index/index.js create mode 100644 multimedia/media/media_js_standard/recorderFormat/src/main/js/test/AudioRecorderFormatCompatibilityTest.test.js create mode 100644 multimedia/media/media_js_standard/recorderFormat/src/main/js/test/List.test.js create mode 100644 multimedia/media/media_js_standard/recorderFormat/src/main/resources/base/element/string.json create mode 100644 multimedia/media/media_js_standard/recorderFormat/src/main/resources/base/media/icon.png diff --git a/multimedia/media/media_js_standard/AudioPlayerTestBase.js b/multimedia/media/media_js_standard/AudioPlayerTestBase.js new file mode 100644 index 000000000..40986f779 --- /dev/null +++ b/multimedia/media/media_js_standard/AudioPlayerTestBase.js @@ -0,0 +1,153 @@ +/* + * Copyright (C) 2022 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 media from '@ohos.multimedia.media' +import * as mediaTestBase from './MediaTestBase.js'; + +export function playAudioSource(src, duration, playTime, checkSeekTime, done) { + console.info(`case media source url: ${src}`) + let volumeChanged = false; + let playCount = 0; + let pauseCount = 0; + let stopCount = 0; + let seekCount = 0; + let audioPlayer = media.createAudioPlayer(); + if (audioPlayer == null) { + console.error('case createAudioPlayer failed'); + expect().assertFail(); + done(); + } + audioPlayer.src = src; + audioPlayer.on('dataLoad', () => { + console.info('case set source success'); + expect(audioPlayer.state).assertEqual('paused'); + expect(audioPlayer.currentTime).assertEqual(0); + expect(audioPlayer.duration).assertClose(duration, 500); + // step 0: dataLoad -> play + audioPlayer.play(); + }); + audioPlayer.on('play', () => { + console.info('case start to play'); + expect(audioPlayer.state).assertEqual('playing'); + playCount++; + if (playCount == 1) { + // step 1: play -> seek duration/3 + mediaTestBase.msleep(playTime); + audioPlayer.seek(audioPlayer.duration / 3); + } else if (playCount == 2) { + // step 5: play -> seek duration when loop is true + audioPlayer.loop = true; + audioPlayer.seek(audioPlayer.duration); + } else if (playCount == 3) { + // step 9: play -> stop + audioPlayer.stop(); + } else { + // step 12: play -> pause + audioPlayer.pause(); + } + }); + audioPlayer.on('pause', () => { + console.info('case now is paused'); + expect(audioPlayer.state).assertEqual('paused'); + pauseCount++; + if (pauseCount == 1) { + // step 3: pause -> seek 0 + audioPlayer.seek(0); + } else { + // step 13: pause -> stop + audioPlayer.stop(); + } + }); + audioPlayer.on('stop', () => { + console.info('case stop success'); + expect(audioPlayer.state).assertEqual('stopped'); + stopCount++; + if (stopCount == 1) { + // step 10: stop -> reset + audioPlayer.reset(); + } else { + // step 14: stop -> release + expect(volumeChanged).assertEqual(true); + audioPlayer.release(); + done(); + } + }); + audioPlayer.on('reset', () => { + console.info('case reset success'); + expect(audioPlayer.state).assertEqual('idle'); + // step 11: reset -> dataLoad + audioPlayer.src = src; + }); + audioPlayer.on('timeUpdate', (seekDoneTime) => { + seekCount++; + if (seekDoneTime == null) { + console.info(`case seek filed`); + audioPlayer.release(); + expect().assertFail(); + done(); + return; + } + console.info('case seek success, and seek time is ' + seekDoneTime); + if (seekCount == 1) { + // step 2: seek duration/3 -> pause + expect(audioPlayer.state).assertEqual('playing'); + if (checkSeekTime) { + expect(audioPlayer.duration / 3).assertEqual(seekDoneTime); + } + mediaTestBase.msleep(playTime); + audioPlayer.pause(); + } else if (seekCount == 2){ + // step 4: seek 0 -> play + if (checkSeekTime) { + expect(0).assertEqual(seekDoneTime); + } + expect(audioPlayer.state).assertEqual('paused'); + audioPlayer.play(); + } else if (seekCount == 3){ + // step 6: seek duration -> setVolume + seek duration when loop is false + if (checkSeekTime) { + expect(audioPlayer.duration).assertEqual(seekDoneTime); + } + mediaTestBase.msleep(playTime); + expect(audioPlayer.state).assertEqual('playing'); + audioPlayer.loop = false; + audioPlayer.setVolume(0.5); + audioPlayer.seek(audioPlayer.duration); + } else if (seekCount == 4){ + // step 7: seek duration -> setVolume + seek duration when loop is false + if (checkSeekTime) { + expect(audioPlayer.duration).assertEqual(seekDoneTime); + } + mediaTestBase.msleep(playTime); + expect(audioPlayer.state).assertEqual('stopped'); + } + }); + audioPlayer.on('volumeChange', () => { + console.info('case set volume success '); + volumeChanged = true; + }); + audioPlayer.on('finish', () => { + console.info('case play end'); + expect(audioPlayer.state).assertEqual('stopped'); + // step 8: play when stream is end + audioPlayer.play(); + }); + audioPlayer.on('error', (err) => { + console.error(`case error called,errMessage is ${err.message}`); + audioPlayer.release(); + expect().assertFail(); + done(); + }); +} \ No newline at end of file diff --git a/multimedia/media/media_js_standard/VideoPlayerTestBase.js b/multimedia/media/media_js_standard/VideoPlayerTestBase.js index 351f367ae..7eda18ac4 100644 --- a/multimedia/media/media_js_standard/VideoPlayerTestBase.js +++ b/multimedia/media/media_js_standard/VideoPlayerTestBase.js @@ -38,7 +38,7 @@ export async function clearRouter() { await router.clear(); } -export async function playVideoSource(url, width, height, duration, playTime) { +export async function playVideoSource(url, width, height, duration, playTime, done) { console.info(`case media source url: ${url}`) let videoPlayer = null; let surfaceID = globalThis.value; @@ -49,6 +49,7 @@ export async function playVideoSource(url, width, height, duration, playTime) { } else { console.error('case createVideoPlayer failed'); expect().assertFail(); + done(); } }, mediaTestBase.failureCallback).catch(mediaTestBase.catchCallback); @@ -59,13 +60,14 @@ export async function playVideoSource(url, width, height, duration, playTime) { videoPlayer.on('error', (err) => { console.error(`case error called, errMessage is ${err.message}`); expect().assertFail(); + videoPlayer.release(); + done(); }); videoPlayer.url = url; - if (width != null & height != null) { - await videoPlayer.setDisplaySurface(surfaceID).then(() => { - console.info('case setDisplaySurface success, surfaceID: ' + surfaceID); - }, mediaTestBase.failureCallback).catch(mediaTestBase.catchCallback); - } + await videoPlayer.setDisplaySurface(surfaceID).then(() => { + console.info('case setDisplaySurface success, surfaceID: ' + surfaceID); + }, mediaTestBase.failureCallback).catch(mediaTestBase.catchCallback); + await videoPlayer.prepare().then(() => { console.info('case prepare called'); diff --git a/multimedia/media/media_js_standard/audioPlayer/src/main/config.json b/multimedia/media/media_js_standard/audioPlayer/src/main/config.json index bdca28227..42108b2fa 100644 --- a/multimedia/media/media_js_standard/audioPlayer/src/main/config.json +++ b/multimedia/media/media_js_standard/audioPlayer/src/main/config.json @@ -44,7 +44,7 @@ } ], "deviceType": [ - "phone", + "default", "tablet", "tv", "wearable" diff --git a/multimedia/media/media_js_standard/audioRecorder/src/main/config.json b/multimedia/media/media_js_standard/audioRecorder/src/main/config.json index 3d5b3d7f6..938e76200 100644 --- a/multimedia/media/media_js_standard/audioRecorder/src/main/config.json +++ b/multimedia/media/media_js_standard/audioRecorder/src/main/config.json @@ -44,7 +44,7 @@ } ], "deviceType": [ - "phone", + "default", "tablet", "tv", "wearable" diff --git a/multimedia/media/media_js_standard/recorderFormat/BUILD.gn b/multimedia/media/media_js_standard/recorderFormat/BUILD.gn new file mode 100644 index 000000000..808bdf826 --- /dev/null +++ b/multimedia/media/media_js_standard/recorderFormat/BUILD.gn @@ -0,0 +1,31 @@ +# 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("recorder_format_js_hap") { + hap_profile = "./src/main/config.json" + deps = [ + ":recorder_format_js_assets", + ":recorder_format_resources", + ] + certificate_profile = "./signature/openharmony_sx.p7b" + hap_name = "ActsRecorderFormatJsTest" +} +ohos_js_assets("recorder_format_js_assets") { + source_dir = "./src/main/js/default" +} +ohos_resources("recorder_format_resources") { + sources = [ "./src/main/resources" ] + hap_profile = "./src/main/config.json" +} diff --git a/multimedia/media/media_js_standard/recorderFormat/Test.json b/multimedia/media/media_js_standard/recorderFormat/Test.json new file mode 100644 index 000000000..6183e3e92 --- /dev/null +++ b/multimedia/media/media_js_standard/recorderFormat/Test.json @@ -0,0 +1,25 @@ +{ + "description": "Configuration for audioRecorder Tests", + "driver": { + "type": "JSUnitTest", + "test-timeout": "1000000", + "package": "ohos.acts.multimedia.audio.recorderformat", + "shell-timeout": "60000" + }, + "kits": [ + { + "type": "ShellKit", + "run-command": [ + ], + "teardown-command":[ + ] + }, + { + "test-file-name": [ + "ActsRecorderFormatJsTest.hap" + ], + "type": "AppInstallKit", + "cleanup-apps": true + } + ] +} \ No newline at end of file diff --git a/multimedia/media/media_js_standard/recorderFormat/signature/openharmony_sx.p7b b/multimedia/media/media_js_standard/recorderFormat/signature/openharmony_sx.p7b new file mode 100644 index 0000000000000000000000000000000000000000..9f5b11e79355fb9d6f7cf7be4b2e60d661b2f33e GIT binary patch literal 3458 zcmcgvdsGuw8Yd5+h!HF*N>v~}uxj8=NFc%5b|#s;WD*h*AQX#}Wb%MyCL|Lk#Al;r zMT@TWRIRV#3w3?%QCnos(YkikwXS+>U3X7c>{`p&>biBiT6OhkcLu0}NB`K`PW8cS)3Tppf870zic_x0`?zY&6{zMEl%6Cr)#y zCESCcTD>txg<7n7ja~&?(H?INiRtw!ET&Sy4#ER7dIa|9QQV{|h^b)=@pu}%^>wB) zvsn!@HW<@lQB@2!ARc1{0^6-{z0t(3U@>rYg|@<5LprQz9i~EiqTncoKOJSRLKuhEUuUnf z1RYYD#|%(L=XDyfI+Vfc;3gJ>RUb83v1ldhHLB~QSREF9?5jg4%p7J^<{pe%lrgBS zb*K$P^u4&eSZNLU)SgkT6|U<2&#)Cml}vS|TyL*3&Pz~eMMuT>#2H$WM``pGpxp8n5j1Fqp*R-L77<^l&STRf?&9YEX7=< zDz(Qfx9K21KxAcFFXG2ME}t~!R*?0|a1f87W_bN9CL7DfML6vc z2kU)3>JuVyzj$t2Jn3H`&VLQWd7rik_&h#eSiC)O1Po4ki51wh(}e;-VghhNsURgu zU=t=~@Kr`=7K;u9zHzdf&>OTYrgMLnaSo}FE z7>vynNg*HwQb@{v<<*%YnG%u~LVYF({z4D{f&)9qNJ{QW z1E1HI4*@S(fFuYj&+-4+*}nf9xZ%j~Q}0h&yGK*JP_!nS_uZb!e|Ycmr7L5x9mPKi zzWCt;$)93t+_)y;?Jp@ zW^{B-nBDn9;@r&=Ef~TDr15w^355cF@&Yi1vxf*r2#1}*u89TO5D-3S2unra^u%Tr#ET;%Nx=e&Fc?uY+lpx4YJ&I$^GM% z?YFPACKb(k^qURrl(y!&*w>E+m%um1&n!*MUGn?(1txGw{r4pkyDV8pd8!@P#vj-s zPmk_=6rR`pZQ22rKWdggr~3Glc15vtAQs^Lg{7MWCia#t`+23aP!#+M|#vHcm=M^Vw|GfnPZ-O+AC>b1a5`lpI3}g~7sUMRvOVT&(8a1ao!L|%6RyUYdG+o@D zd0|TXS?$Q?M3zT5%cJf-9*rfAP9KQm1y--07(wzvX@4GZ=8I9p=TInjWD*`LhmA$-Z~})RkrTCAKY2fDaI-XL98K z;Mg<8ZNLd5@FoC)4+59oRxJFGzB&K5_e#9AJ5LsEym}=4J)g@yn)X#b6z9P#$)>Zn1yKJ&%Gh_J_P?04`M}7>7n2kL#E$)Zo#BDekByW> zD2+W7rJxW%KmpjZuo@IR85KfeVNUr3gJyho(MsFZ4^|C7evI68=>D)*-X8tkqF2{; zPOBI3!Jx+{IbWy+C_gvh(8{BkclV8GcFloH7X37=<#evG<=n&5RKshF)4J|i&+v0* mcF&2-RF-@wJUYksmpg~&-%}u2fmruv@3#&un(UkW?f(E-P+H^w literal 0 HcmV?d00001 diff --git a/multimedia/media/media_js_standard/recorderFormat/src/main/config.json b/multimedia/media/media_js_standard/recorderFormat/src/main/config.json new file mode 100644 index 000000000..a7e86cc7b --- /dev/null +++ b/multimedia/media/media_js_standard/recorderFormat/src/main/config.json @@ -0,0 +1,100 @@ +{ + "app": { + "apiVersion": { + "compatible": 6, + "releaseType": "Beta1", + "target": 7 + }, + "vendor": "acts", + "bundleName": "ohos.acts.multimedia.audio.recorderformat", + "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.recorderformat.MainAbility", + "description": "$string:mainability_description", + "label": "$string:entry_MainAbility", + "type": "page", + "homeAbility": true, + "launchType": "standard" + } + ], + "deviceType": [ + "default", + "tablet", + "tv", + "wearable" + ], + "reqPermissions": [ + { + "name" : "ohos.permission.GRANT_SENSITIVE_PERMISSIONS", + "reason" : "use ohos.permission.GRANT_SENSITIVE_PERMISSIONS" + }, + { + "name" : "ohos.permission.REVOKE_SENSITIVE_PERMISSIONS", + "reason" : "use ohos.permission.REVOKE_SENSITIVE_PERMISSIONS" + }, + { + "name" : "ohos.permission.MICROPHONE", + "reason" : "use ohos.permission.MICROPHONE" + }, + { + "name" : "ohos.permission.MEDIA_LOCATION", + "reason" : "use ohos.permission.MEDIA_LOCATION" + }, + { + "name" : "ohos.permission.READ_MEDIA", + "reason" : "use ohos.permission.READ_MEDIA" + }, + { + "name" : "ohos.permission.WRITE_MEDIA", + "reason" : "use ohos.permission.WRITE_MEDIA" + } + ], + "mainAbility": "ohos.acts.multimedia.audio.recorderformat.MainAbility", + "distro": { + "moduleType": "entry", + "installationFree": false, + "deliveryWithInstall": true, + "moduleName": "entry" + }, + "package": "ohos.acts.multimedia.audio.recorderformat", + "name": ".MyApplication", + "js": [ + { + "pages": [ + "pages/index/index" + ], + "name": "default", + "window": { + "designWidth": 720, + "autoDesignWidth": true + } + } + ] + } +} \ No newline at end of file diff --git a/multimedia/media/media_js_standard/recorderFormat/src/main/java/ohos/acts/multimedia/audio/audioplayer/MainAbility.java b/multimedia/media/media_js_standard/recorderFormat/src/main/java/ohos/acts/multimedia/audio/audioplayer/MainAbility.java new file mode 100644 index 000000000..c3adacfc7 --- /dev/null +++ b/multimedia/media/media_js_standard/recorderFormat/src/main/java/ohos/acts/multimedia/audio/audioplayer/MainAbility.java @@ -0,0 +1,35 @@ +/* + * Copyright (C) 2022 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.audioplayer; + + 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/media/media_js_standard/recorderFormat/src/main/java/ohos/acts/multimedia/audio/audioplayer/MyApplication.java b/multimedia/media/media_js_standard/recorderFormat/src/main/java/ohos/acts/multimedia/audio/audioplayer/MyApplication.java new file mode 100644 index 000000000..956bc8897 --- /dev/null +++ b/multimedia/media/media_js_standard/recorderFormat/src/main/java/ohos/acts/multimedia/audio/audioplayer/MyApplication.java @@ -0,0 +1,29 @@ +/* + * Copyright (C) 2022 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.audioplayer; + + import ohos.aafwk.ability.AbilityPackage; + +/* + * java MyApplication + */ + + public class MyApplication extends AbilityPackage { + @Override + public void onInitialize() { + super.onInitialize(); + } + } diff --git a/multimedia/media/media_js_standard/recorderFormat/src/main/js/default/app.js b/multimedia/media/media_js_standard/recorderFormat/src/main/js/default/app.js new file mode 100644 index 000000000..830070d19 --- /dev/null +++ b/multimedia/media/media_js_standard/recorderFormat/src/main/js/default/app.js @@ -0,0 +1,23 @@ +/* + * Copyright (C) 2022 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/media/media_js_standard/recorderFormat/src/main/js/default/i18n/en-US.json b/multimedia/media/media_js_standard/recorderFormat/src/main/js/default/i18n/en-US.json new file mode 100644 index 000000000..e63c70d97 --- /dev/null +++ b/multimedia/media/media_js_standard/recorderFormat/src/main/js/default/i18n/en-US.json @@ -0,0 +1,6 @@ +{ + "strings": { + "hello": "Hello", + "world": "World" + } +} \ No newline at end of file diff --git a/multimedia/media/media_js_standard/recorderFormat/src/main/js/default/i18n/zh-CN.json b/multimedia/media/media_js_standard/recorderFormat/src/main/js/default/i18n/zh-CN.json new file mode 100644 index 000000000..de6ee5748 --- /dev/null +++ b/multimedia/media/media_js_standard/recorderFormat/src/main/js/default/i18n/zh-CN.json @@ -0,0 +1,6 @@ +{ + "strings": { + "hello": "您好", + "world": "世界" + } +} \ No newline at end of file diff --git a/multimedia/media/media_js_standard/recorderFormat/src/main/js/default/pages/index/index.css b/multimedia/media/media_js_standard/recorderFormat/src/main/js/default/pages/index/index.css new file mode 100644 index 000000000..c9195944a --- /dev/null +++ b/multimedia/media/media_js_standard/recorderFormat/src/main/js/default/pages/index/index.css @@ -0,0 +1,61 @@ +/* + * Copyright (C) 2022 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. + */ + +.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/media/media_js_standard/recorderFormat/src/main/js/default/pages/index/index.hml b/multimedia/media/media_js_standard/recorderFormat/src/main/js/default/pages/index/index.hml new file mode 100644 index 000000000..8d0e2061b --- /dev/null +++ b/multimedia/media/media_js_standard/recorderFormat/src/main/js/default/pages/index/index.hml @@ -0,0 +1,20 @@ + + +
+ + {{ $t('strings.hello') }} {{ title }} + +
diff --git a/multimedia/media/media_js_standard/recorderFormat/src/main/js/default/pages/index/index.js b/multimedia/media/media_js_standard/recorderFormat/src/main/js/default/pages/index/index.js new file mode 100644 index 000000000..67f8b8567 --- /dev/null +++ b/multimedia/media/media_js_standard/recorderFormat/src/main/js/default/pages/index/index.js @@ -0,0 +1,41 @@ +/* + * Copyright (C) 2022 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/media/media_js_standard/recorderFormat/src/main/js/test/AudioRecorderFormatCompatibilityTest.test.js b/multimedia/media/media_js_standard/recorderFormat/src/main/js/test/AudioRecorderFormatCompatibilityTest.test.js new file mode 100644 index 000000000..6e1b25a53 --- /dev/null +++ b/multimedia/media/media_js_standard/recorderFormat/src/main/js/test/AudioRecorderFormatCompatibilityTest.test.js @@ -0,0 +1,368 @@ +/* + * 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 media from '@ohos.multimedia.media' +import abilityAccessCtrl from '@ohos.abilityAccessCtrl' +import bundle from '@ohos.bundle' +import mediaLibrary from '@ohos.multimedia.mediaLibrary' +import {describe, beforeAll, beforeEach, afterEach, afterAll, it, expect} from 'deccjsunit/index' + +describe('AudioRecorderFormatCompatibilityTest', function () { + const END_STATE = 0; + const PRE_STATE = 1; + const START_STATE = 2; + const PAUSE_STATE = 3; + const RESUME_STATE = 4; + const STOP_STATE = 5; + const RESET_STATE = 6; + const RELEASE_STATE = 7; + const ERROR_STATE = 8; + const RECORDER_TIME = 1000; + let fdPath; + let fileAsset; + let fdNumber; + let audioRecorder; + let audioConfig = { + audioSourceType : media.AudioSourceType.AUDIO_SOURCE_TYPE_MIC, + audioEncoder : media.AudioSourceType.AAC_LC, + audioEncodeBitRate : 22050, + audioSampleRate : 22050, + numberOfChannels : 2, + format : media.AudioOutputFormat.AAC_ADTS, + uri : 'file:///data/accounts/account_0/appdata/appdata/recorder/test.m4a', + location : { latitude : 1, longitude : 1 }, + } + + function sleep(time) { + for(let t = Date.now();Date.now() - t <= time;); + } + + function initAudioRecorder() { + if (typeof (audioRecorder) != 'undefined') { + audioRecorder.release(); + audioRecorder = undefined; + } + audioRecorder = media.createAudioRecorder(); + } + + beforeAll(async function () { + await applyPermission(); + console.info('beforeAll case'); + }) + + beforeEach(function () { + console.info('beforeEach case'); + }) + + afterEach(async function () { + await closeFd(); + console.info('afterEach case'); + }) + + afterAll(function () { + console.info('afterAll case'); + }) + + async function applyPermission() { + let appInfo = await bundle.getApplicationInfo('ohos.acts.multimedia.audio.recorderformat', 0, 100); + let atManager = abilityAccessCtrl.createAtManager(); + if (atManager != null) { + let tokenID = appInfo.accessTokenId; + console.info('[permission] case accessTokenID is ' + tokenID); + let permissionName1 = 'ohos.permission.MICROPHONE'; + let permissionName2 = 'ohos.permission.MEDIA_LOCATION'; + let permissionName3 = 'ohos.permission.READ_MEDIA'; + let permissionName4 = 'ohos.permission.WRITE_MEDIA'; + await atManager.grantUserGrantedPermissi + + + + + + + on(tokenID, permissionName1, 1).then((result) => { + console.info('[permission] case grantUserGrantedPermission success :' + result); + }).catch((err) => { + console.error('[permission] case grantUserGrantedPermission failed :' + err); + }); + await atManager.grantUserGrantedPermission(tokenID, permissionName2, 1).then((result) => { + console.info('[permission] case grantUserGrantedPermission success :' + result); + }).catch((err) => { + console.error('[permission] case grantUserGrantedPermission failed :' + err); + }); + await atManager.grantUserGrantedPermission(tokenID, permissionName3, 1).then((result) => { + console.info('[permission] case grantUserGrantedPermission success :' + result); + }).catch((err) => { + console.error('[permission] case grantUserGrantedPermission failed :' + err); + }); + await atManager.grantUserGrantedPermission(tokenID, permissionName4, 1).then((result) => { + console.info('[permission] case grantUserGrantedPermission success :' + result); + }).catch((err) => { + console.error('[permission] case grantUserGrantedPermission failed :' + err); + }); + } else { + console.error('[permission] case apply permission failed, createAtManager failed'); + } + } + + async function getFd(pathName) { + let displayName = pathName; + const mediaTest = mediaLibrary.getMediaLibrary(); + let fileKeyObj = mediaLibrary.FileKey; + let mediaType = mediaLibrary.MediaType.VIDEO; + let publicPath = await mediaTest.getPublicDirectory(mediaLibrary.DirectoryType.DIR_VIDEO); + let dataUri = await mediaTest.createAsset(mediaType, displayName, publicPath); + if (dataUri != undefined) { + let args = dataUri.id.toString(); + let fetchOp = { + selections : fileKeyObj.ID + "=?", + selectionArgs : [args], + } + let fetchFileResult = await mediaTest.getFileAssets(fetchOp); + fileAsset = await fetchFileResult.getAllObject(); + fdNumber = await fileAsset[0].open('Rw'); + fdPath = "fd://" + fdNumber.toString(); + console.info(`[mediaLibrary] case fdPath: ${fdPath}`); + } else { + console.error('[mediaLibrary] case dataUri is null') + } + } + + async function closeFd() { + if (fileAsset != null) { + await fileAsset[0].close(fdNumber).then(() => { + console.info('[mediaLibrary] case close fd success'); + }).catch((err) => { + console.error('[mediaLibrary] case close fd failed'); + }); + } else { + console.error('[mediaLibrary] case fileAsset is null'); + } + } + + function nextStep(mySteps, done) { + if (mySteps[0] == END_STATE) { + done(); + console.info('case to done'); + return; + } + switch (mySteps[0]) { + case PRE_STATE: + console.info('case to prepare'); + audioRecorder.prepare(audioConfig); + break; + case START_STATE: + console.info('case to start'); + audioRecorder.start(); + break; + case PAUSE_STATE: + console.info('case to pause'); + audioRecorder.pause(); + break; + case RESUME_STATE: + console.info('case to resume'); + audioRecorder.resume(); + break; + case STOP_STATE: + console.info('case to stop'); + audioRecorder.stop(); + break; + case RESET_STATE: + console.info('case to reset'); + audioRecorder.reset(); + break; + case RELEASE_STATE: + console.info('case to release'); + audioRecorder.release(); + audioRecorder = undefined; + break; + case ERROR_STATE: + console.info('case to wait error callback'); + break; + default: + break; + } + } + + function setCallback(mySteps, done) { + audioRecorder.on('prepare', () => { + console.info('setCallback prepare() case callback is called'); + mySteps.shift(); + nextStep(mySteps, done); + }); + + audioRecorder.on('start', () => { + console.info('setCallback start() case callback is called'); + sleep(RECORDER_TIME); + mySteps.shift(); + nextStep(mySteps, done); + }); + + audioRecorder.on('pause', () => { + console.info('setCallback pause() case callback is called'); + sleep(RECORDER_TIME); + mySteps.shift(); + nextStep(mySteps, done); + }); + + audioRecorder.on('resume', () => { + console.info('setCallback resume() case callback is called'); + sleep(RECORDER_TIME); + mySteps.shift(); + nextStep(mySteps, done); + }); + + audioRecorder.on('stop', () => { + console.info('setCallback stop() case callback is called'); + mySteps.shift(); + nextStep(mySteps, done); + }); + + audioRecorder.on('reset', () => { + console.info('setCallback reset() case callback is called'); + mySteps.shift(); + nextStep(mySteps, done); + }); + + audioRecorder.on('release', () => { + console.info('setCallback release() case callback is called'); + mySteps.shift(); + nextStep(mySteps, done); + }); + audioRecorder.on('error', (err) => { + console.info(`case error called,errName is ${err.name}`); + console.info(`case error called,errCode is ${err.code}`); + console.info(`case error called,errMessage is ${err.message}`); + mySteps.shift(); + expect(mySteps[0]).assertEqual(ERROR_STATE); + mySteps.shift(); + nextStep(mySteps, done); + }); + } + + /* * + * @tc.number : SUB_MEDIA_AUDIO_RECORDER_FORMAT_COMPATIBILITY_0100 + * @tc.name : location: {latitude: -90, longitude: -180} + * @tc.desc : location test + * @tc.size : MediumTest + * @tc.type : Function + * @tc.level : Level1 + */ + it('SUB_MEDIA_AUDIO_RECORDER_FORMAT_COMPATIBILITY_0100', 0, async function (done) { + await getFd('COMPATIBILITY_0100.m4a'); + audioConfig.uri = fdPath; + audioConfig.location.latitude = -90; + audioConfig.location.longitude = -180; + initAudioRecorder(); + let mySteps = new Array(PRE_STATE, START_STATE, STOP_STATE, RELEASE_STATE, END_STATE); + setCallback(mySteps, done); + audioRecorder.prepare(audioConfig); + }) + + /* * + * @tc.number : SUB_MEDIA_AUDIO_RECORDER_FORMAT_COMPATIBILITY_0200 + * @tc.name : location: {latitude: 90, longitude: 180} + * @tc.desc : location test + * @tc.size : MediumTest + * @tc.type : Function + * @tc.level : Level1 + */ + it('SUB_MEDIA_AUDIO_RECORDER_FORMAT_COMPATIBILITY_0200', 0, async function (done) { + await getFd('COMPATIBILITY_0200.m4a'); + audioConfig.uri = fdPath; + audioConfig.location.latitude = 90; + audioConfig.location.longitude = 180; + initAudioRecorder(); + let mySteps = new Array(PRE_STATE, START_STATE, STOP_STATE, RELEASE_STATE, END_STATE); + setCallback(mySteps, done); + audioRecorder.prepare(audioConfig); + }) + + /* * + * @tc.number : SUB_MEDIA_AUDIO_RECORDER_FORMAT_COMPATIBILITY_0300 + * @tc.name : location: {latitude: 0, longitude: 0} + * @tc.desc : location test + * @tc.size : MediumTest + * @tc.type : Function + * @tc.level : Level1 + */ + it('SUB_MEDIA_AUDIO_RECORDER_FORMAT_COMPATIBILITY_0300', 0, async function (done) { + await getFd('COMPATIBILITY_0300.m4a'); + audioConfig.uri = fdPath; + audioConfig.location.latitude = 0; + audioConfig.location.longitude = 0; + initAudioRecorder(); + let mySteps = new Array(PRE_STATE, START_STATE, STOP_STATE, RELEASE_STATE, END_STATE); + setCallback(mySteps, done); + audioRecorder.prepare(audioConfig); + }) + + /* * + * @tc.number : SUB_MEDIA_AUDIO_RECORDER_FORMAT_COMPATIBILITY_0400 + * @tc.name : location: {latitude: 0, longitude: 180} + * @tc.desc : location test + * @tc.size : MediumTest + * @tc.type : Function + * @tc.level : Level1 + */ + it('SUB_MEDIA_AUDIO_RECORDER_FORMAT_COMPATIBILITY_0400', 0, async function (done) { + await getFd('COMPATIBILITY_0400.m4a'); + audioConfig.uri = fdPath; + audioConfig.location.latitude = 0; + audioConfig.location.longitude = 180; + initAudioRecorder(); + let mySteps = new Array(PRE_STATE, START_STATE, STOP_STATE, RELEASE_STATE, END_STATE); + setCallback(mySteps, done); + audioRecorder.prepare(audioConfig); + }) + + /* * + * @tc.number : SUB_MEDIA_AUDIO_RECORDER_FORMAT_COMPATIBILITY_0500 + * @tc.name : location: {latitude: -30, longitude: 60} + * @tc.desc : location test + * @tc.size : MediumTest + * @tc.type : Function + * @tc.level : Level1 + */ + it('SUB_MEDIA_AUDIO_RECORDER_FORMAT_COMPATIBILITY_0500', 0, async function (done) { + await getFd('COMPATIBILITY_0500.m4a'); + audioConfig.uri = fdPath; + audioConfig.location.latitude = -30; + audioConfig.location.longitude = 60; + initAudioRecorder(); + let mySteps = new Array(PRE_STATE, START_STATE, STOP_STATE, RELEASE_STATE, END_STATE); + setCallback(mySteps, done); + audioRecorder.prepare(audioConfig); + }) + + /* * + * @tc.number : SUB_MEDIA_AUDIO_RECORDER_FORMAT_COMPATIBILITY_0600 + * @tc.name : location: {latitude: 60, longitude: -90} + * @tc.desc : location test + * @tc.size : MediumTest + * @tc.type : Function + * @tc.level : Level1 + */ + it('SUB_MEDIA_AUDIO_RECORDER_FORMAT_COMPATIBILITY_0600', 0, async function (done) { + await getFd('COMPATIBILITY_0600.m4a'); + audioConfig.uri = fdPath; + audioConfig.location.latitude = 60; + audioConfig.location.longitude = -90; + initAudioRecorder(); + let mySteps = new Array(PRE_STATE, START_STATE, STOP_STATE, RELEASE_STATE, END_STATE); + setCallback(mySteps, done); + audioRecorder.prepare(audioConfig); + }) +}) diff --git a/multimedia/media/media_js_standard/recorderFormat/src/main/js/test/List.test.js b/multimedia/media/media_js_standard/recorderFormat/src/main/js/test/List.test.js new file mode 100644 index 000000000..46b0df3e2 --- /dev/null +++ b/multimedia/media/media_js_standard/recorderFormat/src/main/js/test/List.test.js @@ -0,0 +1,16 @@ +/* + * Copyright (C) 2022 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('./AudioRecorderFormatCompatibilityTest.test.js') diff --git a/multimedia/media/media_js_standard/recorderFormat/src/main/resources/base/element/string.json b/multimedia/media/media_js_standard/recorderFormat/src/main/resources/base/element/string.json new file mode 100644 index 000000000..0bae6bd40 --- /dev/null +++ b/multimedia/media/media_js_standard/recorderFormat/src/main/resources/base/element/string.json @@ -0,0 +1,12 @@ +{ + "string": [ + { + "name": "entry_MainAbility", + "value": "entry_MainAbility" + }, + { + "name": "mainability_description", + "value": "JS_Empty Ability" + } + ] +} \ No newline at end of file diff --git a/multimedia/media/media_js_standard/recorderFormat/src/main/resources/base/media/icon.png b/multimedia/media/media_js_standard/recorderFormat/src/main/resources/base/media/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..ce307a8827bd75456441ceb57d530e4c8d45d36c GIT binary patch literal 6790 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