iOS Team / CNLiveBaseTools · Commits

Commit 0b9ff9ff126a15d745a01dd68b290f55b4d61960

Authored by yanglingyu
1 parent 6223bea7

0.0.8

Inline Side-by-side
Showing 2 changed files with 25 additions and 19 deletions
CNLiveBaseTools.podspec
  View file @0b9ff9f
1 1
2 Pod::Spec.new do |s| 2 Pod::Spec.new do |s|
3 s.name = 'CNLiveBaseTools' 3 s.name = 'CNLiveBaseTools'
4 - s.version = '0.0.7' 4 + s.version = '0.0.8'
5 s.summary = '基础工具库时间声音等工具' 5 s.summary = '基础工具库时间声音等工具'
6 6
7 s.description = <<-DESC 7 s.description = <<-DESC
CNLiveBaseTools/Classes/TabBarEditIcon/CNLiveEditAppIconManager.m
  View file @0b9ff9f
@@ -65,30 +65,36 @@ @@ -65,30 +65,36 @@
65 CNEditAppIconModel *newIconModel = [CNEditAppIconModel mj_objectWithKeyValues:newHolidyDic]; 65 CNEditAppIconModel *newIconModel = [CNEditAppIconModel mj_objectWithKeyValues:newHolidyDic];
66 CNEditAppIconModel *oldIconModel = [CNEditAppIconModel mj_objectWithKeyValues:oldHolidayDic];//当前时间 66 CNEditAppIconModel *oldIconModel = [CNEditAppIconModel mj_objectWithKeyValues:oldHolidayDic];//当前时间
67 CGFloat currentTime = [CNLiveEditAppIconManager currentTimeStr]; 67 CGFloat currentTime = [CNLiveEditAppIconManager currentTimeStr];
68 -  
69 - //皮肤开始结束时间相等说明是一套皮肤  
70 - if (newIconModel.holidayTheme.startTime == oldIconModel.holidayTheme.startTime && newIconModel.holidayTheme.endTime == oldIconModel.holidayTheme.endTime) {  
71 - [userDefaults setObject:newHolidyDic forKey:kHolidayKey];  
72 - [[NSUserDefaults standardUserDefaults] synchronize];  
73 -  
74 - }else{  
75 - //不是一套皮肤  
76 - if (currentTime >= newIconModel.holidayTheme.startTime && currentTime <=newIconModel.holidayTheme.endTime){  
77 - if (currentTime >= oldIconModel.holidayTheme.startTime && currentTime <=oldIconModel.holidayTheme.endTime) {  
78 - //两套皮肤都在展示时间内  
79 - if ((oldIconModel.holidayTheme.endTime - oldIconModel.holidayTheme.startTime) > (newIconModel.holidayTheme.endTime - newIconModel .holidayTheme.startTime)) {  
80 - //当前展示皮肤涵盖新的皮肤展示时间则优先展示时间短的皮肤 68 + if (oldIconModel.holidayTheme.startTime&&oldIconModel.holidayTheme.endTime) {
  69 + //皮肤开始结束时间相等说明是一套皮肤
  70 + if (newIconModel.holidayTheme.startTime == oldIconModel.holidayTheme.startTime && newIconModel.holidayTheme.endTime == oldIconModel.holidayTheme.endTime) {
  71 + [userDefaults setObject:newHolidyDic forKey:kHolidayKey];
  72 + [[NSUserDefaults standardUserDefaults] synchronize];
  73 +
  74 + }else{
  75 + //不是一套皮肤
  76 + if (currentTime >= newIconModel.holidayTheme.startTime && currentTime <=newIconModel.holidayTheme.endTime){
  77 + if (currentTime >= oldIconModel.holidayTheme.startTime && currentTime <=oldIconModel.holidayTheme.endTime) {
  78 + //两套皮肤都在展示时间内
  79 + if ((oldIconModel.holidayTheme.endTime - oldIconModel.holidayTheme.startTime) > (newIconModel.holidayTheme.endTime - newIconModel .holidayTheme.startTime)) {
  80 + //当前展示皮肤涵盖新的皮肤展示时间则优先展示时间短的皮肤
  81 + [userDefaults setObject:newHolidyDic forKey:kHolidayKey];
  82 + [[NSUserDefaults standardUserDefaults] synchronize];
  83 + }
  84 + }else{
  85 + //当前皮肤超出展示时间则替换
81 [userDefaults setObject:newHolidyDic forKey:kHolidayKey]; 86 [userDefaults setObject:newHolidyDic forKey:kHolidayKey];
82 [[NSUserDefaults standardUserDefaults] synchronize]; 87 [[NSUserDefaults standardUserDefaults] synchronize];
83 } 88 }
84 - }else{  
85 - //当前皮肤超出展示时间则替换  
86 - [userDefaults setObject:newHolidyDic forKey:kHolidayKey];  
87 - [[NSUserDefaults standardUserDefaults] synchronize]; 89 +
88 } 90 }
89 -  
90 } 91 }
  92 + }else{
  93 + ///老版未旧皮肤包，替换为新的
  94 + [userDefaults setObject:newHolidyDic forKey:kHolidayKey];
  95 + [[NSUserDefaults standardUserDefaults] synchronize];
91 } 96 }
  97 +
92 }else{ 98 }else{
93 //没有旧皮肤直接使用新皮肤 99 //没有旧皮肤直接使用新皮肤
94 [userDefaults setObject:newHolidyDic forKey:kHolidayKey]; 100 [userDefaults setObject:newHolidyDic forKey:kHolidayKey];