Merge remote-tracking branch 'origin/main' into main

@@ -32,8 +32,8 @@ export class HttpBizUtil {
             if (!headers) {
               headers = new HashMap()
             }
-            headers?.replace('RMRB-X-TOKEN', token)
-            headers?.replace('cookie', 'RMRB-X-TOKEN=' + token)
+            headers?.set('RMRB-X-TOKEN', token)
+            headers?.set('cookie', 'RMRB-X-TOKEN=' + token)
             Logger.debug(TAG, 'get again send: ' + token)
             // refreshToken为空场景不处理，直接请求接口。
             WDHttp.get<T>(url, headers).then((againResDTO: T) => {
@@ -71,8 +71,8 @@ export class HttpBizUtil {
             if (!headers) {
               headers = new HashMap()
             }
-            headers?.replace('RMRB-X-TOKEN', token)
-            headers?.replace('cookie', 'RMRB-X-TOKEN=' + token)
+            headers?.set('RMRB-X-TOKEN', token)
+            headers?.set('cookie', 'RMRB-X-TOKEN=' + token)
             Logger.debug(TAG, 'post again send: ' + token)
             // refreshToken为空场景不处理，直接请求接口。
             WDHttp.post<T>(url, data, headers).then((againResDTO: T) => {

@@ -166,6 +166,25 @@ export class ProcessUtils {
    * @param content
    * */
   public static gotoMultiPictureListPage(photoList: PhotoListBean[], swiperIndex?: number) {
+    let tempP = [] as PhotoListBean[]
+    let relIndex = 0;
+    for (let index = 0; index < photoList.length; index++) {
+      const element = photoList[index];
+      if(!StringUtils.isEmpty(element.picPath)){
+        relIndex = relIndex+1
+      }
+    }
+    tempP.length = relIndex
+    relIndex = 0
+    for (let index = 0; index < photoList.length; index++) {
+      const element = photoList[index];
+      if(!StringUtils.isEmpty(element.picPath)){
+        tempP[relIndex] = element
+        relIndex = relIndex+1
+      }
+    }
+    photoList.length = tempP.length
+    photoList = tempP
     let taskAction: Action = {
       type: 'JUMP_DETAIL_PAGE',
       params: {

@@ -289,9 +289,9 @@ struct indicatorAnimations {
   build() {
     Flex({ alignItems: ItemAlign.End }) {
       Stack() {
-        Image($r('app.media.swiper_indicator_gray'))
-          .width('100%')
-          .height(2)
+        // Image($r('app.media.swiper_indicator_gray'))
+        //   .width('100%')
+        //   .height(2)
         Image($r('app.media.swiper_indicator_white'))
           .width(this.leftW)
           .height(2)
@@ -312,6 +312,7 @@ struct indicatorAnimations {
         .margin({
           bottom: -2
         })
+        .fontFamily('BebasNeue')
         .flexShrink(0)
         .animation({
           duration: 300,
@@ -319,9 +320,9 @@ struct indicatorAnimations {
           playMode: PlayMode.Normal
         })
       Stack() {
-        Image($r('app.media.swiper_indicator_gray'))
-          .width('100%')
-          .height(2)
+        // Image($r('app.media.swiper_indicator_gray'))
+        //   .width('100%')
+        //   .height(2)
         Image($r('app.media.swiper_indicator_white'))
           .width(this.rightW)
           .height(2)

@@ -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
-      }
-    })
-  }
-}

@@ -50,11 +50,6 @@ export struct DetailPlayLiveCommon {
 
   }
 
-  aboutToDisappear(): void {
-    console.error("XXXXZZZZ", '---aboutToDisappear------------')
-
-  }
-
   build() {
     Column() {
       // 直播预约或横屏直播统一进横屏直播
@@ -84,20 +79,16 @@ export struct DetailPlayLiveCommon {
         if (data) {
           let detailData = data[0]
           //人民号类型单独获取直播地址
-          if (detailData.rmhPlatform === 1 && detailData.liveInfo?.liveState === 'running') {
-
+          if (detailData.rmhPlatform === 1 && detailData.liveInfo?.liveState === 'running') { //
             let vliveId = detailData.liveInfo.vlive[0].vliveId as string
-            console.error(TAG, 'vliveId==' + vliveId)
             let pullStreamAddressData = await this.liveViewModel.getLiveRoomPullAddress(vliveId) as GetPullAddressBean
-            console.error(TAG, 'vliveId==' + vliveId)
             if (pullStreamAddressData) {
-              console.log(TAG, ' GetPullAddressBean:', JSON.stringify(pullStreamAddressData))
+              //  console.log(TAG, ' GetPullAddressBean:', JSON.stringify(pullStreamAddressData))
               let m3u8uUrl = pullStreamAddressData.transCode[0].m3u8Url
               detailData.liveInfo.vlive[0].liveUrl = m3u8uUrl
               this.playUrl = m3u8uUrl
-              console.log(TAG, ' GetPullAddressBean:', m3u8uUrl)
+              // console.log(TAG, ' GetPullAddressBean:', m3u8uUrl)
             }
-
           }
 
           this.liveLandscape =
@@ -148,7 +139,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

-import { ContentDetailDTO,
+import {
+  ContentDetailDTO,
   GetPullAddressBean,
-  LiveDetailsBean, LiveRoomBean, LiveRoomDataBean,
+  LiveDetailsBean,
+  LiveRoomBean,
+  LiveRoomDataBean,
   LiveRoomItemBean,
-  ValueType } from 'wdBean/Index'
+  ValueType
+} from 'wdBean/Index'
 import { ContentDetailRequest } from 'wdDetailPlayApi/Index'
 import { Logger } from 'wdKit/Index'
 import { ToastUtils } from 'wdKit/src/main/ets/utils/ToastUtils'
@@ -25,26 +29,33 @@ export class LiveViewModel {
         //console.error("XXXXZZZZ", '---getContentDetail---1------------')
         success(data)
       }).catch((message: string) => {
-       // console.error("XXXXZZZZ", '----getContentDetail--2------------')
+        // console.error("XXXXZZZZ", '----getContentDetail--2------------')
         fail(message)
       })
     })
 
   }
 
-  async getLiveRoomPullAddress(vliveId:string) : Promise<GetPullAddressBean>{
-
-    return new Promise<GetPullAddressBean>((success, fail) => {
-      ContentDetailRequest.getLiveRoomPullStream(vliveId).then(async (resDTO: ResponseDTO<GetPullAddressBean>) => {
-        console.log(TAG, 'getContentDetail:', JSON.stringify(resDTO.data))
-        if (resDTO.data) {
-          success(resDTO.data)
-        }else {
-          fail("数据为空")
-        }
-      }).catch(() => {
-        fail("数据为空")
-      })
+  /**
+   *  获取直播间的拉流地址
+   * @param vliveId
+   * @returns
+   */
+  async getLiveRoomPullAddress(vliveId: string): Promise<GetPullAddressBean | null> {
+
+    return new Promise<GetPullAddressBean | null>((success, fail) => {
+      ContentDetailRequest.getLiveRoomPullStream(vliveId)
+        .then(async (resDTO: ResponseDTO<GetPullAddressBean>) => {
+          console.log(TAG, 'getContentDetail:', JSON.stringify(resDTO.data))
+          if (resDTO.data) {
+            success(resDTO.data)
+          } else {
+            success(null)
+          }
+        })
+        .catch(() => {
+          success(null)
+        })
 
     })
 
@@ -104,6 +115,7 @@ export class LiveViewModel {
       })
     })
   }
+
   // 直播详情-C端点赞接口
   getLiveRoomNumberLike(liveId: string, number: number, deviceId: string | number) {
     return new Promise<number>((success, fail) => {
@@ -114,6 +126,7 @@ export class LiveViewModel {
       })
     })
   }
+
   // 直播详情-查询是否点赞接口
   getLiveLike(liveId: string, userId: ValueType, deviceId: string | number) {
     return new Promise<boolean>((success, fail) => {

@@ -56,7 +56,7 @@ export struct PlayUIComponent {
   /*
      初始话播放器设置
    */
-  initPlayerSet(){
+  initPlayerSet() {
 
     //播放进度监听
     if (this.playerController) {
@@ -280,7 +280,12 @@ 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() {