From 2736bdc9ab665edfe0825615fcf4ad53219ed87e Mon Sep 17 00:00:00 2001 From: liujuan Date: Tue, 12 Sep 2023 11:32:42 +0800 Subject: [PATCH] Signed-off-by: liujuan Changes to be committed: --- common/src/main/ets/default/view/NoPhotoComponent.ets | 2 +- common/src/main/ets/default/view/PhotoBrowserHolder.ets | 2 +- .../main/ets/default/view/ThirdSelectPhotoBrowserActionBar.ets | 2 +- common/src/main/ets/default/view/actionbar/ToolBar.ets | 2 +- .../default/view/browserOperation/MediaOperationBasePage.ets | 2 +- common/src/main/ets/default/view/dialog/AddNotesDialog.ets | 2 +- .../src/main/ets/default/view/dialog/CancelOperationDialog.ets | 2 +- common/src/main/ets/default/view/dialog/CopyOrMoveDialog.ets | 2 +- common/src/main/ets/default/view/dialog/DeleteDialog.ets | 2 +- .../src/main/ets/default/view/dialog/DeleteProgressDialog.ets | 2 +- common/src/main/ets/default/view/dialog/DetailsDialog.ets | 2 +- .../ets/default/view/dialog/DownloadCancelOperationDialog.ets | 2 +- common/src/main/ets/default/view/dialog/EditExitDialog.ets | 2 +- common/src/main/ets/default/view/dialog/MultiSelectDialog.ets | 2 +- common/src/main/ets/default/view/dialog/NewAlbumDialog.ets | 2 +- common/src/main/ets/default/view/dialog/ProgressDialog.ets | 2 +- common/src/main/ets/default/view/dialog/RemoveDialog.ets | 2 +- .../src/main/ets/default/view/dialog/RemoveProgressDialog.ets | 2 +- common/src/main/ets/default/view/dialog/RenameDialog.ets | 2 +- common/src/main/ets/default/view/dialog/SaveDialog.ets | 2 +- common/src/main/ets/default/view/dialog/SaveImageDialog.ets | 2 +- common/src/main/ets/default/view/dialog/ThirdDeleteDialog.ets | 3 ++- .../src/main/ets/default/view/photo/PhotoBrowserActionBar.ets | 2 +- .../src/main/ets/default/view/photo/PhotoBrowserToolBar.ets | 2 +- .../src/main/ets/default/view/ThirdSelectAlbumPageBase.ets | 2 +- .../src/main/ets/default/view/ThirdSelectPhotoGridBase.ets | 2 +- feature/timeline/src/main/ets/view/TimelinePage.ets | 2 +- product/phone/src/main/ets/pages/AlbumSelect.ets | 2 +- product/phone/src/main/ets/pages/DefaultPhotoPage.ets | 2 +- product/phone/src/main/ets/pages/EditMain.ets | 2 +- product/phone/src/main/ets/pages/FormEditorPage.ets | 2 +- product/phone/src/main/ets/pages/NewAlbumPage.ets | 2 +- product/phone/src/main/ets/pages/index.ets | 2 +- product/phone/src/main/ets/view/PhotoBrowserComponent.ets | 2 +- product/phone/src/main/ets/view/PhotoGridView.ets | 2 +- 35 files changed, 36 insertions(+), 35 deletions(-) diff --git a/common/src/main/ets/default/view/NoPhotoComponent.ets b/common/src/main/ets/default/view/NoPhotoComponent.ets index ea7eee6d..915aebb7 100644 --- a/common/src/main/ets/default/view/NoPhotoComponent.ets +++ b/common/src/main/ets/default/view/NoPhotoComponent.ets @@ -27,7 +27,7 @@ export struct NoPhotoComponent { @State offSetY: number = Constants.EMPTY_PAGE_DEFAULT_OFFSET; @StorageLink('isHorizontal') isHorizontal: boolean = ScreenManager.getInstance().isHorizontal(); @StorageLink('isSidebar') isSidebar: boolean = ScreenManager.getInstance().isSidebar(); - @StorageLink('leftBlank') leftBlank: [number, number, number, number] + @StorageLink('leftBlank') leftBlank: number[] = [0, ScreenManager.getInstance().getStatusBarHeight(), 0, ScreenManager.getInstance().getNaviBarHeight()]; @State bigScreen: boolean = false; diff --git a/common/src/main/ets/default/view/PhotoBrowserHolder.ets b/common/src/main/ets/default/view/PhotoBrowserHolder.ets index 86164ce3..7cf7ee7b 100644 --- a/common/src/main/ets/default/view/PhotoBrowserHolder.ets +++ b/common/src/main/ets/default/view/PhotoBrowserHolder.ets @@ -17,7 +17,7 @@ import { ScreenManager } from '../model/common/ScreenManager'; @Component export struct PhotoBrowserHolder { @Consume isShowBar: boolean; - @StorageLink('leftBlank') leftBlank: [number, number, number, number] + @StorageLink('leftBlank') leftBlank: number[] = [0, ScreenManager.getInstance().getStatusBarHeight(), 0, ScreenManager.getInstance().getNaviBarHeight()]; build() { diff --git a/common/src/main/ets/default/view/ThirdSelectPhotoBrowserActionBar.ets b/common/src/main/ets/default/view/ThirdSelectPhotoBrowserActionBar.ets index cc3d7e99..2136d663 100644 --- a/common/src/main/ets/default/view/ThirdSelectPhotoBrowserActionBar.ets +++ b/common/src/main/ets/default/view/ThirdSelectPhotoBrowserActionBar.ets @@ -24,7 +24,7 @@ const TAG: string = 'common_ThirdSelectPhotoBrowserActionBar'; @Component export struct ThirdSelectPhotoBrowserActionBar { - @StorageLink('leftBlank') leftBlank: [number, number, number, number] + @StorageLink('leftBlank') leftBlank: number[] = [0, ScreenManager.getInstance().getStatusBarHeight(), 0, ScreenManager.getInstance().getNaviBarHeight()]; @State isMultiPick: boolean = false; @Consume @Watch('createActionBar') isSelected: boolean; diff --git a/common/src/main/ets/default/view/actionbar/ToolBar.ets b/common/src/main/ets/default/view/actionbar/ToolBar.ets index 4b9f920e..4a5ddd0b 100644 --- a/common/src/main/ets/default/view/actionbar/ToolBar.ets +++ b/common/src/main/ets/default/view/actionbar/ToolBar.ets @@ -29,7 +29,7 @@ export class MenuItem { export struct ToolBar { @Consume isShowBar: boolean; @StorageLink('isSplitMode') isSplitMode: boolean = ScreenManager.getInstance().isSplitMode(); - @StorageLink('leftBlank') leftBlank: [number, number, number, number] + @StorageLink('leftBlank') leftBlank: number[] = [0, ScreenManager.getInstance().getStatusBarHeight(), 0, ScreenManager.getInstance().getNaviBarHeight()]; @Consume toolMenuList: Action[]; @Consume moreMenuList: Action[]; diff --git a/common/src/main/ets/default/view/browserOperation/MediaOperationBasePage.ets b/common/src/main/ets/default/view/browserOperation/MediaOperationBasePage.ets index 4f253031..88c5efe0 100644 --- a/common/src/main/ets/default/view/browserOperation/MediaOperationBasePage.ets +++ b/common/src/main/ets/default/view/browserOperation/MediaOperationBasePage.ets @@ -40,7 +40,7 @@ const TAG: string = 'common_MediaOperationBasePage'; @Component export struct MediaOperationBasePage { - @StorageLink('leftBlank') leftBlank: [number, number, number, number] + @StorageLink('leftBlank') leftBlank: number[] = [0, ScreenManager.getInstance().getStatusBarHeight(), 0, ScreenManager.getInstance().getNaviBarHeight()]; @Provide pageType: string = MediaOperationType.Move; @Provide broadCast: BroadCast = new BroadCast(); diff --git a/common/src/main/ets/default/view/dialog/AddNotesDialog.ets b/common/src/main/ets/default/view/dialog/AddNotesDialog.ets index 96aaa4a1..1e041e5e 100644 --- a/common/src/main/ets/default/view/dialog/AddNotesDialog.ets +++ b/common/src/main/ets/default/view/dialog/AddNotesDialog.ets @@ -26,7 +26,7 @@ const TAG: string = 'common_AddNotesDialog'; export struct AddNotesDialog { @StorageLink('isHorizontal') isHorizontal: boolean = ScreenManager.getInstance().isHorizontal(); @StorageLink('isSidebar') isSidebar: boolean = ScreenManager.getInstance().isSidebar(); - @StorageLink('leftBlank') leftBlank: [number, number, number, number] + @StorageLink('leftBlank') leftBlank: number[] = [0, ScreenManager.getInstance().getStatusBarHeight(), 0, ScreenManager.getInstance().getNaviBarHeight()]; controller: CustomDialogController; @Consume dialogCallback: DialogCallback; diff --git a/common/src/main/ets/default/view/dialog/CancelOperationDialog.ets b/common/src/main/ets/default/view/dialog/CancelOperationDialog.ets index 59911001..d5ada580 100644 --- a/common/src/main/ets/default/view/dialog/CancelOperationDialog.ets +++ b/common/src/main/ets/default/view/dialog/CancelOperationDialog.ets @@ -30,7 +30,7 @@ export class CancelParam { export struct CancelOperationDialog { @StorageLink('isHorizontal') isHorizontal: boolean = ScreenManager.getInstance().isHorizontal(); @StorageLink('isSidebar') isSidebar: boolean = ScreenManager.getInstance().isSidebar(); - @StorageLink('leftBlank') leftBlank: [number, number, number, number] + @StorageLink('leftBlank') leftBlank: number[] = [0, ScreenManager.getInstance().getStatusBarHeight(), 0, ScreenManager.getInstance().getNaviBarHeight()]; controller: CustomDialogController; @Consume cancelMessage: Resource; diff --git a/common/src/main/ets/default/view/dialog/CopyOrMoveDialog.ets b/common/src/main/ets/default/view/dialog/CopyOrMoveDialog.ets index a58338b6..5ff5cfc4 100644 --- a/common/src/main/ets/default/view/dialog/CopyOrMoveDialog.ets +++ b/common/src/main/ets/default/view/dialog/CopyOrMoveDialog.ets @@ -31,7 +31,7 @@ export struct CopyOrMoveDialog { static readonly EXTERNAL_PREFIX_NUM = 2; @StorageLink('isHorizontal') isHorizontal: boolean = ScreenManager.getInstance().isHorizontal(); @StorageLink('isSidebar') isSidebar: boolean = ScreenManager.getInstance().isSidebar(); - @StorageLink('leftBlank') leftBlank: [number, number, number, number] + @StorageLink('leftBlank') leftBlank: number[] = [0, ScreenManager.getInstance().getStatusBarHeight(), 0, ScreenManager.getInstance().getNaviBarHeight()]; controller: CustomDialogController; dataTime: string; diff --git a/common/src/main/ets/default/view/dialog/DeleteDialog.ets b/common/src/main/ets/default/view/dialog/DeleteDialog.ets index b9508201..ba108816 100644 --- a/common/src/main/ets/default/view/dialog/DeleteDialog.ets +++ b/common/src/main/ets/default/view/dialog/DeleteDialog.ets @@ -24,7 +24,7 @@ const TAG: string = 'common_DeleteDialog'; export struct DeleteDialog { @StorageLink('isHorizontal') isHorizontal: boolean = ScreenManager.getInstance().isHorizontal(); @StorageLink('isSidebar') isSidebar: boolean = ScreenManager.getInstance().isSidebar(); - @StorageLink('leftBlank') leftBlank: [number, number, number, number] + @StorageLink('leftBlank') leftBlank: number[] = [0, ScreenManager.getInstance().getStatusBarHeight(), 0, ScreenManager.getInstance().getNaviBarHeight()]; @Consume dialogCallback: DialogCallback; @Consume dialogMessage: Resource; diff --git a/common/src/main/ets/default/view/dialog/DeleteProgressDialog.ets b/common/src/main/ets/default/view/dialog/DeleteProgressDialog.ets index edf74cc8..5aa3b0a6 100644 --- a/common/src/main/ets/default/view/dialog/DeleteProgressDialog.ets +++ b/common/src/main/ets/default/view/dialog/DeleteProgressDialog.ets @@ -30,7 +30,7 @@ export class DeleteProgressParam { export struct DeleteProgressDialog { @StorageLink('isHorizontal') isHorizontal: boolean = ScreenManager.getInstance().isHorizontal(); @StorageLink('isSidebar') isSidebar: boolean = ScreenManager.getInstance().isSidebar(); - @StorageLink('leftBlank') leftBlank: [number, number, number, number] + @StorageLink('leftBlank') leftBlank: number[] = [0, ScreenManager.getInstance().getStatusBarHeight(), 0, ScreenManager.getInstance().getNaviBarHeight()]; controller: CustomDialogController @Consume deleteProgress: number; diff --git a/common/src/main/ets/default/view/dialog/DetailsDialog.ets b/common/src/main/ets/default/view/dialog/DetailsDialog.ets index df45f427..62fa3870 100644 --- a/common/src/main/ets/default/view/dialog/DetailsDialog.ets +++ b/common/src/main/ets/default/view/dialog/DetailsDialog.ets @@ -42,7 +42,7 @@ export struct DetailsDialog { static readonly EXTERNAL_PREFIX_NUM = 2; @StorageLink('isHorizontal') isHorizontal: boolean = ScreenManager.getInstance().isHorizontal(); @StorageLink('isSidebar') isSidebar: boolean = ScreenManager.getInstance().isSidebar(); - @StorageLink('leftBlank') leftBlank: [number, number, number, number] + @StorageLink('leftBlank') leftBlank: number[] = [0, ScreenManager.getInstance().getStatusBarHeight(), 0, ScreenManager.getInstance().getNaviBarHeight()]; sizeConvert = 1024; controller: CustomDialogController; diff --git a/common/src/main/ets/default/view/dialog/DownloadCancelOperationDialog.ets b/common/src/main/ets/default/view/dialog/DownloadCancelOperationDialog.ets index 2e8250fe..0807c61e 100644 --- a/common/src/main/ets/default/view/dialog/DownloadCancelOperationDialog.ets +++ b/common/src/main/ets/default/view/dialog/DownloadCancelOperationDialog.ets @@ -30,7 +30,7 @@ export class CancelParam { export struct DownloadCancelOperationDialog { @StorageLink('isHorizontal') isHorizontal: boolean = ScreenManager.getInstance().isHorizontal(); @StorageLink('isSidebar') isSidebar: boolean = ScreenManager.getInstance().isSidebar(); - @StorageLink('leftBlank') leftBlank: [number, number, number, number] + @StorageLink('leftBlank') leftBlank: number[] = [0, ScreenManager.getInstance().getStatusBarHeight(), 0, ScreenManager.getInstance().getNaviBarHeight()]; controller: CustomDialogController; @Consume broadCast: BroadCast; diff --git a/common/src/main/ets/default/view/dialog/EditExitDialog.ets b/common/src/main/ets/default/view/dialog/EditExitDialog.ets index 14201d42..e6044d22 100644 --- a/common/src/main/ets/default/view/dialog/EditExitDialog.ets +++ b/common/src/main/ets/default/view/dialog/EditExitDialog.ets @@ -27,7 +27,7 @@ export struct EditExitDialog { @Consume editExitDialogCallback: EditExitDialogCallback; @StorageLink('isHorizontal') isHorizontal: boolean = ScreenManager.getInstance().isHorizontal(); @StorageLink('isSidebar') isSidebar: boolean = ScreenManager.getInstance().isSidebar(); - @StorageLink('leftBlank') leftBlank: [number, number, number, number] + @StorageLink('leftBlank') leftBlank: number[] = [0, ScreenManager.getInstance().getStatusBarHeight(), 0, ScreenManager.getInstance().getNaviBarHeight()]; controller: CustomDialogController; private isPcDevice: boolean = AppStorage.Get('deviceType') === Constants.PC_DEVICE_TYPE; diff --git a/common/src/main/ets/default/view/dialog/MultiSelectDialog.ets b/common/src/main/ets/default/view/dialog/MultiSelectDialog.ets index ed9e7ec8..beb3a1fe 100644 --- a/common/src/main/ets/default/view/dialog/MultiSelectDialog.ets +++ b/common/src/main/ets/default/view/dialog/MultiSelectDialog.ets @@ -32,7 +32,7 @@ export struct MultiSelectDialog { static readonly EXTERNAL_PREFIX_NUM = 2; @StorageLink('isHorizontal') isHorizontal: boolean = ScreenManager.getInstance().isHorizontal(); @StorageLink('isSidebar') isSidebar: boolean = ScreenManager.getInstance().isSidebar(); - @StorageLink('leftBlank') leftBlank: [number, number, number, number] + @StorageLink('leftBlank') leftBlank: number[] = [0, ScreenManager.getInstance().getStatusBarHeight(), 0, ScreenManager.getInstance().getNaviBarHeight()]; controller: CustomDialogController; @Consume multiSelectDetails: MultiSelectDetails; diff --git a/common/src/main/ets/default/view/dialog/NewAlbumDialog.ets b/common/src/main/ets/default/view/dialog/NewAlbumDialog.ets index 6091d8f3..9abd6aa6 100644 --- a/common/src/main/ets/default/view/dialog/NewAlbumDialog.ets +++ b/common/src/main/ets/default/view/dialog/NewAlbumDialog.ets @@ -26,7 +26,7 @@ const TAG: string = 'common_NewAlbumDialog'; export struct NewAlbumDialog { @StorageLink('isHorizontal') isHorizontal: boolean = ScreenManager.getInstance().isHorizontal(); @StorageLink('isSidebar') isSidebar: boolean = ScreenManager.getInstance().isSidebar(); - @StorageLink('leftBlank') leftBlank: [number, number, number, number] + @StorageLink('leftBlank') leftBlank: number[] = [0, ScreenManager.getInstance().getStatusBarHeight(), 0, ScreenManager.getInstance().getNaviBarHeight()]; controller: CustomDialogController; @Consume renameFileName: string; diff --git a/common/src/main/ets/default/view/dialog/ProgressDialog.ets b/common/src/main/ets/default/view/dialog/ProgressDialog.ets index 1e3a5895..d18c6562 100644 --- a/common/src/main/ets/default/view/dialog/ProgressDialog.ets +++ b/common/src/main/ets/default/view/dialog/ProgressDialog.ets @@ -30,7 +30,7 @@ export class ProgressParam { export struct ProgressDialog { @StorageLink('isHorizontal') isHorizontal: boolean = ScreenManager.getInstance().isHorizontal(); @StorageLink('isSidebar') isSidebar: boolean = ScreenManager.getInstance().isSidebar(); - @StorageLink('leftBlank') leftBlank: [number, number, number, number] + @StorageLink('leftBlank') leftBlank: number[] = [0, ScreenManager.getInstance().getStatusBarHeight(), 0, ScreenManager.getInstance().getNaviBarHeight()]; controller: CustomDialogController @Consume progressMessage: Resource; diff --git a/common/src/main/ets/default/view/dialog/RemoveDialog.ets b/common/src/main/ets/default/view/dialog/RemoveDialog.ets index ce7a95e2..c8fbedf4 100644 --- a/common/src/main/ets/default/view/dialog/RemoveDialog.ets +++ b/common/src/main/ets/default/view/dialog/RemoveDialog.ets @@ -24,7 +24,7 @@ const TAG: string = 'common_RemoveDialog'; export struct RemoveDialog { @StorageLink('isHorizontal') isHorizontal: boolean = ScreenManager.getInstance().isHorizontal(); @StorageLink('isSidebar') isSidebar: boolean = ScreenManager.getInstance().isSidebar(); - @StorageLink('leftBlank') leftBlank: [number, number, number, number] + @StorageLink('leftBlank') leftBlank: number[] = [0, ScreenManager.getInstance().getStatusBarHeight(), 0, ScreenManager.getInstance().getNaviBarHeight()]; @Consume dialogCallback: DialogCallback; @Consume dialogMessage: Resource; diff --git a/common/src/main/ets/default/view/dialog/RemoveProgressDialog.ets b/common/src/main/ets/default/view/dialog/RemoveProgressDialog.ets index 859b1fb9..aeea3a9b 100644 --- a/common/src/main/ets/default/view/dialog/RemoveProgressDialog.ets +++ b/common/src/main/ets/default/view/dialog/RemoveProgressDialog.ets @@ -30,7 +30,7 @@ export class RemoveProgressParam { export struct RemoveProgressDialog { @StorageLink('isHorizontal') isHorizontal: boolean = ScreenManager.getInstance().isHorizontal(); @StorageLink('isSidebar') isSidebar: boolean = ScreenManager.getInstance().isSidebar(); - @StorageLink('leftBlank') leftBlank: [number, number, number, number] + @StorageLink('leftBlank') leftBlank: number[] = [0, ScreenManager.getInstance().getStatusBarHeight(), 0, ScreenManager.getInstance().getNaviBarHeight()]; controller: CustomDialogController @Consume removeProgress: number; diff --git a/common/src/main/ets/default/view/dialog/RenameDialog.ets b/common/src/main/ets/default/view/dialog/RenameDialog.ets index f04dfefc..31f75afd 100644 --- a/common/src/main/ets/default/view/dialog/RenameDialog.ets +++ b/common/src/main/ets/default/view/dialog/RenameDialog.ets @@ -26,7 +26,7 @@ const TAG: string = 'common_RenameDialog'; export struct RenameDialog { @StorageLink('isHorizontal') isHorizontal: boolean = ScreenManager.getInstance().isHorizontal(); @StorageLink('isSidebar') isSidebar: boolean = ScreenManager.getInstance().isSidebar(); - @StorageLink('leftBlank') leftBlank: [number, number, number, number] + @StorageLink('leftBlank') leftBlank: number[] = [0, ScreenManager.getInstance().getStatusBarHeight(), 0, ScreenManager.getInstance().getNaviBarHeight()]; controller: CustomDialogController; @Consume renameFileName: string; diff --git a/common/src/main/ets/default/view/dialog/SaveDialog.ets b/common/src/main/ets/default/view/dialog/SaveDialog.ets index 324dd5f8..8a1add5a 100644 --- a/common/src/main/ets/default/view/dialog/SaveDialog.ets +++ b/common/src/main/ets/default/view/dialog/SaveDialog.ets @@ -42,7 +42,7 @@ export class SaveDialogCallback { export struct SaveDialog { @StorageLink('isHorizontal') isHorizontal: boolean = ScreenManager.getInstance().isHorizontal(); @StorageLink('isSidebar') isSidebar: boolean = ScreenManager.getInstance().isSidebar(); - @StorageLink('leftBlank') leftBlank: [number, number, number, number] + @StorageLink('leftBlank') leftBlank: number[] = [0, ScreenManager.getInstance().getStatusBarHeight(), 0, ScreenManager.getInstance().getNaviBarHeight()]; @Consume broadCast: BroadCast; @Consume saveDialogCallback: SaveDialogCallback; diff --git a/common/src/main/ets/default/view/dialog/SaveImageDialog.ets b/common/src/main/ets/default/view/dialog/SaveImageDialog.ets index 6cd55a0d..fe1ec4da 100644 --- a/common/src/main/ets/default/view/dialog/SaveImageDialog.ets +++ b/common/src/main/ets/default/view/dialog/SaveImageDialog.ets @@ -23,7 +23,7 @@ export struct SaveImageDialog { @Consume broadCast: BroadCast @StorageLink('isHorizontal') isHorizontal: boolean = ScreenManager.getInstance().isHorizontal(); @StorageLink('isSidebar') isSidebar: boolean = ScreenManager.getInstance().isSidebar(); - @StorageLink('leftBlank') leftBlank: [number, number, number, number] + @StorageLink('leftBlank') leftBlank: number[] = [0, ScreenManager.getInstance().getStatusBarHeight(), 0, ScreenManager.getInstance().getNaviBarHeight()]; controller: CustomDialogController; private isPcDevice: boolean = AppStorage.Get('deviceType') === Constants.PC_DEVICE_TYPE; diff --git a/common/src/main/ets/default/view/dialog/ThirdDeleteDialog.ets b/common/src/main/ets/default/view/dialog/ThirdDeleteDialog.ets index e70f0174..a582da04 100644 --- a/common/src/main/ets/default/view/dialog/ThirdDeleteDialog.ets +++ b/common/src/main/ets/default/view/dialog/ThirdDeleteDialog.ets @@ -21,7 +21,8 @@ import { Constants } from '../../model/common/Constants'; export struct ThirdDeleteDialog { private TAG: string = 'DeleteDialog' @StorageLink('isHorizontal') isHorizontal: boolean = ScreenManager.getInstance().isHorizontal(); - @StorageLink('leftBlank') leftBlank: [number, number, number, number] = [0, 0, 0, 0]; + @StorageLink('leftBlank') leftBlank: number[] + = [0, ScreenManager.getInstance().getStatusBarHeight(), 0, ScreenManager.getInstance().getNaviBarHeight()]; @Consume dialogCallback: DialogCallback; @Consume dialogMessage: Resource; @StorageLink('confirmText') confirmText: Resource = $r('app.string.dialog_delete'); diff --git a/feature/browser/src/main/ets/default/view/photo/PhotoBrowserActionBar.ets b/feature/browser/src/main/ets/default/view/photo/PhotoBrowserActionBar.ets index b5c0a0d8..b3e6dd0c 100644 --- a/feature/browser/src/main/ets/default/view/photo/PhotoBrowserActionBar.ets +++ b/feature/browser/src/main/ets/default/view/photo/PhotoBrowserActionBar.ets @@ -35,7 +35,7 @@ export struct PhotoBrowserActionBar { @State isVisibility: boolean = true; @State currentBackgroundColor: Resource = ActionBarProp.NORMAL_BACKGROUND_COLOR; @StorageLink('isSplitMode') isSplitMode: boolean = ScreenManager.getInstance().isSplitMode(); - @StorageLink('leftBlank') leftBlank: [number, number, number, number] + @StorageLink('leftBlank') leftBlank: number[] = [0, ScreenManager.getInstance().getStatusBarHeight(), 0, ScreenManager.getInstance().getNaviBarHeight()]; onMenuClicked: Function; isVideoPage: boolean = false; diff --git a/feature/browser/src/main/ets/default/view/photo/PhotoBrowserToolBar.ets b/feature/browser/src/main/ets/default/view/photo/PhotoBrowserToolBar.ets index 46538ae8..015a012e 100644 --- a/feature/browser/src/main/ets/default/view/photo/PhotoBrowserToolBar.ets +++ b/feature/browser/src/main/ets/default/view/photo/PhotoBrowserToolBar.ets @@ -30,7 +30,7 @@ export struct PhotoBrowserToolBar { onMenuClicked: Function; @StorageLink('isSplitMode') isSplitMode: boolean = ScreenManager.getInstance().isSplitMode(); @StorageLink('isHorizontal') isHorizontal: boolean = ScreenManager.getInstance().isHorizontal(); - @StorageLink('leftBlank') leftBlank: [number, number, number, number] + @StorageLink('leftBlank') leftBlank: number[] = [0, ScreenManager.getInstance().getStatusBarHeight(), 0, ScreenManager.getInstance().getNaviBarHeight()]; noAnimation: boolean = true; @Consume hidePopup: boolean; diff --git a/feature/thirdselect/src/main/ets/default/view/ThirdSelectAlbumPageBase.ets b/feature/thirdselect/src/main/ets/default/view/ThirdSelectAlbumPageBase.ets index 70dabc77..185b7c21 100644 --- a/feature/thirdselect/src/main/ets/default/view/ThirdSelectAlbumPageBase.ets +++ b/feature/thirdselect/src/main/ets/default/view/ThirdSelectAlbumPageBase.ets @@ -52,7 +52,7 @@ export struct ThirdSelectAlbumPageBase { @Provide gridColumnsCount: number = 3; isActive = false; @StorageLink(IS_SPLIT_MODE) isSplitMode: boolean = ScreenManager.getInstance().isSplitMode(); - @StorageLink(LEFT_BLANK) leftBlank: [number, number, number, number] + @StorageLink(LEFT_BLANK) leftBlank: number[] = [0, ScreenManager.getInstance().getStatusBarHeight(), 0, ScreenManager.getInstance().getNaviBarHeight()]; @StorageLink(IS_SIDE_BAR) isSidebar: boolean = ScreenManager.getInstance().isSidebar(); dataObserver: CommonObserverCallback = new CommonObserverCallback(this); diff --git a/feature/thirdselect/src/main/ets/default/view/ThirdSelectPhotoGridBase.ets b/feature/thirdselect/src/main/ets/default/view/ThirdSelectPhotoGridBase.ets index 8079960f..7bbf3d56 100644 --- a/feature/thirdselect/src/main/ets/default/view/ThirdSelectPhotoGridBase.ets +++ b/feature/thirdselect/src/main/ets/default/view/ThirdSelectPhotoGridBase.ets @@ -72,7 +72,7 @@ export struct ThirdSelectPhotoGridBase { @State title: string = ''; @State isEmpty: boolean = false; @StorageLink(IS_SPLIT_MODE) isSplitMode: boolean = ScreenManager.getInstance().isSplitMode(); - @StorageLink(LEFT_BLANK) leftBlank: [number, number, number, number] + @StorageLink(LEFT_BLANK) leftBlank: number[] = [0, ScreenManager.getInstance().getStatusBarHeight(), 0, ScreenManager.getInstance().getNaviBarHeight()]; @StorageLink(IS_HORIZONTAL) isHorizontal: boolean = ScreenManager.getInstance().isHorizontal(); DEFAULT_TOAST_DURATION = 2000; diff --git a/feature/timeline/src/main/ets/view/TimelinePage.ets b/feature/timeline/src/main/ets/view/TimelinePage.ets index f81b54ca..6f1ab74d 100644 --- a/feature/timeline/src/main/ets/view/TimelinePage.ets +++ b/feature/timeline/src/main/ets/view/TimelinePage.ets @@ -71,7 +71,7 @@ export struct TimelinePage { @Consume @Watch('onIndexPageShow') isShow: boolean; @StorageLink('TimelinePageIndex') @Watch('onIndexChange') TimelinePageIndex: number = Constants.INVALID; @StorageLink('isSplitMode') isSplitMode: boolean = ScreenManager.getInstance().isSplitMode(); - @StorageLink('leftBlank') leftBlank: [number, number, number, number] + @StorageLink('leftBlank') leftBlank: number[] = [0, ScreenManager.getInstance().getStatusBarHeight(), 0, ScreenManager.getInstance().getNaviBarHeight()]; dataSource: TimelineDataSource; mSelectManager: TimelineSelectManager = new TimelineSelectManager(); diff --git a/product/phone/src/main/ets/pages/AlbumSelect.ets b/product/phone/src/main/ets/pages/AlbumSelect.ets index 9539c48f..8e505bb0 100644 --- a/product/phone/src/main/ets/pages/AlbumSelect.ets +++ b/product/phone/src/main/ets/pages/AlbumSelect.ets @@ -41,7 +41,7 @@ export struct AlbumSelect { @State gridColumnsCount: number = 0; @Provide broadCast: BroadCast = new BroadCast(); @Provide('selectedCount') totalSelectedCount: number = 0; - @StorageLink('leftBlank') leftBlank: [number, number, number, number] + @StorageLink('leftBlank') leftBlank: number[] = [0, ScreenManager.getInstance().getStatusBarHeight(), 0, ScreenManager.getInstance().getNaviBarHeight()]; private isActive = false; private scroller: Scroller = new Scroller(); diff --git a/product/phone/src/main/ets/pages/DefaultPhotoPage.ets b/product/phone/src/main/ets/pages/DefaultPhotoPage.ets index 05217495..148d31c7 100644 --- a/product/phone/src/main/ets/pages/DefaultPhotoPage.ets +++ b/product/phone/src/main/ets/pages/DefaultPhotoPage.ets @@ -46,7 +46,7 @@ export struct DefaultPhotoPage { @State actionBarProp: ActionBarProp = new ActionBarProp(); @StorageLink('isSplitMode') isSplitMode: boolean = ScreenManager.getInstance().isSplitMode(); @StorageLink('isHorizontal') isHorizontal: boolean = ScreenManager.getInstance().isHorizontal(); - @StorageLink('leftBlank') leftBlank: [number, number, number, number] + @StorageLink('leftBlank') leftBlank: number[] = [0, ScreenManager.getInstance().getStatusBarHeight(), 0, ScreenManager.getInstance().getNaviBarHeight()]; defaultMediaItem: MediaItem; @StorageLink('statusBarHeight') statusBarHeight: number = 0; diff --git a/product/phone/src/main/ets/pages/EditMain.ets b/product/phone/src/main/ets/pages/EditMain.ets index a6c8436b..e29354a1 100644 --- a/product/phone/src/main/ets/pages/EditMain.ets +++ b/product/phone/src/main/ets/pages/EditMain.ets @@ -56,7 +56,7 @@ export struct EditMain { @Provide mainBottomSize: number = Constants.BOTTOM_TOOL_BAR_SIZE; @Provide titleSize: number = Constants.TOP_BAR_SIZE; @Provide filterBottomSize: number = Constants.FILTER_BOTTOM_TOOL_BAR_SIZE; - @StorageLink('leftBlank') leftBlank: [number, number, number, number] + @StorageLink('leftBlank') leftBlank: number[] = [ Constants.NUMBER_0, ScreenManager.getInstance().getStatusBarHeight(), diff --git a/product/phone/src/main/ets/pages/FormEditorPage.ets b/product/phone/src/main/ets/pages/FormEditorPage.ets index 359b34b4..616e6970 100644 --- a/product/phone/src/main/ets/pages/FormEditorPage.ets +++ b/product/phone/src/main/ets/pages/FormEditorPage.ets @@ -42,7 +42,7 @@ struct FormEditorPage { @StorageLink('FASetting_FormId') formId: string = '0'; @StorageLink('isHorizontal') isHorizontal: boolean = ScreenManager.getInstance().isHorizontal(); @StorageLink('isSidebar') isSidebar: boolean = ScreenManager.getInstance().isSidebar(); - @StorageLink('leftBlank') leftBlank: [number, number, number, number] + @StorageLink('leftBlank') leftBlank: number[] = [0, ScreenManager.getInstance().getStatusBarHeight(), 0, ScreenManager.getInstance().getNaviBarHeight()]; currentIndex: number = 0; @State isShowName: boolean = true; diff --git a/product/phone/src/main/ets/pages/NewAlbumPage.ets b/product/phone/src/main/ets/pages/NewAlbumPage.ets index 6a9b2314..ed33b6eb 100644 --- a/product/phone/src/main/ets/pages/NewAlbumPage.ets +++ b/product/phone/src/main/ets/pages/NewAlbumPage.ets @@ -63,7 +63,7 @@ export struct NewAlbumPage { @State isClickScrollBar: boolean = false; @StorageLink('PhotoGridPageIndex') @Watch('onIndexChange') PhotoGridPageIndex: number = Constants.INVALID; @StorageLink('isSplitMode') isSplitMode: boolean = ScreenManager.getInstance().isSplitMode(); - @StorageLink('leftBlank') leftBlank: [number, number, number, number] + @StorageLink('leftBlank') leftBlank: number[] = [0, ScreenManager.getInstance().getStatusBarHeight(), 0, ScreenManager.getInstance().getNaviBarHeight()]; title: string; @StorageLink('placeholderIndex') @Watch('onPlaceholderChanged') placeholderIndex: number = -1; diff --git a/product/phone/src/main/ets/pages/index.ets b/product/phone/src/main/ets/pages/index.ets index 64fb5ea9..988b6d46 100644 --- a/product/phone/src/main/ets/pages/index.ets +++ b/product/phone/src/main/ets/pages/index.ets @@ -57,7 +57,7 @@ const IMAGE_CACHE_SIZE: number = 1024 * 1024 * IMAGE_CACHE_COUNT; struct IndexPage { @StorageLink('app_key_tabs_index') preIndex: number = Constants.TIMELINE_PAGE_INDEX; @StorageLink('isSplitMode') isSplitMode: boolean = ScreenManager.getInstance().isSplitMode(); - @StorageLink('leftBlank') leftBlank: [number, number, number, number] + @StorageLink('leftBlank') leftBlank: number[] = [ Constants.NUMBER_0, ScreenManager.getInstance().getStatusBarHeight(), diff --git a/product/phone/src/main/ets/view/PhotoBrowserComponent.ets b/product/phone/src/main/ets/view/PhotoBrowserComponent.ets index 437b1746..412752e7 100644 --- a/product/phone/src/main/ets/view/PhotoBrowserComponent.ets +++ b/product/phone/src/main/ets/view/PhotoBrowserComponent.ets @@ -96,7 +96,7 @@ export struct PhotoBrowserComponent { @StorageLink('TimelinePageIndex') TimelinePageIndex: number = Constants.INVALID; @StorageLink('PhotoGridPageIndex') PhotoGridPageIndex: number = Constants.INVALID; @StorageLink('isSplitMode') isSplitMode: boolean = ScreenManager.getInstance().isSplitMode(); - @StorageLink('leftBlank') leftBlank: [number, number, number, number] + @StorageLink('leftBlank') leftBlank: number[] = [0, ScreenManager.getInstance().getStatusBarHeight(), 0, ScreenManager.getInstance().getNaviBarHeight()]; @StorageLink('entryFromHap') entryFromHap: number = Constants.ENTRY_FROM_NONE; mTransition: string; diff --git a/product/phone/src/main/ets/view/PhotoGridView.ets b/product/phone/src/main/ets/view/PhotoGridView.ets index 6df962e0..783df502 100644 --- a/product/phone/src/main/ets/view/PhotoGridView.ets +++ b/product/phone/src/main/ets/view/PhotoGridView.ets @@ -86,7 +86,7 @@ export struct PhotoGridView { @Provide rightClickMenuList: Array = new Array(); @StorageLink('PhotoGridPageIndex') @Watch('onIndexChange') PhotoGridPageIndex: number = Constants.INVALID; @StorageLink('isSplitMode') isSplitMode: boolean = ScreenManager.getInstance().isSplitMode(); - @StorageLink('leftBlank') leftBlank: [number, number, number, number] + @StorageLink('leftBlank') leftBlank: number[] = [0, ScreenManager.getInstance().getStatusBarHeight(), 0, ScreenManager.getInstance().getNaviBarHeight()]; @Prop @Watch('onPageChanged') pageStatus: boolean; @State gridItemWidth: number = 0;