提交 52178d10 编写于 作者: C caochuan

规范包名

Signed-off-by: Ncaochuan <caochuan@huawei.com>
上级 3930ac91
...@@ -17,16 +17,16 @@ import abilityAccessCtrl from '@ohos.abilityAccessCtrl'; ...@@ -17,16 +17,16 @@ import abilityAccessCtrl from '@ohos.abilityAccessCtrl';
import bundle from '@ohos.bundle'; import bundle from '@ohos.bundle';
const presetsCount = { const presetsCount = {
ActsMediaLibraryAlbum: { albumsCount: 7, assetsCount: 19 }, ActsMediaLibraryAlbumTest: { albumsCount: 7, assetsCount: 19 },
ActsMediaLibraryFavorite: { albumsCount: 6, assetsCount: 32 }, ActsMediaLibraryFavoriteTest: { albumsCount: 6, assetsCount: 32 },
ActsMediaLibraryAlbumFileResultCb: { albumsCount: 5, assetsCount: 118 }, ActsMediaLibraryAlbumFileResultCb: { albumsCount: 5, assetsCount: 118 },
ActsMediaLibraryFile: { albumsCount: 6, assetsCount: 21 }, ActsMediaLibraryFileTest: { albumsCount: 6, assetsCount: 21 },
ActsMediaLibraryFileAsset: { albumsCount: 27, assetsCount: 72 }, ActsMediaLibraryFileAssetTest: { albumsCount: 27, assetsCount: 72 },
ActsMediaLibraryFileAssetUri: { albumsCount: 3, assetsCount: 6 }, ActsMediaLibraryFileAssetUri: { albumsCount: 3, assetsCount: 6 },
ActsMediaLibraryFileKey: { albumsCount: 2, assetsCount: 2 }, ActsMediaLibraryFileKeyTest: { albumsCount: 2, assetsCount: 2 },
ActsMediaLibraryFileResult: { albumsCount: 4, assetsCount: 13 }, ActsMediaLibraryFileResultTest: { albumsCount: 4, assetsCount: 13 },
ActsMediaLibraryGetThumbnail: { albumsCount: 3, assetsCount: 3 }, ActsMediaLibraryGetThumbnail: { albumsCount: 3, assetsCount: 3 },
ActsMediaLibraryBase: { albumsCount: 11, assetsCount: 11 }, ActsMediaLibraryBaseTest: { albumsCount: 11, assetsCount: 11 },
} }
const IMAGE_TYPE = mediaLibrary.MediaType.IMAGE; const IMAGE_TYPE = mediaLibrary.MediaType.IMAGE;
......
...@@ -21,7 +21,7 @@ ohos_js_hap_suite("mediaLibrary_album_hap") { ...@@ -21,7 +21,7 @@ ohos_js_hap_suite("mediaLibrary_album_hap") {
] ]
ets2abc = true ets2abc = true
certificate_profile = "signature/openharmony_sx.p7b" certificate_profile = "signature/openharmony_sx.p7b"
hap_name = "ActsMediaLibraryAlbum" hap_name = "ActsMediaLibraryAlbumTest"
} }
ohos_app_scope("medialibrary_app_profile") { ohos_app_scope("medialibrary_app_profile") {
......
...@@ -53,7 +53,7 @@ ...@@ -53,7 +53,7 @@
}, },
{ {
"test-file-name": [ "test-file-name": [
"ActsMediaLibraryAlbum.hap" "ActsMediaLibraryAlbumTest.hap"
], ],
"type": "AppInstallKit", "type": "AppInstallKit",
"cleanup-apps": true "cleanup-apps": true
......
...@@ -36,7 +36,7 @@ export default function albumGetFileAssetsCallbackTest(abilityContext) { ...@@ -36,7 +36,7 @@ export default function albumGetFileAssetsCallbackTest(abilityContext) {
beforeAll(async function () { beforeAll(async function () {
console.info('beforeAll case'); console.info('beforeAll case');
await getPermission(); await getPermission();
await checkPresetsAssets(media, 'ActsMediaLibraryAlbum'); await checkPresetsAssets(media, 'ActsMediaLibraryAlbumTest');
}); });
beforeEach(function () { beforeEach(function () {
console.info('beforeEach case'); console.info('beforeEach case');
......
...@@ -33,7 +33,7 @@ export default function albumGetFileAssetsPromiseTest(abilityContext) { ...@@ -33,7 +33,7 @@ export default function albumGetFileAssetsPromiseTest(abilityContext) {
const media = mediaLibrary.getMediaLibrary(abilityContext); const media = mediaLibrary.getMediaLibrary(abilityContext);
beforeAll(async function () { beforeAll(async function () {
console.info('beforeAll case'); console.info('beforeAll case');
await checkPresetsAssets(media, 'ActsMediaLibraryAlbum'); await checkPresetsAssets(media, 'ActsMediaLibraryAlbumTest');
}); });
beforeEach(function () { beforeEach(function () {
console.info('beforeEach case'); console.info('beforeEach case');
......
...@@ -37,7 +37,7 @@ export default function albumTestCallbackTest(abilityContext) { ...@@ -37,7 +37,7 @@ export default function albumTestCallbackTest(abilityContext) {
const media = mediaLibrary.getMediaLibrary(abilityContext); const media = mediaLibrary.getMediaLibrary(abilityContext);
beforeAll(async function () { beforeAll(async function () {
console.info('beforeAll case'); console.info('beforeAll case');
await checkPresetsAssets(media, 'ActsMediaLibraryAlbum'); await checkPresetsAssets(media, 'ActsMediaLibraryAlbumTest');
}); });
beforeEach(function () { beforeEach(function () {
console.info('beforeEach case'); console.info('beforeEach case');
......
...@@ -36,7 +36,7 @@ export default function albumTestPromiseTest(abilityContext) { ...@@ -36,7 +36,7 @@ export default function albumTestPromiseTest(abilityContext) {
const media = mediaLibrary.getMediaLibrary(abilityContext); const media = mediaLibrary.getMediaLibrary(abilityContext);
beforeAll(async function () { beforeAll(async function () {
console.info('beforeAll case'); console.info('beforeAll case');
await checkPresetsAssets(media, 'ActsMediaLibraryAlbum'); await checkPresetsAssets(media, 'ActsMediaLibraryAlbumTest');
}); });
beforeEach(function () { beforeEach(function () {
console.info('beforeEach case'); console.info('beforeEach case');
......
...@@ -21,7 +21,7 @@ ohos_js_hap_suite("mediaLibrary_base_hap") { ...@@ -21,7 +21,7 @@ ohos_js_hap_suite("mediaLibrary_base_hap") {
] ]
ets2abc = true ets2abc = true
certificate_profile = "signature/openharmony_sx.p7b" certificate_profile = "signature/openharmony_sx.p7b"
hap_name = "ActsMediaLibraryBase" hap_name = "ActsMediaLibraryBaseTest"
} }
ohos_app_scope("medialibrary_app_profile") { ohos_app_scope("medialibrary_app_profile") {
......
...@@ -9,8 +9,7 @@ ...@@ -9,8 +9,7 @@
"kits": [ "kits": [
{ {
"type": "ShellKit", "type": "ShellKit",
"pre-push": [ "pre-push": [],
],
"run-command": [ "run-command": [
"rm -rf /storage/media/100/local/files/*", "rm -rf /storage/media/100/local/files/*",
"rm -rf /data/app/el2/100/database/com.ohos.medialibrary.medialibrarydata/*", "rm -rf /data/app/el2/100/database/com.ohos.medialibrary.medialibrarydata/*",
...@@ -20,8 +19,7 @@ ...@@ -20,8 +19,7 @@
}, },
{ {
"type": "PushKit", "type": "PushKit",
"pre-push": [ "pre-push": [],
],
"push": [ "push": [
"./resource/medialibrary/01.jpg ->/storage/media/100/local/temp", "./resource/medialibrary/01.jpg ->/storage/media/100/local/temp",
"./resource/medialibrary/01.mp3 ->/storage/media/100/local/temp", "./resource/medialibrary/01.mp3 ->/storage/media/100/local/temp",
...@@ -36,12 +34,10 @@ ...@@ -36,12 +34,10 @@
"mkdir -pv /storage/media/100/local/files/Videos//{Static,On,Off}", "mkdir -pv /storage/media/100/local/files/Videos//{Static,On,Off}",
"mkdir -pv /storage/media/100/local/files/Audios/{Static,On,Off}", "mkdir -pv /storage/media/100/local/files/Audios/{Static,On,Off}",
"mkdir -pv /storage/media/100/local/files/Documents/{Static,On,Off}", "mkdir -pv /storage/media/100/local/files/Documents/{Static,On,Off}",
"for d in Static On Off OnAlbum OffAlbum; do for i in $$(seq 1); do cp /storage/media/100/local/temp/01.jpg /storage/media/100/local/files/Pictures/$$d/0$$i.jpg; done;done;", "for d in Static On Off OnAlbum OffAlbum; do for i in $$(seq 1); do cp /storage/media/100/local/temp/01.jpg /storage/media/100/local/files/Pictures/$$d/0$$i.jpg; done;done;",
"for d in Static On Off; do for i in $$(seq 1); do cp /storage/media/100/local/temp/01.mp3 /storage/media/100/local/files/Audios/$$d/0$$i.mp3; done;done;", "for d in Static On Off; do for i in $$(seq 1); do cp /storage/media/100/local/temp/01.mp3 /storage/media/100/local/files/Audios/$$d/0$$i.mp3; done;done;",
"for d in Static On Off; do for i in $$(seq 1); do cp /storage/media/100/local/temp/01.mp4 /storage/media/100/local/files/Videos/$$d/0$$i.mp4; done;done;", "for d in Static On Off; do for i in $$(seq 1); do cp /storage/media/100/local/temp/01.mp4 /storage/media/100/local/files/Videos/$$d/0$$i.mp4; done;done;",
"for d in Static On Off; do for i in $$(seq 1); do cp /storage/media/100/local/temp/01.dat /storage/media/100/local/files/Documents/$$d/0$$i.dat; done;done;", "for d in Static On Off; do for i in $$(seq 1); do cp /storage/media/100/local/temp/01.dat /storage/media/100/local/files/Documents/$$d/0$$i.dat; done;done;",
"chmod -R 777 /storage/media/100/local/files/*", "chmod -R 777 /storage/media/100/local/files/*",
"chmod -R 777 /data/service/el2/100/hmdfs/account/files/*", "chmod -R 777 /data/service/el2/100/hmdfs/account/files/*",
"hilog -Q pidoff", "hilog -Q pidoff",
...@@ -54,7 +50,7 @@ ...@@ -54,7 +50,7 @@
}, },
{ {
"test-file-name": [ "test-file-name": [
"ActsMediaLibraryBase.hap" "ActsMediaLibraryBaseTest.hap"
], ],
"type": "AppInstallKit", "type": "AppInstallKit",
"cleanup-apps": true "cleanup-apps": true
......
...@@ -36,7 +36,7 @@ export default function mediaLibraryTestCallback(abilityContext) { ...@@ -36,7 +36,7 @@ export default function mediaLibraryTestCallback(abilityContext) {
beforeAll(async function () { beforeAll(async function () {
console.info('beforeAll case'); console.info('beforeAll case');
await getPermission(); await getPermission();
await checkPresetsAssets(media, 'ActsMediaLibraryBase'); await checkPresetsAssets(media, 'ActsMediaLibraryBaseTest');
}); });
beforeEach(function () { beforeEach(function () {
console.info('beforeEach case'); console.info('beforeEach case');
......
...@@ -36,7 +36,7 @@ export default function mediaLibraryTestPromiseTest(abilityContext) { ...@@ -36,7 +36,7 @@ export default function mediaLibraryTestPromiseTest(abilityContext) {
beforeAll(async function () { beforeAll(async function () {
console.info('beforeAll case'); console.info('beforeAll case');
await getPermission(); await getPermission();
await checkPresetsAssets(media, 'ActsMediaLibraryBase'); await checkPresetsAssets(media, 'ActsMediaLibraryBaseTest');
}); });
beforeEach(function () { beforeEach(function () {
console.info('beforeEach case'); console.info('beforeEach case');
......
...@@ -35,7 +35,7 @@ export default function mediaLibraryTestPromiseOnOffTest(abilityContext) { ...@@ -35,7 +35,7 @@ export default function mediaLibraryTestPromiseOnOffTest(abilityContext) {
beforeAll(async function () { beforeAll(async function () {
console.info('beforeAll case'); console.info('beforeAll case');
await getPermission(); await getPermission();
await checkPresetsAssets(media, 'ActsMediaLibraryBase'); await checkPresetsAssets(media, 'ActsMediaLibraryBaseTest');
}); });
beforeEach(function () { beforeEach(function () {
console.info('beforeEach case'); console.info('beforeEach case');
......
...@@ -21,7 +21,7 @@ ohos_js_hap_suite("mediaLibrary_favorite_hap") { ...@@ -21,7 +21,7 @@ ohos_js_hap_suite("mediaLibrary_favorite_hap") {
] ]
ets2abc = true ets2abc = true
certificate_profile = "signature/openharmony_sx.p7b" certificate_profile = "signature/openharmony_sx.p7b"
hap_name = "ActsMediaLibraryFavorite" hap_name = "ActsMediaLibraryFavoriteTest"
} }
ohos_app_scope("medialibrary_app_profile") { ohos_app_scope("medialibrary_app_profile") {
......
...@@ -9,8 +9,7 @@ ...@@ -9,8 +9,7 @@
"kits": [ "kits": [
{ {
"type": "ShellKit", "type": "ShellKit",
"pre-push": [ "pre-push": [],
],
"run-command": [ "run-command": [
"rm -rf /storage/media/100/local/files/*", "rm -rf /storage/media/100/local/files/*",
"rm -rf /data/app/el2/100/database/com.ohos.medialibrary.medialibrarydata/*", "rm -rf /data/app/el2/100/database/com.ohos.medialibrary.medialibrarydata/*",
...@@ -20,8 +19,7 @@ ...@@ -20,8 +19,7 @@
}, },
{ {
"type": "PushKit", "type": "PushKit",
"pre-push": [ "pre-push": [],
],
"push": [ "push": [
"./resource/medialibrary/01.jpg ->/storage/media/100/local/temp", "./resource/medialibrary/01.jpg ->/storage/media/100/local/temp",
"./resource/medialibrary/01.mp3 ->/storage/media/100/local/temp", "./resource/medialibrary/01.mp3 ->/storage/media/100/local/temp",
...@@ -36,12 +34,10 @@ ...@@ -36,12 +34,10 @@
"mkdir -pv /storage/media/100/local/files/Videos/{StaticPro,StaticCb}", "mkdir -pv /storage/media/100/local/files/Videos/{StaticPro,StaticCb}",
"mkdir -pv /storage/media/100/local/files/Audios/{StaticPro,StaticCb}", "mkdir -pv /storage/media/100/local/files/Audios/{StaticPro,StaticCb}",
"mkdir -pv /storage/media/100/local/files/Documents/{StaticPro,StaticCb}", "mkdir -pv /storage/media/100/local/files/Documents/{StaticPro,StaticCb}",
"for d in {StaticPro,StaticCb}; do for i in $$(seq 4); do cp /storage/media/100/local/temp/01.jpg /storage/media/100/local/files/Pictures/$$d/0$$i.jpg; done;done;", "for d in {StaticPro,StaticCb}; do for i in $$(seq 4); do cp /storage/media/100/local/temp/01.jpg /storage/media/100/local/files/Pictures/$$d/0$$i.jpg; done;done;",
"for d in {StaticPro,StaticCb}; do for i in $$(seq 4); do cp /storage/media/100/local/temp/01.mp3 /storage/media/100/local/files/Audios/$$d/0$$i.mp3; done;done;", "for d in {StaticPro,StaticCb}; do for i in $$(seq 4); do cp /storage/media/100/local/temp/01.mp3 /storage/media/100/local/files/Audios/$$d/0$$i.mp3; done;done;",
"for d in {StaticPro,StaticCb}; do for i in $$(seq 4); do cp /storage/media/100/local/temp/01.mp4 /storage/media/100/local/files/Videos/$$d/0$$i.mp4; done;done;", "for d in {StaticPro,StaticCb}; do for i in $$(seq 4); do cp /storage/media/100/local/temp/01.mp4 /storage/media/100/local/files/Videos/$$d/0$$i.mp4; done;done;",
"for d in {StaticPro,StaticCb}; do for i in $$(seq 4); do cp /storage/media/100/local/temp/01.dat /storage/media/100/local/files/Documents/$$d/0$$i.dat; done;done;", "for d in {StaticPro,StaticCb}; do for i in $$(seq 4); do cp /storage/media/100/local/temp/01.dat /storage/media/100/local/files/Documents/$$d/0$$i.dat; done;done;",
"chmod -R 777 /storage/media/100/local/files/*", "chmod -R 777 /storage/media/100/local/files/*",
"chmod -R 777 /data/service/el2/100/hmdfs/account/files/*", "chmod -R 777 /data/service/el2/100/hmdfs/account/files/*",
"hilog -Q pidoff", "hilog -Q pidoff",
...@@ -54,7 +50,7 @@ ...@@ -54,7 +50,7 @@
}, },
{ {
"test-file-name": [ "test-file-name": [
"ActsMediaLibraryFavorite.hap" "ActsMediaLibraryFavoriteTest.hap"
], ],
"type": "AppInstallKit", "type": "AppInstallKit",
"cleanup-apps": true "cleanup-apps": true
......
...@@ -33,7 +33,7 @@ export default function favoriteTestCallbackTest(abilityContext) { ...@@ -33,7 +33,7 @@ export default function favoriteTestCallbackTest(abilityContext) {
beforeAll(async function () { beforeAll(async function () {
console.info('beforeAll case'); console.info('beforeAll case');
await getPermission(); await getPermission();
await checkPresetsAssets(media, 'ActsMediaLibraryFavorite'); await checkPresetsAssets(media, 'ActsMediaLibraryFavoriteTest');
}); });
beforeEach(function () { beforeEach(function () {
console.info('beforeEach case'); console.info('beforeEach case');
......
...@@ -31,7 +31,7 @@ export default function favoriteTestPromiseTest(abilityContext) { ...@@ -31,7 +31,7 @@ export default function favoriteTestPromiseTest(abilityContext) {
var media = mediaLibrary.getMediaLibrary(abilityContext); var media = mediaLibrary.getMediaLibrary(abilityContext);
beforeAll(async function () { beforeAll(async function () {
console.info('beforeAll case'); console.info('beforeAll case');
await checkPresetsAssets(media, 'ActsMediaLibraryFavorite'); await checkPresetsAssets(media, 'ActsMediaLibraryFavoriteTest');
}); });
beforeEach(function () { beforeEach(function () {
console.info('beforeEach case'); console.info('beforeEach case');
......
...@@ -21,7 +21,7 @@ ohos_js_hap_suite("mediaLibrary_file_hap") { ...@@ -21,7 +21,7 @@ ohos_js_hap_suite("mediaLibrary_file_hap") {
] ]
ets2abc = true ets2abc = true
certificate_profile = "signature/openharmony_sx.p7b" certificate_profile = "signature/openharmony_sx.p7b"
hap_name = "ActsMediaLibraryFile" hap_name = "ActsMediaLibraryFileTest"
} }
ohos_app_scope("medialibrary_app_profile") { ohos_app_scope("medialibrary_app_profile") {
......
...@@ -9,8 +9,7 @@ ...@@ -9,8 +9,7 @@
"kits": [ "kits": [
{ {
"type": "ShellKit", "type": "ShellKit",
"pre-push": [ "pre-push": [],
],
"run-command": [ "run-command": [
"rm -rf /storage/media/100/local/files/*", "rm -rf /storage/media/100/local/files/*",
"rm -rf /data/app/el2/100/database/com.ohos.medialibrary.medialibrarydata/*", "rm -rf /data/app/el2/100/database/com.ohos.medialibrary.medialibrarydata/*",
...@@ -20,8 +19,7 @@ ...@@ -20,8 +19,7 @@
}, },
{ {
"type": "PushKit", "type": "PushKit",
"pre-push": [ "pre-push": [],
],
"push": [ "push": [
"./resource/medialibrary/01.jpg ->/storage/media/100/local/temp", "./resource/medialibrary/01.jpg ->/storage/media/100/local/temp",
"./resource/medialibrary/01.mp3 ->/storage/media/100/local/temp", "./resource/medialibrary/01.mp3 ->/storage/media/100/local/temp",
...@@ -36,17 +34,14 @@ ...@@ -36,17 +34,14 @@
"mkdir -pv /storage/media/100/local/files/Videos/{Static,Dynamic}", "mkdir -pv /storage/media/100/local/files/Videos/{Static,Dynamic}",
"mkdir -pv /storage/media/100/local/files/Audios/{Static,Dynamic}", "mkdir -pv /storage/media/100/local/files/Audios/{Static,Dynamic}",
"mkdir -pv /storage/media/100/local/files/Documents/{Static,Dynamic}", "mkdir -pv /storage/media/100/local/files/Documents/{Static,Dynamic}",
"for d in Static; do for i in $$(seq 6); do cp /storage/media/100/local/temp/01.jpg /storage/media/100/local/files/Pictures/$$d/0$$i.jpg; done;done;", "for d in Static; do for i in $$(seq 6); do cp /storage/media/100/local/temp/01.jpg /storage/media/100/local/files/Pictures/$$d/0$$i.jpg; done;done;",
"for d in Static; do for i in $$(seq 6); do cp /storage/media/100/local/temp/01.mp3 /storage/media/100/local/files/Audios/$$d/0$$i.mp3; done;done;", "for d in Static; do for i in $$(seq 6); do cp /storage/media/100/local/temp/01.mp3 /storage/media/100/local/files/Audios/$$d/0$$i.mp3; done;done;",
"for d in Static; do for i in $$(seq 6); do cp /storage/media/100/local/temp/01.mp4 /storage/media/100/local/files/Videos/$$d/0$$i.mp4; done;done;", "for d in Static; do for i in $$(seq 6); do cp /storage/media/100/local/temp/01.mp4 /storage/media/100/local/files/Videos/$$d/0$$i.mp4; done;done;",
"for d in Static; do for i in $$(seq 6); do cp /storage/media/100/local/temp/01.dat /storage/media/100/local/files/Documents/$$d/0$$i.dat; done;done;", "for d in Static; do for i in $$(seq 6); do cp /storage/media/100/local/temp/01.dat /storage/media/100/local/files/Documents/$$d/0$$i.dat; done;done;",
"cp /storage/media/100/local/temp/01.jpg /storage/media/100/local/files/Pictures/Dynamic/01.jpg", "cp /storage/media/100/local/temp/01.jpg /storage/media/100/local/files/Pictures/Dynamic/01.jpg",
"cp /storage/media/100/local/temp/01.mp4 /storage/media/100/local/files/Videos/Dynamic/01.mp4", "cp /storage/media/100/local/temp/01.mp4 /storage/media/100/local/files/Videos/Dynamic/01.mp4",
"cp /storage/media/100/local/temp/01.mp3 /storage/media/100/local/files/Audios/Dynamic/01.mp3", "cp /storage/media/100/local/temp/01.mp3 /storage/media/100/local/files/Audios/Dynamic/01.mp3",
"cp /storage/media/100/local/temp/01.dat /storage/media/100/local/files/Documents/Dynamic/01.dat", "cp /storage/media/100/local/temp/01.dat /storage/media/100/local/files/Documents/Dynamic/01.dat",
"chmod -R 777 /storage/media/100/local/files/*", "chmod -R 777 /storage/media/100/local/files/*",
"chmod -R 777 /data/service/el2/100/hmdfs/account/files/*", "chmod -R 777 /data/service/el2/100/hmdfs/account/files/*",
"hilog -Q pidoff", "hilog -Q pidoff",
...@@ -59,7 +54,7 @@ ...@@ -59,7 +54,7 @@
}, },
{ {
"test-file-name": [ "test-file-name": [
"ActsMediaLibraryFile.hap" "ActsMediaLibraryFileTest.hap"
], ],
"type": "AppInstallKit", "type": "AppInstallKit",
"cleanup-apps": true "cleanup-apps": true
......
...@@ -39,7 +39,7 @@ export default function fileTestCallbackTest(abilityContext) { ...@@ -39,7 +39,7 @@ export default function fileTestCallbackTest(abilityContext) {
beforeAll(async function () { beforeAll(async function () {
console.info('beforeAll case'); console.info('beforeAll case');
await getPermission(); await getPermission();
await checkPresetsAssets(media, 'ActsMediaLibraryFile') await checkPresetsAssets(media, 'ActsMediaLibraryFileTest')
}); });
beforeEach(function () { beforeEach(function () {
console.info('beforeEach case'); console.info('beforeEach case');
......
...@@ -37,7 +37,7 @@ export default function fileTestPromiseTest(abilityContext) { ...@@ -37,7 +37,7 @@ export default function fileTestPromiseTest(abilityContext) {
const media = mediaLibrary.getMediaLibrary(abilityContext); const media = mediaLibrary.getMediaLibrary(abilityContext);
beforeAll(async function () { beforeAll(async function () {
console.info('beforeAll case'); console.info('beforeAll case');
await checkPresetsAssets(media, 'ActsMediaLibraryFile') await checkPresetsAssets(media, 'ActsMediaLibraryFileTest')
}); });
beforeEach(function () { beforeEach(function () {
console.info('beforeEach case'); console.info('beforeEach case');
......
...@@ -21,7 +21,7 @@ ohos_js_hap_suite("mediaLibrary_fileAsset_hap") { ...@@ -21,7 +21,7 @@ ohos_js_hap_suite("mediaLibrary_fileAsset_hap") {
] ]
ets2abc = true ets2abc = true
certificate_profile = "signature/openharmony_sx.p7b" certificate_profile = "signature/openharmony_sx.p7b"
hap_name = "ActsMediaLibraryFileAsset" hap_name = "ActsMediaLibraryFileAssetTest"
} }
ohos_app_scope("medialibrary_app_profile") { ohos_app_scope("medialibrary_app_profile") {
......
...@@ -9,8 +9,7 @@ ...@@ -9,8 +9,7 @@
"kits": [ "kits": [
{ {
"type": "ShellKit", "type": "ShellKit",
"pre-push": [ "pre-push": [],
],
"run-command": [ "run-command": [
"rm -rf /storage/media/100/local/files/*", "rm -rf /storage/media/100/local/files/*",
"rm -rf /data/app/el2/100/database/com.ohos.medialibrary.medialibrarydata/*", "rm -rf /data/app/el2/100/database/com.ohos.medialibrary.medialibrarydata/*",
...@@ -20,8 +19,7 @@ ...@@ -20,8 +19,7 @@
}, },
{ {
"type": "PushKit", "type": "PushKit",
"pre-push": [ "pre-push": [],
],
"push": [ "push": [
"./resource/medialibrary/01.jpg ->/storage/media/100/local/temp", "./resource/medialibrary/01.jpg ->/storage/media/100/local/temp",
"./resource/medialibrary/01.mp3 ->/storage/media/100/local/temp", "./resource/medialibrary/01.mp3 ->/storage/media/100/local/temp",
...@@ -36,17 +34,14 @@ ...@@ -36,17 +34,14 @@
"mkdir -pv /storage/media/100/local/files/Videos/{ModifyCb,ModifyPro,RW,R,W,RW_cb,R_cb,W_cb,openClose}", "mkdir -pv /storage/media/100/local/files/Videos/{ModifyCb,ModifyPro,RW,R,W,RW_cb,R_cb,W_cb,openClose}",
"mkdir -pv /storage/media/100/local/files/Audios/{ModifyCb,ModifyPro,RW,R,W,RW_cb,R_cb,W_cb,openClose}", "mkdir -pv /storage/media/100/local/files/Audios/{ModifyCb,ModifyPro,RW,R,W,RW_cb,R_cb,W_cb,openClose}",
"mkdir -pv /storage/media/100/local/files/Documents/{ModifyCb,ModifyPro,RW,R,W,RW_cb,R_cb,W_cb,openClose}", "mkdir -pv /storage/media/100/local/files/Documents/{ModifyCb,ModifyPro,RW,R,W,RW_cb,R_cb,W_cb,openClose}",
"for d in RW_cb R_cb W_cb RW R W openClose; do for i in $$(seq 2); do cp /storage/media/100/local/temp/01.jpg /storage/media/100/local/files/Pictures/$$d/0$$i.jpg; done;done;", "for d in RW_cb R_cb W_cb RW R W openClose; do for i in $$(seq 2); do cp /storage/media/100/local/temp/01.jpg /storage/media/100/local/files/Pictures/$$d/0$$i.jpg; done;done;",
"for d in RW_cb R_cb W_cb RW R W openClose; do for i in $$(seq 2); do cp /storage/media/100/local/temp/01.mp3 /storage/media/100/local/files/Audios/$$d/0$$i.mp3; done;done;", "for d in RW_cb R_cb W_cb RW R W openClose; do for i in $$(seq 2); do cp /storage/media/100/local/temp/01.mp3 /storage/media/100/local/files/Audios/$$d/0$$i.mp3; done;done;",
"for d in RW_cb R_cb W_cb RW R W openClose; do for i in $$(seq 2); do cp /storage/media/100/local/temp/01.mp4 /storage/media/100/local/files/Videos/$$d/0$$i.mp4; done;done;", "for d in RW_cb R_cb W_cb RW R W openClose; do for i in $$(seq 2); do cp /storage/media/100/local/temp/01.mp4 /storage/media/100/local/files/Videos/$$d/0$$i.mp4; done;done;",
"for d in RW_cb R_cb W_cb RW R W openClose; do for i in $$(seq 2); do cp /storage/media/100/local/temp/01.dat /storage/media/100/local/files/Documents/$$d/0$$i.dat; done;done;", "for d in RW_cb R_cb W_cb RW R W openClose; do for i in $$(seq 2); do cp /storage/media/100/local/temp/01.dat /storage/media/100/local/files/Documents/$$d/0$$i.dat; done;done;",
"for d in ModifyCb ModifyPro; do for i in $$(seq 7); do cp /storage/media/100/local/temp/01.jpg /storage/media/100/local/files/Pictures/$$d/0$$i.jpg; done;done;", "for d in ModifyCb ModifyPro; do for i in $$(seq 7); do cp /storage/media/100/local/temp/01.jpg /storage/media/100/local/files/Pictures/$$d/0$$i.jpg; done;done;",
"for d in ModifyCb ModifyPro; do for i in $$(seq 5); do cp /storage/media/100/local/temp/01.mp3 /storage/media/100/local/files/Audios/$$d/0$$i.mp3; done;done;", "for d in ModifyCb ModifyPro; do for i in $$(seq 5); do cp /storage/media/100/local/temp/01.mp3 /storage/media/100/local/files/Audios/$$d/0$$i.mp3; done;done;",
"for d in ModifyCb ModifyPro; do for i in $$(seq 5); do cp /storage/media/100/local/temp/01.mp4 /storage/media/100/local/files/Videos/$$d/0$$i.mp4; done;done;", "for d in ModifyCb ModifyPro; do for i in $$(seq 5); do cp /storage/media/100/local/temp/01.mp4 /storage/media/100/local/files/Videos/$$d/0$$i.mp4; done;done;",
"for d in ModifyCb ModifyPro; do for i in $$(seq 5); do cp /storage/media/100/local/temp/01.dat /storage/media/100/local/files/Documents/$$d/0$$i.dat; done;done;", "for d in ModifyCb ModifyPro; do for i in $$(seq 5); do cp /storage/media/100/local/temp/01.dat /storage/media/100/local/files/Documents/$$d/0$$i.dat; done;done;",
"chmod -R 777 /storage/media/100/local/files/*", "chmod -R 777 /storage/media/100/local/files/*",
"chmod -R 777 /data/service/el2/100/hmdfs/account/files/*", "chmod -R 777 /data/service/el2/100/hmdfs/account/files/*",
"hilog -Q pidoff", "hilog -Q pidoff",
...@@ -59,7 +54,7 @@ ...@@ -59,7 +54,7 @@
}, },
{ {
"test-file-name": [ "test-file-name": [
"ActsMediaLibraryFileAsset.hap" "ActsMediaLibraryFileAssetTest.hap"
], ],
"type": "AppInstallKit", "type": "AppInstallKit",
"cleanup-apps": true "cleanup-apps": true
......
...@@ -33,7 +33,7 @@ export default function fileAssetCallback2Test(abilityContext) { ...@@ -33,7 +33,7 @@ export default function fileAssetCallback2Test(abilityContext) {
beforeAll(async function () { beforeAll(async function () {
console.info('beforeAll case'); console.info('beforeAll case');
await getPermission(); await getPermission();
await checkPresetsAssets(media, 'ActsMediaLibraryFileAsset') await checkPresetsAssets(media, 'ActsMediaLibraryFileAssetTest')
}); });
beforeEach(function () { beforeEach(function () {
console.info('beforeEach case'); console.info('beforeEach case');
......
...@@ -31,7 +31,7 @@ export default function fileAssetPromise2Test(abilityContext) { ...@@ -31,7 +31,7 @@ export default function fileAssetPromise2Test(abilityContext) {
const media = mediaLibrary.getMediaLibrary(abilityContext); const media = mediaLibrary.getMediaLibrary(abilityContext);
beforeAll(async function () { beforeAll(async function () {
console.info('beforeAll case'); console.info('beforeAll case');
await checkPresetsAssets(media, 'ActsMediaLibraryFileAsset') await checkPresetsAssets(media, 'ActsMediaLibraryFileAssetTest')
}); });
beforeEach(function () { beforeEach(function () {
console.info('beforeEach case'); console.info('beforeEach case');
......
...@@ -33,7 +33,7 @@ export default function fileAssetTestCallbackTest(abilityContext) { ...@@ -33,7 +33,7 @@ export default function fileAssetTestCallbackTest(abilityContext) {
const media = mediaLibrary.getMediaLibrary(abilityContext); const media = mediaLibrary.getMediaLibrary(abilityContext);
beforeAll(async function () { beforeAll(async function () {
console.info('beforeAll case'); console.info('beforeAll case');
await checkPresetsAssets(media, 'ActsMediaLibraryFileAsset') await checkPresetsAssets(media, 'ActsMediaLibraryFileAssetTest')
}); });
beforeEach(function () { beforeEach(function () {
console.info('beforeEach case'); console.info('beforeEach case');
......
...@@ -33,7 +33,7 @@ export default function fileAssetTestPromiseTest(abilityContext) { ...@@ -33,7 +33,7 @@ export default function fileAssetTestPromiseTest(abilityContext) {
const media = mediaLibrary.getMediaLibrary(abilityContext); const media = mediaLibrary.getMediaLibrary(abilityContext);
beforeAll(async function () { beforeAll(async function () {
console.info('beforeAll case'); console.info('beforeAll case');
await checkPresetsAssets(media, 'ActsMediaLibraryFileAsset') await checkPresetsAssets(media, 'ActsMediaLibraryFileAssetTest')
}); });
beforeEach(function () { beforeEach(function () {
console.info('beforeEach case'); console.info('beforeEach case');
......
...@@ -21,7 +21,7 @@ ohos_js_hap_suite("mediaLibrary_fileKey_hap") { ...@@ -21,7 +21,7 @@ ohos_js_hap_suite("mediaLibrary_fileKey_hap") {
] ]
ets2abc = true ets2abc = true
certificate_profile = "signature/openharmony_sx.p7b" certificate_profile = "signature/openharmony_sx.p7b"
hap_name = "ActsMediaLibraryFileKey" hap_name = "ActsMediaLibraryFileKeyTest"
} }
ohos_app_scope("medialibrary_app_profile") { ohos_app_scope("medialibrary_app_profile") {
......
...@@ -9,8 +9,7 @@ ...@@ -9,8 +9,7 @@
"kits": [ "kits": [
{ {
"type": "ShellKit", "type": "ShellKit",
"pre-push": [ "pre-push": [],
],
"run-command": [ "run-command": [
"rm -rf /storage/media/100/local/files/*", "rm -rf /storage/media/100/local/files/*",
"rm -rf /data/app/el2/100/database/com.ohos.medialibrary.medialibrarydata/*", "rm -rf /data/app/el2/100/database/com.ohos.medialibrary.medialibrarydata/*",
...@@ -20,8 +19,7 @@ ...@@ -20,8 +19,7 @@
}, },
{ {
"type": "PushKit", "type": "PushKit",
"pre-push": [ "pre-push": [],
],
"push": [ "push": [
"./resource/medialibrary/01.jpg ->/storage/media/100/local/temp", "./resource/medialibrary/01.jpg ->/storage/media/100/local/temp",
"./resource/medialibrary/01.mp3 ->/storage/media/100/local/temp", "./resource/medialibrary/01.mp3 ->/storage/media/100/local/temp",
...@@ -34,10 +32,8 @@ ...@@ -34,10 +32,8 @@
"run-command": [ "run-command": [
"mkdir -pv /storage/media/100/local/files/Pictures/ImageInfo", "mkdir -pv /storage/media/100/local/files/Pictures/ImageInfo",
"mkdir -pv /storage/media/100/local/files/Audios/Static", "mkdir -pv /storage/media/100/local/files/Audios/Static",
"cp /storage/media/100/local/temp/01.jpg /storage/media/100/local/files/Pictures/ImageInfo/01.jpg", "cp /storage/media/100/local/temp/01.jpg /storage/media/100/local/files/Pictures/ImageInfo/01.jpg",
"cp /storage/media/100/local/temp/01.mp3 /storage/media/100/local/files/Audios/Static/01.mp3", "cp /storage/media/100/local/temp/01.mp3 /storage/media/100/local/files/Audios/Static/01.mp3",
"chmod -R 777 /storage/media/100/local/files/*", "chmod -R 777 /storage/media/100/local/files/*",
"chmod -R 777 /data/service/el2/100/hmdfs/account/files/*", "chmod -R 777 /data/service/el2/100/hmdfs/account/files/*",
"hilog -Q pidoff", "hilog -Q pidoff",
...@@ -50,7 +46,7 @@ ...@@ -50,7 +46,7 @@
}, },
{ {
"test-file-name": [ "test-file-name": [
"ActsMediaLibraryFileKey.hap" "ActsMediaLibraryFileKeyTest.hap"
], ],
"type": "AppInstallKit", "type": "AppInstallKit",
"cleanup-apps": true "cleanup-apps": true
......
...@@ -35,7 +35,7 @@ export default function filekeyTestCallbackTest(abilityContext) { ...@@ -35,7 +35,7 @@ export default function filekeyTestCallbackTest(abilityContext) {
beforeAll(async function () { beforeAll(async function () {
console.info('beforeAll case'); console.info('beforeAll case');
await getPermission(); await getPermission();
await checkPresetsAssets(media, 'ActsMediaLibraryFileKey') await checkPresetsAssets(media, 'ActsMediaLibraryFileKeyTest')
}); });
beforeEach(function () { beforeEach(function () {
console.info('beforeEach case'); console.info('beforeEach case');
......
...@@ -35,7 +35,7 @@ export default function filekeyTestPromiseTest(abilityContext) { ...@@ -35,7 +35,7 @@ export default function filekeyTestPromiseTest(abilityContext) {
beforeAll(async function () { beforeAll(async function () {
console.info('beforeAll case'); console.info('beforeAll case');
await checkPresetsAssets(media, 'ActsMediaLibraryFileKey') await checkPresetsAssets(media, 'ActsMediaLibraryFileKeyTest')
}); });
beforeEach(function () { beforeEach(function () {
console.info('beforeEach case'); console.info('beforeEach case');
......
...@@ -21,7 +21,7 @@ ohos_js_hap_suite("mediaLibrary_fileResult_hap") { ...@@ -21,7 +21,7 @@ ohos_js_hap_suite("mediaLibrary_fileResult_hap") {
] ]
ets2abc = true ets2abc = true
certificate_profile = "signature/openharmony_sx.p7b" certificate_profile = "signature/openharmony_sx.p7b"
hap_name = "ActsMediaLibraryFileResult" hap_name = "ActsMediaLibraryFileResultTest"
} }
ohos_app_scope("medialibrary_app_profile") { ohos_app_scope("medialibrary_app_profile") {
......
...@@ -9,8 +9,7 @@ ...@@ -9,8 +9,7 @@
"kits": [ "kits": [
{ {
"type": "ShellKit", "type": "ShellKit",
"pre-push": [ "pre-push": [],
],
"run-command": [ "run-command": [
"rm -rf /storage/media/100/local/files/*", "rm -rf /storage/media/100/local/files/*",
"rm -rf /data/app/el2/100/database/com.ohos.medialibrary.medialibrarydata/*", "rm -rf /data/app/el2/100/database/com.ohos.medialibrary.medialibrarydata/*",
...@@ -20,8 +19,7 @@ ...@@ -20,8 +19,7 @@
}, },
{ {
"type": "PushKit", "type": "PushKit",
"pre-push": [ "pre-push": [],
],
"push": [ "push": [
"./resource/medialibrary/01.jpg ->/storage/media/100/local/temp", "./resource/medialibrary/01.jpg ->/storage/media/100/local/temp",
"./resource/medialibrary/01.mp3 ->/storage/media/100/local/temp", "./resource/medialibrary/01.mp3 ->/storage/media/100/local/temp",
...@@ -36,12 +34,10 @@ ...@@ -36,12 +34,10 @@
"mkdir -pv /storage/media/100/local/files/Videos/Static", "mkdir -pv /storage/media/100/local/files/Videos/Static",
"mkdir -pv /storage/media/100/local/files/Audios/Static", "mkdir -pv /storage/media/100/local/files/Audios/Static",
"mkdir -pv /storage/media/100/local/files/Documents/Static", "mkdir -pv /storage/media/100/local/files/Documents/Static",
"for d in Static; do for i in $$(seq 4); do cp /storage/media/100/local/temp/01.jpg /storage/media/100/local/files/Pictures/$$d/0$$i.jpg; done;done;", "for d in Static; do for i in $$(seq 4); do cp /storage/media/100/local/temp/01.jpg /storage/media/100/local/files/Pictures/$$d/0$$i.jpg; done;done;",
"for d in Static; do for i in $$(seq 4); do cp /storage/media/100/local/temp/01.mp3 /storage/media/100/local/files/Audios/$$d/0$$i.mp3; done;done;", "for d in Static; do for i in $$(seq 4); do cp /storage/media/100/local/temp/01.mp3 /storage/media/100/local/files/Audios/$$d/0$$i.mp3; done;done;",
"for d in Static; do for i in $$(seq 4); do cp /storage/media/100/local/temp/01.mp4 /storage/media/100/local/files/Videos/$$d/0$$i.mp4; done;done;", "for d in Static; do for i in $$(seq 4); do cp /storage/media/100/local/temp/01.mp4 /storage/media/100/local/files/Videos/$$d/0$$i.mp4; done;done;",
"for d in Static; do for i in $$(seq 100); do cp /storage/media/100/local/temp/01.dat /storage/media/100/local/files/Documents/$$d/0$$i.dat; done;done;", "for d in Static; do for i in $$(seq 100); do cp /storage/media/100/local/temp/01.dat /storage/media/100/local/files/Documents/$$d/0$$i.dat; done;done;",
"chmod -R 777 /storage/media/100/local/files/*", "chmod -R 777 /storage/media/100/local/files/*",
"chmod -R 777 /data/service/el2/100/hmdfs/account/files/*", "chmod -R 777 /data/service/el2/100/hmdfs/account/files/*",
"hilog -Q pidoff", "hilog -Q pidoff",
...@@ -54,7 +50,7 @@ ...@@ -54,7 +50,7 @@
}, },
{ {
"test-file-name": [ "test-file-name": [
"ActsMediaLibraryFileResult.hap" "ActsMediaLibraryFileResultTest.hap"
], ],
"type": "AppInstallKit", "type": "AppInstallKit",
"cleanup-apps": true "cleanup-apps": true
......
...@@ -33,7 +33,7 @@ export default function fetchFileResultCallbackTest(abilityContext) { ...@@ -33,7 +33,7 @@ export default function fetchFileResultCallbackTest(abilityContext) {
beforeAll(async function () { beforeAll(async function () {
console.info('beforeAll case'); console.info('beforeAll case');
await getPermission(); await getPermission();
await checkPresetsAssets(media, 'ActsMediaLibraryFileResult'); await checkPresetsAssets(media, 'ActsMediaLibraryFileResultTest');
}); });
beforeEach(function () { beforeEach(function () {
console.info('beforeEach case'); console.info('beforeEach case');
......
...@@ -34,7 +34,7 @@ export default function fetchFileResultPromiseTest(abilityContext) { ...@@ -34,7 +34,7 @@ export default function fetchFileResultPromiseTest(abilityContext) {
const media = mediaLibrary.getMediaLibrary(abilityContext); const media = mediaLibrary.getMediaLibrary(abilityContext);
beforeAll(async function () { beforeAll(async function () {
console.info('beforeAll case'); console.info('beforeAll case');
await checkPresetsAssets(media, 'ActsMediaLibraryFileResult'); await checkPresetsAssets(media, 'ActsMediaLibraryFileResultTest');
}); });
beforeEach(function () { beforeEach(function () {
console.info('beforeEach case'); console.info('beforeEach case');
......
...@@ -21,7 +21,7 @@ ohos_js_hap_suite("mediaLibrary_mediafetchoptions_hap") { ...@@ -21,7 +21,7 @@ ohos_js_hap_suite("mediaLibrary_mediafetchoptions_hap") {
] ]
ets2abc = true ets2abc = true
certificate_profile = "signature/openharmony_sx.p7b" certificate_profile = "signature/openharmony_sx.p7b"
hap_name = "ActsMediaLibraryMediafetchoptions" hap_name = "ActsMediaLibraryMediafetchoptionsTest"
} }
ohos_app_scope("medialibrary_app_profile") { ohos_app_scope("medialibrary_app_profile") {
......
...@@ -9,8 +9,7 @@ ...@@ -9,8 +9,7 @@
"kits": [ "kits": [
{ {
"type": "ShellKit", "type": "ShellKit",
"pre-push": [ "pre-push": [],
],
"run-command": [ "run-command": [
"rm -rf /storage/media/100/local/files/*", "rm -rf /storage/media/100/local/files/*",
"rm -rf /data/app/el2/100/database/com.ohos.medialibrary.medialibrarydata/*", "rm -rf /data/app/el2/100/database/com.ohos.medialibrary.medialibrarydata/*",
...@@ -20,8 +19,7 @@ ...@@ -20,8 +19,7 @@
}, },
{ {
"type": "PushKit", "type": "PushKit",
"pre-push": [ "pre-push": [],
],
"push": [ "push": [
"./resource/medialibrary/01.jpg ->/storage/media/100/local/temp", "./resource/medialibrary/01.jpg ->/storage/media/100/local/temp",
"./resource/medialibrary/01.mp3 ->/storage/media/100/local/temp", "./resource/medialibrary/01.mp3 ->/storage/media/100/local/temp",
...@@ -36,12 +34,10 @@ ...@@ -36,12 +34,10 @@
"mkdir -pv /storage/media/100/local/files/Videos/Static", "mkdir -pv /storage/media/100/local/files/Videos/Static",
"mkdir -pv /storage/media/100/local/files/Audios/Static", "mkdir -pv /storage/media/100/local/files/Audios/Static",
"mkdir -pv /storage/media/100/local/files/Documents/Static", "mkdir -pv /storage/media/100/local/files/Documents/Static",
"for d in Static; do for i in $$(seq 2); do cp /storage/media/100/local/temp/01.jpg /storage/media/100/local/files/Pictures/$$d/0$$i.jpg; done;done;", "for d in Static; do for i in $$(seq 2); do cp /storage/media/100/local/temp/01.jpg /storage/media/100/local/files/Pictures/$$d/0$$i.jpg; done;done;",
"for d in Static; do for i in $$(seq 2); do cp /storage/media/100/local/temp/01.mp3 /storage/media/100/local/files/Audios/$$d/0$$i.mp3; done;done;", "for d in Static; do for i in $$(seq 2); do cp /storage/media/100/local/temp/01.mp3 /storage/media/100/local/files/Audios/$$d/0$$i.mp3; done;done;",
"for d in Static; do for i in $$(seq 2); do cp /storage/media/100/local/temp/01.mp4 /storage/media/100/local/files/Videos/$$d/0$$i.mp4; done;done;", "for d in Static; do for i in $$(seq 2); do cp /storage/media/100/local/temp/01.mp4 /storage/media/100/local/files/Videos/$$d/0$$i.mp4; done;done;",
"for d in Static; do for i in $$(seq 2); do cp /storage/media/100/local/temp/01.dat /storage/media/100/local/files/Documents/$$d/0$$i.dat; done;done;", "for d in Static; do for i in $$(seq 2); do cp /storage/media/100/local/temp/01.dat /storage/media/100/local/files/Documents/$$d/0$$i.dat; done;done;",
"chmod -R 777 /storage/media/100/local/files/*", "chmod -R 777 /storage/media/100/local/files/*",
"chmod -R 777 /data/service/el2/100/hmdfs/account/files/*", "chmod -R 777 /data/service/el2/100/hmdfs/account/files/*",
"hilog -Q pidoff", "hilog -Q pidoff",
...@@ -54,7 +50,7 @@ ...@@ -54,7 +50,7 @@
}, },
{ {
"test-file-name": [ "test-file-name": [
"ActsMediaLibraryMediafetchoptions.hap" "ActsMediaLibraryMediafetchoptionsTest.hap"
], ],
"type": "AppInstallKit", "type": "AppInstallKit",
"cleanup-apps": true "cleanup-apps": true
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册