Skip to content

X
Xts Acts

OpenHarmony / Xts Acts
1 年多 前同步成功

通知 9
Star 22
Fork 0
X
Xts Acts
提交 9d65ccd0 编写于 作者: Q qinliwen
浏览文件
操作

<增加medialibrary资源查询条件，适配HOS> 

Signed-off-by: Nqinliwen <qinliwen3@huawei.com>
上级 c82ae822
隐藏空白更改
内联 并排
Showing with 58 addition and 58 deletion
multimedia/medialibrary/mediaLibrary_js_standard/src/main/js/test/favoriteTestCallBack.test.js
浏览文件 @ 9d65ccd0
......@@ -23,8 +23,8 @@ const imageType = mediaLibrary.MediaType.IMAGE;
const videoType = mediaLibrary.MediaType.VIDEO;
const audioType = mediaLibrary.MediaType.AUDIO;
const fileFetchOp = {
selections: mediaLibrary.FileKey.MEDIA_TYPE + '= ?',
selectionArgs: [fileType.toString()],
selections: mediaLibrary.FileKey.MEDIA_TYPE + '= ? AND relative_path = ?',
selectionArgs: [fileType.toString(), 'Documents/'],
};
const imageFetchOp = {
selections: mediaLibrary.FileKey.MEDIA_TYPE + '= ?',
......@@ -35,8 +35,8 @@ const videoFetchOp = {
selectionArgs: [videoType.toString()],
};
const audioFetchOp = {
selections: mediaLibrary.FileKey.MEDIA_TYPE + '= ?',
selectionArgs: [audioType.toString()],
selections: mediaLibrary.FileKey.MEDIA_TYPE + '= ? AND bucket_display_name = ?',
selectionArgs: [audioType.toString(), 'Camera'],
};
describe('favoriteTestCallBack.test.js', function () {
......
multimedia/medialibrary/mediaLibrary_js_standard/src/main/js/test/favoriteTestPromise.test.js
浏览文件 @ 9d65ccd0
......@@ -23,8 +23,8 @@ const imageType = mediaLibrary.MediaType.IMAGE;
const videoType = mediaLibrary.MediaType.VIDEO;
const audioType = mediaLibrary.MediaType.AUDIO;
const fileFetchOp = {
selections: mediaLibrary.FileKey.MEDIA_TYPE + '= ?',
selectionArgs: [fileType.toString()],
selections: mediaLibrary.FileKey.MEDIA_TYPE + '= ? AND relative_path = ?',
selectionArgs: [fileType.toString(), 'Documents/'],
};
const imageFetchOp = {
selections: mediaLibrary.FileKey.MEDIA_TYPE + '= ?',
......@@ -35,8 +35,8 @@ const videoFetchOp = {
selectionArgs: [videoType.toString()],
};
const audioFetchOp = {
selections: mediaLibrary.FileKey.MEDIA_TYPE + '= ?',
selectionArgs: [audioType.toString()],
selections: mediaLibrary.FileKey.MEDIA_TYPE + '= ? AND bucket_display_name = ?',
selectionArgs: [audioType.toString(), 'Camera'],
};
describe('favoriteTestPromise.test.js', function () {
......
multimedia/medialibrary/mediaLibrary_js_standard/src/main/js/test/fileAssetTestCallback.test.js
浏览文件 @ 9d65ccd0
......@@ -42,8 +42,8 @@ describe('fileAssetTestCallback.test.js', async function() {
try {
let fileType = mediaLibrary.MediaType.FILE;
let fileFetchOp = {
selections : mediaLibrary.FileKey.MEDIA_TYPE + '= ?',
selectionArgs : [ fileType.toString() ],
selections : mediaLibrary.FileKey.MEDIA_TYPE + '= ? AND relative_path = ?',
selectionArgs : [ fileType.toString(), 'Documents/'],
};
let fetchFileResult = await media.getFileAssets(fileFetchOp);
const dataList = await fetchFileResult.getAllObject();
......@@ -109,8 +109,8 @@ describe('fileAssetTestCallback.test.js', async function() {
try {
let type = mediaLibrary.MediaType.FILE;
let fetchOp = {
selections : mediaLibrary.FileKey.MEDIA_TYPE + '= ?',
selectionArgs : [ type.toString() ],
selections : mediaLibrary.FileKey.MEDIA_TYPE + '= ? AND relative_path = ?',
selectionArgs : [ type.toString(), 'Documents/'],
};
let fetchFileResult = await media.getFileAssets(fetchOp);
const dataList = await fetchFileResult.getAllObject();
......@@ -173,8 +173,8 @@ describe('fileAssetTestCallback.test.js', async function() {
try {
let type = mediaLibrary.MediaType.FILE;
let fetchOp = {
selections : mediaLibrary.FileKey.MEDIA_TYPE + '= ?',
selectionArgs : [ type.toString() ],
selections : mediaLibrary.FileKey.MEDIA_TYPE + '= ? AND relative_path = ?',
selectionArgs : [ type.toString(), 'Documents/'],
};
let fetchFileResult = await media.getFileAssets(fetchOp);
const dataList = await fetchFileResult.getAllObject();
......@@ -438,8 +438,8 @@ describe('fileAssetTestCallback.test.js', async function() {
try {
let fileType = mediaLibrary.MediaType.AUDIO;
let fileFetchOp = {
selections : mediaLibrary.FileKey.MEDIA_TYPE + '= ?',
selectionArgs : [ fileType.toString() ],
selections : mediaLibrary.FileKey.MEDIA_TYPE + '= ? AND bucket_display_name = ?',
selectionArgs : [ fileType.toString(), 'Camera'],
};
let fetchFileResult = await media.getFileAssets(fileFetchOp);
const dataList = await fetchFileResult.getAllObject();
......@@ -499,8 +499,8 @@ describe('fileAssetTestCallback.test.js', async function() {
try {
let type = mediaLibrary.MediaType.AUDIO;
let fetchOp = {
selections : mediaLibrary.FileKey.MEDIA_TYPE + '= ?',
selectionArgs : [ type.toString() ],
selections : mediaLibrary.FileKey.MEDIA_TYPE + '= ? AND bucket_display_name = ?',
selectionArgs : [ type.toString(), 'Camera'],
};
let fetchFileResult = await media.getFileAssets(fetchOp);
const dataList = await fetchFileResult.getAllObject();
......@@ -566,8 +566,8 @@ describe('fileAssetTestCallback.test.js', async function() {
try {
let type = mediaLibrary.MediaType.AUDIO;
let fetchOp = {
selections : mediaLibrary.FileKey.MEDIA_TYPE + '= ?',
selectionArgs : [ type.toString() ],
selections : mediaLibrary.FileKey.MEDIA_TYPE + '= ? AND bucket_display_name = ?',
selectionArgs : [ type.toString(), 'Camera'],
};
let fetchFileResult = await media.getFileAssets(fetchOp);
const dataList = await fetchFileResult.getAllObject();
......@@ -845,8 +845,8 @@ describe('fileAssetTestCallback.test.js', async function() {
try {
let type = mediaLibrary.MediaType.FILE;
let fetchOp = {
selections : mediaLibrary.FileKey.MEDIA_TYPE + '= ?',
selectionArgs : [ type.toString() ],
selections : mediaLibrary.FileKey.MEDIA_TYPE + '= ? AND relative_path = ?',
selectionArgs : [ type.toString(), 'Documents/'],
};
let fetchFileResult = await media.getFileAssets(fetchOp);
const dataList = await fetchFileResult.getAllObject();
......@@ -941,8 +941,8 @@ describe('fileAssetTestCallback.test.js', async function() {
try {
let type = mediaLibrary.MediaType.AUDIO;
let fetchOp = {
selections : mediaLibrary.FileKey.MEDIA_TYPE + '= ?',
selectionArgs : [ type.toString() ],
selections : mediaLibrary.FileKey.MEDIA_TYPE + '= ? AND bucket_display_name = ?',
selectionArgs : [ type.toString(), 'Camera'],
};
let fetchFileResult = await media.getFileAssets(fetchOp);
const dataList = await fetchFileResult.getAllObject();
......
multimedia/medialibrary/mediaLibrary_js_standard/src/main/js/test/fileAssetTestPromise.test.js
浏览文件 @ 9d65ccd0
......@@ -42,8 +42,8 @@ describe('fileAssetTestPromise.test.js', async function() {
try {
let fileType = mediaLibrary.MediaType.FILE;
let fileFetchOp = {
selections : mediaLibrary.FileKey.MEDIA_TYPE + '= ?',
selectionArgs : [ fileType.toString() ],
selections : mediaLibrary.FileKey.MEDIA_TYPE + '= ? AND relative_path = ?',
selectionArgs : [ fileType.toString(), 'Documents/'],
};
let fetchFileResult = await media.getFileAssets(fileFetchOp);
const dataList = await fetchFileResult.getAllObject();
......@@ -95,8 +95,8 @@ describe('fileAssetTestPromise.test.js', async function() {
try {
let type = mediaLibrary.MediaType.FILE;
let fetchOp = {
selections : mediaLibrary.FileKey.MEDIA_TYPE + '= ?',
selectionArgs : [ type.toString() ],
selections : mediaLibrary.FileKey.MEDIA_TYPE + '= ? AND relative_path = ?',
selectionArgs : [ type.toString(), 'Documents/'],
};
let fetchFileResult = await media.getFileAssets(fetchOp);
const dataList = await fetchFileResult.getAllObject();
......@@ -136,8 +136,8 @@ describe('fileAssetTestPromise.test.js', async function() {
try {
let type = mediaLibrary.MediaType.FILE;
let fetchOp = {
selections : mediaLibrary.FileKey.MEDIA_TYPE + '= ?',
selectionArgs : [ type.toString() ],
selections : mediaLibrary.FileKey.MEDIA_TYPE + '= ? AND relative_path = ?',
selectionArgs : [ type.toString(), 'Documents/'],
};
let fetchFileResult = await media.getFileAssets(fetchOp);
const dataList = await fetchFileResult.getAllObject();
......@@ -183,7 +183,7 @@ describe('fileAssetTestPromise.test.js', async function() {
let fileType = mediaLibrary.MediaType.IMAGE;
let fileFetchOp = {
selections : mediaLibrary.FileKey.MEDIA_TYPE + '= ?',
selectionArgs : [ fileType.toString() ],
selectionArgs : [ fileType.toString()],
};
let fetchFileResult = await media.getFileAssets(fileFetchOp);
const dataList = await fetchFileResult.getAllObject();
......@@ -320,8 +320,8 @@ describe('fileAssetTestPromise.test.js', async function() {
try {
let fileType = mediaLibrary.MediaType.AUDIO;
let fileFetchOp = {
selections : mediaLibrary.FileKey.MEDIA_TYPE + '= ?',
selectionArgs : [ fileType.toString() ],
selections : mediaLibrary.FileKey.MEDIA_TYPE + '= ? AND bucket_display_name = ?',
selectionArgs : [ fileType.toString(), 'Camera'],
};
let fetchFileResult = await media.getFileAssets(fileFetchOp);
const dataList = await fetchFileResult.getAllObject();
......@@ -371,8 +371,8 @@ describe('fileAssetTestPromise.test.js', async function() {
try {
let type = mediaLibrary.MediaType.AUDIO;
let fetchOp = {
selections : mediaLibrary.FileKey.MEDIA_TYPE + '= ?',
selectionArgs : [ type.toString() ],
selections : mediaLibrary.FileKey.MEDIA_TYPE + '= ? AND bucket_display_name = ?',
selectionArgs : [ type.toString(), 'Camera'],
};
let fetchFileResult = await media.getFileAssets(fetchOp);
const dataList = await fetchFileResult.getAllObject();
......@@ -412,8 +412,8 @@ describe('fileAssetTestPromise.test.js', async function() {
try {
let type = mediaLibrary.MediaType.AUDIO;
let fetchOp = {
selections : mediaLibrary.FileKey.MEDIA_TYPE + '= ?',
selectionArgs : [ type.toString() ],
selections : mediaLibrary.FileKey.MEDIA_TYPE + '= ? AND bucket_display_name = ?',
selectionArgs : [ type.toString(), 'Camera'],
};
let fetchFileResult = await media.getFileAssets(fetchOp);
const dataList = await fetchFileResult.getAllObject();
......@@ -459,7 +459,7 @@ describe('fileAssetTestPromise.test.js', async function() {
let fileType = mediaLibrary.MediaType.VIDEO;
let fileFetchOp = {
selections : mediaLibrary.FileKey.MEDIA_TYPE + '= ?',
selectionArgs : [ fileType.toString() ],
selectionArgs : [ fileType.toString()],
};
let fetchFileResult = await media.getFileAssets(fileFetchOp);
const dataList = await fetchFileResult.getAllObject();
......@@ -610,8 +610,8 @@ describe('fileAssetTestPromise.test.js', async function() {
try {
let type = mediaLibrary.MediaType.FILE;
let fetchOp = {
selections : mediaLibrary.FileKey.MEDIA_TYPE + '= ?',
selectionArgs : [ type.toString() ],
selections : mediaLibrary.FileKey.MEDIA_TYPE + '= ? AND relative_path = ?',
selectionArgs : [ type.toString(), 'Documents/'],
};
let fetchFileResult = await media.getFileAssets(fetchOp);
const dataList = await fetchFileResult.getAllObject();
......@@ -698,8 +698,8 @@ describe('fileAssetTestPromise.test.js', async function() {
try {
let type = mediaLibrary.MediaType.AUDIO;
let fetchOp = {
selections : mediaLibrary.FileKey.MEDIA_TYPE + '= ?',
selectionArgs : [ type.toString() ],
selections : mediaLibrary.FileKey.MEDIA_TYPE + '= ? AND bucket_display_name = ?',
selectionArgs : [ type.toString(), 'Camera'],
};
let fetchFileResult = await media.getFileAssets(fetchOp);
const dataList = await fetchFileResult.getAllObject();
......
multimedia/medialibrary/mediaLibrary_js_standard/src/main/js/test/fileTestCallBack.test.js
浏览文件 @ 9d65ccd0
......@@ -33,12 +33,12 @@ let videosfetchOp = {
selectionArgs: [videoType.toString()],
};
let audiosfetchOp = {
selections: mediaLibrary.FileKey.MEDIA_TYPE + '= ?',
selectionArgs: [audioType.toString()],
selections: mediaLibrary.FileKey.MEDIA_TYPE + '= ? AND bucket_display_name = ?',
selectionArgs: [audioType.toString(), 'Camera'],
};
let filesfetchOp = {
selections: mediaLibrary.FileKey.MEDIA_TYPE + '= ?',
selectionArgs: [fileType.toString()],
selections: mediaLibrary.FileKey.MEDIA_TYPE + '= ? AND relative_path = ?',
selectionArgs: [fileType.toString(), 'Documents/'],
};
function checkAssetAttr(done, attr, testNum, asset, checkType) {
......
multimedia/medialibrary/mediaLibrary_js_standard/src/main/js/test/fileTestPromise.test.js
浏览文件 @ 9d65ccd0
......@@ -33,12 +33,12 @@ let videosfetchOp = {
selectionArgs: [videoType.toString()],
};
let audiosfetchOp = {
selections: mediaLibrary.FileKey.MEDIA_TYPE + '= ?',
selectionArgs: [audioType.toString()],
selections: mediaLibrary.FileKey.MEDIA_TYPE + '= ? AND bucket_display_name = ?',
selectionArgs: [audioType.toString(), 'Camera'],
};
let filesfetchOp = {
selections: mediaLibrary.FileKey.MEDIA_TYPE + '= ?',
selectionArgs: [fileType.toString()],
selections: mediaLibrary.FileKey.MEDIA_TYPE + '= ? AND relative_path = ?',
selectionArgs: [fileType.toString(), 'Documents/'],
};
function checkAssetAttr(done, attr, testNum, asset, checkType) {
......
multimedia/medialibrary/mediaLibrary_js_standard/src/main/js/test/mediaLibraryTestCallBack.test.js
浏览文件 @ 9d65ccd0
......@@ -44,12 +44,12 @@ let videosfetchOp = {
selectionArgs: [videoType.toString()],
};
let audiosfetchOp = {
selections: mediaLibrary.FileKey.MEDIA_TYPE + '= ?',
selectionArgs: [audioType.toString()],
selections: mediaLibrary.FileKey.MEDIA_TYPE + '= ? AND bucket_display_name = ?',
selectionArgs: [audioType.toString(), 'Camera'],
};
let filesfetchOp = {
selections: mediaLibrary.FileKey.MEDIA_TYPE + '= ?',
selectionArgs: [fileType.toString()],
selections: mediaLibrary.FileKey.MEDIA_TYPE + '= ? AND relative_path = ?',
selectionArgs: [fileType.toString(), 'Documents/'],
};
let imageAndVideofetchOp = {
......
multimedia/medialibrary/mediaLibrary_js_standard/src/main/js/test/mediaLibraryTestPromise.test.js
浏览文件 @ 9d65ccd0
......@@ -44,12 +44,12 @@ let videosfetchOp = {
selectionArgs: [videoType.toString()],
};
let audiosfetchOp = {
selections: mediaLibrary.FileKey.MEDIA_TYPE + '= ?',
selectionArgs: [audioType.toString()],
selections: mediaLibrary.FileKey.MEDIA_TYPE + '= ? AND bucket_display_name = ?',
selectionArgs: [audioType.toString(), 'Camera'],
};
let filesfetchOp = {
selections: mediaLibrary.FileKey.MEDIA_TYPE + '= ?',
selectionArgs: [fileType.toString()],
selections: mediaLibrary.FileKey.MEDIA_TYPE + '= ? AND relative_path = ?',
selectionArgs: [fileType.toString(), 'Documents/'],
};
let imageAndVideofetchOp = {
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或