Signed-off-by: liujuan <liujuan76@h-partners.com>

Changes to be committed:
This commit is contained in:
liujuan 2023-09-12 11:32:42 +08:00
parent 4757f104b2
commit 2736bdc9ab
35 changed files with 36 additions and 35 deletions

View File

@ -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;

View File

@ -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() {

View File

@ -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;

View File

@ -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[];

View File

@ -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();

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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');

View File

@ -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;

View File

@ -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;

View File

@ -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);

View File

@ -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;

View File

@ -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();

View File

@ -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();

View File

@ -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;

View File

@ -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(),

View File

@ -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;

View File

@ -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;

View File

@ -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(),

View File

@ -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;

View File

@ -86,7 +86,7 @@ export struct PhotoGridView {
@Provide rightClickMenuList: Array<Action> = new Array<Action>();
@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;