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

yumaochao
Commit 18782e2e61a0ac19b1d873ead8af48d7062ad08d 18782e2e 2 parents ce2359b8 39bf8561
Showing 4 changed files with 35 additions and 104 deletions
sight_harmony/features/wdComponent/src/main/ets/components/DynamicDetailComponent.ets
sight_harmony/features/wdComponent/src/main/ets/components/cardCommon/CardMediaInfo.ets
sight_harmony/features/wdComponent/src/main/ets/components/page/PageComponent.ets
sight_harmony/features/wdComponent/src/main/ets/viewmodel/PageHelper.ets
--- a/sight_harmony/features/wdComponent/src/main/ets/components/DynamicDetailComponent.ets
View file @18782e2
+++ b/sight_harmony/features/wdComponent/src/main/ets/components/DynamicDetailComponent.ets
View file @18782e2
@@ -41,7 +41,7 @@ export struct DynamicDetailComponent {
   @State newsStatusOfUser: batchLikeAndCollectResult | undefined = undefined // 点赞、收藏状态
   //跳转
-  private mJumpInfo: ContentDTO = {} as ContentDTO;
+  private  mJumpInfo: ContentDTO = {} as ContentDTO;
   // 获取当前所有的display对象
   promise: Promise<Array<display.Display>> = display.getAllDisplays()
@@ -65,7 +65,7 @@ export struct DynamicDetailComponent {
             .height($r('app.float.margin_28'))
             .margin({ left: $r('app.float.margin_16') })
           Blank()
-          Text(this.contentDetailData.publishTime)
+          Text(StringUtils.isEmpty(this.contentDetailData.publishTime)?"":this.contentDetailData.publishTime.replace('-','年').replace('-','月').replace(' ','日 ').substring(0,this.contentDetailData.publishTime.length-2))
             .fontColor($r('app.color.color_B0B0B0'))
             .fontSize($r('app.float.font_size_12'))
             .lineHeight($r('app.float.margin_28'))
@@ -284,7 +284,6 @@ export struct DynamicDetailComponent {
                   }
                   .margin({ left: $r('app.float.margin_16'),right: $r('app.float.margin_16'),top: $r('app.float.margin_8')})
                   .onClick((event: ClickEvent) => {
-                    this.mJumpInfo.objectType = ContentConstants.TYPE_VOD;
                     ProcessUtils.processPage(this.mJumpInfo)
                   })
                 }
@@ -440,12 +439,14 @@ export struct DynamicDetailComponent {
   //创建跳转信息
   makeJumpInfo(){
-    this.mJumpInfo.pageId = 'dynamicDetailPage';
-    // this.mJumpInfo.from = 'dynamicDetailPage';
-    this.mJumpInfo.objectId = this.contentDetailData.newsId+"";
-    this.mJumpInfo.relType = this.contentDetailData.reLInfo?.relType+"";
-    this.mJumpInfo.relId = this.contentDetailData.reLInfo?.relId+"";
-    // this.mJumpInfo.objectType = this.contentDetailData.newsType+"";
+    this.mJumpInfo.pageId = 'dynamicDetailPage'
+    this.mJumpInfo.objectId = this.contentDetailData.newsId+""
+    this.mJumpInfo.relType = this.contentDetailData.reLInfo?.relType+""
+    this.mJumpInfo.relId = this.contentDetailData.reLInfo?.relId+""
+    this.mJumpInfo.objectType = (this.contentDetailData.newsType+"") == ContentConstants.TYPE_FOURTEEN?this.contentDetailData.newsType+"":ContentConstants.TYPE_VOD
+    if(this.contentDetailData.videoInfo!= null && this.contentDetailData.videoInfo.length>0){
+      this.mJumpInfo.videoInfo = this.contentDetailData.videoInfo[0]
+    }
   }
--- a/sight_harmony/features/wdComponent/src/main/ets/components/cardCommon/CardMediaInfo.ets
View file @18782e2
+++ b/sight_harmony/features/wdComponent/src/main/ets/components/cardCommon/CardMediaInfo.ets
View file @18782e2
@@ -21,8 +21,10 @@ export struct CardMediaInfo {
         Row() {
           Image($r('app.media.card_play'))
             .mediaLogo()
-          Text(DateTimeUtils.getFormattedDuration(this.contentDTO.videoInfo.videoDuration * 1000))
-            .mediaText()
+          if(this.contentDTO.videoInfo!=null){
+            Text(DateTimeUtils.getFormattedDuration(this.contentDTO.videoInfo.videoDuration * 1000))
+              .mediaText()
+          }
         }
       } else if (this.contentDTO.objectType === '2') {
         // liveInfo.liveState 直播新闻-直播状态 wait待开播running直播中end已结束cancel已取消paused暂停
--- a/sight_harmony/features/wdComponent/src/main/ets/components/page/PageComponent.ets
View file @18782e2
+++ b/sight_harmony/features/wdComponent/src/main/ets/components/page/PageComponent.ets
View file @18782e2
@@ -121,34 +121,24 @@ export struct PageComponent {
   pageHornAd() {
     if (this.pageModel.isShowAds) {
-
       if (this.pageModel.pageCornerAdv.matInfo != null) {
-        if (1 == this.pageModel.isRightAdv) {
-          // 页面右边挂角
-          this.drawRightCornerAdvView(1)
-        } else if (2 == this.pageModel.isRightAdv) {
-          // 页面左边挂角
-          this.drawLeftCornerAdvView(1)
-        }
+        // 页面右边挂角
+        this.drawPageCornerAdvView(1, 1 == this.pageModel.isRightAdv)
       } else if (this.pageModel.pageCornerContentInfo.advert != null) {
-        if (1 == this.pageModel.isRightAdv) {
-          // 页面右边挂角
-          this.drawRightCornerAdvView(2)
-        } else if (2 == this.pageModel.isRightAdv) {
-          // 页面左边挂角
-          this.drawLeftCornerAdvView(2)
-        }
+        this.drawPageCornerAdvView(2, 1 == this.pageModel.isRightAdv)
       }
     }
   }
   /**
+   * 绘制页面挂角
    *
    * @param type  1:广告中心的挂角广告；2：展现中心的挂角广告
+   * @param isRightCorne   true:右挂角；false：左挂角
    */
   @Builder
-  drawLeftCornerAdvView(type: number) {
+  drawPageCornerAdvView(type: number, isRightCorne: boolean) {
     // 页面左挂角
     Image(type === 1 ? this.pageModel.pageCornerAdv.matInfo.matImageUrl[0]
       : this.pageModel.pageCornerContentInfo.advert.displayUrl)
@@ -157,97 +147,36 @@ export struct PageComponent {
       .id("left_iv")
       .alignRules({
         bottom: { anchor: '__container__', align: VerticalAlign.Bottom },
-        left: { anchor: '__container__', align: HorizontalAlign.Start },
+        left: { anchor: isRightCorne ? "" : '__container__', align: HorizontalAlign.Start },
+        right: { anchor: isRightCorne ? '__container__' : "", align: HorizontalAlign.End },
       })
       .margin({
         bottom: "65vp",
-        left: ('app.float.card_comp_pagePadding_lf')
-      })
-      .onClick(() => {
-        // 广告业务跳转
-        ProcessUtils.openAdvDetail(this.pageModel.pageCornerAdv.matInfo);
-      })
+        left: isRightCorne ? 0 : $r('app.float.card_comp_pagePadding_lf'),
+        right: isRightCorne ? $r('app.float.card_comp_pagePadding_lf') : 0,
-    Image($r('app.media.icon_adv_horn_close'))
-      .id('left_close')
-      .width($r('app.float.vp_16'))
-      .alignRules({
-        top: { anchor: 'left_iv', align: VerticalAlign.Top },
-        left: { anchor: 'left_iv', align: HorizontalAlign.Start },
-      })
-      .offset({
-        x: -10,
-        y: -10
       })
       .onClick(() => {
-        // 关闭挂角广告
-        this.pageModel.isShowAds = false;
-
-      })
-
-    if (type == 1) {
-      Text($r('app.string.comp_advertisement'))
-        .width($r('app.float.vp_28'))
-        .height($r('app.float.vp_16'))
-        .fontSize($r('app.float.font_size_10'))
-        .fontColor(Color.White)
-        .id('left_tag')
-        .alignRules({
-          bottom: { anchor: 'left_iv', align: VerticalAlign.Bottom },
-          left: { anchor: 'left_iv', align: HorizontalAlign.Start },
-        })
-        .textAlign(TextAlign.Center)
-        .backgroundColor($r('app.color.res_color_general_000000_30'))
-        .borderRadius({
-          topLeft: $r('app.float.vp_2'),
-          topRight: $r('app.float.vp_2'),
-          bottomLeft: $r('app.float.vp_2'),
-          bottomRight: $r('app.float.vp_2')
-        })
-    }
-
-  }
-
-  /**
-   *
-   * @param type  1:广告中心的挂角广告；2：展现中心的挂角广告
-   */
-  @Builder
-  drawRightCornerAdvView(type: number) {
-
-    Image(type === 1 ? this.pageModel.pageCornerAdv.matInfo.matImageUrl[0]
-      : this.pageModel.pageCornerContentInfo.advert.displayUrl)
-      .width($r('app.float.vp_80'))
-      .height($r('app.float.vp_80'))
-      .id("right_iv")
-      .alignRules({
-        bottom: { anchor: '__container__', align: VerticalAlign.Bottom },
-        right: { anchor: '__container__', align: HorizontalAlign.End },
-      })
-      .margin({ bottom: "65vp", right: $r('app.float.card_comp_pagePadding_lf') })
-      .onClick(() => {
-
         if (type === 1) {
           // 广告业务跳转
           ProcessUtils.openAdvDetail(this.pageModel.pageCornerAdv.matInfo);
         } else {
           // 展现中心的业务跳转
           ProcessUtils.advJumpMainPage(this.pageModel.pageCornerContentInfo.advert)
-
         }
-
       })
-
+    // 关闭按钮
     Image($r('app.media.icon_adv_horn_close'))
-      .id('right_close')
+      .id('left_close')
       .width($r('app.float.vp_16'))
       .alignRules({
-        top: { anchor: 'right_iv', align: VerticalAlign.Top },
-        right: { anchor: 'right_iv', align: HorizontalAlign.End },
+        top: { anchor: 'left_iv', align: VerticalAlign.Top },
+        left: { anchor: isRightCorne ? '' : 'left_iv', align: HorizontalAlign.Start },
+        right: { anchor: isRightCorne ? 'left_iv' : '', align: HorizontalAlign.End },
       })
       .offset({
-        x: 10,
-        y: -10
+        x: isRightCorne ? 10 : -10,
+        y: isRightCorne ? -10 : -10
       })
       .onClick(() => {
         // 关闭挂角广告
@@ -261,10 +190,11 @@ export struct PageComponent {
         .height($r('app.float.vp_16'))
         .fontSize($r('app.float.font_size_10'))
         .fontColor(Color.White)
-        .id('right_tag')
+        .id('left_tag')
         .alignRules({
-          bottom: { anchor: 'right_iv', align: VerticalAlign.Bottom },
-          right: { anchor: 'right_iv', align: HorizontalAlign.End },
+          bottom: { anchor: 'left_iv', align: VerticalAlign.Bottom },
+          left: { anchor: isRightCorne ? '' : 'left_iv', align: HorizontalAlign.Start },
+          right: { anchor: isRightCorne ? 'left_iv' : '', align: HorizontalAlign.End },
         })
         .textAlign(TextAlign.Center)
         .backgroundColor($r('app.color.res_color_general_000000_30'))
@@ -276,7 +206,6 @@ export struct PageComponent {
         })
     }
-
   }
   async aboutToAppear() {
--- a/sight_harmony/features/wdComponent/src/main/ets/viewmodel/PageHelper.ets
View file @18782e2
+++ b/sight_harmony/features/wdComponent/src/main/ets/viewmodel/PageHelper.ets
View file @18782e2
@@ -71,7 +71,6 @@ export class PageHelper {
         return
       }
-
       if ("left_down" == cornersAdv.pos) {
         // 左边挂角广告
         pageModel.isRightAdv = 2