Sfoglia il codice sorgente

NEW PROJECT ANTS CONTRACT 1.0

Move utils to ISALES PROJECT
Ray Zhang 9 anni fa
parent
commit
71b0924909

+ 91 - 7
Ants Contract/AntsContract/AntsContract.xcodeproj/project.pbxproj

@@ -27,7 +27,18 @@
 		71D01ADB1E08CA53006620CE /* SignatureViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 71D01AD91E08CA53006620CE /* SignatureViewController.m */; };
 		71D01ADF1E08CC81006620CE /* signature.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 71D01ADE1E08CC81006620CE /* signature.storyboard */; };
 		71D01AE31E08F5D2006620CE /* TouchImageView.m in Sources */ = {isa = PBXBuildFile; fileRef = 71D01AE21E08F5D2006620CE /* TouchImageView.m */; };
-		71D01AE61E08FA32006620CE /* PDFUtils.m in Sources */ = {isa = PBXBuildFile; fileRef = 71D01AE51E08FA32006620CE /* PDFUtils.m */; };
+		71D01AEC1E09215E006620CE /* PDFDrawable.m in Sources */ = {isa = PBXBuildFile; fileRef = 71D01AE91E09215E006620CE /* PDFDrawable.m */; };
+		71D01AED1E09215E006620CE /* PDFPage.m in Sources */ = {isa = PBXBuildFile; fileRef = 71D01AEB1E09215E006620CE /* PDFPage.m */; };
+		71D01AF81E092304006620CE /* BasicDrawable.m in Sources */ = {isa = PBXBuildFile; fileRef = 71D01AEF1E092304006620CE /* BasicDrawable.m */; };
+		71D01AF91E092304006620CE /* GridDrawable.m in Sources */ = {isa = PBXBuildFile; fileRef = 71D01AF11E092304006620CE /* GridDrawable.m */; };
+		71D01AFA1E092304006620CE /* GroupDrawable.m in Sources */ = {isa = PBXBuildFile; fileRef = 71D01AF31E092304006620CE /* GroupDrawable.m */; };
+		71D01AFB1E092304006620CE /* ImageDrawable.m in Sources */ = {isa = PBXBuildFile; fileRef = 71D01AF51E092304006620CE /* ImageDrawable.m */; };
+		71D01AFC1E092304006620CE /* LineDrawable.m in Sources */ = {isa = PBXBuildFile; fileRef = 71D01AF71E092304006620CE /* LineDrawable.m */; };
+		71D01B061E0928C2006620CE /* TableDrawable.m in Sources */ = {isa = PBXBuildFile; fileRef = 71D01B031E0928C2006620CE /* TableDrawable.m */; };
+		71D01B071E0928C2006620CE /* TextDrawable.m in Sources */ = {isa = PBXBuildFile; fileRef = 71D01B051E0928C2006620CE /* TextDrawable.m */; };
+		71D01B231E0A2069006620CE /* ImageUtils.m in Sources */ = {isa = PBXBuildFile; fileRef = 71D01B1E1E0A2069006620CE /* ImageUtils.m */; };
+		71D01B241E0A2069006620CE /* PDFUtils.m in Sources */ = {isa = PBXBuildFile; fileRef = 71D01B201E0A2069006620CE /* PDFUtils.m */; };
+		71D01B251E0A2069006620CE /* TextUtils.m in Sources */ = {isa = PBXBuildFile; fileRef = 71D01B221E0A2069006620CE /* TextUtils.m */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
@@ -66,8 +77,31 @@
 		71D01ADE1E08CC81006620CE /* signature.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = signature.storyboard; path = "../../../RedAnt ERP Mobile/common/Functions/signature/signature.storyboard"; sourceTree = "<group>"; };
 		71D01AE11E08F5D2006620CE /* TouchImageView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TouchImageView.h; path = "../../../RedAnt ERP Mobile/common/customUI/TouchImageView.h"; sourceTree = "<group>"; };
 		71D01AE21E08F5D2006620CE /* TouchImageView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = TouchImageView.m; path = "../../../RedAnt ERP Mobile/common/customUI/TouchImageView.m"; sourceTree = "<group>"; };
-		71D01AE41E08FA32006620CE /* PDFUtils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PDFUtils.h; sourceTree = "<group>"; };
-		71D01AE51E08FA32006620CE /* PDFUtils.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PDFUtils.m; sourceTree = "<group>"; };
+		71D01AE81E09215E006620CE /* PDFDrawable.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PDFDrawable.h; path = "../../../RedAnt ERP Mobile/common/pdfCreator/PDFDrawable.h"; sourceTree = "<group>"; };
+		71D01AE91E09215E006620CE /* PDFDrawable.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = PDFDrawable.m; path = "../../../RedAnt ERP Mobile/common/pdfCreator/PDFDrawable.m"; sourceTree = "<group>"; };
+		71D01AEA1E09215E006620CE /* PDFPage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PDFPage.h; path = "../../../RedAnt ERP Mobile/common/pdfCreator/PDFPage.h"; sourceTree = "<group>"; };
+		71D01AEB1E09215E006620CE /* PDFPage.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = PDFPage.m; path = "../../../RedAnt ERP Mobile/common/pdfCreator/PDFPage.m"; sourceTree = "<group>"; };
+		71D01AEE1E092304006620CE /* BasicDrawable.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = BasicDrawable.h; path = "../../../RedAnt ERP Mobile/common/pdfCreator/BasicDrawable.h"; sourceTree = "<group>"; };
+		71D01AEF1E092304006620CE /* BasicDrawable.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = BasicDrawable.m; path = "../../../RedAnt ERP Mobile/common/pdfCreator/BasicDrawable.m"; sourceTree = "<group>"; };
+		71D01AF01E092304006620CE /* GridDrawable.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = GridDrawable.h; path = "../../../RedAnt ERP Mobile/common/pdfCreator/GridDrawable.h"; sourceTree = "<group>"; };
+		71D01AF11E092304006620CE /* GridDrawable.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = GridDrawable.m; path = "../../../RedAnt ERP Mobile/common/pdfCreator/GridDrawable.m"; sourceTree = "<group>"; };
+		71D01AF21E092304006620CE /* GroupDrawable.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = GroupDrawable.h; path = "../../../RedAnt ERP Mobile/common/pdfCreator/GroupDrawable.h"; sourceTree = "<group>"; };
+		71D01AF31E092304006620CE /* GroupDrawable.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = GroupDrawable.m; path = "../../../RedAnt ERP Mobile/common/pdfCreator/GroupDrawable.m"; sourceTree = "<group>"; };
+		71D01AF41E092304006620CE /* ImageDrawable.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ImageDrawable.h; path = "../../../RedAnt ERP Mobile/common/pdfCreator/ImageDrawable.h"; sourceTree = "<group>"; };
+		71D01AF51E092304006620CE /* ImageDrawable.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = ImageDrawable.m; path = "../../../RedAnt ERP Mobile/common/pdfCreator/ImageDrawable.m"; sourceTree = "<group>"; };
+		71D01AF61E092304006620CE /* LineDrawable.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = LineDrawable.h; path = "../../../RedAnt ERP Mobile/common/pdfCreator/LineDrawable.h"; sourceTree = "<group>"; };
+		71D01AF71E092304006620CE /* LineDrawable.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = LineDrawable.m; path = "../../../RedAnt ERP Mobile/common/pdfCreator/LineDrawable.m"; sourceTree = "<group>"; };
+		71D01B011E092807006620CE /* const.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = const.h; sourceTree = "<group>"; };
+		71D01B021E0928C2006620CE /* TableDrawable.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TableDrawable.h; path = "../../../RedAnt ERP Mobile/common/pdfCreator/TableDrawable.h"; sourceTree = "<group>"; };
+		71D01B031E0928C2006620CE /* TableDrawable.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = TableDrawable.m; path = "../../../RedAnt ERP Mobile/common/pdfCreator/TableDrawable.m"; sourceTree = "<group>"; };
+		71D01B041E0928C2006620CE /* TextDrawable.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TextDrawable.h; path = "../../../RedAnt ERP Mobile/common/pdfCreator/TextDrawable.h"; sourceTree = "<group>"; };
+		71D01B051E0928C2006620CE /* TextDrawable.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = TextDrawable.m; path = "../../../RedAnt ERP Mobile/common/pdfCreator/TextDrawable.m"; sourceTree = "<group>"; };
+		71D01B1D1E0A2069006620CE /* ImageUtils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ImageUtils.h; path = "../../../RedAnt ERP Mobile/common/ImageUtils.h"; sourceTree = "<group>"; };
+		71D01B1E1E0A2069006620CE /* ImageUtils.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = ImageUtils.m; path = "../../../RedAnt ERP Mobile/common/ImageUtils.m"; sourceTree = "<group>"; };
+		71D01B1F1E0A2069006620CE /* PDFUtils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PDFUtils.h; path = "../../../RedAnt ERP Mobile/common/PDFUtils.h"; sourceTree = "<group>"; };
+		71D01B201E0A2069006620CE /* PDFUtils.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = PDFUtils.m; path = "../../../RedAnt ERP Mobile/common/PDFUtils.m"; sourceTree = "<group>"; };
+		71D01B211E0A2069006620CE /* TextUtils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TextUtils.h; path = "../../../RedAnt ERP Mobile/common/TextUtils.h"; sourceTree = "<group>"; };
+		71D01B221E0A2069006620CE /* TextUtils.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = TextUtils.m; path = "../../../RedAnt ERP Mobile/common/TextUtils.m"; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -101,6 +135,9 @@
 		713E83B41E037C2000C4F12A /* AntsContract */ = {
 			isa = PBXGroup;
 			children = (
+				71D01ACE1E07B71B006620CE /* config.h */,
+				71D01B011E092807006620CE /* const.h */,
+				71D01B001E0927D7006620CE /* utils */,
 				71D01AE01E08E093006620CE /* pdfEdit */,
 				71D01AD51E08CA35006620CE /* signature */,
 				713E83B81E037C2000C4F12A /* AppDelegate.h */,
@@ -112,7 +149,6 @@
 				713E83C31E037C2000C4F12A /* LaunchScreen.storyboard */,
 				713E83C61E037C2000C4F12A /* Info.plist */,
 				713E83B51E037C2000C4F12A /* Supporting Files */,
-				71D01ACE1E07B71B006620CE /* config.h */,
 			);
 			path = AntsContract;
 			sourceTree = "<group>";
@@ -155,6 +191,7 @@
 		71D01AE01E08E093006620CE /* pdfEdit */ = {
 			isa = PBXGroup;
 			children = (
+				71D01AE71E092150006620CE /* PDFCreator */,
 				71D01AE11E08F5D2006620CE /* TouchImageView.h */,
 				71D01AE21E08F5D2006620CE /* TouchImageView.m */,
 				713E83CC1E03831C00C4F12A /* PageViewController.h */,
@@ -167,12 +204,48 @@
 				713E83D31E03926A00C4F12A /* PDFPageView.m */,
 				71D01AC41E0783BD006620CE /* PDFScrollView.h */,
 				71D01AC51E0783BD006620CE /* PDFScrollView.m */,
-				71D01AE41E08FA32006620CE /* PDFUtils.h */,
-				71D01AE51E08FA32006620CE /* PDFUtils.m */,
 			);
 			name = pdfEdit;
 			sourceTree = "<group>";
 		};
+		71D01AE71E092150006620CE /* PDFCreator */ = {
+			isa = PBXGroup;
+			children = (
+				71D01B021E0928C2006620CE /* TableDrawable.h */,
+				71D01B031E0928C2006620CE /* TableDrawable.m */,
+				71D01B041E0928C2006620CE /* TextDrawable.h */,
+				71D01B051E0928C2006620CE /* TextDrawable.m */,
+				71D01AE81E09215E006620CE /* PDFDrawable.h */,
+				71D01AE91E09215E006620CE /* PDFDrawable.m */,
+				71D01AEA1E09215E006620CE /* PDFPage.h */,
+				71D01AEB1E09215E006620CE /* PDFPage.m */,
+				71D01AEE1E092304006620CE /* BasicDrawable.h */,
+				71D01AEF1E092304006620CE /* BasicDrawable.m */,
+				71D01AF01E092304006620CE /* GridDrawable.h */,
+				71D01AF11E092304006620CE /* GridDrawable.m */,
+				71D01AF21E092304006620CE /* GroupDrawable.h */,
+				71D01AF31E092304006620CE /* GroupDrawable.m */,
+				71D01AF41E092304006620CE /* ImageDrawable.h */,
+				71D01AF51E092304006620CE /* ImageDrawable.m */,
+				71D01AF61E092304006620CE /* LineDrawable.h */,
+				71D01AF71E092304006620CE /* LineDrawable.m */,
+			);
+			name = PDFCreator;
+			sourceTree = "<group>";
+		};
+		71D01B001E0927D7006620CE /* utils */ = {
+			isa = PBXGroup;
+			children = (
+				71D01B1D1E0A2069006620CE /* ImageUtils.h */,
+				71D01B1E1E0A2069006620CE /* ImageUtils.m */,
+				71D01B1F1E0A2069006620CE /* PDFUtils.h */,
+				71D01B201E0A2069006620CE /* PDFUtils.m */,
+				71D01B211E0A2069006620CE /* TextUtils.h */,
+				71D01B221E0A2069006620CE /* TextUtils.m */,
+			);
+			name = utils;
+			sourceTree = "<group>";
+		};
 /* End PBXGroup section */
 
 /* Begin PBXNativeTarget section */
@@ -249,19 +322,30 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				71D01B241E0A2069006620CE /* PDFUtils.m in Sources */,
+				71D01B071E0928C2006620CE /* TextDrawable.m in Sources */,
+				71D01AEC1E09215E006620CE /* PDFDrawable.m in Sources */,
+				71D01B231E0A2069006620CE /* ImageUtils.m in Sources */,
+				71D01AF91E092304006620CE /* GridDrawable.m in Sources */,
+				71D01AFC1E092304006620CE /* LineDrawable.m in Sources */,
 				713E83BD1E037C2000C4F12A /* RootViewController.m in Sources */,
 				71D01ADB1E08CA53006620CE /* SignatureViewController.m in Sources */,
 				71D01AC61E0783BD006620CE /* PDFScrollView.m in Sources */,
+				71D01AF81E092304006620CE /* BasicDrawable.m in Sources */,
 				71D01AD41E07D699006620CE /* SignatureTableViewCell.m in Sources */,
+				71D01AFB1E092304006620CE /* ImageDrawable.m in Sources */,
 				71D01ADA1E08CA53006620CE /* SignatureView.m in Sources */,
 				713E83CE1E03831C00C4F12A /* PageViewController.m in Sources */,
 				71D01AE31E08F5D2006620CE /* TouchImageView.m in Sources */,
 				713E83BA1E037C2000C4F12A /* AppDelegate.m in Sources */,
 				713E83D41E03926A00C4F12A /* PDFPageView.m in Sources */,
+				71D01AFA1E092304006620CE /* GroupDrawable.m in Sources */,
 				713E83D71E03BF8C00C4F12A /* DocumentPageViewController.m in Sources */,
-				71D01AE61E08FA32006620CE /* PDFUtils.m in Sources */,
+				71D01AED1E09215E006620CE /* PDFPage.m in Sources */,
 				71D01AC91E07AAB1006620CE /* EditControlView.m in Sources */,
+				71D01B251E0A2069006620CE /* TextUtils.m in Sources */,
 				71D01AD11E07D1EA006620CE /* SignatureListViewController.m in Sources */,
+				71D01B061E0928C2006620CE /* TableDrawable.m in Sources */,
 				713E83B71E037C2000C4F12A /* main.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;

BIN
Ants Contract/AntsContract/AntsContract.xcodeproj/project.xcworkspace/xcuserdata/Ray.xcuserdatad/UserInterfaceState.xcuserstate


+ 53 - 21
Ants Contract/AntsContract/AntsContract.xcodeproj/xcuserdata/Ray.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -26,11 +26,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "AntsContract/DocumentPageViewController.m"
-            timestampString = "503905101.35948"
+            timestampString = "503918069.776987"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "216"
-            endingLineNumber = "216"
+            startingLineNumber = "218"
+            endingLineNumber = "218"
             landmarkName = "-viewControllerAtIndex:"
             landmarkType = "7">
          </BreakpointContent>
@@ -42,11 +42,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "AntsContract/DocumentPageViewController.m"
-            timestampString = "503905101.35948"
+            timestampString = "503918069.776987"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "245"
-            endingLineNumber = "245"
+            startingLineNumber = "247"
+            endingLineNumber = "247"
             landmarkName = "-indexOfViewController:"
             landmarkType = "7">
          </BreakpointContent>
@@ -58,11 +58,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "AntsContract/DocumentPageViewController.m"
-            timestampString = "503905101.35948"
+            timestampString = "503918069.776987"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "288"
-            endingLineNumber = "288"
+            startingLineNumber = "290"
+            endingLineNumber = "290"
             landmarkName = "-pageViewController:spineLocationForInterfaceOrientation:"
             landmarkType = "7">
          </BreakpointContent>
@@ -90,11 +90,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "AntsContract/DocumentPageViewController.m"
-            timestampString = "503905101.35948"
+            timestampString = "503918069.776987"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "259"
-            endingLineNumber = "259"
+            startingLineNumber = "261"
+            endingLineNumber = "261"
             landmarkName = "-pageViewController:viewControllerBeforeViewController:"
             landmarkType = "7">
          </BreakpointContent>
@@ -106,11 +106,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "AntsContract/DocumentPageViewController.m"
-            timestampString = "503905101.35948"
+            timestampString = "503918069.776987"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "270"
-            endingLineNumber = "270"
+            startingLineNumber = "272"
+            endingLineNumber = "272"
             landmarkName = "-pageViewController:viewControllerAfterViewController:"
             landmarkType = "7">
          </BreakpointContent>
@@ -170,11 +170,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "AntsContract/DocumentPageViewController.m"
-            timestampString = "503905101.35948"
+            timestampString = "503918069.776987"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "229"
-            endingLineNumber = "229"
+            startingLineNumber = "231"
+            endingLineNumber = "231"
             landmarkName = "-viewControllerAtIndex:"
             landmarkType = "7">
          </BreakpointContent>
@@ -250,11 +250,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "AntsContract/DocumentPageViewController.m"
-            timestampString = "503905101.35948"
+            timestampString = "503918069.776987"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "164"
-            endingLineNumber = "164"
+            startingLineNumber = "166"
+            endingLineNumber = "166"
             landmarkName = "-addSignature:to:"
             landmarkType = "7">
          </BreakpointContent>
@@ -323,5 +323,37 @@
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "AntsContract/ImageUtils.m"
+            timestampString = "503917839.787034"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "12"
+            endingLineNumber = "12"
+            landmarkName = "+scaleToSize:to:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "AntsContract/PDFUtils.m"
+            timestampString = "503918841.208486"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "178"
+            endingLineNumber = "178"
+            landmarkName = "+SavePDF:source:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
    </Breakpoints>
 </Bucket>

+ 1 - 1
Ants Contract/AntsContract/AntsContract/AppDelegate.h

@@ -12,6 +12,6 @@
 
 @property (strong, nonatomic) UIWindow *window;
 
-
+@property bool bEnable_Cache;
 @end
 

+ 2 - 0
Ants Contract/AntsContract/AntsContract/AppDelegate.m

@@ -17,6 +17,8 @@
 
 - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions {
     // Override point for customization after application launch.
+    
+    self.bEnable_Cache = true;
     return YES;
 }
 

+ 5 - 68
Ants Contract/AntsContract/AntsContract/DocumentPageViewController.m

@@ -29,8 +29,8 @@
     self.signatureData= [[NSMutableDictionary alloc] init];
     
     
-    self.document = [self OpenPDF:@"SUBCONTRACTORS REFERRAL LIST.pdf"];
-    
+    self.document = [PDFUtils OpenPDF:@"SUBCONTRACTORS REFERRAL LIST.pdf"];
+    self.total_page = CGPDFDocumentGetNumberOfPages (self.document);
     self.controlTemplate = [self loadControl];
     
     
@@ -153,6 +153,8 @@
     
 }
 - (IBAction)onSaveClicked:(id)sender {
+    [PDFUtils SavePDF:self.controlTemplate source:self.document];
+  //  [PDFUtils savep
 }
 
 -(void) addSignature :(UIImage*) img to:(NSMutableDictionary*)signatureData
@@ -315,70 +317,5 @@
 }
 #pragma mark pdf utils
 
--(CGPDFDocumentRef)OpenPDF:(NSString*) template
-{
-    //获取路径
-    /*
-     NSArray *paths=NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES);//坐标
-     
-     NSString *saveDirectory=[paths objectAtIndex:0];
-     
-     NSString *saveFileName=@"myPDF.pdf";
-     
-     NSString *newFilePath=[saveDirectory stringByAppendingPathComponent:saveFileName];
-     */
-    
-    NSString *default_path = [[NSBundle mainBundle] pathForResource:template ofType:nil];
-    const char *filename=[default_path UTF8String];
-    
-    NSLog(@"%@",default_path);
-    
-    //关联上下文的对象
-    
-    //   CGContextRef pdfContext;
-    
-    CFStringRef path;
-    
-    CFURLRef url;
-    
-    path=CFStringCreateWithCString(NULL, filename, kCFStringEncodingUTF8);
-    
-    url=CFURLCreateWithFileSystemPath(NULL, path, kCFURLPOSIXPathStyle, 0);
-    
-    CGPDFDocumentRef document;
-    document = CGPDFDocumentCreateWithURL (url);
-    CFRelease(url);
-    self.total_page = CGPDFDocumentGetNumberOfPages (document);
-    
-    if (self.total_page == 0) {
-        printf("[%s] needs at least one page!\n", [@"myPDF.pdf" UTF8String] );
-        return NULL;
-    } else {
-        printf("[%ld] pages loaded in this PDF!\n", self.total_page);
-        
-        
-        /*8
-         for (NSInteger pageNumber = 1; pageNumber <= count; pageNumber++)
-         {
-         CGPDFPageRef pageRef = CGPDFDocumentGetPage(document, pageNumber);
-         
-         CGPDFDictionaryRef pageDictionaryFromPage = CGPDFPageGetDictionary(pageRef);
-         
-         if (pageDictionaryFromPage == pageDictionaryFromDestArray) // Found it
-         {
-         targetPageNumber = pageNumber; break;
-         }
-         
-         
-         }*/
-    }
-    
-    //    CGPDFPageRef page= CGPDFDocumentGetPage(document, 0);
-    //    CGContextDrawPDFPage(<#CGContextRef  _Nullable c#>, <#CGPDFPageRef  _Nullable page#>)
-    
-    return document;
-    
-    
-    
-}
+
 @end

+ 1 - 0
Ants Contract/AntsContract/AntsContract/config.h

@@ -11,4 +11,5 @@
 
 #define DEBUG_PDFSIG true
 
+#define PDF_DEBUG true
 #endif /* config_h */

+ 28 - 0
Ants Contract/AntsContract/AntsContract/const.h

@@ -0,0 +1,28 @@
+//
+//  const.h
+//  AntsContract
+//
+//  Created by Ray on 12/20/16.
+//  Copyright © 2016 United Software Applications, Inc. All rights reserved.
+//
+
+#ifndef const_h
+#define const_h
+
+#define DEBUGLOG 1
+#ifdef DEBUGLOG
+#ifdef DEBUG
+//     #define DebugLog( s, ... ) fprintf(stderr,"%s\n",[[NSString stringWithFormat:s, ##__VA_ARGS__] UTF8String])//
+#define DebugLog( s, ... ) fprintf(stderr, "<%p %s:(%d)> %s \n", self, [[[NSString stringWithUTF8String:__FILE__] lastPathComponent]UTF8String], __LINE__, [[NSString stringWithFormat:(s), ##__VA_ARGS__]UTF8String] )
+#else
+#define DebugLog( s, ... )
+#endif
+#else
+#define DebugLog( s, ... )
+#endif
+
+
+#define UIColorFromRGB(rgbValue) [UIColor colorWithRed:((float)((rgbValue & 0xFF0000) >> 16))/255.0 green:((float)((rgbValue & 0xFF00) >> 8))/255.0 blue:((float)(rgbValue & 0xFF))/255.0 alpha:1.0]
+
+
+#endif /* const_h */