Merge remote-tracking branch 'origin/main'

liyubing
Commit 931512e136378b3ca30d8a27fb9faefe8a525648 931512e1 2 parents 1429499c 8164bf0b
Showing 8 changed files with 68 additions and 42 deletions
sight_harmony/features/wdComponent/src/main/ets/components/CompParser.ets
sight_harmony/features/wdComponent/src/main/ets/components/MorningEveningPaper/MorningEveningPaperComponent.ets
sight_harmony/features/wdComponent/src/main/ets/components/MorningEveningPaper/PaperTitleComponent.ets
sight_harmony/features/wdComponent/src/main/ets/components/cardview/Card5Component.ets
sight_harmony/features/wdComponent/src/main/ets/components/cardview/Card6Component.ets
sight_harmony/features/wdComponent/src/main/ets/components/compview/ZhSingleColumn09.ets
sight_harmony/features/wdComponent/src/main/ets/components/page/PageComponent.ets
sight_harmony/features/wdComponent/src/main/ets/components/page/template/TemplatePageComponent.ets
--- a/sight_harmony/features/wdComponent/src/main/ets/components/CompParser.ets
View file @931512e
+++ b/sight_harmony/features/wdComponent/src/main/ets/components/CompParser.ets
View file @931512e
@@ -38,6 +38,7 @@ export struct CompParser {
   @State pageId: string = '';
   @State pageName: string = '';
   @ObjectLink compDTO: CompDTO
+  @State nextCompDTO: CompDTO = new CompDTO
   @State compIndex: number = 0;
   @State private pageModel: PageModel = new PageModel();
   @State audioItems: ContentDTO[] = [];
@@ -83,17 +84,14 @@ export struct CompParser {
       this.compDTO.operDataList[0]?.objectType !== '13') { //暂时屏蔽活动和音频详情入口
       if (this.compDTO.compStyle === CompStyle.Label_03) {
         LabelComponent({ compDTO: this.compDTO })
-        Divider().strokeWidth(1).color('#f5f5f5').padding({ left: 16, right: 16 })
       } else if (this.compDTO.compStyle === CompStyle.Zh_Carousel_Layout_01) {
         if (this.compDTO.operDataList.length > this.audioItems.length) {
           ZhCarouselLayout01({ compDTO: this.compDTO, pageId: this.pageId, pageName: this.pageName })
-          Divider().strokeWidth(1).color('#f5f5f5').padding({ left: 16, right: 16 })
         }
       } else if (this.compDTO.compStyle === CompStyle.Zh_Single_Row_01 &&
         this.compDTO.imageScale === 2) { // && compDTO.name ==="横划卡"
         LiveHorizontalCardComponent({ compDTO: this.compDTO, pageId: this.pageId, pageName: this.pageName })
-        Divider().strokeWidth(1).color('#f5f5f5').padding({ left: 16, right: 16 })
       } else if (this.compDTO.compStyle === CompStyle.Zh_Single_Row_01 && this.compDTO.imageScale === 3) {
         if (this.compDTO.operDataList.length > 1) {
           HorizontalStrokeCardThreeTwoRadioForMoreComponent({
@@ -108,17 +106,13 @@ export struct CompParser {
             pageName: this.pageName
           })
         }
-        Divider().strokeWidth(1).color('#f5f5f5').padding({ left: 16, right: 16 })
       } else if (this.compDTO.compStyle === CompStyle.Zh_Single_Row_02) {
         ZhSingleRow02({ compDTO: this.compDTO, pageId: this.pageId, pageName: this.pageName })
-        Divider().strokeWidth(1).color('#f5f5f5').padding({ left: 16, right: 16 })
       } else if (this.compDTO.compStyle === CompStyle.Zh_Single_Row_03) {
         ZhSingleRow03({ compDTO: this.compDTO, pageId: this.pageId, pageName: this.pageName })
-        Divider().strokeWidth(1).color('#f5f5f5').padding({ left: 16, right: 16 })
       } else if (this.compDTO.compStyle === CompStyle.Zh_Grid_Layout_02) { //双列流小视频,一行两图卡 ->标题
         //ZhGridLayout02({ compDTO: this.compDTO })
         CompNormalTitle({ compDTO: this.compDTO })
-        //   Divider().strokeWidth(5).color('#f5f5f5').padding({ left: 0, right: 0 })
       } else if (this.compDTO.compStyle === CompStyle.Card_Comp_Zh_Grid_Layout_02) { //双列流小视频,一行两图卡
         ZhGridLayout02NewsContent({
@@ -130,16 +124,12 @@ export struct CompParser {
       } else if (this.compDTO.compStyle === CompStyle.Zh_Grid_Layout_03) {
         ZhGridLayout03({ compDTO: this.compDTO, pageId: this.pageId, pageName: this.pageName })
-        Divider().strokeWidth(1).color('#f5f5f5').padding({ left: 16, right: 16 })
       } else if (this.compDTO.compStyle === CompStyle.Zh_Single_Row_04) {
         ZhSingleRow04({ compDTO: this.compDTO, pageId: this.pageId, pageName: this.pageName })
-        Divider().strokeWidth(1).color('#f5f5f5').padding({ left: 16, right: 16 })
       } else if (this.compDTO.compStyle === CompStyle.Zh_Single_Row_05) {
         // ZhSingleRow05({ compDTO })
-        // Divider().strokeWidth(5).color('#f5f5f5').padding({ left: 0, right: 0 })
       } else if (this.compDTO.compStyle === CompStyle.Zh_Single_Row_06) {
         ZhSingleRow06({ compDTO: this.compDTO, pageId: this.pageId, pageName: this.pageName })
-        Divider().strokeWidth(1).color('#f5f5f5').padding({ left: 16, right: 16 })
       } else if (this.compDTO.compStyle === CompStyle.Zh_Single_Column_02) {
         //头图卡 和comStyle 2相同，
         Card5Component({
@@ -149,7 +139,6 @@ export struct CompParser {
           pageId: this.pageId,
           pageName: this.pageName
         })
-        Divider().strokeWidth(1).color('#f5f5f5').padding({ left: 16, right: 16 })
       } else if (this.compDTO.compStyle === CompStyle.Zh_Single_Column_03) {
         // 大图卡
         Card2Component({
@@ -158,7 +147,6 @@ export struct CompParser {
           pageId: this.pageId,
           pageName: this.pageName
         })
-        Divider().strokeWidth(1).color('#f5f5f5').padding({ left: 16, right: 16 })
       } else if (this.compDTO.compStyle === CompStyle.Card_09) {
         //时间链卡
         Card9Component({
@@ -167,7 +155,6 @@ export struct CompParser {
           pageId: this.pageId,
           pageName: this.pageName
         })
-        Divider().strokeWidth(1).color('#f5f5f5').padding({ left: 16, right: 16 })
       } else if (this.compDTO.compStyle === CompStyle.Card_13) {
         Card6Component({
           compDTO: this.compDTO,
@@ -175,7 +162,6 @@ export struct CompParser {
           pageId: this.pageId,
           pageName: this.pageName
         })
-        Divider().strokeWidth(1).color('#f5f5f5').padding({ left: 16, right: 16 })
       } else if (this.compDTO.compStyle === CompStyle.Card_03) {
         Card3Component({
           compDTO: this.compDTO,
@@ -183,20 +169,15 @@ export struct CompParser {
           pageId: this.pageId,
           pageName: this.pageName
         })
-        Divider().strokeWidth(1).color('#f5f5f5').padding({ left: 16, right: 16 })
       } else if (this.compDTO.compStyle === CompStyle.Zh_Single_Column_04) {
         ZhSingleColumn04({ compDTO: this.compDTO, pageId: this.pageId, pageName: this.pageName })
-        Divider().strokeWidth(1).color('#f5f5f5').padding({ left: 16, right: 16 })
       } else if (this.compDTO.compStyle === CompStyle.Zh_Single_Column_05) {
         // ZhSingleColumn05({ compDTO: compDTO })
-        // Divider().strokeWidth(5).color('#f5f5f5').padding({ left: 0, right: 0 })
       } else if (this.compDTO.compStyle === CompStyle.Zh_Single_Column_09) {
         ZhSingleColumn09({ compDTO: this.compDTO, pageId: this.pageId, pageName: this.pageName })
-        Divider().strokeWidth(1).color('#f5f5f5').padding({ left: 16, right: 16 })
       } else if (this.compDTO.compStyle === CompStyle.Card_Comp_Adv) { // 广告
         AdvCardParser({ pageModel: this.pageModel, compDTO: this.compDTO })
         //Text(`compIndex = ${compIndex}`).width('100%').fontSize('12fp').fontColor(Color.Red).padding({ left: 0, right: 0 })
-        Divider().strokeWidth(1).color('#f5f5f5').padding({ left: 16, right: 16 })
       } else if (!Number.isNaN(Number(this.compDTO.compStyle)) || this.compDTO.compType === 'appStyle') {
         CardParser({
           contentDTO: this.compDTO.operDataList[0],
@@ -205,7 +186,6 @@ export struct CompParser {
           pageName: this.pageName,
           compIndex: this.compIndex
         });
-        Divider().strokeWidth(1).color('#f5f5f5').padding({ left: 16, right: 16 })
       } else {
         // Text(this.compDTO.compStyle)
         //   .width(CommonConstants.FULL_PARENT)
@@ -215,9 +195,43 @@ export struct CompParser {
         //       WDRouterRule.jumpWithPage(WDRouterPage.QualityCommentsPage)
         //     }
         //   })
-        // Divider().strokeWidth(8).color('#f5f5f5').padding({ left: 0, right: 0 })
+      }
+
+      if (
+        this.compDTO.compStyle === CompStyle.Card_09 ||
+          this.compDTO.compStyle === CompStyle.Zh_Single_Column_09 ||
+          this.compDTO.compStyle === CompStyle.Zh_Single_Row_04 ||
+          this.compDTO.compStyle === CompStyle.Zh_Single_Row_06
+      ) {
+        if (this.compDTO.compStyle === this.nextCompDTO.compStyle) {
+          Divider().strokeWidth(1).color('#f5f5f5').padding({ left: 16, right: 16 })
+        } else {
+          Divider().strokeWidth(5).color('#f5f5f5').padding({ left: 16, right: 16 })
+        }
+      } else if (this.compDTO?.operDataList?.[0]?.appStyle === CompStyle.Card_10) {
+        // 大专题
+        if (this.nextCompDTO?.operDataList?.[0]?.appStyle === CompStyle.Card_10) {
+          Divider().strokeWidth(1).color('#f5f5f5').padding({ left: 16, right: 16 })
+        } else {
+          Divider().strokeWidth(5).color('#f5f5f5').padding({ left: 16, right: 16 })
+        }
+      } else if (this.compDTO.compType === 'appStyle') {
+        if (
+          this.nextCompDTO.compStyle === CompStyle.Card_09 ||
+            this.nextCompDTO?.operDataList?.[0]?.appStyle === CompStyle.Card_10 ||
+            this.nextCompDTO.compStyle === CompStyle.Zh_Single_Column_09 ||
+            this.nextCompDTO.compStyle === CompStyle.Zh_Single_Row_04 ||
+            this.nextCompDTO.compStyle === CompStyle.Zh_Single_Row_06
+        ) {
+          Divider().strokeWidth(5).color('#f5f5f5').padding({ left: 16, right: 16 })
+        } else {
+          Divider().strokeWidth(1).color('#f5f5f5').padding({ left: 16, right: 16 })
+        }
+      } else {
+        // Divider().strokeWidth(1).color('#f5f5f5').padding({ left: 16, right: 16 })
       }
     }
+
   }
 }
--- a/sight_harmony/features/wdComponent/src/main/ets/components/MorningEveningPaper/MorningEveningPaperComponent.ets
View file @931512e
+++ b/sight_harmony/features/wdComponent/src/main/ets/components/MorningEveningPaper/MorningEveningPaperComponent.ets
View file @931512e
@@ -4,7 +4,7 @@ import {
   PageInfoBean,
   ContentDTO,
   contentListParams,
-  InteractDataDTO
+  InteractDataDTO, TopicInfo
 } from 'wdBean';
 import { DateTimeUtils, Logger, SPHelper, WindowModel } from 'wdKit/Index';
 import { PaperReaderSimpleDialog } from '../../dialog/PaperReaderDialog';
@@ -61,6 +61,7 @@ export struct MorningEveningPaperComponent {
   @Provide title: string = ''
   @Provide subTitle: string = ''
   @Provide audioTitle: string = ''
+  @Provide topicInfo: TopicInfo  = {} as TopicInfo
   @Provide isAudioPlaying: boolean = false
   @Provide status: number = PlayerConstants.STATUS_START;
   @Provide currentTime: string = "00:00";
@@ -142,6 +143,7 @@ export struct MorningEveningPaperComponent {
       viewColumInsightIntentShare(context,String(dailyPaperTopicPageId), this.pageInfoBean)
       this.title = this.pageInfoBean?.topicInfo?.title
+      this.topicInfo = this.pageInfoBean?.topicInfo
       let dateTime = DateTimeUtils.parseDate(this.pageInfoBean?.topicInfo?.topicDate ?? '', DateTimeUtils.PATTERN_DATE_HYPHEN)
       const dateShow = new Date(dateTime)
       this.subTitle = `${dateShow.getFullYear()}年\n${(dateShow.getMonth() + 1)}月${dateShow.getDate()}日`
@@ -314,7 +316,7 @@ export struct MorningEveningPaperComponent {
   @Builder
   topPaperTitle(){
     Column(){
-      PaperTitleComponent({topicInfo:this.pageInfoBean?.topicInfo})
+      PaperTitleComponent()
         .margin({top:this.topSafeHeight})
     }
     .height(44+this.topSafeHeight)
--- a/sight_harmony/features/wdComponent/src/main/ets/components/MorningEveningPaper/PaperTitleComponent.ets
View file @931512e
+++ b/sight_harmony/features/wdComponent/src/main/ets/components/MorningEveningPaper/PaperTitleComponent.ets
View file @931512e
@@ -12,7 +12,7 @@ import { TrackConstants } from 'wdTracking/Index';
 export struct PaperTitleComponent {
   @Consume title?: string
   @Consume subTitle?: string
-  topicInfo: TopicInfo  = {} as TopicInfo
+  @Consume topicInfo: TopicInfo
   aboutToAppear() {
   }
@@ -98,18 +98,18 @@ export struct PaperTitleComponent {
         })
         .margin({ right: 16 })
-      // Image($r('app.media.icon_share'))
-      //   .height($r('app.float.top_arrow_size'))
-      //   .width($r('app.float.top_arrow_size'))
-      //   .alignRules({
-      //     right: { anchor: "img_close", align: HorizontalAlign.Start },
-      //     center: { anchor: "__container__", align: VerticalAlign.Center }
-      //   })
-      //   .id('img_share')
-      //   .margin({ right: 16 })
-      //   .onClick(() => {
-      //     this.share()
-      //   })
+      Image($r('app.media.icon_share'))
+        .height($r('app.float.top_arrow_size'))
+        .width($r('app.float.top_arrow_size'))
+        .alignRules({
+          right: { anchor: "img_close", align: HorizontalAlign.Start },
+          center: { anchor: "__container__", align: VerticalAlign.Center }
+        })
+        .id('img_share')
+        .margin({ right: 16 })
+        .onClick(() => {
+          this.share()
+        })
     }
     // .margin({ left: 14, right: 14 })
     .height($r('app.float.top_bar_height'))
--- a/sight_harmony/features/wdComponent/src/main/ets/components/cardview/Card5Component.ets
View file @931512e
+++ b/sight_harmony/features/wdComponent/src/main/ets/components/cardview/Card5Component.ets
View file @931512e
@@ -54,7 +54,8 @@ export struct Card5Component {
             bottomRight: $r('app.float.image_border_radius')
           }
         )
-        .aspectRatio(343 / 225)
+        // .aspectRatio(343 / 225)
+        .autoResize(true)
       if (!!this.titleShowPolicy || this.titleShowPolicy === null ) {
         Row()
           .borderRadius(
--- a/sight_harmony/features/wdComponent/src/main/ets/components/cardview/Card6Component.ets
View file @931512e
+++ b/sight_harmony/features/wdComponent/src/main/ets/components/cardview/Card6Component.ets
View file @931512e
@@ -94,7 +94,7 @@ export struct Card6Component {
             .alignSelf(ItemAlign.Start)
             .textOverflow({ overflow: TextOverflow.Ellipsis }) // 超出的部分显示省略号。
             .textIndent((this.contentDTO.newTags?.length || this.contentDTO.seoTags?.length) > 2 &&
-              (this.contentDTO.newTags?.length || this.contentDTO.seoTags?.length) < 5 ? 58 :
+              (this.contentDTO.newTags?.length || this.contentDTO.seoTags?.length) < 5 ? (12 + (this.contentDTO.newTags?.length || this.contentDTO.seoTags?.length) * 11) :
               ((this.contentDTO.newTags?.length > 0 || this.contentDTO.seoTags?.length > 0) || this.contentDTO.objectType == '5' || this.contentDTO.top === 1) ? 35 :
                 0 )
           }.alignContent(Alignment.TopStart)
--- a/sight_harmony/features/wdComponent/src/main/ets/components/compview/ZhSingleColumn09.ets
View file @931512e
+++ b/sight_harmony/features/wdComponent/src/main/ets/components/compview/ZhSingleColumn09.ets
View file @931512e
@@ -138,8 +138,8 @@ export struct ZhSingleColumn09 {
                 .textAlign(TextAlign.Center)
                 .fontColor(0xffffff)
               Image($r('app.media.icon_selected'))
-                .width(19)
-                .height(19)
+                .width(14)
+                .height(14)
                 .opacity(this.activeIndexs.includes(index) ? 1 : 0)
                 .objectFit(ImageFit.Contain)
             }
--- a/sight_harmony/features/wdComponent/src/main/ets/components/page/PageComponent.ets
View file @931512e
+++ b/sight_harmony/features/wdComponent/src/main/ets/components/page/PageComponent.ets
View file @931512e
@@ -95,7 +95,15 @@ export struct PageComponent {
         LazyForEach(this.pageModel.compList, (compDTO: CompDTO, compIndex: number) => {
           ListItem() {
             Column() {
-              CompParser({ pageModel: this.pageModel, compDTO: compDTO, compIndex: compIndex, pageId: this.pageId });
+              CompParser(
+                {
+                  pageModel: this.pageModel,
+                  nextCompDTO: compIndex === this.pageModel.compList.getDataArray().length - 1 ? new CompDTO() : this.pageModel.compList.get(compIndex + 1) as CompDTO,
+                  compDTO: compDTO,
+                  compIndex: compIndex,
+                  pageId: this.pageId
+                }
+              );
             }
           }
         },
--- a/sight_harmony/features/wdComponent/src/main/ets/components/page/template/TemplatePageComponent.ets
View file @931512e
+++ b/sight_harmony/features/wdComponent/src/main/ets/components/page/template/TemplatePageComponent.ets
View file @931512e
@@ -125,6 +125,7 @@ export default struct TemplatePageComponent {
             CompParser({
               compDTO: compDTO,
+              nextCompDTO: index === this.templatePage.compList.getDataArray().length - 1 ? new CompDTO() : this.templatePage.compList.get(index + 1) as CompDTO,
               compIndex: index,
               pageId: this.pageId,
               pageName: this.pageName