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
wangyujian_wd
2024-05-06 18:07:12 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
b42272f3b6c2a3a8bec7bc2f8c847c9e9a574a75
b42272f3
1 parent
74bec455
fix:1)电子报/预览图样式修改优化(字体,行间距)
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
12 additions
and
11 deletions
sight_harmony/features/wdComponent/src/main/ets/components/ENewspaperPageComponent.ets
sight_harmony/features/wdComponent/src/main/ets/components/MultiPictureDetailPageComponent.ets
sight_harmony/features/wdComponent/src/main/ets/components/calendar/RMCalendarCell.ets
sight_harmony/features/wdComponent/src/main/ets/dialog/ENewspaperListDialog.ets
sight_harmony/features/wdComponent/src/main/ets/dialog/ENewspaperPageDialog.ets
sight_harmony/features/wdComponent/src/main/resources/rawfile/font/BebasNeueBold.otf
sight_harmony/features/wdComponent/src/main/resources/rawfile/font/BebasNeue_Regular.otf
sight_harmony/features/wdComponent/src/main/ets/components/ENewspaperPageComponent.ets
View file @
b42272f
...
...
@@ -81,8 +81,8 @@ export struct ENewspaperPageComponent {
this.picHeight = this.picWidth * 566 / 378
//注册字体
font.registerFont({
familyName: 'BebasNeue_Regular',
familySrc: $rawfile('font/BebasNeue_Regular.otf')
familyName: 'BebasNeueBold',
familySrc: $rawfile('font/BebasNeueBold.otf')
})
this.getNewspaperTime()
this.getNewspaperList()
...
...
@@ -117,7 +117,7 @@ export struct ENewspaperPageComponent {
Text(this.calendarDate?.replace('-', '.')?.replace('-', '.'))
.fontSize($r('app.float.font_size_20'))
.fontColor($r('app.color.white'))
.fontFamily('BebasNeue
_Regular
')
.fontFamily('BebasNeue
Bold
')
.fontWeight(FontWeight.Regular)
Image($r('app.media.icon_triangle'))
...
...
@@ -232,7 +232,7 @@ export struct ENewspaperPageComponent {
Text(this.currentPageNum)
.fontSize($r('app.float.font_size_36'))
.fontColor($r('app.color.white'))
.fontFamily('BebasNeue
_Regular
')
.fontFamily('BebasNeue
Bold
')
Text('版')
.fontSize($r('app.float.font_size_16'))
.fontColor($r('app.color.white'))
...
...
sight_harmony/features/wdComponent/src/main/ets/components/MultiPictureDetailPageComponent.ets
View file @
b42272f
...
...
@@ -63,10 +63,10 @@ export struct MultiPictureDetailPageComponent {
this.picHeight = this.picWidth * 578 / 375
this.titleHeight = this.screenWidth * 178 / 375
//注册字体
font.registerFont({
familyName: 'BebasNeue_Regular',
familySrc: $rawfile('font/BebasNeue_Regular.otf')
})
// font.registerFont({
// familyName: 'BebasNeueBold',
// familySrc: $rawfile('font/BebasNeueBold.otf')
// })
// 注册监听网络连接
let netStatus = NetworkUtil.isNetConnected()
if (netStatus) {
...
...
sight_harmony/features/wdComponent/src/main/ets/components/calendar/RMCalendarCell.ets
View file @
b42272f
...
...
@@ -100,7 +100,7 @@ export struct RMCalenderCell {
.fontSize(this.itemFontSize)
.fontColor(this.getItemColor())
.fontWeight(this.itemFontWeight)
.fontFamily('BebasNeue
_Regular
')
.fontFamily('BebasNeue
Bold
')
}
}
// .justifyContent(FlexAlign.Center)
...
...
sight_harmony/features/wdComponent/src/main/ets/dialog/ENewspaperListDialog.ets
View file @
b42272f
...
...
@@ -73,7 +73,7 @@ export struct ENewspaperListDialog {
Text(this.currentPageNum)
.fontSize($r('app.float.font_size_36'))
.fontColor($r('app.color.color_222222'))
.fontFamily('BebasNeue
_Regular
')
.fontFamily('BebasNeue
Bold
')
Text('版')
.fontSize($r('app.float.font_size_16'))
.fontColor($r('app.color.color_222222'))
...
...
@@ -159,6 +159,7 @@ export struct ENewspaperListDialog {
Text(positionItem.newsTxt)
.fontSize($r('app.float.font_size_14'))
.fontColor($r('app.color.color_999999'))
.lineHeight(25)
.margin({
// bottom: 15
})
...
...
sight_harmony/features/wdComponent/src/main/ets/dialog/ENewspaperPageDialog.ets
View file @
b42272f
...
...
@@ -29,7 +29,7 @@ export struct ENewspaperPageDialog {
Text(item.pageNum)
.fontSize($r('app.float.normal_text_size'))
.fontColor(this.currentPageNum == item.pageNum ? Color.White : $r('app.color.color_222222'))
.fontFamily('BebasNeue
_Regular
')
.fontFamily('BebasNeue
Bold
')
}
.alignItems(VerticalAlign.Center)
.justifyContent(FlexAlign.Center)
...
...
sight_harmony/features/wdComponent/src/main/resources/rawfile/font/BebasNeueBold.otf
0 → 100644
View file @
b42272f
No preview for this file type
sight_harmony/features/wdComponent/src/main/resources/rawfile/font/BebasNeue_Regular.otf
deleted
100644 → 0
View file @
74bec45
Please
register
or
login
to post a comment