eSign

更新合同模板
修复编辑状态document number 显示位置不对的问题。

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

@@ -138,11 +138,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/PageViewController.m"
-            timestampString = "514697931.312841"
+            timestampString = "516163779.68652"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "1061"
-            endingLineNumber = "1061"
+            startingLineNumber = "1071"
+            endingLineNumber = "1071"
             landmarkName = "-CheckButtonClicked:"
             landmarkType = "7">
          </BreakpointContent>
@@ -154,11 +154,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/PageViewController.m"
-            timestampString = "514697931.312841"
+            timestampString = "516163779.68652"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "1064"
-            endingLineNumber = "1064"
+            startingLineNumber = "1074"
+            endingLineNumber = "1074"
             landmarkName = "-CheckButtonClicked:"
             landmarkType = "7">
          </BreakpointContent>
@@ -170,11 +170,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/PageViewController.m"
-            timestampString = "514697931.312841"
+            timestampString = "516163779.68652"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "936"
-            endingLineNumber = "936"
+            startingLineNumber = "946"
+            endingLineNumber = "946"
             landmarkName = "-CheckButtonClicked:"
             landmarkType = "7">
          </BreakpointContent>
@@ -186,11 +186,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/PageViewController.m"
-            timestampString = "514697931.312841"
+            timestampString = "516163779.68652"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "974"
-            endingLineNumber = "974"
+            startingLineNumber = "984"
+            endingLineNumber = "984"
             landmarkName = "-CheckButtonClicked:"
             landmarkType = "7">
          </BreakpointContent>
@@ -202,11 +202,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/PageViewController.m"
-            timestampString = "514697931.312841"
+            timestampString = "516163779.68652"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "978"
-            endingLineNumber = "978"
+            startingLineNumber = "988"
+            endingLineNumber = "988"
             landmarkName = "-CheckButtonClicked:"
             landmarkType = "7">
          </BreakpointContent>
@@ -298,11 +298,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/PageViewController.m"
-            timestampString = "514714314.588883"
+            timestampString = "516163779.68652"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "942"
-            endingLineNumber = "942"
+            startingLineNumber = "952"
+            endingLineNumber = "952"
             landmarkName = "-CheckButtonClicked:"
             landmarkType = "7">
          </BreakpointContent>
@@ -314,11 +314,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/PageViewController.m"
-            timestampString = "514715027.926162"
+            timestampString = "516163779.68652"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "1124"
-            endingLineNumber = "1124"
+            startingLineNumber = "1134"
+            endingLineNumber = "1134"
             landmarkName = "-CheckButtonClicked:"
             landmarkType = "7">
          </BreakpointContent>

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

@@ -68,11 +68,11 @@
 		714B870B1E24CAE300A40D18 /* debug.json in Resources */ = {isa = PBXBuildFile; fileRef = 714B870A1E24CAE200A40D18 /* debug.json */; };
 		717243441E1CCCEC00800678 /* CustomIOSAlertView.m in Sources */ = {isa = PBXBuildFile; fileRef = 717243431E1CCCEC00800678 /* CustomIOSAlertView.m */; };
 		7188C2891E8E435500938FFC /* GEIC - Home Improvement Contract 2017 Update.json in Resources */ = {isa = PBXBuildFile; fileRef = 7188C2881E8E435500938FFC /* GEIC - Home Improvement Contract 2017 Update.json */; };
-		7188C28B1E8E437900938FFC /* GEIC - Home Improvement Contract 2017 Update.pdf in Resources */ = {isa = PBXBuildFile; fileRef = 7188C28A1E8E437900938FFC /* GEIC - Home Improvement Contract 2017 Update.pdf */; };
 		71B152EF1E66C87F00D2E5EC /* AddExtDocumentViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 71B152EE1E66C87F00D2E5EC /* AddExtDocumentViewController.m */; };
 		71BBFC371E6419D4008668A7 /* ExtDocumentsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 71BBFC361E6419D4008668A7 /* ExtDocumentsViewController.m */; };
 		71BBFC3A1E651CC4008668A7 /* DocnotesViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 71BBFC391E651CC4008668A7 /* DocnotesViewController.m */; };
 		71F8D0341EC057A2002003DB /* RANetworkTaskDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 71F8D0331EC057A2002003DB /* RANetworkTaskDelegate.m */; };
+		71F8D0E41EC4066D002003DB /* GEIC - Home Improvement Contract 2017 Update_2.pdf in Resources */ = {isa = PBXBuildFile; fileRef = 71F8D0E31EC4066D002003DB /* GEIC - Home Improvement Contract 2017 Update_2.pdf */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
@@ -192,7 +192,6 @@
 		717243421E1CCCEC00800678 /* CustomIOSAlertView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CustomIOSAlertView.h; path = "../../../RedAnt ERP Mobile/common/customUI/CustomIOSAlertView.h"; sourceTree = "<group>"; };
 		717243431E1CCCEC00800678 /* CustomIOSAlertView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = CustomIOSAlertView.m; path = "../../../RedAnt ERP Mobile/common/customUI/CustomIOSAlertView.m"; sourceTree = "<group>"; };
 		7188C2881E8E435500938FFC /* GEIC - Home Improvement Contract 2017 Update.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; name = "GEIC - Home Improvement Contract 2017 Update.json"; path = "Granite Expo eSign/GEIC - Home Improvement Contract 2017 Update.json"; sourceTree = "<group>"; };
-		7188C28A1E8E437900938FFC /* GEIC - Home Improvement Contract 2017 Update.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; name = "GEIC - Home Improvement Contract 2017 Update.pdf"; path = "Granite Expo eSign/GEIC - Home Improvement Contract 2017 Update.pdf"; sourceTree = "<group>"; };
 		71B152ED1E66C87F00D2E5EC /* AddExtDocumentViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AddExtDocumentViewController.h; path = ../../common/AddExtDocumentViewController.h; sourceTree = "<group>"; };
 		71B152EE1E66C87F00D2E5EC /* AddExtDocumentViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AddExtDocumentViewController.m; path = ../../common/AddExtDocumentViewController.m; sourceTree = "<group>"; };
 		71BBFC351E6419D4008668A7 /* ExtDocumentsViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ExtDocumentsViewController.h; path = ../../common/ExtDocumentsViewController.h; sourceTree = "<group>"; };
@@ -201,6 +200,7 @@
 		71BBFC391E651CC4008668A7 /* DocnotesViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = DocnotesViewController.m; path = ../../common/DocnotesViewController.m; sourceTree = "<group>"; };
 		71F8D0321EC057A2002003DB /* RANetworkTaskDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RANetworkTaskDelegate.h; path = ../../../common/upload/RANetworkTaskDelegate.h; sourceTree = "<group>"; };
 		71F8D0331EC057A2002003DB /* RANetworkTaskDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = RANetworkTaskDelegate.m; path = ../../../common/upload/RANetworkTaskDelegate.m; sourceTree = "<group>"; };
+		71F8D0E31EC4066D002003DB /* GEIC - Home Improvement Contract 2017 Update_2.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; path = "GEIC - Home Improvement Contract 2017 Update_2.pdf"; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -431,7 +431,7 @@
 			children = (
 				7188C2881E8E435500938FFC /* GEIC - Home Improvement Contract 2017 Update.json */,
 				714B870A1E24CAE200A40D18 /* debug.json */,
-				7188C28A1E8E437900938FFC /* GEIC - Home Improvement Contract 2017 Update.pdf */,
+				71F8D0E31EC4066D002003DB /* GEIC - Home Improvement Contract 2017 Update_2.pdf */,
 			);
 			name = "pdf resource";
 			sourceTree = "<group>";
@@ -519,9 +519,9 @@
 			files = (
 				7128C24B1E124F4500FF635B /* Assets.xcassets in Resources */,
 				7128C26F1E124FF200FF635B /* Main.storyboard in Resources */,
-				7188C28B1E8E437900938FFC /* GEIC - Home Improvement Contract 2017 Update.pdf in Resources */,
 				7128C2701E124FF200FF635B /* LaunchScreen.storyboard in Resources */,
 				7188C2891E8E435500938FFC /* GEIC - Home Improvement Contract 2017 Update.json in Resources */,
+				71F8D0E41EC4066D002003DB /* GEIC - Home Improvement Contract 2017 Update_2.pdf in Resources */,
 				7115D45F1E16326C00EF4E4C /* CommonEditor.storyboard in Resources */,
 				7128C27D1E12500B00FF635B /* signature.storyboard in Resources */,
 				7128C2E81E12511B00FF635B /* LICENSE in Resources */,

Ants Contract/common/PageViewController.m

@@ -601,6 +601,16 @@ typedef enum {
         fontsize=10;
     [label setFont:[UIFont systemFontOfSize:fontsize]];
     
+    NSString * alignment=template[@"textAlignment"];
+    
+    if([alignment.lowercaseString isEqualToString:@"center"])
+        label.textAlignment=NSTextAlignmentCenter;
+    else if([alignment.lowercaseString isEqualToString:@"left"])
+        label.textAlignment=NSTextAlignmentLeft;
+    else if([alignment.lowercaseString isEqualToString:@"right"])
+        label.textAlignment=NSTextAlignmentRight;
+       
+    
     label.text =template[@"value"];
     
     label.tag = index+ CONTROL_BASE;

Ants Contract/common/RootViewController.m

@@ -280,7 +280,7 @@
         
         //                dvc.templateName = @"debug.json";
         dvc.templatePath = [[NSBundle mainBundle] pathForResource:@"GEIC - Home Improvement Contract 2017 Update.json" ofType:nil];
-        dvc.pdfPath = [[NSBundle mainBundle] pathForResource:@"GEIC - Home Improvement Contract 2017 Update.pdf" ofType:nil];
+        dvc.pdfPath = [[NSBundle mainBundle] pathForResource:@"GEIC - Home Improvement Contract 2017 Update_2.pdf" ofType:nil];
 
         dvc.docment_id =  offline_docnumber;
         dvc.OnSave=^(NSString* file, NSString* subject)
@@ -315,7 +315,7 @@
                     
                     //                dvc.templateName = @"debug.json";
                     dvc.templatePath = [[NSBundle mainBundle] pathForResource:@"GEIC - Home Improvement Contract 2017 Update.json" ofType:nil];
-                    dvc.pdfPath = [[NSBundle mainBundle] pathForResource:@"GEIC - Home Improvement Contract 2017 Update.pdf" ofType:nil];                    dvc.docment_id = json[@"doc_number"];
+                    dvc.pdfPath = [[NSBundle mainBundle] pathForResource:@"GEIC - Home Improvement Contract 2017 Update_2.pdf" ofType:nil];                    dvc.docment_id = json[@"doc_number"];
                     dvc.OnSave=^(NSString* file, NSString* subject)
                     {
                         
@@ -343,7 +343,7 @@
                         
                         //                dvc.templateName = @"debug.json";
                         dvc.templatePath = [[NSBundle mainBundle] pathForResource:@"GEIC - Home Improvement Contract 2017 Update.json" ofType:nil];
-                        dvc.pdfPath = [[NSBundle mainBundle] pathForResource:@"GEIC - Home Improvement Contract 2017 Update.pdf" ofType:nil];
+                        dvc.pdfPath = [[NSBundle mainBundle] pathForResource:@"GEIC - Home Improvement Contract 2017 Update_2.pdf" ofType:nil];
 
                         dvc.docment_id =  offline_docnumber;
                         dvc.OnSave=^(NSString* file, NSString* subject)