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

* 'main' of http://192.168.1.42/developOne/harmonyPool:
  fix(17703)：直播间点赞样式调整
  国殇实例创建修改

@@ -78,25 +78,28 @@ export struct LiveLikeComponent {
   transLikeStyle(): ILikeStyleResp {
   transLikeStyle(): ILikeStyleResp {
     if (this.likesStyle === 'love' || this.likesStyle === 'thumb') {
     if (this.likesStyle === 'love' || this.likesStyle === 'thumb') {
       return {
       return {
-        url: this.likeStatus ? $r(`app.media.ic_like_check`) :
-          this.styleType == 1 ? $r('app.media.icon_like_default') : $r(`app.media.ic_like_uncheck`),
+        url: this.likeStatus ? $r('app.media.ic_like_check') :
+          this.styleType == 1 ? $r('app.media.icon_like_default') : $r('app.media.ic_like_uncheck'),
         name: '赞'
         name: '赞'
       }
       }
     } else if (this.likesStyle === 'pray') {
     } else if (this.likesStyle === 'pray') {
       return {
       return {
-        url: this.likeStatus ? $r(`app.media.ic_thub_check`) : $r(`app.media.ic_thub_uncheck`),
+        url: this.likeStatus ? $r('app.media.ic_thub_check') :
+          this.styleType == 1 ? $r('app.media.icon_like_unselect_light_pray') :
+          $r('app.media.icon_like_unselect_night_pray'),
         name: '祈祷'
         name: '祈祷'
       }
       }
     } else if (this.likesStyle === 'mourning') {
     } else if (this.likesStyle === 'mourning') {
       return {
       return {
-        url: this.likeStatus ? $r(`app.media.ic_candle_check`) :
-        $r(`app.media.ic_candle_uncheck`),
+        url: this.likeStatus ? $r('app.media.ic_candle_check') :
+          this.styleType == 1 ? $r('app.media.icon_like_unselect_light_candle') :
+          $r('app.media.icon_like_unselect_night_candle'),
         name: '默哀'
         name: '默哀'
       }
       }
     }
     }
     return {
     return {
-      url: this.likeStatus ? $r(`app.media.ic_like_check`) :
-        this.styleType == 1 ? $r('app.media.icon_like_default') : $r(`app.media.ic_like_uncheck`),
+      url: this.likeStatus ? $r('app.media.ic_like_check') :
+        this.styleType == 1 ? $r('app.media.icon_like_default') : $r('app.media.ic_like_uncheck'),
       name: '点赞'
       name: '点赞'
     }
     }
   }
   }
@@ -106,8 +109,8 @@ export struct LiveLikeComponent {
     Stack({ alignContent: Alignment.TopEnd }) {
     Stack({ alignContent: Alignment.TopEnd }) {
       Column() {
       Column() {
         Image(this.transLikeStyle().url)
         Image(this.transLikeStyle().url)
-          .width(24)
-          .height(24)
+          .width(((this.likesStyle === 'mourning'||this.likesStyle === 'pray')&& !this.likeStatus) ?36:24)
+          .height(((this.likesStyle === 'mourning'||this.likesStyle === 'pray')&& !this.likeStatus)?36:24)
       }
       }
       .justifyContent(FlexAlign.Center)
       .justifyContent(FlexAlign.Center)
       .width(36)
       .width(36)

@@ -252,7 +252,7 @@ export struct LiveOperRowListView {
       })
       })
     }
     }
     .width(48)
     .width(48)
-    .margin({left:this.isLlive?0:10})
+    .margin({left:this.isLlive?0:5})
     .visibility(this.likesStyle == 4 || this.likesStyle == 'empty' || !this.openLikes ? Visibility.None : Visibility.Visible)
     .visibility(this.likesStyle == 4 || this.likesStyle == 'empty' || !this.openLikes ? Visibility.None : Visibility.Visible)
   }
   }
 
 

 import { LogoutViewModel } from 'wdComponent';
 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 { promptAction, window } from '@kit.ArkUI';
 import { UpgradeTipDialog } from "./upgradePage/UpgradeTipDialog"
 import { UpgradeTipDialog } from "./upgradePage/UpgradeTipDialog"
 import { ProcessUtils } from 'wdRouter/Index';
 import { ProcessUtils } from 'wdRouter/Index';
 import { StartupManager } from '../startupmanager/StartupManager';
 import { StartupManager } from '../startupmanager/StartupManager';
 import { BusinessError } from '@kit.BasicServicesKit';
 import { BusinessError } from '@kit.BasicServicesKit';
 import { BottomNavigationComponent } from './view/BottomNavigationComponent';
 import { BottomNavigationComponent } from './view/BottomNavigationComponent';
+import LaunchDataModel from './viewModel/LaunchDataModel';
 
 
 const TAG = 'MainPage';
 const TAG = 'MainPage';
 
 
@@ -36,6 +40,15 @@ struct MainPage {
     EmitterUtils.receiveEvent(EmitterEventId.FORCE_USER_LOGIN_OUT, () => {
     EmitterUtils.receiveEvent(EmitterEventId.FORCE_USER_LOGIN_OUT, () => {
       LogoutViewModel.clearLoginInfo()
       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() {
   pageTransition() {

@@ -15,7 +15,6 @@ import { Logger, SPHelper, UmengStats } from 'wdKit/Index';
 import { SpConstants } from 'wdConstant/Index';
 import { SpConstants } from 'wdConstant/Index';
 import { TrackingModule } from 'wdTracking/Index'
 import { TrackingModule } from 'wdTracking/Index'
 import { StartupManager } from '../../startupmanager/StartupManager'
 import { StartupManager } from '../../startupmanager/StartupManager'
-import { GrayManageModel, mournsInfoModel } from 'wdComponent/src/main/ets/viewmodel/GrayManageModel'
 
 
 @Entry
 @Entry
 @Component
 @Component
@@ -110,14 +109,9 @@ struct LaunchPage {
             WDRouterRule.jumpWithReplacePage(WDRouterPage.mainPage)
             WDRouterRule.jumpWithReplacePage(WDRouterPage.mainPage)
             return
             return
           }
           }
-          
+
           let dataModel : LaunchDataModel = JSON.parse(dataModelStr)
           let dataModel : LaunchDataModel = JSON.parse(dataModelStr)
           console.log(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) {
           if (dataModel.launchPageInfo || dataModel.launchAdInfo.length) {
             //跳转广告页
             //跳转广告页