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 89 additions and 12 deletions
... ... @@ -135,7 +135,7 @@ export struct CompParser {
} else if (this.compDTO.compStyle === CompStyle.Zh_Single_Column_09) {
Divider().strokeWidth(3).color('#ffffff').padding({ left: 0, right: 0 }).margin({ top: -3 })
Divider().strokeWidth(6).color('#f5f5f5')
ZhSingleColumn09({ compDTO: this.compDTO })
ZhSingleColumn09({ compDTO: this.compDTO, pageId: this.pageId, pageName: this.pageName })
Divider().strokeWidth(6).color('#f5f5f5')
} else if (this.compDTO.compStyle === CompStyle.Card_Comp_Adv) { // 广告
AdvCardParser({ pageModel: this.pageModel, compDTO: this.compDTO })
... ...
... ... @@ -23,6 +23,7 @@ const testString = '因为读书的人\n是低ç€å¤´å‘上看的人\n身处一éš
export struct CommentComponent {
private onCloseClick = () => {
}
showTitleComponent: boolean = true
@Prop showCloseIcon?: boolean = false
@State hasMore: boolean = true;
@State currentPage: number = 1;
... ... @@ -168,7 +169,9 @@ export struct CommentComponent {
build() {
Column() {
List({ scroller: this.listScroller }) {
if (this.showTitleComponent) {
ListItemGroup({ header: this.titleHeader() })
}
if (!this.isComments) {
EmptyComponent({ emptyType: 17 })
... ...
... ... @@ -88,17 +88,13 @@ struct CommentListDialog {
build() {
Column() {
this.titleHeaderView()
CommentComponent({
publishCommentModel: this.publishCommentModel,
showCloseIcon: true,
fixedHeightMode: true,
onCloseClick: () => {
this.controller!.close()
if (this.onClose) {
this.onClose()
}
},
inDialog: true
inDialog: true,
showTitleComponent: false
}).layoutWeight(1)
OperRowListView({
... ... @@ -119,4 +115,33 @@ struct CommentListDialog {
.height(this.windowHeight - this.windowWidth * 9 / 16 + 'px')
.backgroundColor(Color.White)
}
@Builder titleHeaderView() {
Row() {
Row() {
Image($r('app.media.redLine'))
.height(16)
.width(3)
Text('全部评论')
.fontSize(18)// .fontColor('#222222')
.fontColor($r('app.color.color_222222'))
.fontWeight(FontWeight.Medium)
.margin({ left: 5 })
}
.margin({ left: 16 })
Image($r('app.media.close_button'))
.height(16)
.width(16)
.margin({ right: 16 })// .visibility(this.showCloseIcon ? Visibility.Visible : Visibility.Hidden)
.onClick(() => {
if (this.onClose) {
this.onClose()
}
})
}
.height(44)
.width('100%')
.justifyContent(FlexAlign.SpaceBetween)
}
}
\ No newline at end of file
... ...
... ... @@ -5,6 +5,8 @@ import { postInteractAccentionOperateParams } from 'wdBean';
import { PageRepository } from '../../repository/PageRepository';
import { CommonConstants } from 'wdConstant/Index';
import { onlyWifiLoadImg } from '../../utils/lazyloadImg';
import { Tracking, TrackingContent, TrackConstants, ParamType } from 'wdTracking';
import { TrackingUtils } from 'wdTracking/src/main/ets/common/TrackingUtils'
/**
* 兴趣卡
* Zh_Single_Column-09
... ... @@ -14,6 +16,8 @@ const TAG = 'Zh_Single_Column-09'
@Entry
@Component
export struct ZhSingleColumn09 {
@State pageId: string = '';
@State pageName: string = '';
@State compDTO: CompDTO = {} as CompDTO
@State activeIndexs: Array<number> = []
@State operDataList: ContentDTO[] = this.compDTO?.operDataList || []
... ... @@ -25,6 +29,43 @@ export struct ZhSingleColumn09 {
this.operDataList = this.shuffleArray(this.compDTO?.operDataList)
}
trackClick(type: 'close_interest_card_click' | 'interest_card_selecting_click') {
try {
const contentDTO = this.compDTO.operDataList[0];
const extParams: ParamType = {
'value': type === 'close_interest_card_click' ? 'closeInterestCard' : 'selectInterestCard',
'duration': 0,
'action': 'detailPageShow',
'shareChannel': '',
'contentName': '兴趣选项卡',
'contentType': this.compDTO.objectType || '',
'contentId': this.compDTO.objectId,
// 'channelSourceId': this.compDTO.channelId,
// 'contentShowChannelId': this.compDTO.channelId,
'regionName': 2, // 信息流：2
'componentType': this.compDTO.compStyle,
'sceneId': contentDTO.sceneId,
'subSceneId': contentDTO.subSceneId,
'cnsTraceId': contentDTO.cnsTraceId,
'cardItemId': this.compDTO.cardItemId,
'itemId': this.compDTO.itemId || contentDTO.itemId,
'expIds': this.compDTO.expIds || contentDTO.expIds,
}
if (type === 'interest_card_selecting_click') {
// extParams['interestOptions'] = this.operDataList.map(item => {
// return item.
// })
}
let params = TrackingUtils.generateParams(extParams);
params['pageId'] = this.pageId;
params['pageName'] = this.pageName;
TrackingUtils.fillPositionWith(params)
Tracking.event(type, params)
} catch (e) {
console.log('Zh_Single_Column-09', JSON.stringify(e))
}
}
getItemWidth(index: number) {
if (index % 4 === 0 || index % 4 === 3) {
return 80
... ... @@ -73,6 +114,7 @@ export struct ZhSingleColumn09 {
.margin({top: -10})
.padding({top: 0, bottom: 0, left: 0, right: 0})
.onClick(() => {
this.trackClick('interest_card_selecting_click')
if (this.activeIndexs.length > 0) {
this.selfClosed = true;
}
... ... @@ -142,6 +184,7 @@ export struct ZhSingleColumn09 {
.width(14)
.height(14)
.onClick(() => {
this.trackClick('close_interest_card_click')
this.selfClosed = true;
})
}
... ...
... ... @@ -144,9 +144,10 @@ struct LoginPage {
Text("登录")
.borderRadius(4)
.fontColor(this.isSubmit ? "#FFFFFFFF" : "#66FFFFFF")
.fontSize(18)
.fontWeight(FontWeight.Medium)
.fontSize("31lpx")
.fontWeight(400)
.margin({ top: 20 })
.lineHeight("50lpx")
.height(44)
.textAlign(TextAlign.Center)
.width("100%")
... ... @@ -167,7 +168,12 @@ struct LoginPage {
if (!this.checkCodePage) {
Text('忘记密码').fontColor('#666666').fontSize(14).margin({ top: 16 })
Text('忘记密码')
.fontColor('#666666')
.fontSize("31lpx")
.fontWeight(400)
.lineHeight("38lpx")
.margin({ top: 16 })
.onClick(() => {
TrackingButton.click("loginPageForgotPassword",TrackConstants.PageName.Login_Page,TrackConstants.PageName.Login_Page)
if(StringUtils.isNotEmpty(this.accountContent) && StringUtils.photoMatch(this.accountContent)){
... ...