Merge remote-tracking branch 'origin/main'

 //缩略标题
-import { CommonConstants } from 'wdConstant'
-import { ContentDTO } from 'wdBean'
-import { DateTimeUtils } from 'wdKit'
+import { CommonConstants } from 'wdConstant';
+import { ContentDTO } from 'wdBean';
 import { ProcessUtils } from 'wdRouter';
-import { CardSourceInfo } from '../cardCommon/CardSourceInfo'
+import { CardSourceInfo } from '../cardCommon/CardSourceInfo';
+import { Notes } from './notes';
+
 const TAG = 'Card11Component';
 
 /**
@@ -16,12 +17,21 @@ export struct Card11Component {
 
   build() {
     Column() {
-      Text(this.contentDTO.newsTitle)
-        .fontSize($r("app.float.font_size_16"))
-        .fontColor(this.clicked ? 0x848484 : $r("app.color.color_222222"))
-        .maxLines(3)
-        .textOverflow({ overflow: TextOverflow.Ellipsis })
-        .width(CommonConstants.FULL_WIDTH)
+      Stack() {
+        if (this.contentDTO.objectType == '5') {
+          Notes({ objectType: this.contentDTO.objectType })
+        }
+        Text(this.contentDTO.newsTitle)
+          .fontSize($r("app.float.font_size_16"))
+          .fontColor(this.clicked ? 0x848484 : $r("app.color.color_222222"))
+          .maxLines(3)
+          .textOverflow({ overflow: TextOverflow.Ellipsis })
+          .width(CommonConstants.FULL_WIDTH)
+          .textIndent(this.contentDTO.objectType == '5' ? 35 : 0)
+
+      }.alignContent(Alignment.TopStart)
+
+
       // 评论等信息
       CardSourceInfo({ contentDTO: this.contentDTO })
     }.width(CommonConstants.FULL_WIDTH)

 import { ContentDTO } from 'wdBean';
-import { CommonConstants } from 'wdConstant'
+import { CommonConstants } from 'wdConstant';
 import { ProcessUtils } from 'wdRouter';
-import { CardSourceInfo } from '../cardCommon/CardSourceInfo'
+import { CardSourceInfo } from '../cardCommon/CardSourceInfo';
+import { Notes } from './notes';
 
 /**
  * 卡片样式："appStyle":"3"
@@ -14,10 +15,17 @@ export struct Card3Component {
 
   build() {
     Column() {
-      Text(this.contentDTO.newsTitle)
-        .fontSize($r("app.float.font_size_16"))
-        .fontColor(this.clicked ? 0x848484 : $r("app.color.color_222222"))
-        .width(CommonConstants.FULL_WIDTH)
+      Stack() {
+        if (this.contentDTO.objectType == '5') {
+          Notes({ objectType: this.contentDTO.objectType })
+        }
+        Text(this.contentDTO.newsTitle)
+          .fontSize($r("app.float.font_size_16"))
+          .fontColor(this.clicked ? 0x848484 : $r("app.color.color_222222"))
+          .width(CommonConstants.FULL_WIDTH)
+          .textIndent(this.contentDTO.objectType == '5' ? 35 : 0)
+      }.alignContent(Alignment.TopStart)
+
       // 评论等信息
       CardSourceInfo({ contentDTO: this.contentDTO })
     }

@@ -22,13 +22,12 @@ export struct Card5Component {
 
   build() {
     Stack() {
-
       Image(this.loadImg ? this.contentDTO.coverUrl : '')
         .backgroundColor(0xf5f5f5)
         .width(CommonConstants.FULL_WIDTH)
         .autoResize(true)
         .borderRadius($r('app.float.image_border_radius'))
-      if (this.titleShowPolicy === 1) {
+      if (this.titleShowPolicy === 1 || this.titleShowPolicy === null) {
         Row()
           .width(CommonConstants.FULL_WIDTH)
           .height(59)