diff --git a/multimedia/media/media_js_standard/audioDecoder/Test.json b/multimedia/media/media_js_standard/audioDecoder/Test.json index e25486fa9ec9c78b674479dcfb4fc8ef8d201493..cedb3b5ec0230c70770278febb34a65d8c720c67 100644 --- a/multimedia/media/media_js_standard/audioDecoder/Test.json +++ b/multimedia/media/media_js_standard/audioDecoder/Test.json @@ -4,9 +4,16 @@ "type": "JSUnitTest", "test-timeout": "2000000", "package": "ohos.acts.multimedia.audio.audiodecoder", - "shell-timeout": "60000" + "shell-timeout": "60000" }, "kits": [ + { + "test-file-name": [ + "ActsAudioDecoderJsTest.hap" + ], + "type": "AppInstallKit", + "cleanup-apps": true + }, { "type": "PushKit", "pre-push": [ @@ -19,7 +26,7 @@ "./resource/audio/audioDecode/vorbis.es ->/data/accounts/account_0/appdata/ohos.acts.multimedia.audio.audiodecoder/" ] }, - { + { "type": "ShellKit", "run-command": [ "rm -R /data/accounts/account_0/appdata/ohos.acts.multimedia.audio.audiodecoder/results", @@ -29,13 +36,6 @@ ], "teardown-command":[ ] - }, - { - "test-file-name": [ - "ActsAudioDecoderJsTest.hap" - ], - "type": "AppInstallKit", - "cleanup-apps": true } ] -} +} \ No newline at end of file diff --git a/multimedia/media/media_js_standard/audioEncoder/Test.json b/multimedia/media/media_js_standard/audioEncoder/Test.json index dea08584c4e4fffff1fc9a42a2b0f4a4439d4e72..62300221edec1a5541149a57498ef4bc2797b78f 100644 --- a/multimedia/media/media_js_standard/audioEncoder/Test.json +++ b/multimedia/media/media_js_standard/audioEncoder/Test.json @@ -4,9 +4,16 @@ "type": "JSUnitTest", "test-timeout": "2000000", "package": "ohos.acts.multimedia.audio.audioencoder", - "shell-timeout": "60000" + "shell-timeout": "60000" }, "kits": [ + { + "test-file-name": [ + "ActsAudioEncoderJsTest.hap" + ], + "type": "AppInstallKit", + "cleanup-apps": true + }, { "type": "PushKit", "pre-push": [ @@ -16,7 +23,7 @@ "./resource/audio/audioEncode/S32LE_2.pcm ->/data/accounts/account_0/appdata/ohos.acts.multimedia.audio.audioencoder/" ] }, - { + { "type": "ShellKit", "run-command": [ "rm -R /data/accounts/account_0/appdata/ohos.acts.multimedia.audio.audioencoder/results", @@ -26,13 +33,6 @@ ], "teardown-command":[ ] - }, - { - "test-file-name": [ - "ActsAudioEncoderJsTest.hap" - ], - "type": "AppInstallKit", - "cleanup-apps": true } ] -} +} \ No newline at end of file diff --git a/multimedia/media/media_js_standard/audioPlayer/BUILD.gn b/multimedia/media/media_js_standard/audioPlayer/BUILD.gn index 5b1d783ea81cf4d8864630a92dbd233d608cac42..9bad2266c231f6eeaa907b53225551208e22a528 100644 --- a/multimedia/media/media_js_standard/audioPlayer/BUILD.gn +++ b/multimedia/media/media_js_standard/audioPlayer/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright (C) 2021-2022 Huawei Device Co., Ltd. +# 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 diff --git a/multimedia/media/media_js_standard/audioPlayer/Test.json b/multimedia/media/media_js_standard/audioPlayer/Test.json index ddb68ab0978381fd8d182cbb1804c48d4d2977e5..8d705ef062a1f50e917474387d1415222f66a863 100644 --- a/multimedia/media/media_js_standard/audioPlayer/Test.json +++ b/multimedia/media/media_js_standard/audioPlayer/Test.json @@ -2,11 +2,18 @@ "description": "Configuration for audioPlayer Tests", "driver": { "type": "JSUnitTest", - "test-timeout": "120000", + "test-timeout": "2000000", "package": "ohos.acts.multimedia.audio.audioplayer", "shell-timeout": "60000" }, "kits": [ + { + "test-file-name": [ + "ActsAudioPlayerJsTest.hap" + ], + "type": "AppInstallKit", + "cleanup-apps": true + }, { "type": "PushKit", "pre-push": [ @@ -44,13 +51,6 @@ ], "teardown-command":[ ] - }, - { - "test-file-name": [ - "ActsAudioPlayerJsTest.hap" - ], - "type": "AppInstallKit", - "cleanup-apps": true } ] } diff --git a/multimedia/media/media_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 index c3adacfc7a7e0e86651b857ee2f6e857d5c173be..84cb3efd1dba0d92d906a3624192afd6b887499a 100644 --- a/multimedia/media/media_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 @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022 Huawei Device Co., Ltd. + * 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 diff --git a/multimedia/media/media_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 index 956bc88979f54b82cf83932c34081ad9f26e8588..a735d0a33e16bdb4ae0194d12fb865e64207b88e 100644 --- a/multimedia/media/media_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 @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022 Huawei Device Co., Ltd. + * 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 diff --git a/multimedia/media/media_js_standard/audioPlayer/src/main/js/default/app.js b/multimedia/media/media_js_standard/audioPlayer/src/main/js/default/app.js index dab1e8146b5f31325a3aaed0c1fbb9a6c73b39d3..e423f4bce4698ec1d7dc86c3eea3990a5e7b1085 100644 --- a/multimedia/media/media_js_standard/audioPlayer/src/main/js/default/app.js +++ b/multimedia/media/media_js_standard/audioPlayer/src/main/js/default/app.js @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021-2022 Huawei Device Co., Ltd. + * 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 diff --git a/multimedia/media/media_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 index 9fbc8868aac904db047906f6407339108a857414..5bd7567028568bd522193b2519d545ca6dcf397d 100644 --- a/multimedia/media/media_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 @@ -1,18 +1,3 @@ -/* - * Copyright (C) 2021-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; diff --git a/multimedia/media/media_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 index e886a71e3b847d80047843e600b38e9c4164b116..f64b040a5ae394dbaa5e185e1ecd4f4556b92184 100644 --- a/multimedia/media/media_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 @@ -1,18 +1,3 @@ - -