iOS Team / CNLiveBaseTools · Commits

Commit 0d055ed7fc3c77602d0923ba77fb43f3965606a1

Authored by yanglingyu
1 parent 0b9ff9ff

修改皮肤包判断

Inline Side-by-side
Showing 1 changed file with 6 additions and 28 deletions
CNLiveBaseTools/Classes/TabBarEditIcon/CNLiveEditAppIconManager.m
  View file @0d055ed
... ... @@ -63,38 +63,16 @@
63 63 NSDictionary *oldHolidayDic = [userDefaults objectForKey:kHolidayKey];
64 64 if (oldHolidayDic && oldHolidayDic.count > 0) {
65 65 CNEditAppIconModel *newIconModel = [CNEditAppIconModel mj_objectWithKeyValues:newHolidyDic];
66   - CNEditAppIconModel *oldIconModel = [CNEditAppIconModel mj_objectWithKeyValues:oldHolidayDic];//当前时间
67   - CGFloat currentTime = [CNLiveEditAppIconManager currentTimeStr];
68   - if (oldIconModel.holidayTheme.startTime&&oldIconModel.holidayTheme.endTime) {
69   - //皮肤开始结束时间相等说明是一套皮肤
70   - if (newIconModel.holidayTheme.startTime == oldIconModel.holidayTheme.startTime && newIconModel.holidayTheme.endTime == oldIconModel.holidayTheme.endTime) {
  66 + if ([newIconModel.isShow isEqualToString:@"0"]) {
  67 +
  68 + //判断是否启用
  69 + CGFloat currentTime = [CNLiveEditAppIconManager currentTimeStr];
  70 + if (currentTime >= newIconModel.holidayTheme.startTime) {
  71 + //在开始时间内则展示
71 72 [userDefaults setObject:newHolidyDic forKey:kHolidayKey];
72 73 [[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   - //当前皮肤超出展示时间则替换
86   - [userDefaults setObject:newHolidyDic forKey:kHolidayKey];
87   - [[NSUserDefaults standardUserDefaults] synchronize];
88   - }
89   -
90   - }
91 74 }
92   - }else{
93   - ///老版未旧皮肤包，替换为新的
94   - [userDefaults setObject:newHolidyDic forKey:kHolidayKey];
95   - [[NSUserDefaults standardUserDefaults] synchronize];
96 75 }
97   -
98 76 }else{
99 77 //没有旧皮肤直接使用新皮肤
100 78 [userDefaults setObject:newHolidyDic forKey:kHolidayKey];
... ...