Merge branch 'main' of http://192.168.1.42/developOne/harmonyPool

@@ -108,7 +108,7 @@ export struct ZhSingleRow02 {
               Column() {
                 if (this.moreWidth > this.initMoreWidth + 2) {
                   Text(this.moreTips)
-                    .fontSize(8)
+                    .fontSize(9)
                     .fontColor(0x858585)
                     .width(8)
                 }

@@ -179,7 +179,7 @@ export struct ZhSingleRow03 {
               Column() {
                 if (this.moreWidth > this.initMoreWidth + 2) {
                   Text(this.moreTips)
-                    .fontSize(8)
+                    .fontSize(9)
                     .fontColor(0x858585)
                     .width(8)
                 }

@@ -70,7 +70,6 @@ struct PeopleShipHomePage {
             .objectRepeat(ImageRepeat.NoRepeat)
             .backgroundColor(Color.White)
             .visibility(this.isLoading ? Visibility.None : Visibility.Visible)
-            .expandSafeArea([SafeAreaType.SYSTEM], [SafeAreaEdge.TOP])
 
           Row()
             .height(px2vp(this.topSafeHeight))
@@ -78,7 +77,6 @@ struct PeopleShipHomePage {
             .backgroundColor($r('app.color.white'))
             .visibility(this.topOpacity > 0 ? Visibility.Visible : Visibility.None)
             .opacity(this.topOpacity )
-            .expandSafeArea([SafeAreaType.SYSTEM], [SafeAreaEdge.TOP])
         }
 
         Column(){
@@ -141,10 +139,10 @@ struct PeopleShipHomePage {
             })
           }
         }
-        .expandSafeArea([SafeAreaType.SYSTEM], [SafeAreaEdge.BOTTOM])
         .alignItems(HorizontalAlign.Start)
         .justifyContent(FlexAlign.Start)
         .width('100%')
+        .margin({top:px2vp(this.topSafeHeight)})
       }
       .width('100%')
     }else{
@@ -165,7 +163,6 @@ struct PeopleShipHomePage {
   }
 
    aboutToAppear() {
-     WindowModel.shared.setWindowLayoutFullScreen(false)
      this.getData()
   }
 

@@ -167,7 +167,7 @@ export struct HorizontalStrokeCardThreeTwoRadioForMoreComponent {
               Column() {
                 if (this.moreWidth > this.initMoreWidth + 2) {
                   Text(this.moreTips)
-                    .fontSize(8)
+                    .fontSize(9)
                     .fontColor(0x858585)
                     .width(8)
                 }

@@ -190,7 +190,7 @@ export struct LiveHorizontalCardComponent {
                 Column() {
                   if (this.moreWidth > this.initMoreWidth + 2) {
                     Text(this.moreTips)
-                      .fontSize(8)
+                      .fontSize(9)
                       .fontColor(0x858585)
                       .width(8)
                   }

@@ -38,6 +38,7 @@ struct MineHomePage {
   @State isCommentEnter:string = "";
   @State isConnectNetwork : boolean = NetworkUtil.isNetConnected()
   @State topSafeHeight: number = AppStorage.get<number>('topSafeHeight') || 0
+  @State bottomSafeHeight: number = AppStorage.get<number>('bottomSafeHeight') || 0
   pageShowTime:number = 0;
   pageHideTime:number = 0;
 
@@ -69,7 +70,6 @@ struct MineHomePage {
               .width('100%')
               .height('355lpx')
               .objectFit(ImageFit.Cover)
-            .expandSafeArea([SafeAreaType.SYSTEM], [SafeAreaEdge.TOP])
 
             Row()
               .height(px2vp(this.topSafeHeight))
@@ -77,7 +77,6 @@ struct MineHomePage {
               .backgroundColor($r('app.color.white'))
               .visibility(this.tileOpacity > 0 ? 0 : 1)
               .opacity(this.tileOpacity )
-            .expandSafeArea([SafeAreaType.SYSTEM], [SafeAreaEdge.TOP])
           }
 
           Column(){
@@ -287,8 +286,10 @@ struct MineHomePage {
             .scrollBar(BarState.Off)
             .width('100%')
             .layoutWeight(1)
-        }.expandSafeArea([SafeAreaType.SYSTEM], [SafeAreaEdge.BOTTOM])
+          }
+          .margin({top:px2vp(this.topSafeHeight)})
         }.width('100%')
+        .padding({bottom:px2vp(this.bottomSafeHeight)})
         .layoutWeight(1)
       }else{
         Column(){

@@ -140,7 +140,6 @@ export struct MultiPictureListPage {
     .id('e_picture_container')
     // 设置顶部绘制延伸到状态栏
     // 设置底部绘制延伸到导航条
-    .expandSafeArea([SafeAreaType.SYSTEM], [SafeAreaEdge.TOP, SafeAreaEdge.BOTTOM])
   }
 
   /**

@@ -70,7 +70,6 @@ struct OtherNormalUserHomePage {
             .width('100%')
             .height('355lpx')
             .objectFit(ImageFit.Cover)
-            .expandSafeArea([SafeAreaType.SYSTEM], [SafeAreaEdge.TOP])
 
           Row()
             .height(px2vp(this.topSafeHeight))
@@ -78,7 +77,6 @@ struct OtherNormalUserHomePage {
             .backgroundColor($r('app.color.white'))
             .visibility(this.tileOpacity > 0 ? 0 : 1)
             .opacity(this.tileOpacity )
-            .expandSafeArea([SafeAreaType.SYSTEM], [SafeAreaEdge.TOP])
         }
 
         Column(){
@@ -254,7 +252,7 @@ struct OtherNormalUserHomePage {
           .scrollBar(BarState.Off)
           .width('100%')
           .layoutWeight(1)
-        }.expandSafeArea([SafeAreaType.SYSTEM], [SafeAreaEdge.BOTTOM])
+        }
       }.width('100%')
       .layoutWeight(1)
     }else{

@@ -68,7 +68,6 @@ struct VisitorCommentPage {
             .width("100%")
             .height("100%")
             .backgroundColor($r('app.color.white'))
-            .expandSafeArea([SafeAreaType.SYSTEM], [SafeAreaEdge.BOTTOM])
           CustomPullToRefresh({
             alldata:this.data,
             scroller:this.scroller,