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

* 'main' of http://192.168.1.42/developOne/harmonyPool:
  fix: 组件用的是comp上的coverUrl      稿件用的是programInfo上的ullColumnImgUrls里的url      appstyle有值的是稿件      compstyle有值是组件
  fix |> 电子报支持系统侧滑返回http://192.168.1.3:8080/zentao/bug-view-20008.html
  fix |> 空串解析json报错
  ref |> 处理评论列表间距和展开展示一半问题
  fix: 19928 横划卡配置跳转到外链，跳转后页面比例与安卓不一致，且无返回按钮，见截图
  fix: 20069 信息流页面广告-封面图左右间距应和上门稿件封面图左右间距一致，边距16
  fix: 关注分割线左右留白

@@ -25,6 +25,7 @@ export struct WdWebComponent {
   @State subjectData : string = ''
   @State subjectData : string = ''
 
 
   @StorageProp('currentBreakpoint') @Watch("currentChanged")currentBreakpoint: string = 'sm';
   @StorageProp('currentBreakpoint') @Watch("currentChanged")currentBreakpoint: string = 'sm';
+  @State userAgent:string = 'Mozilla/5.0 (Phone; OpenHarmony 5.0) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/114.0.0.0 Safari/537.36 ArkWeb/4.1.6.1 Mobile automobile/792 Android'
 
 
   currentChanged(){
   currentChanged(){
     ///折叠屏转换
     ///折叠屏转换
@@ -54,6 +55,9 @@ export struct WdWebComponent {
           let url: string = event.data.getRequestUrl().toString()
           let url: string = event.data.getRequestUrl().toString()
           return this.onLoadIntercept(url);
           return this.onLoadIntercept(url);
         })
         })
+        .onControllerAttached(() => {
+          this.webviewControl.setCustomUserAgent(this.userAgent);
+        })
     }
     }
   }
   }
 
 

@@ -52,8 +52,8 @@ export struct CardAdvBigImageComponent {
     }
     }
     .width(CommonConstants.FULL_WIDTH)
     .width(CommonConstants.FULL_WIDTH)
     .padding({
     .padding({
-      left: $r('app.float.card_comp_pagePadding_lf'),
-      right: $r('app.float.card_comp_pagePadding_lf'),
+      left: 10,
+      right: 10,
       top: $r('app.float.card_comp_pagePadding_tb'),
       top: $r('app.float.card_comp_pagePadding_tb'),
       bottom: $r('app.float.card_comp_pagePadding_tb')
       bottom: $r('app.float.card_comp_pagePadding_tb')
     })
     })

@@ -54,8 +54,8 @@ export struct CardAdvLongImageComponent {
     }
     }
     .width(CommonConstants.FULL_WIDTH)
     .width(CommonConstants.FULL_WIDTH)
     .padding({
     .padding({
-      left: $r('app.float.card_comp_pagePadding_lf'),
-      right: $r('app.float.card_comp_pagePadding_lf'),
+      left: 10,
+      right: 10,
       top: $r('app.float.card_comp_pagePadding_tb'),
       top: $r('app.float.card_comp_pagePadding_tb'),
       bottom: $r('app.float.card_comp_pagePadding_tb')
       bottom: $r('app.float.card_comp_pagePadding_tb')
     })
     })

@@ -87,8 +87,8 @@ export struct CardAdvSmallImageComponent {
     .width("100%")
     .width("100%")
     .height(this.isBigThreeLine ? 127 : 106)
     .height(this.isBigThreeLine ? 127 : 106)
     .padding({
     .padding({
-      left: $r('app.float.card_comp_pagePadding_lf'),
-      right: $r('app.float.card_comp_pagePadding_lf'),
+      left: 10,
+      right: 10,
       top: $r('app.float.card_comp_pagePadding_tb'),
       top: $r('app.float.card_comp_pagePadding_tb'),
       bottom: $r('app.float.card_comp_pagePadding_tb')
       bottom: $r('app.float.card_comp_pagePadding_tb')
     })
     })

@@ -78,8 +78,8 @@ export struct CardAdvThreeImageComponent {
     }
     }
     .width(CommonConstants.FULL_WIDTH)
     .width(CommonConstants.FULL_WIDTH)
     .padding({
     .padding({
-      left: $r('app.float.card_comp_pagePadding_lf'),
-      right: $r('app.float.card_comp_pagePadding_lf'),
+      left: 10,
+      right: 10,
       top: $r('app.float.card_comp_pagePadding_tb'),
       top: $r('app.float.card_comp_pagePadding_tb'),
       bottom: $r('app.float.card_comp_pagePadding_tb')
       bottom: $r('app.float.card_comp_pagePadding_tb')
     })
     })

@@ -62,8 +62,8 @@ export struct CardAdvVideoComponent {
     }
     }
     .width(CommonConstants.FULL_WIDTH)
     .width(CommonConstants.FULL_WIDTH)
     .padding({
     .padding({
-      left: $r('app.float.card_comp_pagePadding_lf'),
-      right: $r('app.float.card_comp_pagePadding_lf'),
+      left: 10,
+      right: 10,
       top: $r('app.float.card_comp_pagePadding_tb'),
       top: $r('app.float.card_comp_pagePadding_tb'),
       bottom: $r('app.float.card_comp_pagePadding_tb')
       bottom: $r('app.float.card_comp_pagePadding_tb')
     })
     })

@@ -85,8 +85,8 @@ export struct CardAdvVideoExComponent {
     }
     }
     .width(CommonConstants.FULL_WIDTH)
     .width(CommonConstants.FULL_WIDTH)
     .padding({
     .padding({
-      left: $r('app.float.card_comp_pagePadding_lf'),
-      right: $r('app.float.card_comp_pagePadding_lf'),
+      left: 10,
+      right: 10,
       top: $r('app.float.card_comp_pagePadding_tb'),
       top: $r('app.float.card_comp_pagePadding_tb'),
       bottom: $r('app.float.card_comp_pagePadding_tb')
       bottom: $r('app.float.card_comp_pagePadding_tb')
     })
     })

@@ -111,7 +111,7 @@ export struct Card10Component {
       }
       }
       // 大图
       // 大图
       Stack() {
       Stack() {
-        Image(this.loadImg ? this.contentDTO?.coverUrl : '')
+        Image(this.loadImg ? this.contentDTO.fullColumnImgUrls?.[0]?.url || this.contentDTO.fullColumnImgUrls?.[0]?.fullUrl : '')
           .backgroundColor(0xf5f5f5)
           .backgroundColor(0xf5f5f5)
           .width('100%')
           .width('100%')
           .borderRadius({
           .borderRadius({

@@ -80,7 +80,7 @@ export struct Card14Component {
           .margin({right: 12})
           .margin({right: 12})
           .width('64%')
           .width('64%')
 
 
-        Image(this.loadImg ? this.contentDTO.coverUrl : '')
+        Image(this.loadImg ? this.contentDTO.fullColumnImgUrls?.[0]?.url || this.contentDTO.fullColumnImgUrls?.[0]?.fullUrl : '')
           .backgroundColor(0xf5f5f5)
           .backgroundColor(0xf5f5f5)
           .aspectRatio(3 / 2)
           .aspectRatio(3 / 2)
           .height(78)
           .height(78)

@@ -80,7 +80,7 @@ export struct Card15Component {
       }
       }
       //大图
       //大图
       Stack() {
       Stack() {
-        Image(this.loadImg ? this.contentDTO.coverUrl : '')
+        Image(this.loadImg ? this.contentDTO.fullColumnImgUrls?.[0]?.url || this.contentDTO.fullColumnImgUrls?.[0]?.fullUrl : '')
           .backgroundColor(0xf5f5f5)
           .backgroundColor(0xf5f5f5)
           .borderRadius($r('app.float.image_border_radius'))
           .borderRadius($r('app.float.image_border_radius'))
         //播放状态+时长
         //播放状态+时长

@@ -197,14 +197,14 @@ struct createImg {
                 alignContent: Alignment.BottomEnd
                 alignContent: Alignment.BottomEnd
               }) {
               }) {
                 if (this.getPicType(item.weight, item.height) === 1) {
                 if (this.getPicType(item.weight, item.height) === 1) {
-                  Image(this.loadImg ? item.fullUrl || item.url : '')
+                  Image(this.loadImg ? item.url || item.fullUrl : '')
                     .backgroundColor(0xf5f5f5)
                     .backgroundColor(0xf5f5f5)
                     .width('100%')
                     .width('100%')
                     .height(198)
                     .height(198)
                     .autoResize(true)
                     .autoResize(true)
                     .borderRadius(this.caclImageRadius(index))
                     .borderRadius(this.caclImageRadius(index))
                 } else if (this.getPicType(item.weight, item.height) === 2) {
                 } else if (this.getPicType(item.weight, item.height) === 2) {
-                  Image(this.loadImg ? item.fullUrl ||  item.url : '')
+                  Image(this.loadImg ? item.url || item.fullUrl : '')
                     .width('100%')
                     .width('100%')
                     .height(305)
                     .height(305)
                     .autoResize(true)
                     .autoResize(true)

@@ -153,7 +153,7 @@ struct createImg {
           span: { xs: 12 }
           span: { xs: 12 }
         }) {
         }) {
           Stack() {
           Stack() {
-            Image(this.loadImg ? this.contentDTO.coverUrl : '')
+            Image(this.loadImg ? this.contentDTO.fullColumnImgUrls?.[0]?.url || this.contentDTO.fullColumnImgUrls?.[0]?.fullUrl : '')
               .backgroundColor(0xf5f5f5)
               .backgroundColor(0xf5f5f5)
               .width(CommonConstants.FULL_WIDTH)
               .width(CommonConstants.FULL_WIDTH)
               .aspectRatio(16 / 9)
               .aspectRatio(16 / 9)
@@ -176,7 +176,7 @@ struct createImg {
           span: { xs: 6 }
           span: { xs: 6 }
         }) {
         }) {
           Stack() {
           Stack() {
-            Image(this.loadImg ? this.contentDTO.coverUrl : '')
+            Image(this.loadImg ? this.contentDTO.fullColumnImgUrls?.[0]?.url || this.contentDTO.fullColumnImgUrls?.[0]?.fullUrl : '')
               .backgroundColor(0xf5f5f5)
               .backgroundColor(0xf5f5f5)
               .width(CommonConstants.FULL_WIDTH)
               .width(CommonConstants.FULL_WIDTH)
               .borderRadius($r('app.float.image_border_radius'))
               .borderRadius($r('app.float.image_border_radius'))

@@ -79,7 +79,7 @@ export struct Card21Component {
 
 
         GridItem() {
         GridItem() {
           Stack() {
           Stack() {
-            Image(this.loadImg ? this.contentDTO.coverUrl : '')
+            Image(this.loadImg ? this.contentDTO.fullColumnImgUrls?.[0]?.url || this.contentDTO.fullColumnImgUrls?.[0]?.fullUrl : '')
               .backgroundColor(0xf5f5f5)
               .backgroundColor(0xf5f5f5)
               .width(CommonConstants.FULL_WIDTH)
               .width(CommonConstants.FULL_WIDTH)
               .borderRadius($r('app.float.image_border_radius'))
               .borderRadius($r('app.float.image_border_radius'))

 //全标题 "appStyle":"2",
 //全标题 "appStyle":"2",
 import { CompDTO, ContentDTO } from 'wdBean';
 import { CompDTO, ContentDTO } from 'wdBean';
-import { CommonConstants } from 'wdConstant/Index';
+import { CommonConstants, CompStyle } from 'wdConstant/Index';
 import { ProcessUtils } from 'wdRouter';
 import { ProcessUtils } from 'wdRouter';
 import { CardMediaInfo } from '../cardCommon/CardMediaInfo';
 import { CardMediaInfo } from '../cardCommon/CardMediaInfo';
 import { CardSourceInfo } from '../cardCommon/CardSourceInfo';
 import { CardSourceInfo } from '../cardCommon/CardSourceInfo';
@@ -44,6 +44,14 @@ export struct Card2Component {
     this.textArr = titleInitRes.textArr;
     this.textArr = titleInitRes.textArr;
   }
   }
 
 
+  getCover() {
+    if (this.compDTO.compStyle === CompStyle.Zh_Single_Column_03) {
+      return this.contentDTO.coverUrl
+    } else if (this.contentDTO.appStyle === CompStyle.Card_02) {
+      return this.contentDTO.fullColumnImgUrls?.[0]?.url || this.contentDTO.fullColumnImgUrls?.[0]?.fullUrl
+    }
+    return ''
+  }
 
 
   build() {
   build() {
     Column() {
     Column() {
@@ -96,7 +104,7 @@ export struct Card2Component {
 
 
         //大图
         //大图
         Stack() {
         Stack() {
-          Image(this.loadImg ? this.contentDTO.coverUrl : '')
+          Image(this.loadImg ? this.getCover() : '')
             .width(CommonConstants.FULL_WIDTH)
             .width(CommonConstants.FULL_WIDTH)
             .aspectRatio(16 / 9)
             .aspectRatio(16 / 9)
             .borderRadius($r('app.float.image_border_radius'))
             .borderRadius($r('app.float.image_border_radius'))

 import { ContentDTO, CompDTO } from 'wdBean';
 import { ContentDTO, CompDTO } from 'wdBean';
-import { CommonConstants } from 'wdConstant';
 import { ProcessUtils } from 'wdRouter';
 import { ProcessUtils } from 'wdRouter';
 import { onlyWifiLoadImg } from '../../utils/lazyloadImg';
 import { onlyWifiLoadImg } from '../../utils/lazyloadImg';
 import { Notes } from './notes';
 import { Notes } from './notes';
@@ -7,7 +6,8 @@ import { getNotesContentWidth } from '../../utils/FuncUtils'
 import { persistentStorage, hasClicked } from '../../utils/persistentStorage';
 import { persistentStorage, hasClicked } from '../../utils/persistentStorage';
 import { InfomationCardClick } from '../../utils/infomationCardClick'
 import { InfomationCardClick } from '../../utils/infomationCardClick'
 import { SearchShowRed, titleInitRes, textItem } from '../../utils/searchShowRed';
 import { SearchShowRed, titleInitRes, textItem } from '../../utils/searchShowRed';
-import router from '@ohos.router'
+import router from '@ohos.router';
+import { CommonConstants, CompStyle } from 'wdConstant/Index';
 
 
 
 
 const TAG: string = 'Card5Component';
 const TAG: string = 'Card5Component';
@@ -42,9 +42,18 @@ export struct Card5Component {
     this.textArr = titleInitRes.textArr;
     this.textArr = titleInitRes.textArr;
   }
   }
 
 
+  getCover() {
+    if (this.compDTO.compStyle === CompStyle.Zh_Single_Column_02) {
+      return this.contentDTO.coverUrl
+    } else if (this.contentDTO.appStyle === CompStyle.Card_05) {
+      return this.contentDTO.fullColumnImgUrls?.[0]?.url || this.contentDTO.fullColumnImgUrls?.[0]?.fullUrl
+    }
+    return ''
+  }
+
   build() {
   build() {
     Stack() {
     Stack() {
-      Image(this.loadImg ? this.contentDTO.coverUrl : '')
+      Image(this.loadImg ?  this.getCover()  : '')
         .backgroundColor(0xf5f5f5)
         .backgroundColor(0xf5f5f5)
         .width(CommonConstants.FULL_WIDTH)
         .width(CommonConstants.FULL_WIDTH)
         .borderRadius(
         .borderRadius(

@@ -35,12 +35,22 @@ export struct Card6Component {
     const curRouter = router.getState().name;
     const curRouter = router.getState().name;
     this.clicked = hasClicked(this.contentDTO.objectId, curRouter)
     this.clicked = hasClicked(this.contentDTO.objectId, curRouter)
   }
   }
+
   titleInit() {
   titleInit() {
     const titleInitRes:titleInitRes = SearchShowRed.titleInit(this.contentDTO.title);
     const titleInitRes:titleInitRes = SearchShowRed.titleInit(this.contentDTO.title);
     this.titleMarked = titleInitRes.titleMarked;
     this.titleMarked = titleInitRes.titleMarked;
     this.textArr = titleInitRes.textArr;
     this.textArr = titleInitRes.textArr;
   }
   }
 
 
+  getCover() {
+    if (this.compDTO.compStyle === CompStyle.Card_13) {
+      return this.contentDTO.coverUrl
+    } else if (this.contentDTO.appStyle === CompStyle.Card_06) {
+      return this.contentDTO.fullColumnImgUrls?.[0]?.url || this.contentDTO.fullColumnImgUrls?.[0]?.fullUrl
+    }
+    return ''
+  }
+
   build() {
   build() {
     Row() {
     Row() {
       Column() {
       Column() {
@@ -109,7 +119,7 @@ export struct Card6Component {
 
 
 
 
       Stack({alignContent: Alignment.BottomEnd}) {
       Stack({alignContent: Alignment.BottomEnd}) {
-        Image(this.loadImg ? this.contentDTO.coverUrl || this.contentDTO.fullColumnImgUrls?.[0]?.url || this.contentDTO.fullColumnImgUrls?.[0]?.fullUrl : '')
+        Image(this.loadImg ? this.getCover() : '')
           .backgroundColor(this.loadImg ? $r('app.color.color_B0B0B0') : 0xf5f5f5)
           .backgroundColor(this.loadImg ? $r('app.color.color_B0B0B0') : 0xf5f5f5)
           .borderRadius(5)
           .borderRadius(5)
           .aspectRatio(this.contentDTO.appStyle === CompStyle.Card_13 ? 3 / 2 : 3 / 4)
           .aspectRatio(this.contentDTO.appStyle === CompStyle.Card_13 ? 3 / 2 : 3 / 4)

@@ -714,7 +714,7 @@ struct commentHeaderView {
         dialogBeforeJumpOtherPageAction: this.dialogBeforeJumpOtherPageAction
         dialogBeforeJumpOtherPageAction: this.dialogBeforeJumpOtherPageAction
       }).margin({ left: 60, right: 16 })
       }).margin({ left: 60, right: 16 })
     }.alignItems(HorizontalAlign.Start)
     }.alignItems(HorizontalAlign.Start)
-    .padding({bottom: 8})
+    .padding({bottom: 0})
   }
   }
 
 
   @Builder headerView() {
   @Builder headerView() {
@@ -842,6 +842,7 @@ struct commentFooterView {
         })
         })
       }
       }
     }
     }
+    // .alignItems(VerticalAlign.Bottom)
     .justifyContent(FlexAlign.SpaceBetween)
     .justifyContent(FlexAlign.SpaceBetween)
     .width('100%')
     .width('100%')
     .height(30)
     .height(30)

@@ -110,9 +110,12 @@ export struct CommentText {
             //   this.maxLineMesssage = this.maxLineMesssage.slice(0, this.maxLineMesssage.length - 1)
             //   this.maxLineMesssage = this.maxLineMesssage.slice(0, this.maxLineMesssage.length - 1)
             // }
             // }
 
 
+            // console.log(`XXXXXXXXXXGY：${thisTextWidth - maxLineTextWidth}`)
             ///早晚报三行显示 展开功能显示末尾
             ///早晚报三行显示 展开功能显示末尾
             if (this.isMorningEveningPaper) {
             if (this.isMorningEveningPaper) {
               this.maxLineMesssage = this.maxLineMesssage.substring(0,this.maxLineMesssage.length - 7)
               this.maxLineMesssage = this.maxLineMesssage.substring(0,this.maxLineMesssage.length - 7)
+            } else if (thisTextWidth > maxLineTextWidth + 5) {
+              this.maxLineMesssage = this.maxLineMesssage.substring(0,this.maxLineMesssage.length - 1)
             }
             }
             break
             break
           }
           }

@@ -34,7 +34,7 @@ export struct PeopleShipAttentionContentListTopComponent {
       .width('100%')
       .width('100%')
       .height('102vp')
       .height('102vp')
 
 
-      Divider().strokeWidth(1).color($r('app.color.color_F5F5F5'))
+      Divider().strokeWidth(1).color($r('app.color.color_F5F5F5')).padding({ left: 10, right: 10 })
     }
     }
   }
   }
 
 

@@ -3,6 +3,7 @@ import { DateTimeUtils, Logger } from 'wdKit';
 import common from '@ohos.app.ability.common';
 import common from '@ohos.app.ability.common';
 import window from '@ohos.window';
 import window from '@ohos.window';
 import { TrackingPageBrowse, TrackConstants } from 'wdTracking/Index';
 import { TrackingPageBrowse, TrackConstants } from 'wdTracking/Index';
+import { router } from '@kit.ArkUI';
 
 
 const TAG = 'ENewspaper';
 const TAG = 'ENewspaper';
 
 
@@ -64,6 +65,7 @@ struct ENewspaper {
 
 
   onBackPress() {
   onBackPress() {
     Logger.info(TAG, 'onBackPress');
     Logger.info(TAG, 'onBackPress');
+    router.back()
     return true
     return true
   }
   }
 }
 }

@@ -13,6 +13,7 @@ import { BusinessError } from '@kit.BasicServicesKit';
 import { BottomNavigationComponent } from './view/BottomNavigationComponent';
 import { BottomNavigationComponent } from './view/BottomNavigationComponent';
 import LaunchDataModel from './viewModel/LaunchDataModel';
 import LaunchDataModel from './viewModel/LaunchDataModel';
 import { LaunchPageModel } from './viewModel/LaunchPageModel';
 import { LaunchPageModel } from './viewModel/LaunchPageModel';
+import { JSON } from '@kit.ArkTS';
 
 
 const TAG = 'MainPage';
 const TAG = 'MainPage';
 
 
@@ -46,14 +47,19 @@ struct MainPage {
       LogoutViewModel.clearLoginInfo()
       LogoutViewModel.clearLoginInfo()
     })
     })
 
 
-    let dataModelStr : string = SPHelper.default.getSync(SpConstants.APP_MOURNS_INFO_DATA_MODEL,'') as string
-    let dataModel : LaunchDataModel = JSON.parse(dataModelStr)
-    // console.log(dataModelStr)
-    // 处理国殇模式数据
-    let mourns: mournsInfoModel = dataModel.mourns as mournsInfoModel
     let GrayManage = new GrayManageModel()
     let GrayManage = new GrayManageModel()
-    GrayManage.setMourning(mourns)
-    AppStorage.setOrCreate('GrayManage', GrayManage)
+    let dataModelStr : string = SPHelper.default.getSync(SpConstants.APP_MOURNS_INFO_DATA_MODEL,'') as string
+    try {
+      if (dataModelStr && dataModelStr.length > 0) {
+        let dataModel : LaunchDataModel = JSON.parse(dataModelStr) as LaunchDataModel
+        // 处理国殇模式数据
+        let mourns: mournsInfoModel = dataModel.mourns as mournsInfoModel
+        GrayManage.setMourning(mourns)
+      }
+      AppStorage.setOrCreate('GrayManage', GrayManage)
+    } catch (e) {
+      Logger.error(TAG, `Unexpected Text in JSON ??` + JSON.stringify(e) +"  " + dataModelStr);
+    }
   }
   }
 
 
   pageTransition() {
   pageTransition() {

@@ -19,15 +19,6 @@ struct DefaultWebPage {
 
 
   build() {
   build() {
     Column() {
     Column() {
-      Column() {
-        WdWebComponent({
-          webviewControl: this.webviewControl,
-          webUrl: this.webUrl,
-          isPageEnd: $isPageEnd
-        })
-      }.layoutWeight(1)
-
-
       Row() {
       Row() {
         Button({ type: ButtonType.Normal }) {
         Button({ type: ButtonType.Normal }) {
           Image($r("app.media.back_icon_black"))
           Image($r("app.media.back_icon_black"))
@@ -42,6 +33,14 @@ struct DefaultWebPage {
       }.width("100%").height(44)
       }.width("100%").height(44)
       .alignItems(VerticalAlign.Center)
       .alignItems(VerticalAlign.Center)
       .expandSafeArea([SafeAreaType.SYSTEM], [SafeAreaEdge.BOTTOM])
       .expandSafeArea([SafeAreaType.SYSTEM], [SafeAreaEdge.BOTTOM])
+
+      Column() {
+        WdWebComponent({
+          webviewControl: this.webviewControl,
+          webUrl: this.webUrl,
+          isPageEnd: $isPageEnd
+        })
+      }.layoutWeight(1)
     }
     }
     .width(CommonConstants.FULL_WIDTH)
     .width(CommonConstants.FULL_WIDTH)
     .height(CommonConstants.FULL_HEIGHT).padding({
     .height(CommonConstants.FULL_HEIGHT).padding({