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
陈剑华
2024-10-11 17:45:56 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
48ac8e5ecb72a6745c7559067d024c5b8c941925
48ac8e5e
1 parent
ce5f1b2a
feat: 20748 搜索-“钱江视频”,搜索结果切换到人民号tab,动态和单图卡视频未展示文本信息
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
14 additions
and
8 deletions
sight_harmony/features/wdBean/src/main/ets/bean/content/ContentDTO.ets
sight_harmony/features/wdComponent/src/main/ets/components/CardParser.ets
sight_harmony/features/wdComponent/src/main/ets/components/cardview/Card11Component.ets
sight_harmony/features/wdComponent/src/main/ets/components/cardview/Card20Component.ets
sight_harmony/features/wdComponent/src/main/ets/components/cardview/Card6Component.ets
sight_harmony/features/wdComponent/src/main/ets/components/cardview/SearchContentComponent.ets
sight_harmony/features/wdComponent/src/main/ets/components/search/SearchResultContentComponent.ets
sight_harmony/features/wdComponent/src/main/ets/viewmodel/SearchResultContentItem.ets
sight_harmony/features/wdBean/src/main/ets/bean/content/ContentDTO.ets
View file @
48ac8e5
...
...
@@ -22,6 +22,8 @@ export class ContentShareInfoDTO {
@Observed
export class ContentDTO implements BaseDTO {
introduction: string = '';
zhDescription: string = '';
seoTags: string = '';
cornerMark:string = '';
liveType?: string; // 直播新闻-直播状态
...
...
@@ -153,6 +155,7 @@ export class ContentDTO implements BaseDTO {
static clone(old: ContentDTO): ContentDTO {
let content = new ContentDTO();
content.zhDescription = old.zhDescription;
content.liveType = old.liveType;
content.seoTags = old.seoTags;
content.appStyle = old.appStyle;
...
...
sight_harmony/features/wdComponent/src/main/ets/components/CardParser.ets
View file @
48ac8e5
...
...
@@ -81,7 +81,7 @@ export struct CardParser {
@Builder
contentBuilder(contentDTO: ContentDTO) {
// Card6Component({ compDTO: this.compDTO, contentDTO: this.contentDTO })
if (!!contentDTO.contentText
)
{
if (!!contentDTO.contentText
|| !!contentDTO.zhDescription || !!contentDTO.introduction)
{
SearchContentComponent({
contentDTO,
compDTO: this.compDTO,
...
...
sight_harmony/features/wdComponent/src/main/ets/components/cardview/Card11Component.ets
View file @
48ac8e5
...
...
@@ -33,7 +33,7 @@ export struct Card11Component {
}
titleInit() {
const titleInitRes:titleInitRes = SearchShowRed.titleInit(this.contentDTO.title);
const titleInitRes:titleInitRes = SearchShowRed.titleInit(this.contentDTO.title
|| this.contentDTO.newsTitle
);
this.titleMarked = titleInitRes.titleMarked;
this.textArr = titleInitRes.textArr;
}
...
...
sight_harmony/features/wdComponent/src/main/ets/components/cardview/Card20Component.ets
View file @
48ac8e5
...
...
@@ -36,7 +36,7 @@ export struct Card20Component {
}
titleInit() {
const titleInitRes:titleInitRes = SearchShowRed.titleInit(this.contentDTO.title);
const titleInitRes:titleInitRes = SearchShowRed.titleInit(this.contentDTO.title
|| this.contentDTO.newsTitle
);
this.titleMarked = titleInitRes.titleMarked;
this.textArr = titleInitRes.textArr;
}
...
...
@@ -55,7 +55,7 @@ export struct Card20Component {
isPeopleShipHome:this.isPeopleShipHome, loadImg: this.loadImg
}
) // 标题
if (this.contentDTO.newsTitle) {
if (this.contentDTO.
title || this.contentDTO.
newsTitle) {
Stack() {
if(this.contentDTO.objectType == '5'){
Notes({ objectType: this.contentDTO.objectType,objectLevel:this.contentDTO.objectLevel }).height(29).align(Alignment.Center)
...
...
sight_harmony/features/wdComponent/src/main/ets/components/cardview/Card6Component.ets
View file @
48ac8e5
...
...
@@ -36,7 +36,7 @@ export struct Card6Component {
}
titleInit() {
const titleInitRes:titleInitRes = SearchShowRed.titleInit(this.contentDTO.title);
const titleInitRes:titleInitRes = SearchShowRed.titleInit(this.contentDTO.title
|| this.contentDTO.newsTitle
);
this.titleMarked = titleInitRes.titleMarked;
this.textArr = titleInitRes.textArr;
}
...
...
@@ -80,7 +80,7 @@ export struct Card6Component {
}
})
} else {
Span(this.contentDTO.newsTitle)
Span(this.contentDTO.newsTitle
|| this.contentDTO.title
)
}
}
.fontColor(this.clicked ? 0x848484 : 0x222222)
...
...
sight_harmony/features/wdComponent/src/main/ets/components/cardview/SearchContentComponent.ets
View file @
48ac8e5
...
...
@@ -34,7 +34,7 @@ export struct SearchContentComponent {
}
titleInit() {
const titleInitRes:titleInitRes = SearchShowRed.titleInit(this.contentDTO.contentText ||
''
);
const titleInitRes:titleInitRes = SearchShowRed.titleInit(this.contentDTO.contentText ||
this.contentDTO.zhDescription || this.contentDTO.introduction
);
// this.titleMarked = titleInitRes.titleMarked;
this.textArr = titleInitRes.textArr;
}
...
...
sight_harmony/features/wdComponent/src/main/ets/components/search/SearchResultContentComponent.ets
View file @
48ac8e5
...
...
@@ -457,6 +457,8 @@ export struct SearchResultContentComponent {
let seoTags = value.data?.seoTags
let cornerMark = value.data?.cornerMark
let contentDTO = new ContentDTO();
contentDTO.introduction = value.data.introduction
contentDTO.zhDescription = value.data.zhDescription
contentDTO.liveType = liveType ? liveType : ""
contentDTO.seoTags = seoTags ? seoTags : ""
contentDTO.cornerMark = cornerMark ? cornerMark : ""
...
...
sight_harmony/features/wdComponent/src/main/ets/viewmodel/SearchResultContentItem.ets
View file @
48ac8e5
...
...
@@ -6,6 +6,8 @@ export class SearchResultContentItem{
}
export class SearchDescription{
introduction: string = ''
zhDescription: string = ''
likeEnable: string = ""
previewUri: string = ""
firstFrameImageBucket: string = ""
...
...
@@ -151,7 +153,6 @@ export class SearchDescription{
liveEndTime: string = ""
topicTemplate: string = ""
barrageEnable: string = ""
introduction: string = ""
notice: string = ""
shareTitleLiteral: string = ""
coverHImageUri: string = ""
...
...
Please
register
or
login
to post a comment