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

@@ -40,7 +40,7 @@ export struct DynamicDetailComponent {
   scroller: Scroller = new Scroller();
   scroller: Scroller = new Scroller();
 
 
   //点赞 收藏 评论 数量
   //点赞 收藏 评论 数量
-  @State interactDataDTO: InteractDataDTO = {} as InteractDataDTO
+  @State interactDataDTO: InteractDataDTO = {likeNum:0} as InteractDataDTO
   /**
   /**
    * 关注状态：默认未关注 点击去关注
    * 关注状态：默认未关注 点击去关注
    */
    */
@@ -333,11 +333,13 @@ export struct DynamicDetailComponent {
                   .width($r('app.float.margin_24'))
                   .width($r('app.float.margin_24'))
                   .height($r('app.float.margin_24'))
                   .height($r('app.float.margin_24'))
                   .objectFit(ImageFit.Cover)
                   .objectFit(ImageFit.Cover)
-                Text(NumberFormatterUtils.formatNumberWithWan(this.interactDataDTO?.likeNum))
-                  .fontColor($r('app.color.color_999999'))
-                  .fontSize($r('app.float.font_size_16'))
-                  .lineHeight($r('app.float.margin_20'))
-                  .margin({ left: $r('app.float.margin_2')})
+                if(this.interactDataDTO?.likeNum != 0){
+                  Text(NumberFormatterUtils.formatNumberWithWan(this.interactDataDTO?.likeNum))
+                    .fontColor($r('app.color.color_999999'))
+                    .fontSize($r('app.float.font_size_16'))
+                    .lineHeight($r('app.float.margin_20'))
+                    .margin({ left: $r('app.float.margin_2')})
+                }
                 Blank().layoutWeight(1)
                 Blank().layoutWeight(1)
               }
               }
               .width($r('app.float.margin_154'))
               .width($r('app.float.margin_154'))

@@ -263,10 +263,10 @@ export struct TopNavigationComponent {
       if (this.currentTopNavSelectedIndex == 0) {
       if (this.currentTopNavSelectedIndex == 0) {
         return item.name === '视频' ? Color.White : '#e5e0e0'
         return item.name === '视频' ? Color.White : '#e5e0e0'
       } else {
       } else {
-        return this.currentTopNavSelectedIndex === index ? Color.Black : Color.Gray
+        return this.currentTopNavSelectedIndex === index ? Color.Black : "#999999"
       }
       }
     } else {
     } else {
-      return this.currentTopNavSelectedIndex === index ? Color.Black : Color.Gray
+      return this.currentTopNavSelectedIndex === index ? Color.Black : "#999999"
     }
     }
   }
   }
 
 
@@ -274,30 +274,28 @@ export struct TopNavigationComponent {
   tabBarBuilder(item: TopNavDTO, index: number) {
   tabBarBuilder(item: TopNavDTO, index: number) {
     Column() {
     Column() {
       Text(item.name)
       Text(item.name)
-        .fontSize(this.currentTopNavSelectedIndex === index ? $r('app.float.selected_text_size') : $r('app.float.normal_text_size'))
+        .fontSize($r('app.float.selected_text_size'))
         .fontWeight(this.currentTopNavSelectedIndex === index ? FontWeight.Bold : FontWeight.Normal)
         .fontWeight(this.currentTopNavSelectedIndex === index ? FontWeight.Bold : FontWeight.Normal)
         .fontColor(this.getFontColor(item, index))
         .fontColor(this.getFontColor(item, index))
-        .padding({ top: $r('app.float.top_tab_item_padding_top') })
+        .padding({ top: $r('app.float.top_tab_item_padding_top') , bottom: $r('app.float.top_tab_item_padding_bottom')})
         .maxLines(this.MAX_LINE)
         .maxLines(this.MAX_LINE)
       if (this.currentTopNavSelectedIndex === index) {
       if (this.currentTopNavSelectedIndex === index) {
         Row()
         Row()
           .width(20)
           .width(20)
           .height(3)
           .height(3)
           .backgroundImage($r('app.media.icon_channel_active'), ImageRepeat.NoRepeat)
           .backgroundImage($r('app.media.icon_channel_active'), ImageRepeat.NoRepeat)
+          .backgroundImageSize(ImageSize.Contain)
       }
       }
-
     }
     }
     .hoverEffect(HoverEffect.Highlight)
     .hoverEffect(HoverEffect.Highlight)
     .constraintSize({
     .constraintSize({
       minWidth: $r('app.float.top_tab_item_min_width'),
       minWidth: $r('app.float.top_tab_item_min_width'),
       maxWidth: $r('app.float.top_tab_item_max_width')
       maxWidth: $r('app.float.top_tab_item_max_width')
     })
     })
-    // .margin({ right: 36 })
     .backgroundColor(Color.Transparent)
     .backgroundColor(Color.Transparent)
     .padding({
     .padding({
       left: $r('app.float.top_tab_item_padding_horizontal'),
       left: $r('app.float.top_tab_item_padding_horizontal'),
       right: $r('app.float.top_tab_item_padding_horizontal'),
       right: $r('app.float.top_tab_item_padding_horizontal'),
-      bottom: $r('app.float.top_tab_item_padding_bottom')
     })
     })
     .id(`col_tabBar${index}`)
     .id(`col_tabBar${index}`)
     .margin({ right: this.myChannelList.length === index + 1 ? 36 : 0 })
     .margin({ right: this.myChannelList.length === index + 1 ? 36 : 0 })

@@ -34,7 +34,7 @@
     },
     },
     {
     {
       "name": "selected_text_size",
       "name": "selected_text_size",
-      "value": "18fp"
+      "value": "17vp"
     },
     },
     {
     {
       "name": "font_size_18",
       "name": "font_size_18",
@@ -178,11 +178,11 @@
     },
     },
     {
     {
       "name": "top_tab_item_padding_bottom",
       "name": "top_tab_item_padding_bottom",
-      "value": "5vp"
+      "value": "2vp"
     },
     },
     {
     {
       "name": "top_tab_item_padding_top",
       "name": "top_tab_item_padding_top",
-      "value": "2vp"
+      "value": "5vp"
     },
     },
     {
     {
       "name": "top_bar_height",
       "name": "top_bar_height",