Преглед изворни кода

170110
1.1.170110 release version.

Ray Zhang пре 9 година
родитељ
комит
37bfd63790

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


+ 197 - 21
Ants Contract/AntsContract.xcworkspace/xcuserdata/Ray.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -74,11 +74,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "../RedAnt ERP Mobile/common/pdfCreator/TextDrawable.m"
-            timestampString = "505726864.594865"
+            timestampString = "505895899.214773"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "814"
-            endingLineNumber = "814">
+            startingLineNumber = "907"
+            endingLineNumber = "907">
          </BreakpointContent>
       </BreakpointProxy>
       <BreakpointProxy
@@ -88,11 +88,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "../RedAnt ERP Mobile/common/pdfCreator/TextDrawable.m"
-            timestampString = "505726864.594865"
+            timestampString = "505895899.214773"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "836"
-            endingLineNumber = "836">
+            startingLineNumber = "929"
+            endingLineNumber = "929">
          </BreakpointContent>
       </BreakpointProxy>
       <BreakpointProxy
@@ -102,11 +102,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "../RedAnt ERP Mobile/common/pdfCreator/TextDrawable.m"
-            timestampString = "505726864.594865"
+            timestampString = "505895899.214773"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "866"
-            endingLineNumber = "866">
+            startingLineNumber = "959"
+            endingLineNumber = "959">
          </BreakpointContent>
       </BreakpointProxy>
       <BreakpointProxy
@@ -116,11 +116,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "../RedAnt ERP Mobile/common/pdfCreator/TextDrawable.m"
-            timestampString = "505726864.594865"
+            timestampString = "505895899.214773"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "1336"
-            endingLineNumber = "1336">
+            startingLineNumber = "1429"
+            endingLineNumber = "1429">
          </BreakpointContent>
       </BreakpointProxy>
       <BreakpointProxy
@@ -130,11 +130,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "../RedAnt ERP Mobile/common/pdfCreator/TextDrawable.m"
-            timestampString = "505726864.594865"
+            timestampString = "505895899.214773"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "1093"
-            endingLineNumber = "1093">
+            startingLineNumber = "1186"
+            endingLineNumber = "1186">
          </BreakpointContent>
       </BreakpointProxy>
       <BreakpointProxy
@@ -144,11 +144,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "../RedAnt ERP Mobile/common/pdfCreator/TextDrawable.m"
-            timestampString = "505726864.594865"
+            timestampString = "505895899.214773"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "1499"
-            endingLineNumber = "1499">
+            startingLineNumber = "1592"
+            endingLineNumber = "1592">
          </BreakpointContent>
       </BreakpointProxy>
       <BreakpointProxy
@@ -190,14 +190,190 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "../RedAnt ERP Mobile/common/pdfCreator/TextDrawable.m"
-            timestampString = "505726864.594865"
+            timestampString = "505895899.214773"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "538"
-            endingLineNumber = "538"
+            startingLineNumber = "572"
+            endingLineNumber = "572"
+            landmarkName = "-Draw:dataSource:ParentRect:startX:startY:flipHeight:range:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "../RedAnt ERP Mobile/common/pdfCreator/TextDrawable.m"
+            timestampString = "505895899.214773"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "679"
+            endingLineNumber = "679"
             landmarkName = "-Draw:dataSource:ParentRect:startX:startY:flipHeight:range:"
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "common/PageViewController.m"
+            timestampString = "505896870.817727"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "123"
+            endingLineNumber = "123"
+            landmarkName = "-refreshControl"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "common/PageViewController.m"
+            timestampString = "505896967.171446"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "127"
+            endingLineNumber = "127"
+            landmarkName = "-refreshControl"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "common/SignatureListViewController.m"
+            timestampString = "505902254.409883"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "308"
+            endingLineNumber = "308"
+            landmarkName = "-tableView:cellForRowAtIndexPath:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "common/PageViewController.m"
+            timestampString = "505906253.926108"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "873"
+            endingLineNumber = "873"
+            landmarkName = "-TouchImageViewOnTouche:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "common/DocumentPageViewController.m"
+            timestampString = "505902254.409883"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "678"
+            endingLineNumber = "678"
+            landmarkName = "-viewControllerAtIndex:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "common/DocumentPageViewController.m"
+            timestampString = "505902254.409883"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "689"
+            endingLineNumber = "689"
+            landmarkName = "-viewControllerAtIndex:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "common/DocumentPageViewController.m"
+            timestampString = "505902254.409883"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "685"
+            endingLineNumber = "685"
+            landmarkName = "-viewControllerAtIndex:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "common/DocumentPageViewController.m"
+            timestampString = "505902254.409883"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "677"
+            endingLineNumber = "677"
+            landmarkName = "-viewControllerAtIndex:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "common/PageViewController.m"
+            timestampString = "505906253.926108"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "225"
+            endingLineNumber = "225"
+            landmarkName = "-addTextView:destView:index:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "common/PageViewController.m"
+            timestampString = "505906021.436241"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "215"
+            endingLineNumber = "215"
+            landmarkName = "-addTextView:destView:index:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
    </Breakpoints>
 </Bucket>

+ 3 - 3
Ants Contract/AntsContract/AntsContract/Base.lproj/Main.storyboard

@@ -256,11 +256,11 @@
                                         <rect key="frame" x="0.0" y="28" width="360" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="v4l-du-pTm" id="JkA-pY-NIV">
-                                            <rect key="frame" x="0.0" y="0.0" width="360" height="43.5"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="360" height="44"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="Title" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="Ofv-pg-h2w">
-                                                    <rect key="frame" x="15" y="0.0" width="330" height="43.5"/>
+                                                    <rect key="frame" x="15" y="0.0" width="330" height="44"/>
                                                     <autoresizingMask key="autoresizingMask"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="16"/>
                                                     <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
@@ -376,7 +376,7 @@
                                         <rect key="frame" x="0.0" y="28" width="768" height="128"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="KmC-hR-Rfo" id="twt-7p-gUd">
-                                            <rect key="frame" x="0.0" y="0.0" width="768" height="127.5"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="768" height="128"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" text="GE2016121201" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="eH3-OQ-M6Q">

+ 0 - 124
Ants Contract/Granite Expo eSign/Granite Expo eSign.xcodeproj/project.pbxproj

@@ -48,23 +48,6 @@
 		7128C2E91E12511B00FF635B /* NSData+Base64.m in Sources */ = {isa = PBXBuildFile; fileRef = 7128C2E21E12511B00FF635B /* NSData+Base64.m */; };
 		7128C2EA1E12511B00FF635B /* NSData+CommonCrypto.m in Sources */ = {isa = PBXBuildFile; fileRef = 7128C2E41E12511B00FF635B /* NSData+CommonCrypto.m */; };
 		7128C2EB1E12511B00FF635B /* NSString+Base64.m in Sources */ = {isa = PBXBuildFile; fileRef = 7128C2E61E12511B00FF635B /* NSString+Base64.m */; };
-		7128C3001E12513800FF635B /* AFHTTPRequestOperation.m in Sources */ = {isa = PBXBuildFile; fileRef = 7128C2EE1E12513800FF635B /* AFHTTPRequestOperation.m */; };
-		7128C3011E12513800FF635B /* AFHTTPRequestOperationManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 7128C2F01E12513800FF635B /* AFHTTPRequestOperationManager.m */; };
-		7128C3021E12513800FF635B /* AFHTTPSessionManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 7128C2F21E12513800FF635B /* AFHTTPSessionManager.m */; };
-		7128C3031E12513800FF635B /* AFNetworkReachabilityManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 7128C2F51E12513800FF635B /* AFNetworkReachabilityManager.m */; };
-		7128C3041E12513800FF635B /* AFSecurityPolicy.m in Sources */ = {isa = PBXBuildFile; fileRef = 7128C2F71E12513800FF635B /* AFSecurityPolicy.m */; };
-		7128C3051E12513800FF635B /* AFURLConnectionOperation.m in Sources */ = {isa = PBXBuildFile; fileRef = 7128C2F91E12513800FF635B /* AFURLConnectionOperation.m */; };
-		7128C3061E12513800FF635B /* AFURLRequestSerialization.m in Sources */ = {isa = PBXBuildFile; fileRef = 7128C2FB1E12513800FF635B /* AFURLRequestSerialization.m */; };
-		7128C3071E12513800FF635B /* AFURLResponseSerialization.m in Sources */ = {isa = PBXBuildFile; fileRef = 7128C2FD1E12513800FF635B /* AFURLResponseSerialization.m */; };
-		7128C3081E12513800FF635B /* AFURLSessionManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 7128C2FF1E12513800FF635B /* AFURLSessionManager.m */; };
-		7128C31C1E12515800FF635B /* AFNetworkActivityIndicatorManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 7128C30B1E12515800FF635B /* AFNetworkActivityIndicatorManager.m */; };
-		7128C31D1E12515800FF635B /* UIActivityIndicatorView+AFNetworking.m in Sources */ = {isa = PBXBuildFile; fileRef = 7128C30D1E12515800FF635B /* UIActivityIndicatorView+AFNetworking.m */; };
-		7128C31E1E12515800FF635B /* UIAlertView+AFNetworking.m in Sources */ = {isa = PBXBuildFile; fileRef = 7128C30F1E12515800FF635B /* UIAlertView+AFNetworking.m */; };
-		7128C31F1E12515800FF635B /* UIButton+AFNetworking.m in Sources */ = {isa = PBXBuildFile; fileRef = 7128C3111E12515800FF635B /* UIButton+AFNetworking.m */; };
-		7128C3201E12515800FF635B /* UIImageView+AFNetworking.m in Sources */ = {isa = PBXBuildFile; fileRef = 7128C3141E12515800FF635B /* UIImageView+AFNetworking.m */; };
-		7128C3211E12515800FF635B /* UIProgressView+AFNetworking.m in Sources */ = {isa = PBXBuildFile; fileRef = 7128C3171E12515800FF635B /* UIProgressView+AFNetworking.m */; };
-		7128C3221E12515800FF635B /* UIRefreshControl+AFNetworking.m in Sources */ = {isa = PBXBuildFile; fileRef = 7128C3191E12515800FF635B /* UIRefreshControl+AFNetworking.m */; };
-		7128C3231E12515800FF635B /* UIWebView+AFNetworking.m in Sources */ = {isa = PBXBuildFile; fileRef = 7128C31B1E12515800FF635B /* UIWebView+AFNetworking.m */; };
 		7128C3291E12520B00FF635B /* libz.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 7128C3281E12520B00FF635B /* libz.tbd */; };
 		7128C33A1E12540F00FF635B /* ACNetwork.m in Sources */ = {isa = PBXBuildFile; fileRef = 7128C3371E12540F00FF635B /* ACNetwork.m */; };
 		7128C33B1E12540F00FF635B /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 7128C3391E12540F00FF635B /* AppDelegate.m */; };
@@ -161,43 +144,6 @@
 		7128C2E41E12511B00FF635B /* NSData+CommonCrypto.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = "NSData+CommonCrypto.m"; path = "../../../RedAnt ERP Mobile/common/AES/NSData+CommonCrypto.m"; sourceTree = "<group>"; };
 		7128C2E51E12511B00FF635B /* NSString+Base64.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "NSString+Base64.h"; path = "../../../RedAnt ERP Mobile/common/AES/NSString+Base64.h"; sourceTree = "<group>"; };
 		7128C2E61E12511B00FF635B /* NSString+Base64.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = "NSString+Base64.m"; path = "../../../RedAnt ERP Mobile/common/AES/NSString+Base64.m"; sourceTree = "<group>"; };
-		7128C2ED1E12513800FF635B /* AFHTTPRequestOperation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AFHTTPRequestOperation.h; path = "../../../RedAnt ERP Mobile/Pods/AFNetworking/AFNetworking/AFHTTPRequestOperation.h"; sourceTree = "<group>"; };
-		7128C2EE1E12513800FF635B /* AFHTTPRequestOperation.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AFHTTPRequestOperation.m; path = "../../../RedAnt ERP Mobile/Pods/AFNetworking/AFNetworking/AFHTTPRequestOperation.m"; sourceTree = "<group>"; };
-		7128C2EF1E12513800FF635B /* AFHTTPRequestOperationManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AFHTTPRequestOperationManager.h; path = "../../../RedAnt ERP Mobile/Pods/AFNetworking/AFNetworking/AFHTTPRequestOperationManager.h"; sourceTree = "<group>"; };
-		7128C2F01E12513800FF635B /* AFHTTPRequestOperationManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AFHTTPRequestOperationManager.m; path = "../../../RedAnt ERP Mobile/Pods/AFNetworking/AFNetworking/AFHTTPRequestOperationManager.m"; sourceTree = "<group>"; };
-		7128C2F11E12513800FF635B /* AFHTTPSessionManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AFHTTPSessionManager.h; path = "../../../RedAnt ERP Mobile/Pods/AFNetworking/AFNetworking/AFHTTPSessionManager.h"; sourceTree = "<group>"; };
-		7128C2F21E12513800FF635B /* AFHTTPSessionManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AFHTTPSessionManager.m; path = "../../../RedAnt ERP Mobile/Pods/AFNetworking/AFNetworking/AFHTTPSessionManager.m"; sourceTree = "<group>"; };
-		7128C2F31E12513800FF635B /* AFNetworking.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AFNetworking.h; path = "../../../RedAnt ERP Mobile/Pods/AFNetworking/AFNetworking/AFNetworking.h"; sourceTree = "<group>"; };
-		7128C2F41E12513800FF635B /* AFNetworkReachabilityManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AFNetworkReachabilityManager.h; path = "../../../RedAnt ERP Mobile/Pods/AFNetworking/AFNetworking/AFNetworkReachabilityManager.h"; sourceTree = "<group>"; };
-		7128C2F51E12513800FF635B /* AFNetworkReachabilityManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AFNetworkReachabilityManager.m; path = "../../../RedAnt ERP Mobile/Pods/AFNetworking/AFNetworking/AFNetworkReachabilityManager.m"; sourceTree = "<group>"; };
-		7128C2F61E12513800FF635B /* AFSecurityPolicy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AFSecurityPolicy.h; path = "../../../RedAnt ERP Mobile/Pods/AFNetworking/AFNetworking/AFSecurityPolicy.h"; sourceTree = "<group>"; };
-		7128C2F71E12513800FF635B /* AFSecurityPolicy.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AFSecurityPolicy.m; path = "../../../RedAnt ERP Mobile/Pods/AFNetworking/AFNetworking/AFSecurityPolicy.m"; sourceTree = "<group>"; };
-		7128C2F81E12513800FF635B /* AFURLConnectionOperation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AFURLConnectionOperation.h; path = "../../../RedAnt ERP Mobile/Pods/AFNetworking/AFNetworking/AFURLConnectionOperation.h"; sourceTree = "<group>"; };
-		7128C2F91E12513800FF635B /* AFURLConnectionOperation.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AFURLConnectionOperation.m; path = "../../../RedAnt ERP Mobile/Pods/AFNetworking/AFNetworking/AFURLConnectionOperation.m"; sourceTree = "<group>"; };
-		7128C2FA1E12513800FF635B /* AFURLRequestSerialization.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AFURLRequestSerialization.h; path = "../../../RedAnt ERP Mobile/Pods/AFNetworking/AFNetworking/AFURLRequestSerialization.h"; sourceTree = "<group>"; };
-		7128C2FB1E12513800FF635B /* AFURLRequestSerialization.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AFURLRequestSerialization.m; path = "../../../RedAnt ERP Mobile/Pods/AFNetworking/AFNetworking/AFURLRequestSerialization.m"; sourceTree = "<group>"; };
-		7128C2FC1E12513800FF635B /* AFURLResponseSerialization.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AFURLResponseSerialization.h; path = "../../../RedAnt ERP Mobile/Pods/AFNetworking/AFNetworking/AFURLResponseSerialization.h"; sourceTree = "<group>"; };
-		7128C2FD1E12513800FF635B /* AFURLResponseSerialization.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AFURLResponseSerialization.m; path = "../../../RedAnt ERP Mobile/Pods/AFNetworking/AFNetworking/AFURLResponseSerialization.m"; sourceTree = "<group>"; };
-		7128C2FE1E12513800FF635B /* AFURLSessionManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AFURLSessionManager.h; path = "../../../RedAnt ERP Mobile/Pods/AFNetworking/AFNetworking/AFURLSessionManager.h"; sourceTree = "<group>"; };
-		7128C2FF1E12513800FF635B /* AFURLSessionManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AFURLSessionManager.m; path = "../../../RedAnt ERP Mobile/Pods/AFNetworking/AFNetworking/AFURLSessionManager.m"; sourceTree = "<group>"; };
-		7128C30A1E12515800FF635B /* AFNetworkActivityIndicatorManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AFNetworkActivityIndicatorManager.h; path = "../../../RedAnt ERP Mobile/Pods/AFNetworking/UIKit+AFNetworking/AFNetworkActivityIndicatorManager.h"; sourceTree = "<group>"; };
-		7128C30B1E12515800FF635B /* AFNetworkActivityIndicatorManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AFNetworkActivityIndicatorManager.m; path = "../../../RedAnt ERP Mobile/Pods/AFNetworking/UIKit+AFNetworking/AFNetworkActivityIndicatorManager.m"; sourceTree = "<group>"; };
-		7128C30C1E12515800FF635B /* UIActivityIndicatorView+AFNetworking.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "UIActivityIndicatorView+AFNetworking.h"; path = "../../../RedAnt ERP Mobile/Pods/AFNetworking/UIKit+AFNetworking/UIActivityIndicatorView+AFNetworking.h"; sourceTree = "<group>"; };
-		7128C30D1E12515800FF635B /* UIActivityIndicatorView+AFNetworking.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = "UIActivityIndicatorView+AFNetworking.m"; path = "../../../RedAnt ERP Mobile/Pods/AFNetworking/UIKit+AFNetworking/UIActivityIndicatorView+AFNetworking.m"; sourceTree = "<group>"; };
-		7128C30E1E12515800FF635B /* UIAlertView+AFNetworking.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "UIAlertView+AFNetworking.h"; path = "../../../RedAnt ERP Mobile/Pods/AFNetworking/UIKit+AFNetworking/UIAlertView+AFNetworking.h"; sourceTree = "<group>"; };
-		7128C30F1E12515800FF635B /* UIAlertView+AFNetworking.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = "UIAlertView+AFNetworking.m"; path = "../../../RedAnt ERP Mobile/Pods/AFNetworking/UIKit+AFNetworking/UIAlertView+AFNetworking.m"; sourceTree = "<group>"; };
-		7128C3101E12515800FF635B /* UIButton+AFNetworking.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "UIButton+AFNetworking.h"; path = "../../../RedAnt ERP Mobile/Pods/AFNetworking/UIKit+AFNetworking/UIButton+AFNetworking.h"; sourceTree = "<group>"; };
-		7128C3111E12515800FF635B /* UIButton+AFNetworking.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = "UIButton+AFNetworking.m"; path = "../../../RedAnt ERP Mobile/Pods/AFNetworking/UIKit+AFNetworking/UIButton+AFNetworking.m"; sourceTree = "<group>"; };
-		7128C3121E12515800FF635B /* UIImage+AFNetworking.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "UIImage+AFNetworking.h"; path = "../../../RedAnt ERP Mobile/Pods/AFNetworking/UIKit+AFNetworking/UIImage+AFNetworking.h"; sourceTree = "<group>"; };
-		7128C3131E12515800FF635B /* UIImageView+AFNetworking.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "UIImageView+AFNetworking.h"; path = "../../../RedAnt ERP Mobile/Pods/AFNetworking/UIKit+AFNetworking/UIImageView+AFNetworking.h"; sourceTree = "<group>"; };
-		7128C3141E12515800FF635B /* UIImageView+AFNetworking.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = "UIImageView+AFNetworking.m"; path = "../../../RedAnt ERP Mobile/Pods/AFNetworking/UIKit+AFNetworking/UIImageView+AFNetworking.m"; sourceTree = "<group>"; };
-		7128C3151E12515800FF635B /* UIKit+AFNetworking.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "UIKit+AFNetworking.h"; path = "../../../RedAnt ERP Mobile/Pods/AFNetworking/UIKit+AFNetworking/UIKit+AFNetworking.h"; sourceTree = "<group>"; };
-		7128C3161E12515800FF635B /* UIProgressView+AFNetworking.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "UIProgressView+AFNetworking.h"; path = "../../../RedAnt ERP Mobile/Pods/AFNetworking/UIKit+AFNetworking/UIProgressView+AFNetworking.h"; sourceTree = "<group>"; };
-		7128C3171E12515800FF635B /* UIProgressView+AFNetworking.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = "UIProgressView+AFNetworking.m"; path = "../../../RedAnt ERP Mobile/Pods/AFNetworking/UIKit+AFNetworking/UIProgressView+AFNetworking.m"; sourceTree = "<group>"; };
-		7128C3181E12515800FF635B /* UIRefreshControl+AFNetworking.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "UIRefreshControl+AFNetworking.h"; path = "../../../RedAnt ERP Mobile/Pods/AFNetworking/UIKit+AFNetworking/UIRefreshControl+AFNetworking.h"; sourceTree = "<group>"; };
-		7128C3191E12515800FF635B /* UIRefreshControl+AFNetworking.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = "UIRefreshControl+AFNetworking.m"; path = "../../../RedAnt ERP Mobile/Pods/AFNetworking/UIKit+AFNetworking/UIRefreshControl+AFNetworking.m"; sourceTree = "<group>"; };
-		7128C31A1E12515800FF635B /* UIWebView+AFNetworking.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "UIWebView+AFNetworking.h"; path = "../../../RedAnt ERP Mobile/Pods/AFNetworking/UIKit+AFNetworking/UIWebView+AFNetworking.h"; sourceTree = "<group>"; };
-		7128C31B1E12515800FF635B /* UIWebView+AFNetworking.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = "UIWebView+AFNetworking.m"; path = "../../../RedAnt ERP Mobile/Pods/AFNetworking/UIKit+AFNetworking/UIWebView+AFNetworking.m"; sourceTree = "<group>"; };
 		7128C3241E1251D000FF635B /* config.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = config.h; sourceTree = "<group>"; };
 		7128C3251E1251D000FF635B /* const.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = const.h; sourceTree = "<group>"; };
 		7128C3281E12520B00FF635B /* libz.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libz.tbd; path = usr/lib/libz.tbd; sourceTree = SDKROOT; };
@@ -389,8 +335,6 @@
 			isa = PBXGroup;
 			children = (
 				7115D4241E13B32800EF4E4C /* customerUI */,
-				7128C3091E12514300FF635B /* UIKit+AFNetworking */,
-				7128C2EC1E12512F00FF635B /* AFNetworking */,
 				7128C2DD1E12511400FF635B /* aes */,
 				7128C2CC1E1250FF00FF635B /* zip */,
 				7128C2BA1E1250FC00FF635B /* ImageUtils.h */,
@@ -443,57 +387,6 @@
 			name = aes;
 			sourceTree = "<group>";
 		};
-		7128C2EC1E12512F00FF635B /* AFNetworking */ = {
-			isa = PBXGroup;
-			children = (
-				7128C2ED1E12513800FF635B /* AFHTTPRequestOperation.h */,
-				7128C2EE1E12513800FF635B /* AFHTTPRequestOperation.m */,
-				7128C2EF1E12513800FF635B /* AFHTTPRequestOperationManager.h */,
-				7128C2F01E12513800FF635B /* AFHTTPRequestOperationManager.m */,
-				7128C2F11E12513800FF635B /* AFHTTPSessionManager.h */,
-				7128C2F21E12513800FF635B /* AFHTTPSessionManager.m */,
-				7128C2F31E12513800FF635B /* AFNetworking.h */,
-				7128C2F41E12513800FF635B /* AFNetworkReachabilityManager.h */,
-				7128C2F51E12513800FF635B /* AFNetworkReachabilityManager.m */,
-				7128C2F61E12513800FF635B /* AFSecurityPolicy.h */,
-				7128C2F71E12513800FF635B /* AFSecurityPolicy.m */,
-				7128C2F81E12513800FF635B /* AFURLConnectionOperation.h */,
-				7128C2F91E12513800FF635B /* AFURLConnectionOperation.m */,
-				7128C2FA1E12513800FF635B /* AFURLRequestSerialization.h */,
-				7128C2FB1E12513800FF635B /* AFURLRequestSerialization.m */,
-				7128C2FC1E12513800FF635B /* AFURLResponseSerialization.h */,
-				7128C2FD1E12513800FF635B /* AFURLResponseSerialization.m */,
-				7128C2FE1E12513800FF635B /* AFURLSessionManager.h */,
-				7128C2FF1E12513800FF635B /* AFURLSessionManager.m */,
-			);
-			name = AFNetworking;
-			sourceTree = "<group>";
-		};
-		7128C3091E12514300FF635B /* UIKit+AFNetworking */ = {
-			isa = PBXGroup;
-			children = (
-				7128C30A1E12515800FF635B /* AFNetworkActivityIndicatorManager.h */,
-				7128C30B1E12515800FF635B /* AFNetworkActivityIndicatorManager.m */,
-				7128C30C1E12515800FF635B /* UIActivityIndicatorView+AFNetworking.h */,
-				7128C30D1E12515800FF635B /* UIActivityIndicatorView+AFNetworking.m */,
-				7128C30E1E12515800FF635B /* UIAlertView+AFNetworking.h */,
-				7128C30F1E12515800FF635B /* UIAlertView+AFNetworking.m */,
-				7128C3101E12515800FF635B /* UIButton+AFNetworking.h */,
-				7128C3111E12515800FF635B /* UIButton+AFNetworking.m */,
-				7128C3121E12515800FF635B /* UIImage+AFNetworking.h */,
-				7128C3131E12515800FF635B /* UIImageView+AFNetworking.h */,
-				7128C3141E12515800FF635B /* UIImageView+AFNetworking.m */,
-				7128C3151E12515800FF635B /* UIKit+AFNetworking.h */,
-				7128C3161E12515800FF635B /* UIProgressView+AFNetworking.h */,
-				7128C3171E12515800FF635B /* UIProgressView+AFNetworking.m */,
-				7128C3181E12515800FF635B /* UIRefreshControl+AFNetworking.h */,
-				7128C3191E12515800FF635B /* UIRefreshControl+AFNetworking.m */,
-				7128C31A1E12515800FF635B /* UIWebView+AFNetworking.h */,
-				7128C31B1E12515800FF635B /* UIWebView+AFNetworking.m */,
-			);
-			name = "UIKit+AFNetworking";
-			sourceTree = "<group>";
-		};
 		7128C3261E1251DE00FF635B /* pdf resource */ = {
 			isa = PBXGroup;
 			children = (
@@ -592,7 +485,6 @@
 			buildActionMask = 2147483647;
 			files = (
 				7128C3471E12545C00FF635B /* DocumentPageViewController.m in Sources */,
-				7128C3081E12513800FF635B /* AFURLSessionManager.m in Sources */,
 				7115D42A1E14DE0A00EF4E4C /* DocListTableViewCell.m in Sources */,
 				7128C2B11E1250CA00FF635B /* PDFDrawable.m in Sources */,
 				7128C2E71E12511B00FF635B /* AESCrypt.m in Sources */,
@@ -603,37 +495,25 @@
 				7128C2D91E12510900FF635B /* mztools.c in Sources */,
 				7128C2EB1E12511B00FF635B /* NSString+Base64.m in Sources */,
 				7128C2CA1E1250FC00FF635B /* NetworkUtils.m in Sources */,
-				7128C31D1E12515800FF635B /* UIActivityIndicatorView+AFNetworking.m in Sources */,
 				7128C2B31E1250CA00FF635B /* BasicDrawable.m in Sources */,
-				7128C3021E12513800FF635B /* AFHTTPSessionManager.m in Sources */,
 				7128C2C71E1250FC00FF635B /* PDFUtils.m in Sources */,
-				7128C31F1E12515800FF635B /* UIButton+AFNetworking.m in Sources */,
 				717243441E1CCCEC00800678 /* CustomIOSAlertView.m in Sources */,
-				7128C3071E12513800FF635B /* AFURLResponseSerialization.m in Sources */,
 				7128C3541E12548C00FF635B /* PDFScrollView.m in Sources */,
 				7128C3411E12542000FF635B /* LoginViewController.m in Sources */,
 				7128C3461E12545C00FF635B /* CheckSelectorViewController.m in Sources */,
 				7128C2B81E1250CA00FF635B /* LineDrawable.m in Sources */,
-				7128C3211E12515800FF635B /* UIProgressView+AFNetworking.m in Sources */,
-				7128C3201E12515800FF635B /* UIImageView+AFNetworking.m in Sources */,
 				7128C2DB1E12510900FF635B /* zip.c in Sources */,
-				7128C3051E12513800FF635B /* AFURLConnectionOperation.m in Sources */,
-				7128C3031E12513800FF635B /* AFNetworkReachabilityManager.m in Sources */,
 				7128C2C91E1250FC00FF635B /* Reachability.m in Sources */,
 				7128C27C1E12500B00FF635B /* SignatureViewController.m in Sources */,
 				7128C3521E12548C00FF635B /* PageViewController.m in Sources */,
 				7128C2DC1E12510900FF635B /* ZipArchive.mm in Sources */,
-				7128C3001E12513800FF635B /* AFHTTPRequestOperation.m in Sources */,
-				7128C3231E12515800FF635B /* UIWebView+AFNetworking.m in Sources */,
 				7128C3561E12548C00FF635B /* SignatureTableViewCell.m in Sources */,
 				7128C2B51E1250CA00FF635B /* GroupDrawable.m in Sources */,
-				7128C3221E12515800FF635B /* UIRefreshControl+AFNetworking.m in Sources */,
 				7128C28E1E12501B00FF635B /* TouchImageView.m in Sources */,
 				7128C2B41E1250CA00FF635B /* GridDrawable.m in Sources */,
 				7115D4561E1606F700EF4E4C /* GEContractFilterViewController.m in Sources */,
 				7128C2DA1E12510900FF635B /* unzip.c in Sources */,
 				7128C2981E12504300FF635B /* PDFViewController.m in Sources */,
-				7128C3041E12513800FF635B /* AFSecurityPolicy.m in Sources */,
 				7128C2CB1E1250FC00FF635B /* RAUtils.m in Sources */,
 				7128C2C81E1250FC00FF635B /* TextUtils.m in Sources */,
 				7128C33B1E12540F00FF635B /* AppDelegate.m in Sources */,
@@ -644,13 +524,9 @@
 				7128C2401E124F4500FF635B /* main.m in Sources */,
 				7128C3551E12548C00FF635B /* SignatureListViewController.m in Sources */,
 				7128C2EA1E12511B00FF635B /* NSData+CommonCrypto.m in Sources */,
-				7128C3061E12513800FF635B /* AFURLRequestSerialization.m in Sources */,
 				7128C2B01E1250CA00FF635B /* TextDrawable.m in Sources */,
-				7128C3011E12513800FF635B /* AFHTTPRequestOperationManager.m in Sources */,
 				7128C3531E12548C00FF635B /* PDFPageView.m in Sources */,
 				7128C33E1E12541800FF635B /* RootViewController.m in Sources */,
-				7128C31E1E12515800FF635B /* UIAlertView+AFNetworking.m in Sources */,
-				7128C31C1E12515800FF635B /* AFNetworkActivityIndicatorManager.m in Sources */,
 				7128C2E91E12511B00FF635B /* NSData+Base64.m in Sources */,
 				7128C2D81E12510900FF635B /* ioapi.c in Sources */,
 				7128C2C61E1250FC00FF635B /* ImageUtils.m in Sources */,

+ 1 - 1
Ants Contract/Granite Expo eSign/Granite Expo eSign.xcodeproj/xcuserdata/Ray.xcuserdatad/xcschemes/Granite Expo eSign.xcscheme

@@ -42,7 +42,7 @@
       </AdditionalOptions>
    </TestAction>
    <LaunchAction
-      buildConfiguration = "Release"
+      buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       launchStyle = "0"

+ 26 - 26
Ants Contract/Granite Expo eSign/Granite Expo eSign/GEIC - Home Improvement Contract 2017.json

@@ -352,7 +352,7 @@
             "value": []
         },
         "control_10": {
-            "aname": "Initial",
+            "aname": "Initial","can_fill": "true",
             "type": "Signature",
             "required": true,
             "pos_x": 615,
@@ -363,7 +363,7 @@
             "value": ""
         },
         "control_11": {
-            "aname": "Initial",
+            "aname": "Initial","can_fill": "true",
             "type": "Signature",
             "required": true,
             "pos_x": 615,
@@ -374,7 +374,7 @@
             "value": ""
         },
         "control_12": {
-            "aname": "Initial",
+            "aname": "Initial","can_fill": "true",
             "type": "Signature",
             "required": true,
             "pos_x": 615,
@@ -385,7 +385,7 @@
             "value": ""
         },
         "control_13": {
-            "aname": "Initial",
+            "aname": "Initial","can_fill": "true",
             "type": "Signature",
             "required": true,
             "pos_x": 615,
@@ -396,7 +396,7 @@
             "value": ""
         },
         "control_14": {
-            "aname": "Initial",
+            "aname": "Initial","can_fill": "true",
             "type": "Signature",
             "required": true,
             "pos_x": 615,
@@ -433,7 +433,7 @@
     "page_1": {
         "count": 21,
         "control_0": {
-            "aname": "Initial",
+            "aname": "Initial","can_fill": "true",
             "type": "Signature",
             "required": true,
             "pos_x": 615,
@@ -455,7 +455,7 @@
             "value": ""
         },
         "control_2": {
-            "aname": "Initial",
+            "aname": "Initial","can_fill": "true",
             "type": "Signature",
             "required": true,
             "pos_x": 615,
@@ -466,7 +466,7 @@
             "value": ""
         },
         "control_3": {
-            "aname": "Initial",
+            "aname": "Initial","can_fill": "true",
             "type": "Signature",
             "required": true,
             "pos_x": 615,
@@ -477,7 +477,7 @@
             "value": ""
         },
         "control_4": {
-            "aname": "Initial",
+            "aname": "Initial","can_fill": "true",
             "type": "Signature",
             "required": true,
             "pos_x": 615,
@@ -488,7 +488,7 @@
             "value": ""
         },
         "control_5": {
-            "aname": "Initial",
+            "aname": "Initial","can_fill": "true",
             "type": "Signature",
             "required": true,
             "pos_x": 615,
@@ -499,7 +499,7 @@
             "value": ""
         },
         "control_6": {
-            "aname": "Initial",
+            "aname": "Initial","can_fill": "true",
             "type": "Signature",
             "required": true,
             "pos_x": 615,
@@ -510,7 +510,7 @@
             "value": ""
         },
         "control_7": {
-            "aname": "Initial",
+            "aname": "Initial","can_fill": "true",
             "type": "Signature",
             "required": true,
             "pos_x": 615,
@@ -521,7 +521,7 @@
             "value": ""
         },
         "control_8": {
-            "aname": "Initial",
+            "aname": "Initial","can_fill": "true",
             "type": "Signature",
             "required": true,
             "pos_x": 615,
@@ -532,7 +532,7 @@
             "value": ""
         },
         "control_20": {
-            "aname": "Initial",
+            "aname": "Initial","can_fill": "true",
             "type": "Signature",
             "required": true,
             "pos_x": 615,
@@ -590,7 +590,7 @@
             "value": []
         },
         "control_10": {
-            "aname": "Initial",
+            "aname": "Initial","can_fill": "true",
             "type": "Signature",
             "required": true,
             "pos_x": 615,
@@ -601,7 +601,7 @@
             "value": ""
         },
         "control_11": {
-            "aname": "Initial",
+            "aname": "Initial","can_fill": "true",
             "type": "Signature",
             "required": true,
             "pos_x": 615,
@@ -612,7 +612,7 @@
             "value": ""
         },
         "control_12": {
-            "aname": "Initial",
+            "aname": "Initial","can_fill": "true",
             "type": "Signature",
             "required": true,
             "pos_x": 615,
@@ -623,7 +623,7 @@
             "value": ""
         },
         "control_13": {
-            "aname": "Initial",
+            "aname": "Initial","can_fill": "true",
             "type": "Signature",
             "required": true,
             "pos_x": 615,
@@ -634,7 +634,7 @@
             "value": ""
         },
         "control_14": {
-            "aname": "Initial",
+            "aname": "Initial","can_fill": "true",
             "type": "Signature",
             "required": true,
             "pos_x": 615,
@@ -645,7 +645,7 @@
             "value": ""
         },
         "control_15": {
-            "aname": "Initial",
+            "aname": "Initial","can_fill": "true",
             "type": "Signature",
             "required": true,
             "pos_x": 615,
@@ -656,7 +656,7 @@
             "value": ""
         },
         "control_16": {
-            "aname": "Initial",
+            "aname": "Initial","can_fill": "true",
             "type": "Signature",
             "required": true,
             "pos_x": 615,
@@ -802,7 +802,7 @@
     "page_3": {
         "count": 10,
         "control_0": {
-            "aname": "Initial",
+            "aname": "Initial","can_fill": "true",
             "type": "Signature",
             "required": true,
             "pos_x": 615,
@@ -813,7 +813,7 @@
             "value": ""
         },
         "control_1": {
-            "aname": "Initial",
+            "aname": "Initial","can_fill": "true",
             "type": "Signature",
             "required": true,
             "pos_x": 615,
@@ -824,7 +824,7 @@
             "value": ""
         },
         "control_2": {
-            "aname": "Initial",
+            "aname": "Initial","can_fill": "true",
             "type": "Signature",
             "required": true,
             "pos_x": 615,
@@ -835,7 +835,7 @@
             "value": ""
         },
         "control_3": {
-            "aname": "Initial",
+            "aname": "Initial","can_fill": "true",
             "type": "Signature",
             "required": true,
             "pos_x": 615,
@@ -846,7 +846,7 @@
             "value": ""
         },
         "control_4": {
-            "aname": "Initial",
+            "aname": "Initial","can_fill": "true",
             "type": "Signature",
             "required": true,
             "pos_x": 615,

+ 2 - 2
Ants Contract/Granite Expo eSign/Granite Expo eSign/config.h

@@ -17,13 +17,13 @@
 
 //#define ENCRYPT_OFF
 
-#define NO_SAVE_VERIFY false
+#define NO_SAVE_VERIFY true
 
 #define DEBUG_PDFSIG false
 
 #define PDF_DEBUG false
 
-//#define test_server
+#define test_server
 
 #ifdef test_server
     #define  URL_ERR_LOG  @""

+ 7 - 5
Ants Contract/common/ACNetwork.m

@@ -36,11 +36,13 @@
     NSString* short_version =[infoDict objectForKey:@"CFBundleShortVersionString"];
     [params setValue:short_version forKey:@"app_short_ver"];
     
-    UIDevice * dev = [UIDevice currentDevice];
-    NSUUID* uuid =dev.identifierForVendor;
+    
+
 #if TARGET_IPHONE_SIMULATOR//模拟器
     [params setValue:@"simulator_uuid" forKey:@"deviceid"];
 #elif TARGET_OS_IPHONE//真机
+    UIDevice * dev = [UIDevice currentDevice];
+    NSUUID* uuid =dev.identifierForVendor;
     [params setValue:uuid.UUIDString forKey:@"deviceid"];
 #endif
     
@@ -141,7 +143,7 @@
     NSError *error=nil;
     NSDictionary *jsobj = [NSJSONSerialization JSONObjectWithData:json options:NSJSONReadingMutableLeaves error:&error];
     int result = [[jsobj valueForKey:@"result"] intValue];
-    
+    DebugLog(@"new_document result:%d",result);
 
     return jsobj;
 }
@@ -177,7 +179,7 @@
     NSDictionary *jsobj = [NSJSONSerialization JSONObjectWithData:json options:NSJSONReadingMutableLeaves error:&error];
     int result = [[jsobj valueForKey:@"result"] intValue];
     
-    
+        DebugLog(@"new_document result:%d",result);
     return jsobj;
 }
 +(NSDictionary*)logout
@@ -229,7 +231,7 @@
     
     
     NSMutableDictionary* params = [[NSMutableDictionary alloc] init];
-    AppDelegate *appDelegate = (AppDelegate*)[[UIApplication sharedApplication] delegate];
+//    AppDelegate *appDelegate = (AppDelegate*)[[UIApplication sharedApplication] delegate];
 //    if(appDelegate.duid !=nil)
 //        [params setValue:appDelegate.duid forKey:@"udid"];
 //    [params setValue:@"handset_login" forKey:@"action"];

+ 2 - 2
Ants Contract/common/DocumentListViewController.m

@@ -129,10 +129,10 @@
     NSString* subject;
     //                    if (company.length==0) {
     
-    NSString* cur_time =[RAUtils current_date];
+//    NSString* cur_time =[RAUtils current_date];
     subject =name;//[NSString stringWithFormat:@"NPD Product List %@",cur_time];
     
-    AppDelegate *appDelegate = (AppDelegate*)[[UIApplication sharedApplication] delegate];
+//    AppDelegate *appDelegate = (AppDelegate*)[[UIApplication sharedApplication] delegate];
     //    NSString* customer_email=    [appDelegate.customerInfo valueForKey:@"customer_email"];
     
     

+ 1 - 1
Ants Contract/common/DocumentPageViewController.h

@@ -21,7 +21,7 @@
 @property (strong, nonatomic) NSString* templateName;
 
 @property (strong, nonatomic) NSString* docment_id;
-
+@property long current_page;
 
 @property (nonatomic , copy) void (^OnSave)(NSString * file);
 @end

+ 119 - 23
Ants Contract/common/DocumentPageViewController.m

@@ -13,7 +13,7 @@
 #import "PDFUtils.h"
 #import "ACNetwork.h"
 
-#import "AFHTTPSessionManager.h"
+//#import "AFHTTPSessionManager.h"
 #import "AppDelegate.h"
 #import "ACNetwork.h"
 #import "RAUtils.h"
@@ -69,7 +69,8 @@
                 NSString* name =control[@"name"];
                 if([name isEqualToString:@"BarCode"])
                 {
-                    control[@"value"]= qrpath;
+                    if(bwrite)
+                        control[@"value"]= qrpath;
                 }
             }
             else if([type isEqualToString:@"DatePicker"])
@@ -134,7 +135,7 @@
 }
 -(void) dealloc
 {
-    CFBridgingRelease(self.document);
+    CFRelease(self.document);
 }
 - (void)didReceiveMemoryWarning {
     [super didReceiveMemoryWarning];
@@ -214,27 +215,81 @@
         
     };
     
-    signatureVC.blk_Fill =^(NSString* file)
-    {
-        
-        
-        
-        //            NSString* file_name=[file lastPathComponent];
+//    signatureVC.blk_Fill =^(NSString* file, bool fillFullDoc)
+//    {
 //        
-//        NSData* img_data=[ImageUtils load_img:file];
 //        
-//        if(img_data!=nil)
+//        for(int i=0;i<[self.controlTemplate[@"count"] intValue];i++)
 //        {
-//            
-//            UIImage* image=[UIImage imageWithData:img_data];
-//            touchImageView.image = image;
-//            
-//            long index = touchImageView.tag - CONTROL_BASE;
-//            self.controlTemplate [[NSString stringWithFormat:@"control_%ld",index] ][@"value"] = file;
-//            
+//            NSMutableDictionary* page =self.controlTemplate[[NSString stringWithFormat:@"page_%d",i]];
+//            if(!fillFullDoc && i!=self.current_page)
+//                continue;
+//            for(int j=0;j<[page[@"count"] intValue];j++)
+//            {
+//                NSMutableDictionary* control =page[[NSString stringWithFormat:@"control_%d",j]];
+//                NSString* type = control[@"type"];
+//                if(![type isEqualToString:@"Signature"])
+//                    continue;
+//                
+//                control[@"value"]=file;
+//                
+////                NSString* name = control[@"aname"];
+////                bool required = [control[@"required"] boolValue];
+////                
+////                if(required==false)
+////                    continue;
+////                if([type isEqualToString:@"Check"])
+////                {
+////                    NSArray* arr = control[@"value"];
+////                    if(arr.count==0)
+////                    {
+////                        ret=false;
+////                        
+////                        NSString* msg=[NSString stringWithFormat:@"%u Page %d %@ is missing.",fields.count+1,i+1,name];
+////                        if(fields.count<15)
+////                            [fields addObject:msg];
+////                        else
+////                            more++;
+////                    }
+////                    
+////                }
+////                else if(/*[type isEqualToString:@"Signature"]||*/[type isEqualToString:@"Image"]||[type isEqualToString:@"Label"])
+////                {
+////                    continue;
+////                }
+////                else
+////                {
+////                    NSString* str = control[@"value"];
+////                    if(str.length==0)
+////                    {
+////                        ret=false;
+////                        NSString* msg=[NSString stringWithFormat:@"%lu Page %d %@ is missing.",fields.count+1,i+1,name];
+////                        if(fields.count<15)
+////                            [fields addObject:msg];
+////                        else
+////                            more++;
+////                    }
+////                }
+//            }
 //        }
-        
-    };
+//        
+//        
+//        //            NSString* file_name=[file lastPathComponent];
+////        
+////        NSData* img_data=[ImageUtils load_img:file];
+////        
+////        if(img_data!=nil)
+////        {
+////            
+////            UIImage* image=[UIImage imageWithData:img_data];
+////            touchImageView.image = image;
+////            
+////            long index = touchImageView.tag - CONTROL_BASE;
+////            self.controlTemplate [[NSString stringWithFormat:@"control_%ld",index] ][@"value"] = file;
+////            
+////        }
+//        
+//    };
     
     UINavigationController * navi = [[UINavigationController alloc] initWithRootViewController:signatureVC];
     navi.modalPresentationStyle=UIModalPresentationPopover;
@@ -614,7 +669,47 @@
     PageViewController.pageRef =  CGPDFDocumentGetPage (self.document , index+1);
     PageViewController.pageIndex = index;
     
-    ;
+    
+            __weak typeof(self) weakSelf = self;
+    PageViewController.blk_Fill = ^(NSString* file,NSString* subtype,bool fillFullDoc)
+    {
+        
+        
+                for(int i=0;i<[weakSelf.controlTemplate[@"count"] intValue];i++)
+                {
+                    NSMutableDictionary* page =weakSelf.controlTemplate[[NSString stringWithFormat:@"page_%d",i]];
+                    if(!fillFullDoc && i!=weakSelf.current_page)
+                        continue;
+                    for(int j=0;j<[page[@"count"] intValue];j++)
+                    {
+                        NSMutableDictionary* dest =page[[NSString stringWithFormat:@"control_%d",j]];
+                        NSString* type = dest[@"type"];
+                        if(![type isEqualToString:@"Signature"])
+                            continue;
+                        if([dest[@"name"] isEqualToString:subtype])
+                        {
+                            dest[@"value"]=file;
+                        }
+                    }
+                }
+        
+        
+                //            NSString* file_name=[file lastPathComponent];
+        //
+        //        NSData* img_data=[ImageUtils load_img:file];
+        //        
+        //        if(img_data!=nil)
+        //        {
+        //            
+        //            UIImage* image=[UIImage imageWithData:img_data];
+        //            touchImageView.image = image;
+        //            
+        //            long index = touchImageView.tag - CONTROL_BASE;
+        //            self.controlTemplate [[NSString stringWithFormat:@"control_%ld",index] ][@"value"] = file;
+        //            
+        //        }
+                
+    };
     PageViewController.controlTemplate = self.controlTemplate[[NSString stringWithFormat:@"page_%lu",(unsigned long)index]];
     
     PageViewController.signatureData = self.signatureData;
@@ -722,7 +817,7 @@
                 if(str.length==0)
                 {
                     ret=false;
-                    NSString* msg=[NSString stringWithFormat:@"%u Page %d %@ is missing.",fields.count+1,i+1,name];
+                    NSString* msg=[NSString stringWithFormat:@"%lu Page %d %@ is missing.",fields.count+1,i+1,name];
                     if(fields.count<15)
                         [fields addObject:msg];
                     else
@@ -787,6 +882,7 @@
     }
     
     index--;
+    self.current_page= index;
     return  [self viewControllerAtIndex:index];
 }
 
@@ -803,7 +899,7 @@
     if (index == self.total_page){
         return  nil;
     }
-    
+    self.current_page= index;
     return [self viewControllerAtIndex:index];
 }
 

+ 3 - 3
Ants Contract/common/LoginViewController.m

@@ -113,7 +113,7 @@
             [defaults synchronize];
             
             
-            NSString* encryptu=[AESCrypt encrypt:self.edituser.text password:@"usai"];
+//            NSString* encryptu=[AESCrypt encrypt:self.edituser.text password:@"usai"];
             
 //            NSString* sql=[NSString stringWithFormat:@"delete from login_info where name='%@'",encryptu];
 //            [iSalesDB execSql:sql];
@@ -236,9 +236,9 @@
                 
                 [self dismissViewControllerAnimated:YES completion:^{
                     
-                    NSUserDefaults *defaults =[NSUserDefaults standardUserDefaults];
+//                    NSUserDefaults *defaults =[NSUserDefaults standardUserDefaults];
                     
-                    bool offline_dirty=[defaults boolForKey:@"OFFLINE_DIRTY"];
+//                    bool offline_dirty=[defaults boolForKey:@"OFFLINE_DIRTY"];
 //                    sqlite3* db = [iSalesDB get_db];
 //                    int offline_user_exist=[iSalesDB get_recordcount:db table:@"offline_login" where:[NSString stringWithFormat:@"username='%@'",appDelegate.user ]];
 //                    

+ 1 - 1
Ants Contract/common/PDFPageView.m

@@ -39,7 +39,7 @@
 
     CGContextSaveGState (myContext);
     
-                CGRect mediabox= CGPDFPageGetBoxRect(page, kCGPDFMediaBox);
+//                CGRect mediabox= CGPDFPageGetBoxRect(page, kCGPDFMediaBox);
         
 //                CGContextTranslateCTM(myContext, 0, mediabox.size.height);
 //                CGContextScaleCTM(myContext, 1, -1);

+ 1 - 1
Ants Contract/common/PageViewController.h

@@ -19,7 +19,7 @@
 @property size_t pageIndex;
 @property CGPDFPageRef pageRef;
 @property (strong, nonatomic) IBOutlet PDFScrollView *pdfScrollView;
-
+@property (nonatomic , copy) void (^blk_Fill)(NSString* file,NSString* subtype, bool fillFullDoc);
 
 
 @property (strong, nonatomic) NSMutableDictionary * controlTemplate;

+ 101 - 5
Ants Contract/common/PageViewController.m

@@ -47,6 +47,10 @@
     
     // Do any additional setup after loading the view.
 }
+-(void)viewWillAppear:(BOOL)animated
+{
+    [self refreshControl];
+}
 -(void) dealloc
 {
  //   CFBridgingRelease(self.pageRef);
@@ -109,6 +113,64 @@
     }
     
 }
+-(void) refreshControl
+{
+    int count = [self.controlTemplate[@"count"] intValue];
+    for(int i=0;i<count;i++)
+    {
+        NSString* controlname =[NSString stringWithFormat:@"control_%d",i];
+        NSMutableDictionary * control =self.controlTemplate [ controlname];
+        
+        
+//        if([control[@"type"] isEqualToString:@"TextView"])
+//        {
+//            UITextView* tv = (UITextView*) [self findControl:controlname];
+//            tv.text = control[@"value"];
+//        }
+//        else if([control[@"type"] isEqualToString:@"Button"])
+//        {
+//            [self addButton:control destView:self.editControlView index:i];
+//            
+//        }
+//        else if([control[@"type"] isEqualToString:@"Check"])
+//        {
+//            [self addCheck:control destView:self.editControlView index:i];
+//            
+//        }
+//        else
+            if([control[@"type"] isEqualToString:@"Signature"])
+        {
+            TouchImageView* btn = (TouchImageView*) [self findControl:controlname];
+            NSString* file =control[@"value"];
+            
+            NSData* img_data=[ImageUtils load_img:file];
+            
+            if(img_data!=nil)
+            {
+                
+                UIImage* image=[UIImage imageWithData:img_data];
+                btn.image = image;
+                
+            }
+            
+        }
+//        else if([control[@"type"] isEqualToString:@"Image"])
+//        {
+//            [self addImage:control destView:self.editControlView index:i];
+//            
+//        }
+//        else if([control[@"type"] isEqualToString:@"Label"])
+//        {
+//            [self addLabel:control destView:self.editControlView index:i];
+//            
+//        }
+//        else if([control[@"type"] isEqualToString:@"DatePicker"])
+//        {
+//            [self addDatePicker:control destView:self.editControlView index:i];
+//            
+//        }
+    }
+}
 #pragma mark add controls
 -(bool) checkActionCondition:(NSString*) condition
 {
@@ -143,11 +205,31 @@
     bool isdisable = [template[@"disable"] boolValue];
     
     tv.editable = !isdisable;
-    tv.text =template[@"value"];
+    NSString* text= template[@"value"];
+    if(text.length==0)
+        text=@" ";
+    tv.text =text;
+    
+    
+    
+    NSMutableAttributedString* attr_str= [tv.attributedText mutableCopy];
+    
+    NSMutableParagraphStyle *paragraphStyle = [[NSMutableParagraphStyle alloc]init];
+    paragraphStyle.lineHeightMultiple = 1.4;
+//    paragraphStyle.maximumLineHeight = 25.f;
+//    paragraphStyle.minimumLineHeight = 15.f;
+//    paragraphStyle.firstLineHeadIndent = 20.f;
+//    paragraphStyle.alignment = NSTextAlignmentJustified;
+    [attr_str addAttribute:NSParagraphStyleAttributeName value:paragraphStyle range:NSMakeRange(0,attr_str.length)];
+    
+    tv.attributedText=attr_str;
+    tv.text=@"";
     
     tv.tag = index+ CONTROL_BASE;
     
     
+    tv.scrollEnabled=false;
+    
     
     //UIColorFromARGB(0x4066ccff);
     
@@ -768,7 +850,7 @@
     
     NSLog(@"signature button clicked;");
     
-    
+    __weak __typeof(self)weakSelf = self;
     {
     
         long index = touchImageView.tag - CONTROL_BASE;
@@ -788,6 +870,7 @@
         signatureVC.title=@"Signatures";
         signatureVC.signatureData = self.signatureData;
         signatureVC.subType = control_json[@"name"];
+        signatureVC.can_fill= [control_json[@"can_fill"] boolValue];
         
 //        signatureVC.imageView = touchImageView;
         
@@ -807,15 +890,28 @@
                 touchImageView.image = image;
                 
                 long index = touchImageView.tag - CONTROL_BASE;
-                self.controlTemplate [[NSString stringWithFormat:@"control_%ld",index] ][@"value"] = file;
+                weakSelf.controlTemplate [[NSString stringWithFormat:@"control_%ld",index] ][@"value"] = file;
                 
             }
 
         };
-        signatureVC.blk_Fill =^(NSString* file)
+        signatureVC.blk_Fill =^(NSString* file,bool fillFullDoc)
         {
             
-            
+            if(weakSelf.blk_Fill)
+                weakSelf.blk_Fill(file,control_json[@"name"],fillFullDoc);
+//            for(int j=0;j<[self.controlTemplate[@"count"] intValue];j++)
+//            {
+//                NSMutableDictionary* dest =self.controlTemplate[[NSString stringWithFormat:@"control_%d",j]];
+//                NSString* type = dest[@"type"];
+//                if(![type isEqualToString:@"Signature"])
+//                    continue;
+//                if([dest[@"name"] isEqualToString:control_json[@"name"]])
+//                {
+//                    dest[@"value"]=file;
+//                }
+//            }
+            [weakSelf refreshControl];
             
 //            //            NSString* file_name=[file lastPathComponent];
 //            

+ 112 - 111
Ants Contract/common/RootViewController.m

@@ -34,83 +34,84 @@
     // Do any additional setup after loading the view, typically from a nib.
 }
 
--(void) leak_debug
-{
-    
-    
-    CGPDFDocumentRef document = [PDFUtils OpenPDF:@"GEIC - Home Improvement Contract 2017.pdf"];
-    //    self.total_page = CGPDFDocumentGetNumberOfPages (self.document);
-    
-    NSMutableDictionary * controlTemplate = [self templateInit:[PDFUtils loadControl:@"GEIC - Home Improvement Contract 2017.json"]];
-    
-    
-    NSString* pdffile = [PDFUtils SavePDF:controlTemplate source:document window_rect:CGRectMake(0, 0, 768, 960)];
-    
-    CGPDFDocumentRelease(document);
-    
-    //    CFRelease(document);
-    
-    NSString* zipfile=[ACNetwork prepareUploadFile:pdffile json:controlTemplate];
-    
-    [self previewPDF:pdffile];
-    
-    
-    
-    
-    
-    
-}
--(NSMutableDictionary*) templateInit:(NSMutableDictionary*) template
-{
-    
-    
-    NSString* temp = NSTemporaryDirectory();
-    NSString* filename =[NSString stringWithFormat:@"%@.png", [[NSUUID UUID] UUIDString]];
-    NSString* qrpath=[temp stringByAppendingPathComponent:filename];
-    UIImage* qrimg=[RAUtils generateBarCode:@"leak test" width:300 height:44];//[QRCodeGenerator qrImageForString:order_code imageSize:240];
-    bool bwrite=[UIImagePNGRepresentation(qrimg)writeToFile: qrpath    atomically:YES];
-    
-    
-    
-    for(int i=0;i<[template[@"count"] intValue];i++)
-    {
-        NSMutableDictionary* page =template[[NSString stringWithFormat:@"page_%d",i]];
-        for(int j=0;j<[page[@"count"] intValue];j++)
-        {
-            NSMutableDictionary* control =page[[NSString stringWithFormat:@"control_%d",j]];
-            NSString* type = control[@"type"];
-            NSString* field =control[@"field"];
-            if([type isEqualToString:@"Label"])
-            {
-                if([field isEqualToString:@"doc_number"])
-                {
-                    control[@"value"]= @"leak test";
-                }
-            }
-            else if([type isEqualToString:@"Image"])
-            {
-                NSString* name =control[@"name"];
-                if([name isEqualToString:@"BarCode"])
-                {
-                    control[@"value"]= qrpath;
-                }
-            }
-            else if([type isEqualToString:@"DatePicker"])
-            {
-                NSString* name =control[@"aname"];
-                if([name isEqualToString:@"Today's Date"])
-                {
-                    NSDateFormatter * formatter = [[NSDateFormatter alloc]init];
-                    [formatter setDateFormat:@"MM/dd/yyyy"];
-                    NSString* date = [formatter stringFromDate:[NSDate date]] ;
-                    
-                    control[@"value"]= date;
-                }
-            }
-        }
-    }
-    return template;
-}
+//-(void) leak_debug
+//{
+//    
+//    
+//    CGPDFDocumentRef document = [PDFUtils OpenPDF:@"GEIC - Home Improvement Contract 2017.pdf"];
+//    //    self.total_page = CGPDFDocumentGetNumberOfPages (self.document);
+//    
+//    NSMutableDictionary * controlTemplate = [self templateInit:[PDFUtils loadControl:@"GEIC - Home Improvement Contract 2017.json"]];
+//    
+//    
+//    NSString* pdffile = [PDFUtils SavePDF:controlTemplate source:document window_rect:CGRectMake(0, 0, 768, 960)];
+//    
+//    CGPDFDocumentRelease(document);
+//    
+//    //    CFRelease(document);
+//    
+//    NSString* zipfile=[ACNetwork prepareUploadFile:pdffile json:controlTemplate];
+//    
+//    [self previewPDF:pdffile];
+//    
+//    
+//    
+//    
+//    
+//    
+//}
+//-(NSMutableDictionary*) templateInit:(NSMutableDictionary*) template
+//{
+//    
+//    
+//    NSString* temp = NSTemporaryDirectory();
+//    NSString* filename =[NSString stringWithFormat:@"%@.png", [[NSUUID UUID] UUIDString]];
+//    NSString* qrpath=[temp stringByAppendingPathComponent:filename];
+//    UIImage* qrimg=[RAUtils generateBarCode:@"leak test" width:300 height:44];//[QRCodeGenerator qrImageForString:order_code imageSize:240];
+//    bool bwrite=[UIImagePNGRepresentation(qrimg)writeToFile: qrpath    atomically:YES];
+//    
+//    
+//    
+//    for(int i=0;i<[template[@"count"] intValue];i++)
+//    {
+//        NSMutableDictionary* page =template[[NSString stringWithFormat:@"page_%d",i]];
+//        for(int j=0;j<[page[@"count"] intValue];j++)
+//        {
+//            NSMutableDictionary* control =page[[NSString stringWithFormat:@"control_%d",j]];
+//            NSString* type = control[@"type"];
+//            NSString* field =control[@"field"];
+//            if([type isEqualToString:@"Label"])
+//            {
+//                if([field isEqualToString:@"doc_number"])
+//                {
+//                    control[@"value"]= @"leak test";
+//                }
+//            }
+//            else if([type isEqualToString:@"Image"])
+//            {
+//                NSString* name =control[@"name"];
+//                if([name isEqualToString:@"BarCode"])
+//                {
+//                    if(bwrite)
+//                        control[@"value"]= qrpath;
+//                }
+//            }
+//            else if([type isEqualToString:@"DatePicker"])
+//            {
+//                NSString* name =control[@"aname"];
+//                if([name isEqualToString:@"Today's Date"])
+//                {
+//                    NSDateFormatter * formatter = [[NSDateFormatter alloc]init];
+//                    [formatter setDateFormat:@"MM/dd/yyyy"];
+//                    NSString* date = [formatter stringFromDate:[NSDate date]] ;
+//                    
+//                    control[@"value"]= date;
+//                }
+//            }
+//        }
+//    }
+//    return template;
+//}
 
 - (IBAction)onNewCustomerClick:(id)sender {
 //    [self leak_debug];
@@ -308,10 +309,10 @@
     NSString* subject;
     //                    if (company.length==0) {
     
-    NSString* cur_time =[RAUtils current_date];
+//    NSString* cur_time =[RAUtils current_date];
     subject =name;//[NSString stringWithFormat:@"NPD Product List %@",cur_time];
     
-    AppDelegate *appDelegate = (AppDelegate*)[[UIApplication sharedApplication] delegate];
+//    AppDelegate *appDelegate = (AppDelegate*)[[UIApplication sharedApplication] delegate];
     //    NSString* customer_email=    [appDelegate.customerInfo valueForKey:@"customer_email"];
     
     
@@ -335,38 +336,38 @@
     ViewController.hidenavi = false;
     [self.navigationController pushViewController:ViewController animated:YES];
 }
-- (IBAction)OnHICClick:(id)sender {
-    
-    
-    __weak typeof(self) weakSelf = self;
-    
-    
-    DocumentPageViewController* dvc = [self.storyboard instantiateViewControllerWithIdentifier:@"DocumentPageViewController" ];
-    
-    dvc.templateName = @"GEIC - Home Improvement Contract 2016.json";
-    dvc.pdfName = @"GEIC - Home Improvement Contract 2017.pdf";
-    
-    dvc.OnSave=^(NSString* file)
-    {
-     //   [weakSelf previewPDF:file];
-    };
-    
-    [self.navigationController pushViewController:dvc animated:true];
-}
-- (IBAction)OnSRLClick:(id)sender {
-    
-    DocumentPageViewController* dvc = [self.storyboard instantiateViewControllerWithIdentifier:@"DocumentPageViewController" ];
-    
-    dvc.templateName = @"SUBCONTRACTORS REFERRAL LIST.json";
-    dvc.pdfName = @"SUBCONTRACTORS REFERRAL LIST.pdf";
-    dvc.OnSave=^(NSString* file)
-    {
-        
-        //[self previewPDF:file];
-    };
-    
-    [self.navigationController pushViewController:dvc animated:true];
-}
+//- (IBAction)OnHICClick:(id)sender {
+//    
+//    
+//    __weak typeof(self) weakSelf = self;
+//    
+//    
+//    DocumentPageViewController* dvc = [self.storyboard instantiateViewControllerWithIdentifier:@"DocumentPageViewController" ];
+//    
+//    dvc.templateName = @"GEIC - Home Improvement Contract 2016.json";
+//    dvc.pdfName = @"GEIC - Home Improvement Contract 2017.pdf";
+//    
+//    dvc.OnSave=^(NSString* file)
+//    {
+//     //   [weakSelf previewPDF:file];
+//    };
+//    
+//    [self.navigationController pushViewController:dvc animated:true];
+//}
+//- (IBAction)OnSRLClick:(id)sender {
+//    
+//    DocumentPageViewController* dvc = [self.storyboard instantiateViewControllerWithIdentifier:@"DocumentPageViewController" ];
+//    
+//    dvc.templateName = @"SUBCONTRACTORS REFERRAL LIST.json";
+//    dvc.pdfName = @"SUBCONTRACTORS REFERRAL LIST.pdf";
+//    dvc.OnSave=^(NSString* file)
+//    {
+//        
+//        //[self previewPDF:file];
+//    };
+//    
+//    [self.navigationController pushViewController:dvc animated:true];
+//}
 
 
 

+ 2 - 2
Ants Contract/common/SignatureListViewController.h

@@ -16,9 +16,9 @@
 @property (strong, nonatomic) NSString* subType;
 
 @property (strong, nonatomic) IBOutlet UIBarButtonItem *bbAdd;
-
+@property bool can_fill;
 //@property (strong, nonatomic)  UIImageView *imageView;
 @property (nonatomic , copy) void (^blk_Add)();
 @property (nonatomic , copy) void (^blk_Select)(NSString* file);
-@property (nonatomic , copy) void (^blk_Fill)(NSString* file);
+@property (nonatomic , copy) void (^blk_Fill)(NSString* file, bool fillFullDoc);
 @end

+ 68 - 5
Ants Contract/common/SignatureListViewController.m

@@ -43,17 +43,77 @@
 }
 - (IBAction)onFillClick:(id)sender {
     
-    UITableViewCell* cell = ((UIView*)sender).superview.superview;
+        __weak __typeof(self)weakSelf = self;
+    
+    UITableViewCell* cell = (UITableViewCell*)((UIView*)sender).superview.superview;
     
         NSIndexPath *   indexPath = [self.tableView indexPathForCell:cell];
     
     
     NSDictionary * item_json = self.signatureData[self.subType][[NSString stringWithFormat:@"item_%ld",(long)indexPath.section]];
     
+    
+    NSString* title = [NSString stringWithFormat:@"Fill Document %@ with %@ %ld?",self.subType,self.subType,(long)indexPath.section];
+    UIAlertController *alertControl = [UIAlertController alertControllerWithTitle:title message:nil preferredStyle:UIAlertControllerStyleAlert];
+    //block代码块取代了delegate
+    
+    
+//    [alertControl addTextFieldWithConfigurationHandler:^(UITextField *textField) {
+//        textField.text = self.save_name;
+//        
+//        
+//    }];
+    
+    UIAlertAction *actionOne = [UIAlertAction actionWithTitle:@"Fill" style:UIAlertActionStyleDefault handler:^(UIAlertAction *action) {
+        
+        [weakSelf dismissViewControllerAnimated:false completion:^{
+            
+            
+            if(weakSelf.blk_Fill)
+                weakSelf.blk_Fill(item_json[@"file"],true);
+            
+        }];
+    }];
+//    UIAlertAction *alerttwo = [UIAlertAction actionWithTitle:@"Yes" style:UIAlertActionStyleDefault handler:^(UIAlertAction *action) {
+//        
+//        
+//
+//        [self dismissViewControllerAnimated:false completion:^{
+//            
+//            
+//            if(self.blk_Fill)
+//                self.blk_Fill(item_json[@"file"],false);
+//            
+//        }];
+////        DebugLog(@"Cancel");
+//    }];
+    UIAlertAction *alertthree = [UIAlertAction actionWithTitle:@"Cancel" style:UIAlertActionStyleCancel handler:^(UIAlertAction *action) {
+//        DebugLog(@"Cancel");
+    }];
+    [alertControl addAction:actionOne];
+//    [alertControl addAction:alerttwo];
+    [alertControl addAction:alertthree];
+    
+    //UIAlertControllerStyle类型为UIAlertControllerStyleAlert可以添加addTextFieldWithConfigurationHandler:^(UITextField *textField)
+    
+    
+    [self presentViewController:alertControl animated:YES completion:nil];
+
+    
+    
     //        UIImage* img = [UIImage imageWithContentsOfFile:item_json[@"file"]];
     
-    if(self.blk_Fill)
-        self.blk_Fill(item_json[@"file"]);
+//    __weak __typeof(self)weakSelf = self;
+//    [self dismissViewControllerAnimated:false completion:^{
+//        
+//        
+//        if(weakSelf.blk_Fill)
+//            weakSelf.blk_Fill(item_json[@"file"]);
+//        
+//    }];
+    
+    
+
 }
 
 /*
@@ -244,8 +304,11 @@
     UIImage* img = [UIImage imageWithContentsOfFile:item_json[@"file"]];
     
     cell.signatureImageView.image = img;
-//    
-//    
+
+    cell.btnFill.hidden = !self.can_fill;
+
+//
+//
 //    cell.webview.tag = indexPath.section;
 //    
 //    cell.webview.delegate = self;

+ 1 - 0
Ants Contract/common/SignatureTableViewCell.h

@@ -10,5 +10,6 @@
 
 @interface SignatureTableViewCell : UITableViewCell
 @property (strong, nonatomic) IBOutlet UIImageView *signatureImageView;
+@property (strong, nonatomic) IBOutlet UIButton *btnFill;
 
 @end