Merge remote-tracking branch 'origin/main'

@@ -17,7 +17,7 @@ export struct ColumnPage {
   pageId: string = "";
   channelId: string = "";
   pageName: string = ''
-
+  @Provide topSafeHeight: number = AppStorage.get<number>('topSafeHeight') || 0
   aboutToAppear() {
     this.pageId = this.param.pageId
     this.channelId = this.param.channelId
@@ -26,6 +26,7 @@ export struct ColumnPage {
 
   build() {
     Column() {
+      Blank().height(`${this.topSafeHeight}px`)
       CustomTitleUI({ titleName: this.pageName })
       PageComponent({
         currentTopNavSelectedIndex: $currentTopNavSelectedIndex,