Skip to content

Commit

Permalink
Fix a bug from Networking 2.x .
Browse files Browse the repository at this point in the history
  • Loading branch information
YouXianMing committed Jan 12, 2016
1 parent 3ebf48b commit fbac61e
Show file tree
Hide file tree
Showing 4 changed files with 22 additions and 10 deletions.
4 changes: 4 additions & 0 deletions Animations.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -156,6 +156,7 @@
104F0D331BFC1C9C00C46E6A /* ForegroundColorAttribute.m in Sources */ = {isa = PBXBuildFile; fileRef = 104F0D2A1BFC1C9C00C46E6A /* ForegroundColorAttribute.m */; };
104F0D341BFC1C9C00C46E6A /* NSMutableAttributedString+StringAttribute.m in Sources */ = {isa = PBXBuildFile; fileRef = 104F0D2D1BFC1C9C00C46E6A /* NSMutableAttributedString+StringAttribute.m */; };
104F0D351BFC1C9C00C46E6A /* NSString+StringAttribute.m in Sources */ = {isa = PBXBuildFile; fileRef = 104F0D2F1BFC1C9C00C46E6A /* NSString+StringAttribute.m */; };
10567E491C45411700625C6B /* api.md in Resources */ = {isa = PBXBuildFile; fileRef = 10567E481C45411700625C6B /* api.md */; };
10585B2C1C3F468E0052990F /* UIButton+Style.m in Sources */ = {isa = PBXBuildFile; fileRef = 10585B2B1C3F468E0052990F /* UIButton+Style.m */; };
10589D251C2393C200F20BC0 /* FBShimmeringLayer.m in Sources */ = {isa = PBXBuildFile; fileRef = 10589D221C2393C200F20BC0 /* FBShimmeringLayer.m */; };
10589D261C2393C200F20BC0 /* FBShimmeringView.m in Sources */ = {isa = PBXBuildFile; fileRef = 10589D241C2393C200F20BC0 /* FBShimmeringView.m */; };
Expand Down Expand Up @@ -531,6 +532,7 @@
104F0D2E1BFC1C9C00C46E6A /* NSString+StringAttribute.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSString+StringAttribute.h"; sourceTree = "<group>"; };
104F0D2F1BFC1C9C00C46E6A /* NSString+StringAttribute.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSString+StringAttribute.m"; sourceTree = "<group>"; };
104F0D301BFC1C9C00C46E6A /* StringAttributeHelper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StringAttributeHelper.h; sourceTree = "<group>"; };
10567E481C45411700625C6B /* api.md */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = net.daringfireball.markdown; path = api.md; sourceTree = "<group>"; };
10585B2A1C3F468E0052990F /* UIButton+Style.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UIButton+Style.h"; sourceTree = "<group>"; };
10585B2B1C3F468E0052990F /* UIButton+Style.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UIButton+Style.m"; sourceTree = "<group>"; };
10589D201C2393C200F20BC0 /* FBShimmering.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FBShimmering.h; sourceTree = "<group>"; };
Expand Down Expand Up @@ -1177,6 +1179,7 @@
10381F611BF9B44A00E5E476 /* Info.plist */,
10381F511BF9B44A00E5E476 /* main.m */,
10381F741BF9B4E800E5E476 /* Animations.pch */,
10567E481C45411700625C6B /* api.md */,
105EFAF71C42878F00394044 /* SimpleNSLog.h */,
10381F761BF9B4F800E5E476 /* HYQiHei-25JF.otf */,
);
Expand Down Expand Up @@ -1798,6 +1801,7 @@
10381F771BF9B4F800E5E476 /* HYQiHei-25JF.otf in Resources */,
102296981C38CF71001AF5BB /* NodeModelViewControllerBack_black@3x.png in Resources */,
10381F5D1BF9B44A00E5E476 /* Assets.xcassets in Resources */,
10567E491C45411700625C6B /* api.md in Resources */,
102296961C38CF71001AF5BB /* NodeModelStrings.plist in Resources */,
102296991C38CF71001AF5BB /* NodeModelViewControllerBack_next@3x.png in Resources */,
);
Expand Down
Binary file not shown.
22 changes: 12 additions & 10 deletions Animations/V_2_X_Networking.m
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,9 @@ - (instancetype)init {

// AFNetworking 2.x 相关初始化
self.manager = [AFHTTPRequestOperationManager manager];

// 设置请求头
self.HTTPHeaderFieldsWithValues = [NSMutableDictionary dictionary];
}

return self;
Expand Down Expand Up @@ -124,11 +127,10 @@ - (void)startRequest {
}
}];
}

}

- (void)cancelRequest {

[self.httpOperation cancel];
}

Expand All @@ -140,7 +142,7 @@ + (id)getMethodNetworkingWithUrlString:(NSString *)urlString
Networking *networking = [[V_2_X_Networking alloc] init];
networking.urlString = urlString;
networking.requestDictionary = requestDictionary;

if (requestBodyType) {

networking.requestBodyType = requestBodyType;
Expand Down Expand Up @@ -183,7 +185,7 @@ + (id)postMethodNetworkingWithUrlString:(NSString *)urlString
* 重置数据
*/
- (void)resetData {

self.originalResponseData = nil;
self.serializerResponseData = nil;
}
Expand Down Expand Up @@ -236,7 +238,7 @@ - (void)accessResponseSerializer {
* 处理请求头部信息
*/
- (void)accessHeaderField {

if (self.HTTPHeaderFieldsWithValues) {

NSArray *allKeys = self.HTTPHeaderFieldsWithValues.allKeys;
Expand All @@ -253,7 +255,7 @@ - (void)accessHeaderField {
* 设置超时时间
*/
- (void)accessTimeoutInterval {

if (self.timeoutInterval && self.timeoutInterval.floatValue > 0) {

[self.manager.requestSerializer willChangeValueForKey:@"timeoutInterval"];
Expand All @@ -270,22 +272,22 @@ - (void)accessTimeoutInterval {
* @return 处理后的参数
*/
- (NSDictionary *)accessRequestDictionarySerializerWithRequestDictionary:(NSDictionary *)requestDictionary {

if (self.requestDictionarySerializer &&
[self.requestDictionarySerializer respondsToSelector:@selector(serializeRequestDictionary:)]) {

return [self.requestDictionarySerializer serializeRequestDictionary:requestDictionary];

} else {

return requestDictionary;
}
}

#pragma mark -
#pragma mark -

- (void)dealloc {

[self.httpOperation cancel];
}

Expand Down
6 changes: 6 additions & 0 deletions Animations/api.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
1) [GET] https://api.app.net/stream/0/posts/stream/global

2) [GET] http://apis.baidu.com/songshuxiansheng/news/news?

HTTPHeaderField : apikey
Value : 127ed18d90087367f47c3652e52dadc5

0 comments on commit fbac61e

Please sign in to comment.