Skip to content

Master #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 3 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions Coding_iOS.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
0AB591AC1AB6D2F60076C454 /* TweetSendLocaitonMapViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 0AB591AB1AB6D2F60076C454 /* TweetSendLocaitonMapViewController.m */; };
0AB591AD1AB6D51C0076C454 /* MapKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0A6E6BBC1AB180AE004C0107 /* MapKit.framework */; };
0AB591B01AB6D6BE0076C454 /* TweetSendMapAnnotation.m in Sources */ = {isa = PBXBuildFile; fileRef = 0AB591AF1AB6D6BE0076C454 /* TweetSendMapAnnotation.m */; };
285A28C61CB928F000BC607D /* libsqlite3.0.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 285A28C51CB928F000BC607D /* libsqlite3.0.tbd */; };
3A3878371AE293D50078D5DE /* EditLabelViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 3A3878361AE293D50078D5DE /* EditLabelViewController.m */; };
3A38783A1AE2949E0078D5DE /* ResetLabelViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 3A3878391AE2949E0078D5DE /* ResetLabelViewController.m */; };
3A3878401AE295970078D5DE /* ResetLabelCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 3A38783F1AE295970078D5DE /* ResetLabelCell.m */; };
Expand Down Expand Up @@ -982,6 +983,7 @@
927AFF551BFF6DAD00AAE593 /* [email protected] in Resources */ = {isa = PBXBuildFile; fileRef = 927AFF4D1BFF6DAD00AAE593 /* [email protected] */; };
927AFF581BFF755200AAE593 /* ExchangeGoodsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 927AFF571BFF755200AAE593 /* ExchangeGoodsViewController.m */; };
927AFF5B1BFF772A00AAE593 /* ShopOrderTextFieldCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 927AFF5A1BFF772A00AAE593 /* ShopOrderTextFieldCell.m */; };
AB29158D432A29FDCB5885B8 /* libPods-Coding_iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 0A57BDB829CC29FFE70C13FA /* libPods-Coding_iOS.a */; };
B93D904B1ACBA3110057A6EE /* ProjectDeleteAlertControllerVisualStyle.m in Sources */ = {isa = PBXBuildFile; fileRef = B93D904A1ACBA3110057A6EE /* ProjectDeleteAlertControllerVisualStyle.m */; };
B94C1B691AC945D30000C271 /* NewProjectViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = B94C1B681AC945D30000C271 /* NewProjectViewController.m */; };
B94C1B6B1AC945FB0000C271 /* NewProject.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = B94C1B6A1AC945FB0000C271 /* NewProject.storyboard */; };
Expand Down Expand Up @@ -1085,6 +1087,7 @@
0A06C2521AB9E57900AB3B03 /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "[email protected]"; sourceTree = "<group>"; };
0A27A05B1AB5A13B00067833 /* TweetSendLocationDetailViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TweetSendLocationDetailViewController.h; sourceTree = "<group>"; };
0A27A05C1AB5A13B00067833 /* TweetSendLocationDetailViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TweetSendLocationDetailViewController.m; sourceTree = "<group>"; };
0A57BDB829CC29FFE70C13FA /* libPods-Coding_iOS.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Coding_iOS.a"; sourceTree = BUILT_PRODUCTS_DIR; };
0A6E6BA51AAF4162004C0107 /* TweetSendLocationCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TweetSendLocationCell.h; sourceTree = "<group>"; };
0A6E6BA61AAF4162004C0107 /* TweetSendLocationCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TweetSendLocationCell.m; sourceTree = "<group>"; };
0A6E6BA81AAF4B24004C0107 /* TweetSendLocationViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TweetSendLocationViewController.h; sourceTree = "<group>"; };
Expand All @@ -1103,6 +1106,7 @@
0AB591AB1AB6D2F60076C454 /* TweetSendLocaitonMapViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TweetSendLocaitonMapViewController.m; sourceTree = "<group>"; };
0AB591AE1AB6D6BE0076C454 /* TweetSendMapAnnotation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TweetSendMapAnnotation.h; sourceTree = "<group>"; };
0AB591AF1AB6D6BE0076C454 /* TweetSendMapAnnotation.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TweetSendMapAnnotation.m; sourceTree = "<group>"; };
285A28C51CB928F000BC607D /* libsqlite3.0.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libsqlite3.0.tbd; path = usr/lib/libsqlite3.0.tbd; sourceTree = SDKROOT; };
3A3878351AE293D50078D5DE /* EditLabelViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EditLabelViewController.h; sourceTree = "<group>"; };
3A3878361AE293D50078D5DE /* EditLabelViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EditLabelViewController.m; sourceTree = "<group>"; };
3A3878381AE2949E0078D5DE /* ResetLabelViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ResetLabelViewController.h; sourceTree = "<group>"; };
Expand Down Expand Up @@ -2689,6 +2693,7 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
285A28C61CB928F000BC607D /* libsqlite3.0.tbd in Frameworks */,
4EDBECEB1B709EB3003E87C3 /* AVFoundation.framework in Frameworks */,
0AB591AD1AB6D51C0076C454 /* MapKit.framework in Frameworks */,
0A6E6BBF1AB180CB004C0107 /* CoreLocation.framework in Frameworks */,
Expand All @@ -2714,6 +2719,7 @@
8E477014198770E700997D05 /* Foundation.framework in Frameworks */,
68D9A2AD062641F5BCA573C5 /* libPods.a in Frameworks */,
4EF818241B09D8D8005F974B /* WebP.framework in Frameworks */,
AB29158D432A29FDCB5885B8 /* libPods-Coding_iOS.a in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down Expand Up @@ -4031,6 +4037,7 @@
8E477012198770E700997D05 /* Frameworks */ = {
isa = PBXGroup;
children = (
285A28C51CB928F000BC607D /* libsqlite3.0.tbd */,
4EDBECEA1B709EB3003E87C3 /* AVFoundation.framework */,
4EF818231B09D8D8005F974B /* WebP.framework */,
0A6E6BBE1AB180CB004C0107 /* CoreLocation.framework */,
Expand All @@ -4054,6 +4061,7 @@
8E477019198770E700997D05 /* CoreData.framework */,
8E477031198770E700997D05 /* XCTest.framework */,
3B024F2227BD4152BC7C9A7A /* libPods.a */,
0A57BDB829CC29FFE70C13FA /* libPods-Coding_iOS.a */,
);
name = Frameworks;
sourceTree = "<group>";
Expand Down Expand Up @@ -6000,7 +6008,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods/Pods-frameworks.sh\"\n";
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-Coding_iOS/Pods-Coding_iOS-frameworks.sh\"\n";
showEnvVarsInLog = 0;
};
96A9263FF11A4AA8B5F6BB6B /* Copy Pods Resources */ = {
Expand All @@ -6015,7 +6023,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods/Pods-resources.sh\"\n";
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-Coding_iOS/Pods-Coding_iOS-resources.sh\"\n";
showEnvVarsInLog = 0;
};
/* End PBXShellScriptBuildPhase section */
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
{
"DVTSourceControlWorkspaceBlueprintPrimaryRemoteRepositoryKey" : "9F3660E5AC46AAE96CC141F90EBB3A671D67F2C2",
"DVTSourceControlWorkspaceBlueprintWorkingCopyRepositoryLocationsKey" : {

},
"DVTSourceControlWorkspaceBlueprintWorkingCopyStatesKey" : {
"0BE8B4916C79C0D6BC415A5C19AC33B37D62A706" : 0,
"9F3660E5AC46AAE96CC141F90EBB3A671D67F2C2" : 0
},
"DVTSourceControlWorkspaceBlueprintIdentifierKey" : "B957FA12-2C65-4535-8DCF-55C231C4C24F",
"DVTSourceControlWorkspaceBlueprintWorkingCopyPathsKey" : {
"0BE8B4916C79C0D6BC415A5C19AC33B37D62A706" : "Coding-iOS\/Coding_iOS\/Resources\/webview\/",
"9F3660E5AC46AAE96CC141F90EBB3A671D67F2C2" : "Coding-iOS\/"
},
"DVTSourceControlWorkspaceBlueprintNameKey" : "Coding_iOS",
"DVTSourceControlWorkspaceBlueprintVersion" : 204,
"DVTSourceControlWorkspaceBlueprintRelativePathToProjectKey" : "Coding_iOS.xcodeproj",
"DVTSourceControlWorkspaceBlueprintRemoteRepositoriesKey" : [
{
"DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "git:\/\/git.coding.net\/bluishoul\/CodingAppWebviewTemplate.git",
"DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git",
"DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "0BE8B4916C79C0D6BC415A5C19AC33B37D62A706"
},
{
"DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "https:\/\/github.com\/zhuangzhuangzhou\/Coding-iOS.git",
"DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git",
"DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "9F3660E5AC46AAE96CC141F90EBB3A671D67F2C2"
}
]
}
Binary file modified Coding_iOS/.DS_Store
Binary file not shown.
22 changes: 11 additions & 11 deletions Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -26,20 +26,20 @@ PODS:
- GoogleSymbolUtilities (~> 1.0)
- GoogleUtilities (~> 1.0)
- GoogleAnalytics (3.14.0)
- GoogleNetworkingUtilities (1.0.0):
- GoogleNetworkingUtilities (1.2.0):
- GoogleSymbolUtilities (~> 1.0)
- GoogleSymbolUtilities (1.1.0)
- GoogleUtilities (1.2.0):
- GoogleSymbolUtilities (~> 1.0)
- GoogleSymbolUtilities (1.0.3)
- GoogleUtilities (1.1.0):
- GoogleSymbolUtilities (~> 1.0.0)
- hpple (0.2.0)
- iVersion (1.11.4)
- JazzHands (2.0.0)
- MarqueeLabel (2.3.5)
- MarqueeLabel (2.5.2)
- Masonry (0.5.3)
- MBProgressHUD (0.9)
- MMMarkdown (0.3)
- NYXImagesKit (2.3)
- pop (1.0.8)
- pop (1.0.9)
- POP+MCAnimate (2.0.1):
- pop (~> 1.0)
- POP+MCAnimate/Animations (= 2.0.1)
Expand Down Expand Up @@ -120,18 +120,18 @@ SPEC CHECKSUMS:
FontAwesome+iOS: 9070b682a9255ca0fdc34bcfb129ad0ba2b73b87
Google: 875f5a8ade86dd02e36586e4a54814843938c7f6
GoogleAnalytics: 9be1afdb8deeac4bb5f13ca7f7d3b9db2a1f43dc
GoogleNetworkingUtilities: 292992ab31b7b4ba32809a0e8b40e324cdfb2c0c
GoogleSymbolUtilities: 82ad9f93d3615244b3f4ce440f5ab2515e8b4f56
GoogleUtilities: 8ed9134debe11719097881711464752900668f10
GoogleNetworkingUtilities: ec1e9911aca811eb18b7144394fee6168b607785
GoogleSymbolUtilities: eb3965ea12710569c7b80db198a39e39b18613f7
GoogleUtilities: 85f8ad6b251544286a97163133d042ec95f889c5
hpple: 3b765f96fc2cd56ad1a49aef6f7be5cb2aa64b57
iVersion: 2b6ffe708672cb494ba3cab150a94800c2892e81
JazzHands: 00002e9b1284e7fc1ac6555012e81b8942477242
MarqueeLabel: fd29be3b4cf5f37b01676749409679aac23eb6fa
MarqueeLabel: c82ca09a3a969b4d34ce5d65f0f82840525ab259
Masonry: 9f515466afe48632562342a40a1c224071a1a022
MBProgressHUD: d8e7ea388dc1549a42e0d219067cf5f2c898fb66
MMMarkdown: 13af1af50e5f476f1097797f43ea2bd76c83067a
NYXImagesKit: 8163e3335a40eaa173ca5bbbf81fafb57d3947eb
pop: bb773ae2c791ca2629de13b347e7a8b450fa6a57
pop: f667631a5108a2e60d9e8797c9b32ddaf2080bce
POP+MCAnimate: a99e209148c602512de487f1160a44bf78572024
PPiAwesomeButton: 16f7279582fd36f65186b24b83ef876217363eb5
RBBAnimation: 4b2d66f6d993febce63cd564da934985313b9c59
Expand Down