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

* 'main' of http://192.168.1.42/developOne/harmonyPool:
  fix |> 话题专题列表页标签文字写死为【调查
  noncode: 修改包版本号
  fix: 视频引导手势问题

@@ -2,8 +2,8 @@
   "app": {
   "app": {
     "bundleName": "com.peopledailychina.hosactivity",
     "bundleName": "com.peopledailychina.hosactivity",
     "vendor": "$string:app_vendor",
     "vendor": "$string:app_vendor",
-    "versionCode": 7391,
-    "versionName": "7.3.9.1",
+    "versionCode": 7392,
+    "versionName": "7.3.9.2",
     "icon": "$media:app_icon",
     "icon": "$media:app_icon",
     "label": "$string:app_name"
     "label": "$string:app_name"
   }
   }

@@ -69,9 +69,9 @@ export class ContentDTO implements BaseDTO {
   vImageUrl: string = '';
   vImageUrl: string = '';
   screenType: string = '';
   screenType: string = '';
   source: string = '';
   source: string = '';
-  objectType: string = '';
+  objectType: string = '';//0:不跳转 1:点播,2:直播,3:活动,4:广告,5:专题,6:链接,7:榜单,8:图文,9:组图,10:H5新闻,11:频道,12:组件,13:音频,14动态图文,15动态视频
   objectId: string = '';
   objectId: string = '';
-  objectLevel: string = '';
+  objectLevel: string = '';// 对象分类;频道(1:一级频道,2:二级频道),专题(21:文章专题,22:音频专题,23:直播专题,24:话题专题)
   channelId: string = '';
   channelId: string = '';
   relId: string = '';
   relId: string = '';
   relType: string = '';
   relType: string = '';

@@ -122,7 +122,7 @@ export struct Card10Component {
             ProcessUtils.processPage(this.contentDTO)
             ProcessUtils.processPage(this.contentDTO)
           })
           })
         if (this.contentDTO.objectType == '5') {
         if (this.contentDTO.objectType == '5') {
-          Notes({ objectType: 5 }).margin({ left: 5, bottom: 5 })
+          Notes({ objectType: 5,objectLevel:this.contentDTO.objectLevel }).margin({ left: 5, bottom: 5 })
         }
         }
       }.alignContent(Alignment.BottomStart)
       }.alignContent(Alignment.BottomStart)
 
 
@@ -212,7 +212,7 @@ export struct Card10ComponentTimelineItem {
         Column() {
         Column() {
           Stack() {
           Stack() {
             if (this.slideItem.objectType == '5') {
             if (this.slideItem.objectType == '5') {
-              Notes({ objectType: 5 })
+              Notes({ objectType: 5,objectLevel:this.slideItem.objectLevel })
             }
             }
             Text(this.slideItem.newsTitle)
             Text(this.slideItem.newsTitle)
               .fontSize($r('app.float.font_size_17'))
               .fontSize($r('app.float.font_size_17'))
@@ -255,7 +255,7 @@ export struct Card10ComponentTimelineItem {
         Column() {
         Column() {
           Stack() {
           Stack() {
             if (this.slideItem.objectType == '5') {
             if (this.slideItem.objectType == '5') {
-              Notes({ objectType: 5 })
+              Notes({ objectType: 5,objectLevel:this.slideItem.objectLevel })
             }
             }
             Text(this.slideItem.newsTitle)
             Text(this.slideItem.newsTitle)
               .fontSize($r('app.float.font_size_17'))
               .fontSize($r('app.float.font_size_17'))

@@ -41,7 +41,7 @@ export struct Card11Component {
     Column() {
     Column() {
       Stack() {
       Stack() {
         if(this.contentDTO.objectType == '5'){
         if(this.contentDTO.objectType == '5'){
-          Notes({ objectType: this.contentDTO.objectType,  }).height(28).align(Alignment.Center)
+          Notes({ objectType: this.contentDTO.objectType,objectLevel:this.contentDTO.objectLevel }).height(28).align(Alignment.Center)
         } else {
         } else {
           if (this.contentDTO.seoTags) {
           if (this.contentDTO.seoTags) {
             Notes({ newTags: this.contentDTO.seoTags }).height(28).align(Alignment.Center)
             Notes({ newTags: this.contentDTO.seoTags }).height(28).align(Alignment.Center)

@@ -56,7 +56,7 @@ export struct Card20Component {
       if (this.contentDTO.newsTitle) {
       if (this.contentDTO.newsTitle) {
         Stack() {
         Stack() {
           if(this.contentDTO.objectType == '5'){
           if(this.contentDTO.objectType == '5'){
-            Notes({ objectType: this.contentDTO.objectType }).height(29).align(Alignment.Center)
+            Notes({ objectType: this.contentDTO.objectType,objectLevel:this.contentDTO.objectLevel }).height(29).align(Alignment.Center)
           } else {
           } else {
             if (this.contentDTO.seoTags) {
             if (this.contentDTO.seoTags) {
               Notes({ newTags: this.contentDTO.seoTags }).height(29).align(Alignment.Center)
               Notes({ newTags: this.contentDTO.seoTags }).height(29).align(Alignment.Center)

@@ -49,7 +49,7 @@ export struct Card2Component {
       Column() {
       Column() {
         Stack() {
         Stack() {
           if(this.contentDTO.objectType == '5'){
           if(this.contentDTO.objectType == '5'){
-            Notes({ objectType: this.contentDTO.objectType }).height(29).align(Alignment.Center)
+            Notes({ objectType: this.contentDTO.objectType,objectLevel:this.contentDTO.objectLevel }).height(29).align(Alignment.Center)
           } else {
           } else {
             if (this.contentDTO.seoTags) {
             if (this.contentDTO.seoTags) {
               Notes({ newTags: this.contentDTO.seoTags }).height(29).align(Alignment.Center)
               Notes({ newTags: this.contentDTO.seoTags }).height(29).align(Alignment.Center)

@@ -39,7 +39,7 @@ export struct Card3Component {
     Column() {
     Column() {
       Stack() {
       Stack() {
         if(this.contentDTO.objectType == '5'){
         if(this.contentDTO.objectType == '5'){
-          Notes({ objectType: this.contentDTO.objectType }).height(29).align(Alignment.Center)
+          Notes({ objectType: this.contentDTO.objectType,objectLevel:this.contentDTO.objectLevel }).height(29).align(Alignment.Center)
         } else {
         } else {
           if (this.contentDTO.seoTags) {
           if (this.contentDTO.seoTags) {
             Notes({ newTags: this.contentDTO.seoTags }).height(29).align(Alignment.Center)
             Notes({ newTags: this.contentDTO.seoTags }).height(29).align(Alignment.Center)

@@ -49,7 +49,7 @@ export struct Card4Component {
       Column() {
       Column() {
         Stack() {
         Stack() {
           if(this.contentDTO.objectType == '5'){
           if(this.contentDTO.objectType == '5'){
-            Notes({ objectType: this.contentDTO.objectType }).height(19).align(Alignment.Center)
+            Notes({ objectType: this.contentDTO.objectType,objectLevel:this.contentDTO.objectLevel }).height(19).align(Alignment.Center)
           } else {
           } else {
             if (this.contentDTO.seoTags) {
             if (this.contentDTO.seoTags) {
               Notes({ newTags: this.contentDTO.seoTags }).height(19).align(Alignment.Center)
               Notes({ newTags: this.contentDTO.seoTags }).height(19).align(Alignment.Center)

@@ -77,7 +77,7 @@ export struct Card5Component {
         Row() {
         Row() {
           Stack() {
           Stack() {
             if(this.contentDTO.objectType == '5'){
             if(this.contentDTO.objectType == '5'){
-              Notes({ objectType: this.contentDTO.objectType }).height(20).align(Alignment.Center)
+              Notes({ objectType: this.contentDTO.objectType,objectLevel:this.contentDTO.objectLevel }).height(20).align(Alignment.Center)
             } else {
             } else {
               if (this.contentDTO.seoTags) {
               if (this.contentDTO.seoTags) {
                 Notes({ newTags: this.contentDTO.seoTags }).height(20).align(Alignment.Center)
                 Notes({ newTags: this.contentDTO.seoTags }).height(20).align(Alignment.Center)

@@ -46,7 +46,7 @@ export struct Card6Component {
         Column() {
         Column() {
           Stack() {
           Stack() {
             if(this.contentDTO.objectType == '5'){
             if(this.contentDTO.objectType == '5'){
-              Notes({ objectType: this.contentDTO.objectType }).height(28).align(Alignment.Center)
+              Notes({ objectType: this.contentDTO.objectType,objectLevel:this.contentDTO.objectLevel }).height(28).align(Alignment.Center)
             } else {
             } else {
               if (this.contentDTO.seoTags) {
               if (this.contentDTO.seoTags) {
                 Notes({ newTags: this.contentDTO.seoTags }).height(28).align(Alignment.Center)
                 Notes({ newTags: this.contentDTO.seoTags }).height(28).align(Alignment.Center)

@@ -108,7 +108,7 @@ export struct Card9Component {
             topRight: $r('app.float.image_border_radius')
             topRight: $r('app.float.image_border_radius')
           })
           })
         if(this.contentDTO.objectType == '5'){
         if(this.contentDTO.objectType == '5'){
-          Notes({ objectType: this.contentDTO.objectType }).height(20).align(Alignment.Center)
+          Notes({ objectType: this.contentDTO.objectType,objectLevel:this.contentDTO.objectLevel }).height(20).align(Alignment.Center)
             .margin({ left: 5, bottom: 5 })
             .margin({ left: 5, bottom: 5 })
         } else {
         } else {
           if (this.contentDTO.seoTags) {
           if (this.contentDTO.seoTags) {

@@ -2,12 +2,14 @@
  * 表示
  * 表示
  *  objectType 0:不跳转 1:点播,2:直播,3:活动,4:广告,5:专题,6:链接,7:榜单,8:图文,9:组图,10:H5新闻,11:频道,12:组件,13:音频,
  *  objectType 0:不跳转 1:点播,2:直播,3:活动,4:广告,5:专题,6:链接,7:榜单,8:图文,9:组图,10:H5新闻,11:频道,12:组件,13:音频,
  14动态图文,15动态视频16问政；100人民号,101标签
  14动态图文,15动态视频16问政；100人民号,101标签
+ * objectLevel: 对象分类;频道(1:一级频道,2:二级频道),专题(21:文章专题,22:音频专题,23:直播专题,24:话题专题)
  */
  */
 
 
 @Preview
 @Preview
 @Component
 @Component
 export struct Notes {
 export struct Notes {
   @State objectType: number | string = 5
   @State objectType: number | string = 5
+  @State objectLevel: number | string = -1
   @State newTags: string = ''
   @State newTags: string = ''
   @State seoTags: string = ''
   @State seoTags: string = ''
   build() {
   build() {
@@ -30,16 +32,19 @@ export struct Notes {
   returnTypeTitleFn(): string {
   returnTypeTitleFn(): string {
     if (this.newTags) {
     if (this.newTags) {
       return this.newTags
       return this.newTags
-    } else {
-      if (this.objectType == 5) {
-        return '专题'
-      } else if (this.objectType == 10) {
-        return 'H5'
-      } else if (this.objectType == 8) {
-        return '文章'
+    }
+    if (this.objectType == 5) {
+      if (this.objectLevel == 24) {
+        return '调查'
       }
       }
+      return '专题'
+    }
+    if (this.objectType == 10) {
+      return 'H5'
+    }
+    if (this.objectType == 8) {
+      return '文章'
     }
     }
-
     return ''
     return ''
   }
   }
 }
 }

@@ -219,7 +219,7 @@ struct CarouselLayout01CardView {
         // 文本信息
         // 文本信息
         Stack() {
         Stack() {
           if(this.item.objectType == '5'){
           if(this.item.objectType == '5'){
-            Notes({ objectType: this.item.objectType })
+            Notes({ objectType: this.item.objectType,objectLevel:this.item.objectLevel })
           } else {
           } else {
             if (this.item.seoTags) {
             if (this.item.seoTags) {
               Notes({ newTags: this.item.seoTags })
               Notes({ newTags: this.item.seoTags })

@@ -15,7 +15,6 @@ import { BusinessError } from '@kit.BasicServicesKit';
 
 
 const storage = LocalStorage.getShared();
 const storage = LocalStorage.getShared();
 const TAG = 'DetailVideoListPage'
 const TAG = 'DetailVideoListPage'
-PersistentStorage.persistProp('DetailVideoListGestureLoadStrategy', 0); // 点播视频手势动画0为用户首次进入视频点播，1为用户已进入视频点播
 
 
 @Entry(storage)
 @Entry(storage)
 @Component
 @Component
@@ -47,7 +46,7 @@ export struct DetailVideoListPage {
   @Provide toastTextVisible: boolean = false
   @Provide toastTextVisible: boolean = false
   private AudioSuspension = new AudioSuspensionModel()
   private AudioSuspension = new AudioSuspensionModel()
   @State isShowAudioCom: boolean = false
   @State isShowAudioCom: boolean = false
-  @StorageLink('DetailVideoListGestureLoadStrategy') DetailVideoListGestureLoadStrategy: number = 0
+  @StorageLink('GestureLoadStrategy') GestureLoadStrategy: number = 0
 
 
   async aboutToAppear(): Promise<void> {
   async aboutToAppear(): Promise<void> {
     // 注册监听网络连接
     // 注册监听网络连接
@@ -285,10 +284,10 @@ export struct DetailVideoListPage {
         .justifyContent(FlexAlign.Center)
         .justifyContent(FlexAlign.Center)
         .width('100%')
         .width('100%')
         .height('100%')
         .height('100%')
-        .visibility(this.DetailVideoListGestureLoadStrategy == 0 ? Visibility.Visible : Visibility.Hidden)
+        .visibility(this.GestureLoadStrategy == 0 ? Visibility.Visible : Visibility.Hidden)
         .backgroundColor('rgba(0, 0, 0, 0.50)')
         .backgroundColor('rgba(0, 0, 0, 0.50)')
         .onTouch(() => {
         .onTouch(() => {
-          this.DetailVideoListGestureLoadStrategy = 1
+          this.GestureLoadStrategy = 1
         })
         })
         // 手势动画 初次进入显示
         // 手势动画 初次进入显示
         LottieView({
         LottieView({
@@ -299,9 +298,9 @@ export struct DetailVideoListPage {
           autoplay: true,
           autoplay: true,
           loop: true
           loop: true
         })
         })
-          .visibility(this.DetailVideoListGestureLoadStrategy == 0 ? Visibility.Visible : Visibility.Hidden)
+          .visibility(this.GestureLoadStrategy == 0 ? Visibility.Visible : Visibility.Hidden)
           .onTouch(() => {
           .onTouch(() => {
-            this.DetailVideoListGestureLoadStrategy = 1
+            this.GestureLoadStrategy = 1
           })
           })
       }
       }
     }
     }

@@ -25,7 +25,6 @@ interface loadMoreData {
 
 
 const TAG = 'VideoChannelDetail'
 const TAG = 'VideoChannelDetail'
 const storage = LocalStorage.getShared();
 const storage = LocalStorage.getShared();
-PersistentStorage.persistProp('GestureLoadStrategy', 0); // 点播视频手势动画0为用户首次进入视频点播，1为用户已进入视频点播
 
 
 @Entry(storage)
 @Entry(storage)
 @Component
 @Component

@@ -15,6 +15,8 @@ import LaunchDataModel from './viewModel/LaunchDataModel';
 
 
 const TAG = 'MainPage';
 const TAG = 'MainPage';
 
 
+PersistentStorage.persistProp('GestureLoadStrategy', 0); // 点播视频手势动画0为用户首次进入视频点播，1为用户已进入视频点播
+
 @Entry
 @Entry
 @Component
 @Component
 struct MainPage {
 struct MainPage {