eSign 20170419

修复 save 时检查必填项引起的闪退。

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

@@ -1,5 +1,5 @@
 {
-    "count": 4,
+    "count": 5,
     "signature_name": [
                        "Customer Initial",
                        "Decision Maker",
@@ -452,7 +452,7 @@
             "textAlignment":"center",
             "required": true,
             "pos_x": 523,
-            "pos_y": 917,
+            "pos_y": 920,
             "width": 104,
             "size": "8",
             "height": 11,
@@ -724,7 +724,7 @@
             "textAlignment":"center",
             "required": true,
             "pos_x": 523,
-            "pos_y": 917,
+            "pos_y": 920,
             "width": 104,
             "size": "8",
             "height": 11,
@@ -847,7 +847,7 @@
             "textAlignment":"center",
             "required": true,
             "pos_x": 523,
-            "pos_y": 917,
+            "pos_y": 920,
             "width": 104,
             "size": "8",
             "height": 11,
@@ -965,7 +965,7 @@
             "textAlignment":"center",
             "required": true,
             "pos_x": 523,
-            "pos_y": 917,
+            "pos_y": 920,
             "width": 104,
             "size": "8",
             "height": 11,
@@ -983,12 +983,12 @@
             "value": ""
         }
     },
-    "page_4_ignor": {
-        "count": 5,
-        "control_0": {
+    "page_4": {
+        "count": 2,
+        "control_0_ignor": {
             "aname": "Homeowner Signature",
             "linewidth":8,
-            "type": "Signature",
+            "type": "ignor",
             "required": true,
             "pos_x": 127,
             "pos_y": 553,
@@ -997,10 +997,10 @@
             "name": "Homeowner",
             "value": ""
         },
-        "control_1": {
+        "control_1_ignor": {
             "aname": "Handwrite Print Name",
             "linewidth":5,
-            "type": "Signature",
+            "type": "ignor",
             "required": true,
             "pos_x": 326,
             "pos_y": 553,
@@ -1009,10 +1009,10 @@
             "name": "Homeowner Print Name",
             "value": ""
         },
-        "control_2": {
+        "control_2_ignor": {
             "aname": "Handwrite date",
             "linewidth":5,
-            "type": "Signature",
+            "type": "ignor",
             "required": true,
             "pos_x": 552,
             "pos_y": 553,
@@ -1021,19 +1021,19 @@
             "name": "Date",
             "value": ""
         },
-        "control_4": {
+        "control_1": {
             "type": "Label",
             "textAlignment":"center",
             "required": true,
             "pos_x": 523,
-            "pos_y": 917,
+            "pos_y": 920,
             "width": 104,
             "size": "8",
             "height": 11,
             "field": "doc_number",
             "value": ""
         },
-        "control_3": {
+        "control_0": {
             "type": "Image",
             "required": true,
             "pos_x": 500,

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

Ants Contract/common/DocumentPageViewController.m

@@ -968,7 +968,7 @@
             NSString* name = control[@"aname"];
             bool required = [control[@"required"] boolValue];
             
-            if(required==false)
+            if(required==false || [type.lowercaseString isEqualToString:@"ignor"])
                 continue;
             if([type isEqualToString:@"Check"])
             {