developOne / harmonyPool

Go to a project
Toggle navigation Toggle navigation pinning
张善主
6eac2dcd 2 parents aac3fc99 76068c8b

Merge remote-tracking branch 'origin/main'

Inline Side-by-side
Showing 42 changed files with 364 additions and 111 deletions
@@ -5,12 +5,15 @@ import { BaseDTO } from './BaseDTO'; @@ -5,12 +5,15 @@ import { BaseDTO } from './BaseDTO';
5 5
6 @Observed 6 @Observed
7 export class CompDTO implements BaseDTO { 7 export class CompDTO implements BaseDTO {
  8 + expIds: string = '';
  9 + itemId: string = '';
8 contentText?: string = ''; 10 contentText?: string = '';
9 backgroundColor: string = ''; 11 backgroundColor: string = '';
10 backgroundImgUrl: string = ''; 12 backgroundImgUrl: string = '';
11 cityCode: string = ''; 13 cityCode: string = '';
12 compStyle: string = ''; 14 compStyle: string = '';
13 compType: string = ''; 15 compType: string = '';
  16 + cardItemId: string = '';
14 // dataSourceRequest: any[]; 17 // dataSourceRequest: any[];
15 districtCode: string = ''; 18 districtCode: string = '';
16 extraData?: string; 19 extraData?: string;
@@ -44,7 +47,7 @@ export class CompDTO implements BaseDTO { @@ -44,7 +47,7 @@ export class CompDTO implements BaseDTO {
44 matInfo: CompAdvMatInfoBean = new CompAdvMatInfoBean 47 matInfo: CompAdvMatInfoBean = new CompAdvMatInfoBean
45 pageId?: string; 48 pageId?: string;
46 objectType?: string; 49 objectType?: string;
47 - hasMore: number = 1 50 + hasMore: number = 1;
48 51
49 // keyGenerator相关字符串，用于刷新list布局 52 // keyGenerator相关字符串，用于刷新list布局
50 timestamp: String = '1' 53 timestamp: String = '1'
@@ -11,12 +11,15 @@ import { LiveRoomDataBean } from '../live/LiveRoomDataBean'; @@ -11,12 +11,15 @@ import { LiveRoomDataBean } from '../live/LiveRoomDataBean';
11 11
12 @Observed 12 @Observed
13 export class ContentDTO implements BaseDTO { 13 export class ContentDTO implements BaseDTO {
  14 + expIds: string = '';
  15 + itemId: string = '';
14 shareFlag?: string = '1'; 16 shareFlag?: string = '1';
15 appStyle: string = ''; 17 appStyle: string = '';
16 cityCode: string = ''; 18 cityCode: string = '';
17 coverSize: string = ''; 19 coverSize: string = '';
18 coverType: number = -1; 20 coverType: number = -1;
19 coverUrl: string = ''; 21 coverUrl: string = '';
  22 + cnsTraceId: string = ''
20 description: string = ''; 23 description: string = '';
21 districtCode: string = ''; 24 districtCode: string = '';
22 endTime: string = ''; 25 endTime: string = '';
@@ -45,6 +48,8 @@ export class ContentDTO implements BaseDTO { @@ -45,6 +48,8 @@ export class ContentDTO implements BaseDTO {
45 startTime: string = ''; 48 startTime: string = '';
46 subType: string = ''; 49 subType: string = '';
47 subtitle: string = ''; 50 subtitle: string = '';
  51 + sceneId: string = '';
  52 + subSceneId: string = '';
48 title: string = ''; 53 title: string = '';
49 vImageUrl: string = ''; 54 vImageUrl: string = '';
50 screenType: string = ''; 55 screenType: string = '';
@@ -23,6 +23,8 @@ import { SearchContentComponent } from './cardview/SearchContentComponent'; @@ -23,6 +23,8 @@ import { SearchContentComponent } from './cardview/SearchContentComponent';
23 */ 23 */
24 @Component 24 @Component
25 export struct CardParser { 25 export struct CardParser {
  26 + @State pageId: string = '';
  27 + @State pageName: string = '';
26 @State contentDTO: ContentDTO = new ContentDTO(); 28 @State contentDTO: ContentDTO = new ContentDTO();
27 @ObjectLink compDTO: CompDTO 29 @ObjectLink compDTO: CompDTO
28 30
@@ -34,39 +36,39 @@ export struct CardParser { @@ -34,39 +36,39 @@ export struct CardParser {
34 contentBuilder(contentDTO: ContentDTO) { 36 contentBuilder(contentDTO: ContentDTO) {
35 // Card6Component({ compDTO: this.compDTO, contentDTO: this.contentDTO }) 37 // Card6Component({ compDTO: this.compDTO, contentDTO: this.contentDTO })
36 if (!!contentDTO.contentText) { 38 if (!!contentDTO.contentText) {
37 - SearchContentComponent({ contentDTO }) 39 + SearchContentComponent({ contentDTO, compDTO: this.compDTO, pageId: this.pageId, pageName: this.pageName })
38 } else { 40 } else {
39 if (contentDTO.appStyle === CompStyle.Card_02) { 41 if (contentDTO.appStyle === CompStyle.Card_02) {
40 - Card2Component({ compDTO: this.compDTO, contentDTO }) 42 + Card2Component({ compDTO: this.compDTO, contentDTO, pageId: this.pageId, pageName: this.pageName })
41 } else if (contentDTO.appStyle === CompStyle.Card_03) { 43 } else if (contentDTO.appStyle === CompStyle.Card_03) {
42 - Card3Component({ compDTO: this.compDTO, contentDTO }) 44 + Card3Component({ compDTO: this.compDTO, contentDTO, pageId: this.pageId, pageName: this.pageName })
43 } else if (contentDTO.appStyle === CompStyle.Card_04) { 45 } else if (contentDTO.appStyle === CompStyle.Card_04) {
44 - Card4Component({ compDTO: this.compDTO, contentDTO }) 46 + Card4Component({ compDTO: this.compDTO, contentDTO, pageId: this.pageId, pageName: this.pageName })
45 } else if (contentDTO.appStyle === CompStyle.Card_05) { 47 } else if (contentDTO.appStyle === CompStyle.Card_05) {
46 - Card5Component({ contentDTO, titleShowPolicy: this.compDTO.titleShowPolicy}) 48 + Card5Component({ compDTO: this.compDTO, contentDTO, titleShowPolicy: this.compDTO.titleShowPolicy, pageId: this.pageId, pageName: this.pageName})
47 } else if (contentDTO.appStyle === CompStyle.Card_06 || contentDTO.appStyle === CompStyle 49 } else if (contentDTO.appStyle === CompStyle.Card_06 || contentDTO.appStyle === CompStyle
48 .Card_13) { 50 .Card_13) {
49 - Card6Component({ compDTO: this.compDTO, contentDTO: this.contentDTO }) 51 + Card6Component({ compDTO: this.compDTO, contentDTO: this.contentDTO, pageId: this.pageId, pageName: this.pageName })
50 } else if (contentDTO.appStyle === CompStyle.Card_10) { 52 } else if (contentDTO.appStyle === CompStyle.Card_10) {
51 - Card10Component({ compDTO: this.compDTO, contentDTO }) 53 + Card10Component({ compDTO: this.compDTO, contentDTO, pageId: this.pageId, pageName: this.pageName })
52 } else if (contentDTO.appStyle === CompStyle.Card_11) { 54 } else if (contentDTO.appStyle === CompStyle.Card_11) {
53 - Card11Component({ compDTO: this.compDTO, contentDTO }) 55 + Card11Component({ compDTO: this.compDTO, contentDTO, pageId: this.pageId, pageName: this.pageName })
54 } else if (contentDTO.appStyle === CompStyle.Card_12) { 56 } else if (contentDTO.appStyle === CompStyle.Card_12) {
55 - Card12Component({ contentDTO }) 57 + Card12Component({ compDTO: this.compDTO, contentDTO, pageId: this.pageId, pageName: this.pageName })
56 } else if (contentDTO.appStyle === CompStyle.Card_14) { 58 } else if (contentDTO.appStyle === CompStyle.Card_14) {
57 - Card14Component({ contentDTO }) 59 + Card14Component({ contentDTO, compDTO: this.compDTO, pageId: this.pageId, pageName: this.pageName })
58 } else if (contentDTO.appStyle === CompStyle.Card_15) { 60 } else if (contentDTO.appStyle === CompStyle.Card_15) {
59 - Card15Component({ contentDTO }) 61 + Card15Component({ contentDTO, compDTO: this.compDTO, pageId: this.pageId, pageName: this.pageName })
60 } else if (contentDTO.appStyle === CompStyle.Card_16) { 62 } else if (contentDTO.appStyle === CompStyle.Card_16) {
61 - Card16Component({ contentDTO }) 63 + Card16Component({ contentDTO, compDTO: this.compDTO, pageId: this.pageId, pageName: this.pageName })
62 } else if (contentDTO.appStyle === CompStyle.Card_17) { 64 } else if (contentDTO.appStyle === CompStyle.Card_17) {
63 - Card17Component({ compDTO: this.compDTO, contentDTO }) 65 + Card17Component({ compDTO: this.compDTO, contentDTO, pageId: this.pageId, pageName: this.pageName })
64 } else if (contentDTO.appStyle === CompStyle.Card_19) { 66 } else if (contentDTO.appStyle === CompStyle.Card_19) {
65 - Card19Component({ contentDTO }) 67 + Card19Component({ contentDTO, compDTO: this.compDTO, pageId: this.pageId, pageName: this.pageName })
66 } else if (contentDTO.appStyle === CompStyle.Card_20) { 68 } else if (contentDTO.appStyle === CompStyle.Card_20) {
67 - Card20Component({ contentDTO }) 69 + Card20Component({ contentDTO, compDTO: this.compDTO, pageId: this.pageId, pageName: this.pageName })
68 } else if (contentDTO.appStyle === CompStyle.Card_21) { 70 } else if (contentDTO.appStyle === CompStyle.Card_21) {
69 - Card21Component({ contentDTO }) 71 + Card21Component({ contentDTO, compDTO: this.compDTO, pageId: this.pageId, pageName: this.pageName })
70 } else { 72 } else {
71 // todo:组件未实现 / Component Not Implemented 73 // todo:组件未实现 / Component Not Implemented
72 // Text(contentDTO.appStyle) 74 // Text(contentDTO.appStyle)
@@ -33,6 +33,8 @@ import { LiveHorizontalCardComponent } from './view/LiveHorizontalCardComponent' @@ -33,6 +33,8 @@ import { LiveHorizontalCardComponent } from './view/LiveHorizontalCardComponent'
33 */ 33 */
34 @Component 34 @Component
35 export struct CompParser { 35 export struct CompParser {
  36 + @State pageId: string = '';
  37 + @State pageName: string = '';
36 @ObjectLink compDTO: CompDTO 38 @ObjectLink compDTO: CompDTO
37 @State compIndex: number = 0; 39 @State compIndex: number = 0;
38 @State private pageModel: PageModel = new PageModel(); 40 @State private pageModel: PageModel = new PageModel();
@@ -71,26 +73,26 @@ export struct CompParser { @@ -71,26 +73,26 @@ export struct CompParser {
71 Divider().strokeWidth(5).color('#f5f5f5').padding({ left: 0, right: 0 }) 73 Divider().strokeWidth(5).color('#f5f5f5').padding({ left: 0, right: 0 })
72 } else if (this.compDTO.compStyle === CompStyle.Zh_Carousel_Layout_01) { 74 } else if (this.compDTO.compStyle === CompStyle.Zh_Carousel_Layout_01) {
73 if (this.compDTO.operDataList.length > this.audioItems.length) { 75 if (this.compDTO.operDataList.length > this.audioItems.length) {
74 - ZhCarouselLayout01({ compDTO: this.compDTO }) 76 + ZhCarouselLayout01({ compDTO: this.compDTO, pageId: this.pageId, pageName: this.pageName })
75 Divider().strokeWidth(5).color('#f5f5f5').padding({ left: 0, right: 0 }) 77 Divider().strokeWidth(5).color('#f5f5f5').padding({ left: 0, right: 0 })
76 } 78 }
77 } else if (this.compDTO.compStyle === CompStyle.Zh_Single_Row_01 && 79 } else if (this.compDTO.compStyle === CompStyle.Zh_Single_Row_01 &&
78 this.compDTO.imageScale === 2) { // && compDTO.name ==="横划卡" 80 this.compDTO.imageScale === 2) { // && compDTO.name ==="横划卡"
79 81
80 - LiveHorizontalCardComponent({ compDTO: this.compDTO }) 82 + LiveHorizontalCardComponent({ compDTO: this.compDTO, pageId: this.pageId, pageName: this.pageName })
81 Divider().strokeWidth(5).color('#f5f5f5').padding({ left: 0, right: 0 }) 83 Divider().strokeWidth(5).color('#f5f5f5').padding({ left: 0, right: 0 })
82 } else if (this.compDTO.compStyle === CompStyle.Zh_Single_Row_01 && this.compDTO.imageScale === 3) { 84 } else if (this.compDTO.compStyle === CompStyle.Zh_Single_Row_01 && this.compDTO.imageScale === 3) {
83 if (this.compDTO.operDataList.length > 1) { 85 if (this.compDTO.operDataList.length > 1) {
84 - HorizontalStrokeCardThreeTwoRadioForMoreComponent({ compDTO: this.compDTO }) 86 + HorizontalStrokeCardThreeTwoRadioForMoreComponent({ compDTO: this.compDTO, pageId: this.pageId, pageName: this.pageName })
85 } else { 87 } else {
86 - HorizontalStrokeCardThreeTwoRadioForOneComponent({ compDTO: this.compDTO }) 88 + HorizontalStrokeCardThreeTwoRadioForOneComponent({ compDTO: this.compDTO, pageId: this.pageId, pageName: this.pageName })
87 } 89 }
88 Divider().strokeWidth(5).color('#f5f5f5').padding({ left: 0, right: 0 }) 90 Divider().strokeWidth(5).color('#f5f5f5').padding({ left: 0, right: 0 })
89 } else if (this.compDTO.compStyle === CompStyle.Zh_Single_Row_02) { 91 } else if (this.compDTO.compStyle === CompStyle.Zh_Single_Row_02) {
90 - ZhSingleRow02({ compDTO: this.compDTO }) 92 + ZhSingleRow02({ compDTO: this.compDTO, pageId: this.pageId, pageName: this.pageName })
91 Divider().strokeWidth(5).color('#f5f5f5').padding({ left: 0, right: 0 }) 93 Divider().strokeWidth(5).color('#f5f5f5').padding({ left: 0, right: 0 })
92 } else if (this.compDTO.compStyle === CompStyle.Zh_Single_Row_03) { 94 } else if (this.compDTO.compStyle === CompStyle.Zh_Single_Row_03) {
93 - ZhSingleRow03({ compDTO: this.compDTO }) 95 + ZhSingleRow03({ compDTO: this.compDTO, pageId: this.pageId, pageName: this.pageName })
94 Divider().strokeWidth(5).color('#f5f5f5').padding({ left: 0, right: 0 }) 96 Divider().strokeWidth(5).color('#f5f5f5').padding({ left: 0, right: 0 })
95 } else if (this.compDTO.compStyle === CompStyle.Zh_Grid_Layout_02) { //双列流小视频,一行两图卡 ->标题 97 } else if (this.compDTO.compStyle === CompStyle.Zh_Grid_Layout_02) { //双列流小视频,一行两图卡 ->标题
96 //ZhGridLayout02({ compDTO: this.compDTO }) 98 //ZhGridLayout02({ compDTO: this.compDTO })
@@ -98,34 +100,34 @@ export struct CompParser { @@ -98,34 +100,34 @@ export struct CompParser {
98 // Divider().strokeWidth(5).color('#f5f5f5').padding({ left: 0, right: 0 }) 100 // Divider().strokeWidth(5).color('#f5f5f5').padding({ left: 0, right: 0 })
99 } else if (this.compDTO.compStyle === CompStyle.Card_Comp_Zh_Grid_Layout_02) { //双列流小视频,一行两图卡 101 } else if (this.compDTO.compStyle === CompStyle.Card_Comp_Zh_Grid_Layout_02) { //双列流小视频,一行两图卡
100 102
101 - ZhGridLayout02NewsContent({ compDTO: this.compDTO, operDataList: this.compDTO.operDataList }) 103 + ZhGridLayout02NewsContent({ compDTO: this.compDTO, operDataList: this.compDTO.operDataList, pageId: this.pageId, pageName: this.pageName })
102 104
103 } else if (this.compDTO.compStyle === CompStyle.Zh_Grid_Layout_03) { 105 } else if (this.compDTO.compStyle === CompStyle.Zh_Grid_Layout_03) {
104 - ZhGridLayout03({ compDTO: this.compDTO }) 106 + ZhGridLayout03({ compDTO: this.compDTO, pageId: this.pageId, pageName: this.pageName })
105 Divider().strokeWidth(5).color('#f5f5f5').padding({ left: 0, right: 0 }) 107 Divider().strokeWidth(5).color('#f5f5f5').padding({ left: 0, right: 0 })
106 } else if (this.compDTO.compStyle === CompStyle.Zh_Single_Row_04) { 108 } else if (this.compDTO.compStyle === CompStyle.Zh_Single_Row_04) {
107 - ZhSingleRow04({ compDTO: this.compDTO }) 109 + ZhSingleRow04({ compDTO: this.compDTO, pageId: this.pageId, pageName: this.pageName })
108 Divider().strokeWidth(5).color('#f5f5f5').padding({ left: 0, right: 0 }) 110 Divider().strokeWidth(5).color('#f5f5f5').padding({ left: 0, right: 0 })
109 } else if (this.compDTO.compStyle === CompStyle.Zh_Single_Row_05) { 111 } else if (this.compDTO.compStyle === CompStyle.Zh_Single_Row_05) {
110 // ZhSingleRow05({ compDTO }) 112 // ZhSingleRow05({ compDTO })
111 // Divider().strokeWidth(5).color('#f5f5f5').padding({ left: 0, right: 0 }) 113 // Divider().strokeWidth(5).color('#f5f5f5').padding({ left: 0, right: 0 })
112 } else if (this.compDTO.compStyle === CompStyle.Zh_Single_Row_06) { 114 } else if (this.compDTO.compStyle === CompStyle.Zh_Single_Row_06) {
113 - ZhSingleRow06({ compDTO: this.compDTO }) 115 + ZhSingleRow06({ compDTO: this.compDTO, pageId: this.pageId, pageName: this.pageName })
114 Divider().strokeWidth(5).color('#f5f5f5').padding({ left: 0, right: 0 }) 116 Divider().strokeWidth(5).color('#f5f5f5').padding({ left: 0, right: 0 })
115 } else if (this.compDTO.compStyle === CompStyle.Zh_Single_Column_02) { 117 } else if (this.compDTO.compStyle === CompStyle.Zh_Single_Column_02) {
116 //头图卡 和comStyle 2相同， 118 //头图卡 和comStyle 2相同，
117 - Card5Component({ contentDTO: this.compDTO.operDataList[0], titleShowPolicy: this.compDTO.titleShowPolicy }) 119 + Card5Component({ compDTO: this.compDTO, contentDTO: this.compDTO.operDataList[0], titleShowPolicy: this.compDTO.titleShowPolicy, pageId: this.pageId, pageName: this.pageName })
118 Divider().strokeWidth(5).color('#f5f5f5').padding({ left: 0, right: 0 }) 120 Divider().strokeWidth(5).color('#f5f5f5').padding({ left: 0, right: 0 })
119 } else if (this.compDTO.compStyle === CompStyle.Zh_Single_Column_03) { 121 } else if (this.compDTO.compStyle === CompStyle.Zh_Single_Column_03) {
120 // 大图卡 122 // 大图卡
121 - Card2Component({ compDTO: this.compDTO, contentDTO: this.compDTO.operDataList[0] }) 123 + Card2Component({ compDTO: this.compDTO, contentDTO: this.compDTO.operDataList[0], pageId: this.pageId, pageName: this.pageName })
122 Divider().strokeWidth(5).color('#f5f5f5').padding({ left: 0, right: 0 }) 124 Divider().strokeWidth(5).color('#f5f5f5').padding({ left: 0, right: 0 })
123 } else if (this.compDTO.compStyle === CompStyle.Card_09) { 125 } else if (this.compDTO.compStyle === CompStyle.Card_09) {
124 //时间链卡 126 //时间链卡
125 - Card9Component({ contentDTO:this.compDTO.operDataList[0] }) 127 + Card9Component({ compDTO: this.compDTO, contentDTO:this.compDTO.operDataList[0], pageId: this.pageId, pageName: this.pageName })
126 Divider().strokeWidth(5).color('#f5f5f5').padding({ left: 0, right: 0 }) 128 Divider().strokeWidth(5).color('#f5f5f5').padding({ left: 0, right: 0 })
127 } else if (this.compDTO.compStyle === CompStyle.Zh_Single_Column_04) { 129 } else if (this.compDTO.compStyle === CompStyle.Zh_Single_Column_04) {
128 - ZhSingleColumn04({ compDTO: this.compDTO }) 130 + ZhSingleColumn04({ compDTO: this.compDTO, pageId: this.pageId, pageName: this.pageName })
129 Divider().strokeWidth(5).color('#f5f5f5').padding({ left: 0, right: 0 }) 131 Divider().strokeWidth(5).color('#f5f5f5').padding({ left: 0, right: 0 })
130 } else if (this.compDTO.compStyle === CompStyle.Zh_Single_Column_05) { 132 } else if (this.compDTO.compStyle === CompStyle.Zh_Single_Column_05) {
131 // ZhSingleColumn05({ compDTO: compDTO }) 133 // ZhSingleColumn05({ compDTO: compDTO })
@@ -140,7 +142,7 @@ export struct CompParser { @@ -140,7 +142,7 @@ export struct CompParser {
140 //Text(`compIndex = ${compIndex}`).width('100%').fontSize('12fp').fontColor(Color.Red).padding({ left: 0, right: 0 }) 142 //Text(`compIndex = ${compIndex}`).width('100%').fontSize('12fp').fontColor(Color.Red).padding({ left: 0, right: 0 })
141 Divider().strokeWidth(5).color('#f5f5f5').padding({ left: 0, right: 0 }) 143 Divider().strokeWidth(5).color('#f5f5f5').padding({ left: 0, right: 0 })
142 } else if (!Number.isNaN(Number(this.compDTO.compStyle))) { 144 } else if (!Number.isNaN(Number(this.compDTO.compStyle))) {
143 - CardParser({ contentDTO: this.compDTO.operDataList[0], compDTO: this.compDTO }); 145 + CardParser({ contentDTO: this.compDTO.operDataList[0], compDTO: this.compDTO, pageId: this.pageId, pageName: this.pageName });
144 Divider().strokeWidth(1).color('#f5f5f5').padding({ left: 16, right: 16 }) 146 Divider().strokeWidth(1).color('#f5f5f5').padding({ left: 16, right: 16 })
145 } else { 147 } else {
146 // Text(this.compDTO.compStyle) 148 // Text(this.compDTO.compStyle)
@@ -5,6 +5,7 @@ import { CardSourceInfo } from '../cardCommon/CardSourceInfo'; @@ -5,6 +5,7 @@ import { CardSourceInfo } from '../cardCommon/CardSourceInfo';
5 import { CardMediaInfo } from '../cardCommon/CardMediaInfo'; 5 import { CardMediaInfo } from '../cardCommon/CardMediaInfo';
6 import { Notes } from './notes'; 6 import { Notes } from './notes';
7 import { onlyWifiLoadImg } from '../../utils/lazyloadImg'; 7 import { onlyWifiLoadImg } from '../../utils/lazyloadImg';
  8 +import { InfomationCardClick } from '../../utils/infomationCardClick'
8 9
9 /** 10 /**
10 * 大专题卡--CompStyle: 10 11 * 大专题卡--CompStyle: 10
@@ -14,6 +15,8 @@ const TAG: string = 'Card10Component'; @@ -14,6 +15,8 @@ const TAG: string = 'Card10Component';
14 @Preview 15 @Preview
15 @Component 16 @Component
16 export struct Card10Component { 17 export struct Card10Component {
  18 + @State pageId: string = '';
  19 + @State pageName: string = '';
17 @State contentDTO: ContentDTO = new ContentDTO(); 20 @State contentDTO: ContentDTO = new ContentDTO();
18 @State loadImg: boolean = false; 21 @State loadImg: boolean = false;
19 @ObjectLink compDTO: CompDTO 22 @ObjectLink compDTO: CompDTO
@@ -57,6 +60,7 @@ export struct Card10Component { @@ -57,6 +60,7 @@ export struct Card10Component {
57 .textOverflow({ overflow: TextOverflow.Ellipsis }) 60 .textOverflow({ overflow: TextOverflow.Ellipsis })
58 .margin({ bottom: 19 }) 61 .margin({ bottom: 19 })
59 .onClick((event: ClickEvent) => { 62 .onClick((event: ClickEvent) => {
  63 + InfomationCardClick.track(this.compDTO, this.contentDTO, this.pageId, this.pageName)
60 ProcessUtils.processPage(this.contentDTO) 64 ProcessUtils.processPage(this.contentDTO)
61 }) 65 })
62 } 66 }
@@ -70,6 +74,7 @@ export struct Card10Component { @@ -70,6 +74,7 @@ export struct Card10Component {
70 topRight: $r('app.float.image_border_radius') 74 topRight: $r('app.float.image_border_radius')
71 }) 75 })
72 .onClick((event: ClickEvent) => { 76 .onClick((event: ClickEvent) => {
  77 + InfomationCardClick.track(this.compDTO, this.contentDTO, this.pageId, this.pageName)
73 ProcessUtils.processPage(this.contentDTO) 78 ProcessUtils.processPage(this.contentDTO)
74 }) 79 })
75 if (this.contentDTO.objectType == '5') { 80 if (this.contentDTO.objectType == '5') {
@@ -102,6 +107,7 @@ export struct Card10Component { @@ -102,6 +107,7 @@ export struct Card10Component {
102 .justifyContent(FlexAlign.Center) 107 .justifyContent(FlexAlign.Center)
103 .margin({ top: 5 }) 108 .margin({ top: 5 })
104 .onClick((event: ClickEvent) => { 109 .onClick((event: ClickEvent) => {
  110 + InfomationCardClick.track(this.compDTO, this.contentDTO, this.pageId, this.pageName)
105 ProcessUtils.processPage(this.contentDTO) 111 ProcessUtils.processPage(this.contentDTO)
106 }) 112 })
107 } 113 }
@@ -6,6 +6,7 @@ import { ProcessUtils } from 'wdRouter'; @@ -6,6 +6,7 @@ import { ProcessUtils } from 'wdRouter';
6 import { CardSourceInfo } from '../cardCommon/CardSourceInfo'; 6 import { CardSourceInfo } from '../cardCommon/CardSourceInfo';
7 import { Notes } from './notes'; 7 import { Notes } from './notes';
8 import { persistentStorage, hasClicked } from '../../utils/persistentStorage'; 8 import { persistentStorage, hasClicked } from '../../utils/persistentStorage';
  9 +import { InfomationCardClick } from '../../utils/infomationCardClick'
9 10
10 const TAG = 'Card11Component'; 11 const TAG = 'Card11Component';
11 12
@@ -14,6 +15,8 @@ const TAG = 'Card11Component'; @@ -14,6 +15,8 @@ const TAG = 'Card11Component';
14 */ 15 */
15 @Component 16 @Component
16 export struct Card11Component { 17 export struct Card11Component {
  18 + @State pageId: string = '';
  19 + @State pageName: string = '';
17 @State contentDTO: ContentDTO = new ContentDTO(); 20 @State contentDTO: ContentDTO = new ContentDTO();
18 @State clicked: boolean = false; 21 @State clicked: boolean = false;
19 @ObjectLink compDTO: CompDTO 22 @ObjectLink compDTO: CompDTO
@@ -78,6 +81,7 @@ export struct Card11Component { @@ -78,6 +81,7 @@ export struct Card11Component {
78 }) 81 })
79 .backgroundColor($r("app.color.white")) 82 .backgroundColor($r("app.color.white"))
80 .onClick((event: ClickEvent) => { 83 .onClick((event: ClickEvent) => {
  84 + InfomationCardClick.track(this.compDTO, this.contentDTO, this.pageId, this.pageName)
81 this.clicked = true; 85 this.clicked = true;
82 persistentStorage(this.contentDTO.objectId); 86 persistentStorage(this.contentDTO.objectId);
83 ProcessUtils.processPage(this.contentDTO) 87 ProcessUtils.processPage(this.contentDTO)
1 -import { ContentDTO } from 'wdBean'; 1 +import { ContentDTO, CompDTO } from 'wdBean';
2 import { RmhTitle } from '../cardCommon/RmhTitle' 2 import { RmhTitle } from '../cardCommon/RmhTitle'
3 import { CardMediaInfo } from '../cardCommon/CardMediaInfo' 3 import { CardMediaInfo } from '../cardCommon/CardMediaInfo'
4 import { CommonConstants } from 'wdConstant/Index'; 4 import { CommonConstants } from 'wdConstant/Index';
5 import { ProcessUtils } from 'wdRouter'; 5 import { ProcessUtils } from 'wdRouter';
6 import {CarderInteraction} from '../CarderInteraction' 6 import {CarderInteraction} from '../CarderInteraction'
7 import { persistentStorage, hasClicked } from '../../utils/persistentStorage'; 7 import { persistentStorage, hasClicked } from '../../utils/persistentStorage';
  8 +import { InfomationCardClick } from '../../utils/infomationCardClick'
8 9
9 const TAG = 'Card12Component'; 10 const TAG = 'Card12Component';
10 11
@@ -13,6 +14,9 @@ const TAG = 'Card12Component'; @@ -13,6 +14,9 @@ const TAG = 'Card12Component';
13 */ 14 */
14 @Component 15 @Component
15 export struct Card12Component { 16 export struct Card12Component {
  17 + @ObjectLink compDTO: CompDTO
  18 + @State pageId: string = '';
  19 + @State pageName: string = '';
16 @State contentDTO: ContentDTO = new ContentDTO(); 20 @State contentDTO: ContentDTO = new ContentDTO();
17 @State clicked: boolean = false; 21 @State clicked: boolean = false;
18 @State titleMarked: boolean = false; 22 @State titleMarked: boolean = false;
@@ -70,6 +74,7 @@ export struct Card12Component { @@ -70,6 +74,7 @@ export struct Card12Component {
70 bottom: $r('app.float.card_comp_pagePadding_tb') 74 bottom: $r('app.float.card_comp_pagePadding_tb')
71 }) 75 })
72 .onClick((event: ClickEvent) => { 76 .onClick((event: ClickEvent) => {
  77 + InfomationCardClick.track(this.compDTO, this.contentDTO, this.pageId, this.pageName)
73 this.clicked = true; 78 this.clicked = true;
74 persistentStorage(this.contentDTO.objectId); 79 persistentStorage(this.contentDTO.objectId);
75 ProcessUtils.processPage(this.contentDTO) 80 ProcessUtils.processPage(this.contentDTO)
1 -import { ContentDTO } from 'wdBean'; 1 +import { ContentDTO, CompDTO } from 'wdBean';
2 import { RmhTitle } from '../cardCommon/RmhTitle' 2 import { RmhTitle } from '../cardCommon/RmhTitle'
3 import { CardMediaInfo } from '../cardCommon/CardMediaInfo' 3 import { CardMediaInfo } from '../cardCommon/CardMediaInfo'
4 import { CommonConstants } from 'wdConstant/Index'; 4 import { CommonConstants } from 'wdConstant/Index';
@@ -6,6 +6,7 @@ import { ProcessUtils } from 'wdRouter'; @@ -6,6 +6,7 @@ import { ProcessUtils } from 'wdRouter';
6 import {CarderInteraction} from '../CarderInteraction' 6 import {CarderInteraction} from '../CarderInteraction'
7 import { onlyWifiLoadImg } from '../../utils/lazyloadImg'; 7 import { onlyWifiLoadImg } from '../../utils/lazyloadImg';
8 import { persistentStorage, hasClicked } from '../../utils/persistentStorage'; 8 import { persistentStorage, hasClicked } from '../../utils/persistentStorage';
  9 +import { InfomationCardClick } from '../../utils/infomationCardClick'
9 10
10 const TAG = 'Card14Component'; 11 const TAG = 'Card14Component';
11 12
@@ -14,6 +15,9 @@ const TAG = 'Card14Component'; @@ -14,6 +15,9 @@ const TAG = 'Card14Component';
14 */ 15 */
15 @Component 16 @Component
16 export struct Card14Component { 17 export struct Card14Component {
  18 + @ObjectLink compDTO: CompDTO
  19 + @State pageId: string = '';
  20 + @State pageName: string = '';
17 @State contentDTO: ContentDTO = new ContentDTO(); 21 @State contentDTO: ContentDTO = new ContentDTO();
18 @State loadImg: boolean = false; 22 @State loadImg: boolean = false;
19 @State clicked: boolean = false; 23 @State clicked: boolean = false;
@@ -89,6 +93,7 @@ export struct Card14Component { @@ -89,6 +93,7 @@ export struct Card14Component {
89 bottom: $r('app.float.card_comp_pagePadding_tb') 93 bottom: $r('app.float.card_comp_pagePadding_tb')
90 }) 94 })
91 .onClick((event: ClickEvent) => { 95 .onClick((event: ClickEvent) => {
  96 + InfomationCardClick.track(this.compDTO, this.contentDTO, this.pageId, this.pageName)
92 this.clicked = true; 97 this.clicked = true;
93 persistentStorage(this.contentDTO.objectId); 98 persistentStorage(this.contentDTO.objectId);
94 ProcessUtils.processPage(this.contentDTO) 99 ProcessUtils.processPage(this.contentDTO)
1 -import { ContentDTO } from 'wdBean'; 1 +import { ContentDTO, CompDTO } from 'wdBean';
2 import { ProcessUtils } from 'wdRouter'; 2 import { ProcessUtils } from 'wdRouter';
3 import { RmhTitle } from '../cardCommon/RmhTitle' 3 import { RmhTitle } from '../cardCommon/RmhTitle'
4 import { CardMediaInfo } from '../cardCommon/CardMediaInfo' 4 import { CardMediaInfo } from '../cardCommon/CardMediaInfo'
@@ -6,6 +6,7 @@ import { CommonConstants } from 'wdConstant/Index'; @@ -6,6 +6,7 @@ import { CommonConstants } from 'wdConstant/Index';
6 import {CarderInteraction} from '../CarderInteraction' 6 import {CarderInteraction} from '../CarderInteraction'
7 import { onlyWifiLoadImg } from '../../utils/lazyloadImg'; 7 import { onlyWifiLoadImg } from '../../utils/lazyloadImg';
8 import { persistentStorage, hasClicked } from '../../utils/persistentStorage'; 8 import { persistentStorage, hasClicked } from '../../utils/persistentStorage';
  9 +import { InfomationCardClick } from '../../utils/infomationCardClick'
9 10
10 const TAG: string = 'Card15Component'; 11 const TAG: string = 'Card15Component';
11 12
@@ -18,6 +19,9 @@ const TAG: string = 'Card15Component'; @@ -18,6 +19,9 @@ const TAG: string = 'Card15Component';
18 */ 19 */
19 @Component 20 @Component
20 export struct Card15Component { 21 export struct Card15Component {
  22 + @ObjectLink compDTO: CompDTO
  23 + @State pageId: string = '';
  24 + @State pageName: string = '';
21 @State contentDTO: ContentDTO = new ContentDTO(); 25 @State contentDTO: ContentDTO = new ContentDTO();
22 @State loadImg: boolean = false; 26 @State loadImg: boolean = false;
23 @State clicked: boolean = false; 27 @State clicked: boolean = false;
@@ -87,6 +91,7 @@ export struct Card15Component { @@ -87,6 +91,7 @@ export struct Card15Component {
87 bottom: $r('app.float.card_comp_pagePadding_tb') 91 bottom: $r('app.float.card_comp_pagePadding_tb')
88 }) 92 })
89 .onClick((event: ClickEvent) => { 93 .onClick((event: ClickEvent) => {
  94 + InfomationCardClick.track(this.compDTO, this.contentDTO, this.pageId, this.pageName)
90 this.clicked = true; 95 this.clicked = true;
91 persistentStorage(this.contentDTO.objectId); 96 persistentStorage(this.contentDTO.objectId);
92 ProcessUtils.processPage(this.contentDTO) 97 ProcessUtils.processPage(this.contentDTO)
1 -import { ContentDTO } from 'wdBean'; 1 +import { ContentDTO, CompDTO } from 'wdBean';
2 import { RmhTitle } from '../cardCommon/RmhTitle' 2 import { RmhTitle } from '../cardCommon/RmhTitle'
3 import { CardMediaInfo } from '../cardCommon/CardMediaInfo' 3 import { CardMediaInfo } from '../cardCommon/CardMediaInfo'
4 import { CommonConstants } from 'wdConstant/Index'; 4 import { CommonConstants } from 'wdConstant/Index';
@@ -6,6 +6,7 @@ import { ProcessUtils } from 'wdRouter'; @@ -6,6 +6,7 @@ import { ProcessUtils } from 'wdRouter';
6 import {CarderInteraction} from '../CarderInteraction' 6 import {CarderInteraction} from '../CarderInteraction'
7 import { onlyWifiLoadImg } from '../../utils/lazyloadImg'; 7 import { onlyWifiLoadImg } from '../../utils/lazyloadImg';
8 import { persistentStorage, hasClicked } from '../../utils/persistentStorage'; 8 import { persistentStorage, hasClicked } from '../../utils/persistentStorage';
  9 +import { InfomationCardClick } from '../../utils/infomationCardClick'
9 10
10 const TAG = 'Card16Component'; 11 const TAG = 'Card16Component';
11 12
@@ -19,6 +20,9 @@ interface fullColumnImgUrlItem { @@ -19,6 +20,9 @@ interface fullColumnImgUrlItem {
19 */ 20 */
20 @Component 21 @Component
21 export struct Card16Component { 22 export struct Card16Component {
  23 + @ObjectLink compDTO: CompDTO
  24 + @State pageId: string = '';
  25 + @State pageName: string = '';
22 @State contentDTO: ContentDTO = new ContentDTO(); 26 @State contentDTO: ContentDTO = new ContentDTO();
23 @State loadImg: boolean = false; 27 @State loadImg: boolean = false;
24 @State clicked: boolean = false; 28 @State clicked: boolean = false;
@@ -88,6 +92,7 @@ export struct Card16Component { @@ -88,6 +92,7 @@ export struct Card16Component {
88 bottom: $r('app.float.card_comp_pagePadding_tb') 92 bottom: $r('app.float.card_comp_pagePadding_tb')
89 }) 93 })
90 .onClick((event: ClickEvent) => { 94 .onClick((event: ClickEvent) => {
  95 + InfomationCardClick.track(this.compDTO, this.contentDTO, this.pageId, this.pageName)
91 this.clicked = true; 96 this.clicked = true;
92 persistentStorage(this.contentDTO.objectId); 97 persistentStorage(this.contentDTO.objectId);
93 ProcessUtils.processPage(this.contentDTO) 98 ProcessUtils.processPage(this.contentDTO)
@@ -6,6 +6,7 @@ import { CardSourceInfo } from '../cardCommon/CardSourceInfo'; @@ -6,6 +6,7 @@ import { CardSourceInfo } from '../cardCommon/CardSourceInfo';
6 import { onlyWifiLoadImg } from '../../utils/lazyloadImg'; 6 import { onlyWifiLoadImg } from '../../utils/lazyloadImg';
7 import { CardMediaInfo } from '../cardCommon/CardMediaInfo'; 7 import { CardMediaInfo } from '../cardCommon/CardMediaInfo';
8 import { persistentStorage, hasClicked } from '../../utils/persistentStorage'; 8 import { persistentStorage, hasClicked } from '../../utils/persistentStorage';
  9 +import { InfomationCardClick } from '../../utils/infomationCardClick'
9 10
10 const TAG = 'Card17Component'; 11 const TAG = 'Card17Component';
11 12
@@ -14,6 +15,8 @@ const TAG = 'Card17Component'; @@ -14,6 +15,8 @@ const TAG = 'Card17Component';
14 */ 15 */
15 @Component 16 @Component
16 export struct Card17Component { 17 export struct Card17Component {
  18 + @State pageId: string = '';
  19 + @State pageName: string = '';
17 @State contentDTO: ContentDTO = new ContentDTO(); 20 @State contentDTO: ContentDTO = new ContentDTO();
18 @State loadImg: boolean = false; 21 @State loadImg: boolean = false;
19 @State clicked: boolean = false; 22 @State clicked: boolean = false;
@@ -106,6 +109,7 @@ export struct Card17Component { @@ -106,6 +109,7 @@ export struct Card17Component {
106 } 109 }
107 .width(CommonConstants.FULL_WIDTH) 110 .width(CommonConstants.FULL_WIDTH)
108 .onClick((event: ClickEvent) => { 111 .onClick((event: ClickEvent) => {
  112 + InfomationCardClick.track(this.compDTO, this.contentDTO, this.pageId, this.pageName)
109 this.clicked = true; 113 this.clicked = true;
110 persistentStorage(this.contentDTO.objectId); 114 persistentStorage(this.contentDTO.objectId);
111 let taskAction: Action = { 115 let taskAction: Action = {
1 -import { ContentDTO, FullColumnImgUrlDTO, PhotoListBean } from 'wdBean'; 1 +import { ContentDTO, FullColumnImgUrlDTO, PhotoListBean, CompDTO } from 'wdBean';
2 import { RmhTitle } from '../cardCommon/RmhTitle' 2 import { RmhTitle } from '../cardCommon/RmhTitle'
3 import { ProcessUtils } from 'wdRouter'; 3 import { ProcessUtils } from 'wdRouter';
4 import { CommonConstants } from 'wdConstant/Index'; 4 import { CommonConstants } from 'wdConstant/Index';
5 import { CarderInteraction } from '../CarderInteraction' 5 import { CarderInteraction } from '../CarderInteraction'
6 import { onlyWifiLoadImg } from '../../utils/lazyloadImg'; 6 import { onlyWifiLoadImg } from '../../utils/lazyloadImg';
7 import { persistentStorage, hasClicked } from '../../utils/persistentStorage'; 7 import { persistentStorage, hasClicked } from '../../utils/persistentStorage';
  8 +import { InfomationCardClick } from '../../utils/infomationCardClick'
8 9
9 const TAG = 'Card19Component'; 10 const TAG = 'Card19Component';
10 11
@@ -13,6 +14,9 @@ const TAG = 'Card19Component'; @@ -13,6 +14,9 @@ const TAG = 'Card19Component';
13 */ 14 */
14 @Component 15 @Component
15 export struct Card19Component { 16 export struct Card19Component {
  17 + @ObjectLink compDTO: CompDTO
  18 + @State pageId: string = '';
  19 + @State pageName: string = '';
16 @State contentDTO: ContentDTO = new ContentDTO() 20 @State contentDTO: ContentDTO = new ContentDTO()
17 @State clicked: boolean = false; 21 @State clicked: boolean = false;
18 @State titleMarked: boolean = false; 22 @State titleMarked: boolean = false;
@@ -58,6 +62,7 @@ export struct Card19Component { @@ -58,6 +62,7 @@ export struct Card19Component {
58 .width(CommonConstants.FULL_WIDTH) 62 .width(CommonConstants.FULL_WIDTH)
59 .lineHeight(25) 63 .lineHeight(25)
60 .onClick((event: ClickEvent) => { 64 .onClick((event: ClickEvent) => {
  65 + InfomationCardClick.track(this.compDTO, this.contentDTO, this.pageId, this.pageName)
61 this.clicked = true; 66 this.clicked = true;
62 ProcessUtils.processPage(this.contentDTO) 67 ProcessUtils.processPage(this.contentDTO)
63 }) 68 })
@@ -75,6 +80,7 @@ export struct Card19Component { @@ -75,6 +80,7 @@ export struct Card19Component {
75 bottom: $r('app.float.card_comp_pagePadding_tb') 80 bottom: $r('app.float.card_comp_pagePadding_tb')
76 }) 81 })
77 .onClick((event: ClickEvent) => { 82 .onClick((event: ClickEvent) => {
  83 + InfomationCardClick.track(this.compDTO, this.contentDTO, this.pageId, this.pageName)
78 this.clicked = true; 84 this.clicked = true;
79 persistentStorage(this.contentDTO.objectId); 85 persistentStorage(this.contentDTO.objectId);
80 ProcessUtils.processPage(this.contentDTO) 86 ProcessUtils.processPage(this.contentDTO)
1 -import { ContentDTO } from 'wdBean'; 1 +import { ContentDTO, CompDTO } from 'wdBean';
2 import { RmhTitle } from '../cardCommon/RmhTitle' 2 import { RmhTitle } from '../cardCommon/RmhTitle'
3 import { CardMediaInfo } from '../cardCommon/CardMediaInfo' 3 import { CardMediaInfo } from '../cardCommon/CardMediaInfo'
4 import { CommonConstants } from 'wdConstant/Index'; 4 import { CommonConstants } from 'wdConstant/Index';
@@ -6,6 +6,7 @@ import { ProcessUtils } from 'wdRouter'; @@ -6,6 +6,7 @@ import { ProcessUtils } from 'wdRouter';
6 import {CarderInteraction} from '../CarderInteraction' 6 import {CarderInteraction} from '../CarderInteraction'
7 import { onlyWifiLoadImg } from '../../utils/lazyloadImg'; 7 import { onlyWifiLoadImg } from '../../utils/lazyloadImg';
8 import { persistentStorage, hasClicked } from '../../utils/persistentStorage'; 8 import { persistentStorage, hasClicked } from '../../utils/persistentStorage';
  9 +import { InfomationCardClick } from '../../utils/infomationCardClick'
9 10
10 const TAG = 'Card20Component'; 11 const TAG = 'Card20Component';
11 12
@@ -14,6 +15,9 @@ const TAG = 'Card20Component'; @@ -14,6 +15,9 @@ const TAG = 'Card20Component';
14 */ 15 */
15 @Component 16 @Component
16 export struct Card20Component { 17 export struct Card20Component {
  18 + @ObjectLink compDTO: CompDTO
  19 + @State pageId: string = '';
  20 + @State pageName: string = '';
17 @State contentDTO: ContentDTO = new ContentDTO(); 21 @State contentDTO: ContentDTO = new ContentDTO();
18 @State clicked: boolean = false; 22 @State clicked: boolean = false;
19 @State titleMarked: boolean = false; 23 @State titleMarked: boolean = false;
@@ -72,6 +76,7 @@ export struct Card20Component { @@ -72,6 +76,7 @@ export struct Card20Component {
72 bottom: $r('app.float.card_comp_pagePadding_tb') 76 bottom: $r('app.float.card_comp_pagePadding_tb')
73 }) 77 })
74 .onClick((event: ClickEvent) => { 78 .onClick((event: ClickEvent) => {
  79 + InfomationCardClick.track(this.compDTO, this.contentDTO, this.pageId, this.pageName)
75 this.clicked = true; 80 this.clicked = true;
76 persistentStorage(this.contentDTO.objectId); 81 persistentStorage(this.contentDTO.objectId);
77 ProcessUtils.processPage(this.contentDTO) 82 ProcessUtils.processPage(this.contentDTO)
@@ -98,7 +103,7 @@ struct createImg { @@ -98,7 +103,7 @@ struct createImg {
98 103
99 build() { 104 build() {
100 GridRow() { 105 GridRow() {
101 - if (this.contentDTO.fullColumnImgUrls[0].landscape === 1) { 106 + if (this.contentDTO.fullColumnImgUrls[0].landscape === 1 || this.contentDTO.fullColumnImgUrls[0].weight > this.contentDTO.fullColumnImgUrls[0].height) {
102 // 横屏 107 // 横屏
103 GridCol({ 108 GridCol({
104 span: { xs: 12 } 109 span: { xs: 12 }
1 -import { ContentDTO } from 'wdBean'; 1 +import { ContentDTO, CompDTO } from 'wdBean';
2 import { CommonConstants, CompStyle } from 'wdConstant'; 2 import { CommonConstants, CompStyle } from 'wdConstant';
3 import { ProcessUtils } from 'wdRouter'; 3 import { ProcessUtils } from 'wdRouter';
4 import { RmhTitle } from '../cardCommon/RmhTitle' 4 import { RmhTitle } from '../cardCommon/RmhTitle'
@@ -6,6 +6,7 @@ import { CardMediaInfo } from '../cardCommon/CardMediaInfo' @@ -6,6 +6,7 @@ import { CardMediaInfo } from '../cardCommon/CardMediaInfo'
6 import {CarderInteraction} from '../CarderInteraction' 6 import {CarderInteraction} from '../CarderInteraction'
7 import { onlyWifiLoadImg } from '../../utils/lazyloadImg'; 7 import { onlyWifiLoadImg } from '../../utils/lazyloadImg';
8 import { persistentStorage, hasClicked } from '../../utils/persistentStorage'; 8 import { persistentStorage, hasClicked } from '../../utils/persistentStorage';
  9 +import { InfomationCardClick } from '../../utils/infomationCardClick'
9 10
10 const TAG: string = 'Card6Component-Card13Component'; 11 const TAG: string = 'Card6Component-Card13Component';
11 12
@@ -14,6 +15,9 @@ const TAG: string = 'Card6Component-Card13Component'; @@ -14,6 +15,9 @@ const TAG: string = 'Card6Component-Card13Component';
14 */ 15 */
15 @Component 16 @Component
16 export struct Card21Component { 17 export struct Card21Component {
  18 + @ObjectLink compDTO: CompDTO
  19 + @State pageId: string = '';
  20 + @State pageName: string = '';
17 @State contentDTO: ContentDTO = new ContentDTO(); 21 @State contentDTO: ContentDTO = new ContentDTO();
18 @State loadImg: boolean = false; 22 @State loadImg: boolean = false;
19 @State clicked: boolean = false; 23 @State clicked: boolean = false;
@@ -80,6 +84,7 @@ export struct Card21Component { @@ -80,6 +84,7 @@ export struct Card21Component {
80 //TODO 底部的：分享、评论、点赞 功能；需要引用一个公共组件 84 //TODO 底部的：分享、评论、点赞 功能；需要引用一个公共组件
81 } 85 }
82 .onClick((event: ClickEvent) => { 86 .onClick((event: ClickEvent) => {
  87 + InfomationCardClick.track(this.compDTO, this.contentDTO, this.pageId, this.pageName)
83 this.clicked = true; 88 this.clicked = true;
84 persistentStorage(this.contentDTO.objectId); 89 persistentStorage(this.contentDTO.objectId);
85 ProcessUtils.processPage(this.contentDTO) 90 ProcessUtils.processPage(this.contentDTO)
@@ -6,8 +6,9 @@ import { CardMediaInfo } from '../cardCommon/CardMediaInfo'; @@ -6,8 +6,9 @@ import { CardMediaInfo } from '../cardCommon/CardMediaInfo';
6 import { CardSourceInfo } from '../cardCommon/CardSourceInfo'; 6 import { CardSourceInfo } from '../cardCommon/CardSourceInfo';
7 import { Notes } from './notes'; 7 import { Notes } from './notes';
8 import { onlyWifiLoadImg } from '../../utils/lazyloadImg'; 8 import { onlyWifiLoadImg } from '../../utils/lazyloadImg';
9 -  
10 import { persistentStorage, hasClicked } from '../../utils/persistentStorage'; 9 import { persistentStorage, hasClicked } from '../../utils/persistentStorage';
  10 +import { InfomationCardClick } from '../../utils/infomationCardClick';
  11 +
11 const TAG: string = 'Card2Component'; 12 const TAG: string = 'Card2Component';
12 13
13 /** 14 /**
@@ -19,6 +20,8 @@ const TAG: string = 'Card2Component'; @@ -19,6 +20,8 @@ const TAG: string = 'Card2Component';
19 */ 20 */
20 @Component 21 @Component
21 export struct Card2Component { 22 export struct Card2Component {
  23 + @State pageId: string = '';
  24 + @State pageName: string = '';
22 @State contentDTO: ContentDTO = new ContentDTO(); 25 @State contentDTO: ContentDTO = new ContentDTO();
23 @State loadImg: boolean = false; 26 @State loadImg: boolean = false;
24 @State clicked: boolean = false; 27 @State clicked: boolean = false;
@@ -111,6 +114,7 @@ export struct Card2Component { @@ -111,6 +114,7 @@ export struct Card2Component {
111 bottom: $r('app.float.card_comp_pagePadding_tb') 114 bottom: $r('app.float.card_comp_pagePadding_tb')
112 }) 115 })
113 .onClick((event: ClickEvent) => { 116 .onClick((event: ClickEvent) => {
  117 + InfomationCardClick.track(this.compDTO, this.contentDTO, this.pageId, this.pageName)
114 this.clicked = true; 118 this.clicked = true;
115 persistentStorage(this.contentDTO.objectId); 119 persistentStorage(this.contentDTO.objectId);
116 ProcessUtils.processPage(this.contentDTO) 120 ProcessUtils.processPage(this.contentDTO)
@@ -4,6 +4,8 @@ import { ProcessUtils } from 'wdRouter'; @@ -4,6 +4,8 @@ import { ProcessUtils } from 'wdRouter';
4 import { CardSourceInfo } from '../cardCommon/CardSourceInfo'; 4 import { CardSourceInfo } from '../cardCommon/CardSourceInfo';
5 import { Notes } from './notes'; 5 import { Notes } from './notes';
6 import { persistentStorage, hasClicked } from '../../utils/persistentStorage'; 6 import { persistentStorage, hasClicked } from '../../utils/persistentStorage';
  7 +import { InfomationCardClick } from '../../utils/infomationCardClick'
  8 +
7 9
8 /** 10 /**
9 * 卡片样式："appStyle":"3" 11 * 卡片样式："appStyle":"3"
@@ -11,6 +13,8 @@ import { persistentStorage, hasClicked } from '../../utils/persistentStorage'; @@ -11,6 +13,8 @@ import { persistentStorage, hasClicked } from '../../utils/persistentStorage';
11 */ 13 */
12 @Component 14 @Component
13 export struct Card3Component { 15 export struct Card3Component {
  16 + @State pageId: string = '';
  17 + @State pageName: string = '';
14 @State contentDTO: ContentDTO = new ContentDTO(); 18 @State contentDTO: ContentDTO = new ContentDTO();
15 @State clicked: boolean = false; 19 @State clicked: boolean = false;
16 @ObjectLink compDTO: CompDTO 20 @ObjectLink compDTO: CompDTO
@@ -71,6 +75,7 @@ export struct Card3Component { @@ -71,6 +75,7 @@ export struct Card3Component {
71 bottom: $r('app.float.card_comp_pagePadding_tb') 75 bottom: $r('app.float.card_comp_pagePadding_tb')
72 }) 76 })
73 .onClick((event: ClickEvent) => { 77 .onClick((event: ClickEvent) => {
  78 + InfomationCardClick.track(this.compDTO, this.contentDTO, this.pageId, this.pageName)
74 this.clicked = true; 79 this.clicked = true;
75 persistentStorage(this.contentDTO.objectId); 80 persistentStorage(this.contentDTO.objectId);
76 ProcessUtils.processPage(this.contentDTO) 81 ProcessUtils.processPage(this.contentDTO)
@@ -6,6 +6,8 @@ import { CardMediaInfo } from '../cardCommon/CardMediaInfo' @@ -6,6 +6,8 @@ import { CardMediaInfo } from '../cardCommon/CardMediaInfo'
6 import { onlyWifiLoadImg } from '../../utils/lazyloadImg'; 6 import { onlyWifiLoadImg } from '../../utils/lazyloadImg';
7 import { Notes } from './notes'; 7 import { Notes } from './notes';
8 import { persistentStorage, hasClicked } from '../../utils/persistentStorage'; 8 import { persistentStorage, hasClicked } from '../../utils/persistentStorage';
  9 +import { InfomationCardClick } from '../../utils/infomationCardClick'
  10 +
9 const TAG: string = 'Card4Component'; 11 const TAG: string = 'Card4Component';
10 12
11 /** 13 /**
@@ -17,6 +19,8 @@ const TAG: string = 'Card4Component'; @@ -17,6 +19,8 @@ const TAG: string = 'Card4Component';
17 */ 19 */
18 @Component 20 @Component
19 export struct Card4Component { 21 export struct Card4Component {
  22 + @State pageId: string = '';
  23 + @State pageName: string = '';
20 @State contentDTO: ContentDTO = new ContentDTO(); 24 @State contentDTO: ContentDTO = new ContentDTO();
21 @State loadImg: boolean = false; 25 @State loadImg: boolean = false;
22 @State clicked: boolean = false; 26 @State clicked: boolean = false;
@@ -106,6 +110,7 @@ export struct Card4Component { @@ -106,6 +110,7 @@ export struct Card4Component {
106 .justifyContent(FlexAlign.Start) 110 .justifyContent(FlexAlign.Start)
107 .alignItems(HorizontalAlign.Start) 111 .alignItems(HorizontalAlign.Start)
108 .onClick((event: ClickEvent) => { 112 .onClick((event: ClickEvent) => {
  113 + InfomationCardClick.track(this.compDTO, this.contentDTO, this.pageId, this.pageName)
109 this.clicked = true; 114 this.clicked = true;
110 persistentStorage(this.contentDTO.objectId); 115 persistentStorage(this.contentDTO.objectId);
111 ProcessUtils.processPage(this.contentDTO) 116 ProcessUtils.processPage(this.contentDTO)
@@ -4,6 +4,8 @@ import { ProcessUtils } from 'wdRouter'; @@ -4,6 +4,8 @@ import { ProcessUtils } from 'wdRouter';
4 import { onlyWifiLoadImg } from '../../utils/lazyloadImg'; 4 import { onlyWifiLoadImg } from '../../utils/lazyloadImg';
5 import { Notes } from './notes'; 5 import { Notes } from './notes';
6 import { persistentStorage, hasClicked } from '../../utils/persistentStorage'; 6 import { persistentStorage, hasClicked } from '../../utils/persistentStorage';
  7 +import { InfomationCardClick } from '../../utils/infomationCardClick'
  8 +
7 9
8 const TAG: string = 'Card5Component'; 10 const TAG: string = 'Card5Component';
9 11
@@ -12,7 +14,10 @@ const TAG: string = 'Card5Component'; @@ -12,7 +14,10 @@ const TAG: string = 'Card5Component';
12 */ 14 */
13 @Component 15 @Component
14 export struct Card5Component { 16 export struct Card5Component {
  17 + @State pageId: string = '';
  18 + @State pageName: string = '';
15 @State contentDTO: ContentDTO = new ContentDTO(); 19 @State contentDTO: ContentDTO = new ContentDTO();
  20 + @ObjectLink compDTO: CompDTO
16 @Prop titleShowPolicy: number | string 21 @Prop titleShowPolicy: number | string
17 @State loadImg: boolean = false; 22 @State loadImg: boolean = false;
18 @State clicked: boolean = false; 23 @State clicked: boolean = false;
@@ -96,6 +101,7 @@ export struct Card5Component { @@ -96,6 +101,7 @@ export struct Card5Component {
96 bottom: $r('app.float.card_comp_pagePadding_tb') 101 bottom: $r('app.float.card_comp_pagePadding_tb')
97 }) 102 })
98 .onClick((event: ClickEvent) => { 103 .onClick((event: ClickEvent) => {
  104 + InfomationCardClick.track(this.compDTO, this.contentDTO, this.pageId, this.pageName)
99 this.clicked = true; 105 this.clicked = true;
100 persistentStorage(this.contentDTO.objectId); 106 persistentStorage(this.contentDTO.objectId);
101 ProcessUtils.processPage(this.contentDTO) 107 ProcessUtils.processPage(this.contentDTO)
@@ -7,6 +7,7 @@ import { Notes } from './notes'; @@ -7,6 +7,7 @@ import { Notes } from './notes';
7 import { onlyWifiLoadImg } from '../../utils/lazyloadImg'; 7 import { onlyWifiLoadImg } from '../../utils/lazyloadImg';
8 import { Logger } from 'wdKit/Index'; 8 import { Logger } from 'wdKit/Index';
9 import { persistentStorage, hasClicked } from '../../utils/persistentStorage'; 9 import { persistentStorage, hasClicked } from '../../utils/persistentStorage';
  10 +import { InfomationCardClick } from '../../utils/infomationCardClick'
10 11
11 const TAG: string = 'Card6Component-Card13Component'; 12 const TAG: string = 'Card6Component-Card13Component';
12 13
@@ -15,6 +16,8 @@ const TAG: string = 'Card6Component-Card13Component'; @@ -15,6 +16,8 @@ const TAG: string = 'Card6Component-Card13Component';
15 */ 16 */
16 @Component 17 @Component
17 export struct Card6Component { 18 export struct Card6Component {
  19 + @State pageId: string = '';
  20 + @State pageName: string = '';
18 @State loadImg: boolean = false; 21 @State loadImg: boolean = false;
19 @State clicked: boolean = false; 22 @State clicked: boolean = false;
20 @State titleMarked: boolean = false; 23 @State titleMarked: boolean = false;
@@ -104,6 +107,7 @@ export struct Card6Component { @@ -104,6 +107,7 @@ export struct Card6Component {
104 } 107 }
105 } 108 }
106 .onClick((event: ClickEvent) => { 109 .onClick((event: ClickEvent) => {
  110 + InfomationCardClick.track(this.compDTO, this.contentDTO, this.pageId, this.pageName)
107 this.clicked = true; 111 this.clicked = true;
108 persistentStorage(this.contentDTO.objectId); 112 persistentStorage(this.contentDTO.objectId);
109 ProcessUtils.processPage(this.contentDTO) 113 ProcessUtils.processPage(this.contentDTO)
1 -import { ContentDTO, slideShows } from 'wdBean'; 1 +import { ContentDTO, slideShows, CompDTO } from 'wdBean';
2 import { CommonConstants } from 'wdConstant'; 2 import { CommonConstants } from 'wdConstant';
3 import { DateTimeUtils } from 'wdKit'; 3 import { DateTimeUtils } from 'wdKit';
4 import { ProcessUtils } from 'wdRouter'; 4 import { ProcessUtils } from 'wdRouter';
5 import { Notes } from './notes'; 5 import { Notes } from './notes';
6 import { onlyWifiLoadImg } from '../../utils/lazyloadImg'; 6 import { onlyWifiLoadImg } from '../../utils/lazyloadImg';
7 import { persistentStorage, hasClicked } from '../../utils/persistentStorage'; 7 import { persistentStorage, hasClicked } from '../../utils/persistentStorage';
  8 +import { InfomationCardClick } from '../../utils/infomationCardClick'
8 9
9 /** 10 /**
10 * 时间链卡--CompStyle: 09 11 * 时间链卡--CompStyle: 09
@@ -13,6 +14,9 @@ const TAG: string = 'Card9Component'; @@ -13,6 +14,9 @@ const TAG: string = 'Card9Component';
13 14
14 @Component 15 @Component
15 export struct Card9Component { 16 export struct Card9Component {
  17 + @ObjectLink compDTO: CompDTO
  18 + @State pageId: string = '';
  19 + @State pageName: string = '';
16 @State contentDTO: ContentDTO = new ContentDTO(); 20 @State contentDTO: ContentDTO = new ContentDTO();
17 // @State loadImg: boolean = true; 21 // @State loadImg: boolean = true;
18 @State clicked: boolean = false; 22 @State clicked: boolean = false;
@@ -22,6 +26,7 @@ export struct Card9Component { @@ -22,6 +26,7 @@ export struct Card9Component {
22 @State str03: string = ''; 26 @State str03: string = '';
23 27
24 async aboutToAppear(): Promise<void> { 28 async aboutToAppear(): Promise<void> {
  29 + console.log('Card9Component', JSON.stringify(this.contentDTO))
25 this.titleInit(); 30 this.titleInit();
26 // this.loadImg = await onlyWifiLoadImg(); 31 // this.loadImg = await onlyWifiLoadImg();
27 this.clicked = hasClicked(this.contentDTO.objectId) 32 this.clicked = hasClicked(this.contentDTO.objectId)
@@ -112,6 +117,7 @@ export struct Card9Component { @@ -112,6 +117,7 @@ export struct Card9Component {
112 .backgroundColor($r("app.color.white")) 117 .backgroundColor($r("app.color.white"))
113 .margin({ bottom: 8 }) 118 .margin({ bottom: 8 })
114 .onClick((event: ClickEvent) => { 119 .onClick((event: ClickEvent) => {
  120 + InfomationCardClick.track(this.compDTO, this.contentDTO, this.pageId, this.pageName)
115 this.clicked = true; 121 this.clicked = true;
116 persistentStorage(this.contentDTO.objectId); 122 persistentStorage(this.contentDTO.objectId);
117 ProcessUtils.processPage(this.contentDTO) 123 ProcessUtils.processPage(this.contentDTO)
1 /** 1 /**
2 * More_Comp 2 * More_Comp
3 */ 3 */
4 -import { ContentDTO } from 'wdBean/Index';  
5 -  
6 -const TAG: string = 'Card9Component'; 4 +const TAG: string = 'More_Comp';
7 5
8 @Entry 6 @Entry
9 @Component 7 @Component
@@ -4,6 +4,8 @@ import { ProcessUtils } from 'wdRouter'; @@ -4,6 +4,8 @@ import { ProcessUtils } from 'wdRouter';
4 import { CardSourceInfo } from '../cardCommon/CardSourceInfo' 4 import { CardSourceInfo } from '../cardCommon/CardSourceInfo'
5 import { CardMediaInfo } from '../cardCommon/CardMediaInfo' 5 import { CardMediaInfo } from '../cardCommon/CardMediaInfo'
6 import { onlyWifiLoadImg } from '../../utils/lazyloadImg'; 6 import { onlyWifiLoadImg } from '../../utils/lazyloadImg';
  7 +import { InfomationCardClick } from '../../utils/infomationCardClick'
  8 +
7 const TAG: string = 'Card4Component'; 9 const TAG: string = 'Card4Component';
8 10
9 /** 11 /**
@@ -11,6 +13,9 @@ const TAG: string = 'Card4Component'; @@ -11,6 +13,9 @@ const TAG: string = 'Card4Component';
11 */ 13 */
12 @Component 14 @Component
13 export struct SearchContentComponent { 15 export struct SearchContentComponent {
  16 + @ObjectLink compDTO: CompDTO
  17 + @State pageId: string = '';
  18 + @State pageName: string = '';
14 @State contentDTO: ContentDTO = new ContentDTO(); 19 @State contentDTO: ContentDTO = new ContentDTO();
15 @State loadImg: boolean = false; 20 @State loadImg: boolean = false;
16 @State clicked: boolean = false; 21 @State clicked: boolean = false;
@@ -57,6 +62,7 @@ export struct SearchContentComponent { @@ -57,6 +62,7 @@ export struct SearchContentComponent {
57 .justifyContent(FlexAlign.Start) 62 .justifyContent(FlexAlign.Start)
58 .alignItems(HorizontalAlign.Start) 63 .alignItems(HorizontalAlign.Start)
59 .onClick((event: ClickEvent) => { 64 .onClick((event: ClickEvent) => {
  65 + InfomationCardClick.track(this.compDTO, this.contentDTO, this.pageId, this.pageName)
60 this.clicked = true; 66 this.clicked = true;
61 ProcessUtils.processPage(this.contentDTO) 67 ProcessUtils.processPage(this.contentDTO)
62 }) 68 })
@@ -7,6 +7,7 @@ import { EmptyComponent } from '../view/EmptyComponent'; @@ -7,6 +7,7 @@ import { EmptyComponent } from '../view/EmptyComponent';
7 import { CardMediaInfo } from '../cardCommon/CardMediaInfo'; 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 11
11 const TAG = 'Zh_Carousel_Layout-01'; 12 const TAG = 'Zh_Carousel_Layout-01';
12 13
@@ -41,6 +42,8 @@ class MyDataSource implements IDataSource { @@ -41,6 +42,8 @@ class MyDataSource implements IDataSource {
41 42
42 @Component 43 @Component
43 export struct ZhCarouselLayout01 { 44 export struct ZhCarouselLayout01 {
  45 + @State pageId: string = '';
  46 + @State pageName: string = '';
44 @StorageLink('currentBreakpoint') @Watch('watchCurrentBreakpoint') currentBreakpoint: string = 47 @StorageLink('currentBreakpoint') @Watch('watchCurrentBreakpoint') currentBreakpoint: string =
45 BreakpointConstants.BREAKPOINT_XS; 48 BreakpointConstants.BREAKPOINT_XS;
46 @State compDTO: CompDTO = {} as CompDTO 49 @State compDTO: CompDTO = {} as CompDTO
@@ -149,6 +152,7 @@ export struct ZhCarouselLayout01 { @@ -149,6 +152,7 @@ export struct ZhCarouselLayout01 {
149 bottom: $r('app.float.card_comp_pagePadding_tb') 152 bottom: $r('app.float.card_comp_pagePadding_tb')
150 }) 153 })
151 .onClick((event: ClickEvent) => { 154 .onClick((event: ClickEvent) => {
  155 + InfomationCardClick.track(this.compDTO, this.compDTO.operDataList[this.swiperIndex], this.pageId, this.pageName)
152 Logger.info(TAG, `ZhCarouselLayout01 onClick event index: ${this.swiperIndex}`); 156 Logger.info(TAG, `ZhCarouselLayout01 onClick event index: ${this.swiperIndex}`);
153 ProcessUtils.processPage(this.compDTO.operDataList[this.swiperIndex]) 157 ProcessUtils.processPage(this.compDTO.operDataList[this.swiperIndex])
154 }) 158 })
@@ -4,6 +4,7 @@ import { Logger } from 'wdKit/Index'; @@ -4,6 +4,7 @@ import { Logger } from 'wdKit/Index';
4 import { ProcessUtils } from 'wdRouter'; 4 import { ProcessUtils } from 'wdRouter';
5 import PageViewModel from '../../viewmodel/PageViewModel'; 5 import PageViewModel from '../../viewmodel/PageViewModel';
6 import { onlyWifiLoadImg } from '../../utils/lazyloadImg'; 6 import { onlyWifiLoadImg } from '../../utils/lazyloadImg';
  7 +import { InfomationCardClick } from '../../utils/infomationCardClick'
7 8
8 let listSize: number = 2; 9 let listSize: number = 2;
9 10
@@ -13,6 +14,8 @@ let listSize: number = 2; @@ -13,6 +14,8 @@ let listSize: number = 2;
13 */ 14 */
14 @Component 15 @Component
15 export struct ZhGridLayout02NewsContent { 16 export struct ZhGridLayout02NewsContent {
  17 + @State pageId: string = '';
  18 + @State pageName: string = '';
16 @ObjectLink compDTO: CompDTO 19 @ObjectLink compDTO: CompDTO
17 @State operDataList: ContentDTO[] = [] 20 @State operDataList: ContentDTO[] = []
18 @State loadImg: boolean = false; 21 @State loadImg: boolean = false;
@@ -74,6 +77,7 @@ export struct ZhGridLayout02NewsContent { @@ -74,6 +77,7 @@ export struct ZhGridLayout02NewsContent {
74 } 77 }
75 .width('100%') 78 .width('100%')
76 .onClick(() => { 79 .onClick(() => {
  80 + InfomationCardClick.track(this.compDTO, item, this.pageId, this.pageName)
77 ProcessUtils.processPage(item) 81 ProcessUtils.processPage(item)
78 }) 82 })
79 } 83 }
@@ -4,6 +4,7 @@ import { Logger } from 'wdKit'; @@ -4,6 +4,7 @@ import { Logger } from 'wdKit';
4 import { WDRouterRule } from 'wdRouter'; 4 import { WDRouterRule } from 'wdRouter';
5 import { ProcessUtils } from 'wdRouter'; 5 import { ProcessUtils } from 'wdRouter';
6 import { onlyWifiLoadImg } from '../../utils/lazyloadImg'; 6 import { onlyWifiLoadImg } from '../../utils/lazyloadImg';
  7 +import { InfomationCardClick } from '../../utils/infomationCardClick'
7 8
8 const TAG = 'Zh_Grid_Layout-03'; 9 const TAG = 'Zh_Grid_Layout-03';
9 const FULL_PARENT: string = '100%'; 10 const FULL_PARENT: string = '100%';
@@ -18,6 +19,8 @@ let listSize: number = 4; @@ -18,6 +19,8 @@ let listSize: number = 4;
18 @Preview 19 @Preview
19 @Component 20 @Component
20 export struct ZhGridLayout03 { 21 export struct ZhGridLayout03 {
  22 + @State pageId: string = '';
  23 + @State pageName: string = '';
21 @State compDTO: CompDTO = {} as CompDTO 24 @State compDTO: CompDTO = {} as CompDTO
22 @State loadImg: boolean = false; 25 @State loadImg: boolean = false;
23 26
@@ -73,6 +76,7 @@ export struct ZhGridLayout03 { @@ -73,6 +76,7 @@ export struct ZhGridLayout03 {
73 } 76 }
74 .width('100%') 77 .width('100%')
75 .onClick((event: ClickEvent) => { 78 .onClick((event: ClickEvent) => {
  79 + InfomationCardClick.track(this.compDTO, item, this.pageId, this.pageName)
76 if (item.objectType === '11') { 80 if (item.objectType === '11') {
77 ProcessUtils.jumpChannelTab(item.objectId, item.pageId, item.newsTitle) 81 ProcessUtils.jumpChannelTab(item.objectId, item.pageId, item.newsTitle)
78 } else { 82 } else {
1 import { CompDTO, ContentDTO } from 'wdBean'; 1 import { CompDTO, ContentDTO } from 'wdBean';
2 import { CommonConstants } from 'wdConstant'; 2 import { CommonConstants } from 'wdConstant';
3 import { ProcessUtils } from 'wdRouter'; 3 import { ProcessUtils } from 'wdRouter';
  4 +import { InfomationCardClick } from '../../utils/infomationCardClick'
4 5
5 const TAG = 'Zh_Single_Column-04'; 6 const TAG = 'Zh_Single_Column-04';
6 7
@@ -10,6 +11,8 @@ const TAG = 'Zh_Single_Column-04'; @@ -10,6 +11,8 @@ const TAG = 'Zh_Single_Column-04';
10 */ 11 */
11 @Component 12 @Component
12 export struct ZhSingleColumn04 { 13 export struct ZhSingleColumn04 {
  14 + @State pageId: string = '';
  15 + @State pageName: string = '';
13 @State compDTO: CompDTO = {} as CompDTO 16 @State compDTO: CompDTO = {} as CompDTO
14 operDataList: ContentDTO[] = [ 17 operDataList: ContentDTO[] = [
15 // {newsTitle: "民检普法课堂：正当防卫是什么正当防卫是什么正当防卫是什么正当防卫是什么？", tagWord: 1} as ContentDTO, 18 // {newsTitle: "民检普法课堂：正当防卫是什么正当防卫是什么正当防卫是什么正当防卫是什么？", tagWord: 1} as ContentDTO,
@@ -83,6 +86,7 @@ export struct ZhSingleColumn04 { @@ -83,6 +86,7 @@ export struct ZhSingleColumn04 {
83 .backgroundImage($r('app.media.rmh_theme_bg')) 86 .backgroundImage($r('app.media.rmh_theme_bg'))
84 .backgroundImageSize({ width: CommonConstants.FULL_WIDTH, height: CommonConstants.FULL_WIDTH }) 87 .backgroundImageSize({ width: CommonConstants.FULL_WIDTH, height: CommonConstants.FULL_WIDTH })
85 .onClick(() => { 88 .onClick(() => {
  89 + InfomationCardClick.track(this.compDTO, item, this.pageId, this.pageName)
86 ProcessUtils.processPage(item) 90 ProcessUtils.processPage(item)
87 }) 91 })
88 } 92 }
1 import { CommonConstants } from 'wdConstant'; 1 import { CommonConstants } from 'wdConstant';
2 import { Action, CompDTO, Params } from 'wdBean'; 2 import { Action, CompDTO, Params } from 'wdBean';
3 import { WDRouterRule } from 'wdRouter'; 3 import { WDRouterRule } from 'wdRouter';
  4 +import { InfomationCardClick } from '../../utils/infomationCardClick'
4 5
5 const TAG = 'Zh_Single_Column-05'; 6 const TAG = 'Zh_Single_Column-05';
6 7
@@ -10,6 +11,8 @@ const TAG = 'Zh_Single_Column-05'; @@ -10,6 +11,8 @@ const TAG = 'Zh_Single_Column-05';
10 */ 11 */
11 @Component 12 @Component
12 export struct ZhSingleColumn05 { 13 export struct ZhSingleColumn05 {
  14 + @State pageId: string = '';
  15 + @State pageName: string = '';
13 @State compDTO: CompDTO = {} as CompDTO 16 @State compDTO: CompDTO = {} as CompDTO
14 17
15 build() { 18 build() {
@@ -29,6 +32,7 @@ export struct ZhSingleColumn05 { @@ -29,6 +32,7 @@ export struct ZhSingleColumn05 {
29 .justifyContent(FlexAlign.Center) 32 .justifyContent(FlexAlign.Center)
30 .borderRadius($r('app.float.button_border_radius')) 33 .borderRadius($r('app.float.button_border_radius'))
31 .onClick(() => { 34 .onClick(() => {
  35 + // InfomationCardClick.track(this.compDTO, this.contentDTO, this.pageId, this.pageName)
32 let taskAction: Action = { 36 let taskAction: Action = {
33 type: 'JUMP_H5_BY_WEB_VIEW', 37 type: 'JUMP_H5_BY_WEB_VIEW',
34 params: { 38 params: {
@@ -6,6 +6,7 @@ import { CommonConstants } from 'wdConstant/Index'; @@ -6,6 +6,7 @@ import { CommonConstants } from 'wdConstant/Index';
6 import { ProcessUtils } from 'wdRouter'; 6 import { ProcessUtils } from 'wdRouter';
7 import { HttpUtils } from 'wdNetwork/Index'; 7 import { HttpUtils } from 'wdNetwork/Index';
8 import { onlyWifiLoadImg } from '../../utils/lazyloadImg'; 8 import { onlyWifiLoadImg } from '../../utils/lazyloadImg';
  9 +import { InfomationCardClick } from '../../utils/infomationCardClick'
9 10
10 /** 11 /**
11 * 小视频横划卡 12 * 小视频横划卡
@@ -15,6 +16,8 @@ const TAG = 'Zh_Single_Row-02' @@ -15,6 +16,8 @@ const TAG = 'Zh_Single_Row-02'
15 16
16 @Component 17 @Component
17 export struct ZhSingleRow02 { 18 export struct ZhSingleRow02 {
  19 + @State pageId: string = '';
  20 + @State pageName: string = '';
18 @State compDTO: CompDTO = {} as CompDTO 21 @State compDTO: CompDTO = {} as CompDTO
19 22
20 build() { 23 build() {
@@ -26,7 +29,11 @@ export struct ZhSingleRow02 { @@ -26,7 +29,11 @@ export struct ZhSingleRow02 {
26 List() { 29 List() {
27 ForEach(this.compDTO.operDataList, (item: ContentDTO, index: number) => { 30 ForEach(this.compDTO.operDataList, (item: ContentDTO, index: number) => {
28 CreatorItem({ 31 CreatorItem({
29 - item 32 + item,
  33 + index,
  34 + compDTO: this.compDTO,
  35 + pageId: this.pageId,
  36 + pageName: this.pageName
30 }) 37 })
31 .margin({right: index === this.compDTO.operDataList.length - 1 ? $r('app.float.card_comp_pagePadding_lf') : 0}) 38 .margin({right: index === this.compDTO.operDataList.length - 1 ? $r('app.float.card_comp_pagePadding_lf') : 0})
32 }) 39 })
@@ -69,11 +76,6 @@ export struct ZhSingleRow02 { @@ -69,11 +76,6 @@ export struct ZhSingleRow02 {
69 Image($r("app.media.more")) 76 Image($r("app.media.more"))
70 .width(14) 77 .width(14)
71 .height(14) 78 .height(14)
72 - .onClick(() => {  
73 - // TODO 跳转的页面，定义的入参可能不合理。推荐id: 41  
74 - let params = {'index': "1"} as Record<string, string>  
75 - WDRouterRule.jumpWithPage(WDRouterPage.followListPage, params)  
76 - })  
77 } 79 }
78 .padding({ 80 .padding({
79 right: $r('app.float.card_comp_pagePadding_lf'), 81 right: $r('app.float.card_comp_pagePadding_lf'),
@@ -103,7 +105,11 @@ function textOverflowStyle(maxLine: number) { @@ -103,7 +105,11 @@ function textOverflowStyle(maxLine: number) {
103 105
104 @Component 106 @Component
105 struct CreatorItem { 107 struct CreatorItem {
  108 + @Prop pageId: string = '';
  109 + @Prop pageName: string = '';
  110 + @Prop compDTO: CompDTO
106 @Prop item: ContentDTO 111 @Prop item: ContentDTO
  112 + @Prop index: number
107 @State rmhIsAttention: number = 0 113 @State rmhIsAttention: number = 0
108 @State loadImg: boolean = false; 114 @State loadImg: boolean = false;
109 115
@@ -143,6 +149,7 @@ struct CreatorItem { @@ -143,6 +149,7 @@ struct CreatorItem {
143 .borderRadius($r('app.float.image_border_radius')) 149 .borderRadius($r('app.float.image_border_radius'))
144 } 150 }
145 .onClick((event: ClickEvent) => { 151 .onClick((event: ClickEvent) => {
  152 + InfomationCardClick.track(this.compDTO, this.item, this.pageId, this.pageName)
146 ProcessUtils.processPage(this.item) 153 ProcessUtils.processPage(this.item)
147 }) 154 })
148 } 155 }
@@ -9,6 +9,7 @@ import { LiveModel } from '../../viewmodel/LiveModel' @@ -9,6 +9,7 @@ import { LiveModel } from '../../viewmodel/LiveModel'
9 import { Logger, ToastUtils } from 'wdKit'; 9 import { Logger, ToastUtils } from 'wdKit';
10 import { onlyWifiLoadImg } from '../../utils/lazyloadImg'; 10 import { onlyWifiLoadImg } from '../../utils/lazyloadImg';
11 import { SpConstants } from 'wdConstant/Index' 11 import { SpConstants } from 'wdConstant/Index'
  12 +import { InfomationCardClick } from '../../utils/infomationCardClick';
12 13
13 /** 14 /**
14 * 直播预约卡 15 * 直播预约卡
@@ -25,6 +26,8 @@ interface reserveReqItem { @@ -25,6 +26,8 @@ interface reserveReqItem {
25 @Entry 26 @Entry
26 @Component 27 @Component
27 export struct ZhSingleRow03 { 28 export struct ZhSingleRow03 {
  29 + @State pageId: string = '';
  30 + @State pageName: string = '';
28 @State compDTO: CompDTO = {} as CompDTO 31 @State compDTO: CompDTO = {} as CompDTO
29 @State isEndEdge: boolean = false; 32 @State isEndEdge: boolean = false;
30 // @State reserveStatus: reserveItem[] = [] 33 // @State reserveStatus: reserveItem[] = []
@@ -197,6 +200,7 @@ export struct ZhSingleRow03 { @@ -197,6 +200,7 @@ export struct ZhSingleRow03 {
197 .backgroundColor(0xf9f9f9) 200 .backgroundColor(0xf9f9f9)
198 .margin({right: 8}) 201 .margin({right: 8})
199 .onClick(() => { 202 .onClick(() => {
  203 + InfomationCardClick.track(this.compDTO, item, this.pageId, this.pageName)
200 ProcessUtils.processPage(item) 204 ProcessUtils.processPage(item)
201 }) 205 })
202 } 206 }
@@ -2,6 +2,7 @@ import { CompDTO, ContentDTO } from 'wdBean'; @@ -2,6 +2,7 @@ import { CompDTO, ContentDTO } from 'wdBean';
2 import { CommonConstants } from 'wdConstant'; 2 import { CommonConstants } from 'wdConstant';
3 import { DateTimeUtils } from 'wdKit'; 3 import { DateTimeUtils } from 'wdKit';
4 import { ProcessUtils } from 'wdRouter'; 4 import { ProcessUtils } from 'wdRouter';
  5 +import { InfomationCardClick } from '../../utils/infomationCardClick';
5 6
6 /** 7 /**
7 * 本地精选卡 8 * 本地精选卡
@@ -10,6 +11,8 @@ import { ProcessUtils } from 'wdRouter'; @@ -10,6 +11,8 @@ import { ProcessUtils } from 'wdRouter';
10 11
11 @Component 12 @Component
12 export struct ZhSingleRow04 { 13 export struct ZhSingleRow04 {
  14 + @State pageId: string = '';
  15 + @State pageName: string = '';
13 @State compDTO: CompDTO = {} as CompDTO 16 @State compDTO: CompDTO = {} as CompDTO
14 17
15 build() { 18 build() {
@@ -71,6 +74,7 @@ export struct ZhSingleRow04 { @@ -71,6 +74,7 @@ export struct ZhSingleRow04 {
71 top: 6 74 top: 6
72 }) 75 })
73 .onClick(() => { 76 .onClick(() => {
  77 + InfomationCardClick.track(this.compDTO, item, this.pageId, this.pageName)
74 ProcessUtils.processPage(item) 78 ProcessUtils.processPage(item)
75 }) 79 })
76 } 80 }
@@ -4,6 +4,7 @@ import { postInteractAccentionOperateParams } from 'wdBean'; @@ -4,6 +4,7 @@ import { postInteractAccentionOperateParams } from 'wdBean';
4 import { PageRepository } from '../../repository/PageRepository'; 4 import { PageRepository } from '../../repository/PageRepository';
5 import { CommonConstants } from 'wdConstant/Index'; 5 import { CommonConstants } from 'wdConstant/Index';
6 import { HttpUtils } from 'wdNetwork/Index'; 6 import { HttpUtils } from 'wdNetwork/Index';
  7 +import { InfomationCardClick } from '../../utils/infomationCardClick';
7 8
8 /** 9 /**
9 * 人民号横划卡 10 * 人民号横划卡
@@ -14,6 +15,8 @@ const TAG = 'Zh_Single_Row-05' @@ -14,6 +15,8 @@ const TAG = 'Zh_Single_Row-05'
14 @Entry 15 @Entry
15 @Component 16 @Component
16 export struct ZhSingleRow05 { 17 export struct ZhSingleRow05 {
  18 + @State pageId: string = '';
  19 + @State pageName: string = '';
17 @State compDTO: CompDTO = { 20 @State compDTO: CompDTO = {
18 // objectTitle: '创作者推荐', 21 // objectTitle: '创作者推荐',
19 // operDataList: [ 22 // operDataList: [
@@ -83,8 +86,8 @@ export struct ZhSingleRow05 { @@ -83,8 +86,8 @@ export struct ZhSingleRow05 {
83 .height(14) 86 .height(14)
84 .onClick(() => { 87 .onClick(() => {
85 // TODO 跳转的页面，定义的入参可能不合理。推荐id: 41 88 // TODO 跳转的页面，定义的入参可能不合理。推荐id: 41
86 - let params = {'index': "1"} as Record<string, string>;  
87 - WDRouterRule.jumpWithPage(WDRouterPage.followListPage, params) 89 + // let params = {'index': "1"} as Record<string, string>;
  90 + // WDRouterRule.jumpWithPage(WDRouterPage.followListPage, params)
88 }) 91 })
89 } 92 }
90 .padding({ 93 .padding({
@@ -10,6 +10,7 @@ import { MultiPictureDetailViewModel } from '../../viewmodel/MultiPictureDetailV @@ -10,6 +10,7 @@ import { MultiPictureDetailViewModel } from '../../viewmodel/MultiPictureDetailV
10 import commentViewModel from '../../components/comment/viewmodel/CommentViewModel'; 10 import commentViewModel from '../../components/comment/viewmodel/CommentViewModel';
11 import { commentItemModel } from '../../components/comment/model/CommentModel' 11 import { commentItemModel } from '../../components/comment/model/CommentModel'
12 import { onlyWifiLoadImg } from '../../utils/lazyloadImg'; 12 import { onlyWifiLoadImg } from '../../utils/lazyloadImg';
  13 +import { InfomationCardClick } from '../../utils/infomationCardClick';
13 14
14 /** 15 /**
15 * 精选评论卡 16 * 精选评论卡
@@ -19,6 +20,8 @@ const TAG = 'Zh_Single_Row-06' @@ -19,6 +20,8 @@ const TAG = 'Zh_Single_Row-06'
19 @Entry 20 @Entry
20 @Component 21 @Component
21 export struct ZhSingleRow06 { 22 export struct ZhSingleRow06 {
  23 + @State pageId: string = '';
  24 + @State pageName: string = '';
22 @State compDTO: CompDTO = {} as CompDTO 25 @State compDTO: CompDTO = {} as CompDTO
23 @State newsStatusOfUser: batchLikeAndCollectResult = { 26 @State newsStatusOfUser: batchLikeAndCollectResult = {
24 likeStatus: '0' 27 likeStatus: '0'
@@ -143,8 +146,6 @@ export struct ZhSingleRow06 { @@ -143,8 +146,6 @@ export struct ZhSingleRow06 {
143 Text(Number(this.newsStatusOfUser?.likeStatus) == 1 ? '已赞' : '点赞') 146 Text(Number(this.newsStatusOfUser?.likeStatus) == 1 ? '已赞' : '点赞')
144 .fontSize(15) 147 .fontSize(15)
145 .fontColor(0x999999) 148 .fontColor(0x999999)
146 - .onClick(() => {  
147 - })  
148 } 149 }
149 .onClick(() => { 150 .onClick(() => {
150 this.toggleLikeStatus() 151 this.toggleLikeStatus()
@@ -160,6 +161,9 @@ export struct ZhSingleRow06 { @@ -160,6 +161,9 @@ export struct ZhSingleRow06 {
160 bottom: $r('app.float.card_comp_pagePadding_tb') 161 bottom: $r('app.float.card_comp_pagePadding_tb')
161 }) 162 })
162 .backgroundColor($r('app.color.white')) 163 .backgroundColor($r('app.color.white'))
  164 + .onClick(() => {
  165 + InfomationCardClick.track(this.compDTO, this.compDTO.operDataList[0], this.pageId, this.pageName)
  166 + })
163 } 167 }
164 168
165 @Builder 169 @Builder
@@ -546,45 +546,45 @@ export struct TopNavigationComponent { @@ -546,45 +546,45 @@ export struct TopNavigationComponent {
546 return null 546 return null
547 } 547 }
548 548
549 - private getTextInfo(index: number): Record<string, number> {  
550 - let strJson = getInspectorByKey(index.toString())  
551 - try {  
552 - let obj: Record<string, string> = JSON.parse(strJson)  
553 - let rectInfo: number[][] = JSON.parse('[' + obj.$rect + ']')  
554 - return { 'left': px2vp(rectInfo[0][0]), 'width': px2vp(rectInfo[1][0] - rectInfo[0][0]) }  
555 - } catch (error) {  
556 - return { 'left': 0, 'width': 0 }  
557 - }  
558 - }  
559 -  
560 - private getCurrentIndicatorInfo(index: number, event: TabsAnimationEvent): Record<string, number> {  
561 - let nextIndex = index  
562 - if (index > 0 && event.currentOffset > 0) {  
563 - nextIndex--  
564 - } else if (index < 3 && event.currentOffset < 0) {  
565 - nextIndex++  
566 - }  
567 - let indexInfo = this.getTextInfo(index)  
568 - let nextIndexInfo = this.getTextInfo(nextIndex)  
569 - let swipeRatio = Math.abs(event.currentOffset / this.tabsWidth)  
570 - let currentIndex = swipeRatio > 0.5 ? nextIndex : index // 页面滑动超过一半，tabBar切换到下一页。  
571 - let currentLeft = indexInfo.left + (nextIndexInfo.left - indexInfo.left) * swipeRatio  
572 - let currentWidth = indexInfo.width + (nextIndexInfo.width - indexInfo.width) * swipeRatio  
573 - return { 'index': currentIndex, 'left': currentLeft, 'width': currentWidth }  
574 - }  
575 -  
576 - private startAnimateTo(duration: number, leftMargin: number, width: number) {  
577 - animateTo({  
578 - duration: duration, // 动画时长  
579 - curve: Curve.Linear, // 动画曲线  
580 - iterations: 1, // 播放次数  
581 - playMode: PlayMode.Normal, // 动画模式  
582 - onFinish: () => {  
583 - console.info('play end')  
584 - }  
585 - }, () => {  
586 - this.indicatorLeftMargin = leftMargin  
587 - this.indicatorWidth = width  
588 - })  
589 - } 549 + // private getTextInfo(index: number): Record<string, number> {
  550 + // let strJson = getInspectorByKey(index.toString())
  551 + // try {
  552 + // let obj: Record<string, string> = JSON.parse(strJson)
  553 + // let rectInfo: number[][] = JSON.parse('[' + obj.$rect + ']')
  554 + // return { 'left': px2vp(rectInfo[0][0]), 'width': px2vp(rectInfo[1][0] - rectInfo[0][0]) }
  555 + // } catch (error) {
  556 + // return { 'left': 0, 'width': 0 }
  557 + // }
  558 + // }
  559 + //
  560 + // private getCurrentIndicatorInfo(index: number, event: TabsAnimationEvent): Record<string, number> {
  561 + // let nextIndex = index
  562 + // if (index > 0 && event.currentOffset > 0) {
  563 + // nextIndex--
  564 + // } else if (index < 3 && event.currentOffset < 0) {
  565 + // nextIndex++
  566 + // }
  567 + // let indexInfo = this.getTextInfo(index)
  568 + // let nextIndexInfo = this.getTextInfo(nextIndex)
  569 + // let swipeRatio = Math.abs(event.currentOffset / this.tabsWidth)
  570 + // let currentIndex = swipeRatio > 0.5 ? nextIndex : index // 页面滑动超过一半，tabBar切换到下一页。
  571 + // let currentLeft = indexInfo.left + (nextIndexInfo.left - indexInfo.left) * swipeRatio
  572 + // let currentWidth = indexInfo.width + (nextIndexInfo.width - indexInfo.width) * swipeRatio
  573 + // return { 'index': currentIndex, 'left': currentLeft, 'width': currentWidth }
  574 + // }
  575 +
  576 + // private startAnimateTo(duration: number, leftMargin: number, width: number) {
  577 + // animateTo({
  578 + // duration: duration, // 动画时长
  579 + // curve: Curve.Linear, // 动画曲线
  580 + // iterations: 1, // 播放次数
  581 + // playMode: PlayMode.Normal, // 动画模式
  582 + // onFinish: () => {
  583 + // console.info('play end')
  584 + // }
  585 + // }, () => {
  586 + // this.indicatorLeftMargin = leftMargin
  587 + // this.indicatorWidth = width
  588 + // })
  589 + // }
590 } 590 }
1 import { CommonConstants } from 'wdConstant' 1 import { CommonConstants } from 'wdConstant'
2 import { ContentDTO, CompDTO, Action, Params } from 'wdBean' 2 import { ContentDTO, CompDTO, Action, Params } from 'wdBean'
3 import { ProcessUtils, WDRouterRule, WDRouterPage } from 'wdRouter'; 3 import { ProcessUtils, WDRouterRule, WDRouterPage } from 'wdRouter';
  4 +import { InfomationCardClick } from '../../utils/infomationCardClick';
4 5
5 @Component 6 @Component
6 export struct HorizontalStrokeCardThreeTwoRadioForMoreComponent { 7 export struct HorizontalStrokeCardThreeTwoRadioForMoreComponent {
7 @State compDTO: CompDTO = {} as CompDTO 8 @State compDTO: CompDTO = {} as CompDTO
  9 + @State pageId: string = '';
  10 + @State pageName: string = '';
8 11
9 build() { 12 build() {
10 Column() { 13 Column() {
@@ -76,6 +79,7 @@ export struct HorizontalStrokeCardThreeTwoRadioForMoreComponent { @@ -76,6 +79,7 @@ export struct HorizontalStrokeCardThreeTwoRadioForMoreComponent {
76 .padding({ left: (index == 0) ? 16 : 0, right: (index == this.compDTO.operDataList.length - 1) ? 16 : 0 }) 79 .padding({ left: (index == 0) ? 16 : 0, right: (index == this.compDTO.operDataList.length - 1) ? 16 : 0 })
77 // .offset({x:16}) 80 // .offset({x:16})
78 .onClick(() => { 81 .onClick(() => {
  82 + InfomationCardClick.track(this.compDTO, item, this.pageId, this.pageName)
79 ProcessUtils.processPage(item) 83 ProcessUtils.processPage(item)
80 }) 84 })
81 }) 85 })
@@ -3,9 +3,12 @@ import { WDRouterRule } from 'wdRouter/Index' @@ -3,9 +3,12 @@ import { WDRouterRule } from 'wdRouter/Index'
3 import { Logger } from 'wdKit/Index' 3 import { Logger } from 'wdKit/Index'
4 import { ExtraDTO } from 'wdBean/src/main/ets/bean/component/extra/ExtraDTO' 4 import { ExtraDTO } from 'wdBean/src/main/ets/bean/component/extra/ExtraDTO'
5 import { LiveModel } from '../../viewmodel/LiveModel' 5 import { LiveModel } from '../../viewmodel/LiveModel'
  6 +import { InfomationCardClick } from '../../utils/infomationCardClick';
6 7
7 @Component 8 @Component
8 export struct HorizontalStrokeCardThreeTwoRadioForOneComponent { 9 export struct HorizontalStrokeCardThreeTwoRadioForOneComponent {
  10 + @State pageId: string = '';
  11 + @State pageName: string = '';
9 @State compDTO: CompDTO = {} as CompDTO 12 @State compDTO: CompDTO = {} as CompDTO
10 @State clicked: boolean = false; 13 @State clicked: boolean = false;
11 14
@@ -64,6 +67,7 @@ export struct HorizontalStrokeCardThreeTwoRadioForOneComponent { @@ -64,6 +67,7 @@ export struct HorizontalStrokeCardThreeTwoRadioForOneComponent {
64 .backgroundColor($r("app.color.white")) 67 .backgroundColor($r("app.color.white"))
65 .margin({ bottom: 8 }) 68 .margin({ bottom: 8 })
66 .onClick(() => { 69 .onClick(() => {
  70 + InfomationCardClick.track(this.compDTO, this.compDTO.operDataList[0], this.pageId, this.pageName)
67 this.clicked = true; 71 this.clicked = true;
68 this.gotoLive(this.compDTO?.operDataList[0]) 72 this.gotoLive(this.compDTO?.operDataList[0])
69 }) 73 })
@@ -9,10 +9,13 @@ import { LiveModel } from '../../viewmodel/LiveModel' @@ -9,10 +9,13 @@ import { LiveModel } from '../../viewmodel/LiveModel'
9 import { ContentConstants } from '../../constants/ContentConstants' 9 import { ContentConstants } from '../../constants/ContentConstants'
10 import { ProcessUtils } from 'wdRouter'; 10 import { ProcessUtils } from 'wdRouter';
11 import { onlyWifiLoadImg } from '../../utils/lazyloadImg'; 11 import { onlyWifiLoadImg } from '../../utils/lazyloadImg';
  12 +import { InfomationCardClick } from '../../utils/infomationCardClick';
12 13
13 14
14 @Component 15 @Component
15 export struct LiveHorizontalCardComponent { 16 export struct LiveHorizontalCardComponent {
  17 + @State pageId: string = '';
  18 + @State pageName: string = '';
16 @State compDTO: CompDTO = {} as CompDTO 19 @State compDTO: CompDTO = {} as CompDTO
17 @State loadImg: boolean = false; 20 @State loadImg: boolean = false;
18 21
@@ -95,6 +98,7 @@ export struct LiveHorizontalCardComponent { @@ -95,6 +98,7 @@ export struct LiveHorizontalCardComponent {
95 } 98 }
96 .padding({ left: (index == 0) ? 16 : 0, right: (index == this.compDTO.operDataList.length - 1) ? 16 : 0 }) 99 .padding({ left: (index == 0) ? 16 : 0, right: (index == this.compDTO.operDataList.length - 1) ? 16 : 0 })
97 .onClick(() => { 100 .onClick(() => {
  101 + InfomationCardClick.track(this.compDTO, item, this.pageId, this.pageName)
98 if (item.objectType != '0') { 102 if (item.objectType != '0') {
99 console.log(item.objectId) 103 console.log(item.objectId)
100 this.gotoLive(item) 104 this.gotoLive(item)
  1 +import { TrackingContent, TrackConstants, ParamType } from 'wdTracking';
  2 +import { CompDTO, ContentDTO } from 'wdBean';
  3 +
  4 +export class InfomationCardClick {
  5 +
  6 + private static getLiveState(contentDTO: ContentDTO) {
  7 + if (contentDTO?.liveInfo?.liveState === 'wait') {
  8 + return 'liveSubscribe'
  9 + } else if (contentDTO?.liveInfo?.liveState === 'running') {
  10 + return 'livePlaying'
  11 + } else if (contentDTO?.liveInfo?.liveState === 'end') {
  12 + return 'liveEnd'
  13 + } else {
  14 + return ''
  15 + }
  16 + }
  17 +
  18 + private static getSummaryType(objectType: string) {
  19 + let summaryType: string = ''
  20 + switch(objectType) {
  21 + case '2':
  22 + summaryType = 'liveTopic';
  23 + break;
  24 + case '8':
  25 + summaryType = 'articleTopic';
  26 + break;
  27 + case '13':
  28 + summaryType = 'audioTopic';
  29 + break;
  30 + // case '':
  31 + // summaryType = 'talkTopic';
  32 + // break;
  33 + // case '':
  34 + // summaryType = 'morningAndEveningNewsTopic';
  35 + // break;
  36 + // case '':
  37 + // summaryType = 'timeAxisTopic';
  38 + // break;
  39 + default:
  40 + summaryType = '';
  41 + break;
  42 + }
  43 + return summaryType;
  44 + }
  45 +
  46 + public static track(compDTO: CompDTO, contentDTO: ContentDTO, pageId: string, pageName: string): void {
  47 + try {
  48 + const extParams: ParamType = {
  49 + 'action': 'detailPageShow',
  50 + 'shareChannel': '',
  51 + 'duration': 0,
  52 + 'contentName': contentDTO.newsTitle,
  53 + 'contentType': contentDTO.objectType,
  54 + // 'contentClassify': '' // 废除
  55 + 'contentId': contentDTO.objectId,
  56 + // 'compId': contentDTO.relId,
  57 + 'contentStyle': contentDTO.appStyle,
  58 + 'liveType': InfomationCardClick.getLiveState(contentDTO),
  59 + 'channelSourceId': contentDTO.channelId,
  60 + 'contentShowChannelId': contentDTO.channelId,
  61 + // 'contentShowChannelName': '',
  62 + 'linkUrl': contentDTO.linkUrl,
  63 + 'regionName': 2, // 信息流：2
  64 + 'componentType': compDTO.compStyle,
  65 + 'sceneId': contentDTO.sceneId,
  66 + 'subSceneId': contentDTO.subSceneId,
  67 + 'cnsTraceId': contentDTO.cnsTraceId,
  68 + 'cardItemId': compDTO.cardItemId,
  69 + 'itemId': compDTO.itemId || contentDTO.itemId,
  70 + 'expIds': compDTO.expIds || contentDTO.expIds
  71 + }
  72 + if (contentDTO.objectType === '5') {
  73 + extParams['summaryId'] = contentDTO.objectId;
  74 + extParams['summaryType'] = InfomationCardClick.getSummaryType(contentDTO.objectType);
  75 + extParams['specialLink'] = contentDTO.linkUrl;
  76 + }
  77 + if (contentDTO.objectType === '2') {
  78 + extParams['liveStreamType'] = contentDTO?.liveInfo.vrType === 0 ? 1 : 2;
  79 + extParams['vliveId'] = contentDTO.objectId;
  80 + extParams['vliveName'] = contentDTO.newsTitle;
  81 + extParams['liveMode'] = 1;
  82 + }
  83 + if (contentDTO.rmhPlatform === 1) {
  84 + extParams['saAuthorName'] = contentDTO.rmhInfo?.rmhName;
  85 + extParams['saAuthorId'] = contentDTO.rmhInfo?.rmhId;
  86 + } else if (contentDTO.source) {
  87 + extParams['saAuthorName'] = contentDTO.source;
  88 + }
  89 + console.log('InfomationCardClick-params：', JSON.stringify(extParams))
  90 + TrackingContent.common(TrackConstants.EventType.Click, pageId, pageName, extParams)
  91 + } catch (err) {
  92 + console.log('InfomationCardClick-err', JSON.stringify(err))
  93 + }
  94 + }
  95 +}
@@ -83,23 +83,30 @@ export struct DetailPlayLiveCommon { @@ -83,23 +83,30 @@ export struct DetailPlayLiveCommon {
83 * 获取直播信息，可区分横竖屏直播 83 * 获取直播信息，可区分横竖屏直播
84 */ 84 */
85 getLiveDetails() { 85 getLiveDetails() {
  86 +
  87 +
86 this.liveViewModel.getLiveDetails(this.contentId, this.relId, this.relType) 88 this.liveViewModel.getLiveDetails(this.contentId, this.relId, this.relType)
87 .then( 89 .then(
88 (data) => { 90 (data) => {
89 if (data.length > 0) { 91 if (data.length > 0) {
  92 +
  93 + //todo 不加setTimeOut ，接口返回的数据 就没法让PlayerComponent #@Consume @Watch('updateData') liveDetailsBean 的updateData方法运行
  94 + setTimeout(() => {
90 this.liveDetailsBean = data[0] 95 this.liveDetailsBean = data[0]
91 - this.liveState = this.liveDetailsBean.liveInfo?.liveState  
92 - this.liveStyle = this.liveDetailsBean.liveInfo.liveStyle 96 + }, 10)
  97 +
  98 + this.liveState = data[0].liveInfo?.liveState
  99 + this.liveStyle = data[0].liveInfo.liveStyle
93 100
94 - if (this.liveDetailsBean.fullColumnImgUrls && this.liveDetailsBean.fullColumnImgUrls.length > 0) {  
95 - this.imgUrl = this.liveDetailsBean.fullColumnImgUrls[0].url 101 + if (data[0].fullColumnImgUrls && data[0].fullColumnImgUrls.length > 0) {
  102 + this.imgUrl = data[0].fullColumnImgUrls[0].url
96 } 103 }
97 104
98 - if (this.liveDetailsBean.liveInfo.liveState == 'end') {  
99 - this.playUrl = this.liveDetailsBean.liveInfo.vlive[0].replayUri 105 + if (data[0].liveInfo.liveState == 'end') {
  106 + this.playUrl = data[0].liveInfo.vlive[0].replayUri
100 } 107 }
101 108
102 - console.log(TAG, 'getLiveDetails:', JSON.stringify((this.liveDetailsBean))) 109 + // console.log(TAG, 'getLiveDetails:', JSON.stringify((this.liveDetailsBean)))
103 } 110 }
104 }, 111 },
105 () => { 112 () => {
@@ -36,6 +36,7 @@ export struct DetailPlayVLivePage { @@ -36,6 +36,7 @@ export struct DetailPlayVLivePage {
36 aboutToAppear(): void { 36 aboutToAppear(): void {
37 this.openFullScreen() 37 this.openFullScreen()
38 this.getLiveRoomData() 38 this.getLiveRoomData()
  39 +
39 } 40 }
40 41
41 aboutToDisappear(): void { 42 aboutToDisappear(): void {
@@ -21,6 +21,7 @@ export struct PlayerComponent { @@ -21,6 +21,7 @@ export struct PlayerComponent {
21 @State playUrl: string = '' 21 @State playUrl: string = ''
22 @State isCanplay: boolean = false 22 @State isCanplay: boolean = false
23 23
  24 +
24 pageShowChange() { 25 pageShowChange() {
25 this.playerController?.play() 26 this.playerController?.play()
26 } 27 }
@@ -30,15 +31,10 @@ export struct PlayerComponent { @@ -30,15 +31,10 @@ export struct PlayerComponent {
30 } 31 }
31 32
32 aboutToAppear(): void { 33 aboutToAppear(): void {
33 - console.log(TAG, 'aboutToAppear')  
34 - this.playerController.onCanplay = () => {  
35 - console.log('可以播放了')  
36 - this.playerController?.play()  
37 - this.isCanplay = true  
38 - }  
39 } 34 }
40 35
41 async aboutToDisappear(): Promise<void> { 36 async aboutToDisappear(): Promise<void> {
  37 +
42 await this.playerController?.pause() 38 await this.playerController?.pause()
43 await this.playerController?.stop() 39 await this.playerController?.stop()
44 await this.playerController?.release() 40 await this.playerController?.release()
@@ -63,7 +59,6 @@ export struct PlayerComponent { @@ -63,7 +59,6 @@ export struct PlayerComponent {
63 59
64 this.liveStreamType = liveStreamType 60 this.liveStreamType = liveStreamType
65 this.playUrl = playUrl 61 this.playUrl = playUrl
66 -  
67 } 62 }
68 } 63 }
69 64
@@ -75,6 +70,7 @@ export struct PlayerComponent { @@ -75,6 +70,7 @@ export struct PlayerComponent {
75 WDPlayerRenderVLiveView({ 70 WDPlayerRenderVLiveView({
76 playerController: this.playerController, 71 playerController: this.playerController,
77 onLoad: () => { 72 onLoad: () => {
  73 + this.isCanplay = true
78 this.playerController?.firstPlay(this.playUrl); 74 this.playerController?.firstPlay(this.playUrl);
79 } 75 }
80 }) 76 })
@@ -82,12 +78,14 @@ export struct PlayerComponent { @@ -82,12 +78,14 @@ export struct PlayerComponent {
82 AliPlayerRenderView({ 78 AliPlayerRenderView({
83 playerController: this.playerController, 79 playerController: this.playerController,
84 onLoad: () => { 80 onLoad: () => {
  81 + this.isCanplay = true
85 this.playerController?.firstPlay(this.playUrl); 82 this.playerController?.firstPlay(this.playUrl);
86 } 83 }
87 }).margin({ top: 195 }).height(211) 84 }).margin({ top: 195 }).height(211)
88 } 85 }
89 86
90 PictureLoading().visibility(this.isCanplay ? Visibility.None : Visibility.Visible) 87 PictureLoading().visibility(this.isCanplay ? Visibility.None : Visibility.Visible)
  88 +
91 } 89 }
92 .height('100%') 90 .height('100%')
93 .width('100%') 91 .width('100%')
@@ -98,8 +96,11 @@ export struct PlayerComponent { @@ -98,8 +96,11 @@ export struct PlayerComponent {
98 this.isShowControl = !this.isShowControl 96 this.isShowControl = !this.isShowControl
99 } 97 }
100 }) 98 })
  99 +
101 } 100 }
102 .height('100%') 101 .height('100%')
103 .width('100%') 102 .width('100%')
104 } 103 }
  104 +
  105 +
105 } 106 }
@@ -137,7 +137,6 @@ export class WDAliPlayerController { @@ -137,7 +137,6 @@ export class WDAliPlayerController {
137 onStateChanged: (status: number) => { 137 onStateChanged: (status: number) => {
138 this.avPlayerStatus = status 138 this.avPlayerStatus = status
139 Logger.debug(TAG, "status update:" + `${this.getStatusStringWith(status)}`) 139 Logger.debug(TAG, "status update:" + `${this.getStatusStringWith(status)}`)
140 -  
141 switch (status) { 140 switch (status) {
142 case initalized: { 141 case initalized: {
143 //this.avPlayer?.prepare(); 142 //this.avPlayer?.prepare();