fix: 17931 UI还原问题-【uat】地区精选卡，上下两条线比android细，看图

陈剑华
Commit f9f1a21d0a9f2590b516474d323629abb59c4cd9 f9f1a21d 1 parent 67d697ce
Showing 3 changed files with 46 additions and 23 deletions
sight_harmony/features/wdComponent/src/main/ets/components/CompParser.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 @f9f1a21
+++ b/sight_harmony/features/wdComponent/src/main/ets/components/CompParser.ets
View file @f9f1a21
@@ -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/page/PageComponent.ets
View file @f9f1a21
+++ b/sight_harmony/features/wdComponent/src/main/ets/components/page/PageComponent.ets
View file @f9f1a21
@@ -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 @f9f1a21
+++ b/sight_harmony/features/wdComponent/src/main/ets/components/page/template/TemplatePageComponent.ets
View file @f9f1a21
@@ -123,6 +123,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