Merge branch 'main' of http://192.168.1.42/developOne/harmonyPool

@@ -37,7 +37,7 @@ struct PeopleShipHomePage {
   @Provide @Watch('handleChangeAttentionStata') isLoadingAttention: boolean = false
   //关注显示
   @State attentionOpacity: boolean = false
-  @Provide topHeight: number = 214
+  @Provide topHeight: number = 190
   @State isLoading: boolean = true
   @State topSafeHeight: number = AppStorage.get<number>('topSafeHeight') || 0
   @State isConnectNetwork : boolean = NetworkUtil.isNetConnected()
@@ -101,7 +101,7 @@ struct PeopleShipHomePage {
                     topHeight: this.topHeight
                   })
                     .width("100%")
-                    .height(this.topHeight)
+                    // .height(this.topHeight)
                   // 列表
                   Column(){
                     PeopleShipHomeListComponent({

@@ -28,7 +28,7 @@ export struct PeopleShipHomePageTopComponent {
   @State collapseTxt: string = '…展开';
   private subTxt: string = '';
   @State content: string = ''
-  @State topFixedHeight: number = 214
+  @State topFixedHeight: number = 190
   @State lineInNum: number = 1
   @Link topHeight: number
   @State provinceName: string = ''
@@ -323,7 +323,7 @@ export struct PeopleShipHomePageTopComponent {
       }
     }
     if (this.detailModel) {
-      this.topFixedHeight = 214
+      this.topFixedHeight = 190
       if (this.detailModel.region && this.detailModel.region.length > 0) {
         this.provinceName = this.detailModel.region
       } else {
@@ -364,7 +364,6 @@ export struct PeopleShipHomePageTopComponent {
           this.topHeight = this.topFixedHeight + (this.isCollapse ? 21 * 3 : 21 * this.lineInNum)
         }
       }
-
     }
   }
 

@@ -207,6 +207,8 @@ export struct DetailPlayShortVideoPage {
 
     this.contentTrackingDict()
     this.publishCommentModel.targetId = String(this.contentDetailData?.newsId || '')
+    this.publishCommentModel.targetTitle = String(this.contentDetailData?.newsTitle || '')
+    this.publishCommentModel.targetType = String(this.contentDetailData?.newsType || '')
   }
 
   contentTrackingDict() {

@@ -72,6 +72,7 @@ struct LaunchAdvertisingPage {
             }else {
               //显示图片
               Image(this.defaultModel.bootScreenUrl)
+                .objectFit(ImageFit.Contain)
                 // .expandSafeArea([SafeAreaType.SYSTEM], [SafeAreaEdge.TOP, SafeAreaEdge.BOTTOM])
                 .width('100%')
                 .height('100%')