Showing
12 changed files
with
65 additions
and
15 deletions
| @@ -323,6 +323,8 @@ export class ProcessUtils { | @@ -323,6 +323,8 @@ export class ProcessUtils { | ||
| 323 | extra: { | 323 | extra: { |
| 324 | relType: content?.relType, | 324 | relType: content?.relType, |
| 325 | relId: content?.relId, | 325 | relId: content?.relId, |
| 326 | + extra: content?.extra, | ||
| 327 | + title: content?.newsTitle | ||
| 326 | } as ExtraDTO | 328 | } as ExtraDTO |
| 327 | } as Params, | 329 | } as Params, |
| 328 | }; | 330 | }; |
| @@ -130,8 +130,6 @@ export { LiveInfoDTO } from './src/main/ets/bean/detail/LiveInfoDTO'; | @@ -130,8 +130,6 @@ export { LiveInfoDTO } from './src/main/ets/bean/detail/LiveInfoDTO'; | ||
| 130 | 130 | ||
| 131 | export { postRecommendListParams } from './src/main/ets/bean/detail/postRecommendListParams'; | 131 | export { postRecommendListParams } from './src/main/ets/bean/detail/postRecommendListParams'; |
| 132 | 132 | ||
| 133 | -export { postThemeListParams } from './src/main/ets/bean/detail/postThemeListParams'; | ||
| 134 | - | ||
| 135 | export { LiveDTO } from './src/main/ets/bean/peoples/LiveDTO'; | 133 | export { LiveDTO } from './src/main/ets/bean/peoples/LiveDTO'; |
| 136 | 134 | ||
| 137 | export { contentVideosDTO } from './src/main/ets/bean/content/contentVideosDTO'; | 135 | export { contentVideosDTO } from './src/main/ets/bean/content/contentVideosDTO'; |
| @@ -165,3 +163,7 @@ export { | @@ -165,3 +163,7 @@ export { | ||
| 165 | AttentionBatchDTO, | 163 | AttentionBatchDTO, |
| 166 | CreatorDTO | 164 | CreatorDTO |
| 167 | } from './src/main/ets/bean/peoples/AttentionBatchDTO'; | 165 | } from './src/main/ets/bean/peoples/AttentionBatchDTO'; |
| 166 | + | ||
| 167 | +export { GoldenPositionExtraBean } from './src/main/ets/bean/content/GoldenPositionExtraBean'; | ||
| 168 | +export { ClassBean } from './src/main/ets/bean/content/ClassBean'; | ||
| 169 | +export { CreatorsBean } from './src/main/ets/bean/content/CreatorsBean'; |
| @@ -17,4 +17,6 @@ export interface ExtraDTO extends ItemDTO { | @@ -17,4 +17,6 @@ export interface ExtraDTO extends ItemDTO { | ||
| 17 | photoList: PhotoListBean[]; | 17 | photoList: PhotoListBean[]; |
| 18 | swiperIndex?: number | 18 | swiperIndex?: number |
| 19 | commentId?: string; | 19 | commentId?: string; |
| 20 | + extra?:string | ||
| 21 | + title: string | ||
| 20 | } | 22 | } |
| 1 | +import { FullColumnImgUrlDTO } from '../detail/FullColumnImgUrlDTO'; | ||
| 2 | +import { LiveInfoDTO } from '../detail/LiveInfoDTO'; | ||
| 3 | +import { VideoInfoDTO } from '../detail/VideoInfoDTO'; | ||
| 4 | +import { InteractDataDTO } from './InteractDataDTO'; | ||
| 5 | +import { slideShows } from '../morningevening/slideShows'; | ||
| 6 | +import { VoiceInfoDTO } from '../detail/VoiceInfoDTO'; | ||
| 7 | +import { RmhInfoDTO } from '../detail/RmhInfoDTO'; | ||
| 8 | +import { commentInfo } from './commentInfo'; | ||
| 9 | +import { ArrayList } from '@kit.ArkTS'; | ||
| 10 | + | ||
| 11 | +export interface ClassBean { | ||
| 12 | + secondClassifyName:string | ||
| 13 | + classifyName:string | ||
| 14 | +} |
| 1 | +import { ArrayList } from '@kit.ArkTS'; | ||
| 2 | +import { ClassBean } from './ClassBean'; | ||
| 3 | +import { CreatorsBean } from './CreatorsBean'; | ||
| 4 | + | ||
| 5 | +export interface GoldenPositionExtraBean { | ||
| 6 | + sort:number | ||
| 7 | + pageNum:number | ||
| 8 | + pageSize:number | ||
| 9 | + channelId:string | ||
| 10 | + topicId:string | ||
| 11 | + keyWord:string | ||
| 12 | + aggregateType:string | ||
| 13 | + poolCode:string | ||
| 14 | + showPublishStartTime:string | ||
| 15 | + showPublishEndTime:string | ||
| 16 | + keywordsType:string | ||
| 17 | + keywords:ArrayList<string> | ||
| 18 | + classifys: ArrayList<ClassBean> | ||
| 19 | + creatorTags: ArrayList<CreatorsBean> | ||
| 20 | +} |
| 1 | -import { ContentDTO } from 'wdBean'; | 1 | +import { ContentDTO , Action,GoldenPositionExtraBean} from 'wdBean'; |
| 2 | import { CommonConstants ,ViewType} from 'wdConstant'; | 2 | import { CommonConstants ,ViewType} from 'wdConstant'; |
| 3 | import PageViewModel from '../../viewmodel/PageViewModel'; | 3 | import PageViewModel from '../../viewmodel/PageViewModel'; |
| 4 | import RefreshLayout from '../page/RefreshLayout'; | 4 | import RefreshLayout from '../page/RefreshLayout'; |
| @@ -22,9 +22,14 @@ struct ThemeListPage { | @@ -22,9 +22,14 @@ struct ThemeListPage { | ||
| 22 | currentPage: number = 1; | 22 | currentPage: number = 1; |
| 23 | pageSize: number = 20; | 23 | pageSize: number = 20; |
| 24 | title: string = '金刚位聚合页' | 24 | title: string = '金刚位聚合页' |
| 25 | + extra: string = '' | ||
| 25 | 26 | ||
| 26 | aboutToAppear(): void { | 27 | aboutToAppear(): void { |
| 27 | - PageViewModel.postThemeList(this.sort, this.currentPage, this.pageSize).then((liveReviewDTO) => { | 28 | + let par:Action = router.getParams() as Action; |
| 29 | + let params = par?.params; | ||
| 30 | + this.extra = params?.extra?.extra || ''; | ||
| 31 | + this.title = params?.extra?.title || ''; | ||
| 32 | + PageViewModel.postThemeList(this.sort, this.currentPage, this.pageSize,this.extra).then((liveReviewDTO) => { | ||
| 28 | console.log(`postThemeList${JSON.stringify(liveReviewDTO)}`) | 33 | console.log(`postThemeList${JSON.stringify(liveReviewDTO)}`) |
| 29 | this.data.push(...liveReviewDTO.list) | 34 | this.data.push(...liveReviewDTO.list) |
| 30 | if(this.data.getDataArray().length > 0){ | 35 | if(this.data.getDataArray().length > 0){ |
| @@ -194,7 +194,8 @@ export struct SearchResultContentComponent{ | @@ -194,7 +194,8 @@ export struct SearchResultContentComponent{ | ||
| 194 | isSearch: true, | 194 | isSearch: true, |
| 195 | publishTimestamp:"", | 195 | publishTimestamp:"", |
| 196 | bottomNavId:'', | 196 | bottomNavId:'', |
| 197 | - openType:'' | 197 | + openType:'', |
| 198 | + extra:'' | ||
| 198 | } | 199 | } |
| 199 | 200 | ||
| 200 | this.data.push(contentDTO) | 201 | this.data.push(contentDTO) |
| @@ -22,7 +22,7 @@ import { | @@ -22,7 +22,7 @@ import { | ||
| 22 | postExecuteLikeParams, | 22 | postExecuteLikeParams, |
| 23 | postInteractAccentionOperateParams, | 23 | postInteractAccentionOperateParams, |
| 24 | postRecommendListParams, | 24 | postRecommendListParams, |
| 25 | - postThemeListParams | 25 | + GoldenPositionExtraBean |
| 26 | } from 'wdBean'; | 26 | } from 'wdBean'; |
| 27 | import { PageUIReqBean } from '../components/page/bean/PageUIReqBean'; | 27 | import { PageUIReqBean } from '../components/page/bean/PageUIReqBean'; |
| 28 | 28 | ||
| @@ -437,7 +437,7 @@ export class PageRepository { | @@ -437,7 +437,7 @@ export class PageRepository { | ||
| 437 | * @param params | 437 | * @param params |
| 438 | * @returns | 438 | * @returns |
| 439 | * */ | 439 | * */ |
| 440 | - static postThemeList(params: postThemeListParams) { | 440 | + static postThemeList(params: GoldenPositionExtraBean) { |
| 441 | let url = HttpUrlUtils.getThemeListUrl() | 441 | let url = HttpUrlUtils.getThemeListUrl() |
| 442 | Logger.info(TAG, "postThemeList url = " + url + JSON.stringify(params)) | 442 | Logger.info(TAG, "postThemeList url = " + url + JSON.stringify(params)) |
| 443 | return WDHttp.post<ResponseDTO<LiveReviewDTO>>(url, params) | 443 | return WDHttp.post<ResponseDTO<LiveReviewDTO>>(url, params) |
| @@ -8,7 +8,8 @@ import { | @@ -8,7 +8,8 @@ import { | ||
| 8 | NavigationBodyDTO, | 8 | NavigationBodyDTO, |
| 9 | PageDTO, | 9 | PageDTO, |
| 10 | PageInfoBean, | 10 | PageInfoBean, |
| 11 | - PageInfoDTO | 11 | + PageInfoDTO, |
| 12 | + GoldenPositionExtraBean | ||
| 12 | } from 'wdBean'; | 13 | } from 'wdBean'; |
| 13 | 14 | ||
| 14 | import { CollectionUtils, Logger, ResourcesUtils, StringUtils } from 'wdKit'; | 15 | import { CollectionUtils, Logger, ResourcesUtils, StringUtils } from 'wdKit'; |
| @@ -379,10 +380,13 @@ export class PageViewModel extends BaseViewModel { | @@ -379,10 +380,13 @@ export class PageViewModel extends BaseViewModel { | ||
| 379 | }) | 380 | }) |
| 380 | } | 381 | } |
| 381 | 382 | ||
| 382 | - async postThemeList(sort: number, pageNum: number, pageSize: number) : Promise<LiveReviewDTO> { | 383 | + async postThemeList(sort: number, pageNum: number, pageSize: number,extra: string) : Promise<LiveReviewDTO> { |
| 384 | + let bean: GoldenPositionExtraBean = JSON.parse(extra) | ||
| 385 | + bean.pageNum = pageNum | ||
| 386 | + bean.pageSize = pageSize | ||
| 383 | return new Promise<LiveReviewDTO>((success, error) => { | 387 | return new Promise<LiveReviewDTO>((success, error) => { |
| 384 | Logger.info(TAG, `postThemeList pageInfo start`); | 388 | Logger.info(TAG, `postThemeList pageInfo start`); |
| 385 | - PageRepository.postThemeList({ sort, pageNum, pageSize }).then((resDTO) => { | 389 | + PageRepository.postThemeList(bean).then((resDTO) => { |
| 386 | if (!resDTO || !resDTO.data) { | 390 | if (!resDTO || !resDTO.data) { |
| 387 | Logger.error(TAG, 'postThemeList then navResDTO is empty'); | 391 | Logger.error(TAG, 'postThemeList then navResDTO is empty'); |
| 388 | error('resDTO is empty'); | 392 | error('resDTO is empty'); |
-
Please register or login to post a comment