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

!516 【master】【RK3568】【压力测试】【ToC】【高概率】【wukong】出现33次 进程com.ohos.photos下出现jscrash，栈名：initializeConsume/getCountOfMedia

Browse Source 
Merge pull request !516 from liujuan/master
This commit is contained in:
openharmony_ci 2024-02-27 12:22:34 +00:00 committed by Gitee
commit 6f7c8f68fc
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
common/src/main/ets/default/model/browser/photo/SelectUtil.ts
View File

@ -35,34 +35,34 @@ export class SelectUtil {
static getCountOfMedia(uriArray: Array<string>, selectedMap: Map<string, MediaItem>): Promise<Array<number>> { static getCountOfMedia(uriArray: Array<string>, selectedMap: Map<string, MediaItem>): Promise<Array<number>> {
let result = [0, 0]; let result = [0, 0];
if (uriArray === undefined || uriArray.length <= 0) { if (uriArray === null || uriArray === undefined || uriArray.length <= 0) {
Log.info(TAG, 'uriArray is null or empty!'); Log.info(TAG, 'uriArray is null or empty!');
return new Promise((resolve) => { return new Promise((resolve): void => {
resolve(result); resolve(result);
}) });
} }
if (selectedMap === undefined || selectedMap.size <= 0) { if (selectedMap === undefined || selectedMap.size <= 0) {
Log.info(TAG, 'selectedMap is null or empty!'); Log.info(TAG, 'selectedMap is null or empty!');
return new Promise((resolve) => { return new Promise((resolve): void => {
resolve(result); resolve(result);
}) });
} }
let imageCount: number = 0; let imageCount: number = 0;
let videoCount: number = 0; let videoCount: number = 0;
for (let i = 0; i < selectedMap.size; i++) { for (let i = 0; i < uriArray.length; i++) {
let mediaItem: MediaItem = selectedMap.get(uriArray[i]); let mediaItem: MediaItem = selectedMap.get(uriArray[i]);
if (mediaItem.mediaType === UserFileManagerAccess.MEDIA_TYPE_IMAGE) { if (mediaItem?.mediaType === UserFileManagerAccess.MEDIA_TYPE_IMAGE) {
imageCount++; imageCount++;
} else if (mediaItem.mediaType === UserFileManagerAccess.MEDIA_TYPE_VIDEO) { } else if (mediaItem?.mediaType === UserFileManagerAccess.MEDIA_TYPE_VIDEO) {
videoCount++; videoCount++;
} }
} }
result = [imageCount, videoCount]; result = [imageCount, videoCount];
return new Promise((resolve) => { return new Promise((resolve): void => {
resolve(result); resolve(result);
}) });
} }
static async grantPermissionForUris(uris: Array<string>, bundleName: string): Promise<void> { static async grantPermissionForUris(uris: Array<string>, bundleName: string): Promise<void> {