zhenghy

fix: 16640

@@ -81,7 +81,7 @@ export class WindowModel { @@ -81,7 +81,7 @@ export class WindowModel {
81 81
82 setWindowKeepScreenOn(isKeepScreenOn: boolean) { 82 setWindowKeepScreenOn(isKeepScreenOn: boolean) {
83 this.windowStage?.getMainWindow((err, windowClass: window.Window) => { 83 this.windowStage?.getMainWindow((err, windowClass: window.Window) => {
84 - windowClass.setWindowKeepScreenOn(isKeepScreenOn, (err: BusinessError) => { 84 + windowClass?.setWindowKeepScreenOn(isKeepScreenOn, (err: BusinessError) => {
85 const errCode: number = err.code; 85 const errCode: number = err.code;
86 if (errCode) { 86 if (errCode) {
87 console.error(WindowModel.TAG + '设置屏幕常亮:' + isKeepScreenOn + ',失败: ' + JSON.stringify(err)); 87 console.error(WindowModel.TAG + '设置屏幕常亮:' + isKeepScreenOn + ',失败: ' + JSON.stringify(err));
@@ -179,9 +179,11 @@ export struct DetailPlayShortVideoPage { @@ -179,9 +179,11 @@ export struct DetailPlayShortVideoPage {
179 .height(this.videoLandScape === 1 ? '100%' : 'auto') 179 .height(this.videoLandScape === 1 ? '100%' : 'auto')
180 .width('100%') 180 .width('100%')
181 .margin({ 181 .margin({
182 - bottom: this.videoLandScape === 1 ? 130 : 0,  
183 top: this.topSafeHeight + 'px' 182 top: this.topSafeHeight + 'px'
184 }) 183 })
  184 + .padding({
  185 + bottom: this.videoLandScape === 1 ? 115 : 0,
  186 + })
185 .align(this.videoLandScape === 0 ? Alignment.Top : Alignment.Center) 187 .align(this.videoLandScape === 0 ? Alignment.Top : Alignment.Center)
186 .onClick(() => { 188 .onClick(() => {
187 console.error('WDPlayerRenderView=== onClick') 189 console.error('WDPlayerRenderView=== onClick')
@@ -17,7 +17,7 @@ export struct PlayerCommentView { @@ -17,7 +17,7 @@ export struct PlayerCommentView {
17 }) 17 })
18 18
19 TextInput({ placeholder: '说两句...', text: this.comment }) 19 TextInput({ placeholder: '说两句...', text: this.comment })
20 - .placeholderColor(Color.White) 20 + .placeholderColor('#999999')
21 .placeholderFont({ size: 14 }) 21 .placeholderFont({ size: 14 })
22 .fontColor(Color.White) 22 .fontColor(Color.White)
23 .fontSize(14) 23 .fontSize(14)
@@ -30,7 +30,12 @@ export struct PlayerCommentView { @@ -30,7 +30,12 @@ export struct PlayerCommentView {
30 } 30 }
31 .backgroundColor(Color.Black) 31 .backgroundColor(Color.Black)
32 .alignItems(VerticalAlign.Center) 32 .alignItems(VerticalAlign.Center)
33 - .padding({ left: 16, right: 16, top: 11, bottom: 11 }) 33 + .padding({
  34 + left: 16,
  35 + right: 16,
  36 + top: 11,
  37 + bottom: 11
  38 + })
34 .visibility(this.isOpenDetail ? Visibility.None : Visibility.Visible) 39 .visibility(this.isOpenDetail ? Visibility.None : Visibility.Visible)
35 } 40 }
36 } 41 }
@@ -170,7 +170,7 @@ export struct PlayerRightView { @@ -170,7 +170,7 @@ export struct PlayerRightView {
170 .width(58) 170 .width(58)
171 .position({ x: '100%', y: '100%' }) 171 .position({ x: '100%', y: '100%' })
172 .markAnchor({ x: '100%', y: '100%' }) 172 .markAnchor({ x: '100%', y: '100%' })
173 - .padding({ bottom: 0, right: 10 }) 173 + .padding({ bottom: 60, right: 10 })
174 .visibility(this.isOpenDetail || this.isDragging ? Visibility.None : Visibility.Visible) 174 .visibility(this.isOpenDetail || this.isDragging ? Visibility.None : Visibility.Visible)
175 175
176 } 176 }
@@ -220,7 +220,7 @@ export struct PlayerRightView { @@ -220,7 +220,7 @@ export struct PlayerRightView {
220 if (this.likesStyle === 1) { 220 if (this.likesStyle === 1) {
221 return { 221 return {
222 url: this.newsStatusOfUser.likeStatus === '1' ? $r(`app.media.ic_like_check`) : $r(`app.media.ic_like_uncheck`), 222 url: this.newsStatusOfUser.likeStatus === '1' ? $r(`app.media.ic_like_check`) : $r(`app.media.ic_like_uncheck`),
223 - name: '赞' 223 + name: '赞'
224 } 224 }
225 } else if (this.likesStyle === 2) { 225 } else if (this.likesStyle === 2) {
226 return { 226 return {