liyubing

Merge remote-tracking branch 'origin/main'

@@ -8,6 +8,7 @@ import { CardMediaInfo } from '../cardCommon/CardMediaInfo'; @@ -8,6 +8,7 @@ import { CardMediaInfo } from '../cardCommon/CardMediaInfo';
8 import { onlyWifiLoadImg } from '../../utils/lazyloadImg'; 8 import { onlyWifiLoadImg } from '../../utils/lazyloadImg';
9 import { Notes } from '../cardview/notes'; 9 import { Notes } from '../cardview/notes';
10 import { InfomationCardClick } from '../../utils/infomationCardClick' 10 import { InfomationCardClick } from '../../utils/infomationCardClick'
  11 +import font from '@ohos.font';
11 12
12 const TAG = 'Zh_Carousel_Layout-01'; 13 const TAG = 'Zh_Carousel_Layout-01';
13 14
@@ -67,6 +68,11 @@ export struct ZhCarouselLayout01 { @@ -67,6 +68,11 @@ export struct ZhCarouselLayout01 {
67 list.push(i); 68 list.push(i);
68 } 69 }
69 this.data = new MyDataSource(list) 70 this.data = new MyDataSource(list)
  71 +
  72 + font.registerFont({
  73 + familyName: 'BebasNeue',
  74 + familySrc: $rawfile('font/BebasNeue.ttf')
  75 + })
70 } 76 }
71 77
72 isAutoPlay() { 78 isAutoPlay() {