Merge remote-tracking branch 'origin/main'

@@ -2,8 +2,8 @@
   "app": {
     "bundleName": "com.peopledailychina.hosactivity",
     "vendor": "$string:app_vendor",
-    "versionCode": 7370,
-    "versionName": "7.3.7.0",
+    "versionCode": 7390,
+    "versionName": "7.3.9.0",
     "icon": "$media:app_icon",
     "label": "$string:app_name"
   }

@@ -48,9 +48,9 @@ export struct ENewspaperItemComponent {
           this.isShowSkeleton = false
         })
         .objectFit(ImageFit.Fill)
-        .visibility(this.isShowSkeleton ? Visibility.None : Visibility.Visible)
+        .zIndex(10)
       newsSkeleton()
-        .visibility(this.isShowSkeleton ? Visibility.Visible : Visibility.None)
+        .zIndex(1)
       if (this.contentWidth !== 0) {
         Canvas(this.context)
           .width(px2vp(this.contentWidth))
@@ -59,6 +59,7 @@ export struct ENewspaperItemComponent {
           .onReady(() => {
 
           })
+          .zIndex(15)
       }
     }
     .padding({

@@ -14,6 +14,7 @@ import { viewBlogItemInsightIntentShare } from '../utils/InsightIntentShare'
 import { common } from '@kit.AbilityKit';
 import { PageRepository } from '../repository/PageRepository';
 import { CommentDialogView } from './CommentDialogView';
+import { faceDetector } from '@kit.CoreVisionKit';
 
 const TAG: string = 'SpacialTopicPageComponent'
 
@@ -40,7 +41,7 @@ export struct SpacialTopicPageComponent {
   @State bottomSafeHeight: number = AppStorage.get<number>('bottomSafeHeight') || 0
   @State isNetConnected: boolean = true
   @Provide topSafeHeight: number = AppStorage.get<number>('topSafeHeight') || 0
-
+  @State showComment: boolean = false
   private trySendData2H5() {
     if (!this.webPrepared || !this.dataPrepared) {
       return
@@ -204,14 +205,14 @@ export struct SpacialTopicPageComponent {
             this.showCommentList = true
           }
         })
-        // //全部评论
-        // CommentDialogView({
-        //   index: $index,
-        //   currentIndex: $currentIndex,
-        //   showCommentList: $showCommentList,
-        //   publishCommentModel: $publishCommentModel,
-        //   interactData: $interactData,
-        // })
+        //全部评论
+        CommentDialogView({
+          index: $index,
+          currentIndex: $currentIndex,
+          showCommentList: $showCommentList,
+          publishCommentModel: $publishCommentModel,
+          interactData: $interactData,
+        }).visibility(this.showComment?Visibility.Visible:Visibility.Hidden)
       }
     }.width(CommonConstants.FULL_WIDTH).height(CommonConstants.FULL_HEIGHT)
   }

@@ -3,6 +3,7 @@ import { ContentDetailDTO } from 'wdBean/Index'
 import { DetailDialog } from './DetailDialog'
 import { componentUtils } from '@kit.ArkUI'
 
+const TAG = 'PlayerTitleView';
 @Preview
 @Component
 export struct PlayerTitleView {
@@ -11,6 +12,9 @@ export struct PlayerTitleView {
   @Consume isOpenDetail: boolean
   @Consume isDragging: boolean
   @State titleHeight: number = 0
+  @State rmhPlatform: number = 0 // 1是人民号
+  @State isOverLines: boolean = false
+  @State summary: string = ''
   dialogController: CustomDialogController = new CustomDialogController({
     builder: DetailDialog({
       name: this.getName(),
@@ -26,7 +30,11 @@ export struct PlayerTitleView {
 
   getName(): string {
     // authTitle
-    return this.contentDetailData?.rmhInfo?.rmhName || ''
+    if (this.rmhPlatform == 0) {
+      return this.contentDetailData?.newsSourceName || ''
+    } else {
+      return this.contentDetailData?.rmhInfo?.rmhName || ''
+    }
   }
 
   getIcon(): string {
@@ -41,7 +49,45 @@ export struct PlayerTitleView {
     return this.contentDetailData?.newIntroduction || ''
   }
 
+  /**
+   * 截断文本
+   * @author liuzhendong(猩猩G)
+   * @param {string} str   要截断的文本   '啊啊啊啊啊'
+   * @param {number} fontSize  字体大小(px)
+   * @param {number} maxLines  最大行数   3
+   * @param {number} textWidth 文本宽度(px)  vp 需要转换vp2px()
+   * @returns {string} clipStr  截断后的文本 '啊啊'
+   */
+  clipText(str: string, fontSize: number, maxLines: number, textWidth: number): string {
+    let strArr: string[] = str.split("")
+    let truncateContent: string = '啊啊啊啊啊啊' // ...比正常文字宽度更小，这里使用啊啊啊(任意三个文字)代替计算
+    let measureTruncateWidth: number = measure.measureText({
+      textContent: truncateContent,
+      fontSize: fontSize,
+      fontWeight: 400,
+      lineHeight: 20,
+      wordBreak:WordBreak.BREAK_ALL
+    })
+    let clipStr: string = ''
+    for (let i = 0; i < strArr.length; i++) {
+      if (measure.measureText({
+        textContent: clipStr,
+        fontSize: fontSize,
+        fontWeight: 400,
+        lineHeight: 20,
+        wordBreak:WordBreak.BREAK_ALL
+      }) >= textWidth * maxLines - measureTruncateWidth) {
+        this.isOverLines = true
+        break;
+      }
+      clipStr += strArr[i]
+    }
+    console.log(TAG, 'clipStr:', clipStr)
+    return clipStr
+  }
+
   aboutToAppear(): void {
+    this.rmhPlatform = this.contentDetailData?.rmhPlatform || 0
     const info = measure.measureTextSize({
       textContent: this.getTitle(),
       fontSize: 15,
@@ -52,6 +98,8 @@ export struct PlayerTitleView {
     })
     this.titleHeight = info?.height as number || 0
     console.log('titleHeight:', this.titleHeight,)
+    console.log(TAG, 'this.contentDetailData:', JSON.stringify(this.contentDetailData))
+    this.summary = this.getSummary()
   }
 
   build() {
@@ -64,7 +112,7 @@ export struct PlayerTitleView {
             .maxLines(1)
             .lineHeight(25)
             .fontWeight(600)
-            .fontFamily('PingFang SC-Regular')
+            .fontFamily('PingFang SC-Semibold')
             .textOverflow({ overflow: TextOverflow.Ellipsis })
 
           if (this.getIcon()) {
@@ -87,26 +135,70 @@ export struct PlayerTitleView {
       /**
        * 标题大于三行或存在简介显示查看详情按钮
        */
-      if (this.titleHeight > 200 || this.getSummary()) {
-        Text('查看详情 > ')
-          .padding({
-            left: 6,
-            right: 6,
-            top: 4,
-            bottom: 4
-          })
-          .borderRadius(2)
-          .backgroundColor('#99636363')
-          .fontFamily('PingFang SC-Regular')
-          .fontColor(Color.White)
-          .fontSize(12)
-          .lineHeight(14)
-          .fontWeight(400)
-          .margin({ bottom: 8 })
-          .onClick(() => {
-            this.isOpenDetail = true
-            this.dialogController?.open()
-          })
+      if (this.rmhPlatform == 1) {
+        if (this.titleHeight > 200 || this.summary) {
+          Text('查看详情 > ')
+            .padding({
+              left: 6,
+              right: 6,
+              top: 4,
+              bottom: 4
+            })
+            .borderRadius(2)
+            .backgroundColor('#99636363')
+            .fontFamily('PingFang SC-Regular')
+            .fontColor(Color.White)
+            .fontSize(12)
+            .lineHeight(14)
+            .fontWeight(400)
+            .margin({ bottom: 8 })
+            .onClick(() => {
+              this.isOpenDetail = true
+              this.dialogController?.open()
+            })
+        }
+      } else {
+        if(this.summary) {
+          Text() {
+            Span(this.clipText(this.summary, 14, 2, this.windowWidth - 150 - vp2px(50)))
+              .fontSize(14)
+              .fontColor(Color.White)
+              .lineHeight(21)
+              .fontWeight(400)
+              .fontFamily('PingFang SC-Regular')
+            if (this.isOverLines) {
+              Span('...    全文')
+                .fontColor('#888888')
+                .fontWeight(400)
+                .fontFamily('PingFang SC-Regular')
+                .fontSize(12)
+                .onClick(() => {
+                  this.isOpenDetail = true
+                  this.dialogController?.open()
+                })
+              ImageSpan($r('app.media.comment_unfold_svg'))
+                .width(14)
+                .height(14)
+                .objectFit(ImageFit.Fill)
+                .verticalAlign(ImageSpanAlignment.CENTER)
+                .padding({
+                  bottom: 4
+                })
+                .onClick(() => {
+                  this.isOpenDetail = true
+                  this.dialogController?.open()
+                })
+
+            }
+          }
+            .padding({
+              left: 6,
+              right: 6,
+              top: 4,
+              bottom: 4
+            })
+            .margin({ bottom: 8 })
+        }
       }
 
     }

+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" fill="none" version="1.1" width="16" height="16" viewBox="0 0 16 16"><g transform="matrix(0,-1,1,0,-16,16)"><g><path d="M10.303455641479491,17.960819560243227L4.363755241479492,23.900515460243227Q4.324434578479492,23.939835460243224,4.324704443879492,23.995445460243225Q4.324434578479492,24.051055460243226,4.363755241479492,24.090375460243223L10.303455641479491,30.030075460243225Q10.342505641479491,30.069075460243226,10.397735641479493,30.069075460243226Q10.452965641479492,30.069075460243226,10.492015641479492,30.030075460243225L11.387685641479493,29.134375460243227Q11.406435641479492,29.115675460243224,11.416585641479493,29.091175460243225Q11.426735641479493,29.066675460243225,11.426735641479493,29.040075460243223Q11.426735641479493,29.013575460243224,11.416585641479493,28.989075460243225Q11.406435641479492,28.964575460243225,11.387685641479493,28.945875460243226L6.437285641479493,23.995445460243225L11.387685641479493,19.045045460243227Q11.406435641479492,19.026295460243226,11.416585641479493,19.001795460243226Q11.426735641479493,18.977295460243226,11.426735641479493,18.950765460243225Q11.426735641479493,18.924245460243224,11.416585641479493,18.899744460243227Q11.406435641479492,18.875241460243224,11.387685641479493,18.856488460243224L10.492015641479492,17.960819560243227Q10.452965641479492,17.921767119783226,10.397735641479493,17.921767119783226Q10.342505641479491,17.921767119783226,10.303455641479491,17.960819560243227Z" fill-rule="evenodd" fill="#888888" fill-opacity="1"/></g></g></svg>
\ No newline at end of file