Skip to content

Commit 87b426f

Browse files
wanghenghengwanghengheng
committed
更新一些通用宏
1 parent c506f8c commit 87b426f

1 file changed

Lines changed: 59 additions & 64 deletions

File tree

‎Coding_iOS/Coding_iOS-Prefix.pch.example‎

Lines changed: 59 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -11,49 +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 "UILabel+Common.h"
30-
#import "NSDate+Common.h"
31-
#import "UIBarButtonItem+Common.h"
32-
#import "UIActionSheet+Common.h"
33-
#import "NSURL+Common.h"
34-
#import "UISearchBar+Common.h"
35-
#import "UITTTAttributedLabel.h"
36-
#import "NSObject+ObjectMap.h"
37-
#import "ImageSizeManager.h"
38-
#import "MobClick.h"
39-
#import <BlocksKit/BlocksKit+UIKit.h>
40-
#import <ReactiveCocoa/ReactiveCocoa.h>
41-
#import <ReactiveCocoa/RACEXTScope.h>
42-
#import "UIImageView+WebCache.h"
43-
#import <Masonry/Masonry.h>
44-
45-
#import "BaseNavigationController.h"
46-
#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"
4744

4845
#endif
46+
47+
#define SD_WEBP
48+
4949
//友盟统计
5050
#define kUmeng_AppKey @""
51-
#define kUmeng_Event_Request @"Request"
52-
53-
//友盟推送
54-
#define kUmeng_AppKey_Push @""
55-
#define kUmeng_DeviceTokenKey @"Umeng_DeviceTokenKey"
56-
#define kUmeng_MessageAliasTypeCoding @"GLOBAL_KEY"
51+
#define kUmeng_Event_Request @""
5752

5853
//信鸽推送
5954
#define kXGPush_Id 123456
@@ -95,14 +90,14 @@
9590
#define kMySegmentControlIcon_Height 70.0
9691

9792
#define kBackButtonFontSize 16
98-
#define kNavTitleFontSize 19
93+
#define kNavTitleFontSize 18
9994
#define kBadgeTipStr @"badgeTip"
10095

10196
#define kDefaultLastId [NSNumber numberWithInteger:99999999]
10297

10398
#define kColor999 [UIColor colorWithHexString:@"0x999999"]
10499
#define kColorTableBG [UIColor colorWithHexString:@"0xfafafa"]
105-
#define kColorTableSectionBg [UIColor colorWithHexString:@"0xe5e5e5"]
100+
#define kColorTableSectionBg [UIColor colorWithHexString:@"0xeeeeee"]
106101

107102
#define kImage999 [UIImage imageWithColor:kColor999]
108103

@@ -135,28 +130,28 @@
135130
#pragma mark - Weak Object
136131

137132
/**
138-
* @code
139-
* ESWeak(imageView, weakImageView);
140-
* [self testBlock:^(UIImage *image) {
141-
* ESStrong(weakImageView, strongImageView);
142-
* strongImageView.image = image;
143-
* }];
144-
*
145-
* // `ESWeak_(imageView)` will create a var named `weak_imageView`
146-
* ESWeak_(imageView);
147-
* [self testBlock:^(UIImage *image) {
148-
* ESStrong_(imageView);
149-
* _imageView.image = image;
150-
* }];
151-
*
152-
* // weak `self` and strong `self`
153-
* ESWeakSelf;
154-
* [self testBlock:^(UIImage *image) {
155-
* ESStrongSelf;
156-
* _self.image = image;
157-
* }];
158-
* @endcode
159-
*/
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+
*/
160155

161156
#define ESWeak(var, weakVar) __weak __typeof(&*var) weakVar = var
162157
#define ESStrong_DoNotCheckNil(weakVar, _var) __typeof(&*weakVar) _var = weakVar
@@ -168,4 +163,4 @@
168163
/** defines a weak `self` named `__weakSelf` */
169164
#define ESWeakSelf ESWeak(self, __weakSelf);
170165
/** defines a strong `self` named `_self` from `__weakSelf` */
171-
#define ESStrongSelf ESStrong(__weakSelf, _self);
166+
#define ESStrongSelf ESStrong(__weakSelf, _self);

0 commit comments

Comments
 (0)