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

@@ -68,9 +68,9 @@ export struct Card10Component {
 
 
   initHideDetail() {
   initHideDetail() {
     const curRouter = router.getState().name;
     const curRouter = router.getState().name;
-    if (curRouter === 'MyCollectionListPage') {
-      this.hideDetail = true;
-    }
+    // if (curRouter === 'MyCollectionListPage') {
+    //   this.hideDetail = true;
+    // }
   }
   }
 
 
   titleInit() {
   titleInit() {
@@ -154,7 +154,6 @@ export struct Card10Component {
         .height(40)
         .height(40)
         .borderRadius($r('app.float.button_border_radius'))
         .borderRadius($r('app.float.button_border_radius'))
         .justifyContent(FlexAlign.Center)
         .justifyContent(FlexAlign.Center)
-        .margin({ top: 5 })
         .onClick((event: ClickEvent) => {
         .onClick((event: ClickEvent) => {
           InfomationCardClick.track(this.compDTO, this.contentDTO, this.pageId, this.pageName)
           InfomationCardClick.track(this.compDTO, this.contentDTO, this.pageId, this.pageName)
           ProcessUtils.processPage(this.contentDTO)
           ProcessUtils.processPage(this.contentDTO)

@@ -35,9 +35,9 @@ export struct Card9Component {
 
 
   initHideDetail() {
   initHideDetail() {
     const curRouter = router.getState().name;
     const curRouter = router.getState().name;
-    if (curRouter === 'MyCollectionListPage') {
-      this.hideDetail = true;
-    }
+    // if (curRouter === 'MyCollectionListPage') {
+    //   this.hideDetail = true;
+    // }
   }
   }
 
 
   //内容浏览Tracking
   //内容浏览Tracking

@@ -37,6 +37,6 @@ struct FollowListPage {
       .width('100%')
       .width('100%')
     }.width("100%")
     }.width("100%")
     .height("100%")
     .height("100%")
-    .padding({top:px2vp(this.topSafeHeight),bottom:px2vp(this.bottomSafeHeight)})
+    .padding({top:px2vp(this.topSafeHeight),bottom:px2vp(this.bottomSafeHeight)+10})
   }
   }
 }
 }

@@ -475,7 +475,7 @@ export struct SearchResultContentComponent {
     contentDTO.coverSize = ""
     contentDTO.coverSize = ""
     contentDTO.coverType = value.data.type == "5" ? 1 : -1
     contentDTO.coverType = value.data.type == "5" ? 1 : -1
     contentDTO.coverUrl =
     contentDTO.coverUrl =
-      this.searchType == "activity" ? value.data.zhChannelPageImg : value.data.appStyleImages.split("&&")[0];
+      this.searchType == "activity" ? value.data.zhChannelPageImg : value.data.appStyleImages.split("&&")[0].split('?')[0];
     contentDTO.description = value.data.description
     contentDTO.description = value.data.description
     contentDTO.districtCode = value.data.districtCode
     contentDTO.districtCode = value.data.districtCode
     contentDTO.endTime = value.data.endTime
     contentDTO.endTime = value.data.endTime
@@ -515,7 +515,7 @@ export struct SearchResultContentComponent {
     contentDTO.visitorComment = -1
     contentDTO.visitorComment = -1
     contentDTO.fullColumnImgUrls = photos
     contentDTO.fullColumnImgUrls = photos
     contentDTO.newsSummary = ""
     contentDTO.newsSummary = ""
-    contentDTO.hasMore = -1
+    contentDTO.hasMore = this.hasMore ? 1 : -1
     contentDTO.slideShows = []
     contentDTO.slideShows = []
     contentDTO.voiceInfo = {} as VoiceInfoDTO
     contentDTO.voiceInfo = {} as VoiceInfoDTO
     contentDTO.tagWord = -1
     contentDTO.tagWord = -1

@@ -815,6 +815,7 @@ class MinePageDatasModel{
     contentDTO.source = StringUtils.isEmpty(value.creatorName) ? value.sourceName : value.creatorName
     contentDTO.source = StringUtils.isEmpty(value.creatorName) ? value.sourceName : value.creatorName
     contentDTO.objectId = value.id
     contentDTO.objectId = value.id
     contentDTO.objectType = value.type
     contentDTO.objectType = value.type
+    contentDTO.objectLevel = value.topicType
     contentDTO.channelId = value.channelId
     contentDTO.channelId = value.channelId
     contentDTO.relId = value.relId
     contentDTO.relId = value.relId
     contentDTO.relType = value.relType
     contentDTO.relType = value.relType

@@ -124,7 +124,6 @@ export struct TabLiveItemComponent {
           RelativeContainer() {
           RelativeContainer() {
             Image(this.item.transcodeImageUrl)
             Image(this.item.transcodeImageUrl)
               .width('100%')
               .width('100%')
-              .height(174)
               .objectFit(ImageFit.Cover)
               .objectFit(ImageFit.Cover)
               .borderRadius(4)
               .borderRadius(4)
               .id('iv_id')
               .id('iv_id')
@@ -160,7 +159,7 @@ export struct TabLiveItemComponent {
           .margin({
           .margin({
             top: 8,
             top: 8,
           })
           })
-          .height(174)
+          .height('auto')
           .onClick(() => {
           .onClick(() => {
             this.gotoVideoPlayPage()
             this.gotoVideoPlayPage()
           })
           })

@@ -276,7 +276,7 @@ export struct MultiPictureDetailPageComponent {
                 }.alignItems(VerticalAlign.Center)
                 }.alignItems(VerticalAlign.Center)
               }
               }
               .borderRadius(4)
               .borderRadius(4)
-              .backgroundColor('#333333')
+              .backgroundColor('#33FFFFFF')
               .width(54)
               .width(54)
               .height(24)
               .height(24)
               .onClick(() => {
               .onClick(() => {

@@ -141,6 +141,7 @@ export class StartupManager {
 
 
       GetuiPush.sharedInstance().requestEnableNotifications(this.context!).then((enabled) => {
       GetuiPush.sharedInstance().requestEnableNotifications(this.context!).then((enabled) => {
         HWLocationUtils.startLocationService()
         HWLocationUtils.startLocationService()
+        SPHelper.default.save(SpConstants.SETTING_PUSH_SWITCH,enabled)
       })
       })
 
 
       GetuiPush.sharedInstance().onReachMainPage()
       GetuiPush.sharedInstance().onReachMainPage()