Skip to content

G
GMNetService
Commit 6121ba3c authored by 乔金柱's avatar 乔金柱
Browse files
Options

Merge branch 'ajp/AFN_Update' into 'master' 

Ajp/afn update

See merge request !5
parents 20e500a7 b604c545
Hide whitespace changes
Inline Side-by-side
Showing with 32 additions and 72 deletions
Example/GMNetService.xcodeproj/project.pbxproj
View file @ 6121ba3c
......@@ -62,7 +62,7 @@
6003F5BB195388D20070C39A /* Tests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = Tests.m; sourceTree = "<group>"; };
606FC2411953D9B200FFA9A0 /* Tests-Prefix.pch */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Tests-Prefix.pch"; sourceTree = "<group>"; };
6219D603E9A1BF85E64D9A6F /* Pods-GMNetService_Tests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-GMNetService_Tests.release.xcconfig"; path = "Pods/Target Support Files/Pods-GMNetService_Tests/Pods-GMNetService_Tests.release.xcconfig"; sourceTree = "<group>"; };
649EC34D3909D775E61E44CC /* GMNetService.podspec */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; name = GMNetService.podspec; path = ../GMNetService.podspec; sourceTree = "<group>"; };
649EC34D3909D775E61E44CC /* GMNetService.podspec */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; name = GMNetService.podspec; path = ../GMNetService.podspec; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.ruby; };
6BE357F92022174C575F6751 /* README.md */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = net.daringfireball.markdown; name = README.md; path = ../README.md; sourceTree = "<group>"; };
7E7FBFA0B6B370ABF235AC4F /* Pods-GMNetService_Example.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-GMNetService_Example.debug.xcconfig"; path = "Pods/Target Support Files/Pods-GMNetService_Example/Pods-GMNetService_Example.debug.xcconfig"; sourceTree = "<group>"; };
873B8AEA1B1F5CCA007FD442 /* Main.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = Main.storyboard; sourceTree = "<group>"; };
......@@ -213,7 +213,6 @@
6003F587195388D20070C39A /* Frameworks */,
6003F588195388D20070C39A /* Resources */,
E5148730E302727A2A70918A /* [CP] Embed Pods Frameworks */,
8076969C9D6AA6428E01E508 /* [CP] Copy Pods Resources */,
);
buildRules = (
);
......@@ -232,8 +231,6 @@
6003F5AA195388D20070C39A /* Sources */,
6003F5AB195388D20070C39A /* Frameworks */,
6003F5AC195388D20070C39A /* Resources */,
E15697FFEC80A844FFD3D9A1 /* [CP] Embed Pods Frameworks */,
8BA8F52FD87C2DB398B4BB07 /* [CP] Copy Pods Resources */,
);
buildRules = (
);
......@@ -269,6 +266,7 @@
developmentRegion = English;
hasScannedForEncodings = 0;
knownRegions = (
English,
en,
Base,
);
......@@ -342,58 +340,13 @@
shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
showEnvVarsInLog = 0;
};
8076969C9D6AA6428E01E508 /* [CP] Copy Pods Resources */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
);
name = "[CP] Copy Pods Resources";
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-GMNetService_Example/Pods-GMNetService_Example-resources.sh\"\n";
showEnvVarsInLog = 0;
};
8BA8F52FD87C2DB398B4BB07 /* [CP] Copy Pods Resources */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
);
name = "[CP] Copy Pods Resources";
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-GMNetService_Tests/Pods-GMNetService_Tests-resources.sh\"\n";
showEnvVarsInLog = 0;
};
E15697FFEC80A844FFD3D9A1 /* [CP] Embed Pods Frameworks */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
);
name = "[CP] Embed Pods Frameworks";
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-GMNetService_Tests/Pods-GMNetService_Tests-frameworks.sh\"\n";
showEnvVarsInLog = 0;
};
E5148730E302727A2A70918A /* [CP] Embed Pods Frameworks */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
"${SRCROOT}/Pods/Target Support Files/Pods-GMNetService_Example/Pods-GMNetService_Example-frameworks.sh",
"${PODS_ROOT}/Target Support Files/Pods-GMNetService_Example/Pods-GMNetService_Example-frameworks.sh",
"${BUILT_PRODUCTS_DIR}/AFNetworking/AFNetworking.framework",
"${BUILT_PRODUCTS_DIR}/GMNetService/GMNetService.framework",
);
......@@ -404,7 +357,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-GMNetService_Example/Pods-GMNetService_Example-frameworks.sh\"\n";
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-GMNetService_Example/Pods-GMNetService_Example-frameworks.sh\"\n";
showEnvVarsInLog = 0;
};
/* End PBXShellScriptBuildPhase section */
......
Example/Podfile
View file @ 6121ba3c
......@@ -3,6 +3,7 @@ inhibit_all_warnings!
target 'GMNetService_Example' do
pod 'GMNetService', :path => '../'
pod 'AFNetworking', '4.0.0'
target 'GMNetService_Tests' do
inherit! :search_paths
......
Example/Podfile.lock
View file @ 6121ba3c
......@@ -14,20 +14,24 @@ PODS:
- AFNetworking/Serialization (3.1.0)
- AFNetworking/UIKit (3.1.0):
- AFNetworking/NSURLSession
- GMNetService (0.1.9):
- GMNetService (1.0.2):
- AFNetworking (= 3.1.0)
DEPENDENCIES:
- GMNetService (from `../`)
SPEC REPOS:
trunk:
- AFNetworking
EXTERNAL SOURCES:
GMNetService:
:path: ../
:path: "../"
SPEC CHECKSUMS:
AFNetworking: 5e0e199f73d8626b11e79750991f5d173d1f8b67
GMNetService: 09e2c2cea77d0337118f91ff96cd748db8fc05c8
GMNetService: 35d60c9581b4881c986670a722d7b79a2d575d54
PODFILE CHECKSUM: 7ff46b43a8d5593b3f8ac864bad161c3754f2311
COCOAPODS: 1.3.1
COCOAPODS: 1.9.3
GMNetService.podspec
View file @ 6121ba3c
......@@ -19,5 +19,5 @@ Pod::Spec.new do |s|
s.source_files = 'GMNetService/Classes/**/*'
s.public_header_files = 'GMNetService/Classes/{WMNetService,WMSecureNetService,WMImageUploadOperation,GMNetConstant,GMHTTPSessionManager}.h'
s.dependency 'AFNetworking', '3.1.0'
s.dependency 'AFNetworking'
end
GMNetService/Classes/WMNetService.m
View file @ 6121ba3c
......@@ -60,39 +60,41 @@
NSString *fullUrlString = [NSString stringWithFormat:@"%@%@%@", self.apiHost, URLString, self.urlCommonParameters];
__weak typeof(self) weakSelf = self;
if (method == HttpMethodGet) {
[networking GET:fullUrlString parameters:parameters success:^(NSURLSessionDataTask *task, id responseObject) {
[self successWithTask:task responseObject:responseObject success:success];
} failure:^(NSURLSessionDataTask *task, NSError *error) {
[self failureWithTask:task error:error failed:failed];
[networking GET:fullUrlString parameters:parameters headers:nil progress:nil success:^(NSURLSessionDataTask * _Nonnull task, id _Nullable responseObject) {
[weakSelf successWithTask:task responseObject:responseObject success:success];
} failure:^(NSURLSessionDataTask * _Nullable task, NSError * _Nonnull error) {
[weakSelf failureWithTask:task error:error failed:failed];
}];
}else if (method == HttpMethodPost){
[networking POST:fullUrlString parameters:parameters success:^(NSURLSessionDataTask *task, id responseObject) {
[self successWithTask:task responseObject:responseObject success:success];
[networking POST:fullUrlString parameters:parameters headers:nil progress:nil success:^(NSURLSessionDataTask *task, id responseObject) {
[weakSelf successWithTask:task responseObject:responseObject success:success];
} failure:^(NSURLSessionDataTask *task, NSError *error) {
[self failureWithTask:task error:error failed:failed];
[weakSelf failureWithTask:task error:error failed:failed];
}];
}else if (method == HttpMethodDelete){
[networking DELETE:fullUrlString parameters:parameters success:^(NSURLSessionDataTask *task, id responseObject) {
[self successWithTask:task responseObject:responseObject success:success];
[networking DELETE:fullUrlString parameters:parameters headers:nil success:^(NSURLSessionDataTask *task, id responseObject) {
[weakSelf successWithTask:task responseObject:responseObject success:success];
} failure:^(NSURLSessionDataTask *task, NSError *error) {
[self failureWithTask:task error:error failed:failed];
[weakSelf failureWithTask:task error:error failed:failed];
}];
}else if (method == HttpMethodPatch){
[networking PATCH:fullUrlString parameters:parameters success:^(NSURLSessionDataTask *task, id responseObject) {
[self successWithTask:task responseObject:responseObject success:success];
[networking PATCH:fullUrlString parameters:parameters headers:nil success:^(NSURLSessionDataTask *task, id responseObject) {
[weakSelf successWithTask:task responseObject:responseObject success:success];
} failure:^(NSURLSessionDataTask *task, NSError *error) {
[self failureWithTask:task error:error failed:failed];
[weakSelf failureWithTask:task error:error failed:failed];
}];
}else if (method == HttpMethodPut){
[networking PUT:fullUrlString parameters:parameters success:^(NSURLSessionDataTask *task, id responseObject) {
[self successWithTask:task responseObject:responseObject success:success];
[networking PUT:fullUrlString parameters:parameters headers:nil success:^(NSURLSessionDataTask *task, id responseObject) {
[weakSelf successWithTask:task responseObject:responseObject success:success];
} failure:^(NSURLSessionDataTask *task, NSError *error) {
[self failureWithTask:task error:error failed:failed];
[weakSelf failureWithTask:task error:error failed:failed];
}];
}
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment