修复直播频道切换问题

@@ -121,35 +121,6 @@ export struct LiveHorizontalCardComponent {
   }
   }
 
 
   async gotoLive(content: ContentDTO) {
   async gotoLive(content: ContentDTO) {
-    const liveDetail = await LiveModel.getLiveDetails(content?.objectId || '', content?.relId || '', content?.relType || '')
-    if (content && content.objectType) {
-      if (content.objectType === ContentConstants.TYPE_LIVE) {
-        if (liveDetail && liveDetail[0] && liveDetail[0].liveInfo) {
-          const liveStyle = liveDetail[0].liveInfo.liveStyle
-          const liveState = liveDetail[0].liveInfo.liveState
-
-          console.error('liveDetail===', liveDetail)
-
-          let taskAction: Action = {
-            type: 'JUMP_DETAIL_PAGE',
-            params: {
-              detailPageType: 2,
-              contentID: content?.objectId,
-              liveStyle: liveState === 'wait' ? 0 : liveStyle,
-              extra: {
-                relType: content?.relType,
-                relId: content?.relId,
-              } as ExtraDTO
-            } as Params,
-          };
-          WDRouterRule.jumpWithAction(taskAction)
-          // Logger.debug(TAG, `gotoLive, ${content.objectId}`);
-        }
-      } else if (content.objectType === ContentConstants.TYPE_TELETEXT) {
-        ProcessUtils.processPage(content)
-      }
-    }
-
-
+    ProcessUtils.processPage(content)
   }
   }
 }
 }

@@ -32,19 +32,32 @@ export struct DetailPlayShortVideoPage {
   @Provide followStatus: string = '0' // 关注状态
   @Provide followStatus: string = '0' // 关注状态
   @Provide isOpenDetail: boolean = false // 查看详情按钮点击
   @Provide isOpenDetail: boolean = false // 查看详情按钮点击
   @Provide isDragging: boolean = false // 拖动时间进度条
   @Provide isDragging: boolean = false // 拖动时间进度条
+  @Consume @Watch('videoStatusChange') switchVideoStatus: boolean
   @Consume @Watch('pageShowChange') pageShow: number
   @Consume @Watch('pageShowChange') pageShow: number
-  @Consume @Watch('pageHideChange') pageHide: number
 
 
+  /**
+   * 页面显示重查用户关注、点赞等信息
+   */
   pageShowChange() {
   pageShowChange() {
-    if (this.currentIndex === this.index && this.playerController.getStatus() === PlayerConstants.STATUS_PAUSE) {
-      this.playerController.play()
+    if (this.currentIndex === this.index) {
       this.queryNewsInfoOfUser()
       this.queryNewsInfoOfUser()
+      if (this.switchVideoStatus) {
+        this.playerController.play()
+      }
     }
     }
   }
   }
 
 
-  pageHideChange() {
-    if (this.currentIndex === this.index && this.playerController.getStatus() === PlayerConstants.STATUS_START) {
-      this.playerController.pause()
+  /**
+   * 频道切换视频暂停、播放
+   * 页面显隐视频暂停、播放
+   */
+  videoStatusChange() {
+    if (this.currentIndex === this.index) {
+      if (this.switchVideoStatus) {
+        this.playerController.play()
+      } else {
+        this.playerController.pause()
+      }
     }
     }
   }
   }
 
 

@@ -22,12 +22,12 @@ export struct DetailVideoListPage {
   @Provide showComment: boolean = true
   @Provide showComment: boolean = true
   @Provide pageShow: number = -1
   @Provide pageShow: number = -1
   @Provide pageHide: number = -1
   @Provide pageHide: number = -1
+  @Provide switchVideoStatus: boolean = false
   @State data: ContentDetailDTO[] = []
   @State data: ContentDetailDTO[] = []
   @State testData: string[] = ['111', '222', '333']
   @State testData: string[] = ['111', '222', '333']
   @State currentIndex: number = 0
   @State currentIndex: number = 0
   @State interactDataList: InteractDataDTO[] = []
   @State interactDataList: InteractDataDTO[] = []
   @State isFullScreen: boolean = false
   @State isFullScreen: boolean = false
-  @State switchVideoStatus: boolean = false
 
 
   async aboutToAppear(): Promise<void> {
   async aboutToAppear(): Promise<void> {
     this.openFullScreen()
     this.openFullScreen()
@@ -57,13 +57,14 @@ export struct DetailVideoListPage {
   onPageShow(): void {
   onPageShow(): void {
     console.log(TAG, 'onPageShow')
     console.log(TAG, 'onPageShow')
     this.pageShow = Math.random()
     this.pageShow = Math.random()
+    this.switchVideoStatus = true
     this.openFullScreen()
     this.openFullScreen()
 
 
   }
   }
 
 
   onPageHide(): void {
   onPageHide(): void {
     console.log(TAG, 'onPageHide')
     console.log(TAG, 'onPageHide')
-    this.pageHide = Math.random()
+    this.switchVideoStatus = false
     this.closeFullScreen()
     this.closeFullScreen()
   }
   }
 
 

@@ -46,37 +46,43 @@ export struct VideoChannelDetail {
   private swiperController: SwiperController = new SwiperController()
   private swiperController: SwiperController = new SwiperController()
   @Provide showComment: boolean = false
   @Provide showComment: boolean = false
   @Provide windowWidth: number = AppStorage.get<number>('windowWidth') || 0
   @Provide windowWidth: number = AppStorage.get<number>('windowWidth') || 0
-  @Consume pageShow: number
-  @Consume pageHide: number
+  @Consume @Watch('pageShowChange') pageShow: number
+  @Consume @Watch('pageHideChange') pageHide: number
+  @Provide switchVideoStatus: boolean = false
   @State data: ContentDetailDTO[] = []
   @State data: ContentDetailDTO[] = []
   @State currentIndex: number = 0
   @State currentIndex: number = 0
   @State interactDataList: InteractDataDTO[] = []
   @State interactDataList: InteractDataDTO[] = []
   @State totalCount: number = 0
   @State totalCount: number = 0
   @State isMouted: boolean = false
   @State isMouted: boolean = false
 
 
+  pageShowChange() {
+    if (this.bottomNavIndex === 2 && this.topNavIndex === 0) {
+      this.barBackgroundColor = Color.Black
+      this.switchVideoStatus = true
+      this.openFullScreen()
+    }
+  }
+
+  pageHideChange() {
+    this.barBackgroundColor = Color.Transparent
+    this.switchVideoStatus = false
+    this.closeFullScreen()
+  }
+
   /**
   /**
    * 监听视频频道激活或失活
    * 监听视频频道激活或失活
    */
    */
   navIndexChange() {
   navIndexChange() {
-    // if (timer) clearTimeout(timer)
     console.log('navIndexChange', this.bottomNavIndex, this.topNavIndex)
     console.log('navIndexChange', this.bottomNavIndex, this.topNavIndex)
-    // timer = setTimeout(() => {
-
     if (this.bottomNavIndex === 2 && this.topNavIndex === 0) {
     if (this.bottomNavIndex === 2 && this.topNavIndex === 0) {
-      // 如果视频在暂停则播放视频
       this.barBackgroundColor = Color.Black
       this.barBackgroundColor = Color.Black
-      this.pageShow = Math.random()
+      this.switchVideoStatus = true
       this.openFullScreen()
       this.openFullScreen()
     } else {
     } else {
-      // 如果视频在播放则暂停视频
       this.barBackgroundColor = Color.Transparent
       this.barBackgroundColor = Color.Transparent
-      this.pageHide = Math.random()
+      this.switchVideoStatus = false
       this.closeFullScreen()
       this.closeFullScreen()
     }
     }
-    //   timer = -1
-    // }, 100)
-
-
   }
   }
 
 
   aboutToAppear() {
   aboutToAppear() {
@@ -91,16 +97,6 @@ export struct VideoChannelDetail {
     Logger.info(TAG, 'aboutToDisappear');
     Logger.info(TAG, 'aboutToDisappear');
   }
   }
 
 
-  onPageShow(): void {
-    this.openFullScreen()
-    Logger.info(TAG, 'onPageShow');
-  }
-
-  onPageHide(): void {
-    this.closeFullScreen()
-    Logger.info(TAG, 'onPageHide');
-  }
-
   /**
   /**
    * 开启沉浸式
    * 开启沉浸式
    * TODO:颜色待根据业务接口修改
    * TODO:颜色待根据业务接口修改