Merge remote-tracking branch 'origin/main'

@@ -121,15 +121,15 @@ export struct CompParser {
         CardParser({ contentDTO: this.compDTO.operDataList[0], compDTO: this.compDTO });
         Divider().strokeWidth(1).color('#f5f5f5').padding({ left: 16, right: 16 })
       } else {
-        Text(this.compDTO.compStyle)
-          .width(CommonConstants.FULL_PARENT)
-          .padding(10)
-          .onClick(() => {
-            if (this.compDTO.compStyle === CompStyle.Zh_Single_Row_06) { //精选评论
-              WDRouterRule.jumpWithPage(WDRouterPage.QualityCommentsPage)
-            }
-          })
-        Divider().strokeWidth(1).color('#f5f5f5').padding({ left: 16, right: 16 })
+        // Text(this.compDTO.compStyle)
+        //   .width(CommonConstants.FULL_PARENT)
+        //   .padding(10)
+        //   .onClick(() => {
+        //     if (this.compDTO.compStyle === CompStyle.Zh_Single_Row_06) { //精选评论
+        //       WDRouterRule.jumpWithPage(WDRouterPage.QualityCommentsPage)
+        //     }
+        //   })
+        // Divider().strokeWidth(1).color('#f5f5f5').padding({ left: 16, right: 16 })
       }
     }
 

@@ -5,6 +5,7 @@ import { CommonConstants } from 'wdConstant';
 import { ProcessUtils } from 'wdRouter';
 import { CardSourceInfo } from '../cardCommon/CardSourceInfo';
 import { Notes } from './notes';
+import { persistentStorage, hasClicked } from '../../utils/persistentStorage';
 
 const TAG = 'Card11Component';
 
@@ -23,6 +24,7 @@ export struct Card11Component {
 
   async aboutToAppear(): Promise<void> {
     this.titleInit();
+    this.clicked = hasClicked(this.contentDTO.objectId)
   }
 
   titleInit() {
@@ -76,8 +78,8 @@ export struct Card11Component {
     })
     .backgroundColor($r("app.color.white"))
     .onClick((event: ClickEvent) => {
-
       this.clicked = true;
+      persistentStorage(this.contentDTO.objectId);
       ProcessUtils.processPage(this.contentDTO)
     })
   }

@@ -4,6 +4,7 @@ import { CardMediaInfo } from '../cardCommon/CardMediaInfo'
 import { CommonConstants } from 'wdConstant/Index';
 import { ProcessUtils } from 'wdRouter';
 import {CarderInteraction} from '../CarderInteraction'
+import { persistentStorage, hasClicked } from '../../utils/persistentStorage';
 
 const TAG = 'Card12Component';
 
@@ -21,6 +22,7 @@ export struct Card12Component {
 
   aboutToAppear(): void {
     this.titleInit();
+    this.clicked = hasClicked(this.contentDTO.objectId)
   }
 
   titleInit() {
@@ -69,6 +71,7 @@ export struct Card12Component {
     })
     .onClick((event: ClickEvent) => {
       this.clicked = true;
+      persistentStorage(this.contentDTO.objectId);
       ProcessUtils.processPage(this.contentDTO)
     })
   }

@@ -5,6 +5,7 @@ import { CommonConstants } from 'wdConstant/Index';
 import { ProcessUtils } from 'wdRouter';
 import {CarderInteraction} from '../CarderInteraction'
 import { onlyWifiLoadImg } from '../../utils/lazyloadImg';
+import { persistentStorage, hasClicked } from '../../utils/persistentStorage';
 
 const TAG = 'Card14Component';
 
@@ -23,6 +24,7 @@ export struct Card14Component {
 
   async aboutToAppear(): Promise<void> {
     this.titleInit();
+    this.clicked = hasClicked(this.contentDTO.objectId)
     this.loadImg = await onlyWifiLoadImg();
   }
 
@@ -88,6 +90,7 @@ export struct Card14Component {
     })
     .onClick((event: ClickEvent) => {
       this.clicked = true;
+      persistentStorage(this.contentDTO.objectId);
       ProcessUtils.processPage(this.contentDTO)
     })
   }

@@ -5,6 +5,7 @@ import { CardMediaInfo } from '../cardCommon/CardMediaInfo'
 import { CommonConstants } from 'wdConstant/Index';
 import {CarderInteraction} from '../CarderInteraction'
 import { onlyWifiLoadImg } from '../../utils/lazyloadImg';
+import { persistentStorage, hasClicked } from '../../utils/persistentStorage';
 
 const TAG: string = 'Card15Component';
 
@@ -27,6 +28,7 @@ export struct Card15Component {
 
   async aboutToAppear(): Promise<void> {
     this.titleInit();
+    this.clicked = hasClicked(this.contentDTO.objectId)
     this.loadImg = await onlyWifiLoadImg();
   }
 
@@ -85,6 +87,7 @@ export struct Card15Component {
     })
     .onClick((event: ClickEvent) => {
       this.clicked = true;
+      persistentStorage(this.contentDTO.objectId);
       ProcessUtils.processPage(this.contentDTO)
     })
   }

@@ -5,6 +5,7 @@ import { CommonConstants } from 'wdConstant/Index';
 import { ProcessUtils } from 'wdRouter';
 import {CarderInteraction} from '../CarderInteraction'
 import { onlyWifiLoadImg } from '../../utils/lazyloadImg';
+import { persistentStorage, hasClicked } from '../../utils/persistentStorage';
 
 const TAG = 'Card16Component';
 
@@ -28,6 +29,7 @@ export struct Card16Component {
 
   async aboutToAppear(): Promise<void> {
     this.titleInit();
+    this.clicked = hasClicked(this.contentDTO.objectId)
     this.loadImg = await onlyWifiLoadImg();
   }
 
@@ -87,6 +89,7 @@ export struct Card16Component {
     })
     .onClick((event: ClickEvent) => {
       this.clicked = true;
+      persistentStorage(this.contentDTO.objectId);
       ProcessUtils.processPage(this.contentDTO)
     })
   }

@@ -5,6 +5,7 @@ import { WDRouterRule } from 'wdRouter';
 import { CardSourceInfo } from '../cardCommon/CardSourceInfo';
 import { onlyWifiLoadImg } from '../../utils/lazyloadImg';
 import { CardMediaInfo } from '../cardCommon/CardMediaInfo';
+import { persistentStorage, hasClicked } from '../../utils/persistentStorage';
 
 const TAG = 'Card17Component';
 
@@ -24,6 +25,7 @@ export struct Card17Component {
 
   async aboutToAppear(): Promise<void> {
     this.titleInit();
+    this.clicked = hasClicked(this.contentDTO.objectId)
     this.loadImg = await onlyWifiLoadImg();
   }
 
@@ -105,6 +107,7 @@ export struct Card17Component {
       .width(CommonConstants.FULL_WIDTH)
       .onClick((event: ClickEvent) => {
         this.clicked = true;
+        persistentStorage(this.contentDTO.objectId);
         let taskAction: Action = {
           type: 'JUMP_DETAIL_PAGE',
           params: {

@@ -4,6 +4,7 @@ import { ProcessUtils } from 'wdRouter';
 import { CommonConstants } from 'wdConstant/Index';
 import { CarderInteraction } from '../CarderInteraction'
 import { onlyWifiLoadImg } from '../../utils/lazyloadImg';
+import { persistentStorage, hasClicked } from '../../utils/persistentStorage';
 
 const TAG = 'Card19Component';
 
@@ -21,6 +22,7 @@ export struct Card19Component {
 
   async aboutToAppear(): Promise<void> {
     this.titleInit();
+    this.clicked = hasClicked(this.contentDTO.objectId)
     console.log('card19',JSON.stringify(this.contentDTO))
   }
 
@@ -74,6 +76,7 @@ export struct Card19Component {
     })
     .onClick((event: ClickEvent) => {
       this.clicked = true;
+      persistentStorage(this.contentDTO.objectId);
       ProcessUtils.processPage(this.contentDTO)
     })
   }

@@ -5,6 +5,7 @@ import { CommonConstants } from 'wdConstant/Index';
 import { ProcessUtils } from 'wdRouter';
 import {CarderInteraction} from '../CarderInteraction'
 import { onlyWifiLoadImg } from '../../utils/lazyloadImg';
+import { persistentStorage, hasClicked } from '../../utils/persistentStorage';
 
 const TAG = 'Card20Component';
 
@@ -22,6 +23,7 @@ export struct Card20Component {
 
   aboutToAppear(): void {
     this.titleInit();
+    this.clicked = hasClicked(this.contentDTO.objectId)
   }
 
   titleInit() {
@@ -71,6 +73,7 @@ export struct Card20Component {
     })
     .onClick((event: ClickEvent) => {
       this.clicked = true;
+      persistentStorage(this.contentDTO.objectId);
       ProcessUtils.processPage(this.contentDTO)
     })
   }

@@ -5,6 +5,7 @@ import { RmhTitle } from '../cardCommon/RmhTitle'
 import { CardMediaInfo } from '../cardCommon/CardMediaInfo'
 import {CarderInteraction} from '../CarderInteraction'
 import { onlyWifiLoadImg } from '../../utils/lazyloadImg';
+import { persistentStorage, hasClicked } from '../../utils/persistentStorage';
 
 const TAG: string = 'Card6Component-Card13Component';
 
@@ -23,6 +24,7 @@ export struct Card21Component {
 
   async aboutToAppear(): Promise<void> {
     this.titleInit();
+    this.clicked = hasClicked(this.contentDTO.objectId)
     this.loadImg = await onlyWifiLoadImg();
   }
 
@@ -79,6 +81,7 @@ export struct Card21Component {
     }
     .onClick((event: ClickEvent) => {
       this.clicked = true;
+      persistentStorage(this.contentDTO.objectId);
       ProcessUtils.processPage(this.contentDTO)
     })
     .padding({

@@ -7,7 +7,7 @@ import { CardSourceInfo } from '../cardCommon/CardSourceInfo';
 import { Notes } from './notes';
 import { onlyWifiLoadImg } from '../../utils/lazyloadImg';
 
-// import { persistentStorage, hasClicked } from '../../utils/persistentStorage';
+import { persistentStorage, hasClicked } from '../../utils/persistentStorage';
 const TAG: string = 'Card2Component';
 
 /**
@@ -29,9 +29,9 @@ export struct Card2Component {
   @State str03: string = '';
 
   async aboutToAppear(): Promise<void> {
+    this.clicked = hasClicked(this.contentDTO.objectId)
     this.titleInit();
     this.loadImg = await onlyWifiLoadImg();
-    // this.clicked = hasClicked(this.contentDTO.objectId)
   }
 
   titleInit() {
@@ -109,7 +109,7 @@ export struct Card2Component {
     })
     .onClick((event: ClickEvent) => {
       this.clicked = true;
-      // persistentStorage(this.contentDTO.objectId);
+      persistentStorage(this.contentDTO.objectId);
       ProcessUtils.processPage(this.contentDTO)
     })
   }

@@ -3,6 +3,7 @@ import { CompDTO, ContentDTO } from 'wdBean';
 import { ProcessUtils } from 'wdRouter';
 import { CardSourceInfo } from '../cardCommon/CardSourceInfo';
 import { Notes } from './notes';
+import { persistentStorage, hasClicked } from '../../utils/persistentStorage';
 
 /**
  * 卡片样式："appStyle":"3"
@@ -20,7 +21,7 @@ export struct Card3Component {
 
   async aboutToAppear(): Promise<void> {
     this.titleInit();
-    // this.clicked = hasClicked(this.contentDTO.objectId)
+    this.clicked = hasClicked(this.contentDTO.objectId)
   }
 
   titleInit() {
@@ -71,6 +72,7 @@ export struct Card3Component {
     })
     .onClick((event: ClickEvent) => {
       this.clicked = true;
+      persistentStorage(this.contentDTO.objectId);
       ProcessUtils.processPage(this.contentDTO)
     })
   }

@@ -5,6 +5,7 @@ import { CardSourceInfo } from '../cardCommon/CardSourceInfo'
 import { CardMediaInfo } from '../cardCommon/CardMediaInfo'
 import { onlyWifiLoadImg } from '../../utils/lazyloadImg';
 import { Notes } from './notes';
+import { persistentStorage, hasClicked } from '../../utils/persistentStorage';
 const TAG: string = 'Card4Component';
 
 /**
@@ -26,6 +27,7 @@ export struct Card4Component {
   @ObjectLink compDTO: CompDTO
 
   async aboutToAppear(): Promise<void> {
+    this.clicked = hasClicked(this.contentDTO.objectId)
     this.titleInit();
     this.loadImg = await onlyWifiLoadImg();
   }
@@ -102,6 +104,7 @@ export struct Card4Component {
       .alignItems(HorizontalAlign.Start)
       .onClick((event: ClickEvent) => {
         this.clicked = true;
+        persistentStorage(this.contentDTO.objectId);
         ProcessUtils.processPage(this.contentDTO)
       })
       //bottom 评论等信息

@@ -3,6 +3,7 @@ import { CommonConstants } from 'wdConstant';
 import { ProcessUtils } from 'wdRouter';
 import { onlyWifiLoadImg } from '../../utils/lazyloadImg';
 import { Notes } from './notes';
+import { persistentStorage, hasClicked } from '../../utils/persistentStorage';
 
 const TAG: string = 'Card5Component';
 
@@ -21,6 +22,7 @@ export struct Card5Component {
   @State str03: string = '';
 
   async aboutToAppear(): Promise<void> {
+    this.clicked = hasClicked(this.contentDTO.objectId)
     this.loadImg = await onlyWifiLoadImg();
 
     this.titleInit();
@@ -95,6 +97,7 @@ export struct Card5Component {
     })
     .onClick((event: ClickEvent) => {
       this.clicked = true;
+      persistentStorage(this.contentDTO.objectId);
       ProcessUtils.processPage(this.contentDTO)
     })
 

@@ -6,6 +6,7 @@ import { CardMediaInfo } from '../cardCommon/CardMediaInfo';
 import { Notes } from './notes';
 import { onlyWifiLoadImg } from '../../utils/lazyloadImg';
 import { Logger } from 'wdKit/Index';
+import { persistentStorage, hasClicked } from '../../utils/persistentStorage';
 
 const TAG: string = 'Card6Component-Card13Component';
 
@@ -26,7 +27,7 @@ export struct Card6Component {
   async aboutToAppear(): Promise<void> {
     this.titleInit();
     this.loadImg = await onlyWifiLoadImg();
-    // this.clicked = hasClicked(this.contentDTO.objectId)
+    this.clicked = hasClicked(this.contentDTO.objectId)
   }
 
   titleInit() {
@@ -104,7 +105,7 @@ export struct Card6Component {
     }
     .onClick((event: ClickEvent) => {
       this.clicked = true;
-      // persistentStorage(this.contentDTO.objectId);
+      persistentStorage(this.contentDTO.objectId);
       ProcessUtils.processPage(this.contentDTO)
     })
     .padding({

@@ -4,6 +4,7 @@ import { DateTimeUtils } from 'wdKit';
 import { ProcessUtils } from 'wdRouter';
 import { Notes } from './notes';
 import { onlyWifiLoadImg } from '../../utils/lazyloadImg';
+import { persistentStorage, hasClicked } from '../../utils/persistentStorage';
 
 /**
  * 时间链卡--CompStyle:  09
@@ -23,6 +24,7 @@ export struct Card9Component {
   async aboutToAppear(): Promise<void> {
     this.titleInit();
     // this.loadImg = await onlyWifiLoadImg();
+    this.clicked = hasClicked(this.contentDTO.objectId)
   }
 
   titleInit() {
@@ -111,6 +113,7 @@ export struct Card9Component {
     .margin({ bottom: 8 })
     .onClick((event: ClickEvent) => {
       this.clicked = true;
+      persistentStorage(this.contentDTO.objectId);
       ProcessUtils.processPage(this.contentDTO)
     })
   }
@@ -163,6 +166,7 @@ export struct Card9Component {
               .textOverflow({ overflow: TextOverflow.Ellipsis })
               .alignSelf(ItemAlign.Center)
               .margin({ left: 12 })
+              // .padding({bottom: 20})
             // if (item.fullColumnImgUrls[0] && item.fullColumnImgUrls[0].url) {
             //   Image(this.loadImg? item.fullColumnImgUrls[0].url : '')
             //     .backgroundColor(0xf5f5f5)
@@ -175,7 +179,7 @@ export struct Card9Component {
       }
       .alignContent(Alignment.TopStart)
     }
-    .height(item.fullColumnImgUrls[0] && item.fullColumnImgUrls[0].url ? 100 : 78)
+    .height(item.fullColumnImgUrls[0] && item.fullColumnImgUrls[0].url ? 100 : 50)
     .alignItems(HorizontalAlign.Start)
   }
 }
\ No newline at end of file

@@ -139,7 +139,7 @@ export struct ZhSingleRow06 {
             .height(16)
             .margin({right: 3})
 
-          Text('点赞')
+          Text(Number(this.newsStatusOfUser?.likeStatus) == 1 ? '已赞' : '点赞')
             .fontSize(15)
             .fontColor(0x999999)
             .onClick(() => {

-// PersistentStorage.persistProp('clickedIds', []);
-//
-// function persistentStorage(id: string | number, type: 'add' | 'remove' | undefined = 'add') {
-//   let clickedIds = AppStorage.get<string>('clickedIds')?.split(',') || [];
-//   let index = clickedIds.indexOf(id.toString())
-//   if (type === 'add') {
-//     if (index >= 0) return;
-//     clickedIds.push(id.toString());
-//   } else if (type === 'remove') {
-//     clickedIds.splice(index, 1);
-//   }
-//   AppStorage.set('clickedIds', clickedIds.join(','));
-// }
-//
-// function hasClicked(id: string | number) {
-//   let clickedIds = AppStorage.get<string>('clickedIds')?.split(',') || [];
-//   let index = clickedIds.indexOf(id.toString())
-//   if (index >= 0) return true;
-//   return false;
-// }
-//
-// export { persistentStorage, hasClicked }
\ No newline at end of file
+PersistentStorage.persistProp('clickedIds', []);
+
+function persistentStorage(id: string | number, type: 'add' | 'remove' | undefined = 'add') {
+  let _clickedIds = AppStorage.get<string[]>('clickedIds');
+  let clickedIds = _clickedIds?.toString()?.split(',') || [];
+  let index = clickedIds.indexOf(id.toString())
+  if (type === 'add') {
+    if (index >= 0) return;
+    clickedIds.push(id.toString());
+  } else if (type === 'remove') {
+    clickedIds.splice(index, 1);
+  }
+  AppStorage.set('clickedIds', clickedIds.join(','));
+}
+
+function hasClicked(id: string | number) {
+  let clickedIds = AppStorage.get<string>('clickedIds')?.split(',') || [];
+  let index = clickedIds.indexOf(id.toString())
+  if (index >= 0) return true;
+  return false;
+}
+
+export { persistentStorage, hasClicked }
\ No newline at end of file