Merge remote-tracking branch 'origin/main'

@@ -93,12 +93,14 @@ export struct DetailPlayShortVideoPage {
   async videoStatusChange() {
   async videoStatusChange() {
     if (this.currentIndex === this.index) {
     if (this.currentIndex === this.index) {
       if (this.switchVideoStatus && this.isPlay && this.onlyWifiLoadVideo) {
       if (this.switchVideoStatus && this.isPlay && this.onlyWifiLoadVideo) {
-        await this.playerController.play()
+        // await this.playerController.play()
+        this.playerController?.switchPlayOrPause();
         await this.playerController.startRenderFrame(() => {
         await this.playerController.startRenderFrame(() => {
           this.imageVisible = false
           this.imageVisible = false
         })
         })
       } else {
       } else {
-        this.playerController.stop()
+        // this.playerController.stop()
+        this.playerController.pause()
       }
       }
     }
     }
   }
   }
@@ -246,7 +248,8 @@ export struct DetailPlayShortVideoPage {
   async aboutToDisappear(): Promise<void> {
   async aboutToDisappear(): Promise<void> {
     console.log(TAG, 'aboutToDisappear', this.index)
     console.log(TAG, 'aboutToDisappear', this.index)
     await this.playerController?.pause()
     await this.playerController?.pause()
-    await this.playerController?.release();
+    // await this.playerController?.stop()
+    // await this.playerController?.release();
   }
   }
 
 
   /**
   /**
@@ -266,6 +269,7 @@ export struct DetailPlayShortVideoPage {
     //   height = rect.width
     //   height = rect.width
     // }
     // }
     // 视频宽高比屏幕大，则宽度撑满
     // 视频宽高比屏幕大，则宽度撑满
+    //console.log(`cj2024 ratio = ${this.ratio} width / height = ${width / height}`)
     if (this.ratio > width / height) {
     if (this.ratio > width / height) {
       this.playerWidth = '100%'
       this.playerWidth = '100%'
       this.playerHeight = px2vp(width / this.ratio)
       this.playerHeight = px2vp(width / this.ratio)
@@ -274,7 +278,7 @@ export struct DetailPlayShortVideoPage {
       this.playerHeight = '100%'
       this.playerHeight = '100%'
       this.playerWidth = px2vp(height * this.ratio)
       this.playerWidth = px2vp(height * this.ratio)
     }
     }
-    console.log('calculatePlayerRect=====', width, height)
+    //console.log('cj2024 calculatePlayerRect=====', width, height,px2vp(this.windowHeight),this.playerHeight)
 
 
   }
   }
 
 
@@ -321,6 +325,7 @@ export struct DetailPlayShortVideoPage {
           }
           }
 
 
         }
         }
+        // .backgroundColor(Color.Green)
         .width('100%')
         .width('100%')
         .layoutWeight(1)
         .layoutWeight(1)
         .onClick(() => {
         .onClick(() => {
@@ -467,6 +472,8 @@ export struct DetailPlayShortVideoPage {
     }
     }
     .width('100%')
     .width('100%')
     .height('100%')
     .height('100%')
+    // .backgroundColor(Color.Orange)
+    // .opacity(0.2)
 
 
   }
   }