eSign 20170419

1.30 测试版打包

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

@@ -102,7 +102,7 @@
       <BreakpointProxy
          BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
          <BreakpointContent
-            shouldBeEnabled = "Yes"
+            shouldBeEnabled = "No"
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/PageViewController.m"
@@ -115,5 +115,53 @@
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "common/DocumentListViewController.m"
+            timestampString = "514283514.514538"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "1092"
+            endingLineNumber = "1092"
+            landmarkName = "-tableView:editActionsForRowAtIndexPath:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "../RedAnt ERP Mobile/common/Functions/PDF+Web/PDFViewController.m"
+            timestampString = "514283024.735881"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "34"
+            endingLineNumber = "34"
+            landmarkName = "-viewDidLoad"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "../RedAnt ERP Mobile/common/Functions/PDF+Web/PDFViewController.m"
+            timestampString = "514283049.640152"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "192"
+            endingLineNumber = "192"
+            landmarkName = "-loadcontent"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
    </Breakpoints>
 </Bucket>

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

@@ -452,7 +452,7 @@
             "textAlignment":"center",
             "required": true,
             "pos_x": 523,
-            "pos_y": 920,
+            "pos_y": 917,
             "width": 104,
             "size": "8",
             "height": 11,
@@ -724,7 +724,7 @@
             "textAlignment":"center",
             "required": true,
             "pos_x": 523,
-            "pos_y": 920,
+            "pos_y": 917,
             "width": 104,
             "size": "8",
             "height": 11,
@@ -847,7 +847,7 @@
             "textAlignment":"center",
             "required": true,
             "pos_x": 523,
-            "pos_y": 920,
+            "pos_y": 917,
             "width": 104,
             "size": "8",
             "height": 11,
@@ -965,7 +965,7 @@
             "textAlignment":"center",
             "required": true,
             "pos_x": 523,
-            "pos_y": 920,
+            "pos_y": 917,
             "width": 104,
             "size": "8",
             "height": 11,
@@ -1026,7 +1026,7 @@
             "textAlignment":"center",
             "required": true,
             "pos_x": 523,
-            "pos_y": 920,
+            "pos_y": 917,
             "width": 104,
             "size": "8",
             "height": 11,

Ants Contract/common/DocumentListViewController.m

@@ -168,14 +168,14 @@
     }];
 }
 
--(void) previewPDF:(NSString*)url title:(NSString*)title subject:(NSString*)subject
+-(void) previewPDF:(NSString*)url title:(NSString*)title subject:(NSString*)subject islocal:(bool) islocalfile
 {
     NSString* name=@"";//[self.content_data[indexPath.row] valueForKey:@"tear_name"];
 //    NSString* url= file;//[self.content_data[indexPath.row] valueForKey:@"pdf_path"];
     
     
     
-    bool isLocalFile= false;//[self.content_data[indexPath.row] valueForKey:@"isLocalFile"];
+    bool isLocalFile= islocalfile;//[self.content_data[indexPath.row] valueForKey:@"isLocalFile"];
     
     PDFViewController *ViewController = [self.storyboard instantiateViewControllerWithIdentifier:@"PDFViewController"];
     ViewController.url = url;
@@ -915,7 +915,7 @@
     NSString* subject = [NSString stringWithFormat:@"%@ %@, %@ %@",item_json[@"doc_number"],item_json[@"customer_name"],item_json[@"signed_date"],item_json[@"signed_time"]];
 
     
-    [self previewPDF:pdf_url title:item_json[@"doc_number"] subject:subject];
+    [self previewPDF:pdf_url title:item_json[@"doc_number"] subject:subject islocal:false];
     
 
     
@@ -1053,6 +1053,8 @@
     
     
     UITableViewRowAction *modifyAction = [UITableViewRowAction rowActionWithStyle:UITableViewRowActionStyleDestructive title:@"   Modify        " handler:^(UITableViewRowAction *action, NSIndexPath *indexPath) {
+        
+        [tableView reloadRowsAtIndexPaths:@[indexPath]withRowAnimation:UITableViewRowAnimationMiddle];
          __weak typeof(self) weakSelf = self;
         DebugLog(@"modify click");
         
@@ -1087,7 +1089,7 @@
                 dvc.OnSave=^(NSString* file, NSString* subject)
                 {
                     
-                    [weakSelf previewPDF:file title:item_json[@"doc_number"] subject:subject];
+                    [weakSelf previewPDF:file title:item_json[@"doc_number"] subject:subject islocal:true];
                 };
                 
                 [self.navigationController pushViewController:dvc animated:true];

Ants Contract/common/DocumentPageViewController.m

@@ -163,13 +163,13 @@
     
     if(self.no_save|| self.hide_control)
     {
-        [self.navigationController popToRootViewControllerAnimated:false];
+        [self.navigationController popViewControllerAnimated:false];
         return;
     }
     UIAlertController *alertControl = [UIAlertController alertControllerWithTitle:@"Are you sure cancel customer? All your entered information will lost." message:nil preferredStyle:UIAlertControllerStyleAlert];
     
     UIAlertAction *alertthree = [UIAlertAction actionWithTitle:@"Yes" style:UIAlertActionStyleDestructive handler:^(UIAlertAction *action) {
-        [self.navigationController popToRootViewControllerAnimated:false];
+        [self.navigationController popViewControllerAnimated:false];
     }];
     // [alertControl addAction:actionOne];
     
@@ -454,7 +454,7 @@
         [defaults synchronize];
         
         
-        [weakSelf.navigationController popToRootViewControllerAnimated:false];
+        [weakSelf.navigationController popViewControllerAnimated:false];
         if(weakSelf.OnSave)
             weakSelf.OnSave(pdffile,@"");
         
@@ -494,7 +494,7 @@
                 {
                     
                     
-                    [weakSelf.navigationController popToRootViewControllerAnimated:false];
+                    [weakSelf.navigationController popViewControllerAnimated:false];
                     if(weakSelf.OnSave)
                         weakSelf.OnSave(pdffile,json[@"subject"]);
                     
@@ -553,7 +553,7 @@
                         [defaults synchronize];
                         
                         
-                        [weakSelf.navigationController popToRootViewControllerAnimated:false];
+                        [weakSelf.navigationController popViewControllerAnimated:false];
                         if(weakSelf.OnSave)
                             weakSelf.OnSave(pdffile,@"");