Toggle navigation
Toggle navigation
This project
Loading...
Sign in
developOne
/
harmonyPool
Go to a project
Toggle navigation
Projects
Groups
Snippets
Help
Toggle navigation pinning
Project
Activity
Repository
Pipelines
Graphs
Issues
0
Merge Requests
0
Wiki
Network
Create a new issue
Builds
Commits
Authored by
yangchenggong1_wd
2024-10-14 15:06:53 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
7bf939358b814abd8435b9c4dfe04587294e7da3
7bf93935
1 parent
65b1d985
fix |> 20791 人民号>推荐频道,地方精选卡不应展示更多按钮,见对比截图。
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
37 additions
and
28 deletions
sight_harmony/commons/wdConstant/src/main/ets/enum/BottomNavi.ets
sight_harmony/features/wdComponent/src/main/ets/components/CompParser.ets
sight_harmony/features/wdComponent/src/main/ets/components/compview/ZhSingleRow04.ets
sight_harmony/features/wdComponent/src/main/ets/components/page/PageComponent.ets
sight_harmony/features/wdComponent/src/main/ets/components/page/template/TemplatePageComponent.ets
sight_harmony/commons/wdConstant/src/main/ets/enum/BottomNavi.ets
View file @
7bf9393
...
...
@@ -8,4 +8,5 @@ export const enum BottomNavi {
VIDEO=2,
SERVICE=3,
MINE=4,
TEMPLATE=5,
}
...
...
sight_harmony/features/wdComponent/src/main/ets/components/CompParser.ets
View file @
7bf9393
import { CompDTO, ContentDTO } from 'wdBean';
import { CommonConstants, CompStyle } from 'wdConstant/Index';
import {
BottomNavi,
CommonConstants, CompStyle } from 'wdConstant/Index';
import PageModel from '../viewmodel/PageModel';
import { CardParser } from './CardParser';
import { Card2Component } from './cardview/Card2Component';
...
...
@@ -42,6 +42,7 @@ export struct CompParser {
@State private pageModel: PageModel = new PageModel();
@State audioItems: ContentDTO[] = [];
@State noneAudioItems: ContentDTO[] = [];
bottomNavi:BottomNavi = BottomNavi.PEOPLE
aboutToAppear(): void {
...
...
@@ -167,7 +168,7 @@ export struct CompParser {
ZhGridLayout03({ compDTO: this.compDTO, pageId: this.pageId, pageName: this.pageName, loadImg: this.pageModel.loadImg })
this.getBehindDivider()
} else if (this.compDTO.compStyle === CompStyle.Zh_Single_Row_04) {
ZhSingleRow04({ compDTO: this.compDTO, pageId: this.pageId, pageName: this.pageName, loadImg: this.pageModel.loadImg })
ZhSingleRow04({ compDTO: this.compDTO, pageId: this.pageId, pageName: this.pageName, loadImg: this.pageModel.loadImg
,bottomNavi:this.bottomNavi
})
this.getBehindDivider()
} else if (this.compDTO.compStyle === CompStyle.Zh_Single_Row_05) {
// ZhSingleRow05({ compDTO })
...
...
sight_harmony/features/wdComponent/src/main/ets/components/compview/ZhSingleRow04.ets
View file @
7bf9393
import { CompDTO, ContentDTO } from 'wdBean';
import { CommonConstants } from 'wdConstant';
import {
BottomNavi,
CommonConstants } from 'wdConstant';
import { DateTimeUtils } from 'wdKit';
import { ProcessUtils } from 'wdRouter';
import { InfomationCardClick } from '../../utils/infomationCardClick';
...
...
@@ -15,6 +15,7 @@ export struct ZhSingleRow04 {
@State pageId: string = '';
@State pageName: string = '';
@State compDTO: CompDTO = {} as CompDTO
bottomNavi:BottomNavi = BottomNavi.PEOPLE
build() {
Column() {
...
...
@@ -32,30 +33,33 @@ export struct ZhSingleRow04 {
.lineHeight(25)
}
Row() {
Text("更多")
.fontSize($r("app.float.font_size_14"))
.fontColor($r("app.color.color_999999"))
.margin({ right: 1 })
Image($r("app.media.more"))
.width(14)
.height(14)
}
.visibility(this.compDTO?.objectType === '0' || this.compDTO?.objectType === '' ? Visibility.None :
Visibility.Visible)
.onClick(() => {
if (this.compDTO?.objectType === '11') {
ProcessUtils.jumpChannelTab(this.compDTO.objectId, this.compDTO.pageId as string, this.compDTO.objectTitle)
} else {
const contentDTO: ContentDTO = {
objectId: this.compDTO.objectId,
objectType: this.compDTO.objectType,
linkUrl: this.compDTO.linkUrl,
pageId: this.compDTO.pageId
} as ContentDTO
ProcessUtils.processPage(contentDTO)
if(this.bottomNavi === BottomNavi.NEWS){
Row() {
Text("更多")
.fontSize($r("app.float.font_size_14"))
.fontColor($r("app.color.color_999999"))
.margin({ right: 1 })
Image($r("app.media.more"))
.width(14)
.height(14)
}
})
.visibility(this.compDTO?.objectType === '0' || this.compDTO?.objectType === '' ? Visibility.None :
Visibility.Visible)
.onClick(() => {
if (this.compDTO?.objectType === '11') {
ProcessUtils.jumpChannelTab(this.compDTO.objectId, this.compDTO.pageId as string, this.compDTO.objectTitle)
} else {
const contentDTO: ContentDTO = {
objectId: this.compDTO.objectId,
objectType: this.compDTO.objectType,
linkUrl: this.compDTO.linkUrl,
pageId: this.compDTO.pageId
} as ContentDTO
ProcessUtils.processPage(contentDTO)
}
})
}
}
.justifyContent(FlexAlign.SpaceBetween)
.margin({ bottom: 8 })
...
...
sight_harmony/features/wdComponent/src/main/ets/components/page/PageComponent.ets
View file @
7bf9393
...
...
@@ -125,7 +125,8 @@ export struct PageComponent {
nextCompDTO: compIndex === this.pageModel.compList.getDataArray().length - 1 ? new CompDTO() : this.pageModel.compList.get(compIndex + 1) as CompDTO,
compDTO: compDTO,
compIndex: compIndex,
pageId: this.pageId
pageId: this.pageId,
bottomNavi:this.bottomNavi
}
)
}
...
...
sight_harmony/features/wdComponent/src/main/ets/components/page/template/TemplatePageComponent.ets
View file @
7bf9393
...
...
@@ -9,6 +9,7 @@ import LoadMoreLayout from '../LoadMoreLayout'
import TemplatePageHelp from './TemplatePageHelp'
import TemplatePageModel from './TemplatePageModel'
import { TemplatePageStateType } from './TemplatePageStateType'
import { BottomNavi} from 'wdConstant/Index';
const TAG: string = 'TemplatePageComponent';
...
...
@@ -126,7 +127,8 @@ export default struct TemplatePageComponent {
nextCompDTO: index === this.templatePage.compList.getDataArray().length - 1 ? new CompDTO() : this.templatePage.compList.get(index + 1) as CompDTO,
compIndex: index,
pageId: this.pageId,
pageName: this.pageName
pageName: this.pageName,
bottomNavi:BottomNavi.TEMPLATE
});
}
}
...
...
Please
register
or
login
to post a comment