修复频道切换

@@ -20,4 +20,5 @@ export interface Params {
   // 17.多图（图集）详情页
   detailPageType?: number; // 详情页类型
   liveStyle?: number; // 直播类型：0横屏，1竖屏
+  creatorId?: string; //号主id
 }

@@ -18,12 +18,15 @@ export struct BottomNavigationComponent {
   @Provide bottomRectHeight: number = 0
   @Provide topRectHeight: number = 0
   @Provide isLayoutFullScreen: boolean = false
+  @Provide isImmersive: boolean = false // 是否开启沉浸式模式 http://192.168.1.3:3300/project/3802/interface/api/189229
+  @Provide isNight: boolean = false // 是否开启夜间模式
   @State bottomSafeHeight: number = AppStorage.get<number>('bottomSafeHeight') || 0
   @State topSafeHeight: number = AppStorage.get<number>('topSafeHeight') || 0
   // 底导/顶导全部数据
   @State @Watch('onBottomNavigationDataUpdated') bottomNavList: BottomNavDTO[] = []
   // 底导当前选中/焦点下标
   @State currentNavIndex: number = BottomNavi.NEWS;
+  // @State currentTopNavSelectedIndex: number = 0; //
   @State barBackgroundColor: Color = Color.Transparent
   // 底导TabsController
   private navController: TabsController = new TabsController();

@@ -151,36 +151,25 @@ export struct TopNavigationComponent {
   }
 
   indexChange() {
-    if (this._currentNavIndex === 2 && this.currentTopNavSelectedIndex === 0 && this.changeBarBackgroundColor) {
-      this.barBackgroundColor = Color.Black
-      this.changeBarBackgroundColor(this.barBackgroundColor)
-    } else {
-      this.barBackgroundColor = Color.Transparent
-      this.changeBarBackgroundColor(this.barBackgroundColor)
-    }
 
+    // 判断视频频道待处理
     if (this._currentNavIndex === 2 && this.currentTopNavSelectedIndex == 0) {
-      if (!this.isLayoutFullScreen) {
-        const windowStage = WindowModel.shared.getWindowStage() as window.WindowStage
-        const windowClass: window.Window = windowStage.getMainWindowSync(); // 获取应用主窗口
-        windowClass.setWindowLayoutFullScreen(true).then(() => {
+      this.barBackgroundColor = Color.Black
+      this.changeBarBackgroundColor && this.changeBarBackgroundColor(this.barBackgroundColor)
+      WindowModel.shared.setWindowSystemBarProperties({ statusBarContentColor: '#ffffff', })
+      WindowModel.shared.setWindowLayoutFullScreen(true)
       this.isLayoutFullScreen = true
       this.bottomRectHeight = this.bottomSafeHeight
       this.topRectHeight = this.topSafeHeight
-        })
-      }
 
     } else {
-      if (this.isLayoutFullScreen) {
-        const windowStage = WindowModel.shared.getWindowStage() as window.WindowStage
-        const windowClass: window.Window = windowStage.getMainWindowSync(); // 获取应用主窗口
-        windowClass.setWindowLayoutFullScreen(false).then(() => {
+      this.barBackgroundColor = Color.Transparent
+      this.changeBarBackgroundColor && this.changeBarBackgroundColor(this.barBackgroundColor)
+      WindowModel.shared.setWindowSystemBarProperties({ statusBarContentColor: '#000000', })
+      WindowModel.shared.setWindowLayoutFullScreen(false)
       this.isLayoutFullScreen = false
       this.bottomRectHeight = 0
       this.topRectHeight = 0
-          console.error(' this.isLayoutFullScreen ', this.isLayoutFullScreen)
-        })
-      }
     }
   }
 

-import { window } from '@kit.ArkUI'
-import { NumberFormatterUtils, WindowModel } from 'wdKit/Index'
-
-import { devicePLSensorManager } from 'wdDetailPlayApi/Index'
-import { DateFormatUtil, WDPlayerController } from 'wdPlayer/Index'
-import { LiveDetailsBean, LiveRoomDataBean } from 'wdBean/Index'
-
-@Entry
-@Component
-export struct PlayVUIComponent {
-  playerController: WDPlayerController = new WDPlayerController();
-  //菜单键是否可见
-  @State isMenuVisible: boolean = true
-  @State isFullScreen: boolean = false
-  @Consume liveDetailsBean: LiveDetailsBean
-  @Consume liveRoomDataBean: LiveRoomDataBean
-  @State currentTime: string = ''
-  @State totalTime: string = ''
-  @State progressVal: number = 0;
-  //是否处于播放状态中
-  @State isPlayStatus: boolean = true
-
-  aboutToAppear(): void {
-    //播放进度监听
-    this.playerController.onTimeUpdate = (position: number, duration: number) => {
-      this.currentTime = DateFormatUtil.secondToTime(Math.floor(position / 1000));
-      this.totalTime = DateFormatUtil.secondToTime(Math.floor(duration / 1000));
-      this.progressVal = Math.floor(position * 100 / duration);
-    }
-  }
-
-  build() {
-    Column() {
-      this.getTopUIComponent()
-      this.getMiddleUIComponent()
-      this.getBottomUIComponent()
-    }
-    .width('100%')
-    .height('100%')
-    .alignItems(HorizontalAlign.Start)
-  }
-
-  @Builder
-  getTopUIComponent() {
-    Column() {
-      Row() {
-        Image($r('app.media.icon_arrow_left_white'))
-          .width(24)
-          .aspectRatio(1)
-          .visibility(Visibility.None)
-          .margin({
-            right: 10
-          })
-        if (this.liveDetailsBean.liveInfo?.liveState != 'wait') {
-          Text(this.liveDetailsBean.newsTitle)
-            .maxLines(1)
-            .textOverflow({ overflow: TextOverflow.Ellipsis })
-            .fontSize('16fp')
-            .fontWeight(500)
-            .fontColor(Color.White)
-            .textAlign(TextAlign.Start)
-            .layoutWeight(1)
-        } else {
-          Blank()
-        }
-        Image($r('app.media.icon_share'))
-          .width(24)
-          .aspectRatio(1)
-          .visibility(Visibility.None)
-      }
-      .width('100%')
-      .alignItems(VerticalAlign.Center)
-      .margin({
-        bottom: 10
-      })
-
-      this.getLiveStatusView()
-    }.width('100%')
-    .padding({
-      top: 20,
-      bottom: 6,
-      left: 10,
-      right: 10
-    })
-    .alignItems(HorizontalAlign.Start)
-    .visibility(this.isMenuVisible ? Visibility.Visible : Visibility.None)
-  }
-
-  @Builder
-  getLiveStatusView() {
-    // 直播新闻-直播状态  wait待开播running直播中end已结束cancel已取消paused暂停
-    // 预约
-    if (this.liveDetailsBean.liveInfo?.liveState == 'wait') {
-      Row() {
-        Image($r('app.media.icon_live_status_wait'))
-          .width(22)
-          .height(18)
-        Text('预约')
-          .fontSize('11fp')
-          .fontWeight(400)
-          .fontColor(Color.White)
-      }
-      .backgroundColor('#4D000000')
-      .padding({
-        top: 1,
-        right: 4,
-        bottom: 1
-      })
-    }
-    // 直播中
-    else if (this.liveDetailsBean.liveInfo?.liveState == 'running') {
-      Row() {
-        Image($r('app.media.icon_live_status_running'))
-          .width(22)
-          .height(18)
-        Text('直播中')
-          .fontSize('11fp')
-          .fontWeight(400)
-          .fontColor(Color.White)
-        Image($r('app.media.icon_live_player_status_end'))
-          .width(12)
-          .height(12)
-        Text(`${NumberFormatterUtils.formatNumberWithWan(this.liveRoomDataBean.pv)}人参与`)
-          .fontSize('11fp')
-          .fontWeight(400)
-          .fontColor(Color.White)
-      }
-      .backgroundColor('#4D000000')
-      .padding({
-        top: 1,
-        right: 4,
-        bottom: 1
-      })
-    }
-    //回看
-    else if (this.liveDetailsBean.liveInfo?.liveState == 'end') {
-      Row() {
-        Text('回看')
-          .fontSize('11fp')
-          .fontWeight(400)
-          .fontColor(Color.White)
-        Image($r('app.media.icon_live_player_status_end'))
-          .width(12)
-          .height(12)
-        Text(`${NumberFormatterUtils.formatNumberWithWan(this.liveRoomDataBean.pv)}人参与`)
-          .fontSize('11fp')
-          .fontWeight(400)
-          .fontColor(Color.White)
-      }
-      .backgroundColor('#4D000000')
-      .padding({
-        left: 4,
-        top: 1,
-        right: 4,
-        bottom: 1
-      })
-    }
-  }
-
-  @Builder
-  getMiddleUIComponent() {
-    Stack()
-      .layoutWeight(1)
-      .width('100%')
-      .onClick(() => {
-        this.isMenuVisible = !this.isMenuVisible
-      })
-  }
-
-  @Builder
-  getBottomUIComponent() {
-    Row() {
-      if (this.liveDetailsBean?.liveInfo?.liveState == 'end') {
-        this.playOrPauseBtn()
-        Text(this.currentTime)
-          .fontColor(Color.White)
-          .fontWeight(600)
-          .fontSize('12fp')
-          .margin({
-            left: 16
-          })
-
-        this.playProgressView()
-
-        Text(this.totalTime)
-          .fontColor(Color.White)
-          .fontWeight(600)
-          .fontSize('12fp')
-          .margin({
-            right: 16
-          })
-      } else {
-        Blank()
-      }
-      Image($r('app.media.icon_live_player_full_screen'))
-        .width(24)
-        .height(24)
-        .onClick(() => {
-          this.isFullScreen = !this.isFullScreen
-          WindowModel.shared.setPreferredOrientation(this.isFullScreen ? window.Orientation.LANDSCAPE : window.Orientation.PORTRAIT);
-          devicePLSensorManager.devicePLSensorOn(this.isFullScreen ? window.Orientation.LANDSCAPE : window.Orientation.PORTRAIT);
-        })
-    }
-    .alignItems(VerticalAlign.Center)
-    .linearGradient({ angle: 0, colors: [['#99000000', 0], ['#00000000', 1]] })
-    .width('100%')
-    .padding({
-      left: 10,
-      right: 10,
-      top: 15,
-      bottom: 15
-    })
-    .visibility(this.isMenuVisible ? Visibility.Visible : Visibility.None)
-  }
-
-  @Builder
-  playOrPauseBtn() {
-    //暂停、播放
-    Image(this.isPlayStatus ? $r('app.media.icon_live_player_pause') : $r('app.media.player_play_ic'))
-      .width(24)
-      .height(24)
-      .onClick(() => {
-        if (this.isPlayStatus) {
-          this.isPlayStatus = false
-          this.playerController.pause()
-        } else {
-          this.isPlayStatus = true
-          this.playerController.play()
-        }
-      })
-  }
-
-  @Builder
-  playProgressView() {
-    Slider({
-      value: this.progressVal,
-      step: 1,
-      style: SliderStyle.OutSet
-    })
-      .blockSize({
-        width: 18,
-        height: 12
-      })// .blockStyle({
-        //   type: SliderBlockType.IMAGE,
-        //   image: $r('app.media.ic_player_block')
-        // })
-      .blockColor(Color.White)
-      .trackColor('#4DFFFFFF')
-      .selectedColor('#FFED2800')
-      .height(14)
-      .trackThickness(1)
-      .layoutWeight(1)
-      .margin({
-        left: 8,
-        right: 8
-      })
-      .onChange((value: number, mode: SliderChangeMode) => {
-        this.playerController?.setSeekTime(value, mode);
-      })
-  }
-}
\ No newline at end of file

@@ -15,14 +15,19 @@ export struct PlayerUIComponent {
       //   // 全屏按钮
       // }.layoutWeight(1)
 
-      Row() {
+
       PlayerCommentComponent()
+        .visibility(this.isShowControl ? Visibility.Hidden : Visibility.Visible)
+        .animation({ duration: 500 })
+        .position({ y: '100%' })
+        .markAnchor({ y: '100%' })
+      
       PlayerVideoControlComponent({ playerController: this.playerController })
         .visibility(this.isShowControl ? Visibility.Visible : Visibility.Hidden)
         .animation({ duration: 500 })
-      }
         .position({ y: '100%' })
         .markAnchor({ y: '100%' })
+
     }
     .height('100%')
     .width('100%')

@@ -4,7 +4,6 @@ import { ResponseDTO } from 'wdNetwork/Index';
 import { DetailPlayShortVideoPage } from './DetailPlayShortVideoPage'
 import router from '@ohos.router';
 import { contentListParams } from 'wdDetailPlayApi/src/main/ets/request/ContentDetailRequest';
-import window from '@ohos.window';
 import { WindowModel } from 'wdKit';
 
 const storage = LocalStorage.getShared();
@@ -31,16 +30,16 @@ export struct DetailVideoListPage {
     /**
      * 开启沉浸式并设置状态栏颜色
      */
-    const windowStage = WindowModel.shared.getWindowStage() as window.WindowStage
-    const windowClass: window.Window = windowStage.getMainWindowSync();
-    windowClass.setWindowLayoutFullScreen(true)
-    this.isFullScreen = true
-    windowClass.setWindowSystemBarProperties({
-      statusBarContentColor: '#ffffff',
-    })
+    // const windowStage = WindowModel.shared.getWindowStage() as window.WindowStage
+    // const windowClass: window.Window = windowStage.getMainWindowSync();
+    // windowClass.setWindowLayoutFullScreen(true)
+    // this.isFullScreen = true
+    // windowClass.setWindowSystemBarProperties({
+    //   statusBarContentColor: '#ffffff',
+    // })
 
 
-    let data: ContentDetailDTO[] = []
+    // let data: ContentDetailDTO[] = []
     let action: Action = router.getParams() as Action
     if (action) {
       this.contentId = action.params?.contentID || ''
@@ -63,17 +62,6 @@ export struct DetailVideoListPage {
 
     await this.queryVideoList()
 
-    // await ContentDetailRequest.postRecommendVideoList({
-    //   pageSize: 5,
-    //   refreshCnt: 1
-    // }).then(res => {
-    //   if (res.data) {
-    //     data = data.concat(res.data)
-    //   }
-    //   console.log('res1===', JSON.stringify(res))
-    //   console.log('res==' + this.data)
-    // })
-
 
     if (this.data.length > 0) {
       const params: contentListParams = {
@@ -103,37 +91,18 @@ export struct DetailVideoListPage {
   }
 
   aboutToDisappear(): void {
-
-    const windowStage = WindowModel.shared.getWindowStage() as window.WindowStage
-    const windowClass: window.Window = windowStage.getMainWindowSync(); // 获取应用主窗口
-    windowClass.setWindowLayoutFullScreen(false)
-    this.isFullScreen = false
-    windowClass.setWindowSystemBarProperties({ statusBarContentColor: '#000000' })
-
+    WindowModel.shared.setWindowSystemBarProperties({ statusBarContentColor: '#000000', })
+    WindowModel.shared.setWindowLayoutFullScreen(false)
   }
 
   onPageShow(): void {
-    if (!this.isFullScreen) {
-      const windowStage = WindowModel.shared.getWindowStage() as window.WindowStage
-      const windowClass: window.Window = windowStage.getMainWindowSync();
-      windowClass.setWindowLayoutFullScreen(true)
-      this.isFullScreen = true
-      windowClass.setWindowSystemBarProperties({
-        statusBarContentColor: '#ffffff',
-      })
-
-    }
+    WindowModel.shared.setWindowSystemBarProperties({ statusBarContentColor: '#ffffff', })
+    WindowModel.shared.setWindowLayoutFullScreen(true)
   }
 
   onPageHide(): void {
-    if (this.isFullScreen) {
-      const windowStage = WindowModel.shared.getWindowStage() as window.WindowStage
-      const windowClass: window.Window = windowStage.getMainWindowSync(); // 获取应用主窗口
-      windowClass.setWindowLayoutFullScreen(false)
-      this.isFullScreen = false
-      windowClass.setWindowSystemBarProperties({ statusBarContentColor: '#000000' })
-    }
-
+    WindowModel.shared.setWindowSystemBarProperties({ statusBarContentColor: '#000000', })
+    WindowModel.shared.setWindowLayoutFullScreen(false)
   }
 
   /**

-import { ContentDetailDTO, InteractDataDTO, RmhInfoDTO, UserInfoDTO } from 'wdBean/Index';
+import { ContentDetailDTO, InteractDataDTO, Params, RmhInfoDTO, UserInfoDTO } from 'wdBean/Index';
 import {
   batchLikeAndCollectParams,
   batchLikeAndCollectResult,
@@ -8,10 +8,11 @@ import {
   postExecuteLikeParams,
   postInteractAccentionOperateParams
 } from 'wdDetailPlayApi/src/main/ets/request/ContentDetailRequest';
-import { ToastUtils } from 'wdKit';
+import { SPHelper, ToastUtils } from 'wdKit';
 import { HttpUrlUtils } from 'wdNetwork/Index';
 import { WDPlayerController } from 'wdPlayer/Index';
 import { WDRouterPage, WDRouterRule } from 'wdRouter/Index';
+import { SpConstants } from 'wdConstant/Index'
 
 export interface OperationItem {
   icon: Resource;
@@ -64,9 +65,10 @@ export struct OperationListView {
   /**
    * 点赞、取消点赞
    */
-  toggleLikeStatus() {
+  async toggleLikeStatus() {
     // 未登录，跳转登录
-    if (!HttpUrlUtils.getUserId()) {
+    const user_id = await SPHelper.default.get(SpConstants.USER_ID, '')
+    if (!user_id) {
       this.playerController?.pause()
       WDRouterRule.jumpWithPage(WDRouterPage.loginPage)
       return
@@ -77,10 +79,16 @@ export struct OperationListView {
       contentType: this.contentDetailData?.newsType + '',
     }
     ContentDetailRequest.postExecuteLike(params).then(res => {
-      console.log('toggleLikeStatus==',)
+
       if (this.newsStatusOfUser) {
         this.newsStatusOfUser.likeStatus = this.newsStatusOfUser?.likeStatus === '1' ? '0' : '1'
-        this.queryContentInteractCount()
+        if (this.newsStatusOfUser.likeStatus === '1') {
+          this.interactData.likeNum = Number(this.interactData.likeNum) + 1
+        } else {
+          this.interactData.likeNum = Number(this.interactData.likeNum) - 1
+        }
+        console.log('点赞、取消点赞==', this.newsStatusOfUser?.likeStatus, this.interactData?.likeNum)
+        // this.queryContentInteractCount()
       }
 
     })
@@ -89,9 +97,10 @@ export struct OperationListView {
   /**
    * 收藏、取消收藏
    */
-  toggleCollectStatus() {
+  async toggleCollectStatus() {
     // 未登录，跳转登录
-    if (!HttpUrlUtils.getUserId()) {
+    const user_id = await SPHelper.default.get(SpConstants.USER_ID, '')
+    if (!user_id) {
       WDRouterRule.jumpWithPage(WDRouterPage.loginPage)
       return
     }
@@ -104,10 +113,15 @@ export struct OperationListView {
 
     }
     ContentDetailRequest.postExecuteCollectRecord(params).then(res => {
-      console.log('toggleLikeStatus==',)
       if (this.newsStatusOfUser) {
         this.newsStatusOfUser.collectStatus = this.newsStatusOfUser?.collectStatus === 1 ? 0 : 1
-        this.queryContentInteractCount()
+        // this.queryContentInteractCount()
+        if (this.newsStatusOfUser.collectStatus === 1) {
+          this.interactData.collectNum = Number(this.interactData.collectNum) + 1
+        } else {
+          this.interactData.collectNum = Number(this.interactData.collectNum) - 1
+        }
+        console.log('收藏、取消收藏==', this.newsStatusOfUser?.collectStatus, this.interactData?.collectNum)
       }
     })
 
@@ -140,9 +154,10 @@ export struct OperationListView {
   /**
    * 关注号主
    */
-  handleAccention() {
+  async handleAccention() {
     // 未登录，跳转登录
-    if (!HttpUrlUtils.getUserId()) {
+    const user_id = await SPHelper.default.get(SpConstants.USER_ID, '')
+    if (!user_id) {
       WDRouterRule.jumpWithPage(WDRouterPage.loginPage)
       return
     }
@@ -181,7 +196,15 @@ export struct OperationListView {
             })
             .id("row1")
             .onClick(() => {
+              if (this.contentDetailData.rmhInfo?.cnMainControl === 1) {
                 // 号主页
+                const params: Params = {
+                  creatorId: this.contentDetailData.rmhInfo.rmhId,
+                  pageID: ''
+                }
+                WDRouterRule.jumpWithPage(WDRouterPage.peopleShipHomePage, params)
+              }
+
             })
           if (this.followStatus == '0') {
             Image($r('app.media.ic_add'))