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

@@ -219,42 +219,44 @@ export struct ZhSingleRow03 {
 
   @Builder
   ItemCard(item: ContentDTO) {
-    Column() {
-      Row() {
-        Image(this.loadImg ? item.coverUrl : '')
-          .width(106)
-          .height(60)
-          .margin({right: 12})
-          .backgroundColor(0xf5f5f5)
-
-        Text(item.newsTitle)
-          .width(154)
-          .height(60)
-          .maxLines(3)
-          .textOverflow({overflow: TextOverflow.Ellipsis})
-      }
-      .margin({bottom: 16})
+    if (this.compDTO.operDataList.length >= 2) {
+      Column() {
+        Row() {
+          Image(this.loadImg ? item.coverUrl : '')
+            .width(106)
+            .height(60)
+            .margin({right: 12})
+            .backgroundColor(0xf5f5f5)
+            .margin({right: 12})
 
-      Row() {
-        Flex({justifyContent: FlexAlign.SpaceBetween}){
-          Row() {
-            Text(this.format(new Date(item.liveInfo.liveStartTime).getTime()))
-              .margin({right: 6})
-              .fontColor(0x000000)
-              .fontSize(13)
-              .textAlign(TextAlign.Start)
-            Image($r('app.media.timeline_rect'))
-              .width(4)
-              .height(3)
-              .margin({right: 6})
-            Text(item.liveInfo.liveStartTime.split(' ')[1].slice(0, 5))
-              .margin({right: 6})
-              .fontColor(0x000000)
-              .fontSize(13)
-            Text('开始直播')
-              .fontColor(0xC8C8C8)
-              .fontSize(13)
-          }
+          Text(item.newsTitle)
+            .width(154)
+            .height(60)
+            .maxLines(3)
+            .textOverflow({overflow: TextOverflow.Ellipsis})
+        }
+        .margin({bottom: 16})
+
+        Row() {
+          Flex({justifyContent: FlexAlign.SpaceBetween}){
+            Row() {
+              Text(this.format(new Date(item.liveInfo.liveStartTime).getTime()))
+                .margin({right: 6})
+                .fontColor(0x000000)
+                .fontSize(13)
+                .textAlign(TextAlign.Start)
+              Image($r('app.media.timeline_rect'))
+                .width(4)
+                .height(3)
+                .margin({right: 6})
+              Text(item.liveInfo.liveStartTime.split(' ')[1].slice(0, 5))
+                .margin({right: 6})
+                .fontColor(0x000000)
+                .fontSize(13)
+              Text('开始直播')
+                .fontColor(0xC8C8C8)
+                .fontSize(13)
+            }
 
           Row() {
             Text(this.isReserved(Number(item.objectId)) ? '已预约' : '预约')
@@ -266,44 +268,92 @@ export struct ZhSingleRow03 {
               .textAlign(TextAlign.Center)
               .borderRadius(3)
               .onClick(() => {
-                const isSubscribe = !this.isReserved(Number(item.objectId))
-
-                // 直播预约埋点
-                const params: ParamType = {
-                  'contentName': item.newsTitle,
-                  'contentType': item.objectType,
-                  "liveStreamType": item?.liveInfo.vrType === 0 ? 1 : 2,
-                  "vliveId": item.objectId,
-                  "vliveName": item.newsTitle,
-                  "contentId": item.objectId,
-                  "compId": item.relId,
-                  "contentStyle": item.appStyle,
-                  "liveType": getLiveState(item),
-                  'contentShowChannelId': item.channelId,
-                  'linkUrl': item.linkUrl,
-                  "pageId": this.pageId,
-                  "pageName": '直播',
-                }
-                Logger.info(TAG, `直播预约埋点: ${JSON.stringify(params)}`);
-                Tracking.event(isSubscribe? "live_subscribe_click": "cancel_live_subscribe_click", params)
-                this.bookAndCancel(item.relId, item.objectId, isSubscribe)
+                this.bookAndCancel(item.relId, item.objectId, !this.isReserved(Number(item.objectId)))
               })
 
+            }
+            .margin({top: -5})
           }
-          .margin({top: -5})
+
+        }
+      }
+      .width(298)
+      .height(116)
+      .padding({top: 12, bottom: 12, left: 12, right: 12})
+      .backgroundColor(0xf9f9f9)
+      .margin({right: 8})
+      .onClick(() => {
+        InfomationCardClick.track(this.compDTO, item, this.pageId, this.pageName)
+        ProcessUtils.processPage(item)
+      })
+    } else {
+      Column() {
+        Row() {
+          Image(this.loadImg ? item.coverUrl : '')
+            .width(106)
+            .height(60)
+            .backgroundColor(0xf5f5f5)
+            .margin({right: 12})
+
+          Text(item.newsTitle)
+            .width(201)
+            .height(60)
+            .maxLines(3)
+            .textOverflow({overflow: TextOverflow.Ellipsis})
         }
+        .margin({bottom: 16})
+        .justifyContent(FlexAlign.Start)
 
+        Row() {
+          Flex({justifyContent: FlexAlign.SpaceBetween}){
+            Row() {
+              Text(this.format(new Date(item.liveInfo.liveStartTime).getTime()))
+                .margin({right: 6})
+                .fontColor(0x000000)
+                .fontSize(13)
+                .textAlign(TextAlign.Start)
+              Image($r('app.media.timeline_rect'))
+                .width(4)
+                .height(3)
+                .margin({right: 6})
+              Text(item.liveInfo.liveStartTime.split(' ')[1].slice(0, 5))
+                .margin({right: 6})
+                .fontColor(0x000000)
+                .fontSize(13)
+              Text('开始直播')
+                .fontColor(0xC8C8C8)
+                .fontSize(13)
+            }
+
+            Row() {
+              Text(this.isReserved(Number(item.objectId)) ? '已预约' : '预约')
+                .width(48)
+                .height(24)
+                .backgroundColor(this.isReserved(Number(item.objectId)) ? 0xffffff : 0xED2800)
+                .fontColor(this.isReserved(Number(item.objectId)) ? 0xC8C8C8 : 0xffffff)
+                .fontSize(12)
+                .textAlign(TextAlign.Center)
+                .borderRadius(3)
+                .onClick(() => {
+                  this.bookAndCancel(item.relId, item.objectId, !this.isReserved(Number(item.objectId)))
+                })
+
+            }
+            .margin({top: -5})
+          }
+
+        }
       }
+      .width('100%')
+      .height(116)
+      .padding({top: 12, bottom: 12, left: 12, right: 12})
+      .backgroundColor(0xf9f9f9)
+      .margin({right: 8})
+      .onClick(() => {
+        InfomationCardClick.track(this.compDTO, item, this.pageId, this.pageName)
+        ProcessUtils.processPage(item)
+      })
     }
-    .width(298)
-    .height(116)
-    .padding({top: 12, bottom: 12, left: 12, right: 12})
-    .backgroundColor(0xf9f9f9)
-    .margin({right: 8})
-    .onClick(() => {
-      InfomationCardClick.track(this.compDTO, item, this.pageId, this.pageName)
-      ProcessUtils.processPage(item)
-    })
   }
 
 
@@ -330,9 +380,6 @@ export struct ZhSingleRow03 {
           .width(14)
           .height(14)
       }
-      .padding({
-        right: $r('app.float.card_comp_pagePadding_lf'),
-      })
       .onClick(() => {
         this.jumpToMore();
       })
@@ -362,85 +409,4 @@ export struct ZhSingleRow03 {
 
 }
 
-@Extend(Text)
-function textOverflowStyle(maxLine: number) {
-  .maxLines(maxLine)
-  .textOverflow({ overflow: TextOverflow.Ellipsis })
-}
 
-@Component
-struct CreatorItem {
-  @Prop item: ContentDTO
-  @State rmhIsAttention: number = 0
-  @State loadImg: boolean = false;
-
-  async aboutToAppear(): Promise<void> {
-    this.loadImg = await onlyWifiLoadImg();
-  }
-  build() {
-    ListItem() {
-      Column() {
-        Stack({ alignContent: Alignment.Bottom }) {
-          Image(this.loadImg ? this.item.coverUrl : '')
-            .backgroundColor(0xf5f5f5)
-            .width(156)
-            .height(208)
-            .border({width: 1})
-            .borderRadius(3)
-          Row()
-            .width(156)
-            .height(80)
-            .linearGradient({
-              direction: GradientDirection.Bottom,
-              colors: [['rgba(0, 0, 0, 0.0)', 0.0], ['rgba(0, 0, 0, 0.3)', 1.0]]
-            })
-          Text(this.item.newsTitle)
-            .fontColor(0xffffff)
-            .fontSize(14)
-            .maxLines(2)
-            .textOverflow({overflow: TextOverflow.Ellipsis})
-            .width(140)
-            .margin({bottom: 8})
-        }
-      }
-      .width(156)
-      .height(208)
-      .margin({ right: 11 })
-      .borderColor($r('app.color.color_EDEDED'))
-      .borderRadius($r('app.float.image_border_radius'))
-    }
-    .onClick((event: ClickEvent) => {
-      ProcessUtils.processPage(this.item)
-    })
-  }
-
-  /**
-   * 关注号主 TODO 这里后面需要抽离
-   */
-  handleAccention(item: ContentDTO, status: number) {
-    this.rmhIsAttention = this.rmhIsAttention ? 0 : 1
-    return
-    // 未登录，跳转登录
-    if (!HttpUtils.getUserId()) {
-      WDRouterRule.jumpWithPage(WDRouterPage.loginPage)
-      return
-    }
-
-    const params: postInteractAccentionOperateParams = {
-      attentionUserType: item.rmhInfo?.userType || '', //被关注用户类型（1 普通用户 2 视频号 3 矩阵号）
-      attentionUserId: item.rmhInfo?.userId || '', // 被关注用户号主id
-      attentionCreatorId: item.rmhInfo?.rmhId || '', // 被关注用户号主id
-      // userType: 1,
-      // userId: '1', // TODO 用户id需要从本地获取
-      status: status,
-    }
-    PageRepository.postInteractAccentionOperate(params).then(res => {
-      console.log(TAG, '关注号主==', JSON.stringify(res.data))
-      if (status === 1) {
-        this.rmhIsAttention = 0
-      } else {
-        this.rmhIsAttention = 1
-      }
-    })
-  }
-}

@@ -148,7 +148,6 @@ export struct DetailPlayLiveCommon {
   onPageHide() {
     this.pageHide = Math.random()
     Logger.info(TAG, 'onPageHide')
-    console.error("XXXXZZZZ", '---onPageHide------------')
     //页面浏览
     TrackingPageBrowse.trackCommonPageExposureEnd(TrackConstants.PageName.Live_Detail,
       TrackConstants.PageName.Live_Detail

@@ -56,7 +56,7 @@ export struct PlayUIComponent {
   /*
      初始话播放器设置
    */
-  initPlayerSet(){
+  initPlayerSet() {
 
     //播放进度监听
     if (this.playerController) {
@@ -279,8 +279,13 @@ export struct PlayUIComponent {
             })
         }
 
-        // 进度条
-        this.playProgressView()
+        if (this.contentDetailData.liveInfo?.liveState == 'running') {
+          Blank()
+        } else {
+          // 进度条
+          this.playProgressView()
+        }
+
         // 总的播放时间
         if (this.contentDetailData?.liveInfo?.liveState != 'running' || this.contentDetailData.showTime) {
           Text(this.totalTime)

@@ -32,7 +32,6 @@ export struct TopPlayComponent {
   @Provide playSourceState: number = 0
   private playUrl: string = ""
   private xComponentIsLoaded: boolean = false
-  pageParam: ParamType = {}
 
   aboutToAppear(): void {
     if (this.playerController) {
@@ -148,16 +147,12 @@ export struct TopPlayComponent {
       Logger.debug(TAG, "播放地址为空")
       return
     }
-    this.contentTrackingDict()
-    this.playerController?.firstPlay(this.playUrl, TrackConstants.PageName.Live_Detail, this.pageParam);
-  }
 
-  contentTrackingDict() {
-    this.pageParam = {
+    this.playerController?.firstPlay(this.playUrl, TrackConstants.PageName.Live_Detail, {
       'contentType': `${this.contentDetailData.newsType}`,
       'contentId': `${this.contentDetailData.newsId}`,
       'contentName': `${this.contentDetailData.newsTitle || ''}`,
-    }
+    });
   }
 
   build() {