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

* 'main' of http://192.168.1.42/developOne/harmonyPool:
  fix：somobug
  fix(图集)：去除全屏操作

@@ -82,7 +82,6 @@ export struct CompParser {
 
 
     if (this.compDTO.operDataList[0]?.objectType !== '3' &&
     if (this.compDTO.operDataList[0]?.objectType !== '3' &&
       this.compDTO.operDataList[0]?.objectType !== '13') { //暂时屏蔽活动和音频详情入口
       this.compDTO.operDataList[0]?.objectType !== '13') { //暂时屏蔽活动和音频详情入口
-
       if (this.compDTO.compStyle === CompStyle.Label_03) {
       if (this.compDTO.compStyle === CompStyle.Label_03) {
         LabelComponent({ compDTO: this.compDTO })
         LabelComponent({ compDTO: this.compDTO })
         Divider().strokeWidth(5).color('#f5f5f5').padding({ left: 0, right: 0 })
         Divider().strokeWidth(5).color('#f5f5f5').padding({ left: 0, right: 0 })
@@ -108,7 +107,7 @@ export struct CompParser {
         Divider().strokeWidth(1).color('#f5f5f5').padding({ left: 16, right: 16 })
         Divider().strokeWidth(1).color('#f5f5f5').padding({ left: 16, right: 16 })
       } else if (this.compDTO.compStyle === CompStyle.Zh_Single_Row_03) {
       } else if (this.compDTO.compStyle === CompStyle.Zh_Single_Row_03) {
         ZhSingleRow03({ compDTO: this.compDTO, pageId: this.pageId, pageName: this.pageName })
         ZhSingleRow03({ compDTO: this.compDTO, pageId: this.pageId, pageName: this.pageName })
-        Divider().strokeWidth(5).color('#f5f5f5').padding({ left: 0, right: 0 })
+        Divider().strokeWidth(1).color('#f5f5f5').padding({ left: 16, right: 16 })
       } else if (this.compDTO.compStyle === CompStyle.Zh_Grid_Layout_02) { //双列流小视频,一行两图卡 ->标题
       } else if (this.compDTO.compStyle === CompStyle.Zh_Grid_Layout_02) { //双列流小视频,一行两图卡 ->标题
         //ZhGridLayout02({ compDTO: this.compDTO })
         //ZhGridLayout02({ compDTO: this.compDTO })
         CompNormalTitle({ compDTO: this.compDTO })
         CompNormalTitle({ compDTO: this.compDTO })
@@ -136,7 +135,7 @@ export struct CompParser {
       } else if (this.compDTO.compStyle === CompStyle.Zh_Single_Column_03) {
       } else if (this.compDTO.compStyle === CompStyle.Zh_Single_Column_03) {
         // 大图卡
         // 大图卡
         Card2Component({ compDTO: this.compDTO, contentDTO: this.compDTO.operDataList[0], pageId: this.pageId, pageName: this.pageName })
         Card2Component({ compDTO: this.compDTO, contentDTO: this.compDTO.operDataList[0], pageId: this.pageId, pageName: this.pageName })
-        Divider().strokeWidth(5).color('#f5f5f5').padding({ left: 0, right: 0 })
+        Divider().strokeWidth(1).color('#f5f5f5').padding({ left: 16, right: 16 })
       } else if (this.compDTO.compStyle === CompStyle.Card_09) {
       } else if (this.compDTO.compStyle === CompStyle.Card_09) {
         //时间链卡
         //时间链卡
         Card9Component({ compDTO: this.compDTO, contentDTO:this.compDTO.operDataList[0], pageId: this.pageId, pageName: this.pageName })
         Card9Component({ compDTO: this.compDTO, contentDTO:this.compDTO.operDataList[0], pageId: this.pageId, pageName: this.pageName })

@@ -48,7 +48,6 @@ struct MultiPictureDetailPage {
   }
   }
 
 
   aboutToAppear() {
   aboutToAppear() {
-    this.openFullScreen()
 
 
     Logger.info(TAG, 'aboutToDisappear');
     Logger.info(TAG, 'aboutToDisappear');
 
 
@@ -68,13 +67,11 @@ struct MultiPictureDetailPage {
 
 
   aboutToDisappear(): void {
   aboutToDisappear(): void {
     console.log(TAG, 'aboutToDisappear')
     console.log(TAG, 'aboutToDisappear')
-    this.closeFullScreen()
   }
   }
 
 
   onPageShow(): void {
   onPageShow(): void {
     console.log(TAG, 'onPageShow')
     console.log(TAG, 'onPageShow')
     this.pageShowTime = DateTimeUtils.getTimeStamp()
     this.pageShowTime = DateTimeUtils.getTimeStamp()
-    this.openFullScreen()
 
 
   }
   }
 
 
@@ -84,25 +81,7 @@ struct MultiPictureDetailPage {
     let duration = 0
     let duration = 0
     duration = Math.floor((this.pageHideTime - this.pageShowTime)/1000)
     duration = Math.floor((this.pageHideTime - this.pageShowTime)/1000)
     TrackingPageBrowse.trackCommonPageExposureEnd(TrackConstants.PageName.Atlas_Detail,TrackConstants.PageName.Atlas_Detail,duration)
     TrackingPageBrowse.trackCommonPageExposureEnd(TrackConstants.PageName.Atlas_Detail,TrackConstants.PageName.Atlas_Detail,duration)
-    this.closeFullScreen()
   }
   }
 
 
-  /**
-   * 开启沉浸式
-   * TODO:颜色待根据业务接口修改
-   */
-  openFullScreen() {
-    WindowModel.shared.setWindowLayoutFullScreen(true)
-    WindowModel.shared.setWindowSystemBarProperties({ statusBarContentColor: '#ffffff', })
-  }
-
-  /**
-   * 关闭沉浸式
-   * TODO:颜色待根据业务接口修改
-   */
-  closeFullScreen() {
-    WindowModel.shared.setWindowLayoutFullScreen(false)
-    WindowModel.shared.setWindowSystemBarProperties({ statusBarContentColor: '#000000', })
-  }
 
 
 }
 }