developOne / harmonyPool

Go to a project
Toggle navigation Toggle navigation pinning
liyubing
dd840814 2 parents c0a2ce38 907cc78a

Merge remote-tracking branch 'origin/main'

Inline Side-by-side
Showing 5 changed files with 91 additions and 14 deletions
@@ -135,7 +135,7 @@ export struct CompParser { @@ -135,7 +135,7 @@ export struct CompParser {
135 } else if (this.compDTO.compStyle === CompStyle.Zh_Single_Column_09) { 135 } else if (this.compDTO.compStyle === CompStyle.Zh_Single_Column_09) {
136 Divider().strokeWidth(3).color('#ffffff').padding({ left: 0, right: 0 }).margin({ top: -3 }) 136 Divider().strokeWidth(3).color('#ffffff').padding({ left: 0, right: 0 }).margin({ top: -3 })
137 Divider().strokeWidth(6).color('#f5f5f5') 137 Divider().strokeWidth(6).color('#f5f5f5')
138 - ZhSingleColumn09({ compDTO: this.compDTO }) 138 + ZhSingleColumn09({ compDTO: this.compDTO, pageId: this.pageId, pageName: this.pageName })
139 Divider().strokeWidth(6).color('#f5f5f5') 139 Divider().strokeWidth(6).color('#f5f5f5')
140 } else if (this.compDTO.compStyle === CompStyle.Card_Comp_Adv) { // 广告 140 } else if (this.compDTO.compStyle === CompStyle.Card_Comp_Adv) { // 广告
141 AdvCardParser({ pageModel: this.pageModel, compDTO: this.compDTO }) 141 AdvCardParser({ pageModel: this.pageModel, compDTO: this.compDTO })
@@ -23,6 +23,7 @@ const testString = '因为读书的人\n是低ç€å¤´å‘上看的人\nèº«å¤„ä¸€éš @@ -23,6 +23,7 @@ const testString = '因为读书的人\n是低ç€å¤´å‘上看的人\n身处一éš
23 export struct CommentComponent { 23 export struct CommentComponent {
24 private onCloseClick = () => { 24 private onCloseClick = () => {
25 } 25 }
  26 + showTitleComponent: boolean = true
26 @Prop showCloseIcon?: boolean = false 27 @Prop showCloseIcon?: boolean = false
27 @State hasMore: boolean = true; 28 @State hasMore: boolean = true;
28 @State currentPage: number = 1; 29 @State currentPage: number = 1;
@@ -168,7 +169,9 @@ export struct CommentComponent { @@ -168,7 +169,9 @@ export struct CommentComponent {
168 build() { 169 build() {
169 Column() { 170 Column() {
170 List({ scroller: this.listScroller }) { 171 List({ scroller: this.listScroller }) {
171 - ListItemGroup({ header: this.titleHeader() }) 172 + if (this.showTitleComponent) {
  173 + ListItemGroup({ header: this.titleHeader() })
  174 + }
172 175
173 if (!this.isComments) { 176 if (!this.isComments) {
174 EmptyComponent({ emptyType: 17 }) 177 EmptyComponent({ emptyType: 17 })
@@ -88,17 +88,13 @@ struct CommentListDialog { @@ -88,17 +88,13 @@ struct CommentListDialog {
88 88
89 build() { 89 build() {
90 Column() { 90 Column() {
  91 + this.titleHeaderView()
  92 +
91 CommentComponent({ 93 CommentComponent({
92 publishCommentModel: this.publishCommentModel, 94 publishCommentModel: this.publishCommentModel,
93 - showCloseIcon: true,  
94 fixedHeightMode: true, 95 fixedHeightMode: true,
95 - onCloseClick: () => {  
96 - this.controller!.close()  
97 - if (this.onClose) {  
98 - this.onClose()  
99 - }  
100 - },  
101 - inDialog: true 96 + inDialog: true,
  97 + showTitleComponent: false
102 }).layoutWeight(1) 98 }).layoutWeight(1)
103 99
104 OperRowListView({ 100 OperRowListView({
@@ -119,4 +115,33 @@ struct CommentListDialog { @@ -119,4 +115,33 @@ struct CommentListDialog {
119 .height(this.windowHeight - this.windowWidth * 9 / 16 + 'px') 115 .height(this.windowHeight - this.windowWidth * 9 / 16 + 'px')
120 .backgroundColor(Color.White) 116 .backgroundColor(Color.White)
121 } 117 }
  118 +
  119 + @Builder titleHeaderView() {
  120 + Row() {
  121 + Row() {
  122 + Image($r('app.media.redLine'))
  123 + .height(16)
  124 + .width(3)
  125 + Text('全部评论')
  126 + .fontSize(18)// .fontColor('#222222')
  127 + .fontColor($r('app.color.color_222222'))
  128 + .fontWeight(FontWeight.Medium)
  129 + .margin({ left: 5 })
  130 + }
  131 + .margin({ left: 16 })
  132 +
  133 + Image($r('app.media.close_button'))
  134 + .height(16)
  135 + .width(16)
  136 + .margin({ right: 16 })// .visibility(this.showCloseIcon ? Visibility.Visible : Visibility.Hidden)
  137 + .onClick(() => {
  138 + if (this.onClose) {
  139 + this.onClose()
  140 + }
  141 + })
  142 + }
  143 + .height(44)
  144 + .width('100%')
  145 + .justifyContent(FlexAlign.SpaceBetween)
  146 + }
122 } 147 }
@@ -5,6 +5,8 @@ import { postInteractAccentionOperateParams } from 'wdBean'; @@ -5,6 +5,8 @@ import { postInteractAccentionOperateParams } from 'wdBean';
5 import { PageRepository } from '../../repository/PageRepository'; 5 import { PageRepository } from '../../repository/PageRepository';
6 import { CommonConstants } from 'wdConstant/Index'; 6 import { CommonConstants } from 'wdConstant/Index';
7 import { onlyWifiLoadImg } from '../../utils/lazyloadImg'; 7 import { onlyWifiLoadImg } from '../../utils/lazyloadImg';
  8 +import { Tracking, TrackingContent, TrackConstants, ParamType } from 'wdTracking';
  9 +import { TrackingUtils } from 'wdTracking/src/main/ets/common/TrackingUtils'
8 /** 10 /**
9 * 兴趣卡 11 * 兴趣卡
10 * Zh_Single_Column-09 12 * Zh_Single_Column-09
@@ -14,6 +16,8 @@ const TAG = 'Zh_Single_Column-09' @@ -14,6 +16,8 @@ const TAG = 'Zh_Single_Column-09'
14 @Entry 16 @Entry
15 @Component 17 @Component
16 export struct ZhSingleColumn09 { 18 export struct ZhSingleColumn09 {
  19 + @State pageId: string = '';
  20 + @State pageName: string = '';
17 @State compDTO: CompDTO = {} as CompDTO 21 @State compDTO: CompDTO = {} as CompDTO
18 @State activeIndexs: Array<number> = [] 22 @State activeIndexs: Array<number> = []
19 @State operDataList: ContentDTO[] = this.compDTO?.operDataList || [] 23 @State operDataList: ContentDTO[] = this.compDTO?.operDataList || []
@@ -25,6 +29,43 @@ export struct ZhSingleColumn09 { @@ -25,6 +29,43 @@ export struct ZhSingleColumn09 {
25 this.operDataList = this.shuffleArray(this.compDTO?.operDataList) 29 this.operDataList = this.shuffleArray(this.compDTO?.operDataList)
26 } 30 }
27 31
  32 + trackClick(type: 'close_interest_card_click' | 'interest_card_selecting_click') {
  33 + try {
  34 + const contentDTO = this.compDTO.operDataList[0];
  35 + const extParams: ParamType = {
  36 + 'value': type === 'close_interest_card_click' ? 'closeInterestCard' : 'selectInterestCard',
  37 + 'duration': 0,
  38 + 'action': 'detailPageShow',
  39 + 'shareChannel': '',
  40 + 'contentName': '兴趣选项卡',
  41 + 'contentType': this.compDTO.objectType || '',
  42 + 'contentId': this.compDTO.objectId,
  43 + // 'channelSourceId': this.compDTO.channelId,
  44 + // 'contentShowChannelId': this.compDTO.channelId,
  45 + 'regionName': 2, // 信息流：2
  46 + 'componentType': this.compDTO.compStyle,
  47 + 'sceneId': contentDTO.sceneId,
  48 + 'subSceneId': contentDTO.subSceneId,
  49 + 'cnsTraceId': contentDTO.cnsTraceId,
  50 + 'cardItemId': this.compDTO.cardItemId,
  51 + 'itemId': this.compDTO.itemId || contentDTO.itemId,
  52 + 'expIds': this.compDTO.expIds || contentDTO.expIds,
  53 + }
  54 + if (type === 'interest_card_selecting_click') {
  55 + // extParams['interestOptions'] = this.operDataList.map(item => {
  56 + // return item.
  57 + // })
  58 + }
  59 + let params = TrackingUtils.generateParams(extParams);
  60 + params['pageId'] = this.pageId;
  61 + params['pageName'] = this.pageName;
  62 + TrackingUtils.fillPositionWith(params)
  63 + Tracking.event(type, params)
  64 + } catch (e) {
  65 + console.log('Zh_Single_Column-09', JSON.stringify(e))
  66 + }
  67 + }
  68 +
28 getItemWidth(index: number) { 69 getItemWidth(index: number) {
29 if (index % 4 === 0 || index % 4 === 3) { 70 if (index % 4 === 0 || index % 4 === 3) {
30 return 80 71 return 80
@@ -73,6 +114,7 @@ export struct ZhSingleColumn09 { @@ -73,6 +114,7 @@ export struct ZhSingleColumn09 {
73 .margin({top: -10}) 114 .margin({top: -10})
74 .padding({top: 0, bottom: 0, left: 0, right: 0}) 115 .padding({top: 0, bottom: 0, left: 0, right: 0})
75 .onClick(() => { 116 .onClick(() => {
  117 + this.trackClick('interest_card_selecting_click')
76 if (this.activeIndexs.length > 0) { 118 if (this.activeIndexs.length > 0) {
77 this.selfClosed = true; 119 this.selfClosed = true;
78 } 120 }
@@ -142,6 +184,7 @@ export struct ZhSingleColumn09 { @@ -142,6 +184,7 @@ export struct ZhSingleColumn09 {
142 .width(14) 184 .width(14)
143 .height(14) 185 .height(14)
144 .onClick(() => { 186 .onClick(() => {
  187 + this.trackClick('close_interest_card_click')
145 this.selfClosed = true; 188 this.selfClosed = true;
146 }) 189 })
147 } 190 }
@@ -144,10 +144,11 @@ struct LoginPage { @@ -144,10 +144,11 @@ struct LoginPage {
144 Text("登录") 144 Text("登录")
145 .borderRadius(4) 145 .borderRadius(4)
146 .fontColor(this.isSubmit ? "#FFFFFFFF" : "#66FFFFFF") 146 .fontColor(this.isSubmit ? "#FFFFFFFF" : "#66FFFFFF")
147 - .fontSize(18)  
148 - .fontWeight(FontWeight.Medium) 147 + .fontSize("31lpx")
  148 + .fontWeight(400)
149 .margin({ top: 20 }) 149 .margin({ top: 20 })
150 - .height(44) 150 + .lineHeight("50lpx")
  151 + .height(44)
151 .textAlign(TextAlign.Center) 152 .textAlign(TextAlign.Center)
152 .width("100%") 153 .width("100%")
153 .backgroundColor(this.isSubmit ? "#FFED2800" : "#99ED2800") 154 .backgroundColor(this.isSubmit ? "#FFED2800" : "#99ED2800")
@@ -167,7 +168,12 @@ struct LoginPage { @@ -167,7 +168,12 @@ struct LoginPage {
167 168
168 169
169 if (!this.checkCodePage) { 170 if (!this.checkCodePage) {
170 - Text('忘记密码').fontColor('#666666').fontSize(14).margin({ top: 16 }) 171 + Text('忘记密码')
  172 + .fontColor('#666666')
  173 + .fontSize("31lpx")
  174 + .fontWeight(400)
  175 + .lineHeight("38lpx")
  176 + .margin({ top: 16 })
171 .onClick(() => { 177 .onClick(() => {
172 TrackingButton.click("loginPageForgotPassword",TrackConstants.PageName.Login_Page,TrackConstants.PageName.Login_Page) 178 TrackingButton.click("loginPageForgotPassword",TrackConstants.PageName.Login_Page,TrackConstants.PageName.Login_Page)
173 if(StringUtils.isNotEmpty(this.accountContent) && StringUtils.photoMatch(this.accountContent)){ 179 if(StringUtils.isNotEmpty(this.accountContent) && StringUtils.photoMatch(this.accountContent)){