Merge remote-tracking branch 'origin/main'

@@ -12,4 +12,5 @@ export interface commentInfo {
   relType: string;
   newsType?: string,
   objectType?: string,
+  userType?: number
 }
\ No newline at end of file

@@ -186,8 +186,11 @@ export struct ZhSingleRow06 {
           this.loadImg
             ? item.operDataList[0]?.commentInfo?.userHeaderUrl
               ? item.operDataList[0].commentInfo.userHeaderUrl
-              : $r('app.media.icon_default_head_mater')
+              : commentViewModel.adjustUserType(item.operDataList[0].commentInfo?.userType)
+                ? $r('app.media.WDAccountOwnerHedaerDefaultIcon')
+                : $r('app.media.WDAccountDefaultIcon')
             : $r('app.media.icon_default_head_mater'))
+
           .width(32)
           .height(32)
           .borderRadius(16)

@@ -26,6 +26,7 @@ export default struct MinePageUserSimpleInfoUI {
     }else{
       this.headPhotoUrl = ""
       this.levelHead = ""
+      this.userType = "1"
     }
   }
 
@@ -33,12 +34,20 @@ export default struct MinePageUserSimpleInfoUI {
     Row(){
       //头像
       Stack(){
-        Image(this.headPhotoUrl)
-          .alt(this.userType === '1'?$r('app.media.default_head'):$r('app.media.AccountOwner_DefaultIcon'))
-          .width(`${this.calcHeight(100)}lpx`)
-          .height(`${this.calcHeight(100)}lpx`)
-          .objectFit(ImageFit.Cover)
-          .borderRadius(50)
+        if (this.headPhotoUrl.length > 0){
+          Image(this.headPhotoUrl)
+            .alt(this.userType === "1"?$r('app.media.default_head'):$r('app.media.AccountOwner_DefaultIcon'))
+            .width(`${this.calcHeight(100)}lpx`)
+            .height(`${this.calcHeight(100)}lpx`)
+            .objectFit(ImageFit.Cover)
+            .borderRadius(50)
+        }else {
+          Image(this.userType === "1"?$r('app.media.default_head'):$r('app.media.AccountOwner_DefaultIcon'))
+            .width(`${this.calcHeight(100)}lpx`)
+            .height(`${this.calcHeight(100)}lpx`)
+            .objectFit(ImageFit.Cover)
+            .borderRadius(50)
+        }
 
         if(StringUtils.isNotEmpty(this.levelHead)){
           Image(this.levelHead)

@@ -16,6 +16,7 @@
     "wdConstant": "file:../../commons/wdConstant",
     "wdDetailPlayApi": "file:../../features/wdDetailPlayApi",
     "wdRouter": "file:../../commons/wdRouter",
-    "wdTracking": "file:../../features/wdTracking"
+    "wdTracking": "file:../../features/wdTracking",
+    "wdShare": "file:../../features/wdShare"
   }
 }

@@ -6,6 +6,7 @@ import { DateFormatUtil, PlayerConstants, WDAliPlayerController } from 'wdPlayer
 import { ContentDetailDTO, LiveRoomDataBean } from 'wdBean/Index';
 import { DisplayDirection } from 'wdConstant/Index';
 import { LiveFollowComponent, LottieView } from 'wdComponent/Index';
+import { WDShare } from 'wdShare/Index';
 //直播间播放器上层覆盖物
 @Component
 export struct PlayUIComponent {
@@ -123,6 +124,9 @@ export struct PlayUIComponent {
           .width(24)
           .aspectRatio(1)
           .visibility(this.displayDirection == DisplayDirection.VIDEO_HORIZONTAL ? Visibility.Visible : Visibility.None)
+          .onClick(() => {
+            WDShare.shareContent(this.contentDetailData)
+          })
       }
       .width('100%')
       .alignItems(VerticalAlign.Center)

@@ -5,6 +5,7 @@ import { NumberFormatterUtils, WindowModel } from 'wdKit/Index'
 import { window } from '@kit.ArkUI'
 import { WDAliPlayerController } from 'wdPlayer/Index'
 import { DisplayDirection } from 'wdConstant/Index'
+import { WDShare } from 'wdShare/Index'
 
 /**
  *  沉浸式直播--- 头部标题
@@ -76,6 +77,9 @@ export struct PlayerTitleComponent {
           .aspectRatio(1)
           .visibility((this.isLarge && this.displayDirection == DisplayDirection.VIDEO_HORIZONTAL)  ? Visibility.Visible : Visibility.None)
           .margin({right:16})
+          .onClick(() => {
+            WDShare.shareContent(this.contentDetailData)
+          })
       }.margin({ bottom: 10 })
 
       Row() {

@@ -7,7 +7,7 @@
   "main": "",
   "version": "1.0.0",
   "dependencies": {
-    "@ohos/lottie": "2.0.10",
+    "@ohos/lottie": "v2.0.11-rc.6",
     "wdComponent": "file:../../features/wdComponent",
     "wdConstant": "file:../../commons/wdConstant",
     "wdKit": "file:../../commons/wdKit",