Merge remote-tracking branch 'origin/main'

@@ -44,7 +44,7 @@ export struct CarderInteraction {
 
 
   build() {
   build() {
     Row() {
     Row() {
-      if(this.contentDTO.shareFlag === '1'){
+      if(this.contentDetailData?.shareInfo?.shareOpen === 1){
         Row() {
         Row() {
           Image($r('app.media.CarderInteraction_share'))
           Image($r('app.media.CarderInteraction_share'))
             .width(18)
             .width(18)
@@ -60,14 +60,9 @@ export struct CarderInteraction {
         })
         })
       }
       }
 
 
-      if(this.contentDTO.rmhInfo != null){
-        if(this.contentDTO.shareInfo != null && 1 == this.contentDTO.shareInfo.shareOpen && 1 == this.contentDTO.rmhInfo.cnShareControl){
+      if(this.contentDetailData?.openComment == 1){
         this.commentLayout()
         this.commentLayout()
       }
       }
-      }else{
-        this.commentLayout()
-      }
-
       this.builderLike()
       this.builderLike()
     }
     }
     .width('100%')
     .width('100%')

@@ -14,15 +14,16 @@ export struct LottieView {
   private politeChickyController: CanvasRenderingContext2D =
   private politeChickyController: CanvasRenderingContext2D =
     new CanvasRenderingContext2D(); // CanvasRenderingContext2D对象
     new CanvasRenderingContext2D(); // CanvasRenderingContext2D对象
   private animateItem: AnimationItem | null = null; // 初始化loadAnimation接口的返回对象
   private animateItem: AnimationItem | null = null; // 初始化loadAnimation接口的返回对象
+  @Prop title: string
 
 
   // 页面隐藏销毁动画
   // 页面隐藏销毁动画
-  onPageHide(): void {
-    this.animateItem?.destroy()
-
-    if (this.onComplete) {
-      this.animateItem?.removeEventListener('complete', this.onComplete)
-    }
-  }
+  // onPageHide(): void {
+  //   this.animateItem?.destroy()
+  //
+  //   if (this.onComplete) {
+  //     this.animateItem?.removeEventListener('complete', this.onComplete)
+  //   }
+  // }
 
 
   /**
   /**
    * 加载动画
    * 加载动画
@@ -31,7 +32,7 @@ export struct LottieView {
   loadAnimation() {
   loadAnimation() {
     // 销毁动画，减少缓存
     // 销毁动画，减少缓存
     if (this.animateItem !== null) {
     if (this.animateItem !== null) {
-      this.animateItem.destroy();
+      this.animateItem.destroy(this.name);
       this.animateItem = null;
       this.animateItem = null;
     }
     }
 
 
@@ -54,6 +55,32 @@ export struct LottieView {
 
 
   }
   }
 
 
+  aboutToAppear(): void {
+   // console.error('XXXXZZZZ', '-------aboutToAppear-------' + this.title)
+    //lottie?.play()
+
+    //  if(this.init){
+    // if(this.animateItem = null){
+   // this.loadAnimation();
+    // }
+    // }
+
+
+  }
+
+  aboutToDisappear(): void {
+   // console.error('XXXXZZZZ', '-------aboutToDisappear-------' + this.title)
+    // if(this.init){
+    // lottie?.destroy(this.name)
+    //
+    // if (this.onComplete) {
+    //   this.animateItem?.removeEventListener('complete', this.onComplete)
+    // }
+    // this.animateItem = null;
+    // // }
+
+  }
+
   build() {
   build() {
     Stack({ alignContent: Alignment.TopStart }) {
     Stack({ alignContent: Alignment.TopStart }) {
       Canvas(this.politeChickyController)
       Canvas(this.politeChickyController)
@@ -65,9 +92,13 @@ export struct LottieView {
             this.onReady(this.animateItem)
             this.onReady(this.animateItem)
           }
           }
         })
         })
-        .onClick(() => {
-          this.animateItem?.play()
+        .onDisAppear(() => {
+          lottie.destroy(this.name)
+          this.animateItem = null;
+        }).onAppear(()=>{
+        this.loadAnimation();
       })
       })
+
     }
     }
   }
   }
 }
 }

@@ -31,7 +31,7 @@ let preferenceTheme: dataPreferences.Preferences | null = null
 @Component
 @Component
 struct LiveMorePage {
 struct LiveMorePage {
   @State data: LazyDataSource<ContentDTO> = new LazyDataSource();
   @State data: LazyDataSource<ContentDTO> = new LazyDataSource();
-  topSafeHeight: number = AppStorage.get<number>('topSafeHeight') as number;
+  @State topSafeHeight: number = AppStorage.get<number>('topSafeHeight') as number;
   @State bottomSafeHeight: number = AppStorage.get<number>('bottomSafeHeight') || 0
   @State bottomSafeHeight: number = AppStorage.get<number>('bottomSafeHeight') || 0
   type: number = 1;
   type: number = 1;
   pageSize: number = 20;
   pageSize: number = 20;
@@ -46,11 +46,9 @@ struct LiveMorePage {
   @State liveRoomList: LiveRoomDataBean[] = []
   @State liveRoomList: LiveRoomDataBean[] = []
   // 点击过的数据
   // 点击过的数据
   @State clickDatas: Array<string> = []
   @State clickDatas: Array<string> = []
-
   @State loadImg: boolean = false;
   @State loadImg: boolean = false;
 
 
-
-  async aboutToAppear() : Promise<void>{
+  async aboutToAppear(): Promise<void> {
     await this.getPreferencesFromStorage()
     await this.getPreferencesFromStorage()
     this.loadImg = await onlyWifiLoadImg();
     this.loadImg = await onlyWifiLoadImg();
     this.getLivMoreClickPreference()
     this.getLivMoreClickPreference()
@@ -60,16 +58,9 @@ struct LiveMorePage {
   }
   }
 
 
   build() {
   build() {
-    // Navigation() {
-    //   //滑动区域
-    //   this.ListLayout()
-    // }
-    // .titleMode(NavigationTitleMode.Mini)
-    // .title('直播列表')
 
 
     Column() {
     Column() {
       this.TabbarNormal()
       this.TabbarNormal()
-
       if (this.viewType == ViewType.LOADING) {
       if (this.viewType == ViewType.LOADING) {
         this.LoadingLayout()
         this.LoadingLayout()
       } else if (this.viewType == ViewType.ERROR) {
       } else if (this.viewType == ViewType.ERROR) {
@@ -96,15 +87,13 @@ struct LiveMorePage {
         })
         })
       }
       }
     }
     }
+    .height('100%')
     .padding({
     .padding({
       left: $r('app.float.card_comp_pagePadding_lf'),
       left: $r('app.float.card_comp_pagePadding_lf'),
       right: $r('app.float.card_comp_pagePadding_lf'),
       right: $r('app.float.card_comp_pagePadding_lf'),
-      bottom: $r('app.float.card_comp_pagePadding_tb')
-    })
-    .margin({bottom:px2vp(this.bottomSafeHeight)})
-    .onClick(() => {
-      ProcessUtils.processPage(this.contentDTO)
+      top:px2vp(this.topSafeHeight),bottom:px2vp(this.bottomSafeHeight)
     })
     })
+
   }
   }
 
 
   @Builder
   @Builder
@@ -133,7 +122,7 @@ struct LiveMorePage {
     }
     }
     .scrollBar(BarState.Off)
     .scrollBar(BarState.Off)
     .edgeEffect(EdgeEffect.None)
     .edgeEffect(EdgeEffect.None)
-    .cachedCount(8)
+    .cachedCount(3)
     .height('calc(100% - 44vp)')
     .height('calc(100% - 44vp)')
     .onReachEnd(() => {
     .onReachEnd(() => {
       Logger.debug(TAG, "触底了");
       Logger.debug(TAG, "触底了");
@@ -160,9 +149,10 @@ struct LiveMorePage {
         .margin({ top: 16, bottom: 8 })
         .margin({ top: 16, bottom: 8 })
         .alignSelf(ItemAlign.Start)
         .alignSelf(ItemAlign.Start)
         .fontColor(this.isClicked(item.objectId) ? $r('app.color.color_848484') : $r('app.color.color_222222'))
         .fontColor(this.isClicked(item.objectId) ? $r('app.color.color_848484') : $r('app.color.color_222222'))
+
       Stack() {
       Stack() {
         if (item.fullColumnImgUrls && item.fullColumnImgUrls.length > 0) {
         if (item.fullColumnImgUrls && item.fullColumnImgUrls.length > 0) {
-          Image(this.loadImg?item.fullColumnImgUrls[0].url:'')
+          Image(this.loadImg ? item.fullColumnImgUrls[0].url : '')
             .backgroundColor(this.loadImg ? $r('app.color.color_B0B0B0') : 0xf5f5f5)
             .backgroundColor(this.loadImg ? $r('app.color.color_B0B0B0') : 0xf5f5f5)
             .width('100%')
             .width('100%')
             .aspectRatio(16 / 9)
             .aspectRatio(16 / 9)
@@ -246,7 +236,6 @@ struct LiveMorePage {
         })
         })
     }
     }
     .height(44)
     .height(44)
-    .margin({top:this.topSafeHeight+'px'})
     .width('100%')
     .width('100%')
   }
   }
 
 
@@ -260,24 +249,25 @@ struct LiveMorePage {
         lottieHeight: 14,
         lottieHeight: 14,
         autoplay: true,
         autoplay: true,
         loop: true,
         loop: true,
+        title: item.newsTitle
       })
       })
         .margin({
         .margin({
           right: '2vp'
           right: '2vp'
         })
         })
+
       Text('直播中')
       Text('直播中')
         .fontSize('12vp')
         .fontSize('12vp')
         .fontWeight(400)
         .fontWeight(400)
         .fontColor(Color.White)
         .fontColor(Color.White)
-        .textShadow({ radius: 2, color: 'rgba(0,0,0,0.3)', offsetX: 0, offsetY: 2 })
+        .textShadow({
+          radius: 2,
+          color: 'rgba(0,0,0,0.3)',
+          offsetX: 0,
+          offsetY: 2
+        })
         .margin({
         .margin({
           right: '5vp'
           right: '5vp'
         })
         })
-      // Divider()
-      //   .vertical(true)
-      //   .strokeWidth(1)
-      //   .height('12vp')
-      //   .margin({ top: 2, bottom: 2 })
-      //   .color(Color.White)
 
 
       Image($r('app.media.icon_comp_line_live')).height('11vp').width('1.5vp')
       Image($r('app.media.icon_comp_line_live')).height('11vp').width('1.5vp')
 
 
@@ -285,7 +275,12 @@ struct LiveMorePage {
         Text(this.getLiveRoomNumber(item))
         Text(this.getLiveRoomNumber(item))
           .fontSize('12vp')
           .fontSize('12vp')
           .fontWeight(400)
           .fontWeight(400)
-          .textShadow({ radius: 2, color: 'rgba(0,0,0,0.3)', offsetX: 0, offsetY: 2 })
+          .textShadow({
+            radius: 2,
+            color: 'rgba(0,0,0,0.3)',
+            offsetX: 0,
+            offsetY: 2
+          })
           .fontColor(Color.White)
           .fontColor(Color.White)
           .margin({
           .margin({
             left: '5vp'
             left: '5vp'
@@ -422,7 +417,7 @@ struct LiveMorePage {
       const arr: Array<string> = []
       const arr: Array<string> = []
       arr.push(...this.clickDatas)
       arr.push(...this.clickDatas)
       preferenceTheme.put('liveMorePage', arr).then(() => {
       preferenceTheme.put('liveMorePage', arr).then(() => {
-        Logger.debug(TAG,"Succeeded in putting value of 'startup'.");
+        Logger.debug(TAG, "Succeeded in putting value of 'startup'.");
       }).catch((err: BusinessError) => {
       }).catch((err: BusinessError) => {
         Logger.debug(TAG, "Failed to put value of 'startup'. code =" + err.code + ", message =" + err.message);
         Logger.debug(TAG, "Failed to put value of 'startup'. code =" + err.code + ", message =" + err.message);
       })
       })

@@ -31,7 +31,8 @@ const TAG: string = 'ReserveMorePage';
 struct ReserveMorePage {
 struct ReserveMorePage {
   @State data: LazyDataSource<ContentDTO> = new LazyDataSource();
   @State data: LazyDataSource<ContentDTO> = new LazyDataSource();
   private reserveList: ReserveItemBean[] = []
   private reserveList: ReserveItemBean[] = []
-  topSafeHeight: number = AppStorage.get<number>('topSafeHeight') as number;
+  @State topSafeHeight: number = AppStorage.get<number>('topSafeHeight') as number;
+  @State bottomSafeHeight: number = AppStorage.get<number>('bottomSafeHeight') || 0
   type: number = 2;
   type: number = 2;
   pageSize: number = 20;
   pageSize: number = 20;
   title: string = '直播预告'
   title: string = '直播预告'
@@ -78,10 +79,13 @@ struct ReserveMorePage {
             this.currentPage = 1
             this.currentPage = 1
             this.getData(resolve)
             this.getData(resolve)
           },
           },
-        })
+        }).backgroundColor($r('app.color.color_F5F5F5'))
       }
       }
 
 
-    }.backgroundColor($r('app.color.color_F5F5F5'))
+    }.height('100%').backgroundColor('#FFFFFF').padding({
+      top: px2vp(this.topSafeHeight),
+      bottom: px2vp(this.bottomSafeHeight)
+    })
 
 
   }
   }
 
 
@@ -306,8 +310,7 @@ struct ReserveMorePage {
           middle: { anchor: "__container__", align: HorizontalAlign.Center }
           middle: { anchor: "__container__", align: HorizontalAlign.Center }
         })
         })
     }
     }
-    .height(vp2px(44) + this.topSafeHeight + 'px')
-    .padding({ top: this.topSafeHeight + 'px' })
+    .height(44)
     .width('100%').backgroundColor('#FFFFFF')
     .width('100%').backgroundColor('#FFFFFF')
 
 
   }
   }

@@ -156,6 +156,7 @@ export struct OperRowListView {
       this.likeBean['contentRelId'] = this.contentDetailData?.reLInfo?.relId   + ''
       this.likeBean['contentRelId'] = this.contentDetailData?.reLInfo?.relId   + ''
     }
     }
     console.info(TAG, 'contentDetailData----', JSON.stringify(this.contentDetailData))
     console.info(TAG, 'contentDetailData----', JSON.stringify(this.contentDetailData))
+    console.info(TAG, 'this.contentDetailData.shareInfo.shareOpen', JSON.stringify(this.contentDetailData.shareInfo.shareOpen))
     console.info(TAG, 'likeBean----', JSON.stringify(this.likeBean))
     console.info(TAG, 'likeBean----', JSON.stringify(this.likeBean))
     console.info(TAG, 'this.operationButtonList', JSON.stringify(this.operationButtonList))
     console.info(TAG, 'this.operationButtonList', JSON.stringify(this.operationButtonList))
 
 
@@ -384,6 +385,7 @@ export struct OperRowListView {
    */
    */
   @Builder
   @Builder
   builderShare() {
   builderShare() {
+    if(this.contentDetailData?.shareInfo?.shareOpen == 1) {
       Column() {
       Column() {
         Image(this.styleType == 1 ? $r('app.media.iv_live_comment_share') :
         Image(this.styleType == 1 ? $r('app.media.iv_live_comment_share') :
         $r('app.media.iv_live_comment_share_white'))
         $r('app.media.iv_live_comment_share_white'))
@@ -401,6 +403,7 @@ export struct OperRowListView {
       .borderRadius(18)
       .borderRadius(18)
       .backgroundColor(this.pageComponentType === 2 ? '#4D000000' : Color.Transparent)
       .backgroundColor(this.pageComponentType === 2 ? '#4D000000' : Color.Transparent)
     }
     }
+  }
 
 
   handleStyle() {
   handleStyle() {
     if (this.styleType == 1) {
     if (this.styleType == 1) {

@@ -208,13 +208,17 @@ export struct PlayerRightView {
   build() {
   build() {
     Column() {
     Column() {
       this.userBuilderView()
       this.userBuilderView()
+      if (this.contentDetailData?.openLikes == 1) {
         this.likeBuilderView()
         this.likeBuilderView()
+      }
       this.collectBuilderView()
       this.collectBuilderView()
-      if (this.contentDetailData.openComment == 1) {
+      if (this.contentDetailData?.openComment == 1) {
         this.commentBuilderView()
         this.commentBuilderView()
       }
       }
+      if(this.contentDetailData?.shareInfo?.shareOpen == 1) {
         this.shareBuilderView()
         this.shareBuilderView()
       }
       }
+    }
     // .backgroundColor(Color.Blue)
     // .backgroundColor(Color.Blue)
     // .height('100%')
     // .height('100%')
     .width(58)
     .width(58)