视频接入评论

@@ -11,11 +11,12 @@ export struct CommentTabComponent {
   }
   }
   @ObjectLink publishCommentModel: publishCommentModel
   @ObjectLink publishCommentModel: publishCommentModel
   @Prop contentDetail: ContentDetailDTO
   @Prop contentDetail: ContentDetailDTO
+  @Prop pageComponentType: number = -1 //1:视频详情页
   /*展示类型*/
   /*展示类型*/
   @State type: number = 1
   @State type: number = 1
   @State placeHolder: string = '说两句...'
   @State placeHolder: string = '说两句...'
   @State dialogController: CustomDialogController | null = null;
   @State dialogController: CustomDialogController | null = null;
-  styleType : number = 1   //1: 白色背景（图文底部栏）    2: 黑色背景（图集底部栏）
+  styleType: number = 1 //1: 白色背景（图文底部栏）    2: 黑色背景（图集底部栏）
   /*回调方法*/
   /*回调方法*/
   dialogControllerConfirm: () => void = () => {
   dialogControllerConfirm: () => void = () => {
   }
   }
@@ -46,16 +47,44 @@ export struct CommentTabComponent {
     Row() {
     Row() {
       Stack({ alignContent: Alignment.Start }) {
       Stack({ alignContent: Alignment.Start }) {
         RelativeContainer() {
         RelativeContainer() {
-          Image($r('app.media.comment_img_input_hui'))
-            .objectFit(ImageFit.Fill)
-            .resizable({ slice: { top: 1, left: 1, right: 20, bottom: 1 } })
+
+          if (this.pageComponentType === 1) {
+            Row() {
+
+            }
+            .width('100%')
+            .height(30)
+            .borderRadius(2)
+            .backgroundColor(this.pageComponentType === 1 ? '#1a1a1a' : Color.Transparent)
+            .margin({
+              right: 16,
+            })
             .alignRules({
             .alignRules({
               top: { anchor: "__container__", align: VerticalAlign.Top },
               top: { anchor: "__container__", align: VerticalAlign.Top },
               left: { anchor: "__container__", align: HorizontalAlign.Start },
               left: { anchor: "__container__", align: HorizontalAlign.Start },
               right: { anchor: "__container__", align: HorizontalAlign.End },
               right: { anchor: "__container__", align: HorizontalAlign.End },
               bottom: { anchor: "__container__", align: VerticalAlign.Bottom },
               bottom: { anchor: "__container__", align: VerticalAlign.Bottom },
             })
             })
-            .id("Image")
+            .id("RowBg")
+          } else {
+            Image($r('app.media.comment_img_input_hui'))
+              .objectFit(ImageFit.Fill)
+              .resizable({
+                slice: {
+                  top: 1,
+                  left: 1,
+                  right: 20,
+                  bottom: 1
+                }
+              })
+              .alignRules({
+                top: { anchor: "__container__", align: VerticalAlign.Top },
+                left: { anchor: "__container__", align: HorizontalAlign.Start },
+                right: { anchor: "__container__", align: HorizontalAlign.End },
+                bottom: { anchor: "__container__", align: VerticalAlign.Bottom },
+              })
+              .id("Image")
+          }
           Text(this.placeHolder)
           Text(this.placeHolder)
             .fontSize(12)
             .fontSize(12)
             .fontColor('#999999')
             .fontColor('#999999')
@@ -91,7 +120,7 @@ export struct CommentIconComponent {
   @ObjectLink publishCommentModel: publishCommentModel
   @ObjectLink publishCommentModel: publishCommentModel
   /*展示类型*/
   /*展示类型*/
   @State type: number = 1
   @State type: number = 1
-  styleType : number = 1   //1: 白色背景（图文底部栏）    2: 黑色背景（图集底部栏）
+  styleType: number = 1 //1: 白色背景（图文底部栏）    2: 黑色背景（图集底部栏）
   // aboutToAppear(): void {
   // aboutToAppear(): void {
   //   setTimeout(() => {
   //   setTimeout(() => {
   //     this.publishCommentModel.totalCommentNumer = '444'
   //     this.publishCommentModel.totalCommentNumer = '444'

@@ -21,6 +21,7 @@ const TAG = 'PageComponent';
 export struct PageComponent {
 export struct PageComponent {
   @State private pageModel: PageModel = new PageModel();
   @State private pageModel: PageModel = new PageModel();
   @State private pageAdvModel: PageAdModel = new PageAdModel();
   @State private pageAdvModel: PageAdModel = new PageAdModel();
+  @State timer: number = -1
   navIndex: number = 0;
   navIndex: number = 0;
   pageId: string = "";
   pageId: string = "";
   channelId: string = "";
   channelId: string = "";
@@ -29,6 +30,7 @@ export struct PageComponent {
   @Prop @Watch('onAutoRefresh') autoRefresh: number = 0
   @Prop @Watch('onAutoRefresh') autoRefresh: number = 0
   private listScroller: Scroller = new Scroller();
   private listScroller: Scroller = new Scroller();
   needload: boolean = true;
   needload: boolean = true;
+
   build() {
   build() {
     Column() {
     Column() {
       if (this.pageModel.viewType == ViewType.LOADING) {
       if (this.pageModel.viewType == ViewType.LOADING) {
@@ -222,9 +224,10 @@ export struct PageComponent {
   }
   }
 
 
   onChange() {
   onChange() {
-    Logger.info(TAG, `onChangezz id: ${this.pageId} , ${this.channelId} , ${this.navIndex} , navIndex: ${this.currentTopNavSelectedIndex}`);
+    Logger.info(TAG,
+      `onChangezz id: ${this.pageId} , ${this.channelId} , ${this.navIndex} , navIndex: ${this.currentTopNavSelectedIndex}`);
     if (this.navIndex === this.currentTopNavSelectedIndex) {
     if (this.navIndex === this.currentTopNavSelectedIndex) {
-      if(this.needload){
+      if (this.needload) {
         this.getData();
         this.getData();
       }
       }
       this.needload = false;
       this.needload = false;
@@ -242,13 +245,19 @@ export struct PageComponent {
   }
   }
 
 
   async getData() {
   async getData() {
-    Logger.info(TAG, `getData id: ${this.pageId} , ${this.channelId} , navIndex: ${this.currentTopNavSelectedIndex}`);
-    this.pageModel.pageId = this.pageId;
-    this.pageModel.groupId = this.pageId;
-    this.pageModel.channelId = this.channelId;
-    this.pageModel.currentPage = 1;
-    this.pageModel.pageTotalCompSize = 0;
-    PageHelper.getInitData(this.pageModel, this.pageAdvModel)
+    if (this.timer) {
+      clearTimeout(this.timer)
+    }
+    this.timer = setTimeout(() => {
+      Logger.info(TAG, `getData id: ${this.pageId} , ${this.channelId} , navIndex: ${this.currentTopNavSelectedIndex}`);
+      this.pageModel.pageId = this.pageId;
+      this.pageModel.groupId = this.pageId;
+      this.pageModel.channelId = this.channelId;
+      this.pageModel.currentPage = 1;
+      this.pageModel.pageTotalCompSize = 0;
+      PageHelper.getInitData(this.pageModel, this.pageAdvModel)
+    }, 100)
+
   }
   }
 }
 }
 
 

@@ -22,7 +22,7 @@ export struct LikeComponent {
   @Prop data: Record<string, string>
   @Prop data: Record<string, string>
   enableBtn = true
   enableBtn = true
   componentType: number = 1 //1: 底部栏目样式    2: 新闻页中间位置样式  3:动态Tab内容下的互动入口
   componentType: number = 1 //1: 底部栏目样式    2: 新闻页中间位置样式  3:动态Tab内容下的互动入口
-  styleType: number = 1 //1: 白色背景（图文底部栏）    2: 黑色背景（图集底部栏）
+  styleType: number = 1 //1: 白色背景（图文底部栏）    2: 黑色背景（图集底部栏） 3 透明背景
   @State likeCount: number = 0 //点赞数
   @State likeCount: number = 0 //点赞数
 
 
   //上层传值  样例
   //上层传值  样例

@@ -59,6 +59,7 @@ export struct OperRowListView {
    * 7：图集详情页
    * 7：图集详情页
    */
    */
   @Prop componentType: number = 1 //1: 底部栏目样式    2: 新闻页中间位置样式  3:动态Tab内容下的互动入口
   @Prop componentType: number = 1 //1: 底部栏目样式    2: 新闻页中间位置样式  3:动态Tab内容下的互动入口
+  @Prop pageComponentType: number = -1 //1:视频详情页
   @State likesStyle: number = this.contentDetailData.likesStyle // 赞样式 1红心(点赞) 2大拇指(祈福) 3蜡烛(默哀) 4置空
   @State likesStyle: number = this.contentDetailData.likesStyle // 赞样式 1红心(点赞) 2大拇指(祈福) 3蜡烛(默哀) 4置空
   @State operationButtonList: string[] = ['comment', 'collect', 'share'] // 组件展示条件
   @State operationButtonList: string[] = ['comment', 'collect', 'share'] // 组件展示条件
   @State needLike: boolean = true
   @State needLike: boolean = true
@@ -115,6 +116,8 @@ export struct OperRowListView {
   }
   }
 
 
   build() {
   build() {
+    // 视频详情页
+
     Flex({ justifyContent: FlexAlign.SpaceBetween, alignItems: ItemAlign.Center }) {
     Flex({ justifyContent: FlexAlign.SpaceBetween, alignItems: ItemAlign.Center }) {
       // AudioDialog()
       // AudioDialog()
       Row() {
       Row() {
@@ -162,6 +165,7 @@ export struct OperRowListView {
       bottom: `${this.bottomSafeHeight}px`
       bottom: `${this.bottomSafeHeight}px`
       // bottom: 50
       // bottom: 50
     })
     })
+
   }
   }
 
 
   /**
   /**
@@ -174,12 +178,16 @@ export struct OperRowListView {
         CommentTabComponent({
         CommentTabComponent({
           publishCommentModel: this.publishCommentModel,
           publishCommentModel: this.publishCommentModel,
           contentDetail: this.contentDetailData,
           contentDetail: this.contentDetailData,
-          onCommentFocus: this.onCommentFocus
+          onCommentFocus: this.onCommentFocus,
+          pageComponentType: this.pageComponentType
         })
         })
       }
       }
     }
     }
-    .flexShrink(1)
-
+    .layoutWeight(1)
+    .margin({
+      right: this.pageComponentType === 1 ? 16 : 0,
+    })
+ 
     if (this.showCommentIcon) {
     if (this.showCommentIcon) {
       Column() {
       Column() {
         if (this.publishCommentModel?.targetId) {
         if (this.publishCommentModel?.targetId) {

@@ -28,11 +28,11 @@ export struct TopPlayComponent {
 
 
   updateData() {
   updateData() {
     //直播新闻-直播状态  wait待开播running直播中end已结束cancel已取消paused暂停
     //直播新闻-直播状态  wait待开播running直播中end已结束cancel已取消paused暂停
-    if (this.liveDetailsBean.liveInfo && this.liveDetailsBean.liveInfo.previewUrl  && this.liveDetailsBean.liveInfo.previewUrl.length > 0) {
+    if (this.liveDetailsBean.liveInfo && this.liveDetailsBean.liveInfo.previewUrl &&
+      this.liveDetailsBean.liveInfo.previewUrl.length > 0) {
       this.imgUrl = this.liveDetailsBean.liveInfo.previewUrl
       this.imgUrl = this.liveDetailsBean.liveInfo.previewUrl
       Logger.debug(TAG, 'ok+' + `${this.imgUrl}`)
       Logger.debug(TAG, 'ok+' + `${this.imgUrl}`)
-    }
-    else if (this.liveDetailsBean.fullColumnImgUrls && this.liveDetailsBean.fullColumnImgUrls.length > 0) {
+    } else if (this.liveDetailsBean.fullColumnImgUrls && this.liveDetailsBean.fullColumnImgUrls.length > 0) {
       this.imgUrl = this.liveDetailsBean.fullColumnImgUrls[0].url
       this.imgUrl = this.liveDetailsBean.fullColumnImgUrls[0].url
       Logger.debug(TAG, 'ok-' + `${this.imgUrl}`)
       Logger.debug(TAG, 'ok-' + `${this.imgUrl}`)
     }
     }
@@ -81,6 +81,7 @@ export struct TopPlayComponent {
     .alignSelf(ItemAlign.Center)
     .alignSelf(ItemAlign.Center)
   }
   }
 
 
-  aboutToDisappear(): void {
+  async aboutToDisappear(): Promise<void> {
+    await this.playerController?.release()
   }
   }
 }
 }

@@ -115,6 +115,7 @@ export struct PlayerCommentComponent {
       // 收藏、分享、点赞是否需要根据字段显隐
       // 收藏、分享、点赞是否需要根据字段显隐
       OperRowListView({
       OperRowListView({
         styleType: 3,
         styleType: 3,
+        componentType: 4,
         operationButtonList: ['comment', 'collect', 'share', 'like'],
         operationButtonList: ['comment', 'collect', 'share', 'like'],
         contentDetailData: this.contentDetailData,
         contentDetailData: this.contentDetailData,
         publishCommentModel: this.publishCommentModel,
         publishCommentModel: this.publishCommentModel,

@@ -37,11 +37,10 @@ export struct PlayerComponent {
     }
     }
   }
   }
 
 
-  aboutToDisappear(): void {
-     
+  async aboutToDisappear(): Promise<void> {
     this.playerController?.pause()
     this.playerController?.pause()
     this.playerController?.stop()
     this.playerController?.stop()
-    this.playerController?.release()
+    await this.playerController?.release()
   }
   }
 
 
   updateData() {
   updateData() {

@@ -3,20 +3,56 @@ import { PlayerTitleView } from './PlayerTitleView'
 import { PlayerProgressView } from './PlayerProgressView'
 import { PlayerProgressView } from './PlayerProgressView'
 import { PlayerCommentView } from './PlayerCommentView'
 import { PlayerCommentView } from './PlayerCommentView'
 import { PlayerTimeSeekView } from './PlayerTimeSeekView'
 import { PlayerTimeSeekView } from './PlayerTimeSeekView'
+import { OperRowListView } from '../../../../../wdComponent/src/main/ets/components/view/OperRowListView'
+import {
+  publishCommentModel
+} from '../../../../../wdComponent/src/main/ets/components/comment/model/PublishCommentModel'
+import { ContentDetailDTO } from 'wdBean/Index';
+import { WindowModel } from 'wdKit/Index';
 
 
 @Component
 @Component
 export struct PlayerBottomView {
 export struct PlayerBottomView {
   private playerController?: WDPlayerController;
   private playerController?: WDPlayerController;
+  @Consume bottomSafeHeight: number
   @Consume showComment?: boolean
   @Consume showComment?: boolean
   @Consume isOpenDetail?: boolean
   @Consume isOpenDetail?: boolean
   @Consume isDragging?: boolean
   @Consume isDragging?: boolean
+  @Consume contentDetailData: ContentDetailDTO
+  @State publishCommentModel: publishCommentModel = new publishCommentModel()
+
+  aboutToAppear(): void {
+    this.publishCommentModel.targetId = String(this.contentDetailData?.newsId || '')
+    this.publishCommentModel.targetRelId = String(this.contentDetailData?.reLInfo?.relId)
+    this.publishCommentModel.targetTitle = this.contentDetailData?.newsTitle
+    this.publishCommentModel.targetRelType = String(this.contentDetailData?.reLInfo?.relType)
+    this.publishCommentModel.targetRelObjectId = String(this.contentDetailData?.reLInfo?.relObjectId)
+    this.publishCommentModel.keyArticle = String(this.contentDetailData?.keyArticle)
+    this.publishCommentModel.targetType = String(this.contentDetailData?.newsType)
+    this.publishCommentModel.commentContent = ''
+  }
 
 
   build() {
   build() {
     Column() {
     Column() {
       PlayerTitleView()
       PlayerTitleView()
       PlayerProgressView({ playerController: this.playerController })
       PlayerProgressView({ playerController: this.playerController })
       if (this.showComment) {
       if (this.showComment) {
-        PlayerCommentView()
+        // PlayerCommentView()
+        OperRowListView({
+          pageComponentType: 1,
+          styleType: 3,
+          componentType: 4,
+          operationButtonList: ['comment',],
+          contentDetailData: this.contentDetailData,
+          publishCommentModel: this.publishCommentModel,
+          showCommentIcon: false,
+          onBack: () => {
+            WindowModel.shared.setWindowLayoutFullScreen(false)
+            WindowModel.shared.setWindowSystemBarProperties({ statusBarContentColor: '#000000', })
+          }
+        })
+          .padding({
+            bottom: -this.bottomSafeHeight + 'px'
+          })
       }
       }
     }
     }
     .alignItems(HorizontalAlign.Start)
     .alignItems(HorizontalAlign.Start)

@@ -5,6 +5,10 @@
       "value": "#FFFFFF"
       "value": "#FFFFFF"
     },
     },
     {
     {
+      "name": "color_transparent",
+      "value": "#00000000"
+    },
+    {
       "name": "play_track_color",
       "name": "play_track_color",
       "value": "#1AFFFFFF"
       "value": "#1AFFFFFF"
     },
     },

@@ -3,6 +3,18 @@
     {
     {
       "name": "shared_desc",
       "name": "shared_desc",
       "value": "description"
       "value": "description"
+    },
+    {
+      "name": "pull_up_load_text",
+      "value": "加载中..."
+    },
+    {
+      "name": "pull_down_refresh_text",
+      "value": "下拉刷新"
+    },
+    {
+      "name": "release_refresh_text",
+      "value": "松开刷新"
     }
     }
   ]
   ]
 }
 }