Merge remote-tracking branch 'origin/main'

@@ -25,6 +25,7 @@ export struct ImageDownloadComponent {
   build() {
   build() {
     Column() {
     Column() {
       SaveButton({ icon: SaveIconStyle.LINES })
       SaveButton({ icon: SaveIconStyle.LINES })
+        .iconSize(24)
         .iconColor(Color.White)
         .iconColor(Color.White)
         .onClick(async () => {
         .onClick(async () => {
           console.info(`cj2024 onClick ${this.imageBuffer}`)
           console.info(`cj2024 onClick ${this.imageBuffer}`)

@@ -156,7 +156,7 @@ export struct CommentIconComponent {
         // Stack({alignContent:Alignment.Start}) {
         // Stack({alignContent:Alignment.Start}) {
         if (Number.parseInt(this.publishCommentModel.totalCommentNumer) != 0) {
         if (Number.parseInt(this.publishCommentModel.totalCommentNumer) != 0) {
           RelativeContainer() {
           RelativeContainer() {
-            Image($r('app.media.comment_icon_number_bg'))
+            Image(this.styleType == 1 ? $r('app.media.comment_icon_number_bg'):$r('app.media.ic_like_back_Select'))
               .objectFit(ImageFit.Fill)
               .objectFit(ImageFit.Fill)
               .resizable({
               .resizable({
                 slice: {
                 slice: {

-import { Logger, NumberFormatterUtils } from 'wdKit/Index'
+import {  DisplayUtils,Logger, NumberFormatterUtils } from 'wdKit/Index'
 import { LikeViewModel } from '../../viewmodel/LikeViewModel'
 import { LikeViewModel } from '../../viewmodel/LikeViewModel'
 import { SPHelper } from 'wdKit';
 import { SPHelper } from 'wdKit';
 import { WDRouterPage, WDRouterRule } from 'wdRouter/Index';
 import { WDRouterPage, WDRouterRule } from 'wdRouter/Index';
 import { SpConstants } from 'wdConstant/Index';
 import { SpConstants } from 'wdConstant/Index';
 import { ContentDetailDTO } from 'wdBean/Index';
 import { ContentDetailDTO } from 'wdBean/Index';
-
+import measure from '@ohos.measure'
 
 
 const TAG = 'LikeComponent';
 const TAG = 'LikeComponent';
 
 
@@ -168,30 +168,74 @@ export struct LikeComponent {
   likeCompStyle5() {
   likeCompStyle5() {
     //1: 底部栏目样式  默认样式
     //1: 底部栏目样式  默认样式
     Stack({ alignContent: Alignment.Bottom }) {
     Stack({ alignContent: Alignment.Bottom }) {
-      Column() {
-        // Image(this.likeStatus ? $r('app.media.icon_like_select') : $r('app.media.icon_like_default'))
-        Image(this.transLikeStyle().url)
-          .width(24)
-          .height(24)
-          .onClick(() => {
-            this.clickButtonEvent()
+      Image(this.transLikeStyle().url)
+        .width(24)
+        .height(24)
+      if (this.likeCount > 0){
+      RelativeContainer() {
+        Image(this.likeStatus ? $r('app.media.ic_like_back_Select') : $r('app.media.ic_like_back'))
+          .objectFit(ImageFit.Fill)
+          .resizable({
+            slice: {
+              top: 1,
+              left: 20,
+              right: 1,
+              bottom: 1
+            }
           })
           })
-      }
+          .alignRules({
+            top: { anchor: "Text", align: VerticalAlign.Top },
+            left: { anchor: "Text", align: HorizontalAlign.Start },
+            right: { anchor: "Text", align: HorizontalAlign.End },
+            bottom: { anchor: "Text", align: VerticalAlign.Bottom },
+          })
+          .id("Image")
 
 
-      Row() {
-        Text(NumberFormatterUtils.formatNumberWithWan(this.likeCount || ''))
+        Text(NumberFormatterUtils.formatNumberWithWan(this.likeCount || ''))// Text("44444444")
           .fontSize(8)
           .fontSize(8)
-          .fontColor(Color.White)
-          .padding({ left: 4, right: 2 })
+          .fontColor('#ffffff')// .backgroundColor('#ED2800')
+          .height(12)
+          .textAlign(TextAlign.Center)
+          .alignRules({
+            top: { anchor: "__container__", align: VerticalAlign.Top },
+            left: { anchor: "__container__", align: HorizontalAlign.Start }
+          })/*动态计算文字宽度*/
+          .width(this.getMeasureText(NumberFormatterUtils.formatNumberWithWan(this.likeCount || '')) +
+            12)// .backgroundColor(Color.Green)
+          .id("Text")
+          .visibility(this.likeCount > 0 ? Visibility.Visible : Visibility.Hidden)
       }
       }
-      .height(12)
-      .alignItems(VerticalAlign.Center)
-      .position({ x: '100%', })
-      .markAnchor({ x: '100%' })
-      .backgroundImage(this.likeStatus ? $r('app.media.ic_like_back_Select') : $r('app.media.ic_like_back'))
-      .backgroundImageSize(ImageSize.Auto)
-      .visibility(this.likeCount > 0 ? Visibility.Visible : Visibility.Hidden)
-    }.width(24).height(24)
+      .offset({
+        x: 12
+      })
+    }
+
+      // Column() {
+      //   // Image(this.likeStatus ? $r('app.media.icon_like_select') : $r('app.media.icon_like_default'))
+      //   Image(this.transLikeStyle().url)
+      //     .width(24)
+      //     .height(24)
+      //     .onClick(() => {
+      //       this.clickButtonEvent()
+      //     })
+      // }
+      //
+      // Row() {
+      //   Text(NumberFormatterUtils.formatNumberWithWan(this.likeCount || ''))
+      //     .fontSize(8)
+      //     .fontColor(Color.White)
+      //     .padding({ left: 4, right: 2 })
+      // }
+      // .height(12)
+      // .alignItems(VerticalAlign.Center)
+      // .position({ x: '100%', })
+      // .markAnchor({ x: '100%' })
+      // .backgroundImage(this.likeStatus ? $r('app.media.ic_like_back_Select') : $r('app.media.ic_like_back'))
+      // .backgroundImageSize(ImageSize.Auto)
+      // .visibility(this.likeCount > 0 ? Visibility.Visible : Visibility.Hidden)
+    }.width(24).height(24).onClick(() => {
+      this.clickButtonEvent()
+    })
   }
   }
 
 
   @Builder
   @Builder
@@ -210,8 +254,6 @@ export struct LikeComponent {
       .height(36)
       .height(36)
       .borderRadius(18)
       .borderRadius(18)
       .backgroundColor((this.pageComponentType === 4 || this.pageComponentType === 2) ? '#4D000000' : '#FFF5F5F5')
       .backgroundColor((this.pageComponentType === 4 || this.pageComponentType === 2) ? '#4D000000' : '#FFF5F5F5')
-
-
       Row() {
       Row() {
         Text(NumberFormatterUtils.formatNumberWithWan(this.likeCount || ''))
         Text(NumberFormatterUtils.formatNumberWithWan(this.likeCount || ''))
           .fontSize(8)
           .fontSize(8)
@@ -306,4 +348,14 @@ export struct LikeComponent {
       this.likeCount = 0
       this.likeCount = 0
     })
     })
   }
   }
+  private getMeasureText(text: string) {
+    let width = measure.measureText({
+      textContent: text,
+      fontSize: 8,
+      lineHeight: 12,
+      constraintWidth: DisplayUtils.getDeviceWidth(),
+    })
+    width = px2vp(width)
+    return width
+  }
 }
 }