Merge remote-tracking branch 'origin/main'

@@ -9,6 +9,8 @@ import {
 } from 'wdBean';
 } from 'wdBean';
 import { LiveModel } from '../../viewmodel/LiveModel';
 import { LiveModel } from '../../viewmodel/LiveModel';
 import { HttpUtils } from 'wdNetwork/Index';
 import { HttpUtils } from 'wdNetwork/Index';
+import vibrator from '@ohos.vibrator';
+import { BusinessError } from '@ohos.base';
 
 
 const TAG = 'LiveLikeComponent';
 const TAG = 'LiveLikeComponent';
 
 
@@ -106,38 +108,63 @@ export struct LiveLikeComponent {
 
 
   @Builder
   @Builder
   likeCompStyle() {
   likeCompStyle() {
-    Stack({ alignContent: Alignment.Bottom }) {
+    Stack({ alignContent: Alignment.TopEnd }) {
       Column() {
       Column() {
         Image(this.transLikeStyle().url)
         Image(this.transLikeStyle().url)
           .width(24)
           .width(24)
           .height(24)
           .height(24)
-          .onClick(() => {
-            this.clickButtonEvent()
-          })
       }
       }
       .justifyContent(FlexAlign.Center)
       .justifyContent(FlexAlign.Center)
       .width(36)
       .width(36)
       .height(36)
       .height(36)
       .borderRadius(18)
       .borderRadius(18)
       .backgroundColor((this.pageComponentType === 4 || this.pageComponentType === 2) ? '#4D000000' : this.pageComponentType === 8 ? Color.Transparent : '#FFF5F5F5')
       .backgroundColor((this.pageComponentType === 4 || this.pageComponentType === 2) ? '#4D000000' : this.pageComponentType === 8 ? Color.Transparent : '#FFF5F5F5')
-      Row() {
-        Text(NumberFormatterUtils.formatNumberWithWan(this.likeCount || ''))
-          .fontSize(8)
-          .fontColor(Color.White)
-          .padding({ left: 8, right: 2 })
+      if (this.likeCount != 0) {
+        RelativeContainer() {
+          Image(this.styleType == 1 ? $r('app.media.comment_icon_number_bg') : $r('app.media.ic_like_back_Select'))
+            .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")
+
+          Text(NumberFormatterUtils.formatNumberWithWan(this.likeCount || ''))// Text("44444444")
+            .fontSize(8)
+            .fontColor('#ffffff')// .backgroundColor('#ED2800')
+            .height(12)
+            .textAlign(TextAlign.Center)
+            .alignRules({
+              top: { anchor: "__container__", align: VerticalAlign.Top },
+              left: { anchor: "__container__", align: HorizontalAlign.Start }
+            })// .margin({left: 4,right:4
+              // })
+              /*动态计算文字宽度*/
+            .width(this.getMeasureText(NumberFormatterUtils.formatNumberWithWan(this.likeCount || '')) +
+              12)// .backgroundColor(Color.Green)
+            .id("Text")
+            .visibility(this.likeCount > 0 ? Visibility.Visible : Visibility.Hidden)
+        }
+        .offset({
+          x: 18
+        })
       }
       }
-      .height(12)
-      .alignItems(VerticalAlign.Center)
-      .position({ x: '100%', y: 10 })
-      .markAnchor({ x: '100%' })
-      .backgroundImage($r('app.media.ic_like_back'))
-      .backgroundImageSize({height: 13})
-      .width(this.getMeasureText(NumberFormatterUtils.formatNumberWithWan(this.likeCount || '')) +
-        12)
-      .visibility(this.likeCount > 0 ? Visibility.Visible : Visibility.Hidden)
     }
     }
     .width(36)
     .width(36)
-    .height(42)
+    .height(36)
+    .onClick(() => {
+      this.clickButtonEvent()
+    })
     .visibility(this.likesStyle == 'empty' || !this.openLikes ? Visibility.None : Visibility.Visible)
     .visibility(this.likesStyle == 'empty' || !this.openLikes ? Visibility.None : Visibility.Visible)
 
 
   }
   }
@@ -164,6 +191,25 @@ export struct LiveLikeComponent {
     this.LiveModel.getLiveRoomNumberLike(this.likeBean['contentId'], 1, HttpUtils.getDeviceId()).then((data) => {
     this.LiveModel.getLiveRoomNumberLike(this.likeBean['contentId'], 1, HttpUtils.getDeviceId()).then((data) => {
 
 
       console.log(TAG, '点赞接口调用成功', JSON.stringify(data))
       console.log(TAG, '点赞接口调用成功', JSON.stringify(data))
+      try {
+        // 触发马达振动
+        vibrator.startVibration({
+          type: 'time',
+          duration: 100,
+        }, {
+          id: 0,
+          usage: 'alarm'
+        }, (error: BusinessError) => {
+          if (error) {
+            console.error(`Failed to start vibration. Code: ${error.code}, message: ${error.message}`);
+            return;
+          }
+          console.info('Succeed in starting vibration');
+        });
+      } catch (err) {
+        let e: BusinessError = err as BusinessError;
+        console.error(`An unexpected error occurred. Code: ${e.code}, message: ${e.message}`);
+      }
       this.likeCount++
       this.likeCount++
 
 
     }).catch(() => {
     }).catch(() => {

@@ -12,6 +12,9 @@
     "requestPermissions": [
     "requestPermissions": [
       {
       {
         "name": "ohos.permission.INTERNET"
         "name": "ohos.permission.INTERNET"
+      },
+      {
+        "name": "ohos.permission.VIBRATE"
       }
       }
     ],
     ],
     "pages": "$profile:main_pages"
     "pages": "$profile:main_pages"