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

@@ -92,6 +92,14 @@ export struct H5NewsWebPageComponent {
           .backgroundColor(Color.White)
           .backgroundColor(Color.White)
           .height(150)
           .height(150)
 
 
+      //全部评论
+      CommentDialogView({
+        index: $index,
+        currentIndex: $currentIndex,
+        showCommentList: $showCommentList,
+        publishCommentModel: $publishCommentModel,
+        interactData: $interactData,
+      }).visibility(this.showComment ? Visibility.Visible : Visibility.Hidden)
     }
     }
     .margin({top: `${this.topSafeHeight}px`, bottom: `${this.bottomSafeHeight}px`})
     .margin({top: `${this.topSafeHeight}px`, bottom: `${this.bottomSafeHeight}px`})
     .width(CommonConstants.FULL_WIDTH)
     .width(CommonConstants.FULL_WIDTH)

@@ -37,6 +37,7 @@ export struct MorningEveningPaperComponent {
   @Provide  commentList: InteractDataDTO[] = []
   @Provide  commentList: InteractDataDTO[] = []
   @State audioPlayUrl: string = ""
   @State audioPlayUrl: string = ""
   @State isNoListContent:boolean = false;
   @State isNoListContent:boolean = false;
+  @State isContentFailed:boolean = false;
   @State executedStartTime:number = new Date().getTime()
   @State executedStartTime:number = new Date().getTime()
   // @Consume dailyPaperTopicPageId: number
   // @Consume dailyPaperTopicPageId: number
   // @Provide compListItem: CompList = {} as CompList
   // @Provide compListItem: CompList = {} as CompList
@@ -177,6 +178,7 @@ export struct MorningEveningPaperComponent {
       }
       }
       this.isNoListContent = this.compListItem && this.compListItem?.operDataList?.length > 0 ?false:true
       this.isNoListContent = this.compListItem && this.compListItem?.operDataList?.length > 0 ?false:true
     } catch (exception) {
     } catch (exception) {
+       this.isContentFailed = true
 
 
     }
     }
 
 
@@ -264,56 +266,64 @@ export struct MorningEveningPaperComponent {
   }
   }
 
 
   build() {
   build() {
-    Stack({ alignContent: Alignment.Top }) {
-      List() {
-        if (this.pageInfoBean?.topicInfo?.frontLinkObject) {
-
-          ListItem() {
-            topicInfoView({ frontLinkObject: this.pageInfoBean?.topicInfo?.frontLinkObject})
-          }
+    if (this.isContentFailed){
+      Column(){
+        EmptyComponent({emptyType:WDViewDefaultType.WDViewDefaultType_ContentFailed})
+      }.backgroundColor(this.mixedBgColor ?? Color.Black)
+    }else {
+      Stack({ alignContent: Alignment.Top }) {
+        List() {
+          if (this.pageInfoBean?.topicInfo?.frontLinkObject) {
 
 
-        }
+            ListItem() {
+              topicInfoView({ frontLinkObject: this.pageInfoBean?.topicInfo?.frontLinkObject})
+            }
 
 
-        if (this.audioPlayUrl.length > 0){
-          ListItem() {
-            this.AudioBarView()
           }
           }
-          .margin({
-            top: this.isHasTopView ? 10 : 44 + this.topSafeHeight
-          })
-        }
 
 
-        ListItem() {
-          if(this.isNoListContent){
-            EmptyComponent({emptyType:WDViewDefaultType.WDViewDefaultType_NoListContent})
-          }else {
-            SingleColumn999Component({
-              compListItem: this.compListItem,
+          if (this.audioPlayUrl.length > 0){
+            ListItem() {
+              this.AudioBarView()
+            }
+            .margin({
+              top: this.isHasTopView ? 10 : 44 + this.topSafeHeight
             })
             })
-              .margin({
-                top: this.isHasTopView || this.audioPlayUrl.length > 0 ? 10 : 44+this.topSafeHeight
+          }
+
+          ListItem() {
+            if(this.isNoListContent){
+              EmptyComponent({emptyType:WDViewDefaultType.WDViewDefaultType_NoListContent})
+            }else {
+              SingleColumn999Component({
+                compListItem: this.compListItem,
               })
               })
+                .margin({
+                  top: this.isHasTopView || this.audioPlayUrl.length > 0 ? 10 : 44+this.topSafeHeight
+                })
+            }
           }
           }
         }
         }
+        // .height(`calc(100% - ${this.bottomSafeHeight + this.topSafeHeight + 'vp'})`)
+        .edgeEffect(EdgeEffect.None) // 必须设置列表为滑动到边缘无效果
+        .scrollBar(BarState.Off)
+        .onWillScroll(scrollOffset =>{
+          this.scrollOffset = this.scrollOffset + scrollOffset as number
+        })
+
+        this.topPaperTitle()
       }
       }
-      // .height(`calc(100% - ${this.bottomSafeHeight + this.topSafeHeight + 'vp'})`)
-      .edgeEffect(EdgeEffect.None) // 必须设置列表为滑动到边缘无效果
-      .scrollBar(BarState.Off)
-      .onWillScroll(scrollOffset =>{
-        this.scrollOffset = this.scrollOffset + scrollOffset as number
+      .width('100%')
+      .height('100%')
+      .padding({
+        top: 0,
+        // bottom: this.bottomSafeHeight
       })
       })
-
-      this.topPaperTitle()
+      // .backgroundColor(Color.Black)
+      // .backgroundColor(this.pageInfoBean?.backgroundColor ?? Color.Black)
+      .backgroundColor(this.mixedBgColor ?? Color.Black)
     }
     }
-    .width('100%')
-    .height('100%')
-    .padding({
-      top: 0,
-      // bottom: this.bottomSafeHeight
-    })
-    // .backgroundColor(Color.Black)
-    // .backgroundColor(this.pageInfoBean?.backgroundColor ?? Color.Black)
-    .backgroundColor(this.mixedBgColor ?? Color.Black)
+
+
   }
   }
 
 
   @Builder
   @Builder

@@ -26,7 +26,7 @@ export struct PeopleShipRecommendComponent {
           .height('30vp')
           .height('30vp')
           .fontColor($r('app.color.color_222222'))
           .fontColor($r('app.color.color_222222'))
           .fontWeight(600)
           .fontWeight(600)
-          .fontSize($r('app.float.vp_15_7'))
+          .fontSize($r('app.float.vp_18'))
 
 
         Blank()
         Blank()
         Button({ type: ButtonType.Normal, stateEffect: false }) {
         Button({ type: ButtonType.Normal, stateEffect: false }) {

@@ -11,8 +11,8 @@ export struct PeopleShipRecommendHeadComponent {
     Column(){
     Column(){
       Stack({ alignContent: Alignment.BottomEnd }) {
       Stack({ alignContent: Alignment.BottomEnd }) {
         Image(this.rmhInfo.headPhotoUrl.length > 0 ? this.rmhInfo.headPhotoUrl : $r('app.media.WDAccountOwnerHedaerDefaultIcon'))
         Image(this.rmhInfo.headPhotoUrl.length > 0 ? this.rmhInfo.headPhotoUrl : $r('app.media.WDAccountOwnerHedaerDefaultIcon'))
-          .width('40vp')
-          .height('40vp')
+          .width('44vp')
+          .height('44vp')
           .borderRadius('22vp')
           .borderRadius('22vp')
           .objectFit(ImageFit.Cover)
           .objectFit(ImageFit.Cover)
 
 
@@ -28,7 +28,7 @@ export struct PeopleShipRecommendHeadComponent {
       Row() {
       Row() {
         Text(this.rmhInfo.userName)
         Text(this.rmhInfo.userName)
           .fontColor($r('app.color.color_222222'))
           .fontColor($r('app.color.color_222222'))
-          .fontSize($r('app.float.vp_13'))
+          .fontSize($r('app.float.vp_14'))
           .fontWeight(600)
           .fontWeight(600)
           .maxLines(1)
           .maxLines(1)
           .textOverflow({overflow: TextOverflow.Ellipsis})
           .textOverflow({overflow: TextOverflow.Ellipsis})

@@ -45,7 +45,7 @@ export struct ENewspaperListDialog {
   // 手势滑动相关
   // 手势滑动相关
   private panOption: PanGestureOptions = new PanGestureOptions({ direction: PanDirection.Up | PanDirection.Down })
   private panOption: PanGestureOptions = new PanGestureOptions({ direction: PanDirection.Up | PanDirection.Down })
   private topFixedHeight = 124
   private topFixedHeight = 124
-  @State topHeight: number = 124
+  @State topHeight: number = 204
   private deviceHeight: number = 0
   private deviceHeight: number = 0
 
 
 
 

@@ -24,6 +24,13 @@ export struct MultiPictureListPage {
   @Provide topSafeHeight: number = AppStorage.get<number>('topSafeHeight') || 0
   @Provide topSafeHeight: number = AppStorage.get<number>('topSafeHeight') || 0
   // @Provide bgc: Color = Color.White;
   // @Provide bgc: Color = Color.White;
   @Provide duration: number = 0
   @Provide duration: number = 0
+  @State noAnimation: boolean = true
+
+  pageTransition() {
+    // PageTransitionEnter({ duration: this.noAnimation ? 0 : 300 })
+    PageTransitionExit({ duration:  !this.noAnimation ? 0 : 300 })
+  }
+
 
 
   aboutToAppear(): void {
   aboutToAppear(): void {
     //获取宽高尺寸
     //获取宽高尺寸
@@ -65,6 +72,7 @@ export struct MultiPictureListPage {
       })
       })
       .onClick(() => {
       .onClick(() => {
         this.onBack();
         this.onBack();
+        this.noAnimation = false
         router.back();
         router.back();
       })
       })
       .id("backImg")
       .id("backImg")