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 = "529471692.81874"
+            timestampString = "530777756.084739"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "196"
@@ -438,7 +438,7 @@
       <BreakpointProxy
          BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
          <BreakpointContent
-            shouldBeEnabled = "Yes"
+            shouldBeEnabled = "No"
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/DocumentListViewController.m"
@@ -474,7 +474,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/PageViewController.m"
-            timestampString = "529481307.083967"
+            timestampString = "530777756.085214"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "957"
@@ -483,5 +483,37 @@
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "common/PageViewController.m"
+            timestampString = "530777756.08585"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "815"
+            endingLineNumber = "815"
+            landmarkName = "-addImage:destView:index:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "common/PageViewController.m"
+            timestampString = "530777756.086324"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "293"
+            endingLineNumber = "293"
+            landmarkName = "-initControl"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
    </Breakpoints>
 </Bucket>

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

@@ -15,7 +15,7 @@
             "required": true
         },
         "control_1": {
-            "width": 225,
+            "width": 450,
             "tv_vmargin": 0.4,
             "aname": "Invoice Number",
             "type": "TextView",

Ants Contract/common/DocumentPageViewController.m

@@ -144,8 +144,9 @@
                     NSDateFormatter * formatter = [[NSDateFormatter alloc]init];
                     [formatter setDateFormat:@"MM/dd/yyyy"];
                     NSString* date = [formatter stringFromDate:[NSDate date]] ;
-                    
-                    control[@"value"]= date;
+//                    NSString* cval = control[@"value"];
+//                    if(cval==nil)
+                        control[@"value"]= date;
                 }
             }
             else if([type isEqualToString:@"Signature"]&&disable)
@@ -158,7 +159,11 @@
                 NSString* name =control[@"aname"];
                 if([name isEqualToString:@"Agent Name"]||[name isEqualToString:@"Sales Person"])
                 {
-                    control[@"value"]= appDelegate.agentName;
+//                    NSString* cval = control[@"value"];
+//                    if(cval==nil)
+                        control[@"value"]= appDelegate.agentName;
+                
+                    
                 }
                 
                 
@@ -195,7 +200,10 @@
     
     self.document = [PDFUtils OpenPDF:self.pdfPath];
     self.total_page = CGPDFDocumentGetNumberOfPages (self.document);
-    self.controlTemplate = [self templateInit:[PDFUtils loadControl:self.templatePath]];
+    if(self.action==PDFEditActionNew)
+        self.controlTemplate = [self templateInit:[PDFUtils loadControl:self.templatePath]];
+    else
+        self.controlTemplate =[PDFUtils loadControl:self.templatePath];
     
     
 //    self.title = [NSString stringWithFormat:@"%@ [%d/%ld]", self.docment_id,1, self.total_page ];

Ants Contract/common/PageViewController.m

@@ -834,7 +834,7 @@ typedef enum {
     }
     
     
-    btn.backgroundColor = UIColorFromRGB(SIG_BG);
+    btn.backgroundColor = UIColor.clearColor;//UIColorFromRGB(SIG_BG);
     
     if(DEBUG_PDFSIG)
     {