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-09-27 15:00:50 +0800
Browse Files
Options
Browse Files
Download
Plain Diff
Commit
ecd58a33f2ebeed788c9a0af32c92ae0c2bb68bc
ecd58a33
2 parents
4e39b2d1
8a652444
Merge branch 'main' of
http://192.168.1.42/developOne/harmonyPool
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
3 deletions
sight_harmony/features/wdComponent/src/main/ets/components/MorningEveningPaper/MorningEveningPaperComponent.ets
sight_harmony/features/wdComponent/src/main/ets/components/comment/view/CommentTabComponent.ets
sight_harmony/features/wdComponent/src/main/ets/components/page/CardView.ets
sight_harmony/features/wdComponent/src/main/ets/components/MorningEveningPaper/MorningEveningPaperComponent.ets
View file @
ecd58a3
...
...
@@ -249,8 +249,7 @@ export struct MorningEveningPaperComponent {
// 图片转换为PixelMap对象
// const pixelMap: image.PixelMap = await image2PixelMap(item.icon);
// console.log(TAG, "compInfoBean compStyle = " + imageUrl)
if (this.pageInfoBean.backgroundColor.length > 0){
if (this.pageInfoBean.backgroundColor.length > 0 && this.pageInfoBean.topicInfo?.frontLinkObject != undefined){
let colorDatas = ColorUtils.hexColorValueToRGB(this.pageInfoBean.backgroundColor)
let color = ColorUtils.getMorningEveningPaperRgb({red:colorDatas[0],green:colorDatas[1],blue:colorDatas[2],alpha:1})
this.mixedBgColor = "#ff" + color.red.toString(16).padStart(2,'0') + color.green.toString(16).padStart(2,'0') + color.blue.toString(16).padStart(2,'0');
...
...
@@ -258,6 +257,7 @@ export struct MorningEveningPaperComponent {
}
if (imageUrl.length > 0 && this.pageInfoBean.topicInfo.frontFlag === 1) {
const imageSource: image.ImageSource | undefined = await getPicture(imageUrl)
this.pickColor(imageSource)
} else {
...
...
sight_harmony/features/wdComponent/src/main/ets/components/comment/view/CommentTabComponent.ets
View file @
ecd58a3
...
...
@@ -146,6 +146,7 @@ export struct CommentTabComponent {
this.publishCommentModel.rootCommentId = '-1';
this.publishCommentModel.parentId = '-1';
this.publishCommentModel.placeHolderText = "说两句..."
this.publishCommentModel.visitorComment = String(this.contentDetail?.visitorComment || '')
if (this.contentDetail.bestNoticer === 1) {
this.publishCommentModel.placeHolderText = "优质评论会获得最佳评论人的称号"
}
...
...
sight_harmony/features/wdComponent/src/main/ets/components/page/CardView.ets
View file @
ecd58a3
...
...
@@ -626,7 +626,7 @@ export struct PaperSingleColumn999CardView {
}
async aboutToAppear(): Promise<void> {
//
this.loadImg = await onlyWifiLoadImg();
this.loadImg = await onlyWifiLoadImg();
this.onChangeCommentList()
this.isRead = hasClicked(this.item.objectId, '')
}
...
...
Please
register
or
login
to post a comment