Skip to content

Commit 7d6931a

Browse files
committed
中秋祝福
1 parent e2dbd04 commit 7d6931a

5 files changed

Lines changed: 34 additions & 10 deletions

File tree

Coding_iOS/Util/Manager/FunctionIntroManager.m

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -53,11 +53,7 @@ + (BOOL)needToShowIntro{
5353
NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
5454
NSString *preVersion = [defaults stringForKey:kIntroPageKey];
5555
BOOL needToShow = ![preVersion isEqualToString:kVersion_Coding];
56-
NSDate *curDate = [NSDate date];
57-
if (curDate.year != 2015 ||
58-
curDate.month != 9 ||
59-
curDate.day < 25 ||
60-
curDate.day > 27) {//中秋节期间才显示
56+
if (![NSDate isDuringMidAutumn]) {//中秋节期间才显示
6157
needToShow = NO;
6258
}
6359
return needToShow;

Coding_iOS/Util/Manager/StartImagesManager.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,8 @@
2828
@property (strong, nonatomic) NSString *fileName, *descriptionStr, *pathDisk;
2929

3030
+ (StartImage *)defautImage;
31+
+ (StartImage *)midAutumnImage;
32+
3133
- (UIImage *)image;
3234
- (void)startDownloadImage;
3335
@end

Coding_iOS/Util/Manager/StartImagesManager.m

Lines changed: 17 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -61,12 +61,16 @@ - (NSString *)downloadPath{
6161
}
6262

6363
- (StartImage *)randomImage{
64-
NSUInteger count = _imageLoadedArray.count;
65-
if (count > 0) {
66-
NSUInteger index = arc4random()%count;
67-
_startImage = [_imageLoadedArray objectAtIndex:index];
64+
if ([NSDate isDuringMidAutumn]) {
65+
_startImage = [StartImage midAutumnImage];
6866
}else{
69-
_startImage = [StartImage defautImage];
67+
NSUInteger count = _imageLoadedArray.count;
68+
if (count > 0) {
69+
NSUInteger index = arc4random()%count;
70+
_startImage = [_imageLoadedArray objectAtIndex:index];
71+
}else{
72+
_startImage = [StartImage defautImage];
73+
}
7074
}
7175

7276
[self saveDisplayImageName:_startImage.fileName];
@@ -203,6 +207,14 @@ + (StartImage *)defautImage{
203207
return st;
204208
}
205209

210+
+ (StartImage *)midAutumnImage{
211+
StartImage *st = [[StartImage alloc] init];
212+
st.descriptionStr = @"\"中秋快乐\" © Mango";
213+
st.fileName = @"MIDAUTUMNIMAGE.jpg";
214+
st.pathDisk = [[NSBundle mainBundle] pathForResource:@"MIDAUTUMNIMAGE" ofType:@"jpg"];
215+
return st;
216+
}
217+
206218
- (UIImage *)image{
207219
return [UIImage imageWithContentsOfFile:self.pathDisk];
208220
}

Coding_iOS/Util/OC_Category/NSDate+Common.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,5 +31,6 @@
3131

3232
- (NSString *)stringTimesAgo;//代码更新时间
3333

34+
+ (BOOL)isDuringMidAutumn;
3435

3536
@end

Coding_iOS/Util/OC_Category/NSDate+Common.m

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -190,5 +190,18 @@ - (NSString *)stringDisplay_MMdd{
190190
return displayStr;
191191
}
192192

193+
+ (BOOL)isDuringMidAutumn{
194+
BOOL isDuringMidAutumn;
195+
NSDate *curDate = [NSDate date];
196+
if (curDate.year != 2015 ||
197+
curDate.month != 9 ||
198+
curDate.day < 25 ||
199+
curDate.day > 27) {//中秋节期间才显示
200+
isDuringMidAutumn = NO;
201+
}else{
202+
isDuringMidAutumn = YES;
203+
}
204+
return isDuringMidAutumn;
205+
}
193206

194207
@end

0 commit comments

Comments
 (0)