Merge remote-tracking branch 'origin/main'

@@ -372,7 +372,7 @@ export struct WdWebLocalComponent {
               type: SliderBlockType.IMAGE,
               type: SliderBlockType.IMAGE,
               image: $r('app.media.slider_block')
               image: $r('app.media.slider_block')
             })
             })
-            .blockSize({ width: 18, height: 12 })
+            .blockSize({ width: 14, height: 10 })
             .onChange((value: number, mode: SliderChangeMode) => {
             .onChange((value: number, mode: SliderChangeMode) => {
               this.controller.setCurrentTime(value);
               this.controller.setCurrentTime(value);
               if (mode == SliderChangeMode.End) {
               if (mode == SliderChangeMode.End) {

@@ -111,14 +111,13 @@ struct PeopleShipHomePage {
                       .width("100%")
                       .width("100%")
                       // .height(this.topHeight)
                       // .height(this.topHeight)
                     // 列表
                     // 列表
-                    PeopleShipHomeListComponent({
-                      publishCount: this.publishCount,
-                      creatorId: this.creatorId
-                    })
-                    // Column(){
-                    //
-                    //
-                    // }.height('100%')
+
+                    Column(){
+                      PeopleShipHomeListComponent({
+                        publishCount: this.publishCount,
+                        creatorId: this.creatorId
+                      })
+                    }.height('100%')
                   }
                   }
                   .width("100%")
                   .width("100%")
                   .justifyContent(FlexAlign.Start)
                   .justifyContent(FlexAlign.Start)

@@ -64,6 +64,8 @@ export struct DetailPlayLiveCommon {
 
 
   private AudioSuspension = new AudioSuspensionModel()
   private AudioSuspension = new AudioSuspensionModel()
   @State isShowAudioCom: boolean = false
   @State isShowAudioCom: boolean = false
+  ///是否已经执行过pageShow
+  hasPageShow: boolean = false
 
 
   build() {
   build() {
     Column() {
     Column() {
@@ -89,6 +91,10 @@ export struct DetailPlayLiveCommon {
    */
    */
   getContentDetail(): Promise<void> {
   getContentDetail(): Promise<void> {
     return new Promise<void>((resolve, reject) => {
     return new Promise<void>((resolve, reject) => {
+      if (this.hasPageShow) {
+        return
+      }
+      this.hasPageShow = true
       this.liveViewModel.getContentDetail(this.contentId, this.relId, this.relType)
       this.liveViewModel.getContentDetail(this.contentId, this.relId, this.relType)
         .then(async (data: Array<ContentDetailDTO>) => {
         .then(async (data: Array<ContentDetailDTO>) => {
           // console.log(TAG, '查询视频详情用于评论展示 getContentDetail:', JSON.stringify(data));
           // console.log(TAG, '查询视频详情用于评论展示 getContentDetail:', JSON.stringify(data));

@@ -132,7 +132,7 @@ export struct PlayUIComponent {
           //标题
           //标题
           Marquee({
           Marquee({
             start:true,
             start:true,
-            loop: 1,
+            loop: -1,
             src:this.contentDetailData.newsTitle
             src:this.contentDetailData.newsTitle
           })
           })
             .fontSize(this.displayDirection == DisplayDirection.VIDEO_HORIZONTAL ? '18vp' : '16vp')
             .fontSize(this.displayDirection == DisplayDirection.VIDEO_HORIZONTAL ? '18vp' : '16vp')

-import { ContentDetailDTO, LiveDetailsBean, LiveRoomDataBean, postBatchAttentionStatusParams, } from 'wdBean/Index'
+import { ContentDetailDTO, LiveDetailsBean, LiveRoomDataBean,
+  Params,
+  postBatchAttentionStatusParams, } from 'wdBean/Index'
 import { MultiPictureDetailViewModel } from 'wdComponent/src/main/ets/viewmodel/MultiPictureDetailViewModel'
 import { MultiPictureDetailViewModel } from 'wdComponent/src/main/ets/viewmodel/MultiPictureDetailViewModel'
 import { SpConstants } from 'wdConstant/Index'
 import { SpConstants } from 'wdConstant/Index'
 import { ContentDetailRequest, postInteractAccentionOperateParams } from 'wdDetailPlayApi/Index'
 import { ContentDetailRequest, postInteractAccentionOperateParams } from 'wdDetailPlayApi/Index'
@@ -173,6 +175,16 @@ export struct PlayerEndView {
             // .borderStyle(BorderStyle.Solid)
             // .borderStyle(BorderStyle.Solid)
             .position({ x: '50%', y: 0 })
             .position({ x: '50%', y: 0 })
             .markAnchor({ x: '50%', y: '50%' })
             .markAnchor({ x: '50%', y: '50%' })
+            .onClick(()=>{
+              // 跳转到号主页
+              if (this.contentDetailData.rmhInfo?.cnMainControl === 1) {
+                const params: Params = {
+                  creatorId: this.contentDetailData.rmhInfo.rmhId,
+                  pageID: ''
+                }
+                WDRouterRule.jumpWithPage(WDRouterPage.peopleShipHomePage, params)
+              }
+            })
         }
         }
       }
       }
       .width(307)
       .width(307)