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-08-19 16:45:43 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
9541e2904a524de2478f85c1c1fccb34da09428f
9541e290
1 parent
95c6bbc8
fix: 鸿蒙走查 图集
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
7 additions
and
10 deletions
sight_harmony/features/wdComponent/src/main/ets/components/CompParser.ets
sight_harmony/features/wdComponent/src/main/ets/components/cardCommon/CardMediaInfo.ets
sight_harmony/features/wdComponent/src/main/ets/components/cardview/Card11Component.ets
sight_harmony/features/wdComponent/src/main/ets/components/cardview/Card17Component.ets
sight_harmony/features/wdComponent/src/main/ets/components/cardview/Card20Component.ets
sight_harmony/features/wdComponent/src/main/resources/base/element/float.json
sight_harmony/features/wdComponent/src/main/ets/components/CompParser.ets
View file @
9541e29
...
...
@@ -226,7 +226,7 @@ export struct CompParser {
}
} else if (this.compDTO.compStyle === CompStyle.Card_03 || this.compDTO.compStyle === CompStyle.Card_13 || this.compDTO.compStyle === CompStyle.Card_06 ||
this.compDTO.compStyle === CompStyle.Card_04 || this.compDTO.compStyle === CompStyle.Card_02 || this.compDTO.compStyle === CompStyle.Card_17) { // 无图卡 左文右图卡 小视频卡 三图卡 大图卡 图集卡
Divider().strokeWidth(1).color('#f5f5f5').width(CommonConstants.FULL_WIDTH).padding({ left: 10, right: 10 })
.margin({top:14})
Divider().strokeWidth(1).color('#f5f5f5').width(CommonConstants.FULL_WIDTH).padding({ left: 10, right: 10 })
} else if (this.compDTO.compType === 'appStyle' || this.compDTO.compStyle === CompStyle.Zh_Single_Row_01 || this.compDTO.compStyle === CompStyle.Card_Comp_Adv || this.compDTO.compStyle === CompStyle.Zh_Single_Column_02) {
if (
this.nextCompDTO.compStyle === CompStyle.Card_09 ||
...
...
sight_harmony/features/wdComponent/src/main/ets/components/cardCommon/CardMediaInfo.ets
View file @
9541e29
...
...
@@ -95,7 +95,7 @@ export struct CardMediaInfo {
}
}
.margin({ right:
8
})
.margin({ right:
5
})
} else if (this.contentDTO.objectType === '2') {
// liveInfo.liveState 直播新闻-直播状态 wait待开播running直播中end已结束cancel已取消paused暂停
// 显示直播信息
...
...
@@ -193,7 +193,7 @@ export struct CardMediaInfo {
.mediaTextImgtype()
.fontFamily('BebasNeue')
}
.margin({ right:
8
})
.margin({ right:
5
})
} else if (this.contentDTO.objectType === '13') {
// 显示音频信息
...
...
sight_harmony/features/wdComponent/src/main/ets/components/cardview/Card11Component.ets
View file @
9541e29
...
...
@@ -67,7 +67,7 @@ export struct Card11Component {
Span(this.contentDTO.newsTitle)
}
}
.lineHeight(2
7
)
.lineHeight(2
5
)
.fontSize($r("app.float.font_size_18"))
.fontColor(this.clicked ? 0x848484 : $r("app.color.color_222222"))
.maxLines(3)
...
...
sight_harmony/features/wdComponent/src/main/ets/components/cardview/Card17Component.ets
View file @
9541e29
...
...
@@ -63,9 +63,6 @@ export struct Card17Component {
.lineHeight(25)
.maxLines(3)
.width(CommonConstants.FULL_WIDTH)
.margin({
top: 14
})
Stack({ alignContent: Alignment.BottomEnd }) {
// 三个图,
...
...
@@ -137,7 +134,7 @@ export struct Card17Component {
})
// 评论等信息
CardSourceInfo({ compDTO: this.compDTO, contentDTO: this.contentDTO })
CardSourceInfo({ compDTO: this.compDTO, contentDTO: this.contentDTO
, viewShowData: false
})
}
.padding({
left: 10,
...
...
sight_harmony/features/wdComponent/src/main/ets/components/cardview/Card20Component.ets
View file @
9541e29
...
...
@@ -86,7 +86,7 @@ export struct Card20Component {
.fontSize($r('app.float.font_size_18'))
.fontColor(this.clicked ? 0x848484 : $r('app.color.color_222222'))
.maxLines(3)
.lineHeight(2
7
)
.lineHeight(2
5
)
.textOverflow({ overflow: TextOverflow.Ellipsis }) // 超出的部分显示省略号。
.align(Alignment.Start)
.textIndent((this.contentDTO.newTags?.length || this.contentDTO.seoTags?.length) > 2 &&
...
...
sight_harmony/features/wdComponent/src/main/resources/base/element/float.json
View file @
9541e29
...
...
@@ -54,7 +54,7 @@
},
{
"name"
:
"font_size_18"
,
"value"
:
"18
f
p"
"value"
:
"18
v
p"
},
{
"name"
:
"font_size_24"
,
...
...
Please
register
or
login
to post a comment