Explorar o código

eSign 20170414

修改填空字体大小
修改天空支持键盘 next
Ray Zhang %!s(int64=9) %!d(string=hai) anos
pai
achega
c83b66c8f4

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


+ 129 - 49
Ants Contract/AntsContract.xcworkspace/xcuserdata/Ray.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -10,11 +10,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/PageViewController.m"
-            timestampString = "513671115.51967"
+            timestampString = "513850285.542949"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "792"
-            endingLineNumber = "792"
+            startingLineNumber = "823"
+            endingLineNumber = "823"
             landmarkName = "-CheckButtonClicked:"
             landmarkType = "7">
          </BreakpointContent>
@@ -26,11 +26,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/PageViewController.m"
-            timestampString = "513671115.51967"
+            timestampString = "513850285.542949"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "785"
-            endingLineNumber = "785"
+            startingLineNumber = "816"
+            endingLineNumber = "816"
             landmarkName = "-CheckButtonClicked:"
             landmarkType = "7">
          </BreakpointContent>
@@ -42,11 +42,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/PageViewController.m"
-            timestampString = "513671115.51967"
+            timestampString = "513852508.459451"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "1129"
-            endingLineNumber = "1129"
+            startingLineNumber = "1168"
+            endingLineNumber = "1168"
             landmarkName = "-textViewDidEndEditing:"
             landmarkType = "7">
          </BreakpointContent>
@@ -58,11 +58,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/PageViewController.m"
-            timestampString = "513671115.51967"
+            timestampString = "513852508.459451"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "1050"
-            endingLineNumber = "1050"
+            startingLineNumber = "1089"
+            endingLineNumber = "1089"
             landmarkName = "-textViewDidBeginEditing:"
             landmarkType = "7">
          </BreakpointContent>
@@ -74,11 +74,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/PageViewController.m"
-            timestampString = "513671115.51967"
+            timestampString = "513852508.459451"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "1044"
-            endingLineNumber = "1044"
+            startingLineNumber = "1083"
+            endingLineNumber = "1083"
             landmarkName = "-textViewDidBeginEditing:"
             landmarkType = "7">
          </BreakpointContent>
@@ -90,11 +90,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/PageViewController.m"
-            timestampString = "513671115.51967"
+            timestampString = "513852508.459451"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "1056"
-            endingLineNumber = "1056"
+            startingLineNumber = "1095"
+            endingLineNumber = "1095"
             landmarkName = "-textViewDidBeginEditing:"
             landmarkType = "7">
          </BreakpointContent>
@@ -650,7 +650,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/DocumentListViewController.m"
-            timestampString = "513755520.923115"
+            timestampString = "513845155.209027"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "1095"
@@ -1784,11 +1784,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/PageViewController.m"
-            timestampString = "513671115.51967"
+            timestampString = "513852508.459451"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "1074"
-            endingLineNumber = "1074"
+            startingLineNumber = "1113"
+            endingLineNumber = "1113"
             landmarkName = "-textViewDidEndEditing:"
             landmarkType = "7">
          </BreakpointContent>
@@ -1800,11 +1800,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/PageViewController.m"
-            timestampString = "513671115.51967"
+            timestampString = "513850285.542949"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "339"
-            endingLineNumber = "339"
+            startingLineNumber = "370"
+            endingLineNumber = "370"
             landmarkName = "-addTextView:destView:index:"
             landmarkType = "7">
          </BreakpointContent>
@@ -1816,11 +1816,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/PageViewController.m"
-            timestampString = "513671115.51967"
+            timestampString = "513850285.542949"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "329"
-            endingLineNumber = "329"
+            startingLineNumber = "356"
+            endingLineNumber = "356"
             landmarkName = "-addTextView:destView:index:"
             landmarkType = "7">
          </BreakpointContent>
@@ -1832,11 +1832,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/PageViewController.m"
-            timestampString = "513671115.51967"
+            timestampString = "513850285.542949"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "342"
-            endingLineNumber = "342"
+            startingLineNumber = "373"
+            endingLineNumber = "373"
             landmarkName = "-addTextView:destView:index:"
             landmarkType = "7">
          </BreakpointContent>
@@ -1848,11 +1848,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/PageViewController.m"
-            timestampString = "513671115.51967"
+            timestampString = "513850285.542949"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "340"
-            endingLineNumber = "340"
+            startingLineNumber = "371"
+            endingLineNumber = "371"
             landmarkName = "-addTextView:destView:index:"
             landmarkType = "7">
          </BreakpointContent>
@@ -1928,11 +1928,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/PageViewController.m"
-            timestampString = "513671115.51967"
+            timestampString = "513852508.459451"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "1391"
-            endingLineNumber = "1391"
+            startingLineNumber = "1430"
+            endingLineNumber = "1430"
             landmarkName = "-TouchImageViewOnLongPress:"
             landmarkType = "7">
          </BreakpointContent>
@@ -1944,11 +1944,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/PageViewController.m"
-            timestampString = "513671115.51967"
+            timestampString = "513852508.459451"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "1437"
-            endingLineNumber = "1437"
+            startingLineNumber = "1476"
+            endingLineNumber = "1476"
             landmarkName = "-TouchImageViewOnTouche:"
             landmarkType = "7">
          </BreakpointContent>
@@ -2008,11 +2008,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/PageViewController.m"
-            timestampString = "513671115.51967"
+            timestampString = "513852508.459451"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "1411"
-            endingLineNumber = "1411"
+            startingLineNumber = "1450"
+            endingLineNumber = "1450"
             landmarkName = "@implementation PageViewController"
             landmarkType = "3">
          </BreakpointContent>
@@ -2024,11 +2024,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/PageViewController.m"
-            timestampString = "513671115.51967"
+            timestampString = "513852508.459451"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "1412"
-            endingLineNumber = "1412"
+            startingLineNumber = "1451"
+            endingLineNumber = "1451"
             landmarkName = "@implementation PageViewController"
             landmarkType = "3">
          </BreakpointContent>
@@ -2040,11 +2040,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/PageViewController.m"
-            timestampString = "513671115.51967"
+            timestampString = "513852508.459451"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "1418"
-            endingLineNumber = "1418"
+            startingLineNumber = "1457"
+            endingLineNumber = "1457"
             landmarkName = "-touchImageClear:"
             landmarkType = "7">
          </BreakpointContent>
@@ -2385,5 +2385,85 @@
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "common/DocumentListViewController.m"
+            timestampString = "513844435.481325"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "1060"
+            endingLineNumber = "1060"
+            landmarkName = "-tableView:editActionsForRowAtIndexPath:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "common/PageViewController.m"
+            timestampString = "513852508.459451"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "1115"
+            endingLineNumber = "1115"
+            landmarkName = "-textViewDidEndEditing:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "common/PageViewController.m"
+            timestampString = "513850739.956289"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "903"
+            endingLineNumber = "903"
+            landmarkName = "-textView:shouldChangeTextInRange:replacementText:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "common/PageViewController.m"
+            timestampString = "513852508.459451"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "914"
+            endingLineNumber = "914"
+            landmarkName = "-textView:shouldChangeTextInRange:replacementText:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "common/PageViewController.m"
+            timestampString = "513852508.459451"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "1062"
+            endingLineNumber = "1062"
+            landmarkName = "-textViewDidBeginEditing:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
    </Breakpoints>
 </Bucket>

+ 1 - 1
Ants Contract/AntsContract/AntsContract/Base.lproj/Main.storyboard

@@ -1048,7 +1048,7 @@
                                             <rect key="frame" x="0.0" y="0.0" width="768" height="44"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
-                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="GE2016121201" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="5Tt-7m-QFz">
+                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" text="GE2016121201" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="5Tt-7m-QFz">
                                                     <rect key="frame" x="8" y="8" width="121" height="21"/>
                                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="17"/>

+ 0 - 8
Ants Contract/Granite Expo eSign/Granite Expo eSign.xcodeproj/project.pbxproj

@@ -7,7 +7,6 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
-		7115D41F1E13AC0200EF4E4C /* GEIC - Home Improvement Contract 2017.json in Resources */ = {isa = PBXBuildFile; fileRef = 7115D41E1E13AC0200EF4E4C /* GEIC - Home Improvement Contract 2017.json */; };
 		7115D4271E13B70C00EF4E4C /* DocumentListViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 7115D4261E13B70C00EF4E4C /* DocumentListViewController.m */; };
 		7115D42A1E14DE0A00EF4E4C /* DocListTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 7115D4291E14DE0A00EF4E4C /* DocListTableViewCell.m */; };
 		7115D4561E1606F700EF4E4C /* GEContractFilterViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 7115D4551E1606F700EF4E4C /* GEContractFilterViewController.m */; };
@@ -68,7 +67,6 @@
 		714B37081E70FCFE00E99B90 /* cam_scan.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 714B37071E70FCFE00E99B90 /* cam_scan.storyboard */; };
 		714B870B1E24CAE300A40D18 /* debug.json in Resources */ = {isa = PBXBuildFile; fileRef = 714B870A1E24CAE200A40D18 /* debug.json */; };
 		717243441E1CCCEC00800678 /* CustomIOSAlertView.m in Sources */ = {isa = PBXBuildFile; fileRef = 717243431E1CCCEC00800678 /* CustomIOSAlertView.m */; };
-		7172434A1E1E208F00800678 /* GEIC - Home Improvement Contract 2017.pdf in Resources */ = {isa = PBXBuildFile; fileRef = 717243491E1E208F00800678 /* GEIC - Home Improvement Contract 2017.pdf */; };
 		7188C2891E8E435500938FFC /* GEIC - Home Improvement Contract 2017 Update.json in Resources */ = {isa = PBXBuildFile; fileRef = 7188C2881E8E435500938FFC /* GEIC - Home Improvement Contract 2017 Update.json */; };
 		7188C28B1E8E437900938FFC /* GEIC - Home Improvement Contract 2017 Update.pdf in Resources */ = {isa = PBXBuildFile; fileRef = 7188C28A1E8E437900938FFC /* GEIC - Home Improvement Contract 2017 Update.pdf */; };
 		71B152EF1E66C87F00D2E5EC /* AddExtDocumentViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 71B152EE1E66C87F00D2E5EC /* AddExtDocumentViewController.m */; };
@@ -77,7 +75,6 @@
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
-		7115D41E1E13AC0200EF4E4C /* GEIC - Home Improvement Contract 2017.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; name = "GEIC - Home Improvement Contract 2017.json"; path = "Granite Expo eSign/GEIC - Home Improvement Contract 2017.json"; sourceTree = "<group>"; };
 		7115D4251E13B70C00EF4E4C /* DocumentListViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DocumentListViewController.h; path = ../../common/DocumentListViewController.h; sourceTree = "<group>"; };
 		7115D4261E13B70C00EF4E4C /* DocumentListViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = DocumentListViewController.m; path = ../../common/DocumentListViewController.m; sourceTree = "<group>"; };
 		7115D4281E14DE0A00EF4E4C /* DocListTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DocListTableViewCell.h; path = ../../common/DocListTableViewCell.h; sourceTree = "<group>"; };
@@ -193,7 +190,6 @@
 		714B870A1E24CAE200A40D18 /* debug.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = debug.json; sourceTree = "<group>"; };
 		717243421E1CCCEC00800678 /* CustomIOSAlertView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CustomIOSAlertView.h; path = "../../../RedAnt ERP Mobile/common/customUI/CustomIOSAlertView.h"; sourceTree = "<group>"; };
 		717243431E1CCCEC00800678 /* CustomIOSAlertView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = CustomIOSAlertView.m; path = "../../../RedAnt ERP Mobile/common/customUI/CustomIOSAlertView.m"; sourceTree = "<group>"; };
-		717243491E1E208F00800678 /* GEIC - Home Improvement Contract 2017.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; name = "GEIC - Home Improvement Contract 2017.pdf"; path = "Granite Expo eSign/GEIC - Home Improvement Contract 2017.pdf"; sourceTree = "<group>"; };
 		7188C2881E8E435500938FFC /* GEIC - Home Improvement Contract 2017 Update.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; name = "GEIC - Home Improvement Contract 2017 Update.json"; path = "Granite Expo eSign/GEIC - Home Improvement Contract 2017 Update.json"; sourceTree = "<group>"; };
 		7188C28A1E8E437900938FFC /* GEIC - Home Improvement Contract 2017 Update.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; name = "GEIC - Home Improvement Contract 2017 Update.pdf"; path = "Granite Expo eSign/GEIC - Home Improvement Contract 2017 Update.pdf"; sourceTree = "<group>"; };
 		71B152ED1E66C87F00D2E5EC /* AddExtDocumentViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AddExtDocumentViewController.h; path = ../../common/AddExtDocumentViewController.h; sourceTree = "<group>"; };
@@ -428,10 +424,8 @@
 		7128C3261E1251DE00FF635B /* pdf resource */ = {
 			isa = PBXGroup;
 			children = (
-				7115D41E1E13AC0200EF4E4C /* GEIC - Home Improvement Contract 2017.json */,
 				7188C2881E8E435500938FFC /* GEIC - Home Improvement Contract 2017 Update.json */,
 				714B870A1E24CAE200A40D18 /* debug.json */,
-				717243491E1E208F00800678 /* GEIC - Home Improvement Contract 2017.pdf */,
 				7188C28A1E8E437900938FFC /* GEIC - Home Improvement Contract 2017 Update.pdf */,
 			);
 			name = "pdf resource";
@@ -518,14 +512,12 @@
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				7115D41F1E13AC0200EF4E4C /* GEIC - Home Improvement Contract 2017.json in Resources */,
 				7128C24B1E124F4500FF635B /* Assets.xcassets in Resources */,
 				7128C26F1E124FF200FF635B /* Main.storyboard in Resources */,
 				7188C28B1E8E437900938FFC /* GEIC - Home Improvement Contract 2017 Update.pdf in Resources */,
 				7128C2701E124FF200FF635B /* LaunchScreen.storyboard in Resources */,
 				7188C2891E8E435500938FFC /* GEIC - Home Improvement Contract 2017 Update.json in Resources */,
 				7115D45F1E16326C00EF4E4C /* CommonEditor.storyboard in Resources */,
-				7172434A1E1E208F00800678 /* GEIC - Home Improvement Contract 2017.pdf in Resources */,
 				7128C27D1E12500B00FF635B /* signature.storyboard in Resources */,
 				7128C2E81E12511B00FF635B /* LICENSE in Resources */,
 				714B870B1E24CAE300A40D18 /* debug.json in Resources */,

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

@@ -76,7 +76,7 @@
                          ],
             "value": []
         },
-        "control_21": {
+        "control_1": {
             "aname": "Invoice Number",
             "type": "TextView","margin_left":"4",
             "margin_top":"1",
@@ -89,7 +89,7 @@
             "field": "invoice_number",
             "value": ""
         },
-        "control_1": {
+        "control_2": {
             "aname": "Customer Name",
             "type": "TextView","margin_left":"4",
             "margin_top":"1",
@@ -102,7 +102,7 @@
             "field": "customer_name",
             "value": ""
         },
-        "control_2": {
+        "control_3": {
             "aname": "Job Date",
             "type": "DatePicker","margin_left":"4",
             "required": false,
@@ -113,12 +113,13 @@
             "field": "job_date",
             "value": ""
         },
-        "control_3": {
+        "control_4": {
             "aname": "Jobsite Address",
             "type": "TextView","margin_left":"1",
             "required": true,
             "tv_vmargin":0.6,
             "margin_top": "3",
+            "size":"10",
             "pos_x": 248,
             "pos_y": 311,
             "width": 397,
@@ -126,12 +127,13 @@
             "field": "job_addr",
             "value": ""
         },
-        "control_15": {
+        "control_5": {
             "aname": "Jobsite City",
             "type": "TextView","margin_left":"1",
             "required": true,
             "margin_top": "-1",
             "tv_vmargin":0.3,
+            "size":"10",
             "pos_x": 248,
             "pos_y": 326,
             "width": 152,
@@ -139,10 +141,11 @@
             "field": "job_city",
             "value": ""
         },
-        "control_16": {
+        "control_6": {
             "aname": "Jobsite State",
             "type": "TextView","margin_left":"1",
             "required": true,
+            "size":"10",
             "tv_vmargin":0.3,
             "margin_top": "-1",
             "capital":"charater",
@@ -153,12 +156,13 @@
             "field": "job_state",
             "value": "CA"
         },
-        "control_17": {
+        "control_7": {
             "aname": "Jobsite Zipcode",
             "margin_top": "-1",
             "type": "TextView","margin_left":"1",
             "required": true,
             "tv_vmargin":0.3,
+            "size":"10",
             "pos_x": 570,
             "pos_y": 326,
             "width": 74,
@@ -166,7 +170,7 @@
             "field": "job_zip",
             "value": ""
         },
-        "control_4": {
+        "control_8": {
             "aname": "Telephone",
             "format": "us_tel",
             "keyboard":"tel",
@@ -179,7 +183,7 @@
             "field": "tel",
             "value": ""
         },
-        "control_5": {
+        "control_9": {
             "aname": "Today's Date","margin_left":"4",
             "type": "DatePicker",
             "required": true,
@@ -190,7 +194,7 @@
             "field": "today_date",
             "value": ""
         },
-        "control_6": {
+        "control_10": {
             "aname": "Contract Price",
             "type": "TextView","margin_left":"4",
             "required": true,
@@ -208,18 +212,18 @@
                     "condition": "true",
                     "count": 2,
                     "item_0": {
-                        "control": "control_7",
+                        "control": "control_11",
                         "value": "*0.1"
                     },
                     "item_1": {
-                        "control": "control_8",
+                        "control": "control_12",
                         "value": "*0.9"
                     }
                 }
             },
             "value": ""
         },
-        "control_7": {
+        "control_11": {
             "aname": "Labor Deposit",
             "type": "TextView","margin_left":"4",
             "required": true,
@@ -238,14 +242,14 @@
                     "condition": "true",
                     "count": 1,
                     "item_0": {
-                        "control": "control_8",
+                        "control": "control_12",
                         "value": "control_6-control_7"
                     }
                 }
             },
             "value": ""
         },
-        "control_18": {
+        "control_19": {
             "type": "Check",
             "required": true,
             "pos_x": 584,
@@ -266,17 +270,17 @@
                           {
                           "memo": "action",
                           "disable": [
-                                      "control_7"
+                                      "control_11"
                                       ],
                           "set_val": {
                           "condition": "true",
                           "count": 2,
                           "item_0": {
-                          "control": "control_7",
+                          "control": "control_11",
                           "value": "*0.1"
                           },
                           "item_1": {
-                          "control": "control_8",
+                          "control": "control_12",
                           "value": "*0.9"
                           }
                           }
@@ -290,7 +294,7 @@
                           {
                           "memo": "action",
                           "enable": [
-                                     "control_7"
+                                     "control_11"
                                      ]
                           }
                           ]
@@ -299,7 +303,7 @@
                       0
                       ]
         },
-        "control_8": {
+        "control_12": {
             "aname": "Balance on Account",
             "type": "TextView","margin_left":"4",
             "required": true,
@@ -313,7 +317,7 @@
             "disable": true,
             "value": ""
         },
-        "control_9": {
+        "control_13": {
             "aname": "Service",
             "type": "Check",
             "required": true,
@@ -380,7 +384,7 @@
                          ],
             "value": []
         },
-        "control_10": {
+        "control_14": {
             "aname": "Initial","linewidth":8,"can_fill": "true",
             "type": "Signature",
             "required": true,
@@ -391,7 +395,7 @@
             "name": "Customer Initial",
             "value": ""
         },
-        "control_11": {
+        "control_15": {
             "aname": "Initial","linewidth":8,"can_fill": "true",
             "type": "Signature",
             "required": true,
@@ -402,7 +406,7 @@
             "name": "Customer Initial",
             "value": ""
         },
-        "control_12": {
+        "control_16": {
             "aname": "Initial","linewidth":8,"can_fill": "true",
             "type": "Signature",
             "required": true,
@@ -413,7 +417,7 @@
             "name": "Customer Initial",
             "value": ""
         },
-        "control_13": {
+        "control_17": {
             "aname": "Initial","linewidth":8,"can_fill": "true",
             "type": "Signature",
             "required": true,
@@ -424,7 +428,7 @@
             "name": "Customer Initial",
             "value": ""
         },
-        "control_14": {
+        "control_18": {
             "aname": "Initial","linewidth":8,"can_fill": "true",
             "type": "Signature",
             "required": true,
@@ -435,7 +439,7 @@
             "name": "Customer Initial",
             "value": ""
         },
-        "control_20": {
+        "control_21": {
             "type": "Label",
             "textAlignment":"center",
             "required": true,
@@ -447,7 +451,7 @@
             "field": "doc_number",
             "value": ""
         },
-        "control_19": {
+        "control_20": {
 
             "type": "Image",
             "required": true,

+ 44 - 5
Ants Contract/common/PageViewController.m

@@ -323,15 +323,46 @@
     int d_idx = [controlName intValue];
     return [self.view viewWithTag:d_idx+CONTROL_BASE];
 }
+-(UITextView*) findNextTV:(UITextView*)tv
+{
+    long index = tv.tag - CONTROL_BASE;
+    
+    
+
+    
+    int count = [self.controlTemplate[@"count"] intValue];
+    for(long i=index+1;i<count;i++)
+    {
+        NSMutableDictionary * control =self.controlTemplate [[NSString stringWithFormat:@"control_%ld",i] ];
+        if(![control[@"type"] isEqualToString:@"TextView"])
+        {
+            continue;
+        }
+        
+        for(UIView*v in self.editControlView.subviews)
+        {
+            if(v.tag==i+CONTROL_BASE)
+                return (UITextView*)v;
+        }
+        
+        
+    }
+    return nil;
+
+}
 -(void) addTextView:(NSMutableDictionary*) template destView:(UIView*)destView index:(int) index
 {
     
     CGRect srect=[self scaleControl:CGRectMake([template[@"pos_x"] floatValue], [template[@"pos_y"] floatValue], [template[@"width"] floatValue], [template[@"height"] floatValue]) from:CGSizeMake(768, 960.5) to:destView.frame.size];
     
     UITextView* tv = [[UITextView alloc] initWithFrame:srect];
+    if([template[@"next_end"] boolValue])
+        tv.returnKeyType=UIReturnKeyDefault;
+    else
+        tv.returnKeyType=UIReturnKeyNext;
     float fontsize = [template[@"size"] floatValue];
     if(fontsize==0)
-        fontsize=10;
+        fontsize=12;
     [tv setFont:[UIFont systemFontOfSize:fontsize]];
     bool isdisable = [template[@"disable"] boolValue];
     
@@ -786,7 +817,7 @@
                             UITextView* tv = (UITextView*) [self findControl:control[@"control"]];
                             NSString* value = control[@"value"];
                             
-                            UITextView* tv6 = (UITextView*) [self findControl:@"control_6"];
+                            UITextView* tv6 = (UITextView*) [self findControl:@"control_10"];
                             NSString* text = tv6.text;
                             NSString* newvalue = nil;
                             if([value isEqualToString:@"*0.1"])
@@ -876,7 +907,15 @@
     
     if([text isEqualToString:@"\n"])
     {
-        [textView resignFirstResponder];
+      //  [textView resignFirstResponder];
+        
+        UITextView * tv = [self findNextTV:textView];
+        
+        if(tv)
+        [tv becomeFirstResponder];
+
+        
+            [textView resignFirstResponder];
         return false;
     }
     
@@ -1196,7 +1235,7 @@
             else if([value isEqualToString:@"control_6-control_7"])
             {
                 
-                UITextView* tv6 = (UITextView*) [self findControl:@"control_6"];
+                UITextView* tv6 = (UITextView*) [self findControl:@"control_10"];
 //                float f6= [[tv6.text stringByReplacingOccurrencesOfString:@"$" withString:@"" ] floatValue];
 //                
 //                float f7= [[text stringByReplacingOccurrencesOfString:@"$" withString:@"" ] floatValue];
@@ -1228,7 +1267,7 @@
         }
     }
 
-    
+
 //    int count = [self.controlTemplate[@"count"] intValue];
 //    for(int i=0;i<count;i++)
 //    {