Merge remote-tracking branch 'origin/main'

@@ -37,21 +37,21 @@ export struct QualityCommentsComponent {
   aboutToDisappear(): void {
     // windowClass.setWindowSystemBarProperties({ statusBarColor: '#000' })
     this.dialogController = null // 将dialogController置空
-    WindowModel.shared.setWindowLayoutFullScreen(false)
+    // WindowModel.shared.setWindowLayoutFullScreen(false)
   }
 
   onPageShow(): void {
-    WindowModel.shared.setWindowLayoutFullScreen(true)
+    // WindowModel.shared.setWindowLayoutFullScreen(true)
   }
 
   onPageHide(): void {
-    WindowModel.shared.setWindowLayoutFullScreen(false)
+    // WindowModel.shared.setWindowLayoutFullScreen(false)
   }
 
   aboutToAppear(): void {
     this.getData();
     this.showAlert()
-    WindowModel.shared.setWindowLayoutFullScreen(true)
+    // WindowModel.shared.setWindowLayoutFullScreen(true)
   }
 
   showAlert() {
@@ -106,6 +106,7 @@ export struct QualityCommentsComponent {
       Image($r('app.media.comment_img_banner')).width('100%')
         .height(283)
       // .aspectRatio(375 / 283);
+        .expandSafeArea([SafeAreaType.SYSTEM], [SafeAreaEdge.TOP])
     }
     .onAreaChange((oldValue: Area, newValue: Area) => {
       if (Number(oldValue.globalPosition.y) == 0 && Number(newValue.globalPosition.y) > 30) {
@@ -156,13 +157,15 @@ export struct QualityCommentsComponent {
   /*导航栏*/
   @Builder
   TabbarNormal() {
-    Column() {
+    Stack({ alignContent: Alignment.Top }) {
       Row() {
       }
       .width('100%')
       .height(px2vp(this.topSafeHeight))
       .backgroundColor($r('app.color.white'))
       .opacity(this.tileOpacity)
+      .visibility(this.tileOpacity > 0 ? 0 : 1)
+      .expandSafeArea([SafeAreaType.SYSTEM], [SafeAreaEdge.TOP])
 
       Stack({ alignContent: Alignment.Start }) {
         Row() {
@@ -173,6 +176,7 @@ export struct QualityCommentsComponent {
             .fontWeight(400)
             .fontColor($r('app.color.color_222222'))
             .lineHeight('42lpx')
+            .visibility(this.tileOpacity < 0.8 ? 1 : 0)
         }
         .height(44)
         .width('100%')
@@ -218,6 +222,7 @@ export struct QualityCommentsComponent {
       .scrollBar(BarState.Off)
       .edgeEffect(EdgeEffect.None)
 
+      .clip(false)
       // this.TabbarTransparent()
       this.TabbarNormal()
     }
@@ -253,7 +258,7 @@ export struct QualityCommentsComponent {
       this.currentPage++
       this.getData()
     })
-    .margin({ top: 196 })
+    .margin({ top: 196 - px2vp(this.topSafeHeight) })
     .height("100%")
     .width("100%")
     .edgeEffect(EdgeEffect.None) // 必须设置列表为滑动到边缘无效果
@@ -463,12 +468,12 @@ struct QualityCommentItem {
   jumpToAccountOwner() {
 
     commentViewModel.jumpToAccountPage(this.item, () => {
-      WindowModel.shared.setWindowLayoutFullScreen(false)
+      // WindowModel.shared.setWindowLayoutFullScreen(false)
     })
   }
 
   jumpToDetail() {
-    WindowModel.shared.setWindowLayoutFullScreen(false)
+    // WindowModel.shared.setWindowLayoutFullScreen(false)
     // programInfoModel.api_isCommentAction = YES;
     let content = new ContentDTO()
     content.objectId = this.item.targetId;
@@ -501,7 +506,7 @@ struct QualityCommentItem {
     // 未登录，跳转登录
     const user_id = HttpUtils.getUserId()
     if (!user_id) {
-      WindowModel.shared.setWindowLayoutFullScreen(false)
+      // WindowModel.shared.setWindowLayoutFullScreen(false)
       WDRouterRule.jumpWithPage(WDRouterPage.loginPage)
       return
     }

@@ -73,13 +73,19 @@ export struct ZhGridLayout03 {
           bottom:11
         })
         .textOverflow({ overflow: TextOverflow.Ellipsis })
+
     }
     .width('100%')
     .onClick((event: ClickEvent) => {
+      console.log('333rt',JSON.stringify(item))
       InfomationCardClick.track(this.compDTO, item, this.pageId, this.pageName)
       if (item.objectType === '11') {
+        ProcessUtils.jumpExternalWebPage
         ProcessUtils.jumpChannelTab(item.objectId, item.pageId, item.newsTitle)
-      } else {
+      } else  if(item.objectType === '6'){
+        ProcessUtils.jumpExternalWebPage(item.linkUrl)
+        //ProcessUtils.gotoWeb(item);
+      }else{
         ProcessUtils.processPage(item)
       }
     })

@@ -5,11 +5,11 @@ import { QualityCommentsComponent } from '../comment/view/QualityCommentsCompone
 @Component
 struct QualityCommentsPage {
   onPageShow(): void {
-    WindowModel.shared.setWindowLayoutFullScreen(true)
+    // WindowModel.shared.setWindowLayoutFullScreen(true)
   }
 
   onPageHide(): void {
-    WindowModel.shared.setWindowLayoutFullScreen(false)
+    // WindowModel.shared.setWindowLayoutFullScreen(false)
   }
 
   build() {

@@ -114,17 +114,6 @@ export struct OperRowListView {
       }
     })
     this.contentTrackingDict()
-
-    // 2：竖屏直播页 3：图集 4：横屏直播页
-    if(this.pageComponentType == 2 || this.pageComponentType == 4) {
-      // 点赞样式 love爱心型  thumb点赞手势 mourning 蜡烛(默哀) pray 祈福
-      this.likesStyle = this.contentDetailData?.liveInfo?.likesStyle
-      this.openLikes = this.contentDetailData?.liveInfo?.likeEnable == 1 ? true : false
-    } else {
-      // 内容用 点赞样式 1红心(点赞) 2大拇指(祈福) 3蜡烛(默哀) 4置空
-      this.likesStyle = this.contentDetailData.likesStyle
-      this.openLikes = this.contentDetailData.openLikes == 1 ? true : false
-    }
   }
 
   contentTrackingDict(){
@@ -198,6 +187,16 @@ export struct OperRowListView {
       console.log(TAG, 'this.audioUrl+++', this.audioUrl)
       console.log(TAG, 'this.audioTitle+++', this.audioTitle)
     }
+    // 2：竖屏直播页 3：图集 4：横屏直播页
+    if(this.pageComponentType == 2 || this.pageComponentType == 4) {
+      // 点赞样式 love爱心型  thumb点赞手势 mourning 蜡烛(默哀) pray 祈福
+      this.likesStyle = this.contentDetailData?.liveInfo?.likesStyle
+      this.openLikes = this.contentDetailData?.liveInfo?.likeEnable == 1 ? true : false
+    } else {
+      // 内容用 点赞样式 1红心(点赞) 2大拇指(祈福) 3蜡烛(默哀) 4置空
+      this.likesStyle = this.contentDetailData.likesStyle
+      this.openLikes = this.contentDetailData.openLikes == 1 ? true : false
+    }
   }
 
   build() {

@@ -49,6 +49,7 @@ export struct MultiPictureListPage {
           left: { anchor: "__container__", align: HorizontalAlign.Start }
         })
         .onClick(() => {
+          this.onBack();
           router.back();
         })
         .id("backImg")
@@ -134,7 +135,7 @@ export struct MultiPictureListPage {
     }
     .width('100%')
     .height('100%')
-    .padding({top:$r('app.float.margin_44')})
+    // .padding({top:$r('app.float.margin_44')})
     .backgroundColor(Color.Black)
     .id('e_picture_container')
     // 设置顶部绘制延伸到状态栏
@@ -148,7 +149,7 @@ export struct MultiPictureListPage {
    */
   openFullScreen() {
     WindowModel.shared.setWindowSystemBarProperties({ statusBarContentColor: '#ffffff', })
-    WindowModel.shared.setWindowLayoutFullScreen(true)
+    // WindowModel.shared.setWindowLayoutFullScreen(true)
     // WindowModel.shared.setWindowSystemBarEnable([])
   }
 
@@ -163,7 +164,16 @@ export struct MultiPictureListPage {
    */
   closeFullScreen() {
     WindowModel.shared.setWindowSystemBarProperties({ statusBarContentColor: '#000000', })
-    WindowModel.shared.setWindowLayoutFullScreen(false)
+    // WindowModel.shared.setWindowLayoutFullScreen(false)
     // WindowModel.shared.setWindowSystemBarEnable(['status', 'navigation'])
   }
+
+  onBackPress(): boolean | void {
+    this.onBack()
+  }
+
+  private onBack() {
+    // 提前设置，否则返回的页面展示有问题（有时延）
+    this.closeFullScreen()
+  }
 }
\ No newline at end of file

@@ -37,10 +37,14 @@ export struct PlayerRightView {
   @Consume showCommentList: boolean
   @Consume displayDirection: DisplayDirection
   @Consume publishCommentModel: publishCommentModel
-  @State likesStyle: number = this.contentDetailData.likesStyle // 赞样式 1红心(点赞) 2大拇指(祈福) 3蜡烛(默哀) 4置空
-
+  @State likesStyle: number | string = 1 // 赞样式 1红心(点赞) 2大拇指(祈福) 3蜡烛(默哀) 4置空
+  @State openLikes: boolean = false // 是否可以点赞  1：可以 0：不可以
   aboutToAppear() {
-
+    // 内容用 点赞样式 1红心(点赞) 2大拇指(祈福) 3蜡烛(默哀) 4置空
+    this.likesStyle = this.contentDetailData.likesStyle
+    this.openLikes = this.contentDetailData.openLikes == 1 ? true : false
+    // console.log(TAG, 'this.likesStyle', this.likesStyle)
+    // console.log(TAG, 'this.openLikes', this.openLikes)
   }
 
   /**
@@ -299,7 +303,7 @@ export struct PlayerRightView {
         .margin({ top: 2 })
     }
     .margin({ bottom: 20 })
-    .visibility(this.likesStyle !== 4 ? Visibility.Visible : Visibility.None)
+    .visibility(this.likesStyle == 4 || this.likesStyle == 'empty' || !this.openLikes ? Visibility.None : Visibility.Visible)
     .onClick(() => {
       // TODO:点赞动画
       this.toggleLikeStatus()

@@ -91,7 +91,7 @@ struct MultiPictureDetailPage {
    */
   openFullScreen() {
     WindowModel.shared.setWindowSystemBarProperties({ statusBarContentColor: '#ffffff', })
-    WindowModel.shared.setWindowLayoutFullScreen(true)
+    // WindowModel.shared.setWindowLayoutFullScreen(true)
     // WindowModel.shared.setWindowSystemBarEnable([])
   }
 
@@ -101,7 +101,7 @@ struct MultiPictureDetailPage {
    */
   closeFullScreen() {
     WindowModel.shared.setWindowSystemBarProperties({ statusBarContentColor: '#000000', })
-    WindowModel.shared.setWindowLayoutFullScreen(false)
+    // WindowModel.shared.setWindowLayoutFullScreen(false)
     // WindowModel.shared.setWindowSystemBarEnable(['status', 'navigation'])
   }