Merge remote-tracking branch 'origin/main'

@@ -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
           }
           }

@@ -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() {