Ver código fonte

eSign 20170419

加入出口许可证,所有修改完成,准备打包
Ray Zhang 9 anos atrás
pai
commit
e45d4a6cd0

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


+ 102 - 86
Ants Contract/AntsContract.xcworkspace/xcuserdata/Ray.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -15,7 +15,7 @@
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "823"
             endingLineNumber = "823"
-            landmarkName = "-ControlDatePickerClicked:"
+            landmarkName = "-scrollViewDidEndZooming:withView:atScale:"
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
@@ -31,7 +31,7 @@
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "816"
             endingLineNumber = "816"
-            landmarkName = "-ControlDatePickerClicked:"
+            landmarkName = "-viewForZoomingInScrollView:"
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
@@ -42,12 +42,12 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/PageViewController.m"
-            timestampString = "513852508.459451"
+            timestampString = "514194011.795241"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "1168"
-            endingLineNumber = "1168"
-            landmarkName = "-textViewDidBeginEditing:"
+            startingLineNumber = "1173"
+            endingLineNumber = "1173"
+            landmarkName = "-textView:shouldChangeTextInRange:replacementText:"
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
@@ -58,11 +58,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/PageViewController.m"
-            timestampString = "513852508.459451"
+            timestampString = "514194011.795241"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "1089"
-            endingLineNumber = "1089"
+            startingLineNumber = "1094"
+            endingLineNumber = "1094"
             landmarkName = "-textView:shouldChangeTextInRange:replacementText:"
             landmarkType = "7">
          </BreakpointContent>
@@ -74,11 +74,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/PageViewController.m"
-            timestampString = "513852508.459451"
+            timestampString = "514194011.795241"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "1083"
-            endingLineNumber = "1083"
+            startingLineNumber = "1088"
+            endingLineNumber = "1088"
             landmarkName = "-textView:shouldChangeTextInRange:replacementText:"
             landmarkType = "7">
          </BreakpointContent>
@@ -90,11 +90,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/PageViewController.m"
-            timestampString = "513852508.459451"
+            timestampString = "514194011.795241"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "1095"
-            endingLineNumber = "1095"
+            startingLineNumber = "1100"
+            endingLineNumber = "1100"
             landmarkName = "-textView:shouldChangeTextInRange:replacementText:"
             landmarkType = "7">
          </BreakpointContent>
@@ -1784,11 +1784,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/PageViewController.m"
-            timestampString = "513852508.459451"
+            timestampString = "514194011.795241"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "1113"
-            endingLineNumber = "1113"
+            startingLineNumber = "1118"
+            endingLineNumber = "1118"
             landmarkName = "-textView:shouldChangeTextInRange:replacementText:"
             landmarkType = "7">
          </BreakpointContent>
@@ -1805,7 +1805,7 @@
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "370"
             endingLineNumber = "370"
-            landmarkName = "-willRotateToInterfaceOrientation:duration:"
+            landmarkName = "-refreshControl"
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
@@ -1837,7 +1837,7 @@
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "373"
             endingLineNumber = "373"
-            landmarkName = "-didRotateFromInterfaceOrientation:"
+            landmarkName = "-refreshControl"
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
@@ -1853,7 +1853,7 @@
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "371"
             endingLineNumber = "371"
-            landmarkName = "-willRotateToInterfaceOrientation:duration:"
+            landmarkName = "-refreshControl"
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
@@ -1928,11 +1928,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/PageViewController.m"
-            timestampString = "513852508.459451"
+            timestampString = "514194208.861863"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "1430"
-            endingLineNumber = "1430"
+            startingLineNumber = "1439"
+            endingLineNumber = "1439"
             landmarkName = "-signature:"
             landmarkType = "7">
          </BreakpointContent>
@@ -1944,11 +1944,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/PageViewController.m"
-            timestampString = "513852508.459451"
+            timestampString = "514194208.861863"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "1476"
-            endingLineNumber = "1476"
+            startingLineNumber = "1485"
+            endingLineNumber = "1485"
             landmarkName = "-signature:"
             landmarkType = "7">
          </BreakpointContent>
@@ -2008,11 +2008,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/PageViewController.m"
-            timestampString = "513852508.459451"
+            timestampString = "514194208.861863"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "1450"
-            endingLineNumber = "1450"
+            startingLineNumber = "1459"
+            endingLineNumber = "1459"
             landmarkName = "-signature:"
             landmarkType = "7">
          </BreakpointContent>
@@ -2024,11 +2024,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/PageViewController.m"
-            timestampString = "513852508.459451"
+            timestampString = "514194208.861863"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "1451"
-            endingLineNumber = "1451"
+            startingLineNumber = "1460"
+            endingLineNumber = "1460"
             landmarkName = "-signature:"
             landmarkType = "7">
          </BreakpointContent>
@@ -2040,11 +2040,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/PageViewController.m"
-            timestampString = "513852508.459451"
+            timestampString = "514194208.861863"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "1457"
-            endingLineNumber = "1457"
+            startingLineNumber = "1466"
+            endingLineNumber = "1466"
             landmarkName = "-signature:"
             landmarkType = "7">
          </BreakpointContent>
@@ -2125,8 +2125,8 @@
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "256"
             endingLineNumber = "256"
-            landmarkName = "@implementation AppDelegate"
-            landmarkType = "3">
+            landmarkName = "-applicationDidBecomeActive:"
+            landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
       <BreakpointProxy
@@ -2301,7 +2301,7 @@
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "892"
             endingLineNumber = "892"
-            landmarkName = "-extract_data:"
+            landmarkName = "-indexOfViewController:"
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
@@ -2408,11 +2408,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/PageViewController.m"
-            timestampString = "513852508.459451"
+            timestampString = "514194011.795241"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "1115"
-            endingLineNumber = "1115"
+            startingLineNumber = "1120"
+            endingLineNumber = "1120"
             landmarkName = "-textView:shouldChangeTextInRange:replacementText:"
             landmarkType = "7">
          </BreakpointContent>
@@ -2424,11 +2424,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/PageViewController.m"
-            timestampString = "513850739.956289"
+            timestampString = "514194011.795241"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "903"
-            endingLineNumber = "903"
+            startingLineNumber = "904"
+            endingLineNumber = "904"
             landmarkName = "-CheckButtonClicked:"
             landmarkType = "7">
          </BreakpointContent>
@@ -2440,11 +2440,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/PageViewController.m"
-            timestampString = "513852508.459451"
+            timestampString = "514194011.795241"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "914"
-            endingLineNumber = "914"
+            startingLineNumber = "915"
+            endingLineNumber = "915"
             landmarkName = "-CheckButtonClicked:"
             landmarkType = "7">
          </BreakpointContent>
@@ -2456,11 +2456,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/PageViewController.m"
-            timestampString = "513852508.459451"
+            timestampString = "514194011.795241"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "1062"
-            endingLineNumber = "1062"
+            startingLineNumber = "1067"
+            endingLineNumber = "1067"
             landmarkName = "-textView:shouldChangeTextInRange:replacementText:"
             landmarkType = "7">
          </BreakpointContent>
@@ -2573,7 +2573,7 @@
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "388"
             endingLineNumber = "388"
-            landmarkName = "-onSaveClicked:"
+            landmarkName = "-EndEditing"
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
@@ -2596,7 +2596,7 @@
       <BreakpointProxy
          BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
          <BreakpointContent
-            shouldBeEnabled = "Yes"
+            shouldBeEnabled = "No"
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/PageViewController.m"
@@ -2605,40 +2605,56 @@
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "366"
             endingLineNumber = "366"
-            landmarkName = "-willRotateToInterfaceOrientation:duration:"
+            landmarkName = "-refreshControl"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "../RedAnt ERP Mobile/common/PDFUtils.m"
+            timestampString = "514192775.993083"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "350"
+            endingLineNumber = "350"
+            landmarkName = "+SavePDF:source:window_rect:name:isnew:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "../RedAnt ERP Mobile/common/PDFUtils.m"
+            timestampString = "514192864.504539"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "362"
+            endingLineNumber = "362"
+            landmarkName = "+SavePDF:source:window_rect:name:isnew:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "../RedAnt ERP Mobile/common/PDFUtils.m"
+            timestampString = "514192871.084586"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "373"
+            endingLineNumber = "373"
+            landmarkName = "+SavePDF:source:window_rect:name:isnew:"
             landmarkType = "7">
-            <Locations>
-               <Location
-                  shouldBeEnabled = "Yes"
-                  ignoreCount = "0"
-                  continueAfterRunningActions = "No"
-                  symbolName = "-[PageViewController willRotateToInterfaceOrientation:duration:]"
-                  moduleName = "Granite Expo eSign"
-                  usesParentBreakpointCondition = "Yes"
-                  urlString = "file:///Users/ray/Documents/CODE_ERPSuiteIOS/Ants%20Contract/common/PageViewController.m"
-                  timestampString = "514171612.470999"
-                  startingColumnNumber = "9223372036854775807"
-                  endingColumnNumber = "9223372036854775807"
-                  startingLineNumber = "367"
-                  endingLineNumber = "367"
-                  offsetFromSymbolStart = "80">
-               </Location>
-               <Location
-                  shouldBeEnabled = "Yes"
-                  ignoreCount = "0"
-                  continueAfterRunningActions = "No"
-                  symbolName = "-[PageViewController willRotateToInterfaceOrientation:duration:]"
-                  moduleName = "Granite Expo eSign"
-                  usesParentBreakpointCondition = "Yes"
-                  urlString = "file:///Users/ray/Documents/CODE_ERPSuiteIOS/Ants%20Contract/common/PageViewController.m"
-                  timestampString = "514171612.473319"
-                  startingColumnNumber = "9223372036854775807"
-                  endingColumnNumber = "9223372036854775807"
-                  startingLineNumber = "367"
-                  endingLineNumber = "367"
-                  offsetFromSymbolStart = "104">
-               </Location>
-            </Locations>
          </BreakpointContent>
       </BreakpointProxy>
    </Breakpoints>

+ 2 - 0
Ants Contract/Granite Expo eSign/Granite Expo eSign/Info.plist

@@ -65,5 +65,7 @@
 		<string>UIInterfaceOrientationLandscapeRight</string>
 		<string>UIInterfaceOrientationPortraitUpsideDown</string>
 	</array>
+	<key>ITSAppUsesNonExemptEncryption</key>
+	<false/>
 </dict>
 </plist>

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

@@ -18,7 +18,7 @@
 //#define ENCRYPT_OFF
 # ifdef DEBUG
     #define NO_SAVE_VERIFY true
-    #define test_server
+//    #define test_server
 # else
     #define NO_SAVE_VERIFY false
 # endif

+ 14 - 2
Ants Contract/common/PageViewController.m

@@ -877,6 +877,7 @@ typedef enum {
         [sender setTitle:strdate forState:UIControlStateNormal];
         
            weakSelf.controlTemplate [[NSString stringWithFormat:@"control_%ld",index] ][@"value"] = strdate;
+        weakSelf.controlTemplate [[NSString stringWithFormat:@"control_%ld",index] ][@"dirty"]=[NSNumber numberWithBool:true];
     };
     dpvc.title=@"Please choose a date";
     [self.navigationController pushViewController:dpvc animated:true];
@@ -971,6 +972,7 @@ typedef enum {
 //                                float f= [[text stringByReplacingOccurrencesOfString:@"$" withString:@"" ] floatValue]*0.1;
 //                                newvalue = [NSString stringWithFormat:@"$ %.2f",f];
                                 self.controlTemplate [control[@"control"] ][@"value"] = newvalue;
+                                self.controlTemplate [control[@"control"] ][@"dirty"] = [NSNumber numberWithBool:true];
                             }
                             else if([value isEqualToString:@"*0.9"])
                             {
@@ -986,6 +988,7 @@ typedef enum {
                                 newvalue=[newvalue stringByReplacingOccurrencesOfString:@"$" withString:prefix_str];
 //                                newvalue = [NSString stringWithFormat:@"$ %.2f",f];
                                 self.controlTemplate [control[@"control"] ][@"value"] = newvalue;
+                                self.controlTemplate [control[@"control"] ][@"dirty"] = [NSNumber numberWithBool:true];
                             }
 
                             
@@ -1019,6 +1022,8 @@ typedef enum {
             
         }
         self.controlTemplate [[NSString stringWithFormat:@"control_%ld",index] ][@"value"]=checkedData;
+        
+        self.controlTemplate [[NSString stringWithFormat:@"control_%ld",index] ][@"dirty"] = [NSNumber numberWithBool:true];
     };
     checkVC.rowData = rowData;
     checkVC.checkedData = [checkedData mutableCopy];
@@ -1290,7 +1295,7 @@ typedef enum {
     if(text==nil)
         text=@"";
     self.controlTemplate [[NSString stringWithFormat:@"control_%ld",index] ][@"value"] = text;
-    
+    self.controlTemplate [[NSString stringWithFormat:@"control_%ld",index] ][@"dirty"] =[NSNumber numberWithBool:true];
     NSDictionary* action = self.controlTemplate [[NSString stringWithFormat:@"control_%ld",index] ][@"action"];
     NSArray* keys=[action allKeys];
     for(int k=0;k<keys.count;k++)
@@ -1342,6 +1347,7 @@ typedef enum {
 
                 
                 self.controlTemplate [control[@"control"] ][@"value"] = newvalue;
+                self.controlTemplate [control[@"control"] ][@"dirty"] =[NSNumber numberWithBool:true];
             }
             else if([value isEqualToString:@"*0.9"])
             {
@@ -1366,6 +1372,8 @@ typedef enum {
                 }
 //                newvalue = [NSString stringWithFormat:@"$ %.2f",f];
                 self.controlTemplate [control[@"control"] ][@"value"] = newvalue;
+                self.controlTemplate [control[@"control"] ][@"dirty"] = [NSNumber numberWithBool:true];
+                
             }
             else if([value isEqualToString:@"control_6-control_7"])
             {
@@ -1395,6 +1403,7 @@ typedef enum {
                 newvalue=[newvalue stringByReplacingOccurrencesOfString:@"$" withString:prefix_str];
 //                newvalue = [NSString stringWithFormat:@"$ %.2f",f6-f7];
                 self.controlTemplate [control[@"control"] ][@"value"] = newvalue;
+                self.controlTemplate [control[@"control"] ][@"dirty"] = [NSNumber numberWithBool:true];
             }
             
             tv.text = newvalue;
@@ -1465,7 +1474,7 @@ typedef enum {
             
             long index = touchImageView.tag - CONTROL_BASE;
             weakSelf.controlTemplate [[NSString stringWithFormat:@"control_%ld",index] ][@"value"] = file;
-            
+            weakSelf.controlTemplate [[NSString stringWithFormat:@"control_%ld",index] ][@"dirty"] = [NSNumber numberWithBool:true];
         }
         
     };
@@ -1522,6 +1531,8 @@ typedef enum {
                 NSString* file=[PDFUtils addSignature:signimg to:self.signatureData subType:control_json[@"name"]];
                 long index = touchImageView.tag - CONTROL_BASE;
                 self.controlTemplate [[NSString stringWithFormat:@"control_%ld",index] ][@"value"] = file;
+                self.controlTemplate [[NSString stringWithFormat:@"control_%ld",index] ][@"dirty"] =[NSNumber numberWithBool:true];
+
                 touchImageView.image = signimg;
             }
             
@@ -1601,6 +1612,7 @@ typedef enum {
 //    NSMutableDictionary* control_json = self.controlTemplate [[NSString stringWithFormat:@"control_%ld",index] ];
     
     self.controlTemplate [[NSString stringWithFormat:@"control_%ld",index] ][@"value"] = @"";
+    self.controlTemplate [[NSString stringWithFormat:@"control_%ld",index] ][@"dirty"] =[NSNumber numberWithBool:true];
 }
 - (void) touchImageModify:(id) sender
 {