openharmony/applications_photos
1
0
Fork 0
mirror of https://gitee.com/openharmony/applications_photos synced 2024-12-04 21:36:27 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

update common/src/main/ets/default/access/UserFileManagerAccess.ts.

Browse Source 
Signed-off-by: liujuan <liujuan76@h-partners.com>
This commit is contained in:
liujuan 2023-12-26 02:11:19 +00:00 committed by Gitee
parent 84c8f0b839
commit fa1c2ed002
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
1 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
common/src/main/ets/default/access/UserFileManagerAccess.ts
View File

@ -104,13 +104,13 @@ export class UserFileManagerAccess {
static readonly HIDDEN_ALBUM_SUB_TYPE: AlbumSubType = userFileManager.AlbumSubType.HIDDEN;
static readonly ALL_SYSTEM_ALBUM_LIST: Array<AlbumSubType> = [
UserFileManagerAccess.IMAGE_ALBUM_SUB_TYPE,
UserFileManagerAccess.VIDEO_ALBUM_SUB_TYPE,
UserFileManagerAccess.SCREENSHOT_ALBUM_SUB_TYPE,
UserFileManagerAccess.FAVORITE_ALBUM_SUB_TYPE,
UserFileManagerAccess.TRASH_ALBUM_SUB_TYPE,
UserFileManagerAccess.HIDDEN_ALBUM_SUB_TYPE,
UserFileManagerAccess.FAVORITE_ALBUM_SUB_TYPE,
UserFileManagerAccess.IMAGE_ALBUM_SUB_TYPE,
UserFileManagerAccess.VIDEO_ALBUM_SUB_TYPE,
UserFileManagerAccess.SCREENSHOT_ALBUM_SUB_TYPE,
UserFileManagerAccess.FAVORITE_ALBUM_SUB_TYPE,
UserFileManagerAccess.TRASH_ALBUM_SUB_TYPE,
UserFileManagerAccess.HIDDEN_ALBUM_SUB_TYPE,
UserFileManagerAccess.FAVORITE_ALBUM_SUB_TYPE,
]
static readonly SYSTEM_BEFORE_USER_ALBUM_LIST: Array<AlbumSubType> = [
@ -121,8 +121,8 @@ export class UserFileManagerAccess {
]
static readonly SYSTEM_AFTER_USER_ALBUM_LIST: Array<AlbumSubType> = [
UserFileManagerAccess.HIDDEN_ALBUM_SUB_TYPE,
UserFileManagerAccess.TRASH_ALBUM_SUB_TYPE
UserFileManagerAccess.HIDDEN_ALBUM_SUB_TYPE,
UserFileManagerAccess.TRASH_ALBUM_SUB_TYPE
]
private media: userFileManager.UserFileManager = null;
@ -135,10 +135,10 @@ export class UserFileManagerAccess {
}
public static getInstance(): UserFileManagerAccess {
if (AppStorage.Get(Constants.APP_KEY_INSTANCE_MEDIA_LIBRARY_ACCESS) == null) {
AppStorage.SetOrCreate(Constants.APP_KEY_INSTANCE_MEDIA_LIBRARY_ACCESS, new UserFileManagerAccess());
if (AppStorage.get(Constants.APP_KEY_INSTANCE_MEDIA_LIBRARY_ACCESS) == null) {
AppStorage.setOrCreate(Constants.APP_KEY_INSTANCE_MEDIA_LIBRARY_ACCESS, new UserFileManagerAccess());
}
return AppStorage.Get(Constants.APP_KEY_INSTANCE_MEDIA_LIBRARY_ACCESS);
return AppStorage.get(Constants.APP_KEY_INSTANCE_MEDIA_LIBRARY_ACCESS);
}
onCreate(context) {
@ -766,7 +766,7 @@ export class UserFileManagerAccess {
try {
let albumFetchOpt = AlbumDefine.getAlbumFetchOptByUri(albumUri);
// @ts-ignore // TODO 支持不传入type时删掉 ts-ignore
let fetchResult = await this.media.getAlbums(albumFetchOpt);
let fetchResult: userFileManager.FetchResult<Album> = await this.media.getAlbums(albumFetchOpt);
if (!fetchResult) {
Log.warn(TAG, 'getAlbumByUri return null');
return undefined;
@ -796,8 +796,8 @@ export class UserFileManagerAccess {
try {
Log.info(TAG, `getAlbumByName name: ${albumName}`);
let albumFetchOpt = AlbumDefine.getAlbumFetchOptByName(albumName);
// @ts-ignore // TODO 需要媒体库新开接口，支持仅传入fetchOpt
let fetchResult = await this.media.getAlbums(albumFetchOpt);
// @ts-ignore // TODO 需要媒体库新开接口，支持仅传入fetchOpt
let fetchResult: userFileManager.FetchResult<Album> = await this.media.getAlbums(albumFetchOpt);
if (!fetchResult) {
Log.error(TAG, 'getAlbumByName fetchResult undefined')
return undefined;