zhenghy

Merge remote-tracking branch 'origin/main'

Showing 18 changed files with 80 additions and 40 deletions
@@ -121,15 +121,15 @@ export struct CompParser { @@ -121,15 +121,15 @@ export struct CompParser {
121 CardParser({ contentDTO: this.compDTO.operDataList[0], compDTO: this.compDTO }); 121 CardParser({ contentDTO: this.compDTO.operDataList[0], compDTO: this.compDTO });
122 Divider().strokeWidth(1).color('#f5f5f5').padding({ left: 16, right: 16 }) 122 Divider().strokeWidth(1).color('#f5f5f5').padding({ left: 16, right: 16 })
123 } else { 123 } else {
124 - Text(this.compDTO.compStyle)  
125 - .width(CommonConstants.FULL_PARENT)  
126 - .padding(10)  
127 - .onClick(() => {  
128 - if (this.compDTO.compStyle === CompStyle.Zh_Single_Row_06) { //精选评论  
129 - WDRouterRule.jumpWithPage(WDRouterPage.QualityCommentsPage)  
130 - }  
131 - })  
132 - Divider().strokeWidth(1).color('#f5f5f5').padding({ left: 16, right: 16 }) 124 + // Text(this.compDTO.compStyle)
  125 + // .width(CommonConstants.FULL_PARENT)
  126 + // .padding(10)
  127 + // .onClick(() => {
  128 + // if (this.compDTO.compStyle === CompStyle.Zh_Single_Row_06) { //精选评论
  129 + // WDRouterRule.jumpWithPage(WDRouterPage.QualityCommentsPage)
  130 + // }
  131 + // })
  132 + // Divider().strokeWidth(1).color('#f5f5f5').padding({ left: 16, right: 16 })
133 } 133 }
134 } 134 }
135 135
@@ -5,6 +5,7 @@ import { CommonConstants } from 'wdConstant'; @@ -5,6 +5,7 @@ import { CommonConstants } from 'wdConstant';
5 import { ProcessUtils } from 'wdRouter'; 5 import { ProcessUtils } from 'wdRouter';
6 import { CardSourceInfo } from '../cardCommon/CardSourceInfo'; 6 import { CardSourceInfo } from '../cardCommon/CardSourceInfo';
7 import { Notes } from './notes'; 7 import { Notes } from './notes';
  8 +import { persistentStorage, hasClicked } from '../../utils/persistentStorage';
8 9
9 const TAG = 'Card11Component'; 10 const TAG = 'Card11Component';
10 11
@@ -23,6 +24,7 @@ export struct Card11Component { @@ -23,6 +24,7 @@ export struct Card11Component {
23 24
24 async aboutToAppear(): Promise<void> { 25 async aboutToAppear(): Promise<void> {
25 this.titleInit(); 26 this.titleInit();
  27 + this.clicked = hasClicked(this.contentDTO.objectId)
26 } 28 }
27 29
28 titleInit() { 30 titleInit() {
@@ -76,8 +78,8 @@ export struct Card11Component { @@ -76,8 +78,8 @@ export struct Card11Component {
76 }) 78 })
77 .backgroundColor($r("app.color.white")) 79 .backgroundColor($r("app.color.white"))
78 .onClick((event: ClickEvent) => { 80 .onClick((event: ClickEvent) => {
79 -  
80 this.clicked = true; 81 this.clicked = true;
  82 + persistentStorage(this.contentDTO.objectId);
81 ProcessUtils.processPage(this.contentDTO) 83 ProcessUtils.processPage(this.contentDTO)
82 }) 84 })
83 } 85 }
@@ -4,6 +4,7 @@ import { CardMediaInfo } from '../cardCommon/CardMediaInfo' @@ -4,6 +4,7 @@ import { CardMediaInfo } from '../cardCommon/CardMediaInfo'
4 import { CommonConstants } from 'wdConstant/Index'; 4 import { CommonConstants } from 'wdConstant/Index';
5 import { ProcessUtils } from 'wdRouter'; 5 import { ProcessUtils } from 'wdRouter';
6 import {CarderInteraction} from '../CarderInteraction' 6 import {CarderInteraction} from '../CarderInteraction'
  7 +import { persistentStorage, hasClicked } from '../../utils/persistentStorage';
7 8
8 const TAG = 'Card12Component'; 9 const TAG = 'Card12Component';
9 10
@@ -21,6 +22,7 @@ export struct Card12Component { @@ -21,6 +22,7 @@ export struct Card12Component {
21 22
22 aboutToAppear(): void { 23 aboutToAppear(): void {
23 this.titleInit(); 24 this.titleInit();
  25 + this.clicked = hasClicked(this.contentDTO.objectId)
24 } 26 }
25 27
26 titleInit() { 28 titleInit() {
@@ -69,6 +71,7 @@ export struct Card12Component { @@ -69,6 +71,7 @@ export struct Card12Component {
69 }) 71 })
70 .onClick((event: ClickEvent) => { 72 .onClick((event: ClickEvent) => {
71 this.clicked = true; 73 this.clicked = true;
  74 + persistentStorage(this.contentDTO.objectId);
72 ProcessUtils.processPage(this.contentDTO) 75 ProcessUtils.processPage(this.contentDTO)
73 }) 76 })
74 } 77 }
@@ -5,6 +5,7 @@ import { CommonConstants } from 'wdConstant/Index'; @@ -5,6 +5,7 @@ import { CommonConstants } from 'wdConstant/Index';
5 import { ProcessUtils } from 'wdRouter'; 5 import { ProcessUtils } from 'wdRouter';
6 import {CarderInteraction} from '../CarderInteraction' 6 import {CarderInteraction} from '../CarderInteraction'
7 import { onlyWifiLoadImg } from '../../utils/lazyloadImg'; 7 import { onlyWifiLoadImg } from '../../utils/lazyloadImg';
  8 +import { persistentStorage, hasClicked } from '../../utils/persistentStorage';
8 9
9 const TAG = 'Card14Component'; 10 const TAG = 'Card14Component';
10 11
@@ -23,6 +24,7 @@ export struct Card14Component { @@ -23,6 +24,7 @@ export struct Card14Component {
23 24
24 async aboutToAppear(): Promise<void> { 25 async aboutToAppear(): Promise<void> {
25 this.titleInit(); 26 this.titleInit();
  27 + this.clicked = hasClicked(this.contentDTO.objectId)
26 this.loadImg = await onlyWifiLoadImg(); 28 this.loadImg = await onlyWifiLoadImg();
27 } 29 }
28 30
@@ -88,6 +90,7 @@ export struct Card14Component { @@ -88,6 +90,7 @@ export struct Card14Component {
88 }) 90 })
89 .onClick((event: ClickEvent) => { 91 .onClick((event: ClickEvent) => {
90 this.clicked = true; 92 this.clicked = true;
  93 + persistentStorage(this.contentDTO.objectId);
91 ProcessUtils.processPage(this.contentDTO) 94 ProcessUtils.processPage(this.contentDTO)
92 }) 95 })
93 } 96 }
@@ -5,6 +5,7 @@ import { CardMediaInfo } from '../cardCommon/CardMediaInfo' @@ -5,6 +5,7 @@ import { CardMediaInfo } from '../cardCommon/CardMediaInfo'
5 import { CommonConstants } from 'wdConstant/Index'; 5 import { CommonConstants } from 'wdConstant/Index';
6 import {CarderInteraction} from '../CarderInteraction' 6 import {CarderInteraction} from '../CarderInteraction'
7 import { onlyWifiLoadImg } from '../../utils/lazyloadImg'; 7 import { onlyWifiLoadImg } from '../../utils/lazyloadImg';
  8 +import { persistentStorage, hasClicked } from '../../utils/persistentStorage';
8 9
9 const TAG: string = 'Card15Component'; 10 const TAG: string = 'Card15Component';
10 11
@@ -27,6 +28,7 @@ export struct Card15Component { @@ -27,6 +28,7 @@ export struct Card15Component {
27 28
28 async aboutToAppear(): Promise<void> { 29 async aboutToAppear(): Promise<void> {
29 this.titleInit(); 30 this.titleInit();
  31 + this.clicked = hasClicked(this.contentDTO.objectId)
30 this.loadImg = await onlyWifiLoadImg(); 32 this.loadImg = await onlyWifiLoadImg();
31 } 33 }
32 34
@@ -85,6 +87,7 @@ export struct Card15Component { @@ -85,6 +87,7 @@ export struct Card15Component {
85 }) 87 })
86 .onClick((event: ClickEvent) => { 88 .onClick((event: ClickEvent) => {
87 this.clicked = true; 89 this.clicked = true;
  90 + persistentStorage(this.contentDTO.objectId);
88 ProcessUtils.processPage(this.contentDTO) 91 ProcessUtils.processPage(this.contentDTO)
89 }) 92 })
90 } 93 }
@@ -5,6 +5,7 @@ import { CommonConstants } from 'wdConstant/Index'; @@ -5,6 +5,7 @@ import { CommonConstants } from 'wdConstant/Index';
5 import { ProcessUtils } from 'wdRouter'; 5 import { ProcessUtils } from 'wdRouter';
6 import {CarderInteraction} from '../CarderInteraction' 6 import {CarderInteraction} from '../CarderInteraction'
7 import { onlyWifiLoadImg } from '../../utils/lazyloadImg'; 7 import { onlyWifiLoadImg } from '../../utils/lazyloadImg';
  8 +import { persistentStorage, hasClicked } from '../../utils/persistentStorage';
8 9
9 const TAG = 'Card16Component'; 10 const TAG = 'Card16Component';
10 11
@@ -28,6 +29,7 @@ export struct Card16Component { @@ -28,6 +29,7 @@ export struct Card16Component {
28 29
29 async aboutToAppear(): Promise<void> { 30 async aboutToAppear(): Promise<void> {
30 this.titleInit(); 31 this.titleInit();
  32 + this.clicked = hasClicked(this.contentDTO.objectId)
31 this.loadImg = await onlyWifiLoadImg(); 33 this.loadImg = await onlyWifiLoadImg();
32 } 34 }
33 35
@@ -87,6 +89,7 @@ export struct Card16Component { @@ -87,6 +89,7 @@ export struct Card16Component {
87 }) 89 })
88 .onClick((event: ClickEvent) => { 90 .onClick((event: ClickEvent) => {
89 this.clicked = true; 91 this.clicked = true;
  92 + persistentStorage(this.contentDTO.objectId);
90 ProcessUtils.processPage(this.contentDTO) 93 ProcessUtils.processPage(this.contentDTO)
91 }) 94 })
92 } 95 }
@@ -5,6 +5,7 @@ import { WDRouterRule } from 'wdRouter'; @@ -5,6 +5,7 @@ import { WDRouterRule } from 'wdRouter';
5 import { CardSourceInfo } from '../cardCommon/CardSourceInfo'; 5 import { CardSourceInfo } from '../cardCommon/CardSourceInfo';
6 import { onlyWifiLoadImg } from '../../utils/lazyloadImg'; 6 import { onlyWifiLoadImg } from '../../utils/lazyloadImg';
7 import { CardMediaInfo } from '../cardCommon/CardMediaInfo'; 7 import { CardMediaInfo } from '../cardCommon/CardMediaInfo';
  8 +import { persistentStorage, hasClicked } from '../../utils/persistentStorage';
8 9
9 const TAG = 'Card17Component'; 10 const TAG = 'Card17Component';
10 11
@@ -24,6 +25,7 @@ export struct Card17Component { @@ -24,6 +25,7 @@ export struct Card17Component {
24 25
25 async aboutToAppear(): Promise<void> { 26 async aboutToAppear(): Promise<void> {
26 this.titleInit(); 27 this.titleInit();
  28 + this.clicked = hasClicked(this.contentDTO.objectId)
27 this.loadImg = await onlyWifiLoadImg(); 29 this.loadImg = await onlyWifiLoadImg();
28 } 30 }
29 31
@@ -105,6 +107,7 @@ export struct Card17Component { @@ -105,6 +107,7 @@ export struct Card17Component {
105 .width(CommonConstants.FULL_WIDTH) 107 .width(CommonConstants.FULL_WIDTH)
106 .onClick((event: ClickEvent) => { 108 .onClick((event: ClickEvent) => {
107 this.clicked = true; 109 this.clicked = true;
  110 + persistentStorage(this.contentDTO.objectId);
108 let taskAction: Action = { 111 let taskAction: Action = {
109 type: 'JUMP_DETAIL_PAGE', 112 type: 'JUMP_DETAIL_PAGE',
110 params: { 113 params: {
@@ -4,6 +4,7 @@ import { ProcessUtils } from 'wdRouter'; @@ -4,6 +4,7 @@ import { ProcessUtils } from 'wdRouter';
4 import { CommonConstants } from 'wdConstant/Index'; 4 import { CommonConstants } from 'wdConstant/Index';
5 import { CarderInteraction } from '../CarderInteraction' 5 import { CarderInteraction } from '../CarderInteraction'
6 import { onlyWifiLoadImg } from '../../utils/lazyloadImg'; 6 import { onlyWifiLoadImg } from '../../utils/lazyloadImg';
  7 +import { persistentStorage, hasClicked } from '../../utils/persistentStorage';
7 8
8 const TAG = 'Card19Component'; 9 const TAG = 'Card19Component';
9 10
@@ -21,6 +22,7 @@ export struct Card19Component { @@ -21,6 +22,7 @@ export struct Card19Component {
21 22
22 async aboutToAppear(): Promise<void> { 23 async aboutToAppear(): Promise<void> {
23 this.titleInit(); 24 this.titleInit();
  25 + this.clicked = hasClicked(this.contentDTO.objectId)
24 console.log('card19',JSON.stringify(this.contentDTO)) 26 console.log('card19',JSON.stringify(this.contentDTO))
25 } 27 }
26 28
@@ -74,6 +76,7 @@ export struct Card19Component { @@ -74,6 +76,7 @@ export struct Card19Component {
74 }) 76 })
75 .onClick((event: ClickEvent) => { 77 .onClick((event: ClickEvent) => {
76 this.clicked = true; 78 this.clicked = true;
  79 + persistentStorage(this.contentDTO.objectId);
77 ProcessUtils.processPage(this.contentDTO) 80 ProcessUtils.processPage(this.contentDTO)
78 }) 81 })
79 } 82 }
@@ -5,6 +5,7 @@ import { CommonConstants } from 'wdConstant/Index'; @@ -5,6 +5,7 @@ import { CommonConstants } from 'wdConstant/Index';
5 import { ProcessUtils } from 'wdRouter'; 5 import { ProcessUtils } from 'wdRouter';
6 import {CarderInteraction} from '../CarderInteraction' 6 import {CarderInteraction} from '../CarderInteraction'
7 import { onlyWifiLoadImg } from '../../utils/lazyloadImg'; 7 import { onlyWifiLoadImg } from '../../utils/lazyloadImg';
  8 +import { persistentStorage, hasClicked } from '../../utils/persistentStorage';
8 9
9 const TAG = 'Card20Component'; 10 const TAG = 'Card20Component';
10 11
@@ -22,6 +23,7 @@ export struct Card20Component { @@ -22,6 +23,7 @@ export struct Card20Component {
22 23
23 aboutToAppear(): void { 24 aboutToAppear(): void {
24 this.titleInit(); 25 this.titleInit();
  26 + this.clicked = hasClicked(this.contentDTO.objectId)
25 } 27 }
26 28
27 titleInit() { 29 titleInit() {
@@ -71,6 +73,7 @@ export struct Card20Component { @@ -71,6 +73,7 @@ export struct Card20Component {
71 }) 73 })
72 .onClick((event: ClickEvent) => { 74 .onClick((event: ClickEvent) => {
73 this.clicked = true; 75 this.clicked = true;
  76 + persistentStorage(this.contentDTO.objectId);
74 ProcessUtils.processPage(this.contentDTO) 77 ProcessUtils.processPage(this.contentDTO)
75 }) 78 })
76 } 79 }
@@ -5,6 +5,7 @@ import { RmhTitle } from '../cardCommon/RmhTitle' @@ -5,6 +5,7 @@ import { RmhTitle } from '../cardCommon/RmhTitle'
5 import { CardMediaInfo } from '../cardCommon/CardMediaInfo' 5 import { CardMediaInfo } from '../cardCommon/CardMediaInfo'
6 import {CarderInteraction} from '../CarderInteraction' 6 import {CarderInteraction} from '../CarderInteraction'
7 import { onlyWifiLoadImg } from '../../utils/lazyloadImg'; 7 import { onlyWifiLoadImg } from '../../utils/lazyloadImg';
  8 +import { persistentStorage, hasClicked } from '../../utils/persistentStorage';
8 9
9 const TAG: string = 'Card6Component-Card13Component'; 10 const TAG: string = 'Card6Component-Card13Component';
10 11
@@ -23,6 +24,7 @@ export struct Card21Component { @@ -23,6 +24,7 @@ export struct Card21Component {
23 24
24 async aboutToAppear(): Promise<void> { 25 async aboutToAppear(): Promise<void> {
25 this.titleInit(); 26 this.titleInit();
  27 + this.clicked = hasClicked(this.contentDTO.objectId)
26 this.loadImg = await onlyWifiLoadImg(); 28 this.loadImg = await onlyWifiLoadImg();
27 } 29 }
28 30
@@ -79,6 +81,7 @@ export struct Card21Component { @@ -79,6 +81,7 @@ export struct Card21Component {
79 } 81 }
80 .onClick((event: ClickEvent) => { 82 .onClick((event: ClickEvent) => {
81 this.clicked = true; 83 this.clicked = true;
  84 + persistentStorage(this.contentDTO.objectId);
82 ProcessUtils.processPage(this.contentDTO) 85 ProcessUtils.processPage(this.contentDTO)
83 }) 86 })
84 .padding({ 87 .padding({
@@ -7,7 +7,7 @@ import { CardSourceInfo } from '../cardCommon/CardSourceInfo'; @@ -7,7 +7,7 @@ import { CardSourceInfo } from '../cardCommon/CardSourceInfo';
7 import { Notes } from './notes'; 7 import { Notes } from './notes';
8 import { onlyWifiLoadImg } from '../../utils/lazyloadImg'; 8 import { onlyWifiLoadImg } from '../../utils/lazyloadImg';
9 9
10 -// import { persistentStorage, hasClicked } from '../../utils/persistentStorage'; 10 +import { persistentStorage, hasClicked } from '../../utils/persistentStorage';
11 const TAG: string = 'Card2Component'; 11 const TAG: string = 'Card2Component';
12 12
13 /** 13 /**
@@ -29,9 +29,9 @@ export struct Card2Component { @@ -29,9 +29,9 @@ export struct Card2Component {
29 @State str03: string = ''; 29 @State str03: string = '';
30 30
31 async aboutToAppear(): Promise<void> { 31 async aboutToAppear(): Promise<void> {
  32 + this.clicked = hasClicked(this.contentDTO.objectId)
32 this.titleInit(); 33 this.titleInit();
33 this.loadImg = await onlyWifiLoadImg(); 34 this.loadImg = await onlyWifiLoadImg();
34 - // this.clicked = hasClicked(this.contentDTO.objectId)  
35 } 35 }
36 36
37 titleInit() { 37 titleInit() {
@@ -109,7 +109,7 @@ export struct Card2Component { @@ -109,7 +109,7 @@ export struct Card2Component {
109 }) 109 })
110 .onClick((event: ClickEvent) => { 110 .onClick((event: ClickEvent) => {
111 this.clicked = true; 111 this.clicked = true;
112 - // persistentStorage(this.contentDTO.objectId); 112 + persistentStorage(this.contentDTO.objectId);
113 ProcessUtils.processPage(this.contentDTO) 113 ProcessUtils.processPage(this.contentDTO)
114 }) 114 })
115 } 115 }
@@ -3,6 +3,7 @@ import { CompDTO, ContentDTO } from 'wdBean'; @@ -3,6 +3,7 @@ import { CompDTO, ContentDTO } from 'wdBean';
3 import { ProcessUtils } from 'wdRouter'; 3 import { ProcessUtils } from 'wdRouter';
4 import { CardSourceInfo } from '../cardCommon/CardSourceInfo'; 4 import { CardSourceInfo } from '../cardCommon/CardSourceInfo';
5 import { Notes } from './notes'; 5 import { Notes } from './notes';
  6 +import { persistentStorage, hasClicked } from '../../utils/persistentStorage';
6 7
7 /** 8 /**
8 * 卡片样式:"appStyle":"3" 9 * 卡片样式:"appStyle":"3"
@@ -20,7 +21,7 @@ export struct Card3Component { @@ -20,7 +21,7 @@ export struct Card3Component {
20 21
21 async aboutToAppear(): Promise<void> { 22 async aboutToAppear(): Promise<void> {
22 this.titleInit(); 23 this.titleInit();
23 - // this.clicked = hasClicked(this.contentDTO.objectId) 24 + this.clicked = hasClicked(this.contentDTO.objectId)
24 } 25 }
25 26
26 titleInit() { 27 titleInit() {
@@ -71,6 +72,7 @@ export struct Card3Component { @@ -71,6 +72,7 @@ export struct Card3Component {
71 }) 72 })
72 .onClick((event: ClickEvent) => { 73 .onClick((event: ClickEvent) => {
73 this.clicked = true; 74 this.clicked = true;
  75 + persistentStorage(this.contentDTO.objectId);
74 ProcessUtils.processPage(this.contentDTO) 76 ProcessUtils.processPage(this.contentDTO)
75 }) 77 })
76 } 78 }
@@ -5,6 +5,7 @@ import { CardSourceInfo } from '../cardCommon/CardSourceInfo' @@ -5,6 +5,7 @@ import { CardSourceInfo } from '../cardCommon/CardSourceInfo'
5 import { CardMediaInfo } from '../cardCommon/CardMediaInfo' 5 import { CardMediaInfo } from '../cardCommon/CardMediaInfo'
6 import { onlyWifiLoadImg } from '../../utils/lazyloadImg'; 6 import { onlyWifiLoadImg } from '../../utils/lazyloadImg';
7 import { Notes } from './notes'; 7 import { Notes } from './notes';
  8 +import { persistentStorage, hasClicked } from '../../utils/persistentStorage';
8 const TAG: string = 'Card4Component'; 9 const TAG: string = 'Card4Component';
9 10
10 /** 11 /**
@@ -26,6 +27,7 @@ export struct Card4Component { @@ -26,6 +27,7 @@ export struct Card4Component {
26 @ObjectLink compDTO: CompDTO 27 @ObjectLink compDTO: CompDTO
27 28
28 async aboutToAppear(): Promise<void> { 29 async aboutToAppear(): Promise<void> {
  30 + this.clicked = hasClicked(this.contentDTO.objectId)
29 this.titleInit(); 31 this.titleInit();
30 this.loadImg = await onlyWifiLoadImg(); 32 this.loadImg = await onlyWifiLoadImg();
31 } 33 }
@@ -102,6 +104,7 @@ export struct Card4Component { @@ -102,6 +104,7 @@ export struct Card4Component {
102 .alignItems(HorizontalAlign.Start) 104 .alignItems(HorizontalAlign.Start)
103 .onClick((event: ClickEvent) => { 105 .onClick((event: ClickEvent) => {
104 this.clicked = true; 106 this.clicked = true;
  107 + persistentStorage(this.contentDTO.objectId);
105 ProcessUtils.processPage(this.contentDTO) 108 ProcessUtils.processPage(this.contentDTO)
106 }) 109 })
107 //bottom 评论等信息 110 //bottom 评论等信息
@@ -3,6 +3,7 @@ import { CommonConstants } from 'wdConstant'; @@ -3,6 +3,7 @@ import { CommonConstants } from 'wdConstant';
3 import { ProcessUtils } from 'wdRouter'; 3 import { ProcessUtils } from 'wdRouter';
4 import { onlyWifiLoadImg } from '../../utils/lazyloadImg'; 4 import { onlyWifiLoadImg } from '../../utils/lazyloadImg';
5 import { Notes } from './notes'; 5 import { Notes } from './notes';
  6 +import { persistentStorage, hasClicked } from '../../utils/persistentStorage';
6 7
7 const TAG: string = 'Card5Component'; 8 const TAG: string = 'Card5Component';
8 9
@@ -21,6 +22,7 @@ export struct Card5Component { @@ -21,6 +22,7 @@ export struct Card5Component {
21 @State str03: string = ''; 22 @State str03: string = '';
22 23
23 async aboutToAppear(): Promise<void> { 24 async aboutToAppear(): Promise<void> {
  25 + this.clicked = hasClicked(this.contentDTO.objectId)
24 this.loadImg = await onlyWifiLoadImg(); 26 this.loadImg = await onlyWifiLoadImg();
25 27
26 this.titleInit(); 28 this.titleInit();
@@ -95,6 +97,7 @@ export struct Card5Component { @@ -95,6 +97,7 @@ export struct Card5Component {
95 }) 97 })
96 .onClick((event: ClickEvent) => { 98 .onClick((event: ClickEvent) => {
97 this.clicked = true; 99 this.clicked = true;
  100 + persistentStorage(this.contentDTO.objectId);
98 ProcessUtils.processPage(this.contentDTO) 101 ProcessUtils.processPage(this.contentDTO)
99 }) 102 })
100 103
@@ -6,6 +6,7 @@ import { CardMediaInfo } from '../cardCommon/CardMediaInfo'; @@ -6,6 +6,7 @@ import { CardMediaInfo } from '../cardCommon/CardMediaInfo';
6 import { Notes } from './notes'; 6 import { Notes } from './notes';
7 import { onlyWifiLoadImg } from '../../utils/lazyloadImg'; 7 import { onlyWifiLoadImg } from '../../utils/lazyloadImg';
8 import { Logger } from 'wdKit/Index'; 8 import { Logger } from 'wdKit/Index';
  9 +import { persistentStorage, hasClicked } from '../../utils/persistentStorage';
9 10
10 const TAG: string = 'Card6Component-Card13Component'; 11 const TAG: string = 'Card6Component-Card13Component';
11 12
@@ -26,7 +27,7 @@ export struct Card6Component { @@ -26,7 +27,7 @@ export struct Card6Component {
26 async aboutToAppear(): Promise<void> { 27 async aboutToAppear(): Promise<void> {
27 this.titleInit(); 28 this.titleInit();
28 this.loadImg = await onlyWifiLoadImg(); 29 this.loadImg = await onlyWifiLoadImg();
29 - // this.clicked = hasClicked(this.contentDTO.objectId) 30 + this.clicked = hasClicked(this.contentDTO.objectId)
30 } 31 }
31 32
32 titleInit() { 33 titleInit() {
@@ -104,7 +105,7 @@ export struct Card6Component { @@ -104,7 +105,7 @@ export struct Card6Component {
104 } 105 }
105 .onClick((event: ClickEvent) => { 106 .onClick((event: ClickEvent) => {
106 this.clicked = true; 107 this.clicked = true;
107 - // persistentStorage(this.contentDTO.objectId); 108 + persistentStorage(this.contentDTO.objectId);
108 ProcessUtils.processPage(this.contentDTO) 109 ProcessUtils.processPage(this.contentDTO)
109 }) 110 })
110 .padding({ 111 .padding({
@@ -4,6 +4,7 @@ import { DateTimeUtils } from 'wdKit'; @@ -4,6 +4,7 @@ import { DateTimeUtils } from 'wdKit';
4 import { ProcessUtils } from 'wdRouter'; 4 import { ProcessUtils } from 'wdRouter';
5 import { Notes } from './notes'; 5 import { Notes } from './notes';
6 import { onlyWifiLoadImg } from '../../utils/lazyloadImg'; 6 import { onlyWifiLoadImg } from '../../utils/lazyloadImg';
  7 +import { persistentStorage, hasClicked } from '../../utils/persistentStorage';
7 8
8 /** 9 /**
9 * 时间链卡--CompStyle: 09 10 * 时间链卡--CompStyle: 09
@@ -23,6 +24,7 @@ export struct Card9Component { @@ -23,6 +24,7 @@ export struct Card9Component {
23 async aboutToAppear(): Promise<void> { 24 async aboutToAppear(): Promise<void> {
24 this.titleInit(); 25 this.titleInit();
25 // this.loadImg = await onlyWifiLoadImg(); 26 // this.loadImg = await onlyWifiLoadImg();
  27 + this.clicked = hasClicked(this.contentDTO.objectId)
26 } 28 }
27 29
28 titleInit() { 30 titleInit() {
@@ -111,6 +113,7 @@ export struct Card9Component { @@ -111,6 +113,7 @@ export struct Card9Component {
111 .margin({ bottom: 8 }) 113 .margin({ bottom: 8 })
112 .onClick((event: ClickEvent) => { 114 .onClick((event: ClickEvent) => {
113 this.clicked = true; 115 this.clicked = true;
  116 + persistentStorage(this.contentDTO.objectId);
114 ProcessUtils.processPage(this.contentDTO) 117 ProcessUtils.processPage(this.contentDTO)
115 }) 118 })
116 } 119 }
@@ -163,6 +166,7 @@ export struct Card9Component { @@ -163,6 +166,7 @@ export struct Card9Component {
163 .textOverflow({ overflow: TextOverflow.Ellipsis }) 166 .textOverflow({ overflow: TextOverflow.Ellipsis })
164 .alignSelf(ItemAlign.Center) 167 .alignSelf(ItemAlign.Center)
165 .margin({ left: 12 }) 168 .margin({ left: 12 })
  169 + // .padding({bottom: 20})
166 // if (item.fullColumnImgUrls[0] && item.fullColumnImgUrls[0].url) { 170 // if (item.fullColumnImgUrls[0] && item.fullColumnImgUrls[0].url) {
167 // Image(this.loadImg? item.fullColumnImgUrls[0].url : '') 171 // Image(this.loadImg? item.fullColumnImgUrls[0].url : '')
168 // .backgroundColor(0xf5f5f5) 172 // .backgroundColor(0xf5f5f5)
@@ -175,7 +179,7 @@ export struct Card9Component { @@ -175,7 +179,7 @@ export struct Card9Component {
175 } 179 }
176 .alignContent(Alignment.TopStart) 180 .alignContent(Alignment.TopStart)
177 } 181 }
178 - .height(item.fullColumnImgUrls[0] && item.fullColumnImgUrls[0].url ? 100 : 78) 182 + .height(item.fullColumnImgUrls[0] && item.fullColumnImgUrls[0].url ? 100 : 50)
179 .alignItems(HorizontalAlign.Start) 183 .alignItems(HorizontalAlign.Start)
180 } 184 }
181 } 185 }
@@ -139,7 +139,7 @@ export struct ZhSingleRow06 { @@ -139,7 +139,7 @@ export struct ZhSingleRow06 {
139 .height(16) 139 .height(16)
140 .margin({right: 3}) 140 .margin({right: 3})
141 141
142 - Text('点赞') 142 + Text(Number(this.newsStatusOfUser?.likeStatus) == 1 ? '已赞' : '点赞')
143 .fontSize(15) 143 .fontSize(15)
144 .fontColor(0x999999) 144 .fontColor(0x999999)
145 .onClick(() => { 145 .onClick(() => {
1 -// PersistentStorage.persistProp('clickedIds', []);  
2 -//  
3 -// function persistentStorage(id: string | number, type: 'add' | 'remove' | undefined = 'add') {  
4 -// let clickedIds = AppStorage.get<string>('clickedIds')?.split(',') || [];  
5 -// let index = clickedIds.indexOf(id.toString())  
6 -// if (type === 'add') {  
7 -// if (index >= 0) return;  
8 -// clickedIds.push(id.toString());  
9 -// } else if (type === 'remove') {  
10 -// clickedIds.splice(index, 1);  
11 -// }  
12 -// AppStorage.set('clickedIds', clickedIds.join(','));  
13 -// }  
14 -//  
15 -// function hasClicked(id: string | number) {  
16 -// let clickedIds = AppStorage.get<string>('clickedIds')?.split(',') || [];  
17 -// let index = clickedIds.indexOf(id.toString())  
18 -// if (index >= 0) return true;  
19 -// return false;  
20 -// }  
21 -//  
22 -// export { persistentStorage, hasClicked }  
  1 +PersistentStorage.persistProp('clickedIds', []);
  2 +
  3 +function persistentStorage(id: string | number, type: 'add' | 'remove' | undefined = 'add') {
  4 + let _clickedIds = AppStorage.get<string[]>('clickedIds');
  5 + let clickedIds = _clickedIds?.toString()?.split(',') || [];
  6 + let index = clickedIds.indexOf(id.toString())
  7 + if (type === 'add') {
  8 + if (index >= 0) return;
  9 + clickedIds.push(id.toString());
  10 + } else if (type === 'remove') {
  11 + clickedIds.splice(index, 1);
  12 + }
  13 + AppStorage.set('clickedIds', clickedIds.join(','));
  14 +}
  15 +
  16 +function hasClicked(id: string | number) {
  17 + let clickedIds = AppStorage.get<string>('clickedIds')?.split(',') || [];
  18 + let index = clickedIds.indexOf(id.toString())
  19 + if (index >= 0) return true;
  20 + return false;
  21 +}
  22 +
  23 +export { persistentStorage, hasClicked }