Merge remote-tracking branch 'origin/main'

@@ -349,7 +349,7 @@ struct QualityCommentItem {
           /*分割线*/
           Row() {
 
-          }.width('100%').margin({ top: 10, left: 0, right: 0 }).backgroundColor('#EDEDED').height(2.5);
+          }.width('100%').margin({ top: 10, left: 0, right: 0 }).backgroundColor('#EDEDED').height(1);
 
           /*文章或者评论*/
           Row() {

@@ -44,7 +44,7 @@ export struct CustomTitleAndEditUI {
       if (this.isDisplayButton){
         Button(this.isEditState === true?'取消':'编辑')
           .type(ButtonType.Normal)
-          .fontColor($r('app.color.color_B0B0B0'))
+          .fontColor($r('app.color.color_222222'))
           .backgroundColor(Color.White)
           .id("edit_Button")
           .alignRules({

 import { LogoutViewModel } from 'wdComponent';
-import { BreakpointConstants } from 'wdConstant';
+import { GrayManageModel, mournsInfoModel } from 'wdComponent/src/main/ets/viewmodel/GrayManageModel'
+import { BreakpointConstants, SpConstants } from 'wdConstant';
 
-import { BreakpointSystem, EmitterEventId, EmitterUtils, Logger, MpaasUpgradeCheck, WindowModel } from 'wdKit';
+import { BreakpointSystem, EmitterEventId, EmitterUtils, Logger, MpaasUpgradeCheck,
+  SPHelper,
+  WindowModel } from 'wdKit';
 import { promptAction, window } from '@kit.ArkUI';
 import { UpgradeTipDialog } from "./upgradePage/UpgradeTipDialog"
 import { ProcessUtils } from 'wdRouter/Index';
 import { StartupManager } from '../startupmanager/StartupManager';
 import { BusinessError } from '@kit.BasicServicesKit';
 import { BottomNavigationComponent } from './view/BottomNavigationComponent';
+import LaunchDataModel from './viewModel/LaunchDataModel';
 
 const TAG = 'MainPage';
 
@@ -36,6 +40,15 @@ struct MainPage {
     EmitterUtils.receiveEvent(EmitterEventId.FORCE_USER_LOGIN_OUT, () => {
       LogoutViewModel.clearLoginInfo()
     })
+
+    let dataModelStr : string = SPHelper.default.getSync(SpConstants.APP_LAUNCH_PAGE_DATA_MODEL,'') as string
+    let dataModel : LaunchDataModel = JSON.parse(dataModelStr)
+    console.log(dataModelStr)
+    // 处理国殇模式数据
+    let mourns: mournsInfoModel = dataModel.mourns as mournsInfoModel
+    let GrayManage = new GrayManageModel()
+    GrayManage.setMourning(mourns)
+    AppStorage.setOrCreate('GrayManage', GrayManage)
   }
 
   pageTransition() {

@@ -15,7 +15,6 @@ import { Logger, SPHelper, UmengStats } from 'wdKit/Index';
 import { SpConstants } from 'wdConstant/Index';
 import { TrackingModule } from 'wdTracking/Index'
 import { StartupManager } from '../../startupmanager/StartupManager'
-import { GrayManageModel, mournsInfoModel } from 'wdComponent/src/main/ets/viewmodel/GrayManageModel'
 
 @Entry
 @Component
@@ -110,14 +109,9 @@ struct LaunchPage {
             WDRouterRule.jumpWithReplacePage(WDRouterPage.mainPage)
             return
           }
-          
+
           let dataModel : LaunchDataModel = JSON.parse(dataModelStr)
           console.log(dataModelStr)
-          // 处理国殇模式数据
-          let mourns: mournsInfoModel = dataModel.mourns as mournsInfoModel
-          let GrayManage = new GrayManageModel()
-          GrayManage.setMourning(mourns)
-          AppStorage.setOrCreate('GrayManage', GrayManage)
 
           if (dataModel.launchPageInfo || dataModel.launchAdInfo.length) {
             //跳转广告页