Showing
3 changed files
with
34 additions
and
15 deletions
| @@ -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: 72, right: 10 }) | 173 | + .padding({ bottom: 10, 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 | } |
| @@ -229,7 +229,8 @@ export struct PlayerRightView { | @@ -229,7 +229,8 @@ export struct PlayerRightView { | ||
| 229 | } | 229 | } |
| 230 | } else if (this.likesStyle === 3) { | 230 | } else if (this.likesStyle === 3) { |
| 231 | return { | 231 | return { |
| 232 | - url: this.newsStatusOfUser.likeStatus === '1' ? $r(`app.media.ic_candle_check`) : $r(`app.media.ic_candle_uncheck`), | 232 | + url: this.newsStatusOfUser.likeStatus === '1' ? $r(`app.media.ic_candle_check`) : |
| 233 | + $r(`app.media.ic_candle_uncheck`), | ||
| 233 | name: '默哀' | 234 | name: '默哀' |
| 234 | } | 235 | } |
| 235 | } | 236 | } |
| @@ -239,13 +240,17 @@ export struct PlayerRightView { | @@ -239,13 +240,17 @@ export struct PlayerRightView { | ||
| 239 | } | 240 | } |
| 240 | 241 | ||
| 241 | transNum2String(name: 'likeNum' | 'collectNum' | 'commentNum') { | 242 | transNum2String(name: 'likeNum' | 'collectNum' | 'commentNum') { |
| 242 | - console.log(TAG, 'transNum2String', this.interactData.likeNum, this.interactData.collectNum, this.interactData.commentNum) | 243 | + console.log(TAG, 'transNum2String', this.interactData.likeNum, this.interactData.collectNum, |
| 244 | + this.interactData.commentNum) | ||
| 243 | if (name === 'likeNum') { | 245 | if (name === 'likeNum') { |
| 244 | - return this.interactData.likeNum != 0 ? NumberFormatterUtils.formatNumberWithWan(this.interactData.likeNum || '') : '' | 246 | + return this.interactData.likeNum != 0 ? |
| 247 | + NumberFormatterUtils.formatNumberWithWan(this.interactData.likeNum || '') : '' | ||
| 245 | } else if (name === 'collectNum') { | 248 | } else if (name === 'collectNum') { |
| 246 | - return this.interactData.collectNum != 0 ? NumberFormatterUtils.formatNumberWithWan(this.interactData.collectNum || '') : '' | 249 | + return this.interactData.collectNum != 0 ? |
| 250 | + NumberFormatterUtils.formatNumberWithWan(this.interactData.collectNum || '') : '' | ||
| 247 | } else { | 251 | } else { |
| 248 | - return this.interactData.commentNum != 0 ? NumberFormatterUtils.formatNumberWithWan(this.interactData.commentNum || '') : '' | 252 | + return this.interactData.commentNum != 0 ? |
| 253 | + NumberFormatterUtils.formatNumberWithWan(this.interactData.commentNum || '') : '' | ||
| 249 | } | 254 | } |
| 250 | } | 255 | } |
| 251 | 256 | ||
| @@ -282,7 +287,8 @@ export struct PlayerRightView { | @@ -282,7 +287,8 @@ export struct PlayerRightView { | ||
| 282 | @Builder | 287 | @Builder |
| 283 | collectBuilderView() { | 288 | collectBuilderView() { |
| 284 | Column() { | 289 | Column() { |
| 285 | - Image(this.newsStatusOfUser.collectStatus == 1 ? $r(`app.media.ic_collect_check`) : $r(`app.media.ic_collect_uncheck`)) | 290 | + Image(this.newsStatusOfUser.collectStatus == 1 ? $r(`app.media.ic_collect_check`) : |
| 291 | + $r(`app.media.ic_collect_uncheck`)) | ||
| 286 | .width(32) | 292 | .width(32) |
| 287 | .aspectRatio(1) | 293 | .aspectRatio(1) |
| 288 | .onClick(() => { | 294 | .onClick(() => { |
| @@ -25,7 +25,7 @@ export struct PlayerTitleComment { | @@ -25,7 +25,7 @@ export struct PlayerTitleComment { | ||
| 25 | name: this.getName(), | 25 | name: this.getName(), |
| 26 | title: this.getTitle(), | 26 | title: this.getTitle(), |
| 27 | summary: this.getSummary(), | 27 | summary: this.getSummary(), |
| 28 | - isOpen: this.isOpen | 28 | + isOpenDetail: this.isOpen |
| 29 | 29 | ||
| 30 | }), | 30 | }), |
| 31 | autoCancel: false, | 31 | autoCancel: false, |
| @@ -164,9 +164,12 @@ export struct PlayerTitleComment { | @@ -164,9 +164,12 @@ export struct PlayerTitleComment { | ||
| 164 | step: 0.01, | 164 | step: 0.01, |
| 165 | // style: SliderStyle.OutSet | 165 | // style: SliderStyle.OutSet |
| 166 | }) | 166 | }) |
| 167 | - .blockColor(this.status === PlayerConstants.STATUS_START ? Color.Transparent : $r('app.color.play_block_color')) | ||
| 168 | - .trackColor(this.status === PlayerConstants.STATUS_START ? $r('app.color.play_track_color') : $r('app.color.pause_track_color')) | ||
| 169 | - .selectedColor(this.status === PlayerConstants.STATUS_START ? $r('app.color.play_selected_color') : $r('app.color.pause_selected_color')) | 167 | + .blockColor(this.status === PlayerConstants.STATUS_START ? Color.Transparent : |
| 168 | + $r('app.color.play_block_color')) | ||
| 169 | + .trackColor(this.status === PlayerConstants.STATUS_START ? $r('app.color.play_track_color') : | ||
| 170 | + $r('app.color.pause_track_color')) | ||
| 171 | + .selectedColor(this.status === PlayerConstants.STATUS_START ? $r('app.color.play_selected_color') : | ||
| 172 | + $r('app.color.pause_selected_color')) | ||
| 170 | .trackThickness(this.status === PlayerConstants.STATUS_START ? 1 : 4) | 173 | .trackThickness(this.status === PlayerConstants.STATUS_START ? 1 : 4) |
| 171 | .blockStyle({ | 174 | .blockStyle({ |
| 172 | type: this.status === PlayerConstants.STATUS_START ? SliderBlockType.DEFAULT : SliderBlockType.IMAGE, | 175 | type: this.status === PlayerConstants.STATUS_START ? SliderBlockType.DEFAULT : SliderBlockType.IMAGE, |
| @@ -202,7 +205,12 @@ export struct PlayerTitleComment { | @@ -202,7 +205,12 @@ export struct PlayerTitleComment { | ||
| 202 | .margin({ left: 12 }) | 205 | .margin({ left: 12 }) |
| 203 | } | 206 | } |
| 204 | .alignItems(VerticalAlign.Center) | 207 | .alignItems(VerticalAlign.Center) |
| 205 | - .padding({ left: 16, right: 16, top: 11, bottom: 11 }) | 208 | + .padding({ |
| 209 | + left: 16, | ||
| 210 | + right: 16, | ||
| 211 | + top: 11, | ||
| 212 | + bottom: 11 | ||
| 213 | + }) | ||
| 206 | } | 214 | } |
| 207 | 215 | ||
| 208 | } | 216 | } |
| @@ -47,7 +47,7 @@ export struct PlayerTitleView { | @@ -47,7 +47,7 @@ export struct PlayerTitleView { | ||
| 47 | fontSize: 15, | 47 | fontSize: 15, |
| 48 | fontWeight: 400, | 48 | fontWeight: 400, |
| 49 | lineHeight: 20, | 49 | lineHeight: 20, |
| 50 | - constraintWidth: this.windowWidth - 100 - 16 - 22 + 'px', | 50 | + constraintWidth: this.windowWidth - 150 - 16 - 22 + 'px', |
| 51 | 51 | ||
| 52 | }) | 52 | }) |
| 53 | this.titleHeight = info?.height as number || 0 | 53 | this.titleHeight = info?.height as number || 0 |
| @@ -87,7 +87,12 @@ export struct PlayerTitleView { | @@ -87,7 +87,12 @@ export struct PlayerTitleView { | ||
| 87 | */ | 87 | */ |
| 88 | if (this.titleHeight > 200 || this.getSummary()) { | 88 | if (this.titleHeight > 200 || this.getSummary()) { |
| 89 | Text('查看详情 > ') | 89 | Text('查看详情 > ') |
| 90 | - .padding({ left: 6, right: 6, top: 4, bottom: 4 }) | 90 | + .padding({ |
| 91 | + left: 6, | ||
| 92 | + right: 6, | ||
| 93 | + top: 4, | ||
| 94 | + bottom: 4 | ||
| 95 | + }) | ||
| 91 | .borderRadius(2) | 96 | .borderRadius(2) |
| 92 | .backgroundColor('#99636363') | 97 | .backgroundColor('#99636363') |
| 93 | .fontColor(Color.White) | 98 | .fontColor(Color.White) |
| @@ -102,7 +107,7 @@ export struct PlayerTitleView { | @@ -102,7 +107,7 @@ export struct PlayerTitleView { | ||
| 102 | } | 107 | } |
| 103 | 108 | ||
| 104 | } | 109 | } |
| 105 | - .width(this.windowWidth - 100 + 'px') | 110 | + .width(this.windowWidth - 150 + 'px') |
| 106 | .padding({ left: 16, right: 22 }) | 111 | .padding({ left: 16, right: 22 }) |
| 107 | .alignItems(HorizontalAlign.Start) | 112 | .alignItems(HorizontalAlign.Start) |
| 108 | .visibility(this.isOpenDetail || this.isDragging ? Visibility.None : Visibility.Visible) | 113 | .visibility(this.isOpenDetail || this.isDragging ? Visibility.None : Visibility.Visible) |
-
Please register or login to post a comment