Skip to content

Commit 0a733c1

Browse files
LambdaLambda
Lambda
authored and
Lambda
committed
重大改动啊，d2
1 parent bdc09b2 commit 0a733c1

39 files changed

Lines changed: 917 additions & 594 deletions

‎.DS_Store‎

0 Bytes
Binary file not shown.

‎Coding_iOS.xcodeproj/project.pbxproj‎

Lines changed: 18 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@
6161
4E095A841B6B24DE008DC439 /* time_clock_icon@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4E095A811B6B24DE008DC439 /* time_clock_icon@2x.png */; };
6262
4E095A851B6B24DE008DC439 /* topic_comment_icon@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4E095A821B6B24DE008DC439 /* topic_comment_icon@2x.png */; };
6363
4E0BD8561B6C7DFD0061CAA6 /* UIView+Frame.m in Sources */ = {isa = PBXBuildFile; fileRef = 4E0BD8551B6C7DFD0061CAA6 /* UIView+Frame.m */; };
64-
4E0BD86A1B6C7E3D0061CAA6 /* CSHotTopicVC.m in Sources */ = {isa = PBXBuildFile; fileRef = 4E0BD8591B6C7E3D0061CAA6 /* CSHotTopicVC.m */; };
64+
4E0BD86A1B6C7E3D0061CAA6 /* CSHotTopicView.m in Sources */ = {isa = PBXBuildFile; fileRef = 4E0BD8591B6C7E3D0061CAA6 /* CSHotTopicView.m */; };
6565
4E0BD86B1B6C7E3D0061CAA6 /* CSLikesVC.m in Sources */ = {isa = PBXBuildFile; fileRef = 4E0BD85B1B6C7E3D0061CAA6 /* CSLikesVC.m */; };
6666
4E0BD86C1B6C7E3D0061CAA6 /* CSMyTopicVC.m in Sources */ = {isa = PBXBuildFile; fileRef = 4E0BD85D1B6C7E3D0061CAA6 /* CSMyTopicVC.m */; };
6767
4E0BD86D1B6C7E3D0061CAA6 /* CSScrollview.m in Sources */ = {isa = PBXBuildFile; fileRef = 4E0BD85F1B6C7E3D0061CAA6 /* CSScrollview.m */; };
@@ -489,6 +489,8 @@
489489
8B3516511B6CE9460049BC45 /* search_tweet_colck@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 8B35164C1B6CE9460049BC45 /* search_tweet_colck@2x.png */; };
490490
8B3516521B6CE9460049BC45 /* search_tweet_comment@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 8B35164D1B6CE9460049BC45 /* search_tweet_comment@2x.png */; };
491491
8B3516531B6CE9460049BC45 /* search_tweet_like@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 8B35164E1B6CE9460049BC45 /* search_tweet_like@2x.png */; };
492+
8B3516551B6CF69E0049BC45 /* icon_search_clock@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 8B3516541B6CF69E0049BC45 /* icon_search_clock@2x.png */; };
493+
8B888E421B72618200806CEE /* CSHotTopicPagesVC.m in Sources */ = {isa = PBXBuildFile; fileRef = 8B888E411B72618200806CEE /* CSHotTopicPagesVC.m */; };
492494
8E03D4A219F695FE0092F8C8 /* libMobClickLibrary.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 8E03D49F19F695FE0092F8C8 /* libMobClickLibrary.a */; };
493495
8E03D4A419F696970092F8C8 /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 8E03D4A319F696970092F8C8 /* libz.dylib */; };
494496
8E1C3DEA19E7D58A00EF3032 /* AbstractActionSheetPicker.m in Sources */ = {isa = PBXBuildFile; fileRef = 8E1C3DDA19E7D58A00EF3032 /* AbstractActionSheetPicker.m */; };
@@ -885,8 +887,8 @@
885887
4E095A821B6B24DE008DC439 /* topic_comment_icon@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "topic_comment_icon@2x.png"; sourceTree = "<group>"; };
886888
4E0BD8541B6C7DFD0061CAA6 /* UIView+Frame.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UIView+Frame.h"; sourceTree = "<group>"; };
887889
4E0BD8551B6C7DFD0061CAA6 /* UIView+Frame.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UIView+Frame.m"; sourceTree = "<group>"; };
888-
4E0BD8581B6C7E3D0061CAA6 /* CSHotTopicVC.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CSHotTopicVC.h; sourceTree = "<group>"; };
889-
4E0BD8591B6C7E3D0061CAA6 /* CSHotTopicVC.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CSHotTopicVC.m; sourceTree = "<group>"; };
890+
4E0BD8581B6C7E3D0061CAA6 /* CSHotTopicView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CSHotTopicView.h; sourceTree = "<group>"; };
891+
4E0BD8591B6C7E3D0061CAA6 /* CSHotTopicView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CSHotTopicView.m; sourceTree = "<group>"; };
890892
4E0BD85A1B6C7E3D0061CAA6 /* CSLikesVC.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CSLikesVC.h; sourceTree = "<group>"; };
891893
4E0BD85B1B6C7E3D0061CAA6 /* CSLikesVC.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CSLikesVC.m; sourceTree = "<group>"; };
892894
4E0BD85C1B6C7E3D0061CAA6 /* CSMyTopicVC.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CSMyTopicVC.h; sourceTree = "<group>"; };
@@ -1455,6 +1457,7 @@
14551457
4ED673211A8E0ECC00DF2D1A /* SVWebViewControllerActivityReport.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SVWebViewControllerActivityReport.m; sourceTree = "<group>"; };
14561458
4ED673251A8E127100DF2D1A /* SVWebViewControllerActivityReport@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "SVWebViewControllerActivityReport@2x.png"; sourceTree = "<group>"; };
14571459
4ED673271A8E12F900DF2D1A /* SVWebViewControllerActivityReport-iPad@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "SVWebViewControllerActivityReport-iPad@2x.png"; sourceTree = "<group>"; };
1460+
4EDBECE91B7055BF003E87C3 /* Coding_iOS-Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "Coding_iOS-Prefix.pch"; sourceTree = "<group>"; };
14581461
4EDC33CC1AFB4DCC00698315 /* EaseInputTipsView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EaseInputTipsView.h; sourceTree = "<group>"; };
14591462
4EDC33CD1AFB4DCC00698315 /* EaseInputTipsView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EaseInputTipsView.m; sourceTree = "<group>"; };
14601463
4EDD8F4D1A36F42200E9E232 /* libXG-SDK.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = "libXG-SDK.a"; sourceTree = "<group>"; };
@@ -1550,6 +1553,9 @@
15501553
8B35164C1B6CE9460049BC45 /* search_tweet_colck@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "search_tweet_colck@2x.png"; sourceTree = "<group>"; };
15511554
8B35164D1B6CE9460049BC45 /* search_tweet_comment@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "search_tweet_comment@2x.png"; sourceTree = "<group>"; };
15521555
8B35164E1B6CE9460049BC45 /* search_tweet_like@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "search_tweet_like@2x.png"; sourceTree = "<group>"; };
1556+
8B3516541B6CF69E0049BC45 /* icon_search_clock@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "icon_search_clock@2x.png"; sourceTree = "<group>"; };
1557+
8B888E401B72618200806CEE /* CSHotTopicPagesVC.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CSHotTopicPagesVC.h; sourceTree = "<group>"; };
1558+
8B888E411B72618200806CEE /* CSHotTopicPagesVC.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CSHotTopicPagesVC.m; sourceTree = "<group>"; };
15531559
8E03D49F19F695FE0092F8C8 /* libMobClickLibrary.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libMobClickLibrary.a; sourceTree = "<group>"; };
15541560
8E03D4A019F695FE0092F8C8 /* MobClick.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MobClick.h; sourceTree = "<group>"; };
15551561
8E03D4A119F695FE0092F8C8 /* MobClickSocialAnalytics.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MobClickSocialAnalytics.h; sourceTree = "<group>"; };
@@ -2095,8 +2101,8 @@
20952101
4E0BD8571B6C7E3D0061CAA6 /* Topic */ = {
20962102
isa = PBXGroup;
20972103
children = (
2098-
4E0BD8581B6C7E3D0061CAA6 /* CSHotTopicVC.h */,
2099-
4E0BD8591B6C7E3D0061CAA6 /* CSHotTopicVC.m */,
2104+
4E0BD8581B6C7E3D0061CAA6 /* CSHotTopicView.h */,
2105+
4E0BD8591B6C7E3D0061CAA6 /* CSHotTopicView.m */,
21002106
4E0BD85A1B6C7E3D0061CAA6 /* CSLikesVC.h */,
21012107
4E0BD85B1B6C7E3D0061CAA6 /* CSLikesVC.m */,
21022108
4E0BD85C1B6C7E3D0061CAA6 /* CSMyTopicVC.h */,
@@ -2113,6 +2119,8 @@
21132119
4E0BD8671B6C7E3D0061CAA6 /* CSTopiclistView.m */,
21142120
4E0BD8681B6C7E3D0061CAA6 /* CSTopicModel.h */,
21152121
4E0BD8691B6C7E3D0061CAA6 /* CSTopicModel.m */,
2122+
8B888E401B72618200806CEE /* CSHotTopicPagesVC.h */,
2123+
8B888E411B72618200806CEE /* CSHotTopicPagesVC.m */,
21162124
);
21172125
path = Topic;
21182126
sourceTree = "<group>";
@@ -3238,6 +3246,7 @@
32383246
8EA6CF1619E240C40076D59C /* AppDelegate.m */,
32393247
4EFE8DB81B3A5727004B7559 /* Launch Screen.xib */,
32403248
8EA6CF1719E240C40076D59C /* Coding_iOS-Info.plist */,
3249+
4EDBECE91B7055BF003E87C3 /* Coding_iOS-Prefix.pch */,
32413250
4E8C51AE1AC0177600B4C51F /* Coding_iOS-Prefix.pch.example */,
32423251
8EA6CF1919E240C40076D59C /* Coding_iOS.xcdatamodeld */,
32433252
8EA6CFC519E240C40076D59C /* Images.xcassets */,
@@ -3424,6 +3433,7 @@
34243433
8EA6CFAF19E240C40076D59C /* tip_icons */,
34253434
4E1A228C1AB19D1F00CFC14F /* git_btn_icons */,
34263435
8EA6CF5F19E240C40076D59C /* btn_delete_tweetimage@2x.png */,
3436+
8B3516541B6CF69E0049BC45 /* icon_search_clock@2x.png */,
34273437
8EA6CF6319E240C40076D59C /* commentOrLikeBeginImg@2x.png */,
34283438
8B35164A1B6CE9460049BC45 /* icon_arrow_searchHistory@2x.png */,
34293439
8B35164B1B6CE9460049BC45 /* icon_topic_hotTop@2x.png */,
@@ -4446,6 +4456,7 @@
44464456
4E0849821A918A7F00BD27F6 /* coding_emoji_40@2x.png in Resources */,
44474457
4E6383BA1B32640900D98648 /* messageRight_bg_img@2x.png in Resources */,
44484458
4E9113AC1A1CB19900AC9431 /* icon_file_state_pause@2x.png in Resources */,
4459+
8B3516551B6CF69E0049BC45 /* icon_search_clock@2x.png in Resources */,
44494460
4E6383AA1B3262D300D98648 /* taskPriority2@2x.png in Resources */,
44504461
4E66EE281A28226000DA1B3E /* button_file_denete_unable@2x.png in Resources */,
44514462
8E97CE4A1A0A2E11006F9AD7 /* EmojisList.plist in Resources */,
@@ -4649,7 +4660,7 @@
46494660
8EF643D219FF7E2900F7EEB0 /* UserCell.m in Sources */,
46504661
4E8D5D731B454D5000B70936 /* OTPAuthClock.m in Sources */,
46514662
4E8D5D621B45295D00B70936 /* TOTPGenerator.m in Sources */,
4652-
4E0BD86A1B6C7E3D0061CAA6 /* CSHotTopicVC.m in Sources */,
4663+
4E0BD86A1B6C7E3D0061CAA6 /* CSHotTopicView.m in Sources */,
46534664
8EA6D1AE19E240C40076D59C /* CodingTip.m in Sources */,
46544665
4E4D6A5E1B1C64C600FD2E49 /* MRPRDetailViewController.m in Sources */,
46554666
4E2719B81AB02F31006AE214 /* NProjectViewController.m in Sources */,
@@ -4816,6 +4827,7 @@
48164827
8EF643CC19FF7E2900F7EEB0 /* TweetCommentCell.m in Sources */,
48174828
4E6C41191A834EA90098DC17 /* BaseNavigationController.m in Sources */,
48184829
0A03E6D31ABD0F690034BB8E /* LocationHelper.m in Sources */,
4830+
8B888E421B72618200806CEE /* CSHotTopicPagesVC.m in Sources */,
48194831
4E6BA2D91A1EE6AF005FD721 /* AFURLConnectionOperation.m in Sources */,
48204832
8EA6D1BB19E240C40076D59C /* ProjectTopic.m in Sources */,
48214833
8EA6D13219E240C40076D59C /* RegisterViewController.m in Sources */,

‎Coding_iOS/.DS_Store‎

4 KB
Binary file not shown.

‎Coding_iOS/AppDelegate.m‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,9 @@ - (void)customizeInterface {
211211
#pragma mark URL Schemes
212212
- (BOOL)application:(UIApplication *)application openURL:(NSURL *)url sourceApplication:(NSString *)sourceApplication annotation:(id)annotation{
213213
DebugLog(@"path: %@, params: %@", [url path], [url queryParams]);
214-
[self showPasswordWithURL:url];
214+
if (![self showPasswordWithURL:url]) {//如果不是登录注册的链接，就是用正常的解析模式解析
215+
[BaseViewController presentLinkStr:url.absoluteString];
216+
}
215217
return YES;
216218
}
217219

‎Coding_iOS/Coding_iOS-Prefix.pch‎

Lines changed: 38 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -11,47 +11,44 @@
1111
#endif
1212

1313
#ifdef __OBJC__
14-
#import <UIKit/UIKit.h>
15-
#import <Foundation/Foundation.h>
16-
#import <CoreData/CoreData.h>
17-
18-
#import "NSString+Common.h"
19-
#import "NSObject+Common.h"
20-
#import "UIImage+Common.h"
21-
#import "UIButton+Bootstrap.h"
22-
#import "UIColor+expanded.h"
23-
#import "UIButton+Common.h"
24-
#import "UITableView+Common.h"
25-
#import "UIView+Common.h"
26-
#import "UIView+Frame.h"
27-
#import "UILabel+Common.h"
28-
#import "NSDate+Common.h"
29-
#import "UIBarButtonItem+Common.h"
30-
#import "UIActionSheet+Common.h"
31-
#import "NSURL+Common.h"
32-
#import "UISearchBar+Common.h"
33-
#import "UITTTAttributedLabel.h"
34-
#import "NSObject+ObjectMap.h"
35-
#import "ImageSizeManager.h"
36-
#import "MobClick.h"
37-
#import <BlocksKit/BlocksKit+UIKit.h>
38-
#import <ReactiveCocoa/ReactiveCocoa.h>
39-
#import <ReactiveCocoa/RACEXTScope.h>
40-
#import "UIImageView+WebCache.h"
41-
#import <Masonry/Masonry.h>
42-
43-
#import "BaseNavigationController.h"
44-
#import "BaseViewController.h"
14+
#import <UIKit/UIKit.h>
15+
#import <Foundation/Foundation.h>
16+
#import <CoreData/CoreData.h>
17+
18+
#import "NSString+Common.h"
19+
#import "NSObject+Common.h"
20+
#import "UIImage+Common.h"
21+
#import "UIButton+Bootstrap.h"
22+
#import "UIColor+expanded.h"
23+
#import "UIButton+Common.h"
24+
#import "UITableView+Common.h"
25+
#import "UIView+Common.h"
26+
#import "UILabel+Common.h"
27+
#import "NSDate+Common.h"
28+
#import "UIBarButtonItem+Common.h"
29+
#import "UIActionSheet+Common.h"
30+
#import "NSURL+Common.h"
31+
#import "UISearchBar+Common.h"
32+
#import "UITTTAttributedLabel.h"
33+
#import "NSObject+ObjectMap.h"
34+
#import "ImageSizeManager.h"
35+
#import "MobClick.h"
36+
#import <BlocksKit/BlocksKit+UIKit.h>
37+
#import <ReactiveCocoa/ReactiveCocoa.h>
38+
#import <ReactiveCocoa/RACEXTScope.h>
39+
#import "UIImageView+WebCache.h"
40+
#import <Masonry/Masonry.h>
41+
42+
#import "BaseNavigationController.h"
43+
#import "BaseViewController.h"
4544

4645
#endif
46+
47+
#define SD_WEBP
48+
4749
//友盟统计
4850
#define kUmeng_AppKey @""
49-
#define kUmeng_Event_Request @"Request"
50-
51-
//友盟推送
52-
#define kUmeng_AppKey_Push @""
53-
#define kUmeng_DeviceTokenKey @"Umeng_DeviceTokenKey"
54-
#define kUmeng_MessageAliasTypeCoding @"GLOBAL_KEY"
51+
#define kUmeng_Event_Request @""
5552

5653
//信鸽推送
5754
#define kXGPush_Id 123456
@@ -93,14 +90,14 @@
9390
#define kMySegmentControlIcon_Height 70.0
9491

9592
#define kBackButtonFontSize 16
96-
#define kNavTitleFontSize 19
93+
#define kNavTitleFontSize 18
9794
#define kBadgeTipStr @"badgeTip"
9895

9996
#define kDefaultLastId [NSNumber numberWithInteger:99999999]
10097

10198
#define kColor999 [UIColor colorWithHexString:@"0x999999"]
10299
#define kColorTableBG [UIColor colorWithHexString:@"0xfafafa"]
103-
#define kColorTableSectionBg [UIColor colorWithHexString:@"0xe5e5e5"]
100+
#define kColorTableSectionBg [UIColor colorWithHexString:@"0xeeeeee"]
104101

105102
#define kImage999 [UIImage imageWithColor:kColor999]
106103

@@ -144,7 +141,7 @@
144141
* ESWeak_(imageView);
145142
* [self testBlock:^(UIImage *image) {
146143
* ESStrong_(imageView);
147-
* _imageView.image = image;
144+
* _imageView.image = image;
148145
* }];
149146
*
150147
* // weak `self` and strong `self`
@@ -166,4 +163,4 @@
166163
/** defines a weak `self` named `__weakSelf` */
167164
#define ESWeakSelf ESWeak(self, __weakSelf);
168165
/** defines a strong `self` named `_self` from `__weakSelf` */
169-
#define ESStrongSelf ESStrong(__weakSelf, _self);
166+
#define ESStrongSelf ESStrong(__weakSelf, _self);

‎Coding_iOS/Coding_iOS-Prefix.pch.example‎

Lines changed: 59 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -11,51 +11,44 @@
1111
#endif
1212

1313
#ifdef __OBJC__
14-
#import <UIKit/UIKit.h>
15-
#import <Foundation/Foundation.h>
16-
#import <CoreData/CoreData.h>
17-
18-
#import "APIUrl.h"
19-
20-
#import "NSString+Common.h"
21-
#import "NSObject+Common.h"
22-
#import "UIImage+Common.h"
23-
#import "UIButton+Bootstrap.h"
24-
#import "UIColor+expanded.h"
25-
#import "UIButton+Common.h"
26-
#import "UITableView+Common.h"
27-
#import "UIView+Common.h"
28-
#import "UIImageView+Common.h"
29-
#import "UIView+Frame.h"
30-
#import "UILabel+Common.h"
31-
#import "NSDate+Common.h"
32-
#import "UIBarButtonItem+Common.h"
33-
#import "UIActionSheet+Common.h"
34-
#import "NSURL+Common.h"
35-
#import "UISearchBar+Common.h"
36-
#import "UITTTAttributedLabel.h"
37-
#import "NSObject+ObjectMap.h"
38-
#import "ImageSizeManager.h"
39-
#import "MobClick.h"
40-
41-
#import <BlocksKit/BlocksKit+UIKit.h>
42-
#import <ReactiveCocoa/ReactiveCocoa.h>
43-
#import <ReactiveCocoa/RACEXTScope.h>
44-
#import "UIImageView+WebCache.h"
45-
#import <Masonry/Masonry.h>
46-
47-
#import "BaseNavigationController.h"
48-
#import "BaseViewController.h"
14+
#import <UIKit/UIKit.h>
15+
#import <Foundation/Foundation.h>
16+
#import <CoreData/CoreData.h>
17+
18+
#import "NSString+Common.h"
19+
#import "NSObject+Common.h"
20+
#import "UIImage+Common.h"
21+
#import "UIButton+Bootstrap.h"
22+
#import "UIColor+expanded.h"
23+
#import "UIButton+Common.h"
24+
#import "UITableView+Common.h"
25+
#import "UIView+Common.h"
26+
#import "UILabel+Common.h"
27+
#import "NSDate+Common.h"
28+
#import "UIBarButtonItem+Common.h"
29+
#import "UIActionSheet+Common.h"
30+
#import "NSURL+Common.h"
31+
#import "UISearchBar+Common.h"
32+
#import "UITTTAttributedLabel.h"
33+
#import "NSObject+ObjectMap.h"
34+
#import "ImageSizeManager.h"
35+
#import "MobClick.h"
36+
#import <BlocksKit/BlocksKit+UIKit.h>
37+
#import <ReactiveCocoa/ReactiveCocoa.h>
38+
#import <ReactiveCocoa/RACEXTScope.h>
39+
#import "UIImageView+WebCache.h"
40+
#import <Masonry/Masonry.h>
41+
42+
#import "BaseNavigationController.h"
43+
#import "BaseViewController.h"
4944

5045
#endif
46+
47+
#define SD_WEBP
48+
5149
//友盟统计
5250
#define kUmeng_AppKey @""
53-
#define kUmeng_Event_Request @"Request"
54-
55-
//友盟推送
56-
#define kUmeng_AppKey_Push @""
57-
#define kUmeng_DeviceTokenKey @"Umeng_DeviceTokenKey"
58-
#define kUmeng_MessageAliasTypeCoding @"GLOBAL_KEY"
51+
#define kUmeng_Event_Request @""
5952

6053
//信鸽推送
6154
#define kXGPush_Id 123456
@@ -97,14 +90,14 @@
9790
#define kMySegmentControlIcon_Height 70.0
9891

9992
#define kBackButtonFontSize 16
100-
#define kNavTitleFontSize 19
93+
#define kNavTitleFontSize 18
10194
#define kBadgeTipStr @"badgeTip"
10295

10396
#define kDefaultLastId [NSNumber numberWithInteger:99999999]
10497

10598
#define kColor999 [UIColor colorWithHexString:@"0x999999"]
10699
#define kColorTableBG [UIColor colorWithHexString:@"0xfafafa"]
107-
#define kColorTableSectionBg [UIColor colorWithHexString:@"0xe5e5e5"]
100+
#define kColorTableSectionBg [UIColor colorWithHexString:@"0xeeeeee"]
108101

109102
#define kImage999 [UIImage imageWithColor:kColor999]
110103

@@ -137,28 +130,28 @@
137130
#pragma mark - Weak Object
138131

139132
/**
140-
* @code
141-
* ESWeak(imageView, weakImageView);
142-
* [self testBlock:^(UIImage *image) {
143-
* ESStrong(weakImageView, strongImageView);
144-
* strongImageView.image = image;
145-
* }];
146-
*
147-
* // `ESWeak_(imageView)` will create a var named `weak_imageView`
148-
* ESWeak_(imageView);
149-
* [self testBlock:^(UIImage *image) {
150-
* ESStrong_(imageView);
151-
* _imageView.image = image;
152-
* }];
153-
*
154-
* // weak `self` and strong `self`
155-
* ESWeakSelf;
156-
* [self testBlock:^(UIImage *image) {
157-
* ESStrongSelf;
158-
* _self.image = image;
159-
* }];
160-
* @endcode
161-
*/
133+
* @code
134+
* ESWeak(imageView, weakImageView);
135+
* [self testBlock:^(UIImage *image) {
136+
* ESStrong(weakImageView, strongImageView);
137+
* strongImageView.image = image;
138+
* }];
139+
*
140+
* // `ESWeak_(imageView)` will create a var named `weak_imageView`
141+
* ESWeak_(imageView);
142+
* [self testBlock:^(UIImage *image) {
143+
* ESStrong_(imageView);
144+
* _imageView.image = image;
145+
* }];
146+
*
147+
* // weak `self` and strong `self`
148+
* ESWeakSelf;
149+
* [self testBlock:^(UIImage *image) {
150+
* ESStrongSelf;
151+
* _self.image = image;
152+
* }];
153+
* @endcode
154+
*/
162155

163156
#define ESWeak(var, weakVar) __weak __typeof(&*var) weakVar = var
164157
#define ESStrong_DoNotCheckNil(weakVar, _var) __typeof(&*weakVar) _var = weakVar
@@ -170,4 +163,4 @@
170163
/** defines a weak `self` named `__weakSelf` */
171164
#define ESWeakSelf ESWeak(self, __weakSelf);
172165
/** defines a strong `self` named `_self` from `__weakSelf` */
173-
#define ESStrongSelf ESStrong(__weakSelf, _self);
166+
#define ESStrongSelf ESStrong(__weakSelf, _self);

0 commit comments

Comments
 (0)