Просмотр исходного кода

170120
eSign 1.2 release version

Ray Zhang 9 лет назад
Родитель
Сommit
179e796adc

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


+ 64 - 0
Ants Contract/AntsContract.xcworkspace/xcuserdata/Ray.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -97,5 +97,69 @@
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "common/DocumentPageViewController.m"
+            timestampString = "506584879.32929"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "369"
+            endingLineNumber = "369"
+            landmarkName = "-EndEditing"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "common/DocumentPageViewController.m"
+            timestampString = "506584879.32929"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "906"
+            endingLineNumber = "906"
+            landmarkName = "-pageViewController:viewControllerBeforeViewController:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "common/DocumentPageViewController.m"
+            timestampString = "506584879.32929"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "919"
+            endingLineNumber = "919"
+            landmarkName = "-pageViewController:viewControllerAfterViewController:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "common/DocumentPageViewController.m"
+            timestampString = "506584879.32929"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "368"
+            endingLineNumber = "368"
+            landmarkName = "-EndEditing"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
    </Breakpoints>
 </Bucket>

+ 24 - 13
Ants Contract/AntsContract.xcworkspace/xcuserdata/Ray.xcuserdatad/xcdebugger/Expressions.xcexplist

@@ -14,7 +14,15 @@
          </PersistentStrings>
       </ContextState>
       <ContextState
-         contextName = "-[PDFViewController loadcontent]:PDFViewController.m">
+         contextName = "-[DocumentPageViewController EndEditing]:DocumentPageViewController.m">
+         <PersistentStrings>
+            <PersistentString
+               value = "self.current_page">
+            </PersistentString>
+            <PersistentString
+               value = "arr.count">
+            </PersistentString>
+         </PersistentStrings>
       </ContextState>
       <ContextState
          contextName = "-[PageViewController keyboardWillShow:]:PageViewController.m">
@@ -25,21 +33,13 @@
          </PersistentStrings>
       </ContextState>
       <ContextState
-         contextName = "__41-[PageViewController CheckButtonClicked:]_block_invoke:PageViewController.m">
-      </ContextState>
-      <ContextState
-         contextName = "-[PDFViewController onActionClick:]:PDFViewController.m">
+         contextName = "-[PDFViewController loadcontent]:PDFViewController.m">
       </ContextState>
       <ContextState
-         contextName = "+[ACNetwork get_json:parameters:]:ACNetwork.m">
-         <PersistentStrings>
-            <PersistentString
-               value = "[e aes256_encrypt:@&quot;usai2010&quot;]">
-            </PersistentString>
-         </PersistentStrings>
+         contextName = "__41-[PageViewController CheckButtonClicked:]_block_invoke:PageViewController.m">
       </ContextState>
       <ContextState
-         contextName = "__32-[PDFViewController loadcontent]_block_invoke:PDFViewController.m">
+         contextName = "-[PDFViewController onActionClick:]:PDFViewController.m">
       </ContextState>
       <ContextState
          contextName = "-[PageViewController textViewDidEndEditing:]:PageViewController.m">
@@ -66,11 +66,22 @@
             </PersistentString>
          </PersistentStrings>
       </ContextState>
+      <ContextState
+         contextName = "-[PageViewController addTextView:destView:index:]:PageViewController.m">
+      </ContextState>
+      <ContextState
+         contextName = "__32-[PDFViewController loadcontent]_block_invoke:PDFViewController.m">
+      </ContextState>
       <ContextState
          contextName = "+[ACNetwork prepare_addtional_params:]:ACNetwork.m">
       </ContextState>
       <ContextState
-         contextName = "-[PageViewController addTextView:destView:index:]:PageViewController.m">
+         contextName = "+[ACNetwork get_json:parameters:]:ACNetwork.m">
+         <PersistentStrings>
+            <PersistentString
+               value = "[e aes256_encrypt:@&quot;usai2010&quot;]">
+            </PersistentString>
+         </PersistentStrings>
       </ContextState>
    </ContextStates>
 </VariablesViewState>

+ 1 - 1
Ants Contract/Granite Expo eSign/Granite Expo eSign/Info.plist

@@ -17,7 +17,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>1.2</string>
 	<key>CFBundleVersion</key>
-	<string>30881</string>
+	<string>30888</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>NSAppTransportSecurity</key>

+ 18 - 5
Ants Contract/common/DocumentPageViewController.m

@@ -93,7 +93,9 @@
 - (void)viewDidLoad {
     [super viewDidLoad];
     self.title = self.docment_id;
+
     
+
     //    self.delegate = self;
     //    self.dataSource = self;
     
@@ -106,6 +108,9 @@
     self.controlTemplate = [self templateInit:[PDFUtils loadControl:self.templateName]];
     
     
+//    self.title = [NSString stringWithFormat:@"%@ [%d/%ld]", self.docment_id,1, self.total_page ];
+    
+    
     PageViewController* startingViewController=[self viewControllerAtIndex:0];
     
     // NSArray* viewControllers =[NSArray arrayWithObjects:page_0,nil];
@@ -356,7 +361,12 @@
 }
 -(void) EndEditing
 {
-    PageViewController *currentViewController = (PageViewController*)self.pageViewController.viewControllers[self.current_page];
+    
+    
+    NSArray* arr =self.pageViewController.viewControllers;
+    
+     PageViewController *currentViewController = (PageViewController*)self.pageViewController.viewControllers[0];
+//    PageViewController *currentViewController = (PageViewController*)self.pageViewController.viewControllers[self.current_page];
     [currentViewController EndEditing];
 }
 
@@ -879,8 +889,11 @@
     return ret;
 }
 
-#pragma mark - Page View Controller Data Source
-
+//#pragma mark - Page View Controller Data Source
+- (void)pageViewController:(UIPageViewController *)pageViewController didFinishAnimating:(BOOL)finished previousViewControllers:(NSArray<UIViewController *> *)previousViewControllers transitionCompleted:(BOOL)completed
+{
+//        self.title = [NSString stringWithFormat:@"%@ [%ld/%ld]", self.docment_id,((PageViewController*)self.pageViewController.viewControllers[0]).pageIndex+1, self.total_page ];
+}
 
 - (UIViewController *)pageViewController:(UIPageViewController *)pageViewController viewControllerBeforeViewController:(UIViewController *)viewController
 {
@@ -888,9 +901,9 @@
     if ((index == 0 ) || (index == NSNotFound)){
         return nil;
     }
+ //   self.current_page= index;
     
     index--;
-    self.current_page= index;
     return  [self viewControllerAtIndex:index];
 }
 
@@ -901,13 +914,13 @@
     {
         return nil;
     }
+//    self.current_page= index;
     
     index++;
     
     if (index == self.total_page){
         return  nil;
     }
-    self.current_page= index;
     return [self viewControllerAtIndex:index];
 }