处理冲突

entry/src/main/ets/pages/ScanFilePage.ets

@@ -121,7 +121,7 @@ export struct ScanFilePage{
   //     router.back()
   //
   //   })
-  initState(){
+  initState(isOnekey:boolean){
 
     this.initLottie(this.path,true)
     if(isOnekey){

entry/src/main/ets/pages/SettingPage.ets

@@ -98,25 +98,6 @@ export struct SettingPage {
   @StorageProp('currentColorMode') @Watch('onColorModeChange') currentMode: number =
     ConfigurationConstant.ColorMode.COLOR_MODE_LIGHT;
   @StorageLink('isDarkMode') isDarkMode: boolean = false // 是否启用深色模式
-  static readonly IS_BGPLAY_OPEN: string = 'isBgPlayOpen';
-  static readonly IS_AUTO_RATATE: string = 'isAutoRatate';
-  static readonly iS_MEMORY_PLAY: string = 'isMemoryPlay';
-  static readonly IS_MIDIACODEC_OPEN: string = 'isMediacodec';
-  static readonly iS_MUSIC_MEMORY_PLAY: string = 'isMusicMemoryPlay';
-  static readonly iS_MUSIC_BG_COVER: string = 'isMusicBGCover';
-  static readonly iS_SAVE_PLAY_MODE: string = 'isSavePlayMode';
-  static readonly IS_COVER_RECTANGLE: string = 'isCoverRectangle'; //封面圆形或者方形
-
-  static readonly IS_SHOW_SIMI: string = 'isShowSimi';
-  static readonly IS_SHOW_FAV: string = 'isShowFAV';
-  static readonly IS_SHOW_HISTORY: string = 'isShowHistory';
-  static readonly IS_CUSTOMIZE_BG: string = 'is_customize_bg';
-  static readonly IS_GRID_MUSIC: string = 'is_grid_music';
-  static readonly IS_CUSTOMIZE_BG_PATH: string = 'is_customize_bg_path';
-  static readonly IS_SCROLL_HIDE: string = 'isScrollHide';
-  static readonly IS_SAMETIME_PLAY: string = 'isSameTimePlay';
-  static readonly CUSTOMIZE_BG_BLUR: string = 'customize_bg_blur';
-  static readonly BG_BRIGHTNESS: string = 'bg_brightness';
 
   static readonly iS_START_AUTO_PLAY: string = 'isStartAutoPlay';
   static readonly iS_MEMORY_LAST_PLAY: string = 'isMemoryLastPlay';