Toggle navigation
Toggle navigation
This project
Loading...
Sign in
developOne
/
harmonyPool
Go to a project
Toggle navigation
Projects
Groups
Snippets
Help
Toggle navigation pinning
Project
Activity
Repository
Pipelines
Graphs
Issues
0
Merge Requests
0
Wiki
Network
Create a new issue
Builds
Commits
Authored by
张善主
2024-06-28 16:02:27 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
5ee369bb8cad40feef6bb69f0f1257e9f9b48ba4
5ee369bb
1 parent
187533ee
fix(18527):UI还原问题-【uat】进入直播预告点赞按钮数量样式和ios 不一致,看图
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
22 additions
and
8 deletions
sight_harmony/commons/wdRouter/src/main/ets/utils/ProcessUtils.ets
sight_harmony/features/wdComponent/src/main/ets/components/view/LiveLikeComponent.ets
sight_harmony/features/wdComponent/src/main/ets/components/view/LiveOperRowListView.ets
sight_harmony/features/wdDetailPlayLive/src/main/ets/pages/DetailPlayLivePage.ets
sight_harmony/commons/wdRouter/src/main/ets/utils/ProcessUtils.ets
View file @
5ee369b
...
...
@@ -372,6 +372,8 @@ export class ProcessUtils {
type: 'JUMP_INNER_NEW_PAGE',
params: {
contentID: content?.objectId,
//fixme 图文外链,需要单独处理
url:content?.linkUrl,
pageID: 'IMAGE_TEXT_DETAIL',
extra: {
relType: content?.relType,
...
...
sight_harmony/features/wdComponent/src/main/ets/components/view/LiveLikeComponent.ets
View file @
5ee369b
...
...
@@ -113,6 +113,7 @@ export struct LiveLikeComponent {
.width(36)
.height(36)
.borderRadius(18)
.margin({top:6})
.backgroundColor((this.pageComponentType === 4 || this.pageComponentType === 2) ? '#4D000000' :
this.pageComponentType === 8 ? Color.Transparent : '#FFF5F5F5')
...
...
@@ -120,6 +121,7 @@ export struct LiveLikeComponent {
RelativeContainer() {
Image(this.styleType == 1 ? $r('app.media.comment_icon_number_bg') : $r('app.media.ic_like_back_Select'))
.objectFit(ImageFit.Fill)
.height(10)
.resizable({
slice: {
top: 1,
...
...
@@ -144,14 +146,15 @@ export struct LiveLikeComponent {
.alignRules({
top: { anchor: "__container__", align: VerticalAlign.Top },
left: { anchor: "__container__", align: HorizontalAlign.Start }
})// .margin({left: 4,right:4
// })
})
/*动态计算文字宽度*/
.width(this.getMeasureText(NumberFormatterUtils.formatNumberWithWan(this.likeCount || '')) +
12)// .backgroundColor(Color.Green)
8)// .backgroundColor(Color.Green)
.padding({left:2})
.id("Text")
.visibility(this.likeCount > 0 ? Visibility.Visible : Visibility.Hidden)
}
.margin({left:10,top:3})
.offset({
x: 18
})
...
...
sight_harmony/features/wdComponent/src/main/ets/components/view/LiveOperRowListView.ets
View file @
5ee369b
...
...
@@ -20,6 +20,7 @@ import { EmitterEventId, EmitterUtils } from 'wdKit/Index'
import { ParamType, TrackConstants, TrackingContent } from 'wdTracking/Index';
import { CommentCustomDialog, CommentDialogInputContent } from '../comment/view/CommentCustomDialog';
import { HttpUtils } from 'wdNetwork/Index';
import { faceDetector } from '@kit.CoreVisionKit';
const TAG = 'LiveOperRowListView';
...
...
@@ -68,7 +69,8 @@ export struct LiveOperRowListView {
@Consume pageId: string
@State likesStyle: number | string = "love" // 点赞样式 love爱心型 thumb点赞手势 mourning 蜡烛(默哀) pray 祈福
@State openLikes: boolean = false // 是否可以点赞 1:可以 0:不可以
//非沉浸式
private isLlive = false
/// comment
@State showCommentInput: boolean = false
private banComment: boolean = true // 是否已禁言
...
...
@@ -138,6 +140,7 @@ export struct LiveOperRowListView {
.interpolation(ImageInterpolation.High)
}
.width(48)
.padding({top:10})
.hoverEffect(HoverEffect.Scale)
.visibility(this.showBackIcon ? Visibility.Visible : Visibility.None)
.onClick(() => {
...
...
@@ -169,10 +172,11 @@ export struct LiveOperRowListView {
.width('100%')
.backgroundColor(this.bgColor)
.padding({
top: 10,
//
top: 10,
// bottom: 10
bottom: `${this.bottomSafeHeight}px`
bottom: `${this.bottomSafeHeight}px`
,
// bottom: 50
right:20
})
}
...
...
@@ -230,6 +234,7 @@ export struct LiveOperRowListView {
Blank()
}
}
.padding({top:10})
.layoutWeight(1)
.margin({ left: 16 })
}
...
...
@@ -247,6 +252,7 @@ export struct LiveOperRowListView {
})
}
.width(48)
.margin({left:this.isLlive?0:10})
.visibility(this.likesStyle == 4 || this.likesStyle == 'empty' || !this.openLikes ? Visibility.None : Visibility.Visible)
}
...
...
@@ -274,8 +280,9 @@ export struct LiveOperRowListView {
})*/
}
.height(36)
.width(
48
)
.width(
this.isLlive?48:36
)
.borderRadius(18)
.margin({top:10,left:this.isLlive?0:10})
.backgroundColor(this.pageComponentType === 2 ? '#4D000000' : Color.Transparent)
.onClick(() => {
this.toggleCollectStatus()
...
...
@@ -299,9 +306,10 @@ export struct LiveOperRowListView {
this.share()
})
}
.margin({top:10,left:this.isLlive?0:10})
.justifyContent(FlexAlign.Center)
.height(36)
.width(
48
)
.width(
this.isLlive?48:36
)
.borderRadius(18)
.backgroundColor(this.pageComponentType === 2 ? '#4D000000' : Color.Transparent)
}
...
...
sight_harmony/features/wdDetailPlayLive/src/main/ets/pages/DetailPlayLivePage.ets
View file @
5ee369b
...
...
@@ -109,6 +109,7 @@ export struct DetailPlayLivePage {
LiveOperRowListView({
operationButtonList: ['comment', 'collect', 'share', 'like'],
styleType: 1,
isLlive:this.displayDirection == DisplayDirection.VERTICAL,
contentDetailData: this.contentDetailData,
onCommentInputFocus: () => {
// 切换到大家聊
...
...
Please
register
or
login
to post a comment