Przeglądaj źródła

170118
eSign 1.2 test version

Ray Zhang 9 lat temu
rodzic
commit
4d6e8d9663

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


+ 42 - 12
Ants Contract/AntsContract.xcworkspace/xcuserdata/Ray.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -10,11 +10,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/PageViewController.m"
-            timestampString = "506423722.633212"
+            timestampString = "506491314.356293"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "1180"
-            endingLineNumber = "1180"
+            startingLineNumber = "1194"
+            endingLineNumber = "1194"
             landmarkName = "-keyboardWillShow:"
             landmarkType = "7">
          </BreakpointContent>
@@ -26,11 +26,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/PageViewController.m"
-            timestampString = "506423722.633212"
+            timestampString = "506491314.356293"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "1231"
-            endingLineNumber = "1231"
+            startingLineNumber = "1245"
+            endingLineNumber = "1245"
             landmarkName = "-keyboardWillHide:"
             landmarkType = "7">
          </BreakpointContent>
@@ -42,11 +42,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/PageViewController.m"
-            timestampString = "506423722.633212"
+            timestampString = "506491314.356293"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "1230"
-            endingLineNumber = "1230"
+            startingLineNumber = "1244"
+            endingLineNumber = "1244"
             landmarkName = "-keyboardWillHide:"
             landmarkType = "7">
          </BreakpointContent>
@@ -58,14 +58,44 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/PageViewController.m"
-            timestampString = "506423722.633212"
+            timestampString = "506491314.356293"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "1181"
-            endingLineNumber = "1181"
+            startingLineNumber = "1195"
+            endingLineNumber = "1195"
             landmarkName = "-keyboardWillShow:"
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "Granite Expo eSign/Granite Expo eSign/config.h"
+            timestampString = "506478579.976757"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "2"
+            endingLineNumber = "2">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "common/PageViewController.m"
+            timestampString = "506491314.356293"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "726"
+            endingLineNumber = "726"
+            landmarkName = "-textView:shouldChangeTextInRange:replacementText:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
    </Breakpoints>
 </Bucket>

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

@@ -79,7 +79,7 @@
         "control_1": {
             "aname": "Customer Name",
             "type": "TextView","margin_left":"4",
-            "margin_top":"14",
+            "margin_top":"1",
             
             "required": true,
             "pos_x": 222,

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

@@ -15,9 +15,9 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.1</string>
+	<string>1.2</string>
 	<key>CFBundleVersion</key>
-	<string>170110</string>
+	<string>30881</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>NSAppTransportSecurity</key>

+ 7 - 0
Ants Contract/common/DocumentPageViewController.m

@@ -354,9 +354,16 @@
     return CGRectMake(x, y, width, height);
     
 }
+-(void) EndEditing
+{
+    PageViewController *currentViewController = (PageViewController*)self.pageViewController.viewControllers[self.current_page];
+    [currentViewController EndEditing];
+}
 
 - (IBAction)onSaveClicked:(id)sender {
     
+    [self EndEditing];
+    
     if([self verifyData]==false)
         return;
     

+ 1 - 0
Ants Contract/common/PageViewController.h

@@ -28,4 +28,5 @@
 @property (strong, nonatomic) UITextView * hotTextView;
 @property bool keyboard_show;
 @property int keyboard_h;
+-(void)EndEditing;
 @end

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

@@ -31,6 +31,7 @@
 
 - (void)viewDidLoad {
     [super viewDidLoad];
+
     
 //    
 //    self.pdfScrollView = [[PDFScrollView alloc]initWithFrame:CGRectMake(0, 64, 768, 960)];
@@ -199,6 +200,12 @@
 //        }
     }
 }
+-(void)EndEditing
+{
+    [[self view] endEditing:YES];
+}
+
+
 #pragma mark add controls
 -(bool) checkActionCondition:(NSString*) condition
 {
@@ -721,6 +728,12 @@
     if([text isEqualToString:@""])
         return true;
     
+    if([text isEqualToString:@"\n"])
+    {
+        [textView resignFirstResponder];
+        return false;
+    }
+    
     NSString* tv_format=self.controlTemplate [[NSString stringWithFormat:@"control_%ld",index] ][@"format"];
     if([tv_format isEqualToString:@"us_tel"])
     {
@@ -912,6 +925,7 @@
 //        NSMutableDictionary * control =;
     //[self update_newprice];
 }
+
 /*
  #pragma mark - Navigation