Granite Expo esign

更新合同模板

Ants Contract/AntsContract.xcworkspace/xcuserdata/Ray.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -346,7 +346,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/DocumentPageViewController.m"
-            timestampString = "528448173.400988"
+            timestampString = "529297695.180668"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "196"
@@ -378,7 +378,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/RootViewController.m"
-            timestampString = "528449109.475176"
+            timestampString = "529308304.933883"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "285"
@@ -390,11 +390,11 @@
       <BreakpointProxy
          BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
          <BreakpointContent
-            shouldBeEnabled = "Yes"
+            shouldBeEnabled = "No"
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/RootViewController.m"
-            timestampString = "528449109.475257"
+            timestampString = "529308304.934552"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "320"
@@ -410,11 +410,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/RootViewController.m"
-            timestampString = "528449109.475312"
+            timestampString = "529308304.935188"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "348"
-            endingLineNumber = "348"
+            startingLineNumber = "349"
+            endingLineNumber = "349"
             landmarkName = "-onNewCustomerClick:"
             landmarkType = "7">
          </BreakpointContent>
@@ -422,15 +422,15 @@
       <BreakpointProxy
          BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
          <BreakpointContent
-            shouldBeEnabled = "Yes"
+            shouldBeEnabled = "No"
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/RootViewController.m"
-            timestampString = "528449109.475364"
+            timestampString = "529308304.936171"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "714"
-            endingLineNumber = "714"
+            startingLineNumber = "715"
+            endingLineNumber = "715"
             landmarkName = "-debugBtnClick:"
             landmarkType = "7">
          </BreakpointContent>

Ants Contract/Granite Expo eSign/Granite Expo eSign.xcodeproj/project.pbxproj

@@ -13,7 +13,6 @@
 		7115D4561E1606F700EF4E4C /* GEContractFilterViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 7115D4551E1606F700EF4E4C /* GEContractFilterViewController.m */; };
 		7115D4591E162BA800EF4E4C /* DatePickerViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 7115D4581E162BA800EF4E4C /* DatePickerViewController.m */; };
 		7115D45F1E16326C00EF4E4C /* CommonEditor.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 7115D45E1E16326C00EF4E4C /* CommonEditor.storyboard */; };
-		7118DEA71F7F7CCA005192B4 /* GEIC - Home Improvement Contract 2017 Desktop_1.pdf in Resources */ = {isa = PBXBuildFile; fileRef = 7118DEA61F7F7C31005192B4 /* GEIC - Home Improvement Contract 2017 Desktop_1.pdf */; };
 		7128C2401E124F4500FF635B /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 7128C23F1E124F4500FF635B /* main.m */; };
 		7128C24B1E124F4500FF635B /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 7128C24A1E124F4500FF635B /* Assets.xcassets */; };
 		7128C26F1E124FF200FF635B /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 7128C2671E124FF200FF635B /* Main.storyboard */; };
@@ -60,6 +59,7 @@
 		7128C3561E12548C00FF635B /* SignatureTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 7128C3511E12548C00FF635B /* SignatureTableViewCell.m */; };
 		713B97B11F79E0CB002B86BF /* dbgPageVC.m in Sources */ = {isa = PBXBuildFile; fileRef = 713B97B01F79E0CA002B86BF /* dbgPageVC.m */; };
 		713B97B31F79E649002B86BF /* RAPDFPage.m in Sources */ = {isa = PBXBuildFile; fileRef = 713B97B21F79E649002B86BF /* RAPDFPage.m */; };
+		713B9AE71F8C9446002F8E8B /* GEIC - Home Improvement Contract 2017 Desktop_2.pdf in Resources */ = {isa = PBXBuildFile; fileRef = 713B9AE61F8C941B002F8E8B /* GEIC - Home Improvement Contract 2017 Desktop_2.pdf */; };
 		714A9AEC1E9CA92000371995 /* PendingDocumentsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 714A9AEB1E9CA92000371995 /* PendingDocumentsViewController.m */; };
 		714A9AEF1E9CADA100371995 /* PendingDocumentsTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 714A9AEE1E9CADA100371995 /* PendingDocumentsTableViewCell.m */; };
 		714B37041E70F2BF00E99B90 /* ScannerControllerView.m in Sources */ = {isa = PBXBuildFile; fileRef = 714B36FF1E70F2BF00E99B90 /* ScannerControllerView.m */; };
@@ -91,7 +91,6 @@
 		7115D4571E162BA800EF4E4C /* DatePickerViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DatePickerViewController.h; path = "../../../RedAnt ERP Mobile/common/CommonEditor/DatePickerViewController.h"; sourceTree = "<group>"; };
 		7115D4581E162BA800EF4E4C /* DatePickerViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = DatePickerViewController.m; path = "../../../RedAnt ERP Mobile/common/CommonEditor/DatePickerViewController.m"; sourceTree = "<group>"; };
 		7115D45E1E16326C00EF4E4C /* CommonEditor.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = CommonEditor.storyboard; path = "../../../RedAnt ERP Mobile/common/CommonEditor/CommonEditor.storyboard"; sourceTree = "<group>"; };
-		7118DEA61F7F7C31005192B4 /* GEIC - Home Improvement Contract 2017 Desktop_1.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; path = "GEIC - Home Improvement Contract 2017 Desktop_1.pdf"; sourceTree = "<group>"; };
 		7128C23B1E124F4500FF635B /* Granite Expo eSign.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Granite Expo eSign.app"; sourceTree = BUILT_PRODUCTS_DIR; };
 		7128C23F1E124F4500FF635B /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
 		7128C24A1E124F4500FF635B /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
@@ -182,6 +181,7 @@
 		713B97AF1F79E0CA002B86BF /* dbgPageVC.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = dbgPageVC.h; sourceTree = "<group>"; };
 		713B97B01F79E0CA002B86BF /* dbgPageVC.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = dbgPageVC.m; sourceTree = "<group>"; };
 		713B97B21F79E649002B86BF /* RAPDFPage.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = RAPDFPage.m; path = "../../../RedAnt ERP Mobile/common/pdfCreator/RAPDFPage.m"; sourceTree = "<group>"; };
+		713B9AE61F8C941B002F8E8B /* GEIC - Home Improvement Contract 2017 Desktop_2.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; path = "GEIC - Home Improvement Contract 2017 Desktop_2.pdf"; sourceTree = "<group>"; };
 		714A9AEA1E9CA91F00371995 /* PendingDocumentsViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PendingDocumentsViewController.h; path = ../../common/PendingDocumentsViewController.h; sourceTree = "<group>"; };
 		714A9AEB1E9CA92000371995 /* PendingDocumentsViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = PendingDocumentsViewController.m; path = ../../common/PendingDocumentsViewController.m; sourceTree = "<group>"; };
 		714A9AED1E9CADA100371995 /* PendingDocumentsTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PendingDocumentsTableViewCell.h; path = ../../common/PendingDocumentsTableViewCell.h; sourceTree = "<group>"; };
@@ -447,9 +447,9 @@
 			isa = PBXGroup;
 			children = (
 				7188C2881E8E435500938FFC /* GEIC - Home Improvement Contract 2017 Update.json */,
+				713B9AE61F8C941B002F8E8B /* GEIC - Home Improvement Contract 2017 Desktop_2.pdf */,
 				71D5734E1F723260008179ED /* GEIC - Home Improvement Contract 2017 Desktop.json */,
 				714B870A1E24CAE200A40D18 /* debug.json */,
-				7118DEA61F7F7C31005192B4 /* GEIC - Home Improvement Contract 2017 Desktop_1.pdf */,
 			);
 			name = "pdf resource";
 			sourceTree = "<group>";
@@ -535,7 +535,7 @@
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				7118DEA71F7F7CCA005192B4 /* GEIC - Home Improvement Contract 2017 Desktop_1.pdf in Resources */,
+				713B9AE71F8C9446002F8E8B /* GEIC - Home Improvement Contract 2017 Desktop_2.pdf in Resources */,
 				71D5734F1F723260008179ED /* GEIC - Home Improvement Contract 2017 Desktop.json in Resources */,
 				7128C24B1E124F4500FF635B /* Assets.xcassets in Resources */,
 				7128C26F1E124FF200FF635B /* Main.storyboard in Resources */,

Ants Contract/Granite Expo eSign/Granite Expo eSign/Info.plist

@@ -34,7 +34,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.35</string>
+	<string>1.36</string>
 	<key>CFBundleVersion</key>
 	<string>34075</string>
 	<key>ITSAppUsesNonExemptEncryption</key>

Ants Contract/common/RootViewController.m

@@ -282,7 +282,7 @@
         
         //                dvc.templateName = @"debug.json";
         dvc.templatePath = [[NSBundle mainBundle] pathForResource:@"GEIC - Home Improvement Contract 2017 Desktop.json" ofType:nil];
-        dvc.pdfPath = [[NSBundle mainBundle] pathForResource:@"GEIC - Home Improvement Contract 2017 Desktop_1.pdf" ofType:nil];
+        dvc.pdfPath = [[NSBundle mainBundle] pathForResource:@"GEIC - Home Improvement Contract 2017 Desktop_2.pdf" ofType:nil];
 
         dvc.docment_id =  offline_docnumber;
         dvc.OnSave=^(NSString* file, NSString* subject)
@@ -317,7 +317,8 @@
                     
                     //                dvc.templateName = @"debug.json";
                     dvc.templatePath = [[NSBundle mainBundle] pathForResource:@"GEIC - Home Improvement Contract 2017 Desktop.json" ofType:nil];
-                    dvc.pdfPath = [[NSBundle mainBundle] pathForResource:@"GEIC - Home Improvement Contract 2017 Desktop_1.pdf" ofType:nil];                    dvc.docment_id = json[@"doc_number"];
+                    dvc.pdfPath = [[NSBundle mainBundle] pathForResource:@"GEIC - Home Improvement Contract 2017 Desktop_2.pdf" ofType:nil];
+                    dvc.docment_id = json[@"doc_number"];
                     dvc.OnSave=^(NSString* file, NSString* subject)
                     {
                         
@@ -345,7 +346,7 @@
                         
                         //                dvc.templateName = @"debug.json";
                         dvc.templatePath = [[NSBundle mainBundle] pathForResource:@"GEIC - Home Improvement Contract 2017 Desktop.json" ofType:nil];
-                        dvc.pdfPath = [[NSBundle mainBundle] pathForResource:@"GEIC - Home Improvement Contract 2017 Desktop_1.pdf" ofType:nil];
+                        dvc.pdfPath = [[NSBundle mainBundle] pathForResource:@"GEIC - Home Improvement Contract 2017 Desktop_2.pdf" ofType:nil];
 
                         dvc.docment_id =  offline_docnumber;
                         dvc.OnSave=^(NSString* file, NSString* subject)
@@ -711,7 +712,7 @@
     DocumentTemplateViewController* dvc = [self.storyboard instantiateViewControllerWithIdentifier:@"DocumentTemplateViewController" ];
     
     dvc.templatePath = [[NSBundle mainBundle] pathForResource:@"GEIC - Home Improvement Contract 2017 Desktop.json" ofType:nil];
-    dvc.pdfPath = [[NSBundle mainBundle] pathForResource:@"GEIC - Home Improvement Contract 2017 Desktop_1.pdf" ofType:nil];
+    dvc.pdfPath = [[NSBundle mainBundle] pathForResource:@"GEIC - Home Improvement Contract 2017 Desktop_2.pdf" ofType:nil];
     
     dvc.docment_id =  @"debug_template";
     dvc.OnSave=^(NSString* file, NSString* subject)