Merge branch 'master' of gitee.com:openharmony/applications_photos into master

Signed-off-by: zhouwenjun1031 <zhouwenjun6@huawei.com>

feature/browser/src/main/ets/default/view/photo/PhotoBrowserToolBar.ets

@@ -72,7 +72,7 @@ export struct PhotoBrowserToolBar {
         isFromPhotoBrowser: this.isFromPhotoBrowser
       })
     }
-    .padding({ bottom: $r('app.float.title_default') })
+    .padding({ bottom: this.leftBlank[3] })
     .width(Constants.PERCENT_100)
     .visibility(this.isVisibility ? Visibility.Visible : Visibility.Hidden)
     .opacity(this.opacityValue)

feature/editor/src/main/ets/default/view/ToolBar.ets

@@ -15,7 +15,7 @@
 
 import { ActionButton } from './ActionButton';
 import { BroadCast, Constants, Log } from '@ohos/common';
-import { ActionButtonInfo, ActionInfo } from './MainMenuInfo';
+import { ActionButtonInfo } from './MainMenuInfo';
 import { ActionChangedEvent, RefreshActionMenu } from './RefreshMenu';
 import { PhotoEditMode } from '../base/PhotoEditType';
 import { PhotoEditorManager } from '../PhotoEditorManager';
@@ -40,16 +40,16 @@ export struct ToolBar {
   @Consume titleSize: number;
   @Consume isRedo: boolean;
   @Consume isUndo: boolean;
-  private actionInfo: ActionInfo = {
-    src: $r('app.media.ic_edit_photo_toolbar_crop'),
-    // 加入其它按钮时改为PhotoEditMode.EDIT_MODE_CROP
-    actionID: PhotoEditMode.EDIT_MODE_CROP,
-    text: $r('app.string.crop_text'),
-    isActive: true,
-    componentKey: COMPONENT_KEY_Edit_CROP
-  };
   mainMenuList: Array<ActionButtonInfo> = [
-    new ActionButtonInfo(this.actionInfo)
+    new ActionButtonInfo({
+      src: $r('app.media.ic_edit_photo_toolbar_crop'),
+
+      // 加入其它按钮时改为PhotoEditMode.EDIT_MODE_CROP
+      actionID: undefined,
+      text: $r('app.string.crop_text'),
+      isActive: true,
+      componentKey: COMPONENT_KEY_Edit_CROP
+    })
   ];
   // 2022年8月11日 @Watch('clickEvent')打包报错    @State @Watch('clickEvent') menuChanged: RefreshActionMenu = new RefreshActionMenu(-1, this.mainMenuList);
   @State menuChanged: RefreshActionMenu = new RefreshActionMenu(-1, this.mainMenuList);

feature/thirdselect/src/main/ets/default/view/ThirdSelectPhotoBrowserBase.ets

@@ -88,6 +88,8 @@ export struct ThirdSelectPhotoBrowserBase {
   mPosition: number = 0;
   @State title: string = '';
   @Prop @Watch('onPageChanged') pageStatus: boolean = false;
+  @StorageLink(LEFT_BLANK) leftBlank: number[]
+    = [0, ScreenManager.getInstance().getStatusBarHeight(), 0, ScreenManager.getInstance().getNaviBarHeight()];
   @StorageLink(IS_HORIZONTAL) isHorizontal: boolean = ScreenManager.getInstance().isHorizontal();
   maxSelectCount: number = 0;
   @StorageLink('geometryOpacity') geometryOpacity: number = 1;
@@ -386,7 +388,7 @@ export struct ThirdSelectPhotoBrowserBase {
       this.buildCheckBox()
       this.buildPanel()
     }
-    .padding({ bottom: $r('app.float.buttonWithoutText') })
+    .padding({ bottom: this.leftBlank[3] })
   }
 
   pageTransition() {

product/phone/src/main/ets/pages/PhotoGridPage.ets

@@ -19,12 +19,14 @@ import {
   BroadCastManager,
   BrowserConstants,
   Constants,
-  Log
+  Log,
+  ScreenManager
 } from '@ohos/common';
 import { BrowserController } from '@ohos/common/CommonComponents';
 import { PhotoGridView } from '../view/PhotoGridView';
 import { PhotoBrowserComponent } from '../view/PhotoBrowserComponent';
 import { SelectPhotoBrowserView } from '../view/SelectPhotoBrowserView';
+import { LEFT_BLANK } from '@ohos/thirdselect/src/main/ets/default/utils/ThirdSelectConstants';
 
 const TAG: string = 'PhotoGridPage';
 AppStorage.SetOrCreate('PhotoGridPageIndex', Constants.INVALID);
@@ -37,6 +39,8 @@ export struct PhotoGridPage {
   @Provide isSelectedMode: boolean = false;
   @Provide isShow: boolean = true;
   @State isRunningAnimation: boolean = false;
+  @StorageLink(LEFT_BLANK) leftBlank: number[]
+    = [0, ScreenManager.getInstance().getStatusBarHeight(), 0, ScreenManager.getInstance().getNaviBarHeight()];
   @State @Watch('updateAnimationStatus') browserController: BrowserController = new BrowserController(true);
   private appBroadCast: BroadCast = BroadCastManager.getInstance().getBroadCast();
 
@@ -81,7 +85,7 @@ export struct PhotoGridPage {
           browserController: this.browserController
         })
       }
-      .padding({ bottom: $r('app.float.title_default') })
+      .padding({ bottom: this.leftBlank[3] })
 
       if (this.browserController.isBrowserShow) {
         Column() {