openharmony/applications_photos
1
0
Fork 0
mirror of https://gitee.com/openharmony/applications_photos synced 2024-11-26 16:51:35 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

!578 【master】jscrash修复，Cannot read property uri of undefined

Browse Source 
Merge pull request !578 from liujuan/master
This commit is contained in:
openharmony_ci 2024-06-01 09:21:52 +00:00 committed by Gitee
commit 2b5a90d7d2
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
product/phone/src/main/ets/view/PhotoBrowserComponent.ets
View File

@ -600,7 +600,7 @@ export struct PhotoBrowserComponent {
Log.info(TAG, 'onBackPress');
this.appBroadCast.emit('hideBar', []);
let currentPhoto = this.getPhotoByIndex(this.currentIndex);
this.broadCast.emit(BrowserConstants.RESET_DEFAULT_SCALE + currentPhoto.uri, []);
this.broadCast.emit(BrowserConstants.RESET_DEFAULT_SCALE + currentPhoto?.uri, []);
this.controller?.finishAnimation((): void => this.onBackPressInner());
return true;
}
@ -668,7 +668,7 @@ export struct PhotoBrowserComponent {
updatePhotoName(result: TitleName): void {
let currentPhoto = this.getCurrentPhoto();
currentPhoto.setTitle(result.title);
currentPhoto?.setTitle(result.title);
currentPhoto.displayName = result.displayName;
this.appBroadCast.emit(BroadCastConstants.UPDATE_DATA_SOURCE, [currentPhoto]);
}
@ -1168,7 +1168,7 @@ export struct PhotoBrowserComponent {
this.syncPhotoName(currentPhoto).then((result) => {
if (result) {
this.updatePhotoName(result);
this.broadCast.emit(PhotoConstants.UPDATE_PHOTO_NAME + currentPhoto.uri, [result.title]);
this.broadCast.emit(PhotoConstants.UPDATE_PHOTO_NAME + currentPhoto?.uri, [result.title]);
}
});
}
@ -1377,14 +1377,14 @@ export struct PhotoBrowserComponent {
private async syncPhotoName(currentPhoto: MediaItem): Promise<TitleName> {
Log.debug(TAG, 'syncPhotoName start');
let renameResult: TitleName = {title: '', displayName: ''};
let fileAsset = await this.dataSource.getDataByUri(currentPhoto.uri);
let fileAsset = await this.dataSource?.getDataByUri(currentPhoto?.uri);
if (fileAsset) {
renameResult = {
title: fileAsset.get(UserFileManagerAccess.FILE_KEY_TITLE.toString()) as string,
displayName: fileAsset.displayName
};
} else {
let key: string = 'renameResult' + currentPhoto.uri;
let key: string = 'renameResult' + currentPhoto?.uri;
renameResult = AppStorage.get<TitleName>(key) as TitleName;
AppStorage.delete(key);
}