developOne / harmonyPool

Go to a project
Toggle navigation Toggle navigation pinning
wuyanan
a0d23c72 1 parent af44fc28

ref |> 修复竖屏直播竖屏流有两个全屏按钮问题

Inline Side-by-side
Showing 2 changed files with 30 additions and 30 deletions
@@ -59,7 +59,7 @@ export struct PlayerUIComponent { @@ -59,7 +59,7 @@ export struct PlayerUIComponent {
59 } 59 }
60 this.isFullScreen = true 60 this.isFullScreen = true
61 }) 61 })
62 - .visibility(!this.isFullScreen ? Visibility.Visible : Visibility.Hidden) 62 + .visibility(!this.isFullScreen && this.isSmall ? Visibility.Visible : Visibility.Hidden)
63 .margin({ top: 301}) // 195 + 211 - 105 63 .margin({ top: 301}) // 195 + 211 - 105
64 .position({ x: '96.8%' }) 64 .position({ x: '96.8%' })
65 .markAnchor({ x: '96.8%' }) 65 .markAnchor({ x: '96.8%' })
@@ -62,36 +62,36 @@ export struct PlayerVideoControlComponent { @@ -62,36 +62,36 @@ export struct PlayerVideoControlComponent {
62 }) 62 })
63 } 63 }
64 //全屏按钮 64 //全屏按钮
65 - if(!this.isSmall) {  
66 - Image($r('app.media.icon_live_player_full_screen'))  
67 - .height(32)  
68 - .width(32)  
69 - .padding(5)  
70 - .borderRadius($r('app.float.vp_16'))  
71 - .border({width:0.5})  
72 - .borderColor(0x4DFFFFFF)  
73 - .backgroundColor(0x4D222222)  
74 - .margin({right:10})  
75 - .onClick(() => {  
76 - WindowModel.shared.setSpecificSystemBarEnabled(false)  
77 - this.displayDirection = DisplayDirection.VIDEO_HORIZONTAL  
78 - WindowModel.shared.setPreferredOrientation(  
79 - window.Orientation.LANDSCAPE)  
80 - if(this.playerController){  
81 - // if(this.playerController.onVideoSizePlayerUIComponentMethod){  
82 - // this.playerController.onVideoSizePlayerUIComponentMethod(1,2) 65 + // if(!this.isSmall) {
  66 + // Image($r('app.media.icon_live_player_full_screen'))
  67 + // .height(32)
  68 + // .width(32)
  69 + // .padding(5)
  70 + // .borderRadius($r('app.float.vp_16'))
  71 + // .border({width:0.5})
  72 + // .borderColor(0x4DFFFFFF)
  73 + // .backgroundColor(0x4D222222)
  74 + // .margin({right:10})
  75 + // .onClick(() => {
  76 + // WindowModel.shared.setSpecificSystemBarEnabled(false)
  77 + // this.displayDirection = DisplayDirection.VIDEO_HORIZONTAL
  78 + // WindowModel.shared.setPreferredOrientation(
  79 + // window.Orientation.LANDSCAPE)
  80 + // if(this.playerController){
  81 + // // if(this.playerController.onVideoSizePlayerUIComponentMethod){
  82 + // // this.playerController.onVideoSizePlayerUIComponentMethod(1,2)
  83 + // // }
  84 + // if(this.playerController.onVideoSizePlayerComponentBack){
  85 + // this.playerController.onVideoSizePlayerComponentBack(1,2)
  86 + // }
  87 + //
  88 + // if(this.playerController.onVideoSizePlayerTitleComponentBack){
  89 + // this.playerController.onVideoSizePlayerTitleComponentBack(1,2)
  90 + // }
  91 + // }
  92 + // this.isFullScreen = true
  93 + // })
83 // } 94 // }
84 - if(this.playerController.onVideoSizePlayerComponentBack){  
85 - this.playerController.onVideoSizePlayerComponentBack(1,2)  
86 - }  
87 -  
88 - if(this.playerController.onVideoSizePlayerTitleComponentBack){  
89 - this.playerController.onVideoSizePlayerTitleComponentBack(1,2)  
90 - }  
91 - }  
92 - this.isFullScreen = true  
93 - })  
94 - }  
95 } 95 }
96 .alignItems(VerticalAlign.Center) 96 .alignItems(VerticalAlign.Center)
97 // .linearGradient({ angle: 0, colors: [['#99000000', 0], ['#00000000', 1]] }) 97 // .linearGradient({ angle: 0, colors: [['#99000000', 0], ['#00000000', 1]] })