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

* 'main' of http://192.168.1.42/developOne/harmonyPool:
  fix |>修复视频tabbar中视频在右没有声音的问题

@@ -44,6 +44,7 @@ export struct VideoChannelDetail {
   // private recommend?: string = '' // 0.非推荐，1.推荐；
   // private recommend?: string = '' // 0.非推荐，1.推荐；
   @Link @Watch('navIndexChange') bottomNavIndex: number
   @Link @Watch('navIndexChange') bottomNavIndex: number
   @Link @Watch('navIndexChange') topNavIndex: number
   @Link @Watch('navIndexChange') topNavIndex: number
+  @State navVideoIndex: number = 0
   @Prop @Watch('autoRefreshChange') autoRefresh: number = 0
   @Prop @Watch('autoRefreshChange') autoRefresh: number = 0
   @Consume barBackgroundColor: Color
   @Consume barBackgroundColor: Color
   private swiperController: SwiperController = new SwiperController()
   private swiperController: SwiperController = new SwiperController()
@@ -80,7 +81,7 @@ export struct VideoChannelDetail {
   @State endIndex: number = 0
   @State endIndex: number = 0
   @Link isRefreshList: boolean
   @Link isRefreshList: boolean
   autoRefreshChange() {
   autoRefreshChange() {
-    if (this.topNavIndex === 0 && !this.isRequesting) {
+    if (this.topNavIndex === this.navVideoIndex && !this.isRequesting) {
       this.data = []
       this.data = []
       this.interactDataList = []
       this.interactDataList = []
       this.totalCount = 0
       this.totalCount = 0
@@ -92,7 +93,7 @@ export struct VideoChannelDetail {
 
 
   pageShowChange() {
   pageShowChange() {
 
 
-    if (this.bottomNavIndex === 2 && this.topNavIndex === 0) {
+    if (this.bottomNavIndex === 2 && this.topNavIndex === this.navVideoIndex) {
       this.barBackgroundColor = Color.Black
       this.barBackgroundColor = Color.Black
       this.switchVideoStatus = true
       this.switchVideoStatus = true
       this.openFullScreen()
       this.openFullScreen()
@@ -119,7 +120,7 @@ export struct VideoChannelDetail {
    */
    */
   navIndexChange() {
   navIndexChange() {
     // console.log('navIndexChange', this.bottomNavIndex, this.topNavIndex)
     // console.log('navIndexChange', this.bottomNavIndex, this.topNavIndex)
-    if (this.bottomNavIndex === 2 && this.topNavIndex === 0) {
+    if (this.bottomNavIndex === 2 && this.topNavIndex === this.navVideoIndex) {
       // this.barBackgroundColor = Color.Black
       // this.barBackgroundColor = Color.Black
       this.switchVideoStatus = true
       this.switchVideoStatus = true
       this.openFullScreen()
       this.openFullScreen()

@@ -326,6 +326,7 @@ export struct VideoChannelPage {
           VideoChannelDetail({
           VideoChannelDetail({
             bottomNavIndex: $_currentNavIndex,
             bottomNavIndex: $_currentNavIndex,
             topNavIndex: $currentTopNavSelectedIndex,
             topNavIndex: $currentTopNavSelectedIndex,
+            navVideoIndex:index,
             groupId: this.groupId + '',
             groupId: this.groupId + '',
             pageId: item.pageId + '',
             pageId: item.pageId + '',
             pageName: item.name + '',
             pageName: item.name + '',