fix:17339 版面>读报纸，点击弹窗顶部常驻区域下滑,需退出弹窗，见视频对比

@@ -2,6 +2,8 @@ import { Action, NewspaperListBean, NewspaperListItemBean, NewspaperPositionItem
 import { ExtraDTO } from 'wdBean/src/main/ets/bean/component/extra/ExtraDTO'
 import { ExtraDTO } from 'wdBean/src/main/ets/bean/component/extra/ExtraDTO'
 import { WDRouterRule } from 'wdRouter/Index'
 import { WDRouterRule } from 'wdRouter/Index'
 import { ENewspaperPageDialog } from '../dialog/ENewspaperPageDialog'
 import { ENewspaperPageDialog } from '../dialog/ENewspaperPageDialog'
+import { Logger } from 'wdKit';
+import { window } from '@kit.ArkUI';
 
 
 /**
 /**
  * 读报纸半屏弹窗
  * 读报纸半屏弹窗
@@ -35,6 +37,12 @@ export struct ENewspaperListDialog {
   // listDialogController: CustomDialogController
   // listDialogController: CustomDialogController
   public closeDialog?: () => void
   public closeDialog?: () => void
 
 
+  // 手势滑动相关
+  private panOption: PanGestureOptions = new PanGestureOptions({ direction: PanDirection.Up | PanDirection.Down })
+  private topFixedHeight = 124
+  @State topHeight: number = 124
+  private deviceHeight: number = 0
+
   //watch监听报纸页码回调
   //watch监听报纸页码回调
   onCurrentPageNumUpdated(): void {
   onCurrentPageNumUpdated(): void {
     console.log("ENewspaperListDialog-onCurrentPageNumUpdated", "currentPageNum：", this.currentPageNum)
     console.log("ENewspaperListDialog-onCurrentPageNumUpdated", "currentPageNum：", this.currentPageNum)
@@ -46,7 +54,13 @@ export struct ENewspaperListDialog {
     }
     }
   }
   }
 
 
-  aboutToAppear(): void {
+  async aboutToAppear() {
+    // 屏幕高度 - 滑动高度计算
+    let windowClass: window.Window = await window.getLastWindow(getContext(this));
+    let changeHeight = 85 + 44 +  px2vp(windowClass.getWindowAvoidArea(window.AvoidAreaType.TYPE_SYSTEM).topRect.height)
+    changeHeight += px2vp(windowClass.getWindowAvoidArea(window.AvoidAreaType.TYPE_SYSTEM).bottomRect.height)
+    this.deviceHeight = px2vp(windowClass.getWindowProperties().windowRect.height) - changeHeight
+
     this.isCurrentViewOpen = true
     this.isCurrentViewOpen = true
     console.log("ENewspaperListDialog-aboutToAppear", "currentPageNum：", this.currentPageNum)
     console.log("ENewspaperListDialog-aboutToAppear", "currentPageNum：", this.currentPageNum)
     let _scrollIndex = Number.parseInt(this.currentPageNum)
     let _scrollIndex = Number.parseInt(this.currentPageNum)
@@ -56,60 +70,76 @@ export struct ENewspaperListDialog {
   }
   }
 
 
   aboutToDisappear() {
   aboutToDisappear() {
-    // if (this.pageListDialogController) {
-    //   this.pageListDialogController = null
-    // }
     this.isCurrentViewOpen = false
     this.isCurrentViewOpen = false
   }
   }
 
 
   build() {
   build() {
     Stack() {
     Stack() {
       Column() {
       Column() {
-        Row()
-          .width(43)
-          .height(4)
-          .backgroundColor('#EDEDED')
-          .margin({
-            top: 10,
-            bottom: 10
-          })
+        Column() {
+          Row()
+            .width(43)
+            .height(4)
+            .backgroundColor('#EDEDED')
+            .margin({
+              top: 10,
+              bottom: 10
+            })
+            .onClick(() => {
+              if (this.closeDialog) {
+                this.closeDialog()
+              }
+            })
+          Row() {
+            Text(this.currentPageNum)
+              .fontSize($r('app.float.font_size_36'))
+              .fontColor($r('app.color.color_222222'))
+              .fontFamily('BebasNeueBold')
+            Text('版')
+              .fontSize($r('app.float.font_size_16'))
+              .fontColor($r('app.color.color_222222'))
+              .margin({ bottom: 6 })
+
+            Image($r('app.media.icon_triangle_black'))
+              .width($r('app.float.border_radius_6'))
+              .height($r('app.float.border_radius_6'))
+              .margin({ left: 2, bottom: 6 })
+          }
+          .alignItems(VerticalAlign.Bottom)
+          .margin({ left: 15 })
+          .alignSelf(ItemAlign.Start)
           .onClick(() => {
           .onClick(() => {
-            if (this.closeDialog) {
-              this.closeDialog()
+            this.pageDialogShow = !this.pageDialogShow
+            if (this.pageDialogShow) {
+              this.pageListDialogController.open()
+            } else {
+              this.pageListDialogController.close()
             }
             }
           })
           })
-        Row() {
-          Text(this.currentPageNum)
-            .fontSize($r('app.float.font_size_36'))
-            .fontColor($r('app.color.color_222222'))
-            .fontFamily('BebasNeueBold')
-          Text('版')
-            .fontSize($r('app.float.font_size_16'))
-            .fontColor($r('app.color.color_222222'))
-            .margin({ bottom: 6 })
 
 
-          Image($r('app.media.icon_triangle_black'))
-            .width($r('app.float.border_radius_6'))
-            .height($r('app.float.border_radius_6'))
-            .margin({ left: 2, bottom: 6 })
+          Image($r('app.media.line'))
+            .width('100%')
+            .height(6)
+            .margin({ top: 20, left: 16, right: 16 })
+            .objectFit(ImageFit.Contain)
         }
         }
-        .alignItems(VerticalAlign.Bottom)
-        .margin({ left: 15 })
-        .alignSelf(ItemAlign.Start)
-        .onClick(() => {
-          this.pageDialogShow = !this.pageDialogShow
-          if (this.pageDialogShow) {
-            this.pageListDialogController.open()
-          } else {
-            this.pageListDialogController.close()
-          }
-        })
+        .width('100%')
+        .gesture(
+          PanGesture(this.panOption)
+            .onActionStart((event: GestureEvent) => {
+              Logger.debug('ENewspaperListDialog','Pan start')
+            })
+            .onActionUpdate((event: GestureEvent) => {
+              if (this.topFixedHeight + event.offsetY >= this.topFixedHeight) {
+                this.topHeight = this.topFixedHeight + event.offsetY
+              }
+              Logger.debug('ENewspaperListDialog',  'topHeight:' + this.topHeight)
+            })
+            .onActionEnd(() => {
+              this.onCloseGestureDialog()
+            })
+        )
 
 
-        Image($r('app.media.line'))
-          .width('100%')
-          .height(6)
-          .margin({ top: 20, left: 16, right: 16 })
-          .objectFit(ImageFit.Contain)
 
 
         List({ scroller: this.listScroller, initialIndex: this.scrollIndex }) {
         List({ scroller: this.listScroller, initialIndex: this.scrollIndex }) {
           ForEach(this.newspaperListBean?.list, (item: NewspaperListItemBean, index: number) => {
           ForEach(this.newspaperListBean?.list, (item: NewspaperListItemBean, index: number) => {
@@ -252,7 +282,9 @@ export struct ENewspaperListDialog {
           // }
           // }
         })
         })
       }
       }
-      .margin({ top: 124 })
+      // .margin({ top: 124 })
+      .margin({ top: this.topHeight })
+
       .width('100%')
       .width('100%')
       .backgroundColor(Color.White)
       .backgroundColor(Color.White)
       .expandSafeArea([SafeAreaType.SYSTEM], [SafeAreaEdge.BOTTOM])
       .expandSafeArea([SafeAreaType.SYSTEM], [SafeAreaEdge.BOTTOM])
@@ -267,6 +299,33 @@ export struct ENewspaperListDialog {
         this.closeDialog()
         this.closeDialog()
       }
       }
     })
     })
+    .gesture(
+      PanGesture(this.panOption)
+        .onActionStart((event: GestureEvent) => {
+          Logger.debug('ENewspaperListDialog','Pan start')
+        })
+        .onActionUpdate((event: GestureEvent) => {
+          if (event) {
+            if (this.topFixedHeight + event.offsetY  >=  this.topFixedHeight) {
+              this.topHeight = this.topFixedHeight + event.offsetY
+            }
+            Logger.debug('ENewspaperListDialog',  'topHeight:' + this.topHeight)
+          }
+        })
+        .onActionEnd(() => {
+            this.onCloseGestureDialog()
+        })
+    )
+  }
+
+  onCloseGestureDialog() {
+    if (this.topHeight >= this.deviceHeight ) {
+      if (this.closeDialog) {
+        this.closeDialog()
+      }
+    } else {
+      this.topHeight = this.topFixedHeight
+    }
   }
   }
 
 
   updateRecordsData() {
   updateRecordsData() {