developOne / harmonyPool

Go to a project
Toggle navigation Toggle navigation pinning
yumaochao
6d63bf0b 2 parents 49b2966e 6e90a55f

Merge branch 'main' of http://192.168.1.42/developOne/harmonyPool

Inline Side-by-side
Showing 36 changed files with 511 additions and 84 deletions
  1 +{
  2 + "float": [
  3 + {
  4 + "name": "font_size_10",
  5 + "value": "10fp"
  6 + },
  7 + {
  8 + "name": "font_size_11",
  9 + "value": "11fp"
  10 + },
  11 + {
  12 + "name": "font_size_12",
  13 + "value": "12fp"
  14 + },
  15 + {
  16 + "name": "font_size_13",
  17 + "value": "13fp"
  18 + },
  19 + {
  20 + "name": "font_size_14",
  21 + "value": "14fp"
  22 + },
  23 + {
  24 + "name": "font_size_16",
  25 + "value": "16fp"
  26 + },
  27 + {
  28 + "name": "normal_text_size",
  29 + "value": "16fp"
  30 + },
  31 + {
  32 + "name": "font_size_17",
  33 + "value": "17fp"
  34 + },
  35 + {
  36 + "name": "selected_text_size",
  37 + "value": "17vp"
  38 + },
  39 + {
  40 + "name": "font_size_18",
  41 + "value": "18fp"
  42 + },
  43 + {
  44 + "name": "font_size_24",
  45 + "value": "24fp"
  46 + },
  47 + {
  48 + "name": "font_size_20",
  49 + "value": "20fp"
  50 + },
  51 + {
  52 + "name": "font_size_36",
  53 + "value": "36fp"
  54 + },
  55 + {
  56 + "name": "margin_4_negative",
  57 + "value": "-4vp"
  58 + },
  59 + {
  60 + "name": "margin_6_negative",
  61 + "value": "-6vp"
  62 + },
  63 + {
  64 + "name": "main_margin",
  65 + "value": "14vp"
  66 + },
  67 + {
  68 + "name": "margin_4",
  69 + "value": "4vp"
  70 + },
  71 + {
  72 + "name": "margin_8",
  73 + "value": "8vp"
  74 + },
  75 + {
  76 + "name": "margin_9",
  77 + "value": "9vp"
  78 + },
  79 + {
  80 + "name": "label_margin_top",
  81 + "value": "10vp"
  82 + },
  83 + {
  84 + "name": "margin_12",
  85 + "value": "12vp"
  86 + },
  87 + {
  88 + "name": "margin_bottom_16",
  89 + "value": "16vp"
  90 + },
  91 + {
  92 + "name": "label_margin_bottom",
  93 + "value": "8vp"
  94 + },
  95 + {
  96 + "name": "single_row_03_item_width",
  97 + "value": "158vp"
  98 + },
  99 + {
  100 + "name": "single_row_03_item_height",
  101 + "value": "160vp"
  102 + },
  103 + {
  104 + "name": "margin_80",
  105 + "value": "80vp"
  106 + },
  107 + {
  108 + "name": "margin_2",
  109 + "value": "2vp"
  110 + },
  111 + {
  112 + "name": "margin_5",
  113 + "value": "5vp"
  114 + },
  115 + {
  116 + "name": "margin_7",
  117 + "value": "7vp"
  118 + },
  119 + {
  120 + "name": "margin_20",
  121 + "value": "20vp"
  122 + },
  123 + {
  124 + "name": "margin_24",
  125 + "value": "24vp"
  126 + },
  127 + {
  128 + "name": "margin_25",
  129 + "value": "25vp"
  130 + },
  131 + {
  132 + "name": "margin_28",
  133 + "value": "28vp"
  134 + },
  135 + {
  136 + "name": "margin_40",
  137 + "value": "40vp"
  138 + },
  139 + {
  140 + "name": "margin_48",
  141 + "value": "48vp"
  142 + },
  143 + {
  144 + "name": "margin_54",
  145 + "value": "54vp"
  146 + },
  147 + {
  148 + "name": "margin_60",
  149 + "value": "60vp"
  150 + },
  151 + {
  152 + "name": "margin_154",
  153 + "value": "154vp"
  154 + },
  155 + {
  156 + "name": "single_row_03_img_height",
  157 + "value": "88vp"
  158 + },
  159 + {
  160 + "name": "image_border_radius",
  161 + "value": "5vp"
  162 + },
  163 + {
  164 + "name": "button_border_radius",
  165 + "value": "3vp"
  166 + },
  167 + {
  168 + "name": "border_radius_6",
  169 + "value": "6vp"
  170 + },
  171 + {
  172 + "name": "bottom_navigation_margin_bottom",
  173 + "value": "4vp"
  174 + },
  175 + {
  176 + "name": "bottom_navigation_barHeight",
  177 + "value": "50vp"
  178 + },
  179 + {
  180 + "name": "top_tab_bar_height",
  181 + "value": "40vp"
  182 + },
  183 + {
  184 + "name": "top_tab_item_max_width",
  185 + "value": "300vp"
  186 + },
  187 + {
  188 + "name": "top_tab_item_min_width",
  189 + "value": "20vp"
  190 + },
  191 + {
  192 + "name": "top_tab_item_padding_horizontal",
  193 + "value": "7vp"
  194 + },
  195 + {
  196 + "name": "top_tab_item_padding_bottom",
  197 + "value": "2vp"
  198 + },
  199 + {
  200 + "name": "top_tab_item_padding_top",
  201 + "value": "5vp"
  202 + },
  203 + {
  204 + "name": "top_bar_height",
  205 + "value": "44vp"
  206 + },
  207 + {
  208 + "name": "top_arrow_size",
  209 + "value": "24vp"
  210 + },
  211 + {
  212 + "name": "margin_1",
  213 + "value": "1vp"
  214 + },
  215 + {
  216 + "name": "margin_6",
  217 + "value": "6vp"
  218 + },
  219 + {
  220 + "name": "margin_16",
  221 + "value": "16vp"
  222 + },
  223 + {
  224 + "name": "vp_20",
  225 + "value": "20vp"
  226 + },
  227 + {
  228 + "name": "margin_32",
  229 + "value": "32vp"
  230 + },
  231 + {
  232 + "name": "margin_36",
  233 + "value": "36vp"
  234 + },
  235 + {
  236 + "name": "margin_44",
  237 + "value": "44vp"
  238 + },
  239 + {
  240 + "name": "vp_3",
  241 + "value": "3vp"
  242 + },
  243 + {
  244 + "name": "vp_2",
  245 + "value": "2vp"
  246 + },
  247 + {
  248 + "name": "vp_55",
  249 + "value": "55vp"
  250 + },
  251 + {
  252 + "name": "vp_12",
  253 + "value": "12vp"
  254 + },
  255 + {
  256 + "name": "vp_4",
  257 + "value": "4vp"
  258 + },
  259 + {
  260 + "name": "vp_8",
  261 + "value": "8vp"
  262 + },
  263 + {
  264 + "name": "vp_16",
  265 + "value": "16vp"
  266 + },
  267 + {
  268 + "name": "vp_28",
  269 + "value": "28vp"
  270 + },
  271 + {
  272 + "name": "vp_80",
  273 + "value": "80vp"
  274 + },
  275 + {
  276 + "name": "card_comp_pagePadding_lf",
  277 + "value": "16fp"
  278 + },
  279 + {
  280 + "name": "card_comp_pagePadding_tb",
  281 + "value": "14fp"
  282 + },
  283 + {
  284 + "name": "margin_116",
  285 + "value": "116vp"
  286 + },
  287 + {
  288 + "name": "vp_11",
  289 + "value": "11vp"
  290 + },
  291 + {
  292 + "name": "vp_22",
  293 + "value": "22vp"
  294 + },
  295 + {
  296 + "name": "vp_14",
  297 + "value": "14vp"
  298 + },
  299 + {
  300 + "name": "vp_15",
  301 + "value": "15vp"
  302 + },
  303 + {
  304 + "name": "vp_18",
  305 + "value": "18vp"
  306 + },
  307 + {
  308 + "name": "vp_13",
  309 + "value": "13vp"
  310 + },
  311 + {
  312 + "name": "margin_115",
  313 + "value": "115vp"
  314 + }
  315 + ]
  316 +}
@@ -64,6 +64,7 @@ export const enum CompStyle { @@ -64,6 +64,7 @@ export const enum CompStyle {
64 Card_21 = '21', // 小视频卡人民号 64 Card_21 = '21', // 小视频卡人民号
65 Card_22 = '22', // 时间链 65 Card_22 = '22', // 时间链
66 Card_23 = '23', // 问政卡 66 Card_23 = '23', // 问政卡
  67 + More_Comp= 'More_Comp', // 点击查看更多相似
67 68
68 69
69 70
@@ -98,7 +98,7 @@ export interface IStatusContentList { @@ -98,7 +98,7 @@ export interface IStatusContentList {
98 98
99 // relType: string; 99 // relType: string;
100 contentType: string; 100 contentType: string;
101 - // contentRelId: string; 101 + contentRelId: string;
102 } 102 }
103 export interface batchLikeAndCollectParams { 103 export interface batchLikeAndCollectParams {
104 // userType: number; 104 // userType: number;
@@ -12,8 +12,6 @@ export { LoadingComponent } from "./src/main/ets/components/view/LoadingComponen @@ -12,8 +12,6 @@ export { LoadingComponent } from "./src/main/ets/components/view/LoadingComponen
12 12
13 export { PageComponent } from "./src/main/ets/components/page/PageComponent" 13 export { PageComponent } from "./src/main/ets/components/page/PageComponent"
14 14
15 -export { BottomNavigationComponent } from "./src/main/ets/components/page/BottomNavigationComponent"  
16 -  
17 export { LikeComponent } from "./src/main/ets/components/view/LikeComponent" 15 export { LikeComponent } from "./src/main/ets/components/view/LikeComponent"
18 16
19 export { TopNavigationComponent } from "./src/main/ets/components/page/TopNavigationComponent" 17 export { TopNavigationComponent } from "./src/main/ets/components/page/TopNavigationComponent"
@@ -51,8 +49,6 @@ export { DetailViewModel } from "./src/main/ets/viewmodel/DetailViewModel" @@ -51,8 +49,6 @@ export { DetailViewModel } from "./src/main/ets/viewmodel/DetailViewModel"
51 49
52 export { BigPicCardComponent } from "./src/main/ets/components/view/BigPicCardComponent" 50 export { BigPicCardComponent } from "./src/main/ets/components/view/BigPicCardComponent"
53 51
54 -export { MultiPictureDetailPageComponent } from "./src/main/ets/components/MultiPictureDetailPageComponent"  
55 -  
56 export { AudioDetailComponent } from "./src/main/ets/components/AudioDetailComponent" 52 export { AudioDetailComponent } from "./src/main/ets/components/AudioDetailComponent"
57 53
58 export { DynamicDetailComponent } from "./src/main/ets/components/DynamicDetailComponent" 54 export { DynamicDetailComponent } from "./src/main/ets/components/DynamicDetailComponent"
@@ -89,3 +85,14 @@ export { LiveFollowComponent } from "./src/main/ets/components/cardCommon/LiveFo @@ -89,3 +85,14 @@ export { LiveFollowComponent } from "./src/main/ets/components/cardCommon/LiveFo
89 85
90 export { publishCommentModel } from './src/main/ets/components/comment/model/PublishCommentModel'; 86 export { publishCommentModel } from './src/main/ets/components/comment/model/PublishCommentModel';
91 87
  88 +export { MultiPictureDetailItemComponent } from './src/main/ets/components/MultiPictureDetailItemComponent';
  89 +
  90 +export { OperRowListView } from './src/main/ets/components/view/OperRowListView';
  91 +
  92 +export { ImageDownloadComponent } from './src/main/ets/components/ImageDownloadComponent';
  93 +
  94 +export { PageRepository } from './src/main/ets/repository/PageRepository';
  95 +
  96 +export { MultiPictureDetailViewModel } from './src/main/ets/viewmodel/MultiPictureDetailViewModel';
  97 +
  98 +export { viewBlogItemInsightIntentShare } from './src/main/ets/utils/InsightIntentShare';
@@ -14,7 +14,6 @@ @@ -14,7 +14,6 @@
14 "wdKit": "file:../../commons/wdKit", 14 "wdKit": "file:../../commons/wdKit",
15 "wdWebComponent": "file:../../commons/wdWebComponent", 15 "wdWebComponent": "file:../../commons/wdWebComponent",
16 "wdBean": "file:../../features/wdBean", 16 "wdBean": "file:../../features/wdBean",
17 - "wdDetailPlayShortVideo": "file:../../features/wdDetailPlayShortVideo",  
18 "wdRouter": "file:../../commons/wdRouter", 17 "wdRouter": "file:../../commons/wdRouter",
19 "wdNetwork": "file:../../commons/wdNetwork", 18 "wdNetwork": "file:../../commons/wdNetwork",
20 "wdJsBridge": "file:../../commons/wdJsBridge", 19 "wdJsBridge": "file:../../commons/wdJsBridge",
@@ -5,7 +5,6 @@ import { Card3Component } from './cardview/Card3Component'; @@ -5,7 +5,6 @@ import { Card3Component } from './cardview/Card3Component';
5 import { Card4Component } from './cardview/Card4Component'; 5 import { Card4Component } from './cardview/Card4Component';
6 import { Card5Component } from './cardview/Card5Component'; 6 import { Card5Component } from './cardview/Card5Component';
7 import { Card6Component } from './cardview/Card6Component'; 7 import { Card6Component } from './cardview/Card6Component';
8 -import { Card9Component } from './cardview/Card9Component';  
9 import { Card10Component } from './cardview/Card10Component'; 8 import { Card10Component } from './cardview/Card10Component';
10 import { Card11Component } from './cardview/Card11Component'; 9 import { Card11Component } from './cardview/Card11Component';
11 import { Card12Component } from './cardview/Card12Component'; 10 import { Card12Component } from './cardview/Card12Component';
@@ -48,8 +47,6 @@ export struct CardParser { @@ -48,8 +47,6 @@ export struct CardParser {
48 } else if (contentDTO.appStyle === CompStyle.Card_06 || contentDTO.appStyle === CompStyle 47 } else if (contentDTO.appStyle === CompStyle.Card_06 || contentDTO.appStyle === CompStyle
49 .Card_13) { 48 .Card_13) {
50 Card6Component({ compDTO: this.compDTO, contentDTO: this.contentDTO }) 49 Card6Component({ compDTO: this.compDTO, contentDTO: this.contentDTO })
51 - } else if (contentDTO.appStyle === CompStyle.Card_09) {  
52 - Card9Component({ contentDTO })  
53 } else if (contentDTO.appStyle === CompStyle.Card_10) { 50 } else if (contentDTO.appStyle === CompStyle.Card_10) {
54 Card10Component({ compDTO: this.compDTO, contentDTO }) 51 Card10Component({ compDTO: this.compDTO, contentDTO })
55 } else if (contentDTO.appStyle === CompStyle.Card_11) { 52 } else if (contentDTO.appStyle === CompStyle.Card_11) {
@@ -4,6 +4,7 @@ import { WDRouterPage, WDRouterRule } from 'wdRouter/Index'; @@ -4,6 +4,7 @@ import { WDRouterPage, WDRouterRule } from 'wdRouter/Index';
4 import PageModel from '../viewmodel/PageModel'; 4 import PageModel from '../viewmodel/PageModel';
5 import { CardParser } from './CardParser'; 5 import { CardParser } from './CardParser';
6 import { Card2Component } from './cardview/Card2Component'; 6 import { Card2Component } from './cardview/Card2Component';
  7 +import { Card9Component } from './cardview/Card9Component';
7 import { Card5Component } from './cardview/Card5Component'; 8 import { Card5Component } from './cardview/Card5Component';
8 import { AdvCardParser } from './cardViewAdv/AdvCardParser'; 9 import { AdvCardParser } from './cardViewAdv/AdvCardParser';
9 import { ZhCarouselLayout01 } from './compview/ZhCarouselLayout01'; 10 import { ZhCarouselLayout01 } from './compview/ZhCarouselLayout01';
@@ -41,8 +42,12 @@ export struct CompParser { @@ -41,8 +42,12 @@ export struct CompParser {
41 aboutToAppear(): void { 42 aboutToAppear(): void {
42 // 轮播图屏蔽音频类型稿件 43 // 轮播图屏蔽音频类型稿件
43 if (this.compDTO.compStyle === CompStyle.Zh_Carousel_Layout_01) { 44 if (this.compDTO.compStyle === CompStyle.Zh_Carousel_Layout_01) {
44 - this.audioItems = this.compDTO.operDataList.filter(item => item.appStyle === '13')  
45 - this.noneAudioItems = this.compDTO.operDataList.filter(item => item.appStyle !== '13') 45 + this.audioItems = this.compDTO.operDataList.filter(item => {
  46 + return item.objectType === '13' || item.linkUrl.includes('audiotopic')
  47 + })
  48 + this.noneAudioItems = this.compDTO.operDataList.filter(item => {
  49 + return item.objectType !== '13' && !item.linkUrl.includes('audiotopic')
  50 + })
46 this.compDTO.operDataList = this.noneAudioItems; 51 this.compDTO.operDataList = this.noneAudioItems;
47 } 52 }
48 } 53 }
@@ -63,64 +68,68 @@ export struct CompParser { @@ -63,64 +68,68 @@ export struct CompParser {
63 68
64 if (this.compDTO.compStyle === CompStyle.Label_03) { 69 if (this.compDTO.compStyle === CompStyle.Label_03) {
65 LabelComponent({ compDTO: this.compDTO }) 70 LabelComponent({ compDTO: this.compDTO })
66 - Divider().strokeWidth(8).color('#f5f5f5').padding({ left: 0, right: 0 }) 71 + Divider().strokeWidth(5).color('#f5f5f5').padding({ left: 0, right: 0 })
67 } else if (this.compDTO.compStyle === CompStyle.Zh_Carousel_Layout_01) { 72 } else if (this.compDTO.compStyle === CompStyle.Zh_Carousel_Layout_01) {
68 if (this.compDTO.operDataList.length > this.audioItems.length) { 73 if (this.compDTO.operDataList.length > this.audioItems.length) {
69 ZhCarouselLayout01({ compDTO: this.compDTO }) 74 ZhCarouselLayout01({ compDTO: this.compDTO })
70 - Divider().strokeWidth(8).color('#f5f5f5').padding({ left: 0, right: 0 }) 75 + Divider().strokeWidth(5).color('#f5f5f5').padding({ left: 0, right: 0 })
71 } 76 }
72 } else if (this.compDTO.compStyle === CompStyle.Zh_Single_Row_01 && 77 } else if (this.compDTO.compStyle === CompStyle.Zh_Single_Row_01 &&
73 this.compDTO.imageScale === 2) { // && compDTO.name ==="横划卡" 78 this.compDTO.imageScale === 2) { // && compDTO.name ==="横划卡"
74 79
75 LiveHorizontalCardComponent({ compDTO: this.compDTO }) 80 LiveHorizontalCardComponent({ compDTO: this.compDTO })
76 - Divider().strokeWidth(8).color('#f5f5f5').padding({ left: 0, right: 0 }) 81 + Divider().strokeWidth(5).color('#f5f5f5').padding({ left: 0, right: 0 })
77 } else if (this.compDTO.compStyle === CompStyle.Zh_Single_Row_01 && this.compDTO.imageScale === 3) { 82 } else if (this.compDTO.compStyle === CompStyle.Zh_Single_Row_01 && this.compDTO.imageScale === 3) {
78 if (this.compDTO.operDataList.length > 1) { 83 if (this.compDTO.operDataList.length > 1) {
79 HorizontalStrokeCardThreeTwoRadioForMoreComponent({ compDTO: this.compDTO }) 84 HorizontalStrokeCardThreeTwoRadioForMoreComponent({ compDTO: this.compDTO })
80 } else { 85 } else {
81 HorizontalStrokeCardThreeTwoRadioForOneComponent({ compDTO: this.compDTO }) 86 HorizontalStrokeCardThreeTwoRadioForOneComponent({ compDTO: this.compDTO })
82 } 87 }
83 - Divider().strokeWidth(8).color('#f5f5f5').padding({ left: 0, right: 0 }) 88 + Divider().strokeWidth(5).color('#f5f5f5').padding({ left: 0, right: 0 })
84 } else if (this.compDTO.compStyle === CompStyle.Zh_Single_Row_02) { 89 } else if (this.compDTO.compStyle === CompStyle.Zh_Single_Row_02) {
85 ZhSingleRow02({ compDTO: this.compDTO }) 90 ZhSingleRow02({ compDTO: this.compDTO })
86 - Divider().strokeWidth(8).color('#f5f5f5').padding({ left: 0, right: 0 }) 91 + Divider().strokeWidth(5).color('#f5f5f5').padding({ left: 0, right: 0 })
87 } else if (this.compDTO.compStyle === CompStyle.Zh_Single_Row_03) { 92 } else if (this.compDTO.compStyle === CompStyle.Zh_Single_Row_03) {
88 ZhSingleRow03({ compDTO: this.compDTO }) 93 ZhSingleRow03({ compDTO: this.compDTO })
89 - Divider().strokeWidth(8).color('#f5f5f5').padding({ left: 0, right: 0 }) 94 + Divider().strokeWidth(5).color('#f5f5f5').padding({ left: 0, right: 0 })
90 } else if (this.compDTO.compStyle === CompStyle.Zh_Grid_Layout_02) { //双列流小视频,一行两图卡 ->标题 95 } else if (this.compDTO.compStyle === CompStyle.Zh_Grid_Layout_02) { //双列流小视频,一行两图卡 ->标题
91 //ZhGridLayout02({ compDTO: this.compDTO }) 96 //ZhGridLayout02({ compDTO: this.compDTO })
92 CompNormalTitle({ compDTO: this.compDTO }) 97 CompNormalTitle({ compDTO: this.compDTO })
93 - // Divider().strokeWidth(8).color('#f5f5f5').padding({ left: 0, right: 0 }) 98 + // Divider().strokeWidth(5).color('#f5f5f5').padding({ left: 0, right: 0 })
94 } else if (this.compDTO.compStyle === CompStyle.Card_Comp_Zh_Grid_Layout_02) { //双列流小视频,一行两图卡 99 } else if (this.compDTO.compStyle === CompStyle.Card_Comp_Zh_Grid_Layout_02) { //双列流小视频,一行两图卡
95 100
96 ZhGridLayout02NewsContent({ compDTO: this.compDTO, operDataList: this.compDTO.operDataList }) 101 ZhGridLayout02NewsContent({ compDTO: this.compDTO, operDataList: this.compDTO.operDataList })
97 102
98 } else if (this.compDTO.compStyle === CompStyle.Zh_Grid_Layout_03) { 103 } else if (this.compDTO.compStyle === CompStyle.Zh_Grid_Layout_03) {
99 ZhGridLayout03({ compDTO: this.compDTO }) 104 ZhGridLayout03({ compDTO: this.compDTO })
100 - Divider().strokeWidth(8).color('#f5f5f5').padding({ left: 0, right: 0 }) 105 + Divider().strokeWidth(5).color('#f5f5f5').padding({ left: 0, right: 0 })
101 } else if (this.compDTO.compStyle === CompStyle.Zh_Single_Row_04) { 106 } else if (this.compDTO.compStyle === CompStyle.Zh_Single_Row_04) {
102 ZhSingleRow04({ compDTO: this.compDTO }) 107 ZhSingleRow04({ compDTO: this.compDTO })
103 - Divider().strokeWidth(8).color('#f5f5f5').padding({ left: 0, right: 0 }) 108 + Divider().strokeWidth(5).color('#f5f5f5').padding({ left: 0, right: 0 })
104 } else if (this.compDTO.compStyle === CompStyle.Zh_Single_Row_05) { 109 } else if (this.compDTO.compStyle === CompStyle.Zh_Single_Row_05) {
105 // ZhSingleRow05({ compDTO }) 110 // ZhSingleRow05({ compDTO })
106 - // Divider().strokeWidth(8).color('#f5f5f5').padding({ left: 0, right: 0 }) 111 + // Divider().strokeWidth(5).color('#f5f5f5').padding({ left: 0, right: 0 })
107 } else if (this.compDTO.compStyle === CompStyle.Zh_Single_Row_06) { 112 } else if (this.compDTO.compStyle === CompStyle.Zh_Single_Row_06) {
108 ZhSingleRow06({ compDTO: this.compDTO }) 113 ZhSingleRow06({ compDTO: this.compDTO })
109 - Divider().strokeWidth(8).color('#f5f5f5').padding({ left: 0, right: 0 }) 114 + Divider().strokeWidth(5).color('#f5f5f5').padding({ left: 0, right: 0 })
110 } else if (this.compDTO.compStyle === CompStyle.Zh_Single_Column_02) { 115 } else if (this.compDTO.compStyle === CompStyle.Zh_Single_Column_02) {
111 //头图卡 和comStyle 2相同， 116 //头图卡 和comStyle 2相同，
112 Card5Component({ contentDTO: this.compDTO.operDataList[0], titleShowPolicy: this.compDTO.titleShowPolicy }) 117 Card5Component({ contentDTO: this.compDTO.operDataList[0], titleShowPolicy: this.compDTO.titleShowPolicy })
113 - Divider().strokeWidth(8).color('#f5f5f5').padding({ left: 0, right: 0 }) 118 + Divider().strokeWidth(5).color('#f5f5f5').padding({ left: 0, right: 0 })
114 } else if (this.compDTO.compStyle === CompStyle.Zh_Single_Column_03) { 119 } else if (this.compDTO.compStyle === CompStyle.Zh_Single_Column_03) {
115 // 大图卡 120 // 大图卡
116 Card2Component({ compDTO: this.compDTO, contentDTO: this.compDTO.operDataList[0] }) 121 Card2Component({ compDTO: this.compDTO, contentDTO: this.compDTO.operDataList[0] })
117 - Divider().strokeWidth(8).color('#f5f5f5').padding({ left: 0, right: 0 }) 122 + Divider().strokeWidth(5).color('#f5f5f5').padding({ left: 0, right: 0 })
  123 + } else if (this.compDTO.compStyle === CompStyle.Card_09) {
  124 + //时间链卡
  125 + Card9Component({ contentDTO:this.compDTO.operDataList[0] })
  126 + Divider().strokeWidth(5).color('#f5f5f5').padding({ left: 0, right: 0 })
118 } else if (this.compDTO.compStyle === CompStyle.Zh_Single_Column_04) { 127 } else if (this.compDTO.compStyle === CompStyle.Zh_Single_Column_04) {
119 ZhSingleColumn04({ compDTO: this.compDTO }) 128 ZhSingleColumn04({ compDTO: this.compDTO })
120 - Divider().strokeWidth(8).color('#f5f5f5').padding({ left: 0, right: 0 }) 129 + Divider().strokeWidth(5).color('#f5f5f5').padding({ left: 0, right: 0 })
121 } else if (this.compDTO.compStyle === CompStyle.Zh_Single_Column_05) { 130 } else if (this.compDTO.compStyle === CompStyle.Zh_Single_Column_05) {
122 // ZhSingleColumn05({ compDTO: compDTO }) 131 // ZhSingleColumn05({ compDTO: compDTO })
123 - // Divider().strokeWidth(8).color('#f5f5f5').padding({ left: 0, right: 0 }) 132 + // Divider().strokeWidth(5).color('#f5f5f5').padding({ left: 0, right: 0 })
124 } else if (this.compDTO.compStyle === CompStyle.Zh_Single_Column_09) { 133 } else if (this.compDTO.compStyle === CompStyle.Zh_Single_Column_09) {
125 Divider().strokeWidth(3).color('#ffffff').padding({ left: 0, right: 0 }).margin({ top: -3 }) 134 Divider().strokeWidth(3).color('#ffffff').padding({ left: 0, right: 0 }).margin({ top: -3 })
126 Divider().strokeWidth(6).color('#f5f5f5') 135 Divider().strokeWidth(6).color('#f5f5f5')
@@ -129,10 +138,10 @@ export struct CompParser { @@ -129,10 +138,10 @@ export struct CompParser {
129 } else if (this.compDTO.compStyle === CompStyle.Card_Comp_Adv) { // 广告 138 } else if (this.compDTO.compStyle === CompStyle.Card_Comp_Adv) { // 广告
130 AdvCardParser({ pageModel: this.pageModel, compDTO: this.compDTO }) 139 AdvCardParser({ pageModel: this.pageModel, compDTO: this.compDTO })
131 //Text(`compIndex = ${compIndex}`).width('100%').fontSize('12fp').fontColor(Color.Red).padding({ left: 0, right: 0 }) 140 //Text(`compIndex = ${compIndex}`).width('100%').fontSize('12fp').fontColor(Color.Red).padding({ left: 0, right: 0 })
132 - Divider().strokeWidth(8).color('#f5f5f5').padding({ left: 0, right: 0 }) 141 + Divider().strokeWidth(5).color('#f5f5f5').padding({ left: 0, right: 0 })
133 } else if (!Number.isNaN(Number(this.compDTO.compStyle))) { 142 } else if (!Number.isNaN(Number(this.compDTO.compStyle))) {
134 CardParser({ contentDTO: this.compDTO.operDataList[0], compDTO: this.compDTO }); 143 CardParser({ contentDTO: this.compDTO.operDataList[0], compDTO: this.compDTO });
135 - Divider().strokeWidth(8).color('#f5f5f5').padding({ left: 0, right: 0 }) 144 + Divider().strokeWidth(1).color('#f5f5f5').padding({ left: 16, right: 16 })
136 } else { 145 } else {
137 // Text(this.compDTO.compStyle) 146 // Text(this.compDTO.compStyle)
138 // .width(CommonConstants.FULL_PARENT) 147 // .width(CommonConstants.FULL_PARENT)
@@ -627,6 +627,7 @@ export struct DynamicDetailComponent { @@ -627,6 +627,7 @@ export struct DynamicDetailComponent {
627 { 627 {
628 contentId: this.contentDetailData?.newsId + '', 628 contentId: this.contentDetailData?.newsId + '',
629 contentType: this.contentDetailData?.newsType + '', 629 contentType: this.contentDetailData?.newsType + '',
  630 + contentRelId: this.contentDetailData?.reLInfo?.relId + '',
630 } 631 }
631 ] 632 ]
632 } 633 }
@@ -278,6 +278,7 @@ export struct FeedBackActivity { @@ -278,6 +278,7 @@ export struct FeedBackActivity {
278 // 其中包含Array<string>类型的photoUris，为返回图库选择后的媒体文件的uri数组；还包含boolean类型的isOriginalPhoto，指示返回图库选择后的媒体文件是否为原图。 278 // 其中包含Array<string>类型的photoUris，为返回图库选择后的媒体文件的uri数组；还包含boolean类型的isOriginalPhoto，指示返回图库选择后的媒体文件是否为原图。
279 // 声明变量array，其取值为PhotoSelectResult中的数组。 279 // 声明变量array，其取值为PhotoSelectResult中的数组。
280 array = PhotoSelectResult['photoUris']; 280 array = PhotoSelectResult['photoUris'];
  281 + let beforeLen = this.pics.length;
281 let startIndex = this.pics.length-1; 282 let startIndex = this.pics.length-1;
282 let totalLen = this.pics.length+array.length; 283 let totalLen = this.pics.length+array.length;
283 if(totalLen > 3){ 284 if(totalLen > 3){
@@ -293,7 +294,7 @@ export struct FeedBackActivity { @@ -293,7 +294,7 @@ export struct FeedBackActivity {
293 mediaFlag = true; 294 mediaFlag = true;
294 Logger.info(TAG, `select image/video uri: ${value}`); 295 Logger.info(TAG, `select image/video uri: ${value}`);
295 }) 296 })
296 - if(this.pics.length<3){ 297 + if(this.pics.length<=3 && beforeLen != 3 && array.length != 3){
297 this.addPic.id = startIndex 298 this.addPic.id = startIndex
298 this.pics[this.pics.length-1]=this.addPic; 299 this.pics[this.pics.length-1]=this.addPic;
299 } 300 }
@@ -328,6 +328,7 @@ export struct ImageAndTextPageComponent { @@ -328,6 +328,7 @@ export struct ImageAndTextPageComponent {
328 { 328 {
329 contentId: this.contentDetailData?.newsId + '', 329 contentId: this.contentDetailData?.newsId + '',
330 contentType: this.contentDetailData?.newsType + '', 330 contentType: this.contentDetailData?.newsType + '',
  331 + contentRelId: this.contentDetailData?.reLInfo?.relId + '',
331 } 332 }
332 ] 333 ]
333 } 334 }
@@ -21,7 +21,7 @@ export struct MultiPictureDetailItemComponent { @@ -21,7 +21,7 @@ export struct MultiPictureDetailItemComponent {
21 .alt($r('app.media.datail_imageLoading_w')) 21 .alt($r('app.media.datail_imageLoading_w'))
22 22
23 .width(this.imageWidth) 23 .width(this.imageWidth)
24 - .objectFit(ImageFit.Contain) 24 + .objectFit(ImageFit.Auto)
25 .interpolation(ImageInterpolation.High) 25 .interpolation(ImageInterpolation.High)
26 .onComplete(event => { 26 .onComplete(event => {
27 this.imageWidth = '100%' 27 this.imageWidth = '100%'
  1 +/**
  2 + * More_Comp
  3 + */
  4 +const TAG: string = 'Card9Component';
  5 +
  6 +@Entry
  7 +@Component
  8 +export struct MoreComponent {
  9 +
  10 + build() {
  11 + Row() {
  12 + Text('点击展开更多相似')
  13 + .fontSize(16)
  14 + Image($r('app.media.comment_unfold'))
  15 + .width(16)
  16 + .height(16)
  17 + }
  18 + .justifyContent(FlexAlign.Center)
  19 + .width('100%')
  20 + .height(48)
  21 + .backgroundColor(0xffffff)
  22 + }
  23 +}
@@ -679,7 +679,7 @@ struct commentFooterView { @@ -679,7 +679,7 @@ struct commentFooterView {
679 .fontColor($r('app.color.color_666666')) 679 .fontColor($r('app.color.color_666666'))
680 .fontSize(14) 680 .fontSize(14)
681 681
682 - Image($r(this.item.api_status ? 'app.media.comment_like_select' : 'app.media.comment_like_normal')) 682 + Image(this.item.api_status ? $r('app.media.comment_like_select') : $r('app.media.comment_like_normal'))
683 .size({ 683 .size({
684 width: 16, 684 width: 16,
685 height: 16 685 height: 16
@@ -381,7 +381,7 @@ struct QualityCommentItem { @@ -381,7 +381,7 @@ struct QualityCommentItem {
381 }) 381 })
382 382
383 Row() { 383 Row() {
384 - Image($r(this.item.api_status ? 'app.media.comment_like_select' : 'app.media.comment_like_normal')) 384 + Image(this.item.api_status ? $r('app.media.comment_like_select') : $r('app.media.comment_like_normal'))
385 .width(16) 385 .width(16)
386 .height(16) 386 .height(16)
387 if (this.item.likeNum && this.item.likeNum != '0') { 387 if (this.item.likeNum && this.item.likeNum != '0') {
@@ -71,6 +71,7 @@ export struct ZhSingleRow06 { @@ -71,6 +71,7 @@ export struct ZhSingleRow06 {
71 { 71 {
72 contentId: this.compDTO.operDataList[0]?.commentInfo?.newsId + '', 72 contentId: this.compDTO.operDataList[0]?.commentInfo?.newsId + '',
73 contentType: this.compDTO.operDataList[0]?.commentInfo?.newsType + '', 73 contentType: this.compDTO.operDataList[0]?.commentInfo?.newsType + '',
  74 + contentRelId: this.compDTO.operDataList[0]?.commentInfo?.relId + '',
74 } 75 }
75 ] 76 ]
76 } 77 }
1 -import { LazyDataSource, NetworkUtil, StringUtils } from 'wdKit/Index'; 1 +import { LazyDataSource, NetworkUtil, StringUtils, ToastUtils } from 'wdKit/Index';
2 import { Remark, SubscribeMessageModel, 2 import { Remark, SubscribeMessageModel,
3 WDMessageCenterMessageType } from '../../../../model/InteractMessageModel'; 3 WDMessageCenterMessageType } from '../../../../model/InteractMessageModel';
4 import MinePageDatasModel from '../../../../model/MinePageDatasModel'; 4 import MinePageDatasModel from '../../../../model/MinePageDatasModel';
@@ -88,13 +88,9 @@ export struct SubscribeMessageComponent{ @@ -88,13 +88,9 @@ export struct SubscribeMessageComponent{
88 .width('100%') 88 .width('100%')
89 } 89 }
90 90
91 - @Builder ListLayout(){  
92 - List({scroller: this.scroller}) {  
93 - LazyForEach(this.data, (item: SubscribeMessageModel, index: number) => {  
94 - ListItem() {  
95 - SubscribeListChildComponent({ item: item })  
96 - }.width('100%')  
97 - .onClick(()=>{ 91 + jumpDetail(item: SubscribeMessageModel){
  92 + MinePageDatasModel.getAssertDetailData(item.relId,item.contentId,item.relType).then((value) => {
  93 + if(value == "1"){
98 let action = { 94 let action = {
99 type:item.contentType, 95 type:item.contentType,
100 params:{ 96 params:{
@@ -106,6 +102,25 @@ export struct SubscribeMessageComponent{ @@ -106,6 +102,25 @@ export struct SubscribeMessageComponent{
106 } 102 }
107 } as Action 103 } as Action
108 WDRouterRule.jumpWithPage(WDRouterPage.detailPlayLiveCommon, action) 104 WDRouterRule.jumpWithPage(WDRouterPage.detailPlayLiveCommon, action)
  105 + }else{
  106 + ToastUtils.shortToast("内容不存在")
  107 + }
  108 + }).catch((err: Error) => {
  109 + console.log(TAG, JSON.stringify(err))
  110 + })
  111 +
  112 +
  113 +
  114 + }
  115 +
  116 + @Builder ListLayout(){
  117 + List({scroller: this.scroller}) {
  118 + LazyForEach(this.data, (item: SubscribeMessageModel, index: number) => {
  119 + ListItem() {
  120 + SubscribeListChildComponent({ item: item })
  121 + }.width('100%')
  122 + .onClick(()=>{
  123 + this.jumpDetail(item)
109 }) 124 })
110 }) 125 })
111 //没有更多数据 显示提示 126 //没有更多数据 显示提示
@@ -3,7 +3,7 @@ import { PrivacySettingModel } from '../../model/PrivacySettingModel' @@ -3,7 +3,7 @@ import { PrivacySettingModel } from '../../model/PrivacySettingModel'
3 import { Params } from 'wdBean'; 3 import { Params } from 'wdBean';
4 import { WDRouterPage, WDRouterRule } from 'wdRouter'; 4 import { WDRouterPage, WDRouterRule } from 'wdRouter';
5 import { HttpUtils } from 'wdNetwork/Index'; 5 import { HttpUtils } from 'wdNetwork/Index';
6 -import { TrackingPageBrowse, TrackConstants } from 'wdTracking/Index'; 6 +import { TrackingPageBrowse, TrackConstants, TrackingButton } from 'wdTracking/Index';
7 7
8 const TAG = 'PrivacySettingPage'; 8 const TAG = 'PrivacySettingPage';
9 const DiyString = '开启个性化推荐' 9 const DiyString = '开启个性化推荐'
@@ -79,8 +79,19 @@ export struct PrivacySettingPage { @@ -79,8 +79,19 @@ export struct PrivacySettingPage {
79 } 79 }
80 }.onClick(() => { 80 }.onClick(() => {
81 if (item.privacyName == DiyString) { 81 if (item.privacyName == DiyString) {
  82 + trackButtonClick("privacySettingPagePersonalizedRecommendations")
82 return 83 return
83 } 84 }
  85 + if(item.privacyName == "相册权限"){
  86 + trackButtonClick("privacySettingPageAlbumPermissions")
  87 + }else if(item.privacyName == "相机权限"){
  88 + trackButtonClick("privacySettingPageCameraPermissions")
  89 + }else if(item.privacyName == "定位权限"){
  90 + trackButtonClick("privacySettingPageLocationPermissions")
  91 + }else if(item.privacyName == "麦克风权限"){
  92 + trackButtonClick("privacySettingPageMicrophonePermissions")
  93 + }
  94 +
84 if (!item.permission) { 95 if (!item.permission) {
85 //跳转权限设置 96 //跳转权限设置
86 const permissionUtil = new PermissionUtil(); 97 const permissionUtil = new PermissionUtil();
@@ -213,3 +224,7 @@ struct getTuiJianCell { @@ -213,3 +224,7 @@ struct getTuiJianCell {
213 .padding({ left: '29lpx', right: '29lpx' }) 224 .padding({ left: '29lpx', right: '29lpx' })
214 } 225 }
215 } 226 }
  227 +
  228 +function trackButtonClick(buttonName: string){
  229 + TrackingButton.click(buttonName, TrackConstants.PageName.Privacy_Setting, TrackConstants.PageName.Privacy_Setting)
  230 +}
@@ -4,7 +4,7 @@ import { AccountAndSecurityLayout } from '../setting/AccountAndSecurityLayout'; @@ -4,7 +4,7 @@ import { AccountAndSecurityLayout } from '../setting/AccountAndSecurityLayout';
4 import router from '@ohos.router'; 4 import router from '@ohos.router';
5 import { Action, Params } from 'wdBean'; 5 import { Action, Params } from 'wdBean';
6 import { DateTimeUtils } from 'wdKit/Index'; 6 import { DateTimeUtils } from 'wdKit/Index';
7 -import { TrackingPageBrowse, TrackConstants } from 'wdTracking/Index'; 7 +import { TrackingPageBrowse, TrackConstants, TrackingButton } from 'wdTracking/Index';
8 8
9 @Entry 9 @Entry
10 @Component 10 @Component
@@ -67,6 +67,4 @@ struct SettingPage { @@ -67,6 +67,4 @@ struct SettingPage {
67 67
68 export { SettingPage }; 68 export { SettingPage };
69 69
70 -/*  
71 70
72 -* */  
1 import { Params } from 'wdBean'; 1 import { Params } from 'wdBean';
2 import { AppUtils, StringUtils } from 'wdKit/Index'; 2 import { AppUtils, StringUtils } from 'wdKit/Index';
3 import { WDRouterPage, WDRouterRule } from 'wdRouter'; 3 import { WDRouterPage, WDRouterRule } from 'wdRouter';
  4 +import { TrackingButton, TrackConstants } from 'wdTracking/Index';
4 import { CustomTitleUI } from '../reusable/CustomTitleUI'; 5 import { CustomTitleUI } from '../reusable/CustomTitleUI';
5 import { EnvironmentCustomDialog } from './EnvironmentCustomDialog'; 6 import { EnvironmentCustomDialog } from './EnvironmentCustomDialog';
6 7
@@ -58,9 +59,11 @@ export struct AboutPageUI { @@ -58,9 +59,11 @@ export struct AboutPageUI {
58 this.getArrowCell(item, index) 59 this.getArrowCell(item, index)
59 }.onClick(() => { 60 }.onClick(() => {
60 if (index == 0) { 61 if (index == 0) {
  62 + trackButtonClick("aboutPagePrivacyAgreement")
61 let bean = { contentID: "2", pageID: "" } as Params 63 let bean = { contentID: "2", pageID: "" } as Params
62 WDRouterRule.jumpWithPage(WDRouterPage.loginProtocolPage, bean) 64 WDRouterRule.jumpWithPage(WDRouterPage.loginProtocolPage, bean)
63 } else if(index == 1){ 65 } else if(index == 1){
  66 + trackButtonClick("aboutPageUserAgreement")
64 let bean = { contentID: "1", pageID: "" } as Params 67 let bean = { contentID: "1", pageID: "" } as Params
65 WDRouterRule.jumpWithPage(WDRouterPage.loginProtocolPage, bean) 68 WDRouterRule.jumpWithPage(WDRouterPage.loginProtocolPage, bean)
66 }else if(index == 2){ 69 }else if(index == 2){
@@ -124,4 +127,8 @@ export struct AboutPageUI { @@ -124,4 +127,8 @@ export struct AboutPageUI {
124 } 127 }
125 } 128 }
126 129
  130 +function trackButtonClick(buttonName: string){
  131 + TrackingButton.click(buttonName, TrackConstants.PageName.About, TrackConstants.PageName.About)
  132 +}
  133 +
127 134
1 -  
2 -import { BottomNavi, CommonConstants, SpConstants } from 'wdConstant';  
3 -import { Logger, SPHelper, ToastUtils, UserDataLocal, EmitterEventId, EmitterUtils } from 'wdKit';  
4 -import { TopNavigationComponent } from '../page/TopNavigationComponent';  
5 -import PageViewModel from '../../viewmodel/PageViewModel'; 1 +import { SpConstants } from 'wdConstant';
  2 +import { Logger, SPHelper, ToastUtils, EmitterEventId, EmitterUtils } from 'wdKit';
6 import {MineMainSettingFunctionItem} from '../../viewmodel/MineMainSettingFunctionItem'; 3 import {MineMainSettingFunctionItem} from '../../viewmodel/MineMainSettingFunctionItem';
7 import MineSettingDatasModel from '../../model/MineSettingDatasModel'; 4 import MineSettingDatasModel from '../../model/MineSettingDatasModel';
8 -import storageStatistics from "@ohos.file.storageStatistics";  
9 -import { BusinessError } from '@ohos.base';  
10 -import ArrayList from '@ohos.util.ArrayList';  
11 import router from '@ohos.router'; 5 import router from '@ohos.router';
12 import { WDRouterPage, WDRouterRule } from 'wdRouter'; 6 import { WDRouterPage, WDRouterRule } from 'wdRouter';
13 import { Params } from 'wdBean'; 7 import { Params } from 'wdBean';
14 -import { SettingPasswordParams } from 'wdLogin';  
15 import { LoginViewModel } from 'wdLogin/src/main/ets/pages/login/LoginViewModel'; 8 import { LoginViewModel } from 'wdLogin/src/main/ets/pages/login/LoginViewModel';
16 -import { Router } from '@ohos.arkui.UIContext';  
17 import promptAction from '@ohos.promptAction'; 9 import promptAction from '@ohos.promptAction';
18 import { LogoutViewModel } from '../../viewmodel/LogoutViewModel'; 10 import { LogoutViewModel } from '../../viewmodel/LogoutViewModel';
19 import { CustomLogoutDialog } from './CustomLogoutDialog'; 11 import { CustomLogoutDialog } from './CustomLogoutDialog';
20 import { emitter } from '@kit.BasicServicesKit'; 12 import { emitter } from '@kit.BasicServicesKit';
21 import { ConfirmLogoutDialog } from './ConfirmLogoutDialog'; 13 import { ConfirmLogoutDialog } from './ConfirmLogoutDialog';
22 - 14 +import { TrackingButton, TrackConstants } from 'wdTracking/Index';
23 export { SettingPasswordParams } from "wdLogin" 15 export { SettingPasswordParams } from "wdLogin"
24 16
25 @Component 17 @Component
@@ -183,9 +175,11 @@ export struct AccountAndSecurityLayout { @@ -183,9 +175,11 @@ export struct AccountAndSecurityLayout {
183 .onClick(() => { 175 .onClick(() => {
184 console.log(index + "") 176 console.log(index + "")
185 if (index == 0){ 177 if (index == 0){
  178 + trackButtonClick("accountManagementPageChangePhoneNumber")
186 let pageType = {'pageType': 2} as Record<string, number>; 179 let pageType = {'pageType': 2} as Record<string, number>;
187 WDRouterRule.jumpWithPage(WDRouterPage.forgetPasswordPage, pageType) 180 WDRouterRule.jumpWithPage(WDRouterPage.forgetPasswordPage, pageType)
188 }else if (index == 1) { 181 }else if (index == 1) {
  182 + trackButtonClick("accountManagementPageAccountManagementPassword")
189 if (this.ifSetPassword) { 183 if (this.ifSetPassword) {
190 //修改密码 184 //修改密码
191 WDRouterRule.jumpWithPage(WDRouterPage.modifyPasswordPage) 185 WDRouterRule.jumpWithPage(WDRouterPage.modifyPasswordPage)
@@ -195,6 +189,7 @@ export struct AccountAndSecurityLayout { @@ -195,6 +189,7 @@ export struct AccountAndSecurityLayout {
195 WDRouterRule.jumpWithPage(WDRouterPage.forgetPasswordPage, pageType) 189 WDRouterRule.jumpWithPage(WDRouterPage.forgetPasswordPage, pageType)
196 } 190 }
197 }else if (index == 3) { 191 }else if (index == 3) {
  192 + trackButtonClick("accountManagementPageAccountCancellation")
198 this.isAccountPage=false 193 this.isAccountPage=false
199 // WDRouterRule.jumpWithPage(WDRouterPage.forgetPasswordPage, pageType) 194 // WDRouterRule.jumpWithPage(WDRouterPage.forgetPasswordPage, pageType)
200 } 195 }
@@ -215,6 +210,7 @@ export struct AccountAndSecurityLayout { @@ -215,6 +210,7 @@ export struct AccountAndSecurityLayout {
215 210
216 Column() { 211 Column() {
217 Button('退出登录',{ stateEffect: true ,type: ButtonType.Normal}).width('90%').height('80lpx').backgroundColor('#da3e22').fontColor('#fff').margin('20lpx').borderRadius('8lpx').onClick(()=>{ 212 Button('退出登录',{ stateEffect: true ,type: ButtonType.Normal}).width('90%').height('80lpx').backgroundColor('#da3e22').fontColor('#fff').margin('20lpx').borderRadius('8lpx').onClick(()=>{
  213 + trackButtonClick("accountManagementPageLogout")
218 this.confirmDialogController.open() 214 this.confirmDialogController.open()
219 }) 215 })
220 } 216 }
@@ -516,3 +512,7 @@ export struct AccountArrowCell{ @@ -516,3 +512,7 @@ export struct AccountArrowCell{
516 .height('54lpx') 512 .height('54lpx')
517 } 513 }
518 } 514 }
  515 +
  516 +function trackButtonClick(buttonName: string){
  517 + TrackingButton.click(buttonName, TrackConstants.PageName.Account_Management, TrackConstants.PageName.Account_Management)
  518 +}
@@ -15,6 +15,7 @@ import common from '@ohos.app.ability.common'; @@ -15,6 +15,7 @@ import common from '@ohos.app.ability.common';
15 import dataPreferences from '@ohos.data.preferences'; 15 import dataPreferences from '@ohos.data.preferences';
16 import { TitleBackComponent } from './TitleBackComponent'; 16 import { TitleBackComponent } from './TitleBackComponent';
17 import { MyCustomDialog } from '../reusable/MyCustomDialog'; 17 import { MyCustomDialog } from '../reusable/MyCustomDialog';
  18 +import { TrackingButton, TrackConstants } from 'wdTracking/Index';
18 19
19 @Component 20 @Component
20 export struct MineSettingComponent { 21 export struct MineSettingComponent {
@@ -74,11 +75,6 @@ export struct MineSettingComponent { @@ -74,11 +75,6 @@ export struct MineSettingComponent {
74 } 75 }
75 76
76 build() { 77 build() {
77 - // Navigation() {  
78 - // //滑动区域  
79 - // this.settingList()  
80 - // }.titleMode(NavigationTitleMode.Mini)  
81 - // .title('设置')  
82 Column(){ 78 Column(){
83 TitleBackComponent({title:"设置"}) 79 TitleBackComponent({title:"设置"})
84 this.settingList() 80 this.settingList()
@@ -154,15 +150,19 @@ export struct MineSettingComponent { @@ -154,15 +150,19 @@ export struct MineSettingComponent {
154 .selectedColor("#ED2800") 150 .selectedColor("#ED2800")
155 .onChange((isOn: boolean) => { 151 .onChange((isOn: boolean) => {
156 if(item.itemType=='push_switch'){ 152 if(item.itemType=='push_switch'){
  153 + trackButtonClick("settingPagePushSwitch")
157 //推送 154 //推送
158 SPHelper.default.save(SpConstants.SETTING_PUSH_SWITCH,isOn) 155 SPHelper.default.save(SpConstants.SETTING_PUSH_SWITCH,isOn)
159 }else if(item.itemType=='wifi_switch'){ 156 }else if(item.itemType=='wifi_switch'){
  157 + trackButtonClick("settingPageOnlyWifiNetworkLoadPicture")
160 //wifi 图片 158 //wifi 图片
161 SPHelper.default.save(SpConstants.SETTING_WIFI_IMAGE_SWITCH,isOn) 159 SPHelper.default.save(SpConstants.SETTING_WIFI_IMAGE_SWITCH,isOn)
162 }else if(item.itemType=='video_switch'){ 160 }else if(item.itemType=='video_switch'){
  161 + trackButtonClick("settingPageAutomaticallyPlayVideoOnWifiNetwork")
163 //wifi 视频 162 //wifi 视频
164 SPHelper.default.save(SpConstants.SETTING_WIFI_VIDEO_SWITCH,isOn) 163 SPHelper.default.save(SpConstants.SETTING_WIFI_VIDEO_SWITCH,isOn)
165 }else if(item.itemType=='suspensionState_switch'){ 164 }else if(item.itemType=='suspensionState_switch'){
  165 + trackButtonClick("settingPagePlayerFloatingWindowSwitchClick")
166 //悬浮窗 166 //悬浮窗
167 SPHelper.default.save(SpConstants.SETTING_SUSPENSION_SWITCH,isOn) 167 SPHelper.default.save(SpConstants.SETTING_SUSPENSION_SWITCH,isOn)
168 } 168 }
@@ -214,13 +214,16 @@ export struct MineSettingComponent { @@ -214,13 +214,16 @@ export struct MineSettingComponent {
214 .height('54lpx') 214 .height('54lpx')
215 .onClick(() => { 215 .onClick(() => {
216 if (item.itemType == 'account') { 216 if (item.itemType == 'account') {
  217 + trackButtonClick("settingPageAccountManagement")
217 let params: Params = { 218 let params: Params = {
218 pageID: 'AccountAndSecurityLayout' 219 pageID: 'AccountAndSecurityLayout'
219 } 220 }
220 WDRouterRule.jumpWithPage(WDRouterPage.settingPage, params) 221 WDRouterRule.jumpWithPage(WDRouterPage.settingPage, params)
221 } else if (item.itemType == 'private_setting') { 222 } else if (item.itemType == 'private_setting') {
222 WDRouterRule.jumpWithPage(WDRouterPage.privacySettingPage) 223 WDRouterRule.jumpWithPage(WDRouterPage.privacySettingPage)
  224 + trackButtonClick("settingPagePrivacySettings")
223 } else if (item.itemType == 'clear_cache') { 225 } else if (item.itemType == 'clear_cache') {
  226 + trackButtonClick("settingPageClearCache")
224 this.dialogController.open() 227 this.dialogController.open()
225 } 228 }
226 }) 229 })
@@ -264,3 +267,7 @@ export struct MineSettingComponent { @@ -264,3 +267,7 @@ export struct MineSettingComponent {
264 this.preferences.on('change', observer); 267 this.preferences.on('change', observer);
265 } 268 }
266 } 269 }
  270 +
  271 +function trackButtonClick(buttonName: string){
  272 + TrackingButton.click(buttonName, TrackConstants.PageName.Setting, TrackConstants.PageName.Setting)
  273 +}
@@ -73,7 +73,7 @@ export struct OperRowListView { @@ -73,7 +73,7 @@ export struct OperRowListView {
73 @Prop operationButtonList?: string[] = ['comment', 'collect', 'share'] // 组件展示条件 73 @Prop operationButtonList?: string[] = ['comment', 'collect', 'share'] // 组件展示条件
74 @State needLike: boolean = true 74 @State needLike: boolean = true
75 @ObjectLink publishCommentModel: publishCommentModel 75 @ObjectLink publishCommentModel: publishCommentModel
76 - @State styleType: number = 1 76 + @State styleType: number = -1
77 @State showCommentIcon: boolean = true 77 @State showCommentIcon: boolean = true
78 @State bgColor: ResourceColor = Color.White 78 @State bgColor: ResourceColor = Color.White
79 @State interactData: InteractDataDTO = {} as InteractDataDTO 79 @State interactData: InteractDataDTO = {} as InteractDataDTO
@@ -380,12 +380,13 @@ export struct OperRowListView { @@ -380,12 +380,13 @@ export struct OperRowListView {
380 { 380 {
381 contentId: this.contentDetailData?.newsId + '', 381 contentId: this.contentDetailData?.newsId + '',
382 contentType: this.contentDetailData?.newsType + '', 382 contentType: this.contentDetailData?.newsType + '',
  383 + contentRelId: this.contentDetailData?.reLInfo?.relId + '',
383 } 384 }
384 ] 385 ]
385 } 386 }
386 // console.info(TAG, '查询用户对作品收藏11', JSON.stringify(params)) 387 // console.info(TAG, '查询用户对作品收藏11', JSON.stringify(params))
387 let data = await MultiPictureDetailViewModel.getInteractDataStatus(params) 388 let data = await MultiPictureDetailViewModel.getInteractDataStatus(params)
388 - // console.info(TAG, '查询用户对作品收藏22', JSON.stringify(data)) 389 + console.info(TAG, '查询用户对作品收藏22', JSON.stringify(data))
389 this.newsStatusOfUser = data[0]; 390 this.newsStatusOfUser = data[0];
390 } catch (exception) { 391 } catch (exception) {
391 // console.error(TAG, JSON.stringify(exception)) 392 // console.error(TAG, JSON.stringify(exception))
@@ -399,6 +400,7 @@ export struct OperRowListView { @@ -399,6 +400,7 @@ export struct OperRowListView {
399 console.log(TAG, '收藏点击') 400 console.log(TAG, '收藏点击')
400 // 未登录，跳转登录 401 // 未登录，跳转登录
401 const user_id = await SPHelper.default.get(SpConstants.USER_ID, '') 402 const user_id = await SPHelper.default.get(SpConstants.USER_ID, '')
  403 + console.log(TAG, '收藏点击，登录', user_id)
402 if (!user_id) { 404 if (!user_id) {
403 console.log(TAG, '收藏点击，用户未登录') 405 console.log(TAG, '收藏点击，用户未登录')
404 WDRouterRule.jumpWithPage(WDRouterPage.loginPage) 406 WDRouterRule.jumpWithPage(WDRouterPage.loginPage)
@@ -414,9 +416,10 @@ export struct OperRowListView { @@ -414,9 +416,10 @@ export struct OperRowListView {
414 }], 416 }],
415 417
416 } 418 }
417 - console.log(TAG, '收藏点击', JSON.stringify(params)) 419 + // console.log(TAG, '收藏点击', JSON.stringify(params))
418 PageRepository.postExecuteCollectRecord(params).then(res => { 420 PageRepository.postExecuteCollectRecord(params).then(res => {
419 console.log(TAG, '收藏点击 res', JSON.stringify(res)) 421 console.log(TAG, '收藏点击 res', JSON.stringify(res))
  422 + console.log(TAG, '收藏点击 this.newsStatusOfUser', JSON.stringify(this.newsStatusOfUser))
420 if (this.newsStatusOfUser) { 423 if (this.newsStatusOfUser) {
421 this.newsStatusOfUser.collectStatus = this.newsStatusOfUser?.collectStatus === 1 ? 0 : 1 424 this.newsStatusOfUser.collectStatus = this.newsStatusOfUser?.collectStatus === 1 ? 0 : 1
422 if (this.newsStatusOfUser.collectStatus === 1) { 425 if (this.newsStatusOfUser.collectStatus === 1) {
@@ -724,6 +724,31 @@ class MinePageDatasModel{ @@ -724,6 +724,31 @@ class MinePageDatasModel{
724 return WDHttp.get<ResponseDTO<String>>(url) 724 return WDHttp.get<ResponseDTO<String>>(url)
725 }; 725 };
726 726
  727 +
  728 + /**
  729 + * 预约消息 查询详情
  730 + * @returns
  731 + */
  732 + getAssertDetailData(relId:string,contentId:string,relType:string): Promise<String> {
  733 + return new Promise<String>((success, error) => {
  734 + this.fetchAssertDetailData(relId,contentId,relType).then((navResDTO: ResponseDTO<String>) => {
  735 + console.log(TAG,JSON.stringify(navResDTO))
  736 + if (!navResDTO || StringUtils.isEmpty(navResDTO.data)) {
  737 + success("0");
  738 + return
  739 + }
  740 + success("1");
  741 + }).catch((err: Error) => {
  742 + error(err)
  743 + })
  744 + })
  745 + }
  746 +
  747 + fetchAssertDetailData(relId:string,contentId:string,relType:string) {
  748 + let url = HttpUrlUtils.getHost() + HttpUrlUtils.DETAIL_PATH + `?relId=${relId}&contentId=${contentId}&relType=${relType}`
  749 + return WDHttp.get<ResponseDTO<String>>(url)
  750 + };
  751 +
727 } 752 }
728 753
729 const minePageDatasModel = MinePageDatasModel.getInstance() 754 const minePageDatasModel = MinePageDatasModel.getInstance()
@@ -85,7 +85,7 @@ export interface IStatusContentList { @@ -85,7 +85,7 @@ export interface IStatusContentList {
85 85
86 // relType: string; 86 // relType: string;
87 contentType: string; 87 contentType: string;
88 - // contentRelId: string; 88 + contentRelId: string;
89 } 89 }
90 90
91 export interface batchLikeAndCollectParams { 91 export interface batchLikeAndCollectParams {
@@ -15,7 +15,7 @@ @@ -15,7 +15,7 @@
15 "wdNetwork": "file:../../commons/wdNetwork", 15 "wdNetwork": "file:../../commons/wdNetwork",
16 "wdConstant": "file:../../commons/wdConstant", 16 "wdConstant": "file:../../commons/wdConstant",
17 "wdDetailPlayApi": "file:../../features/wdDetailPlayApi", 17 "wdDetailPlayApi": "file:../../features/wdDetailPlayApi",
18 - // "wdComponent": "file:../../features/wdComponent" 18 + "wdComponent": "file:../../features/wdComponent",
19 "wdShare": "file:../../features/wdShare" 19 "wdShare": "file:../../features/wdShare"
20 } 20 }
21 } 21 }
@@ -112,6 +112,7 @@ export struct DetailPlayShortVideoPage { @@ -112,6 +112,7 @@ export struct DetailPlayShortVideoPage {
112 { 112 {
113 contentId: this.contentDetailData?.newsId + '', 113 contentId: this.contentDetailData?.newsId + '',
114 contentType: this.contentDetailData?.newsType + '', 114 contentType: this.contentDetailData?.newsType + '',
  115 + contentRelId: this.contentDetailData?.reLInfo?.relId + '',
115 } 116 }
116 ] 117 ]
117 } 118 }
@@ -97,6 +97,7 @@ export struct DetailDialog { @@ -97,6 +97,7 @@ export struct DetailDialog {
97 contentDetailData: this.contentDetailData, 97 contentDetailData: this.contentDetailData,
98 publishCommentModel: this.publishCommentModel, 98 publishCommentModel: this.publishCommentModel,
99 showCommentIcon: true, 99 showCommentIcon: true,
  100 + styleType: 1,
100 onBack: () => { 101 onBack: () => {
101 WindowModel.shared.setWindowLayoutFullScreen(false) 102 WindowModel.shared.setWindowLayoutFullScreen(false)
102 WindowModel.shared.setWindowSystemBarProperties({ statusBarContentColor: '#000000', }) 103 WindowModel.shared.setWindowSystemBarProperties({ statusBarContentColor: '#000000', })
1 -import { BottomNavigationComponent, LogoutViewModel, PermissionDesComponent } from 'wdComponent'; 1 +import { LogoutViewModel, PermissionDesComponent } from 'wdComponent';
2 import { BreakpointConstants } from 'wdConstant'; 2 import { BreakpointConstants } from 'wdConstant';
3 3
4 import { common } from '@kit.AbilityKit'; 4 import { common } from '@kit.AbilityKit';
@@ -8,6 +8,7 @@ import { UpgradeTipDialog } from "./upgradePage/UpgradeTipDialog" @@ -8,6 +8,7 @@ import { UpgradeTipDialog } from "./upgradePage/UpgradeTipDialog"
8 import { ProcessUtils } from 'wdRouter/Index'; 8 import { ProcessUtils } from 'wdRouter/Index';
9 import { StartupManager } from '../startupmanager/StartupManager'; 9 import { StartupManager } from '../startupmanager/StartupManager';
10 import { BusinessError } from '@kit.BasicServicesKit'; 10 import { BusinessError } from '@kit.BasicServicesKit';
  11 +import { BottomNavigationComponent } from './view/BottomNavigationComponent';
11 12
12 const TAG = 'MainPage'; 13 const TAG = 'MainPage';
13 14
1 import { Logger } from 'wdKit'; 1 import { Logger } from 'wdKit';
2 -import { MultiPictureDetailPageComponent } from 'wdComponent';  
3 import router from '@ohos.router'; 2 import router from '@ohos.router';
4 import { Params, Action } from 'wdBean'; 3 import { Params, Action } from 'wdBean';
5 import { WindowModel } from 'wdKit/Index'; 4 import { WindowModel } from 'wdKit/Index';
  5 +import { MultiPictureDetailPageComponent } from '../view/MultiPictureDetailPageComponent';
  6 +
6 const TAG = 'MultiPictureDetailPage'; 7 const TAG = 'MultiPictureDetailPage';
7 8
8 /** 9 /**
1 import { BottomNavi, CommonConstants, DisplayDirection } from 'wdConstant'; 1 import { BottomNavi, CommonConstants, DisplayDirection } from 'wdConstant';
2 import { BottomNavDTO, NavigationBodyDTO, NavigationDetailDTO, TopNavDTO } from 'wdBean'; 2 import { BottomNavDTO, NavigationBodyDTO, NavigationDetailDTO, TopNavDTO } from 'wdBean';
3 import { EmitterEventId, EmitterUtils, Logger, StringUtils } from 'wdKit'; 3 import { EmitterEventId, EmitterUtils, Logger, StringUtils } from 'wdKit';
4 -import { TopNavigationComponent } from './TopNavigationComponent';  
5 -import { MinePageComponent } from './MinePageComponent';  
6 -import { CompUtils } from '../../utils/CompUtils';  
7 -import ChannelViewModel from '../../viewmodel/ChannelViewModel';  
8 -import HomeChannelUtils, { AssignChannelParam } from 'wdRouter';  
9 -import { VideoChannelPage } from './VideoChannelPage';  
10 import { HttpUtils } from 'wdNetwork/Index'; 4 import { HttpUtils } from 'wdNetwork/Index';
  5 +import HomeChannelUtils, { AssignChannelParam } from 'wdRouter/Index';
  6 +import { MinePageComponent } from 'wdComponent/src/main/ets/components/page/MinePageComponent';
  7 +import { CompUtils, TopNavigationComponent } from 'wdComponent/Index';
  8 +import { VideoChannelPage } from './VideoChannelPage';
  9 +import ChannelViewModel from 'wdComponent/src/main/ets/viewmodel/ChannelViewModel';
11 10
12 const TAG = 'BottomNavigationComponent'; 11 const TAG = 'BottomNavigationComponent';
13 let storage = LocalStorage.getShared(); 12 let storage = LocalStorage.getShared();
@@ -8,23 +8,21 @@ import { @@ -8,23 +8,21 @@ import {
8 postInteractAccentionOperateParams, 8 postInteractAccentionOperateParams,
9 Params 9 Params
10 } from 'wdBean'; 10 } from 'wdBean';
11 -import { MultiPictureDetailViewModel } from '../viewmodel/MultiPictureDetailViewModel';  
12 import display from '@ohos.display'; 11 import display from '@ohos.display';
13 -import font from '@ohos.font';  
14 -import { OperRowListView } from './view/OperRowListView';  
15 -import { MultiPictureDetailItemComponent } from './MultiPictureDetailItemComponent';  
16 -import { ImageDownloadComponent } from '../components/ImageDownloadComponent';  
17 -import { publishCommentModel } from '../components/comment/model/PublishCommentModel';  
18 -import { EmptyComponent } from './view/EmptyComponent';  
19 import { DateTimeUtils } from 'wdKit/Index'; 12 import { DateTimeUtils } from 'wdKit/Index';
20 -import { HttpUrlUtils } from 'wdNetwork/Index';  
21 import { WDRouterPage, WDRouterRule } from 'wdRouter/Index'; 13 import { WDRouterPage, WDRouterRule } from 'wdRouter/Index';
22 -import { PageRepository } from '../repository/PageRepository';  
23 import { SpConstants } from 'wdConstant/Index'; 14 import { SpConstants } from 'wdConstant/Index';
24 import { router } from '@kit.ArkUI'; 15 import { router } from '@kit.ArkUI';
25 -import { viewBlogItemInsightIntentShare } from '../utils/InsightIntentShare'  
26 import { common } from '@kit.AbilityKit'; 16 import { common } from '@kit.AbilityKit';
27 import { CommentDialogView } from 'wdDetailPlayShortVideo/Index'; 17 import { CommentDialogView } from 'wdDetailPlayShortVideo/Index';
  18 +import { EmptyComponent,
  19 + ImageDownloadComponent,
  20 + MultiPictureDetailItemComponent,
  21 + MultiPictureDetailViewModel,
  22 + OperRowListView,
  23 + PageRepository,
  24 + publishCommentModel,
  25 + viewBlogItemInsightIntentShare} from 'wdComponent/Index';
28 26
29 const TAG = 'MultiPictureDetailPageComponent'; 27 const TAG = 'MultiPictureDetailPageComponent';
30 28
@@ -4,9 +4,9 @@ @@ -4,9 +4,9 @@
4 */ 4 */
5 import { BottomNavDTO, TopNavDTO } from 'wdBean/Index' 5 import { BottomNavDTO, TopNavDTO } from 'wdBean/Index'
6 import { VideoChannelDetail } from 'wdDetailPlayShortVideo/Index'; 6 import { VideoChannelDetail } from 'wdDetailPlayShortVideo/Index';
7 -import { PageComponent } from './PageComponent';  
8 import { WDRouterPage, WDRouterRule } from 'wdRouter'; 7 import { WDRouterPage, WDRouterRule } from 'wdRouter';
9 import { DisplayDirection } from 'wdConstant/Index'; 8 import { DisplayDirection } from 'wdConstant/Index';
  9 +import { PageComponent } from 'wdComponent/Index';
10 10
11 const TAG = 'VideoChannelPage' 11 const TAG = 'VideoChannelPage'
12 12