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

@@ -350,12 +350,14 @@ export struct WdWebLocalComponent {
               this.controller.pause()
               this.controller.pause()
               this.cancelProgressTimer()
               this.cancelProgressTimer()
             }
             }
-          })
+          }).margin({right:16})
+
         Row() {
         Row() {
           Text(DateTimeUtils.getFormattedDuration(this.currentTime * 1000))
           Text(DateTimeUtils.getFormattedDuration(this.currentTime * 1000))
             .fontSize(12)
             .fontSize(12)
             .fontColor(Color.White)
             .fontColor(Color.White)
             .fontWeight(600)
             .fontWeight(600)
+
           Slider({
           Slider({
             value: this.currentTime,
             value: this.currentTime,
             min: 0,
             min: 0,
@@ -385,8 +387,8 @@ export struct WdWebLocalComponent {
             .fontSize(12)
             .fontSize(12)
             .fontColor(Color.White)
             .fontColor(Color.White)
             .fontWeight(600)
             .fontWeight(600)
-        }
-        .justifyContent(FlexAlign.Center)
+        }.alignItems(VerticalAlign.Center)
+        .height(48)
 
 
         // Image($r('app.media.icon_full_screen'))
         // Image($r('app.media.icon_full_screen'))
         //   .width(24)
         //   .width(24)
@@ -401,7 +403,9 @@ export struct WdWebLocalComponent {
         colors: [[0x20000000, 0.0], [Color.Transparent, 1.0]] // [0x80000000, 0.5],
         colors: [[0x20000000, 0.0], [Color.Transparent, 1.0]] // [0x80000000, 0.5],
       })
       })
       .width("100%")
       .width("100%")
-      .justifyContent(FlexAlign.SpaceAround)
+      .height(48)
+      .padding({left:16})
+      .alignItems(VerticalAlign.Center)
     }
     }
   }
   }
 
 

@@ -5,7 +5,8 @@ import {
   EmitterUtils,
   EmitterUtils,
   EmitterEventId,
   EmitterEventId,
   NetworkUtil,
   NetworkUtil,
-  DisplayUtils
+  DisplayUtils,
+  ToastUtils
 } from 'wdKit';
 } from 'wdKit';
 import {
 import {
   Action,
   Action,
@@ -185,8 +186,10 @@ export struct ImageAndTextPageComponent {
                 .justifyContent(FlexAlign.Center)
                 .justifyContent(FlexAlign.Center)
               }
               }
               if (this.recommendList.length > 0) {
               if (this.recommendList.length > 0) {
-                Divider().strokeWidth(8).color('#f5f5f5')
-                RecommendList({ recommendList: this.recommendList })
+                Column(){
+                  Divider().strokeWidth(8).color('#f5f5f5')
+                  RecommendList({ recommendList: this.recommendList })
+                }.padding({bottom:this.contentDetailData?.openComment ? 0 : 44 })
               }
               }
               // 评论
               // 评论
               if (this.contentDetailData?.openComment) {
               if (this.contentDetailData?.openComment) {
@@ -447,22 +450,25 @@ export struct ImageAndTextPageComponent {
     PageRepository.postExecuteLike(params).then(res => {
     PageRepository.postExecuteLike(params).then(res => {
       // console.log(TAG, '点赞、res', JSON.stringify(res))
       // console.log(TAG, '点赞、res', JSON.stringify(res))
       // console.log(TAG, '点赞、取消点赞 this.newsStatusOfUser', JSON.stringify(this.newsStatusOfUser))
       // console.log(TAG, '点赞、取消点赞 this.newsStatusOfUser', JSON.stringify(this.newsStatusOfUser))
-      if (this.newsStatusOfUser) {
-        //内容点赞、取消点赞Tracking 1点赞  0取消点赞
-        this.newsStatusOfUser.likeStatus = this.newsStatusOfUser?.likeStatus == '1' ? '0' : '1'
-        if (this.newsStatusOfUser.likeStatus === '1') {
-          this.likeNum = Number(this.likeNum) + 1
+      if (res.code != 0){
+        ToastUtils.showToast(res.message, 1000);
+      }else {
+        if (this.newsStatusOfUser) {
+          //内容点赞、取消点赞Tracking 1点赞  0取消点赞
+          this.newsStatusOfUser.likeStatus = this.newsStatusOfUser?.likeStatus == '1' ? '0' : '1'
+          if (this.newsStatusOfUser.likeStatus === '1') {
+            this.likeNum = Number(this.likeNum) + 1
+          } else {
+            this.likeNum = Number(this.likeNum) - 1
+          }
+          // console.log(TAG, '点赞newsStatusOfUser.likeStatus ', this.newsStatusOfUser.likeStatus)
+          // this.queryContentInteractCount()
+          TrackingContent.like(this.newsStatusOfUser?.likeStatus == '1', TrackConstants.PageName.My, TrackConstants.PageName.My)
         } else {
         } else {
-          this.likeNum = Number(this.likeNum) - 1
+          // 初次进入详情页偶现获取失败，重新获取newsStatusOfUser对象
+          this.getInteractDataStatus()
         }
         }
-        // console.log(TAG, '点赞newsStatusOfUser.likeStatus ', this.newsStatusOfUser.likeStatus)
-        // this.queryContentInteractCount()
-        TrackingContent.like(this.newsStatusOfUser?.likeStatus == '1', TrackConstants.PageName.My, TrackConstants.PageName.My)
-      } else {
-        // 初次进入详情页偶现获取失败，重新获取newsStatusOfUser对象
-        this.getInteractDataStatus()
       }
       }
-
     })
     })
   }
   }
 
 

@@ -34,7 +34,9 @@ export struct FollowListDetailUI {
         if (arr[1] == "0") {
         if (arr[1] == "0") {
           this.data.getDataArray().forEach((element, index) => {
           this.data.getDataArray().forEach((element, index) => {
             if (element.creatorId === arr[0]) {
             if (element.creatorId === arr[0]) {
-              this.data.deleteItem(index)
+              animateTo({}, () => {
+                this.data.deleteItem(index);
+              });
               this.count = this.data.size()
               this.count = this.data.size()
             }
             }
           });
           });
@@ -92,6 +94,7 @@ export struct FollowListDetailUI {
             ListItem() {
             ListItem() {
               FollowChildComponent({ data: item, type: this.type })
               FollowChildComponent({ data: item, type: this.type })
             }
             }
+            .transition(TransitionEffect.OPACITY)
           }, (item: FollowListDetailItem) => item.creatorId)
           }, (item: FollowListDetailItem) => item.creatorId)
 
 
           //没有更多数据  显示提示
           //没有更多数据  显示提示

-import { NumberFormatterUtils, SPHelper } from 'wdKit';
+import { NumberFormatterUtils, SPHelper, ToastUtils } from 'wdKit';
 import promptAction from '@ohos.promptAction';
 import promptAction from '@ohos.promptAction';
 import {
 import {
   batchLikeAndCollectParams,
   batchLikeAndCollectParams,
@@ -526,15 +526,19 @@ export struct OperRowListView {
 
 
     console.log(TAG, '收藏点击', JSON.stringify(params))
     console.log(TAG, '收藏点击', JSON.stringify(params))
     PageRepository.postExecuteCollectRecord(params).then(res => {
     PageRepository.postExecuteCollectRecord(params).then(res => {
-      if (this.newsStatusOfUser) {
-        this.newsStatusOfUser.collectStatus = this.newsStatusOfUser?.collectStatus === 1 ? 0 : 1
-        if (this.newsStatusOfUser.collectStatus === 1) {
-          promptAction.showToast({ message: '收藏成功' })
-          TrackingContent.collect(true,this.pageId,this.pageName,this.pageParam)
-        } else {
-          TrackingContent.collect(false,this.pageId,this.pageName,this.pageParam)
+      if (res.code != 0){
+        ToastUtils.showToast(res.message, 1000);
+      }else {
+        if (this.newsStatusOfUser) {
+          this.newsStatusOfUser.collectStatus = this.newsStatusOfUser?.collectStatus === 1 ? 0 : 1
+          if (this.newsStatusOfUser.collectStatus === 1) {
+            promptAction.showToast({ message: '收藏成功' })
+            TrackingContent.collect(true,this.pageId,this.pageName,this.pageParam)
+          } else {
+            TrackingContent.collect(false,this.pageId,this.pageName,this.pageParam)
+          }
+          this.queryContentInteractCount()
         }
         }
-        this.queryContentInteractCount()
       }
       }
       console.log(TAG, '收藏点击 this.newsStatusOfUser', JSON.stringify(this.newsStatusOfUser))
       console.log(TAG, '收藏点击 this.newsStatusOfUser', JSON.stringify(this.newsStatusOfUser))
     })
     })

@@ -48,6 +48,7 @@ struct OtherNormalUserHomePage {
   @State userName:string = ""
   @State userName:string = ""
   @State headPhotoUrl:string = ""
   @State headPhotoUrl:string = ""
   @State levelHead:string = ""
   @State levelHead:string = ""
+  @State listLevelHead:string = ""
   @State levelId:number = 0
   @State levelId:number = 0
   @State browseNum:number = 0//阅读数
   @State browseNum:number = 0//阅读数
   @State commentNum:number = 0//评论数
   @State commentNum:number = 0//评论数
@@ -208,7 +209,7 @@ struct OtherNormalUserHomePage {
                 Stack({ alignContent: Alignment.Top }){
                 Stack({ alignContent: Alignment.Top }){
                   Tabs({controller: this.controller}) {
                   Tabs({controller: this.controller}) {
                     TabContent() {
                     TabContent() {
-                      OtherHomePageBottomCommentComponent({curUserId:this.curUserId,levelHead:this.levelHead,commentNum:$commentNum})
+                      OtherHomePageBottomCommentComponent({curUserId:this.curUserId,levelHead:this.listLevelHead,commentNum:$commentNum})
                     }
                     }
                     TabContent() {
                     TabContent() {
                       OtherHomePageBottomFollowComponent({curUserId:this.curUserId})
                       OtherHomePageBottomFollowComponent({curUserId:this.curUserId})
@@ -422,6 +423,7 @@ struct OtherNormalUserHomePage {
             this.levelHead = value[0].levelHead
             this.levelHead = value[0].levelHead
           }
           }
         }
         }
+        this.listLevelHead = value[0].levelHead
         this.levelId = value[0].level
         this.levelId = value[0].level
       }
       }
     }).catch((err:Error)=>{
     }).catch((err:Error)=>{

@@ -41,6 +41,8 @@ export struct DetailPlayVLivePage {
   @Consume @Watch('closeFullScreen') pageHide: number
   @Consume @Watch('closeFullScreen') pageHide: number
   @Consume contentId: string
   @Consume contentId: string
   @State swiperIndex: number = 1
   @State swiperIndex: number = 1
+  ///是否展示清屏按钮
+  @State showClearButton: boolean = false
   @Consume liveDetailPageLogic: LiveDetailPageLogic
   @Consume liveDetailPageLogic: LiveDetailPageLogic
   @Provide lastInputedComment: LiveRoomItemBean = {} as LiveRoomItemBean // 上次输入的消息
   @Provide lastInputedComment: LiveRoomItemBean = {} as LiveRoomItemBean // 上次输入的消息
   //播放错误
   //播放错误
@@ -198,6 +200,7 @@ export struct DetailPlayVLivePage {
           playerController: this.playerController,
           playerController: this.playerController,
           swiperController: this.swiperController,
           swiperController: this.swiperController,
           swiperIndex: $swiperIndex,
           swiperIndex: $swiperIndex,
+          showClearButton: $showClearButton
         })
         })
 
 
         // 直播资源加载失败
         // 直播资源加载失败
@@ -241,7 +244,7 @@ export struct DetailPlayVLivePage {
         Image($r('app.media.icon_live_more'))
         Image($r('app.media.icon_live_more'))
           .width(40)
           .width(40)
           .aspectRatio(1)
           .aspectRatio(1)
-          .visibility(this.swiperIndex === 0 ? Visibility.Visible : Visibility.Hidden)
+          .visibility(this.showClearButton ? Visibility.Visible : Visibility.Hidden)
           .position({ x: '100%', y: '100%' })
           .position({ x: '100%', y: '100%' })
           .markAnchor({ x: 56, y: this.bottomSafeHeight })
           .markAnchor({ x: 56, y: this.bottomSafeHeight })
           .onClick(() => {
           .onClick(() => {

@@ -130,13 +130,14 @@ export struct PlayUIComponent {
           })
           })
         if (this.contentDetailData.liveInfo?.liveState != 'wait') {
         if (this.contentDetailData.liveInfo?.liveState != 'wait') {
           //标题
           //标题
-          Text(this.contentDetailData.newsTitle)
-            .maxLines(1)
-            .textOverflow({ overflow: TextOverflow.MARQUEE })
+          Marquee({
+            start:true,
+            loop: 1,
+            src:this.contentDetailData.newsTitle
+          })
             .fontSize(this.displayDirection == DisplayDirection.VIDEO_HORIZONTAL ? '18vp' : '16vp')
             .fontSize(this.displayDirection == DisplayDirection.VIDEO_HORIZONTAL ? '18vp' : '16vp')
             .fontWeight(this.displayDirection == DisplayDirection.VIDEO_HORIZONTAL ? 600 : 500)
             .fontWeight(this.displayDirection == DisplayDirection.VIDEO_HORIZONTAL ? 600 : 500)
             .fontColor(Color.White)
             .fontColor(Color.White)
-            .textAlign(TextAlign.Start)
             .layoutWeight(1)
             .layoutWeight(1)
         } else {
         } else {
           Blank()
           Blank()

@@ -10,9 +10,9 @@ export struct PlayerInfoComponent {
   @Consume liveState: string
   @Consume liveState: string
   @Consume isShowControl: boolean
   @Consume isShowControl: boolean
   @Link swiperIndex: number
   @Link swiperIndex: number
+  @Link showClearButton: boolean
   @Provide isFullScreen: boolean = false // 判断是否全屏，全屏状态下swiper禁止切换
   @Provide isFullScreen: boolean = false // 判断是否全屏，全屏状态下swiper禁止切换
 
 
-
   build() {
   build() {
     Column() {
     Column() {
       Swiper(this.swiperController) {
       Swiper(this.swiperController) {
@@ -35,12 +35,23 @@ export struct PlayerInfoComponent {
           this.isShowControl = !this.isShowControl
           this.isShowControl = !this.isShowControl
         }
         }
       })
       })
-      .onChange((index) => {
-        this.swiperIndex = index
+      .onGestureSwipe((index: number, extraInfo: SwiperAnimationEvent) => {
+        this.dealShowClearButton(index,extraInfo.currentOffset)
+      })
+      .onAnimationEnd((index: number, extraInfo: SwiperAnimationEvent) => {
+        this.dealShowClearButton(index,extraInfo.currentOffset)
       })
       })
       .disableSwipe(this.isFullScreen)
       .disableSwipe(this.isFullScreen)
     }
     }
     .height('100%')
     .height('100%')
     .width('100%')
     .width('100%')
   }
   }
+  dealShowClearButton(index:number, currentOffset: number) {
+    this.swiperIndex = index
+    if (index == 0) {
+      this.showClearButton = currentOffset >= 0;
+    }else if (index == 1) {
+      this.showClearButton = false
+    }
+  }
 }
 }

@@ -9,15 +9,24 @@ import { ReportDeviceInfo } from './reportDeviceInfo/ReportDeviceInfo'
 import { common } from '@kit.AbilityKit'
 import { common } from '@kit.AbilityKit'
 
 
 class LoginJumpHandler implements JumpInterceptorAction {
 class LoginJumpHandler implements JumpInterceptorAction {
+
+  private logining = false
   
   
   /// 说明是调用了跳转 WDRouterPage.loginPage 页面的行为
   /// 说明是调用了跳转 WDRouterPage.loginPage 页面的行为
   on(params?: object | undefined, singleMode?: boolean | undefined): boolean {
   on(params?: object | undefined, singleMode?: boolean | undefined): boolean {
 
 
+    if (this.logining) {
+      return true
+    }
+    this.logining = true
+
     HuaweiAuth.sharedInstance().fetchAnonymousPhone().then((anonymousPhone) => {
     HuaweiAuth.sharedInstance().fetchAnonymousPhone().then((anonymousPhone) => {
 
 
       router.pushUrl({url: WDRouterPage.oneKeyLoginPage.url()})
       router.pushUrl({url: WDRouterPage.oneKeyLoginPage.url()})
+      this.logining = false
     }).catch((error: string) => {
     }).catch((error: string) => {
       router.pushUrl({url: WDRouterPage.loginPage.url()})
       router.pushUrl({url: WDRouterPage.loginPage.url()})
+      this.logining = false
     })
     })
     return true
     return true
   }
   }