Merge remote-tracking branch 'origin/main'

 import { CompStyle } from 'wdConstant';
 import { CompDTO, ContentDTO } from 'wdBean';
 import { Card2Component } from './cardview/Card2Component';
-import { Card3Component } from './cardview/Card3Component';
+// import { Card3Component } from './cardview/Card3Component';
 import { Card4Component } from './cardview/Card4Component';
 import { Card5Component } from './cardview/Card5Component';
 import { Card6Component } from './cardview/Card6Component';
@@ -60,8 +60,6 @@ export struct CardParser {
     } else {
       if (contentDTO.appStyle === CompStyle.Card_02) {
         Card2Component({ compDTO: this.compDTO, contentDTO, pageId: this.pageId, pageName: this.pageName })
-      } else if (contentDTO.appStyle === CompStyle.Card_03) {
-        Card3Component({ compDTO: this.compDTO, contentDTO, pageId: this.pageId, pageName: this.pageName })
       } else if (contentDTO.appStyle === CompStyle.Card_04) {
         Card4Component({ compDTO: this.compDTO, contentDTO, pageId: this.pageId, pageName: this.pageName })
       } else if (contentDTO.appStyle === CompStyle.Card_05) {

@@ -4,6 +4,7 @@ import { WDRouterPage, WDRouterRule } from 'wdRouter/Index';
 import PageModel from '../viewmodel/PageModel';
 import { CardParser } from './CardParser';
 import { Card2Component } from './cardview/Card2Component';
+import { Card3Component } from './cardview/Card3Component';
 import { Card9Component } from './cardview/Card9Component';
 import { Card6Component } from './cardview/Card6Component';
 import { Card5Component } from './cardview/Card5Component';
@@ -72,7 +73,7 @@ export struct CompParser {
 
   build() {
     Column() {
-     // Text(JSON.stringify(this.compDTO.compStyle))
+      //Text(JSON.stringify(this.compDTO.compStyle))
       this.componentBuilder();
     }
   }
@@ -142,11 +143,13 @@ export struct CompParser {
         //时间链卡
         Card9Component({ compDTO: this.compDTO, contentDTO:this.compDTO.operDataList[0], pageId: this.pageId, pageName: this.pageName })
         Divider().strokeWidth(5).color('#f5f5f5').padding({ left: 0, right: 0 })
-      } else if(this.compDTO.compStyle === CompStyle
-        .Card_13){
+      } else if(this.compDTO.compStyle === CompStyle.Card_13){
         Card6Component({ compDTO: this.compDTO, contentDTO: this.compDTO.operDataList[0], pageId: this.pageId, pageName: this.pageName })
         Divider().strokeWidth(5).color('#f5f5f5').padding({ left: 0, right: 0 })
-      } else if (this.compDTO.compStyle === CompStyle.Zh_Single_Column_04) {
+      } else if(this.compDTO.compStyle === CompStyle.Card_03){
+        Card3Component({ compDTO: this.compDTO, contentDTO: this.compDTO.operDataList[0], pageId: this.pageId, pageName: this.pageName })
+        Divider().strokeWidth(5).color('#f5f5f5').padding({ left: 0, right: 0 })
+      }else if (this.compDTO.compStyle === CompStyle.Zh_Single_Column_04) {
         ZhSingleColumn04({ compDTO: this.compDTO, pageId: this.pageId, pageName: this.pageName })
         Divider().strokeWidth(5).color('#f5f5f5').padding({ left: 0, right: 0 })
       } else if (this.compDTO.compStyle === CompStyle.Zh_Single_Column_05) {

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

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

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

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

@@ -122,7 +122,6 @@ export struct FollowThirdTabsComponent{
       })
       .width('100%')
       .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 { Remark, WDMessageCenterMessageType } from '../../../model/InteractMessageModel'
 import MinePageDatasModel from '../../../model/MinePageDatasModel'
@@ -7,7 +7,6 @@ import { CustomPullToRefresh } from '../../reusable/CustomPullToRefresh'
 import { CustomTitleUI } from '../../reusable/CustomTitleUI'
 import { MessageListItemUI } from './MessageListItemUI'
 import {TrackingButton,TrackConstants}from 'wdTracking/Index'
-import TrackingPageBrowseUtils from '../../../utils/TrackingPageBrowseUtils'
 
 const TAG = "MessageListUI"
 

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

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

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

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

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

@@ -22,6 +22,8 @@ export struct PrivacySettingPage {
   @StorageProp('currentBreakpoint') @Watch("currentChanged")currentBreakpoint: string = 'sm';
   private breakpointSystem = new BreakpointSystem();
   @State percent:number = 1
+  @State topSafeHeight: number = AppStorage.get<number>('topSafeHeight') || 0
+  @State bottomSafeHeight: number = AppStorage.get<number>('bottomSafeHeight') || 0
 
   currentChanged(){
     if(this.currentBreakpoint == "md" || this.currentBreakpoint == "lg"){
@@ -76,6 +78,7 @@ export struct PrivacySettingPage {
 
   build() {
     Column(){
+      Column(){
         TitleBackComponent({title:"隐私设置"})
 
         //滑动区域
@@ -83,6 +86,9 @@ export struct PrivacySettingPage {
       }.backgroundColor('#F8F8F8')
       .width("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 {
   pageShowTime:number = 0;
   pageHideTime:number = 0;
+  @State topSafeHeight: number = AppStorage.get<number>('topSafeHeight') || 0
+  @State bottomSafeHeight: number = AppStorage.get<number>('bottomSafeHeight') || 0
 
   onPageShow() {
     this.pageShowTime = DateTimeUtils.getTimeStamp()
@@ -22,7 +24,12 @@ struct SettingAboutPage {
 
   build() {
     Column(){
+      Column(){
         AboutPageUI()
       }.backgroundColor($r('app.color.white'))
+    }.width("100%")
+    .height("100%")
+    .padding({top:px2vp(this.topSafeHeight),bottom:px2vp(this.bottomSafeHeight)})
+
   }
 }
\ No newline at end of file

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

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

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

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

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

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

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