wangyujian_wd

fix:1)电子报/预览图样式修改优化(字体,行间距)

@@ -81,8 +81,8 @@ export struct ENewspaperPageComponent { @@ -81,8 +81,8 @@ export struct ENewspaperPageComponent {
81 this.picHeight = this.picWidth * 566 / 378 81 this.picHeight = this.picWidth * 566 / 378
82 //注册字体 82 //注册字体
83 font.registerFont({ 83 font.registerFont({
84 - familyName: 'BebasNeue_Regular',  
85 - familySrc: $rawfile('font/BebasNeue_Regular.otf') 84 + familyName: 'BebasNeueBold',
  85 + familySrc: $rawfile('font/BebasNeueBold.otf')
86 }) 86 })
87 this.getNewspaperTime() 87 this.getNewspaperTime()
88 this.getNewspaperList() 88 this.getNewspaperList()
@@ -117,7 +117,7 @@ export struct ENewspaperPageComponent { @@ -117,7 +117,7 @@ export struct ENewspaperPageComponent {
117 Text(this.calendarDate?.replace('-', '.')?.replace('-', '.')) 117 Text(this.calendarDate?.replace('-', '.')?.replace('-', '.'))
118 .fontSize($r('app.float.font_size_20')) 118 .fontSize($r('app.float.font_size_20'))
119 .fontColor($r('app.color.white')) 119 .fontColor($r('app.color.white'))
120 - .fontFamily('BebasNeue_Regular') 120 + .fontFamily('BebasNeueBold')
121 .fontWeight(FontWeight.Regular) 121 .fontWeight(FontWeight.Regular)
122 122
123 Image($r('app.media.icon_triangle')) 123 Image($r('app.media.icon_triangle'))
@@ -232,7 +232,7 @@ export struct ENewspaperPageComponent { @@ -232,7 +232,7 @@ export struct ENewspaperPageComponent {
232 Text(this.currentPageNum) 232 Text(this.currentPageNum)
233 .fontSize($r('app.float.font_size_36')) 233 .fontSize($r('app.float.font_size_36'))
234 .fontColor($r('app.color.white')) 234 .fontColor($r('app.color.white'))
235 - .fontFamily('BebasNeue_Regular') 235 + .fontFamily('BebasNeueBold')
236 Text('版') 236 Text('版')
237 .fontSize($r('app.float.font_size_16')) 237 .fontSize($r('app.float.font_size_16'))
238 .fontColor($r('app.color.white')) 238 .fontColor($r('app.color.white'))
@@ -63,10 +63,10 @@ export struct MultiPictureDetailPageComponent { @@ -63,10 +63,10 @@ export struct MultiPictureDetailPageComponent {
63 this.picHeight = this.picWidth * 578 / 375 63 this.picHeight = this.picWidth * 578 / 375
64 this.titleHeight = this.screenWidth * 178 / 375 64 this.titleHeight = this.screenWidth * 178 / 375
65 //注册字体 65 //注册字体
66 - font.registerFont({  
67 - familyName: 'BebasNeue_Regular',  
68 - familySrc: $rawfile('font/BebasNeue_Regular.otf')  
69 - }) 66 + // font.registerFont({
  67 + // familyName: 'BebasNeueBold',
  68 + // familySrc: $rawfile('font/BebasNeueBold.otf')
  69 + // })
70 // 注册监听网络连接 70 // 注册监听网络连接
71 let netStatus = NetworkUtil.isNetConnected() 71 let netStatus = NetworkUtil.isNetConnected()
72 if (netStatus) { 72 if (netStatus) {
@@ -100,7 +100,7 @@ export struct RMCalenderCell { @@ -100,7 +100,7 @@ export struct RMCalenderCell {
100 .fontSize(this.itemFontSize) 100 .fontSize(this.itemFontSize)
101 .fontColor(this.getItemColor()) 101 .fontColor(this.getItemColor())
102 .fontWeight(this.itemFontWeight) 102 .fontWeight(this.itemFontWeight)
103 - .fontFamily('BebasNeue_Regular') 103 + .fontFamily('BebasNeueBold')
104 } 104 }
105 } 105 }
106 // .justifyContent(FlexAlign.Center) 106 // .justifyContent(FlexAlign.Center)
@@ -73,7 +73,7 @@ export struct ENewspaperListDialog { @@ -73,7 +73,7 @@ export struct ENewspaperListDialog {
73 Text(this.currentPageNum) 73 Text(this.currentPageNum)
74 .fontSize($r('app.float.font_size_36')) 74 .fontSize($r('app.float.font_size_36'))
75 .fontColor($r('app.color.color_222222')) 75 .fontColor($r('app.color.color_222222'))
76 - .fontFamily('BebasNeue_Regular') 76 + .fontFamily('BebasNeueBold')
77 Text('版') 77 Text('版')
78 .fontSize($r('app.float.font_size_16')) 78 .fontSize($r('app.float.font_size_16'))
79 .fontColor($r('app.color.color_222222')) 79 .fontColor($r('app.color.color_222222'))
@@ -159,6 +159,7 @@ export struct ENewspaperListDialog { @@ -159,6 +159,7 @@ export struct ENewspaperListDialog {
159 Text(positionItem.newsTxt) 159 Text(positionItem.newsTxt)
160 .fontSize($r('app.float.font_size_14')) 160 .fontSize($r('app.float.font_size_14'))
161 .fontColor($r('app.color.color_999999')) 161 .fontColor($r('app.color.color_999999'))
  162 + .lineHeight(25)
162 .margin({ 163 .margin({
163 // bottom: 15 164 // bottom: 15
164 }) 165 })
@@ -29,7 +29,7 @@ export struct ENewspaperPageDialog { @@ -29,7 +29,7 @@ export struct ENewspaperPageDialog {
29 Text(item.pageNum) 29 Text(item.pageNum)
30 .fontSize($r('app.float.normal_text_size')) 30 .fontSize($r('app.float.normal_text_size'))
31 .fontColor(this.currentPageNum == item.pageNum ? Color.White : $r('app.color.color_222222')) 31 .fontColor(this.currentPageNum == item.pageNum ? Color.White : $r('app.color.color_222222'))
32 - .fontFamily('BebasNeue_Regular') 32 + .fontFamily('BebasNeueBold')
33 } 33 }
34 .alignItems(VerticalAlign.Center) 34 .alignItems(VerticalAlign.Center)
35 .justifyContent(FlexAlign.Center) 35 .justifyContent(FlexAlign.Center)