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

* 'main' of http://192.168.1.42/developOne/harmonyPool:
  fix: 在热点频道下，进入横屏视频详情，点击分享按钮后，再取消分享，视频不能续播
  fix |> 20575 人民号推荐列表中，对推荐内容中、可以抢首评的视频稿件，不能发表评论

@@ -146,6 +146,7 @@ export struct CommentTabComponent {
       this.publishCommentModel.rootCommentId = '-1';
       this.publishCommentModel.rootCommentId = '-1';
       this.publishCommentModel.parentId = '-1';
       this.publishCommentModel.parentId = '-1';
       this.publishCommentModel.placeHolderText = "说两句..."
       this.publishCommentModel.placeHolderText = "说两句..."
+      this.publishCommentModel.visitorComment = String(this.contentDetail?.visitorComment || '')
       if (this.contentDetail.bestNoticer === 1) {
       if (this.contentDetail.bestNoticer === 1) {
         this.publishCommentModel.placeHolderText = "优质评论会获得最佳评论人的称号"
         this.publishCommentModel.placeHolderText = "优质评论会获得最佳评论人的称号"
       }
       }

@@ -35,10 +35,12 @@ export struct PlayerFullScreenView {
 
 
   share() {
   share() {
     this.playerController?.switchPlayOrPause()
     this.playerController?.switchPlayOrPause()
-    WDShare.shareContent(this.contentDetailData)
-    // WDShare.shareContent(this.contentDetailData).then(() => {
-    //   this.playerController?.switchPlayOrPause()
-    // })
+    WDShare.shareContent(this.contentDetailData).then((res) => {
+      // console.log(TAG, "分享弹框关闭", res);
+      if(res == 'dismiss') {
+        this.playerController?.switchPlayOrPause()
+      }
+    })
   }
   }
 
 
   updateProgress() {
   updateProgress() {

@@ -9,22 +9,28 @@ import { AppInnerLinkGenerator } from 'wdRouter';
 
 
 export class WDShare {
 export class WDShare {
 
 
-  static shareContent(content: ContentDetailDTO, pageName: string ="", pageId: string = "") {
-
-    //TODO: 处理分享弹框交互和 海报逻辑
-
-    WDShareBase.getInstance().share({
-      to: ShareType.System,
-      scene: ShareScene.System,
-      type: ShareContentType.Link,
-      obj: {
-        title: content.shareInfo.shareTitle,
-        desc: content.shareInfo.shareSummary,
-        link: content.shareInfo.shareUrl,
-        deeplink:AppInnerLinkGenerator.generateDeepLinkWithConent(content),
-        posterImg:$r("app.media.test_share_poster"),
-      }
-    })
+  static shareContent(content: ContentDetailDTO, pageName: string = "", pageId: string = ""): Promise<string> {
+    return new Promise((resolve, reject) => {
+      // 处理分享弹框交互和海报逻辑
+      WDShareBase.getInstance().share({
+        to: ShareType.System,
+        scene: ShareScene.System,
+        type: ShareContentType.Link,
+        obj: {
+          title: content.shareInfo.shareTitle,
+          desc: content.shareInfo.shareSummary,
+          link: content.shareInfo.shareUrl,
+          deeplink: AppInnerLinkGenerator.generateDeepLinkWithConent(content),
+          posterImg: $r("app.media.test_share_poster"),
+        }
+      })?.then((res) => {
+        // console.log("分享成功", res);
+        resolve(res);
+      }).catch((() => {
+        // console.error("分享失败");
+        reject("error");
+      }))
+    });
   }
   }
 
 
   static shareProgram(program: ContentDTO, pageName: string ="", pageId: string = "") {
   static shareProgram(program: ContentDTO, pageName: string ="", pageId: string = "") {