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

@@ -281,6 +281,8 @@ struct createImg {
                 .backgroundColor(0xf5f5f5)
                 .backgroundColor(0xf5f5f5)
                 .aspectRatio(1)
                 .aspectRatio(1)
                 .borderRadius(this.caclImageRadius(index))
                 .borderRadius(this.caclImageRadius(index))
+                .width('100%')
+                .autoResize(true)
               if (this.getPicType(item.weight, item.height) !== 3) {
               if (this.getPicType(item.weight, item.height) !== 3) {
                 Flex({ direction: FlexDirection.Row }) {
                 Flex({ direction: FlexDirection.Row }) {
                   Image($r('app.media.icon_long_pic'))
                   Image($r('app.media.icon_long_pic'))

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

@@ -120,12 +120,11 @@ export struct FollowFirstTabsComponent{
             this.listScroller.scrollToIndex(index, true, ScrollAlign.CENTER)
             this.listScroller.scrollToIndex(index, true, ScrollAlign.CENTER)
           })
           })
           .width('100%')
           .width('100%')
-          .expandSafeArea([SafeAreaType.SYSTEM], [SafeAreaEdge.BOTTOM])
           .layoutWeight(1)
           .layoutWeight(1)
           .loop(false)
           .loop(false)
           .indicator(false)
           .indicator(false)
           .effectMode(EdgeEffect.None)
           .effectMode(EdgeEffect.None)
-        }.expandSafeArea([SafeAreaType.SYSTEM], [SafeAreaEdge.BOTTOM])
+        }
       }
       }
     }.width('100%')
     }.width('100%')
     .height("100%")
     .height("100%")

@@ -101,7 +101,6 @@ export struct FollowListDetailUI {
             .margin({bottom:"40lpx"})
             .margin({bottom:"40lpx"})
           }
           }
         }
         }
-        .expandSafeArea([SafeAreaType.SYSTEM], [SafeAreaEdge.BOTTOM])
         .edgeEffect(EdgeEffect.None)
         .edgeEffect(EdgeEffect.None)
         .cachedCount(5)
         .cachedCount(5)
         .padding({ left: '31lpx', right: '31lpx' })
         .padding({ left: '31lpx', right: '31lpx' })

@@ -27,7 +27,6 @@ export struct FollowSecondTabsComponent{
               .width("100%")
               .width("100%")
               .height("100%")
               .height("100%")
               .backgroundColor($r('app.color.color_transparent'))
               .backgroundColor($r('app.color.color_transparent'))
-              .expandSafeArea([SafeAreaType.SYSTEM], [SafeAreaEdge.BOTTOM])
 
 
             FollowListDetailUI({creatorDirectoryId:this.data[this.firstIndex].id,type:1})
             FollowListDetailUI({creatorDirectoryId:this.data[this.firstIndex].id,type:1})
               .height("100%")
               .height("100%")
@@ -40,7 +39,6 @@ export struct FollowSecondTabsComponent{
               .width("100%")
               .width("100%")
               .height("100%")
               .height("100%")
               .backgroundColor($r('app.color.color_transparent'))
               .backgroundColor($r('app.color.color_transparent'))
-              .expandSafeArea([SafeAreaType.SYSTEM], [SafeAreaEdge.BOTTOM])
 
 
             this.FollowSecondUI()
             this.FollowSecondUI()
           }.width("100%")
           }.width("100%")
@@ -50,7 +48,6 @@ export struct FollowSecondTabsComponent{
     }
     }
     .width('100%')
     .width('100%')
     .layoutWeight(1)
     .layoutWeight(1)
-    .expandSafeArea([SafeAreaType.SYSTEM], [SafeAreaEdge.BOTTOM])
   }
   }
 
 
   @Builder FollowSecondUI(){
   @Builder FollowSecondUI(){
@@ -89,7 +86,6 @@ export struct FollowSecondTabsComponent{
       .effectMode(EdgeEffect.None)
       .effectMode(EdgeEffect.None)
       .height('100%')
       .height('100%')
       .layoutWeight(1)
       .layoutWeight(1)
-      .expandSafeArea([SafeAreaType.SYSTEM], [SafeAreaEdge.BOTTOM])
     }.width('100%')
     }.width('100%')
   }
   }
 
 

@@ -122,7 +122,6 @@ export struct FollowThirdTabsComponent{
       })
       })
       .width('100%')
       .width('100%')
       .layoutWeight(1)
       .layoutWeight(1)
-      .expandSafeArea([SafeAreaType.SYSTEM], [SafeAreaEdge.BOTTOM])
     }
     }
   }
   }
 
 

-import { DateTimeUtils, StringUtils, ToastUtils } from 'wdKit/Index'
+import { DateTimeUtils } from 'wdKit/Index'
 import { WDRouterPage, WDRouterRule } from 'wdRouter/Index'
 import { WDRouterPage, WDRouterRule } from 'wdRouter/Index'
 import { Remark, WDMessageCenterMessageType } from '../../../model/InteractMessageModel'
 import { Remark, WDMessageCenterMessageType } from '../../../model/InteractMessageModel'
 import MinePageDatasModel from '../../../model/MinePageDatasModel'
 import MinePageDatasModel from '../../../model/MinePageDatasModel'
@@ -7,7 +7,6 @@ import { CustomPullToRefresh } from '../../reusable/CustomPullToRefresh'
 import { CustomTitleUI } from '../../reusable/CustomTitleUI'
 import { CustomTitleUI } from '../../reusable/CustomTitleUI'
 import { MessageListItemUI } from './MessageListItemUI'
 import { MessageListItemUI } from './MessageListItemUI'
 import {TrackingButton,TrackConstants}from 'wdTracking/Index'
 import {TrackingButton,TrackConstants}from 'wdTracking/Index'
-import TrackingPageBrowseUtils from '../../../utils/TrackingPageBrowseUtils'
 
 
 const TAG = "MessageListUI"
 const TAG = "MessageListUI"
 
 

@@ -57,6 +57,12 @@ export struct SubscribeMessageComponent{
           }
           }
         }
         }
       } else {
       } else {
+        Stack(){
+          Row()
+            .width("100%")
+            .height("100%")
+            .backgroundColor($r('app.color.color_F9F9F9'))
+
           CustomPullToRefresh({
           CustomPullToRefresh({
             alldata:this.data,
             alldata:this.data,
             scroller:this.scroller,
             scroller:this.scroller,
@@ -83,7 +89,8 @@ export struct SubscribeMessageComponent{
             .width('100%')
             .width('100%')
         }
         }
       }
       }
-    .backgroundColor($r('app.color.color_F9F9F9'))
+    }
+    .backgroundColor($r('app.color.color_transparent'))
     .height('100%')
     .height('100%')
     .width('100%')
     .width('100%')
   }
   }

@@ -9,6 +9,9 @@ const TAG = "AppointmentListPage"
 struct AppointmentListPage {
 struct AppointmentListPage {
   pageShowTime:number = 0;
   pageShowTime:number = 0;
   pageHideTime:number = 0;
   pageHideTime:number = 0;
+  @State topSafeHeight: number = AppStorage.get<number>('topSafeHeight') || 0
+  @State bottomSafeHeight: number = AppStorage.get<number>('bottomSafeHeight') || 0
+
 
 
   onPageShow() {
   onPageShow() {
     this.pageShowTime = DateTimeUtils.getTimeStamp()
     this.pageShowTime = DateTimeUtils.getTimeStamp()
@@ -23,7 +26,12 @@ struct AppointmentListPage {
 
 
   build() {
   build() {
     Column(){
     Column(){
+      Column(){
         AppointmentListUI()
         AppointmentListUI()
       }
       }
+    }.width("100%")
+    .height("100%")
+    .padding({top:px2vp(this.topSafeHeight),bottom:px2vp(this.bottomSafeHeight)})
+
   }
   }
 }
 }

@@ -11,6 +11,8 @@ struct FollowListPage {
   @State curIndex: string = '0';
   @State curIndex: string = '0';
   pageShowTime:number = 0;
   pageShowTime:number = 0;
   pageHideTime:number = 0;
   pageHideTime:number = 0;
+  @State topSafeHeight: number = AppStorage.get<number>('topSafeHeight') || 0
+  @State bottomSafeHeight: number = AppStorage.get<number>('bottomSafeHeight') || 0
 
 
   onPageShow() {
   onPageShow() {
     this.curIndex = this.params?.['index'];
     this.curIndex = this.params?.['index'];
@@ -25,6 +27,7 @@ struct FollowListPage {
   }
   }
 
 
   build() {
   build() {
+    Column(){
       Column() {
       Column() {
         //Tab 详情
         //Tab 详情
         FollowFirstTabsComponent({changeIndex:Number(this.curIndex)})
         FollowFirstTabsComponent({changeIndex:Number(this.curIndex)})
@@ -32,5 +35,8 @@ struct FollowListPage {
       .backgroundColor($r('app.color.white'))
       .backgroundColor($r('app.color.white'))
       .height('100%')
       .height('100%')
       .width('100%')
       .width('100%')
+    }.width("100%")
+    .height("100%")
+    .padding({top:px2vp(this.topSafeHeight),bottom:px2vp(this.bottomSafeHeight)})
   }
   }
 }
 }

@@ -19,7 +19,6 @@ const TAG = 'MinePageComponent';
  */
  */
 @Component
 @Component
 export struct MinePageComponent {
 export struct MinePageComponent {
-  private topRectHeight: string = AppStorage.get<number>('topSafeHeight') + 'px';
   //是否是创作者
   //是否是创作者
   @State isCreator:boolean = false
   @State isCreator:boolean = false
   @State isLogin:boolean = false   //默认  false  测试放开
   @State isLogin:boolean = false   //默认  false  测试放开
@@ -63,6 +62,8 @@ export struct MinePageComponent {
   @StorageProp('currentBreakpoint') @Watch("currentChanged")currentBreakpoint: string = 'sm';
   @StorageProp('currentBreakpoint') @Watch("currentChanged")currentBreakpoint: string = 'sm';
   private breakpointSystem = new BreakpointSystem();
   private breakpointSystem = new BreakpointSystem();
   @State percent:number = 1
   @State percent:number = 1
+  @State topSafeHeight: number = AppStorage.get<number>('topSafeHeight') || 0
+  @State bottomSafeHeight: number = AppStorage.get<number>('bottomSafeHeight') || 0
 
 
   currentChanged(){
   currentChanged(){
     if(this.currentBreakpoint == "md" || this.currentBreakpoint == "lg"){
     if(this.currentBreakpoint == "md" || this.currentBreakpoint == "lg"){
@@ -154,6 +155,7 @@ export struct MinePageComponent {
   }
   }
 
 
   build() {
   build() {
+    Column(){
       Scroll(this.scroller){
       Scroll(this.scroller){
         Stack(){
         Stack(){
           Image($r('app.media.mine_head_bg'))
           Image($r('app.media.mine_head_bg'))
@@ -168,8 +170,10 @@ export struct MinePageComponent {
       .backgroundColor($r('app.color.color_F9F9F9'))
       .backgroundColor($r('app.color.color_F9F9F9'))
       .scrollable(ScrollDirection.Vertical)
       .scrollable(ScrollDirection.Vertical)
       .scrollBar(BarState.Off)
       .scrollBar(BarState.Off)
-    // 预留状态栏、导航栏高度
-    .margin({ top: this.topRectHeight})
+
+    }.width("100%")
+    .height("100%")
+    .padding({top:px2vp(this.topSafeHeight),bottom:px2vp(this.bottomSafeHeight)})
   }
   }
 
 
 
 

@@ -22,6 +22,8 @@ export struct PrivacySettingPage {
   @StorageProp('currentBreakpoint') @Watch("currentChanged")currentBreakpoint: string = 'sm';
   @StorageProp('currentBreakpoint') @Watch("currentChanged")currentBreakpoint: string = 'sm';
   private breakpointSystem = new BreakpointSystem();
   private breakpointSystem = new BreakpointSystem();
   @State percent:number = 1
   @State percent:number = 1
+  @State topSafeHeight: number = AppStorage.get<number>('topSafeHeight') || 0
+  @State bottomSafeHeight: number = AppStorage.get<number>('bottomSafeHeight') || 0
 
 
   currentChanged(){
   currentChanged(){
     if(this.currentBreakpoint == "md" || this.currentBreakpoint == "lg"){
     if(this.currentBreakpoint == "md" || this.currentBreakpoint == "lg"){
@@ -76,6 +78,7 @@ export struct PrivacySettingPage {
 
 
   build() {
   build() {
     Column(){
     Column(){
+      Column(){
         TitleBackComponent({title:"隐私设置"})
         TitleBackComponent({title:"隐私设置"})
 
 
         //滑动区域
         //滑动区域
@@ -83,6 +86,9 @@ export struct PrivacySettingPage {
       }.backgroundColor('#F8F8F8')
       }.backgroundColor('#F8F8F8')
       .width("100%")
       .width("100%")
       .height("100%")
       .height("100%")
+    }.width("100%")
+    .height("100%")
+    .padding({top:px2vp(this.topSafeHeight),bottom:px2vp(this.bottomSafeHeight)})
 
 
   }
   }
 
 

@@ -7,6 +7,8 @@ import { AboutPageUI } from '../setting/AboutPageUI';
 struct SettingAboutPage {
 struct SettingAboutPage {
   pageShowTime:number = 0;
   pageShowTime:number = 0;
   pageHideTime:number = 0;
   pageHideTime:number = 0;
+  @State topSafeHeight: number = AppStorage.get<number>('topSafeHeight') || 0
+  @State bottomSafeHeight: number = AppStorage.get<number>('bottomSafeHeight') || 0
 
 
   onPageShow() {
   onPageShow() {
     this.pageShowTime = DateTimeUtils.getTimeStamp()
     this.pageShowTime = DateTimeUtils.getTimeStamp()
@@ -22,7 +24,12 @@ struct SettingAboutPage {
 
 
   build() {
   build() {
     Column(){
     Column(){
+      Column(){
         AboutPageUI()
         AboutPageUI()
       }.backgroundColor($r('app.color.white'))
       }.backgroundColor($r('app.color.white'))
+    }.width("100%")
+    .height("100%")
+    .padding({top:px2vp(this.topSafeHeight),bottom:px2vp(this.bottomSafeHeight)})
+
   }
   }
 }
 }

@@ -16,6 +16,8 @@ struct SettingPage {
 
 
   pageShowSettingTime:number = 0;
   pageShowSettingTime:number = 0;
   pageHideSettingTime:number = 0;
   pageHideSettingTime:number = 0;
+  @State topSafeHeight: number = AppStorage.get<number>('topSafeHeight') || 0
+  @State bottomSafeHeight: number = AppStorage.get<number>('bottomSafeHeight') || 0
 
 
 
 
   onPageShow() {
   onPageShow() {
@@ -44,6 +46,7 @@ struct SettingPage {
   }
   }
 
 
   build() {
   build() {
+    Column(){
       Column() {
       Column() {
         if (this.pageType == 'mainSetting') {
         if (this.pageType == 'mainSetting') {
           MineSettingComponent()
           MineSettingComponent()
@@ -52,6 +55,10 @@ struct SettingPage {
         }
         }
       }.setFullWidth()
       }.setFullWidth()
       .backgroundColor($r("app.color.white"))
       .backgroundColor($r("app.color.white"))
+    }.width("100%")
+    .height("100%")
+    .padding({top:px2vp(this.topSafeHeight),bottom:px2vp(this.bottomSafeHeight)})
+
   }
   }
 
 
   // 私有方法
   // 私有方法

@@ -4,6 +4,8 @@ import TrackingPageBrowseUtils from '../utils/TrackingPageBrowseUtils'
 @Entry
 @Entry
 @Component
 @Component
 struct MineMessagePage {
 struct MineMessagePage {
+  @State topSafeHeight: number = AppStorage.get<number>('topSafeHeight') || 0
+  @State bottomSafeHeight: number = AppStorage.get<number>('bottomSafeHeight') || 0
 
 
   onPageShow(): void {
   onPageShow(): void {
     TrackingPageBrowseUtils.TrackingPageBrowseExposureStart()
     TrackingPageBrowseUtils.TrackingPageBrowseExposureStart()
@@ -15,7 +17,12 @@ struct MineMessagePage {
 
 
   build() {
   build() {
     Column(){
     Column(){
+      Column(){
         MessageListUI()
         MessageListUI()
       }
       }
+    }.width("100%")
+    .height("100%")
+    .padding({top:px2vp(this.topSafeHeight),bottom:px2vp(this.bottomSafeHeight)})
+
   }
   }
 }
 }

@@ -10,6 +10,8 @@ struct SearchPage {
   @State fromTabName: string = 'NEWS';
   @State fromTabName: string = 'NEWS';
   pageShowTime:number = 0;
   pageShowTime:number = 0;
   pageHideTime:number = 0;
   pageHideTime:number = 0;
+  @State topSafeHeight: number = AppStorage.get<number>('topSafeHeight') || 0
+  @State bottomSafeHeight: number = AppStorage.get<number>('bottomSafeHeight') || 0
 
 
   onPageShow() {
   onPageShow() {
     this.fromTabName = this.params?.['tabName'];
     this.fromTabName = this.params?.['tabName'];
@@ -25,9 +27,13 @@ struct SearchPage {
 
 
   build() {
   build() {
     Column(){
     Column(){
+      Column(){
         SearchComponent({fromTabName:$fromTabName})
         SearchComponent({fromTabName:$fromTabName})
       }.height('100%')
       }.height('100%')
       .width('100%')
       .width('100%')
       .backgroundColor($r('app.color.white'))
       .backgroundColor($r('app.color.white'))
+    }.width("100%")
+    .height("100%")
+    .padding({top:px2vp(this.topSafeHeight),bottom:px2vp(this.bottomSafeHeight)})
   }
   }
 }
 }

@@ -5,11 +5,19 @@ const TAG = "SubscribeMessagePage"
 @Entry
 @Entry
 @Component
 @Component
 struct SubscribeMessagePage {
 struct SubscribeMessagePage {
+  @State topSafeHeight: number = AppStorage.get<number>('topSafeHeight') || 0
+  @State bottomSafeHeight: number = AppStorage.get<number>('bottomSafeHeight') || 0
+
 
 
   build() {
   build() {
     Column(){
     Column(){
+      Column(){
         SubscribeMessageComponent()
         SubscribeMessageComponent()
       }.height("100%")
       }.height("100%")
       .width("100%")
       .width("100%")
+    }.width("100%")
+    .height("100%")
+    .padding({top:px2vp(this.topSafeHeight),bottom:px2vp(this.bottomSafeHeight)})
+
   }
   }
 }
 }