developOne / harmonyPool

Go to a project
Toggle navigation Toggle navigation pinning
zhaojunkai
4f047650 2 parents a78525d6 c8955c68

Merge remote-tracking branch 'origin/main'

Inline Side-by-side
Showing 11 changed files with 184 additions and 357 deletions
  1 +/**
  2 + * 点赞、已读、分享数量
  3 + */
  4 +export interface InteractDataDTO {
  5 + collectNum: number;
  6 + commentNum: number;
  7 + contentType: number;
  8 + likeNum: number;
  9 + readNum: number;
  10 + shareNum: number;
  11 + contentId: string;
  12 +}
@@ -23,6 +23,7 @@ export struct MultiPictureDetailItemComponent { @@ -23,6 +23,7 @@ export struct MultiPictureDetailItemComponent {
23 .width('100%') 23 .width('100%')
24 .aspectRatio(this.MultiPictureDetailItem.width / this.MultiPictureDetailItem.height) 24 .aspectRatio(this.MultiPictureDetailItem.width / this.MultiPictureDetailItem.height)
25 .objectFit(ImageFit.Fill) 25 .objectFit(ImageFit.Fill)
  26 + .interpolation(ImageInterpolation.High)
26 } 27 }
27 .height('100%') 28 .height('100%')
28 .width('100%') 29 .width('100%')
@@ -13,15 +13,14 @@ const LOCAL_CHANNEL: string = '地方频道' @@ -13,15 +13,14 @@ const LOCAL_CHANNEL: string = '地方频道'
13 struct ChannelDialog { 13 struct ChannelDialog {
14 @State indexSettingTabIndex: number = 1 14 @State indexSettingTabIndex: number = 1
15 @State isEditIng: boolean = false 15 @State isEditIng: boolean = false
16 - @Link currentTopNavSelectedIndex : number  
17 - @Link myChannelList: Array<TopNavDTO>  
18 - @Link moreChannelList: Array<TopNavDTO>  
19 - @Link localChannelList: Array<TopNavDTO>  
20 - @Link indexSettingArray: Array<string>  
21 - @Link topNavList: Array<TopNavDTO> 16 + @Link currentTopNavSelectedIndex: number
  17 + @Link myChannelList: TopNavDTO[]
  18 + @Link moreChannelList: TopNavDTO[]
  19 + @Link localChannelList: TopNavDTO[]
  20 + @Link indexSettingArray: string[]
  21 + controller?: CustomDialogController
22 myChannelItemEditHandle = (index: number): void => { 22 myChannelItemEditHandle = (index: number): void => {
23 let item = this.myChannelList.splice(index, 1)[0] 23 let item = this.myChannelList.splice(index, 1)[0]
24 - console.info(`itemitemitem${JSON.stringify(item)}`)  
25 if (item.moreChannel === '1') { 24 if (item.moreChannel === '1') {
26 this.moreChannelList.unshift(item) 25 this.moreChannelList.unshift(item)
27 } 26 }
@@ -29,7 +28,6 @@ struct ChannelDialog { @@ -29,7 +28,6 @@ struct ChannelDialog {
29 this.localChannelList.unshift(item) 28 this.localChannelList.unshift(item)
30 } 29 }
31 } 30 }
32 - controller?: CustomDialogController  
33 31
34 build() { 32 build() {
35 Column() { 33 Column() {
@@ -108,7 +106,7 @@ struct ChannelDialog { @@ -108,7 +106,7 @@ struct ChannelDialog {
108 Row() { 106 Row() {
109 Text(item.name) 107 Text(item.name)
110 .fontSize(14) 108 .fontSize(14)
111 - .fontColor( this.currentTopNavSelectedIndex === index ? '#ED2800' : (item.homeChannel === '1' ? '#999999' : '#222222')) 109 + .fontColor(this.currentTopNavSelectedIndex === index ? '#ED2800' : (item.homeChannel === '1' ? '#999999' : '#222222'))
112 110
113 if (this.isEditIng && item.myChannel !== '1') { 111 if (this.isEditIng && item.myChannel !== '1') {
114 Image($r('app.media.icon_audio_close')) 112 Image($r('app.media.icon_audio_close'))
@@ -122,10 +120,11 @@ struct ChannelDialog { @@ -122,10 +120,11 @@ struct ChannelDialog {
122 .backgroundColor(item.homeChannel === '1' ? '#F5F5F5' : '') 120 .backgroundColor(item.homeChannel === '1' ? '#F5F5F5' : '')
123 .onClick(() => { 121 .onClick(() => {
124 if (this.isEditIng) { 122 if (this.isEditIng) {
125 - if(item.myChannel !== '1'){ 123 + if (item.myChannel !== '1') {
126 this.myChannelItemEditHandle(index) 124 this.myChannelItemEditHandle(index)
127 } 125 }
128 - }else{ 126 + } else {
  127 + this.currentTopNavSelectedIndex = index
129 this.controller?.close() 128 this.controller?.close()
130 } 129 }
131 }) 130 })
@@ -234,306 +233,35 @@ struct ChannelDialog { @@ -234,306 +233,35 @@ struct ChannelDialog {
234 .padding(16) 233 .padding(16)
235 .backgroundColor('#ffffff') 234 .backgroundColor('#ffffff')
236 } 235 }
237 -  
238 - onTopNavigationDataUpdated() {  
239 - }  
240 } 236 }
241 237
242 -@Entry  
243 @Component 238 @Component
244 struct ChannelSubscriptionLayout { 239 struct ChannelSubscriptionLayout {
  240 + @State indexSettingArray: string [] = ['推荐', '热点']
245 //当前选中的频道 241 //当前选中的频道
246 - @Prop currentTopNavSelectedIndex?: number; 242 + @Link currentTopNavSelectedIndex: number;
  243 + @Link myChannelList: TopNavDTO []
  244 + @Link moreChannelList: TopNavDTO []
  245 + @Link localChannelList: TopNavDTO []
247 246
248 - @State indexSettingArray: Array<string> = ['推荐', '热点']  
249 - @State myChannelList: Array<TopNavDTO> = [  
250 - // {  
251 - // channelId: 0,  
252 - // channelStyle: 1,  
253 - // channelType: 1,  
254 - // defaultPermitted: 1,  
255 - // delPermitted: 1,  
256 - // fontCColor: '#000000',  
257 - // fontColor: '#000000',  
258 - // headlinesOn: 0,  
259 - // homeChannel: '1',  
260 - // iconCUrl: '',  
261 - // iconCUrlSize: '',  
262 - // iconUrl: '',  
263 - // iconUrlSize: '',  
264 - // localChannel: '',  
265 - // moreChannel: '',  
266 - // movePermitted: 0,  
267 - // myChannel: '1',  
268 - // name: '推荐',  
269 - // num: 0,  
270 - // pageId: 21212,  
271 - // pageType: '',  
272 - // underlineCColor: ''  
273 - // },  
274 - // {  
275 - // channelId: 1,  
276 - // channelStyle: 1,  
277 - // channelType: 1,  
278 - // defaultPermitted: 1,  
279 - // delPermitted: 1,  
280 - // fontCColor: '#000000',  
281 - // fontColor: '#000000',  
282 - // headlinesOn: 0,  
283 - // homeChannel: '1',  
284 - // iconCUrl: '',  
285 - // iconCUrlSize: '',  
286 - // iconUrl: '',  
287 - // iconUrlSize: '',  
288 - // localChannel: '',  
289 - // moreChannel: '',  
290 - // movePermitted: 0,  
291 - // myChannel: '1',  
292 - // name: '热点',  
293 - // num: 0,  
294 - // pageId: 21212,  
295 - // pageType: '',  
296 - // underlineCColor: ''  
297 - // },  
298 - // {  
299 - // channelId: 2,  
300 - // channelStyle: 1,  
301 - // channelType: 1,  
302 - // defaultPermitted: 1,  
303 - // delPermitted: 1,  
304 - // fontCColor: '#000000',  
305 - // fontColor: '#000000',  
306 - // headlinesOn: 0,  
307 - // homeChannel: '',  
308 - // iconCUrl: '',  
309 - // iconCUrlSize: '',  
310 - // iconUrl: '',  
311 - // iconUrlSize: '',  
312 - // localChannel: '',  
313 - // moreChannel: '',  
314 - // movePermitted: 0,  
315 - // myChannel: '1',  
316 - // name: '视频',  
317 - // num: 0,  
318 - // pageId: 21212,  
319 - // pageType: '',  
320 - // underlineCColor: ''  
321 - // },  
322 - // {  
323 - // channelId: 3,  
324 - // channelStyle: 1,  
325 - // channelType: 1,  
326 - // defaultPermitted: 1,  
327 - // delPermitted: 1,  
328 - // fontCColor: '#000000',  
329 - // fontColor: '#000000',  
330 - // headlinesOn: 0,  
331 - // homeChannel: '',  
332 - // iconCUrl: '',  
333 - // iconCUrlSize: '',  
334 - // iconUrl: '',  
335 - // iconUrlSize: '',  
336 - // localChannel: '',  
337 - // moreChannel: '',  
338 - // movePermitted: 0,  
339 - // myChannel: '1',  
340 - // name: '云课堂',  
341 - // num: 0,  
342 - // pageId: 21212,  
343 - // pageType: '',  
344 - // underlineCColor: ''  
345 - // },  
346 - ]  
347 - @State moreChannelList: Array<TopNavDTO> = [  
348 - // {  
349 - // channelId: 4,  
350 - // channelStyle: 1,  
351 - // channelType: 1,  
352 - // defaultPermitted: 1,  
353 - // delPermitted: 1,  
354 - // fontCColor: '#000000',  
355 - // fontColor: '#000000',  
356 - // headlinesOn: 0,  
357 - // homeChannel: '',  
358 - // iconCUrl: '',  
359 - // iconCUrlSize: '',  
360 - // iconUrl: '',  
361 - // iconUrlSize: '',  
362 - // localChannel: '',  
363 - // moreChannel: '1',  
364 - // movePermitted: 0,  
365 - // myChannel: '',  
366 - // name: '房产',  
367 - // num: 0,  
368 - // pageId: 21212,  
369 - // pageType: '',  
370 - // underlineCColor: ''  
371 - // },  
372 - // {  
373 - // channelId: 5,  
374 - // channelStyle: 1,  
375 - // channelType: 1,  
376 - // defaultPermitted: 1,  
377 - // delPermitted: 1,  
378 - // fontCColor: '#000000',  
379 - // fontColor: '#000000',  
380 - // headlinesOn: 0,  
381 - // homeChannel: '',  
382 - // iconCUrl: '',  
383 - // iconCUrlSize: '',  
384 - // iconUrl: '',  
385 - // iconUrlSize: '',  
386 - // localChannel: '',  
387 - // moreChannel: '1',  
388 - // movePermitted: 0,  
389 - // myChannel: '',  
390 - // name: '生态',  
391 - // num: 0,  
392 - // pageId: 21212,  
393 - // pageType: '',  
394 - // underlineCColor: ''  
395 - // },  
396 - // {  
397 - // channelId: 6,  
398 - // channelStyle: 1,  
399 - // channelType: 1,  
400 - // defaultPermitted: 1,  
401 - // delPermitted: 1,  
402 - // fontCColor: '#000000',  
403 - // fontColor: '#000000',  
404 - // headlinesOn: 0,  
405 - // homeChannel: '',  
406 - // iconCUrl: '',  
407 - // iconCUrlSize: '',  
408 - // iconUrl: '',  
409 - // iconUrlSize: '',  
410 - // localChannel: '',  
411 - // moreChannel: '1',  
412 - // movePermitted: 0,  
413 - // myChannel: '',  
414 - // name: '健康',  
415 - // num: 0,  
416 - // pageId: 21212,  
417 - // pageType: '',  
418 - // underlineCColor: ''  
419 - // }  
420 - ]  
421 - @State localChannelList: Array<TopNavDTO> = [  
422 - // {  
423 - // channelId: 7,  
424 - // channelStyle: 1,  
425 - // channelType: 1,  
426 - // defaultPermitted: 1,  
427 - // delPermitted: 1,  
428 - // fontCColor: '#000000',  
429 - // fontColor: '#000000',  
430 - // headlinesOn: 0,  
431 - // homeChannel: '',  
432 - // iconCUrl: '',  
433 - // iconCUrlSize: '',  
434 - // iconUrl: '',  
435 - // iconUrlSize: '',  
436 - // localChannel: '1',  
437 - // moreChannel: '',  
438 - // movePermitted: 0,  
439 - // myChannel: '',  
440 - // name: '北京',  
441 - // num: 0,  
442 - // pageId: 21212,  
443 - // pageType: '',  
444 - // underlineCColor: ''  
445 - // },  
446 - // {  
447 - // channelId: 8,  
448 - // channelStyle: 1,  
449 - // channelType: 1,  
450 - // defaultPermitted: 1,  
451 - // delPermitted: 1,  
452 - // fontCColor: '#000000',  
453 - // fontColor: '#000000',  
454 - // headlinesOn: 0,  
455 - // homeChannel: '',  
456 - // iconCUrl: '',  
457 - // iconCUrlSize: '',  
458 - // iconUrl: '',  
459 - // iconUrlSize: '',  
460 - // localChannel: '1',  
461 - // moreChannel: '',  
462 - // movePermitted: 0,  
463 - // myChannel: '',  
464 - // name: '上海',  
465 - // num: 0,  
466 - // pageId: 21212,  
467 - // pageType: '',  
468 - // underlineCColor: ''  
469 - // },  
470 - // {  
471 - // channelId: 9,  
472 - // channelStyle: 1,  
473 - // channelType: 1,  
474 - // defaultPermitted: 1,  
475 - // delPermitted: 1,  
476 - // fontCColor: '#000000',  
477 - // fontColor: '#000000',  
478 - // headlinesOn: 0,  
479 - // homeChannel: '',  
480 - // iconCUrl: '',  
481 - // iconCUrlSize: '',  
482 - // iconUrl: '',  
483 - // iconUrlSize: '',  
484 - // localChannel: '1',  
485 - // moreChannel: '',  
486 - // movePermitted: 0,  
487 - // myChannel: '',  
488 - // name: '江苏',  
489 - // num: 0,  
490 - // pageId: 21212,  
491 - // pageType: '',  
492 - // underlineCColor: ''  
493 - // }  
494 - ]  
495 - // 顶导数据  
496 - @State topNavList: TopNavDTO[] = []  
497 dialogController: CustomDialogController | null = new CustomDialogController({ 247 dialogController: CustomDialogController | null = new CustomDialogController({
498 builder: ChannelDialog({ 248 builder: ChannelDialog({
499 - currentTopNavSelectedIndex:this.currentTopNavSelectedIndex,  
500 - indexSettingArray: this.indexSettingArray,  
501 - topNavList: this.topNavList,  
502 - myChannelList: this.myChannelList,  
503 - moreChannelList: this.moreChannelList,  
504 - localChannelList: this.localChannelList, 249 + currentTopNavSelectedIndex: $currentTopNavSelectedIndex,
  250 + indexSettingArray: $indexSettingArray,
  251 + myChannelList: $myChannelList,
  252 + moreChannelList: $moreChannelList,
  253 + localChannelList: $localChannelList
505 }), 254 }),
506 - cancel: this.exitApp,  
507 alignment: DialogAlignment.TopEnd, 255 alignment: DialogAlignment.TopEnd,
508 customStyle: true, 256 customStyle: true,
509 }) 257 })
510 - aboutToAppear() {  
511 - this.topNavList.forEach((item,index)=>{  
512 - if(item.myChannel === '1'){  
513 - this.myChannelList.push(item)  
514 - }  
515 - if(item.moreChannel === '1'){  
516 - this.moreChannelList.push(item)  
517 - }  
518 - if(item.localChannel === '1'){  
519 - this.localChannelList.push(item)  
520 - }  
521 - })  
522 - }  
523 - aboutToDisappear() {  
524 - this.dialogController = null // 将dialogController置空  
525 - }  
526 258
527 - onCancel() {  
528 - console.info('Callback when the first button is clicked')  
529 - } 259 + aboutToAppear() {
530 260
531 - onAccept() {  
532 - console.info('Callback when the second button is clicked')  
533 } 261 }
534 262
535 - exitApp() {  
536 - console.info('Click the callback in the blank area') 263 + aboutToDisappear() {
  264 + this.dialogController = null // 将dialogController置空
537 } 265 }
538 266
539 build() { 267 build() {
@@ -101,6 +101,7 @@ export struct PageComponent { @@ -101,6 +101,7 @@ export struct PageComponent {
101 } 101 }
102 102
103 onChange() { 103 onChange() {
  104 + Logger.info(TAG, `onChangezz id: ${this.pageId} , ${this.channelId} , ${this.navIndex} , navIndex: ${this.currentTopNavSelectedIndex}`);
104 if (this.navIndex === this.currentTopNavSelectedIndex) { 105 if (this.navIndex === this.currentTopNavSelectedIndex) {
105 this.getData(); 106 this.getData();
106 } 107 }
@@ -17,46 +17,63 @@ export struct TopNavigationComponent { @@ -17,46 +17,63 @@ export struct TopNavigationComponent {
17 // 顶导数据 17 // 顶导数据
18 @State @Watch('onTopNavigationDataUpdated') topNavList: TopNavDTO[] = [] 18 @State @Watch('onTopNavigationDataUpdated') topNavList: TopNavDTO[] = []
19 @State compList: LazyDataSource<CompDTO> = new LazyDataSource(); 19 @State compList: LazyDataSource<CompDTO> = new LazyDataSource();
20 - @State handledTopNavList: TopNavDTO[] = [] 20 + //我的频道id缓存列表
  21 + @State channelIds: number[] = []
  22 + // 我的频道列表
  23 + @State myChannelList: TopNavDTO[] = []
  24 + // 更多频道列表
  25 + @State moreChannelList: TopNavDTO[] = []
  26 + // 地方频道列表
  27 + @State localChannelList: TopNavDTO[] = []
21 readonly MAX_LINE: number = 1; 28 readonly MAX_LINE: number = 1;
22 29
23 topNavListHandle() { 30 topNavListHandle() {
24 let defaultMyChannelList: TopNavDTO[] = [] 31 let defaultMyChannelList: TopNavDTO[] = []
25 - this.handledTopNavList = [...this.topNavList]  
26 - this.handledTopNavList.sort((a, b) => { 32 + let handledTopNavList = [...this.topNavList]
  33 + handledTopNavList.sort((a, b) => {
27 return a.num - b.num; 34 return a.num - b.num;
28 }); 35 });
29 - Logger.info(TAG, `aboutToAppear this.handledTopNavListsort : ${JSON.stringify(this.handledTopNavList)}`);  
30 - for (let i = 0; i < this.handledTopNavList.length; i++) {  
31 - if (this.handledTopNavList[i].defaultPermitted === 0 || this.handledTopNavList[i].movePermitted === 0 || this.handledTopNavList[i].delPermitted === 0 || this.handledTopNavList[i].headlinesOn === 1) {  
32 - defaultMyChannelList.push(this.handledTopNavList.splice(i, 1)[0]); 36 + handledTopNavList.forEach(item => {
  37 + if (item.defaultPermitted === 1 || item.movePermitted === 0 || item.delPermitted === 0 || item.headlinesOn === 1) {
  38 + defaultMyChannelList.push(item);
33 } 39 }
34 - } 40 + })
  41 + defaultMyChannelList.forEach(item => {
  42 + item.myChannel = '1'
  43 + if (item.defaultPermitted === 1) {
  44 + item.homeChannel = '1'
  45 + }
  46 + let index = handledTopNavList.findIndex(_item => _item.channelId === item.channelId)
  47 + if (index !== -1) {
  48 + handledTopNavList.splice(index, 1)
  49 + }
  50 + })
35 51
36 - Logger.info(TAG, `aboutToAppear defaultMyChannelListsort : ${JSON.stringify(defaultMyChannelList)}`); 52 + handledTopNavList.unshift(...defaultMyChannelList)
  53 + handledTopNavList.forEach((item, index) => {
  54 + if (item.channelType === 2) {
  55 + item.localChannel = '1'
  56 + }
  57 + if (index >= 11) {
  58 + if (item.channelType === 1) {
  59 + item.moreChannel = '1'
  60 + }
  61 + } else {
  62 + if (item.channelType === 1 && item.myChannel !== '1') {
  63 + item.moreChannel = '1'
  64 + }
  65 + }
37 66
38 - for (const element of defaultMyChannelList) {  
39 - element.myChannel = '1'  
40 - if (element.defaultPermitted === 1) {  
41 - element.homeChannel = '1' 67 + if (item.myChannel === '1') {
  68 + this.myChannelList.push(item)
42 } 69 }
43 - }  
44 - this.handledTopNavList.unshift(...defaultMyChannelList)  
45 - for (let i = 0; i < this.handledTopNavList.length; i++) {  
46 - if(this.handledTopNavList[i].channelType === 2){  
47 - this.handledTopNavList[i].localChannel = '1' 70 + if (item.moreChannel === '1') {
  71 + this.moreChannelList.push(item)
48 } 72 }
49 - if(i>=11){  
50 - if(this.handledTopNavList[i].channelType === 1){  
51 - this.handledTopNavList[i].moreChannel = '1'  
52 - }  
53 - }else{  
54 - if(this.handledTopNavList[i].channelType === 1 && this.handledTopNavList[i].myChannel !== '1'){  
55 - this.handledTopNavList[i].moreChannel = '1'  
56 - } 73 + if (item.localChannel === '1') {
  74 + this.localChannelList.push(item)
57 } 75 }
58 - }  
59 - console.info(`handledTopNavList:${JSON.stringify(this.handledTopNavList)}`) 76 + })
60 } 77 }
61 78
62 build() { 79 build() {
@@ -150,7 +167,7 @@ export struct TopNavigationComponent { @@ -150,7 +167,7 @@ export struct TopNavigationComponent {
150 Stack({ alignContent: Alignment.TopEnd }) { 167 Stack({ alignContent: Alignment.TopEnd }) {
151 168
152 Tabs() { 169 Tabs() {
153 - ForEach(this.handledTopNavList, (navItem: TopNavDTO, index: number) => { 170 + ForEach(this.myChannelList, (navItem: TopNavDTO, index: number) => {
154 TabContent() { 171 TabContent() {
155 PageComponent({ 172 PageComponent({
156 currentTopNavSelectedIndex: $currentTopNavSelectedIndex, 173 currentTopNavSelectedIndex: $currentTopNavSelectedIndex,
@@ -171,8 +188,10 @@ export struct TopNavigationComponent { @@ -171,8 +188,10 @@ export struct TopNavigationComponent {
171 }) 188 })
172 189
173 ChannelSubscriptionLayout({ 190 ChannelSubscriptionLayout({
174 - topNavList: this.handledTopNavList,  
175 - currentTopNavSelectedIndex: this.currentTopNavSelectedIndex 191 + myChannelList: $myChannelList,
  192 + moreChannelList: $moreChannelList,
  193 + localChannelList: $localChannelList,
  194 + currentTopNavSelectedIndex: $currentTopNavSelectedIndex
176 }) 195 })
177 } 196 }
178 197
@@ -208,7 +227,6 @@ export struct TopNavigationComponent { @@ -208,7 +227,6 @@ export struct TopNavigationComponent {
208 bottom: $r('app.float.top_tab_item_padding_bottom') 227 bottom: $r('app.float.top_tab_item_padding_bottom')
209 }) 228 })
210 .id(`col_tabBar${index}`) 229 .id(`col_tabBar${index}`)
211 -  
212 } 230 }
213 231
214 aboutToAppear() { 232 aboutToAppear() {
@@ -44,6 +44,7 @@ export struct OperRowListView { @@ -44,6 +44,7 @@ export struct OperRowListView {
44 .width(24) 44 .width(24)
45 .height(24) 45 .height(24)
46 .aspectRatio(1) 46 .aspectRatio(1)
  47 + .interpolation(ImageInterpolation.High)
47 } 48 }
48 .margin({ 49 .margin({
49 top: 0, 50 top: 0,
@@ -74,14 +75,12 @@ export struct OperRowListView { @@ -74,14 +75,12 @@ export struct OperRowListView {
74 .width('45.5%') 75 .width('45.5%')
75 .alignItems(VerticalAlign.Center) 76 .alignItems(VerticalAlign.Center)
76 .justifyContent(FlexAlign.Start) 77 .justifyContent(FlexAlign.Start)
77 - Row() { 78 + Flex({ justifyContent: FlexAlign.SpaceAround, alignItems:ItemAlign.Center }) {
78 ForEach(this.operationList, (item: OperationItem, index: number) => { 79 ForEach(this.operationList, (item: OperationItem, index: number) => {
79 this.buildOperationItem(item, index) 80 this.buildOperationItem(item, index)
80 }, (item: OperationItem, index: number) => JSON.stringify(item)) 81 }, (item: OperationItem, index: number) => JSON.stringify(item))
81 } 82 }
82 .width('54.5%') 83 .width('54.5%')
83 - .alignItems(VerticalAlign.Center)  
84 - .justifyContent(FlexAlign.Center)  
85 } 84 }
86 .width('100%') 85 .width('100%')
87 .height(56) 86 .height(56)
@@ -100,6 +99,7 @@ export struct OperRowListView { @@ -100,6 +99,7 @@ export struct OperRowListView {
100 .width(24) 99 .width(24)
101 .height(24) 100 .height(24)
102 .aspectRatio(1) 101 .aspectRatio(1)
  102 + .interpolation(ImageInterpolation.High)
103 } 103 }
104 .margin(5) 104 .margin(5)
105 .alignItems(HorizontalAlign.Center) 105 .alignItems(HorizontalAlign.Center)
@@ -108,6 +108,5 @@ export struct OperRowListView { @@ -108,6 +108,5 @@ export struct OperRowListView {
108 Logger.info(TAG, `buildOperationItem onClick event index: ${index}`); 108 Logger.info(TAG, `buildOperationItem onClick event index: ${index}`);
109 ToastUtils.showToast('体验版，本功能暂未开发', 1000); 109 ToastUtils.showToast('体验版，本功能暂未开发', 1000);
110 }) 110 })
111 - .width('19%')  
112 } 111 }
113 } 112 }
1 import { Logger, ResourcesUtils } from 'wdKit'; 1 import { Logger, ResourcesUtils } from 'wdKit';
2 import { HttpUrlUtils, ResponseDTO, WDHttp } from 'wdNetwork'; 2 import { HttpUrlUtils, ResponseDTO, WDHttp } from 'wdNetwork';
3 -import { ContentDetailDTO } from 'wdBean'; 3 +import { ContentDetailDTO, InteractDataDTO } from 'wdBean';
4 import HashMap from '@ohos.util.HashMap'; 4 import HashMap from '@ohos.util.HashMap';
5 5
6 const TAG = 'ContentDetailRequest'; 6 const TAG = 'ContentDetailRequest';
@@ -17,7 +17,16 @@ export interface recommentVideoListParame { @@ -17,7 +17,16 @@ export interface recommentVideoListParame {
17 pageSize: number; 17 pageSize: number;
18 refreshCnt: number; 18 refreshCnt: number;
19 } 19 }
20 - 20 +
  21 +interface contentListItem {
  22 + contentId: string;
  23 + contentType: number;
  24 +}
  25 +
  26 +export interface contentListParams {
  27 + contentList: contentListItem[];
  28 +}
  29 +
21 30
22 export class ContentDetailRequest { 31 export class ContentDetailRequest {
23 static getContentDetailDataMock(context: Context): Promise<ResponseDTO<ContentDetailDTO[]>> { 32 static getContentDetailDataMock(context: Context): Promise<ResponseDTO<ContentDetailDTO[]>> {
@@ -55,10 +64,10 @@ export class ContentDetailRequest { @@ -55,10 +64,10 @@ export class ContentDetailRequest {
55 * 64 *
56 * @returns 65 * @returns
57 */ 66 */
58 - static getContentInteract() { 67 + static getContentInteract(params: contentListParams): Promise<ResponseDTO<InteractDataDTO[]>> {
59 let url = HttpUrlUtils.getHost() + HttpUrlUtils.INTERACT_DATA_PATH 68 let url = HttpUrlUtils.getHost() + HttpUrlUtils.INTERACT_DATA_PATH
60 let headers: HashMap<string, string> = HttpUrlUtils.getCommonHeaders(); 69 let headers: HashMap<string, string> = HttpUrlUtils.getCommonHeaders();
61 - return WDHttp.get(url, headers) 70 + return WDHttp.post0(url, params, headers)
62 } 71 }
63 72
64 /** 73 /**
1 import router from '@ohos.router'; 1 import router from '@ohos.router';
2 import mediaquery from '@ohos.mediaquery'; 2 import mediaquery from '@ohos.mediaquery';
3 import window from '@ohos.window'; 3 import window from '@ohos.window';
4 -import { Action, ContentDetailDTO, RmhInfoDTO, UserInfoDTO } from 'wdBean'; 4 +import { Action, ContentDetailDTO, InteractDataDTO, RmhInfoDTO, UserInfoDTO } from 'wdBean';
5 import { Logger, SPHelper, WindowModel } from 'wdKit'; 5 import { Logger, SPHelper, WindowModel } from 'wdKit';
6 import { PlayerConstants, WDPlayerController, WDPlayerRenderView } from 'wdPlayer'; 6 import { PlayerConstants, WDPlayerController, WDPlayerRenderView } from 'wdPlayer';
7 import { devicePLSensorManager } from 'wdDetailPlayApi'; 7 import { devicePLSensorManager } from 'wdDetailPlayApi';
@@ -22,6 +22,7 @@ export struct DetailPlayShortVideoPage { @@ -22,6 +22,7 @@ export struct DetailPlayShortVideoPage {
22 private relId?: string = undefined 22 private relId?: string = undefined
23 private relType?: string = undefined 23 private relType?: string = undefined
24 private contentDetailData: ContentDetailDTO | undefined = undefined 24 private contentDetailData: ContentDetailDTO | undefined = undefined
  25 + @Provide interactData: InteractDataDTO | undefined = undefined
25 @Prop @Watch('currentIndexChange') currentIndex: number = 0 26 @Prop @Watch('currentIndexChange') currentIndex: number = 0
26 private index: number = 0 27 private index: number = 0
27 private playerController: WDPlayerController = new WDPlayerController(); 28 private playerController: WDPlayerController = new WDPlayerController();
1 -import { Action, ContentDetailDTO } from 'wdBean/Index'; 1 +import { Action, ContentDetailDTO, InteractDataDTO } from 'wdBean/Index';
2 import { ContentDetailRequest } from 'wdDetailPlayApi/Index' 2 import { ContentDetailRequest } from 'wdDetailPlayApi/Index'
3 import { ResponseDTO } from 'wdNetwork/Index'; 3 import { ResponseDTO } from 'wdNetwork/Index';
4 import { DetailPlayShortVideoPage } from './DetailPlayShortVideoPage' 4 import { DetailPlayShortVideoPage } from './DetailPlayShortVideoPage'
5 import { Test } from './Test' 5 import { Test } from './Test'
6 import router from '@ohos.router'; 6 import router from '@ohos.router';
7 import window from '@ohos.window'; 7 import window from '@ohos.window';
  8 +import { contentListParams } from 'wdDetailPlayApi/src/main/ets/request/ContentDetailRequest';
  9 +
8 10
9 @Entry 11 @Entry
10 @Component 12 @Component
@@ -16,6 +18,7 @@ export struct DetailVideoListPage { @@ -16,6 +18,7 @@ export struct DetailVideoListPage {
16 @State data: ContentDetailDTO[] = [] 18 @State data: ContentDetailDTO[] = []
17 @State testData: string[] = ['111', '222', '333'] 19 @State testData: string[] = ['111', '222', '333']
18 @State currentIndex: number = 0 20 @State currentIndex: number = 0
  21 + @State interactDataList: InteractDataDTO[] = []
19 22
20 async aboutToAppear(): Promise<void> { 23 async aboutToAppear(): Promise<void> {
21 console.error('=================',) 24 console.error('=================',)
@@ -47,11 +50,32 @@ export struct DetailVideoListPage { @@ -47,11 +50,32 @@ export struct DetailVideoListPage {
47 if (res.data) { 50 if (res.data) {
48 data = data.concat(res.data) 51 data = data.concat(res.data)
49 } 52 }
50 - // this.data = res.data || []  
51 console.log('res1===', JSON.stringify(res)) 53 console.log('res1===', JSON.stringify(res))
52 console.log('res==' + this.data) 54 console.log('res==' + this.data)
53 }) 55 })
54 56
  57 +
  58 + if (data.length > 0) {
  59 + const params: contentListParams = {
  60 + contentList: []
  61 + }
  62 + data.map(item => {
  63 + params.contentList.push({
  64 + contentId: item.newsId + '',
  65 + contentType: item.newsType
  66 + })
  67 + })
  68 + // 批量查询内容当前用户点赞、收藏状态
  69 + await ContentDetailRequest.getContentInteract(params).then(res => {
  70 + if (res.data) {
  71 + this.interactDataList = res.data || []
  72 + }
  73 + console.log('获取互动点赞等数据===', JSON.stringify(res))
  74 + })
  75 + // 查询各类型内容动态数据接口V2
  76 +
  77 + }
  78 +
55 this.data = data 79 this.data = data
56 console.error('aboutToAppear===', this.data.length) 80 console.error('aboutToAppear===', this.data.length)
57 81
@@ -67,7 +91,8 @@ export struct DetailVideoListPage { @@ -67,7 +91,8 @@ export struct DetailVideoListPage {
67 DetailPlayShortVideoPage({ 91 DetailPlayShortVideoPage({
68 contentDetailData: item, 92 contentDetailData: item,
69 currentIndex: this.currentIndex, 93 currentIndex: this.currentIndex,
70 - index: index 94 + index: index,
  95 + interactData: this.interactDataList[index]
71 }) 96 })
72 }.width('100%') 97 }.width('100%')
73 .height('100%') 98 .height('100%')
1 -import { RmhInfoDTO, UserInfoDTO } from 'wdBean/Index'; 1 +import { InteractDataDTO, RmhInfoDTO, UserInfoDTO } from 'wdBean/Index';
2 import { ToastUtils } from 'wdKit'; 2 import { ToastUtils } from 'wdKit';
3 3
4 export interface OperationItem { 4 export interface OperationItem {
@@ -13,25 +13,27 @@ const FULL_PARENT: string = '100%'; @@ -13,25 +13,27 @@ const FULL_PARENT: string = '100%';
13 13
14 const TAG = 'OperationListView'; 14 const TAG = 'OperationListView';
15 15
  16 +@Preview
16 @Component 17 @Component
17 export struct OperationListView { 18 export struct OperationListView {
18 @Consume rmhInfo?: RmhInfoDTO 19 @Consume rmhInfo?: RmhInfoDTO
19 @Consume userInfo?: UserInfoDTO 20 @Consume userInfo?: UserInfoDTO
  21 + @Consume interactData: InteractDataDTO
20 @State operationList: OperationItem[] = [ 22 @State operationList: OperationItem[] = [
21 { 23 {
22 icon: $r('app.media.ic_like_uncheck'), 24 icon: $r('app.media.ic_like_uncheck'),
23 text: "赞", 25 text: "赞",
24 - num: 6622 26 + // num: 6622
25 }, 27 },
26 { 28 {
27 icon: $r('app.media.ic_collect_uncheck'), 29 icon: $r('app.media.ic_collect_uncheck'),
28 text: "收藏", 30 text: "收藏",
29 - num: 662, 31 + // num: 662,
30 }, 32 },
31 { 33 {
32 icon: $r('app.media.ic_comment'), 34 icon: $r('app.media.ic_comment'),
33 - text: "评论",  
34 - num: 500, 35 + text: "抢首评",
  36 + // num: 500,
35 }, 37 },
36 { 38 {
37 icon: $r('app.media.ic_share'), 39 icon: $r('app.media.ic_share'),
@@ -76,11 +78,12 @@ export struct OperationListView { @@ -76,11 +78,12 @@ export struct OperationListView {
76 buildUserComp() { 78 buildUserComp() {
77 Column() { 79 Column() {
78 Image(this.rmhInfo?.rmhHeadUrl || this.userInfo?.userHeadUrl) 80 Image(this.rmhInfo?.rmhHeadUrl || this.userInfo?.userHeadUrl)
79 - .width(48) 81 + .width('100%')
80 .borderRadius(24) 82 .borderRadius(24)
81 .aspectRatio(1) 83 .aspectRatio(1)
82 - // .margin(18)  
83 - } 84 + .border({ width: 1, color: Color.White, style: BorderStyle.Solid })
  85 + .margin({ bottom: 30 })
  86 + }.width(48)
84 } 87 }
85 88
86 /** 89 /**
@@ -92,20 +95,50 @@ export struct OperationListView { @@ -92,20 +95,50 @@ export struct OperationListView {
92 buildOperationItem(item: OperationItem, index: number) { 95 buildOperationItem(item: OperationItem, index: number) {
93 Column() { 96 Column() {
94 Image(item.icon) 97 Image(item.icon)
95 - .width('100%') 98 + .width(32)
96 .aspectRatio(1) 99 .aspectRatio(1)
97 // .borderRadius(6) 100 // .borderRadius(6)
  101 + if (item.text === '赞') {
  102 + Text(this.interactData.likeNum ? (this.interactData.likeNum + '') : item.text)
  103 + .width('100%')// .margin({ top: 4, left: 6, right: 6 })// .backgroundColor(Color.Brown)
  104 + .fontWeight(500)
  105 + .textAlign(TextAlign.Center)
  106 + .fontSize(13)
  107 + .fontColor('#FFFFFF')
  108 + .maxLines(1)
  109 + .textOverflow({ overflow: TextOverflow.Ellipsis })
  110 + } else if (item.text === '收藏') {
  111 + Text(this.interactData.collectNum ? (this.interactData.collectNum + '') : item.text)
  112 + .width('100%')// .margin({ top: 4, left: 6, right: 6 })// .backgroundColor(Color.Brown)
  113 + .fontWeight(500)
  114 + .textAlign(TextAlign.Center)
  115 + .fontSize(13)
  116 + .fontColor('#FFFFFF')
  117 + .maxLines(1)
  118 + .textOverflow({ overflow: TextOverflow.Ellipsis })
  119 + } else if (item.text === '抢首评') {
  120 + Text(this.interactData.commentNum ? (this.interactData.commentNum + '') : item.text)
  121 + .width('100%')// .margin({ top: 4, left: 6, right: 6 })// .backgroundColor(Color.Brown)
  122 + .fontWeight(500)
  123 + .textAlign(TextAlign.Center)
  124 + .fontSize(13)
  125 + .fontColor('#FFFFFF')
  126 + .maxLines(1)
  127 + .textOverflow({ overflow: TextOverflow.Ellipsis })
  128 + } else {
  129 + Text(item.text)
  130 + .width('100%')// .margin({ top: 4, left: 6, right: 6 })// .backgroundColor(Color.Brown)
  131 + .fontWeight(500)
  132 + .textAlign(TextAlign.Center)
  133 + .fontSize(13)
  134 + .fontColor('#FFFFFF')
  135 + .maxLines(1)
  136 + .textOverflow({ overflow: TextOverflow.Ellipsis })
  137 + }
98 138
99 - Text(item.text)  
100 - .width('100%')// .margin({ top: 4, left: 6, right: 6 })// .backgroundColor(Color.Brown)  
101 - .fontWeight(FontWeight.Normal)  
102 - .textAlign(TextAlign.Center)  
103 - .fontSize(13)  
104 - .fontColor('#FFFFFF')  
105 - .maxLines(1)  
106 - .textOverflow({ overflow: TextOverflow.Ellipsis })  
107 } 139 }
108 - .margin(5) 140 + .width(32)
  141 + .margin({ bottom: 20 })
109 // .backgroundColor(Color.Black) 142 // .backgroundColor(Color.Black)
110 .alignItems(HorizontalAlign.Center) 143 .alignItems(HorizontalAlign.Center)
111 .hoverEffect(HoverEffect.Scale) 144 .hoverEffect(HoverEffect.Scale)