Showing
4 changed files
with
22 additions
and
8 deletions
| @@ -372,6 +372,8 @@ export class ProcessUtils { | @@ -372,6 +372,8 @@ export class ProcessUtils { | ||
| 372 | type: 'JUMP_INNER_NEW_PAGE', | 372 | type: 'JUMP_INNER_NEW_PAGE', |
| 373 | params: { | 373 | params: { |
| 374 | contentID: content?.objectId, | 374 | contentID: content?.objectId, |
| 375 | + //fixme 图文外链,需要单独处理 | ||
| 376 | + url:content?.linkUrl, | ||
| 375 | pageID: 'IMAGE_TEXT_DETAIL', | 377 | pageID: 'IMAGE_TEXT_DETAIL', |
| 376 | extra: { | 378 | extra: { |
| 377 | relType: content?.relType, | 379 | relType: content?.relType, |
| @@ -113,6 +113,7 @@ export struct LiveLikeComponent { | @@ -113,6 +113,7 @@ export struct LiveLikeComponent { | ||
| 113 | .width(36) | 113 | .width(36) |
| 114 | .height(36) | 114 | .height(36) |
| 115 | .borderRadius(18) | 115 | .borderRadius(18) |
| 116 | + .margin({top:6}) | ||
| 116 | .backgroundColor((this.pageComponentType === 4 || this.pageComponentType === 2) ? '#4D000000' : | 117 | .backgroundColor((this.pageComponentType === 4 || this.pageComponentType === 2) ? '#4D000000' : |
| 117 | this.pageComponentType === 8 ? Color.Transparent : '#FFF5F5F5') | 118 | this.pageComponentType === 8 ? Color.Transparent : '#FFF5F5F5') |
| 118 | 119 | ||
| @@ -120,6 +121,7 @@ export struct LiveLikeComponent { | @@ -120,6 +121,7 @@ export struct LiveLikeComponent { | ||
| 120 | RelativeContainer() { | 121 | RelativeContainer() { |
| 121 | Image(this.styleType == 1 ? $r('app.media.comment_icon_number_bg') : $r('app.media.ic_like_back_Select')) | 122 | Image(this.styleType == 1 ? $r('app.media.comment_icon_number_bg') : $r('app.media.ic_like_back_Select')) |
| 122 | .objectFit(ImageFit.Fill) | 123 | .objectFit(ImageFit.Fill) |
| 124 | + .height(10) | ||
| 123 | .resizable({ | 125 | .resizable({ |
| 124 | slice: { | 126 | slice: { |
| 125 | top: 1, | 127 | top: 1, |
| @@ -144,14 +146,15 @@ export struct LiveLikeComponent { | @@ -144,14 +146,15 @@ export struct LiveLikeComponent { | ||
| 144 | .alignRules({ | 146 | .alignRules({ |
| 145 | top: { anchor: "__container__", align: VerticalAlign.Top }, | 147 | top: { anchor: "__container__", align: VerticalAlign.Top }, |
| 146 | left: { anchor: "__container__", align: HorizontalAlign.Start } | 148 | left: { anchor: "__container__", align: HorizontalAlign.Start } |
| 147 | - })// .margin({left: 4,right:4 | ||
| 148 | - // }) | 149 | + }) |
| 149 | /*动态计算文字宽度*/ | 150 | /*动态计算文字宽度*/ |
| 150 | .width(this.getMeasureText(NumberFormatterUtils.formatNumberWithWan(this.likeCount || '')) + | 151 | .width(this.getMeasureText(NumberFormatterUtils.formatNumberWithWan(this.likeCount || '')) + |
| 151 | - 12)// .backgroundColor(Color.Green) | 152 | + 8)// .backgroundColor(Color.Green) |
| 153 | + .padding({left:2}) | ||
| 152 | .id("Text") | 154 | .id("Text") |
| 153 | .visibility(this.likeCount > 0 ? Visibility.Visible : Visibility.Hidden) | 155 | .visibility(this.likeCount > 0 ? Visibility.Visible : Visibility.Hidden) |
| 154 | } | 156 | } |
| 157 | + .margin({left:10,top:3}) | ||
| 155 | .offset({ | 158 | .offset({ |
| 156 | x: 18 | 159 | x: 18 |
| 157 | }) | 160 | }) |
| @@ -20,6 +20,7 @@ import { EmitterEventId, EmitterUtils } from 'wdKit/Index' | @@ -20,6 +20,7 @@ import { EmitterEventId, EmitterUtils } from 'wdKit/Index' | ||
| 20 | import { ParamType, TrackConstants, TrackingContent } from 'wdTracking/Index'; | 20 | import { ParamType, TrackConstants, TrackingContent } from 'wdTracking/Index'; |
| 21 | import { CommentCustomDialog, CommentDialogInputContent } from '../comment/view/CommentCustomDialog'; | 21 | import { CommentCustomDialog, CommentDialogInputContent } from '../comment/view/CommentCustomDialog'; |
| 22 | import { HttpUtils } from 'wdNetwork/Index'; | 22 | import { HttpUtils } from 'wdNetwork/Index'; |
| 23 | +import { faceDetector } from '@kit.CoreVisionKit'; | ||
| 23 | 24 | ||
| 24 | const TAG = 'LiveOperRowListView'; | 25 | const TAG = 'LiveOperRowListView'; |
| 25 | 26 | ||
| @@ -68,7 +69,8 @@ export struct LiveOperRowListView { | @@ -68,7 +69,8 @@ export struct LiveOperRowListView { | ||
| 68 | @Consume pageId: string | 69 | @Consume pageId: string |
| 69 | @State likesStyle: number | string = "love" // 点赞样式 love爱心型 thumb点赞手势 mourning 蜡烛(默哀) pray 祈福 | 70 | @State likesStyle: number | string = "love" // 点赞样式 love爱心型 thumb点赞手势 mourning 蜡烛(默哀) pray 祈福 |
| 70 | @State openLikes: boolean = false // 是否可以点赞 1:可以 0:不可以 | 71 | @State openLikes: boolean = false // 是否可以点赞 1:可以 0:不可以 |
| 71 | - | 72 | + //非沉浸式 |
| 73 | + private isLlive = false | ||
| 72 | /// comment | 74 | /// comment |
| 73 | @State showCommentInput: boolean = false | 75 | @State showCommentInput: boolean = false |
| 74 | private banComment: boolean = true // 是否已禁言 | 76 | private banComment: boolean = true // 是否已禁言 |
| @@ -138,6 +140,7 @@ export struct LiveOperRowListView { | @@ -138,6 +140,7 @@ export struct LiveOperRowListView { | ||
| 138 | .interpolation(ImageInterpolation.High) | 140 | .interpolation(ImageInterpolation.High) |
| 139 | } | 141 | } |
| 140 | .width(48) | 142 | .width(48) |
| 143 | + .padding({top:10}) | ||
| 141 | .hoverEffect(HoverEffect.Scale) | 144 | .hoverEffect(HoverEffect.Scale) |
| 142 | .visibility(this.showBackIcon ? Visibility.Visible : Visibility.None) | 145 | .visibility(this.showBackIcon ? Visibility.Visible : Visibility.None) |
| 143 | .onClick(() => { | 146 | .onClick(() => { |
| @@ -169,10 +172,11 @@ export struct LiveOperRowListView { | @@ -169,10 +172,11 @@ export struct LiveOperRowListView { | ||
| 169 | .width('100%') | 172 | .width('100%') |
| 170 | .backgroundColor(this.bgColor) | 173 | .backgroundColor(this.bgColor) |
| 171 | .padding({ | 174 | .padding({ |
| 172 | - top: 10, | 175 | + // top: 10, |
| 173 | // bottom: 10 | 176 | // bottom: 10 |
| 174 | - bottom: `${this.bottomSafeHeight}px` | 177 | + bottom: `${this.bottomSafeHeight}px`, |
| 175 | // bottom: 50 | 178 | // bottom: 50 |
| 179 | + right:20 | ||
| 176 | }) | 180 | }) |
| 177 | } | 181 | } |
| 178 | 182 | ||
| @@ -230,6 +234,7 @@ export struct LiveOperRowListView { | @@ -230,6 +234,7 @@ export struct LiveOperRowListView { | ||
| 230 | Blank() | 234 | Blank() |
| 231 | } | 235 | } |
| 232 | } | 236 | } |
| 237 | + .padding({top:10}) | ||
| 233 | .layoutWeight(1) | 238 | .layoutWeight(1) |
| 234 | .margin({ left: 16 }) | 239 | .margin({ left: 16 }) |
| 235 | } | 240 | } |
| @@ -247,6 +252,7 @@ export struct LiveOperRowListView { | @@ -247,6 +252,7 @@ export struct LiveOperRowListView { | ||
| 247 | }) | 252 | }) |
| 248 | } | 253 | } |
| 249 | .width(48) | 254 | .width(48) |
| 255 | + .margin({left:this.isLlive?0:10}) | ||
| 250 | .visibility(this.likesStyle == 4 || this.likesStyle == 'empty' || !this.openLikes ? Visibility.None : Visibility.Visible) | 256 | .visibility(this.likesStyle == 4 || this.likesStyle == 'empty' || !this.openLikes ? Visibility.None : Visibility.Visible) |
| 251 | } | 257 | } |
| 252 | 258 | ||
| @@ -274,8 +280,9 @@ export struct LiveOperRowListView { | @@ -274,8 +280,9 @@ export struct LiveOperRowListView { | ||
| 274 | })*/ | 280 | })*/ |
| 275 | } | 281 | } |
| 276 | .height(36) | 282 | .height(36) |
| 277 | - .width(48) | 283 | + .width(this.isLlive?48:36) |
| 278 | .borderRadius(18) | 284 | .borderRadius(18) |
| 285 | + .margin({top:10,left:this.isLlive?0:10}) | ||
| 279 | .backgroundColor(this.pageComponentType === 2 ? '#4D000000' : Color.Transparent) | 286 | .backgroundColor(this.pageComponentType === 2 ? '#4D000000' : Color.Transparent) |
| 280 | .onClick(() => { | 287 | .onClick(() => { |
| 281 | this.toggleCollectStatus() | 288 | this.toggleCollectStatus() |
| @@ -299,9 +306,10 @@ export struct LiveOperRowListView { | @@ -299,9 +306,10 @@ export struct LiveOperRowListView { | ||
| 299 | this.share() | 306 | this.share() |
| 300 | }) | 307 | }) |
| 301 | } | 308 | } |
| 309 | + .margin({top:10,left:this.isLlive?0:10}) | ||
| 302 | .justifyContent(FlexAlign.Center) | 310 | .justifyContent(FlexAlign.Center) |
| 303 | .height(36) | 311 | .height(36) |
| 304 | - .width(48) | 312 | + .width(this.isLlive?48:36) |
| 305 | .borderRadius(18) | 313 | .borderRadius(18) |
| 306 | .backgroundColor(this.pageComponentType === 2 ? '#4D000000' : Color.Transparent) | 314 | .backgroundColor(this.pageComponentType === 2 ? '#4D000000' : Color.Transparent) |
| 307 | } | 315 | } |
| @@ -109,6 +109,7 @@ export struct DetailPlayLivePage { | @@ -109,6 +109,7 @@ export struct DetailPlayLivePage { | ||
| 109 | LiveOperRowListView({ | 109 | LiveOperRowListView({ |
| 110 | operationButtonList: ['comment', 'collect', 'share', 'like'], | 110 | operationButtonList: ['comment', 'collect', 'share', 'like'], |
| 111 | styleType: 1, | 111 | styleType: 1, |
| 112 | + isLlive:this.displayDirection == DisplayDirection.VERTICAL, | ||
| 112 | contentDetailData: this.contentDetailData, | 113 | contentDetailData: this.contentDetailData, |
| 113 | onCommentInputFocus: () => { | 114 | onCommentInputFocus: () => { |
| 114 | // 切换到大家聊 | 115 | // 切换到大家聊 |
-
Please register or login to post a comment