Merge remote-tracking branch 'origin/main'

@@ -645,11 +645,13 @@ const app = Vue.createApp({
         if (state.isLogined == 1) {
         if (state.isLogined == 1) {
           // 已登录
           // 已登录
           if (window.config.VUE_BASE_NODE === 'dev') {
           if (window.config.VUE_BASE_NODE === 'dev') {
+            showButton.value = true
             showClook.value = true
             showClook.value = true
           } else {
           } else {
             clookStatus(true) // 查"关注"状态 ， 更新按钮上的文字
             clookStatus(true) // 查"关注"状态 ， 更新按钮上的文字
           }
           }
         } else {
         } else {
+          showButton.value = true
           showClook.value = true
           showClook.value = true
         }
         }
       }
       }

@@ -20,7 +20,7 @@ export struct PlayerInfoComponent {
         PlayerUIComponent({ playerController: this.playerController })
         PlayerUIComponent({ playerController: this.playerController })
           .margin({
           .margin({
           // bottom: this.bottomSafeHeight + 'px',
           // bottom: this.bottomSafeHeight + 'px',
-          top: this.topSafeHeight + 'px'
+          top:this.isFullScreen ? 0 : this.topSafeHeight + 'px'
         })
         })
       }
       }
       .cachedCount(2)
       .cachedCount(2)

@@ -59,7 +59,7 @@ export struct PlayerUIComponent {
         }
         }
         this.isFullScreen = true
         this.isFullScreen = true
       })
       })
-      .visibility(this.isSmall ? Visibility.Visible : Visibility.Hidden)
+      .visibility(!this.isFullScreen ? Visibility.Visible : Visibility.Hidden)
       .margin({ top:  301}) // 195 + 211 - 105
       .margin({ top:  301}) // 195 + 211 - 105
       .position({ x: '96.8%' })
       .position({ x: '96.8%' })
       .markAnchor({ x: '96.8%' })
       .markAnchor({ x: '96.8%' })

@@ -138,5 +138,6 @@ export struct PlayerProgressView {
         .visibility(this.isOpenDetail ? Visibility.None : Visibility.Visible)
         .visibility(this.isOpenDetail ? Visibility.None : Visibility.Visible)
       }
       }
     }
     }
+    .onDisAppear(() => clearTimeout(this.timer))
   }
   }
 }
 }