Przeglądaj źródła

170118
eSign 1.2 test version

Ray Zhang 9 lat temu
rodzic
commit
8e87dd4d81

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


+ 16 - 324
Ants Contract/AntsContract.xcworkspace/xcuserdata/Ray.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -3,218 +3,6 @@
    type = "0"
    version = "2.0">
    <Breakpoints>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            shouldBeEnabled = "No"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "../RedAnt ERP Mobile/common/PDFUtils.m"
-            timestampString = "505729887.728875"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "572"
-            endingLineNumber = "572"
-            landmarkName = "@implementation PDFUtils"
-            landmarkType = "3">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            shouldBeEnabled = "No"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "../RedAnt ERP Mobile/common/PDFUtils.m"
-            timestampString = "505729887.728875"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "520"
-            endingLineNumber = "520"
-            landmarkName = "@implementation PDFUtils"
-            landmarkType = "3">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            shouldBeEnabled = "No"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "../RedAnt ERP Mobile/common/PDFUtils.m"
-            timestampString = "505729887.728875"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "576"
-            endingLineNumber = "576"
-            landmarkName = "@implementation PDFUtils"
-            landmarkType = "3">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            shouldBeEnabled = "Yes"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "../RedAnt ERP Mobile/common/PDFUtils.m"
-            timestampString = "505729887.728875"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "579"
-            endingLineNumber = "579"
-            landmarkName = "@implementation PDFUtils"
-            landmarkType = "3">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            shouldBeEnabled = "No"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "../RedAnt ERP Mobile/common/pdfCreator/TextDrawable.m"
-            timestampString = "505895899.214773"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "907"
-            endingLineNumber = "907">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            shouldBeEnabled = "No"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "../RedAnt ERP Mobile/common/pdfCreator/TextDrawable.m"
-            timestampString = "505895899.214773"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "929"
-            endingLineNumber = "929">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            shouldBeEnabled = "No"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "../RedAnt ERP Mobile/common/pdfCreator/TextDrawable.m"
-            timestampString = "505895899.214773"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "959"
-            endingLineNumber = "959">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            shouldBeEnabled = "No"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "../RedAnt ERP Mobile/common/pdfCreator/TextDrawable.m"
-            timestampString = "505895899.214773"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "1429"
-            endingLineNumber = "1429">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            shouldBeEnabled = "Yes"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "../RedAnt ERP Mobile/common/pdfCreator/TextDrawable.m"
-            timestampString = "505895899.214773"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "1186"
-            endingLineNumber = "1186">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            shouldBeEnabled = "No"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "../RedAnt ERP Mobile/common/pdfCreator/TextDrawable.m"
-            timestampString = "505895899.214773"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "1592"
-            endingLineNumber = "1592">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            shouldBeEnabled = "Yes"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "../RedAnt ERP Mobile/common/PDFUtils.m"
-            timestampString = "505729887.728875"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "565"
-            endingLineNumber = "565"
-            landmarkName = "@implementation PDFUtils"
-            landmarkType = "3">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            shouldBeEnabled = "No"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "common/AppDelegate.m"
-            timestampString = "505638128.214545"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "45"
-            endingLineNumber = "45"
-            landmarkName = "-function_test"
-            landmarkType = "7">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            shouldBeEnabled = "No"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "../RedAnt ERP Mobile/common/pdfCreator/TextDrawable.m"
-            timestampString = "505895899.214773"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "572"
-            endingLineNumber = "572"
-            landmarkName = "-Draw:dataSource:ParentRect:startX:startY:flipHeight:range:"
-            landmarkType = "7">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            shouldBeEnabled = "No"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "../RedAnt ERP Mobile/common/pdfCreator/TextDrawable.m"
-            timestampString = "505895899.214773"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "679"
-            endingLineNumber = "679"
-            landmarkName = "-Draw:dataSource:ParentRect:startX:startY:flipHeight:range:"
-            landmarkType = "7">
-         </BreakpointContent>
-      </BreakpointProxy>
       <BreakpointProxy
          BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
          <BreakpointContent
@@ -222,12 +10,12 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/PageViewController.m"
-            timestampString = "505896870.817727"
+            timestampString = "506423722.633212"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "123"
-            endingLineNumber = "123"
-            landmarkName = "-refreshControl"
+            startingLineNumber = "1180"
+            endingLineNumber = "1180"
+            landmarkName = "-keyboardWillShow:"
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
@@ -238,108 +26,12 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/PageViewController.m"
-            timestampString = "505896967.171446"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "127"
-            endingLineNumber = "127"
-            landmarkName = "-refreshControl"
-            landmarkType = "7">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            shouldBeEnabled = "No"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "common/SignatureListViewController.m"
-            timestampString = "505902254.409883"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "308"
-            endingLineNumber = "308"
-            landmarkName = "-tableView:cellForRowAtIndexPath:"
-            landmarkType = "7">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            shouldBeEnabled = "No"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "common/PageViewController.m"
-            timestampString = "505985022.780204"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "895"
-            endingLineNumber = "895"
-            landmarkName = "-TouchImageViewOnTouche:"
-            landmarkType = "7">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            shouldBeEnabled = "No"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "common/DocumentPageViewController.m"
-            timestampString = "505902254.409883"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "678"
-            endingLineNumber = "678"
-            landmarkName = "-viewControllerAtIndex:"
-            landmarkType = "7">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            shouldBeEnabled = "No"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "common/DocumentPageViewController.m"
-            timestampString = "505902254.409883"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "689"
-            endingLineNumber = "689"
-            landmarkName = "-viewControllerAtIndex:"
-            landmarkType = "7">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            shouldBeEnabled = "No"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "common/DocumentPageViewController.m"
-            timestampString = "505902254.409883"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "685"
-            endingLineNumber = "685"
-            landmarkName = "-viewControllerAtIndex:"
-            landmarkType = "7">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            shouldBeEnabled = "No"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "common/DocumentPageViewController.m"
-            timestampString = "505902254.409883"
+            timestampString = "506423722.633212"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "677"
-            endingLineNumber = "677"
-            landmarkName = "-viewControllerAtIndex:"
+            startingLineNumber = "1231"
+            endingLineNumber = "1231"
+            landmarkName = "-keyboardWillHide:"
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
@@ -350,12 +42,12 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/PageViewController.m"
-            timestampString = "505985022.780204"
+            timestampString = "506423722.633212"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "246"
-            endingLineNumber = "246"
-            landmarkName = "-addTextView:destView:index:"
+            startingLineNumber = "1230"
+            endingLineNumber = "1230"
+            landmarkName = "-keyboardWillHide:"
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
@@ -366,12 +58,12 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/PageViewController.m"
-            timestampString = "505985022.780204"
+            timestampString = "506423722.633212"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "235"
-            endingLineNumber = "235"
-            landmarkName = "-addTextView:destView:index:"
+            startingLineNumber = "1181"
+            endingLineNumber = "1181"
+            landmarkName = "-keyboardWillShow:"
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>

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

@@ -14,7 +14,32 @@
          </PersistentStrings>
       </ContextState>
       <ContextState
-         contextName = "+[ACNetwork prepare_addtional_params:]:ACNetwork.m">
+         contextName = "-[PDFViewController loadcontent]:PDFViewController.m">
+      </ContextState>
+      <ContextState
+         contextName = "-[PageViewController keyboardWillShow:]:PageViewController.m">
+         <PersistentStrings>
+            <PersistentString
+               value = "self.hotTextView">
+            </PersistentString>
+         </PersistentStrings>
+      </ContextState>
+      <ContextState
+         contextName = "__41-[PageViewController CheckButtonClicked:]_block_invoke:PageViewController.m">
+      </ContextState>
+      <ContextState
+         contextName = "-[PDFViewController onActionClick:]:PDFViewController.m">
+      </ContextState>
+      <ContextState
+         contextName = "+[ACNetwork get_json:parameters:]:ACNetwork.m">
+         <PersistentStrings>
+            <PersistentString
+               value = "[e aes256_encrypt:@&quot;usai2010&quot;]">
+            </PersistentString>
+         </PersistentStrings>
+      </ContextState>
+      <ContextState
+         contextName = "__32-[PDFViewController loadcontent]_block_invoke:PDFViewController.m">
       </ContextState>
       <ContextState
          contextName = "-[PageViewController textViewDidEndEditing:]:PageViewController.m">
@@ -23,10 +48,10 @@
                value = "textView.text">
             </PersistentString>
             <PersistentString
-               value = "[text floatValue]">
+               value = "12345678*0.1">
             </PersistentString>
             <PersistentString
-               value = "12345678*0.1">
+               value = "[text floatValue]">
             </PersistentString>
             <PersistentString
                value = "[text stringByReplacingOccurrencesOfString:@&quot;$&quot; withString:@&quot;&quot; ] floatValue]">
@@ -42,18 +67,10 @@
          </PersistentStrings>
       </ContextState>
       <ContextState
-         contextName = "-[PageViewController addTextView:destView:index:]:PageViewController.m">
-      </ContextState>
-      <ContextState
-         contextName = "__41-[PageViewController CheckButtonClicked:]_block_invoke:PageViewController.m">
+         contextName = "+[ACNetwork prepare_addtional_params:]:ACNetwork.m">
       </ContextState>
       <ContextState
-         contextName = "+[ACNetwork get_json:parameters:]:ACNetwork.m">
-         <PersistentStrings>
-            <PersistentString
-               value = "[e aes256_encrypt:@&quot;usai2010&quot;]">
-            </PersistentString>
-         </PersistentStrings>
+         contextName = "-[PageViewController addTextView:destView:index:]:PageViewController.m">
       </ContextState>
    </ContextStates>
 </VariablesViewState>

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

@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="11762" systemVersion="15G1212" targetRuntime="iOS.CocoaTouch.iPad" propertyAccessControl="none" colorMatched="YES" initialViewController="UmP-Fl-ZUI">
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="11762" systemVersion="16A323" targetRuntime="iOS.CocoaTouch.iPad" propertyAccessControl="none" colorMatched="YES" initialViewController="UmP-Fl-ZUI">
     <device id="ipad9_7" orientation="portrait">
         <adaptation id="fullscreen"/>
     </device>
@@ -263,11 +263,11 @@
                                         <rect key="frame" x="0.0" y="28" width="360" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="v4l-du-pTm" id="JkA-pY-NIV">
-                                            <rect key="frame" x="0.0" y="0.0" width="360" height="43.5"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="360" height="44"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="Title" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="Ofv-pg-h2w">
-                                                    <rect key="frame" x="15" y="0.0" width="330" height="43.5"/>
+                                                    <rect key="frame" x="15" y="0.0" width="330" height="43"/>
                                                     <autoresizingMask key="autoresizingMask"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="16"/>
                                                     <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
@@ -383,7 +383,7 @@
                                         <rect key="frame" x="0.0" y="28" width="768" height="128"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="KmC-hR-Rfo" id="twt-7p-gUd">
-                                            <rect key="frame" x="0.0" y="0.0" width="768" height="127.5"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="768" height="128"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" text="GE2016121201" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="eH3-OQ-M6Q">

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

@@ -60,7 +60,6 @@
 		7128C3541E12548C00FF635B /* PDFScrollView.m in Sources */ = {isa = PBXBuildFile; fileRef = 7128C34D1E12548C00FF635B /* PDFScrollView.m */; };
 		7128C3551E12548C00FF635B /* SignatureListViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 7128C34F1E12548C00FF635B /* SignatureListViewController.m */; };
 		7128C3561E12548C00FF635B /* SignatureTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 7128C3511E12548C00FF635B /* SignatureTableViewCell.m */; };
-		714B87091E24AE0800A40D18 /* Test.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 714B87081E24AE0800A40D18 /* Test.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 */; };
@@ -169,7 +168,6 @@
 		7128C34F1E12548C00FF635B /* SignatureListViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SignatureListViewController.m; path = ../../common/SignatureListViewController.m; sourceTree = "<group>"; };
 		7128C3501E12548C00FF635B /* SignatureTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SignatureTableViewCell.h; path = ../../common/SignatureTableViewCell.h; sourceTree = "<group>"; };
 		7128C3511E12548C00FF635B /* SignatureTableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SignatureTableViewCell.m; path = ../../common/SignatureTableViewCell.m; sourceTree = "<group>"; };
-		714B87081E24AE0800A40D18 /* Test.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = Test.storyboard; sourceTree = "<group>"; };
 		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>"; };
@@ -227,7 +225,6 @@
 				7128C29A1E12506200FF635B /* pdfedit */,
 				7128C2711E124FFE00FF635B /* signature */,
 				7128C2671E124FF200FF635B /* Main.storyboard */,
-				714B87081E24AE0800A40D18 /* Test.storyboard */,
 				7128C2691E124FF200FF635B /* LaunchScreen.storyboard */,
 				7128C24F1E124F4500FF635B /* Info.plist */,
 				7128C3361E12540F00FF635B /* ACNetwork.h */,
@@ -470,7 +467,6 @@
 				7128C2701E124FF200FF635B /* LaunchScreen.storyboard in Resources */,
 				7115D45F1E16326C00EF4E4C /* CommonEditor.storyboard in Resources */,
 				7172434A1E1E208F00800678 /* GEIC - Home Improvement Contract 2017.pdf in Resources */,
-				714B87091E24AE0800A40D18 /* Test.storyboard in Resources */,
 				7128C27D1E12500B00FF635B /* signature.storyboard in Resources */,
 				7128C2E81E12511B00FF635B /* LICENSE in Resources */,
 				714B870B1E24CAE300A40D18 /* debug.json in Resources */,

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

@@ -79,6 +79,7 @@
         "control_1": {
             "aname": "Customer Name",
             "type": "TextView","margin_left":"4",
+            "margin_top":"14",
             
             "required": true,
             "pos_x": 222,
@@ -104,6 +105,7 @@
             "type": "TextView","margin_left":"1",
             "required": true,
             "tv_vmargin":0.6,
+            "margin_top": "3",
             "pos_x": 248,
             "pos_y": 285,
             "width": 397,
@@ -115,6 +117,7 @@
             "aname": "Jobsite City",
             "type": "TextView","margin_left":"1",
             "required": true,
+            "margin_top": "-1",
             "tv_vmargin":0.3,
             "pos_x": 248,
             "pos_y": 300,
@@ -128,6 +131,7 @@
             "type": "TextView","margin_left":"1",
             "required": true,
             "tv_vmargin":0.3,
+            "margin_top": "-1",
             "capital":"charater",
             "pos_x": 432,
             "pos_y": 300,
@@ -138,6 +142,7 @@
         },
         "control_17": {
             "aname": "Jobsite Zipcode",
+            "margin_top": "-1",
             "type": "TextView","margin_left":"1",
             "required": true,
             "tv_vmargin":0.3,
@@ -700,10 +705,10 @@
             "aname": "Agent Signature",
             "type": "Signature",
             "required": true,
-            "pos_x": 143,
-            "pos_y": 746,
-            "width": 200,
-            "height": 45,
+            "pos_x": 163,
+            "pos_y": 756,
+            "width": 146,
+            "height": 24,
             "name": "Agent Of Contractor",
             "value": ""
         },
@@ -711,10 +716,10 @@
             "aname": "Homeowner Signature",
             "type": "Signature",
             "required": true,
-            "pos_x": 385,
-            "pos_y": 746,
-            "width": 240,
-            "height": 45,
+            "pos_x": 405,
+            "pos_y": 756,
+            "width": 146,
+            "height": 24,
             "name": "Homeowner",
             "value": ""
         },
@@ -722,6 +727,7 @@
             "aname": "Agent Name",
             "type": "TextView",
             "textAlignment":"center",
+            "margin_top": "2",
             "size":"10",
             "tv_vmargin":0.5,
             "required": true,
@@ -737,6 +743,7 @@
             "tv_vmargin":0.5,
             "type": "TextView",
             "textAlignment":"center",
+            "margin_top": "2",
             "size":"10",
             "required": true,
             "pos_x": 472,
@@ -768,6 +775,7 @@
             "width": 165,
             "height": 14,
             "field": "owner_name",
+            "margin_top": "2",
             "value": ""
         },
         "control_6": {
@@ -777,6 +785,7 @@
             "type": "TextView",
             "textAlignment":"center",
             "size":"10",
+            "margin_top": "2",
             "required": true,
             "pos_x": 472,
             "pos_y": 834,
@@ -869,9 +878,9 @@
             "aname": "Homeowner Signature",
             "type": "Signature",
             "required": true,
-            "pos_x": 132,
+            "pos_x": 150,
             "pos_y": 808,
-            "width": 185,
+            "width": 146,
             "height": 24,
             "name": "Homeowner",
             "value": ""
@@ -880,9 +889,9 @@
             "aname": "Handwrite Print name",
             "type": "Signature",
             "required": true,
-            "pos_x": 352,
+            "pos_x": 370,
             "pos_y": 808,
-            "width": 183,
+            "width": 148,
             "height": 24,
             "name": "Homeowner Print Name",
             "value": ""
@@ -928,9 +937,9 @@
             "type": "Signature",
             "required": true,
             "pos_x": 127,
-            "pos_y": 537,
+            "pos_y": 553,
             "width": 146,
-            "height": 40,
+            "height": 24,
             "name": "Homeowner",
             "value": ""
         },
@@ -939,9 +948,9 @@
             "type": "Signature",
             "required": true,
             "pos_x": 326,
-            "pos_y": 537,
+            "pos_y": 553,
             "width": 148,
-            "height": 40,
+            "height": 24,
             "name": "Homeowner Print Name",
             "value": ""
         },
@@ -949,10 +958,10 @@
             "aname": "Handwrite date",
             "type": "Signature",
             "required": true,
-            "pos_x": 546,
-            "pos_y": 537,
-            "width": 75,
-            "height": 40,
+            "pos_x": 552,
+            "pos_y": 553,
+            "width": 60,
+            "height": 24,
             "name": "Date",
             "value": ""
         },

+ 646 - 588
Ants Contract/Granite Expo eSign/debug.json

@@ -1,5 +1,180 @@
 {
-    "count": 5,
+    "page_3": {
+        "control_3": {
+            "aname": "Initial",
+            "type": "Signature",
+            "required": true,
+            "pos_y": 724,
+            "name": "Customer Initial",
+            "value": "/Users/Ray/Library/Developer/CoreSimulator/Devices/981DC680-B46B-40A8-9AF0-7EA992F36F82/data/Containers/Data/Application/F13D3800-7B6E-49E0-9BBF-2CCA950CCB02/tmp/ADB5AEE4-D162-4652-BAEB-72E0692E1D86.png",
+            "can_fill": "true",
+            "pos_x": 615,
+            "width": 30,
+            "height": 15
+        },
+        "control_1": {
+            "aname": "Initial",
+            "type": "Signature",
+            "required": true,
+            "pos_y": 660,
+            "name": "Customer Initial",
+            "value": "/Users/Ray/Library/Developer/CoreSimulator/Devices/981DC680-B46B-40A8-9AF0-7EA992F36F82/data/Containers/Data/Application/F13D3800-7B6E-49E0-9BBF-2CCA950CCB02/tmp/ADB5AEE4-D162-4652-BAEB-72E0692E1D86.png",
+            "can_fill": "true",
+            "pos_x": 615,
+            "width": 30,
+            "height": 15
+        },
+        "control_7": {
+            "aname": "Handwrite Date",
+            "type": "Signature",
+            "required": true,
+            "pos_y": 808,
+            "name": "Date",
+            "value": "/Users/Ray/Library/Developer/CoreSimulator/Devices/981DC680-B46B-40A8-9AF0-7EA992F36F82/data/Containers/Data/Application/F13D3800-7B6E-49E0-9BBF-2CCA950CCB02/tmp/1E1EB23F-A379-4A4F-B14B-21618AC4CE88.png",
+            "pos_x": 566,
+            "width": 60,
+            "height": 24
+        },
+        "control_8": {
+            "type": "Image",
+            "pos_y": 898,
+            "required": true,
+            "name": "BarCode",
+            "value": "/Users/Ray/Library/Developer/CoreSimulator/Devices/981DC680-B46B-40A8-9AF0-7EA992F36F82/data/Containers/Data/Application/F13D3800-7B6E-49E0-9BBF-2CCA950CCB02/tmp/AC386FB3-9369-4ED5-BA89-82A0518AF3E6.png",
+            "pos_x": 500,
+            "width": 150,
+            "height": 22
+        },
+        "control_6": {
+            "aname": "Handwrite Print name",
+            "type": "Signature",
+            "required": true,
+            "pos_y": 808,
+            "name": "Homeowner Print Name",
+            "value": "/Users/Ray/Library/Developer/CoreSimulator/Devices/981DC680-B46B-40A8-9AF0-7EA992F36F82/data/Containers/Data/Application/F13D3800-7B6E-49E0-9BBF-2CCA950CCB02/tmp/4B490A1E-E614-447A-8A0C-B9423CED7845.png",
+            "pos_x": 352,
+            "width": 183,
+            "height": 24
+        },
+        "control_4": {
+            "aname": "Initial",
+            "type": "Signature",
+            "required": true,
+            "pos_y": 762,
+            "name": "Customer Initial",
+            "value": "/Users/Ray/Library/Developer/CoreSimulator/Devices/981DC680-B46B-40A8-9AF0-7EA992F36F82/data/Containers/Data/Application/F13D3800-7B6E-49E0-9BBF-2CCA950CCB02/tmp/ADB5AEE4-D162-4652-BAEB-72E0692E1D86.png",
+            "can_fill": "true",
+            "pos_x": 615,
+            "width": 30,
+            "height": 15
+        },
+        "control_2": {
+            "aname": "Initial",
+            "type": "Signature",
+            "required": true,
+            "pos_y": 687,
+            "name": "Customer Initial",
+            "value": "/Users/Ray/Library/Developer/CoreSimulator/Devices/981DC680-B46B-40A8-9AF0-7EA992F36F82/data/Containers/Data/Application/F13D3800-7B6E-49E0-9BBF-2CCA950CCB02/tmp/ADB5AEE4-D162-4652-BAEB-72E0692E1D86.png",
+            "can_fill": "true",
+            "pos_x": 615,
+            "width": 30,
+            "height": 15
+        },
+        "control_0": {
+            "aname": "Initial",
+            "type": "Signature",
+            "required": true,
+            "pos_y": 644,
+            "name": "Customer Initial",
+            "value": "/Users/Ray/Library/Developer/CoreSimulator/Devices/981DC680-B46B-40A8-9AF0-7EA992F36F82/data/Containers/Data/Application/F13D3800-7B6E-49E0-9BBF-2CCA950CCB02/tmp/ADB5AEE4-D162-4652-BAEB-72E0692E1D86.png",
+            "can_fill": "true",
+            "pos_x": 615,
+            "width": 30,
+            "height": 15
+        },
+        "control_9": {
+            "height": 11,
+            "field": "doc_number",
+            "type": "Label",
+            "pos_y": 917,
+            "required": true,
+            "value": "GE2017010507",
+            "pos_x": 543,
+            "width": 64,
+            "textAlignment": "center",
+            "size": "8"
+        },
+        "count": 10,
+        "control_5": {
+            "aname": "Homeowner Signature",
+            "type": "Signature",
+            "required": true,
+            "pos_y": 808,
+            "name": "Homeowner",
+            "value": "/Users/Ray/Library/Developer/CoreSimulator/Devices/981DC680-B46B-40A8-9AF0-7EA992F36F82/data/Containers/Data/Application/F13D3800-7B6E-49E0-9BBF-2CCA950CCB02/tmp/BDDD11DB-296F-480B-8E8F-F361BE3BF9F6.png",
+            "pos_x": 132,
+            "width": 185,
+            "height": 24
+        }
+    },
+    "page_4": {
+        "control_1": {
+            "aname": "Handwrite Print Name",
+            "type": "Signature",
+            "required": true,
+            "pos_y": 537,
+            "name": "Homeowner Print Name",
+            "value": "/Users/Ray/Library/Developer/CoreSimulator/Devices/981DC680-B46B-40A8-9AF0-7EA992F36F82/data/Containers/Data/Application/F13D3800-7B6E-49E0-9BBF-2CCA950CCB02/tmp/4B490A1E-E614-447A-8A0C-B9423CED7845.png",
+            "pos_x": 326,
+            "width": 148,
+            "height": 40
+        },
+        "count": 5,
+        "control_2": {
+            "aname": "Handwrite date",
+            "type": "Signature",
+            "required": true,
+            "pos_y": 537,
+            "name": "Date",
+            "value": "/Users/Ray/Library/Developer/CoreSimulator/Devices/981DC680-B46B-40A8-9AF0-7EA992F36F82/data/Containers/Data/Application/F13D3800-7B6E-49E0-9BBF-2CCA950CCB02/tmp/1E1EB23F-A379-4A4F-B14B-21618AC4CE88.png",
+            "pos_x": 546,
+            "width": 75,
+            "height": 40
+        },
+        "control_3": {
+            "type": "Image",
+            "pos_y": 898,
+            "required": true,
+            "name": "BarCode",
+            "value": "/Users/Ray/Library/Developer/CoreSimulator/Devices/981DC680-B46B-40A8-9AF0-7EA992F36F82/data/Containers/Data/Application/F13D3800-7B6E-49E0-9BBF-2CCA950CCB02/tmp/AC386FB3-9369-4ED5-BA89-82A0518AF3E6.png",
+            "pos_x": 500,
+            "width": 150,
+            "height": 22
+        },
+        "control_0": {
+            "aname": "Homeowner Signature",
+            "type": "Signature",
+            "required": true,
+            "pos_y": 537,
+            "name": "Homeowner",
+            "value": "/Users/Ray/Library/Developer/CoreSimulator/Devices/981DC680-B46B-40A8-9AF0-7EA992F36F82/data/Containers/Data/Application/F13D3800-7B6E-49E0-9BBF-2CCA950CCB02/tmp/BDDD11DB-296F-480B-8E8F-F361BE3BF9F6.png",
+            "pos_x": 127,
+            "width": 146,
+            "height": 40
+        },
+        "control_4": {
+            "height": 11,
+            "field": "doc_number",
+            "type": "Label",
+            "pos_y": 917,
+            "required": true,
+            "value": "GE2017010507",
+            "pos_x": 543,
+            "width": 64,
+            "textAlignment": "center",
+            "size": "8"
+        }
+    },
     "signature_name": [
                        "Customer Initial",
                        "Decision Maker",
@@ -9,18 +184,8 @@
                        "Date"
                        ],
     "page_0": {
-        "count": 21,
         "control_0": {
-            "type": "Ignor",
-            "required": false,
             "pos_x": 122,
-            "pos_y": 132,
-            "width": 522,
-            "height": 80,
-            "field": "team",
-            "title": "team button",
-            "single_select": true,
-            "show_detail": true,
             "marker_size": 8,
             "cadedate": [
                          [
@@ -74,113 +239,48 @@
                            ]
                           ]
                          ],
-            "value": []
-        },
-        "control_1": {
-            "aname": "Customer Name",
-            "type": "TextView","margin_left":"4",
-            
-            "required": true,
-            "pos_x": 222,
-            "pos_y": 253,
-            "width": 183,
-            "height": 30,
-            "field": "customer_name",
-            "value": "TEST TEXT VIEW VALUE , length test 123 456 789 000- abcdefg hijklmn opqrstuv wxyz"
+            "single_select": true,
+            "title": "team button",
+            "type": "Ignor",
+            "required": false,
+            "pos_y": 132,
+            "show_detail": true,
+            "height": 80,
+            "value": [],
+            "width": 522,
+            "field": "team"
         },
         "control_2": {
+            "margin_left": "4",
             "aname": "Job Date",
-            "type": "DatePicker","margin_left":"4",
+            "type": "DatePicker",
             "required": false,
-            "pos_x": 488,
             "pos_y": 253,
+            "value": "01/18/2017",
+            "pos_x": 488,
             "width": 156,
             "height": 30,
-            "field": "job_date",
-            "value": "12/09/2016"
-        },
-        "control_3": {
-            "aname": "Jobsite Address",
-            "type": "TextView","margin_left":"1",
-            "required": true,
-            "pos_x": 248,
-            "pos_y": 285,
-            "width": 397,
-            "height": 15,
-            "field": "job_addr",
-            "value": "TEST TEXT VIEW VALUE , length test 123 456 789 000- abcdefg hijklmn opqrstuv wxyz"
-        },
-        "control_15": {
-            "aname": "Jobsite City",
-            "type": "TextView","margin_left":"1",
-            "required": true,
-            "pos_x": 248,
-            "pos_y": 300,
-            "width": 152,
-            "height": 15,
-            "field": "job_city",
-            "value": "TEST TEXT VIEW VALUE , length test 123 456 789 000- abcdefg hijklmn opqrstuv wxyz"
-        },
-        "control_16": {
-            "aname": "Jobsite State",
-            "type": "TextView","margin_left":"1",
-            "required": true,
-            "pos_x": 432,
-            "pos_y": 300,
-            "width": 115,
-            "height": 15,
-            "field": "job_state",
-            "value": "TEST TEXT VIEW VALUE , length test 123 456 789 000- abcdefg hijklmn opqrstuv wxyz"
-        },
-        "control_17": {
-            "aname": "Jobsite Zipcode",
-            "type": "TextView","margin_left":"1",
-            "required": true,
-            "pos_x": 570,
-            "pos_y": 300,
-            "width": 74,
-            "height": 15,
-            "field": "job_zip",
-            "value": "TEST TEXT VIEW VALUE , length test 123 456 789 000- abcdefg hijklmn opqrstuv wxyz"
+            "field": "job_date"
         },
         "control_4": {
+            "margin_left": "4",
             "aname": "Telephone",
             "format": "us_tel",
-            "type": "TextView","margin_left":"4",
+            "type": "TextView",
             "required": true,
-            "pos_x": 222,
             "pos_y": 317,
+            "value": "1 (111) 222 3333-44445",
+            "pos_x": 222,
             "width": 183,
             "height": 30,
-            "field": "tel",
-            "value": "1 (555) 444 3333-12345"
-        },
-        "control_5": {
-            "aname": "Today's Date","margin_left":"4",
-            "type": "DatePicker",
-            "required": true,
-            "pos_x": 488,
-            "pos_y": 317,
-            "width": 156,
-            "height": 30,
-            "field": "today_date",
-            "value": "12/09/2016"
+            "field": "tel"
         },
         "control_6": {
-            "aname": "Contract Price",
-            "type": "TextView","margin_left":"4",
-            "required": true,
             "pos_x": 222,
-            "pos_y": 349,
-            "width": 183,
-            "value_type":"float",
-            "height": 30,
-            "prefix_str":"$ ",
-            "field": "contract_price",
+            "type": "TextView",
+            "required": true,
             "action": {
                 "set_val": {
-                    "condition": "true",
-                    "count": 2,
                     "item_0": {
                         "control": "control_7",
                         "value": "*0.1"
@@ -188,114 +288,124 @@
                     "item_1": {
                         "control": "control_8",
                         "value": "*0.9"
-                    }
+                    },
+                    "count": 2,
+                    "condition": "true"
                 }
             },
-            "value": "$ 1234.56"
-        },
-        "control_7": {
-            "aname": "Labor Deposit",
-            "type": "TextView","margin_left":"4",
-            "required": true,
-            "pos_x": 488,
             "pos_y": 349,
-            "width": 85,
+            "prefix_str": "$ ",
+            "margin_left": "4",
             "height": 30,
-            "field": "labor_deposit",
-            "value_type":"float",
-            "prefix_str":"$ ",
-            "disable": true,
-            "action": {
-                "set_val": {
-                    "condition": "true",
-                    "count": 1,
-                    "item_0": {
-                        "control": "control_8",
-                        "value": "control_6-control_7"
-                    }
-                }
-            },
-            "value": "234.00"
+            "value": "$ 2000.00",
+            "width": 183,
+            "field": "contract_price",
+            "aname": "Contract Price",
+            "value_type": "float"
         },
-        "control_18": {
-            "type": "Check",
+        "control_8": {
+            "pos_x": 222,
+            "type": "TextView",
             "required": true,
-            "pos_x": 584,
-            "pos_y": 355,
-            "width": 40,
-            "height": 20,
-            "field": "deposit_percent",
-            "title": "team button",
-            "single_select": true,
-            "show_detail": false,
-            "size": "10",
-            "cadedate": [
-                         [
-                          [
-                           "10%"
-                           ],
-                          [],
-                          {
-                          "memo": "action",
-                          "disable": [
-                                      "control_7"
-                                      ],
-                          "set_val": {
-                          "condition": "true",
-                          "count": 2,
-                          "item_0": {
-                          "control": "control_7",
-                          "value": "*0.1"
-                          },
-                          "item_1": {
-                          "control": "control_8",
-                          "value": "*0.9"
-                          }
-                          }
-                          }
-                          ],
-                         [
-                          [
-                           "Other"
-                           ],
-                          [],
-                          {
-                          "memo": "action",
-                          "enable": [
-                                     "control_7"
-                                     ]
-                          }
-                          ]
-                         ],
-            "value": [
-                      0
-                      ]
-        },
-        "control_8": {
+            "pos_y": 382,
+            "margin_left": "4",
+            "height": 40,
+            "disable": true,
+            "value": "$ 1800.00",
+            "width": 183,
+            "field": "balance",
             "aname": "Balance on Account",
-            "type": "TextView","margin_left":"4",
+            "value_type": "float"
+        },
+        "control_20": {
+            "height": 11,
+            "field": "doc_number",
+            "type": "Label",
+            "pos_y": 917,
+            "required": true,
+            "value": "GE2017010507",
+            "pos_x": 543,
+            "width": 64,
+            "textAlignment": "center",
+            "size": "8"
+        },
+        "control_19": {
+            "type": "Image",
+            "pos_y": 898,
+            "required": true,
+            "name": "BarCode",
+            "value": "/Users/Ray/Library/Developer/CoreSimulator/Devices/981DC680-B46B-40A8-9AF0-7EA992F36F82/data/Containers/Data/Application/F13D3800-7B6E-49E0-9BBF-2CCA950CCB02/tmp/AC386FB3-9369-4ED5-BA89-82A0518AF3E6.png",
+            "pos_x": 500,
+            "width": 150,
+            "height": 22
+        },
+        "count": 21,
+        "control_1": {
+            "margin_left": "4",
+            "aname": "Customer Name",
+            "type": "TextView",
             "required": true,
-            "value_type":"float",
+            "margin_top": "1",
+            "pos_y": 253,
+            "value": "Customer Name",
             "pos_x": 222,
-            "pos_y": 382,
             "width": 183,
-            "height": 40,
-            "field": "balance",
+            "height": 30,
+            "field": "customer_name"
+        },
+        "control_3": {
+            "margin_left": "1",
+            "margin_top": "3",
+            "field": "job_addr",
+            "aname": "Jobsite Address",
+            "type": "TextView",
+            "required": true,
+            "pos_y": 285,
+            "value": "Test Address F12",
+            "pos_x": 248,
+            "width": 397,
+            "tv_vmargin": 0.6,
+            "height": 15
+        },
+        "control_5": {
+            "margin_left": "4",
+            "aname": "Today's Date",
+            "type": "DatePicker",
+            "required": true,
+            "pos_y": 317,
+            "value": "01/18/2017",
+            "pos_x": 488,
+            "width": 156,
+            "height": 30,
+            "field": "today_date"
+        },
+        "control_7": {
+            "pos_x": 488,
+            "type": "TextView",
+            "required": true,
+            "action": {
+                "set_val": {
+                    "count": 1,
+                    "condition": "true",
+                    "item_0": {
+                        "control": "control_8",
+                        "value": "control_6-control_7"
+                    }
+                }
+            },
+            "pos_y": 349,
+            "prefix_str": "$ ",
+            "margin_left": "4",
+            "height": 30,
             "disable": true,
-            "value": "999.00"
+            "value": "$ 200.00",
+            "width": 85,
+            "field": "labor_deposit",
+            "aname": "Labor Deposit",
+            "value_type": "float"
         },
         "control_9": {
-            "aname": "Service",
-            "type": "Check",
-            "required": true,
             "pos_x": 122,
-            "pos_y": 538,
-            "width": 522,
-            "height": 70,
-            "field": "service",
-            "title": "service button",
-            "single_select": false,
-            "show_detail": false,
             "marker_size": 6,
             "cadedate": [
                          [
@@ -349,211 +459,300 @@
                            ]
                           ]
                          ],
-            "value": [0,1,2,3,4]
+            "single_select": false,
+            "title": "service button",
+            "type": "Check",
+            "required": true,
+            "pos_y": 538,
+            "show_detail": false,
+            "height": 70,
+            "value": [
+                      2,
+                      4
+                      ],
+            "width": 522,
+            "field": "service",
+            "aname": "Service"
+        },
+        "control_15": {
+            "margin_left": "1",
+            "field": "job_city",
+            "aname": "Jobsite City",
+            "type": "TextView",
+            "margin_top": "-1",
+            "required": true,
+            "pos_y": 300,
+            "value": "Test City",
+            "pos_x": 248,
+            "width": 152,
+            "tv_vmargin": 0.3,
+            "height": 15
+        },
+        "control_16": {
+            "pos_x": 432,
+            "type": "TextView",
+            "required": true,
+            "pos_y": 300,
+            "margin_left": "1",
+            "margin_top": "-1",
+            "height": 15,
+            "tv_vmargin": 0.3,
+            "value": "CALIFOLIA",
+            "capital": "charater",
+            "width": 115,
+            "field": "job_state",
+            "aname": "Jobsite State"
+        },
+        "control_17": {
+            "margin_left": "1",
+            "margin_top": "-1",
+            "field": "job_zip",
+            "aname": "Jobsite Zipcode",
+            "type": "TextView",
+            "required": true,
+            "pos_y": 300,
+            "value": "123456-789",
+            "pos_x": 570,
+            "width": 74,
+            "tv_vmargin": 0.3,
+            "height": 15
+        },
+        "control_18": {
+            "pos_x": 584,
+            "cadedate": [
+                         [
+                          [
+                           "10%"
+                           ],
+                          [],
+                          {
+                          "set_val": {
+                          "item_0": {
+                          "control": "control_7",
+                          "value": "*0.1"
+                          },
+                          "item_1": {
+                          "control": "control_8",
+                          "value": "*0.9"
+                          },
+                          "count": 2,
+                          "condition": "true"
+                          },
+                          "memo": "action",
+                          "disable": [
+                                      "control_7"
+                                      ]
+                          }
+                          ],
+                         [
+                          [
+                           "Other"
+                           ],
+                          [],
+                          {
+                          "enable": [
+                                     "control_7"
+                                     ],
+                          "memo": "action"
+                          }
+                          ]
+                         ],
+            "single_select": true,
+            "title": "team button",
+            "type": "Check",
+            "required": true,
+            "size": "10",
+            "pos_y": 355,
+            "show_detail": false,
+            "height": 20,
+            "value": [
+                      0
+                      ],
+            "width": 40,
+            "field": "deposit_percent"
         },
         "control_10": {
             "aname": "Initial",
             "type": "Signature",
             "required": true,
-            "pos_x": 615,
             "pos_y": 693,
-            "width": 30,
-            "height": 15,
             "name": "Customer Initial",
-            "value": "TEST TEXT VIEW VALUE , length test 123 456 789 000- abcdefg hijklmn opqrstuv wxyz"
+            "value": "/Users/Ray/Library/Developer/CoreSimulator/Devices/981DC680-B46B-40A8-9AF0-7EA992F36F82/data/Containers/Data/Application/F13D3800-7B6E-49E0-9BBF-2CCA950CCB02/tmp/ADB5AEE4-D162-4652-BAEB-72E0692E1D86.png",
+            "can_fill": "true",
+            "pos_x": 615,
+            "width": 30,
+            "height": 15
         },
         "control_11": {
             "aname": "Initial",
             "type": "Signature",
             "required": true,
-            "pos_x": 615,
             "pos_y": 730,
-            "width": 30,
-            "height": 15,
             "name": "Customer Initial",
-            "value": "TEST TEXT VIEW VALUE , length test 123 456 789 000- abcdefg hijklmn opqrstuv wxyz"
+            "value": "/Users/Ray/Library/Developer/CoreSimulator/Devices/981DC680-B46B-40A8-9AF0-7EA992F36F82/data/Containers/Data/Application/F13D3800-7B6E-49E0-9BBF-2CCA950CCB02/tmp/ADB5AEE4-D162-4652-BAEB-72E0692E1D86.png",
+            "can_fill": "true",
+            "pos_x": 615,
+            "width": 30,
+            "height": 15
         },
         "control_12": {
             "aname": "Initial",
             "type": "Signature",
             "required": true,
-            "pos_x": 615,
             "pos_y": 779,
-            "width": 30,
-            "height": 15,
             "name": "Customer Initial",
-            "value": "TEST TEXT VIEW VALUE , length test 123 456 789 000- abcdefg hijklmn opqrstuv wxyz"
+            "value": "/Users/Ray/Library/Developer/CoreSimulator/Devices/981DC680-B46B-40A8-9AF0-7EA992F36F82/data/Containers/Data/Application/F13D3800-7B6E-49E0-9BBF-2CCA950CCB02/tmp/ADB5AEE4-D162-4652-BAEB-72E0692E1D86.png",
+            "can_fill": "true",
+            "pos_x": 615,
+            "width": 30,
+            "height": 15
         },
         "control_13": {
             "aname": "Initial",
             "type": "Signature",
             "required": true,
-            "pos_x": 615,
             "pos_y": 795,
-            "width": 30,
-            "height": 15,
             "name": "Customer Initial",
-            "value": "TEST TEXT VIEW VALUE , length test 123 456 789 000- abcdefg hijklmn opqrstuv wxyz"
+            "value": "/Users/Ray/Library/Developer/CoreSimulator/Devices/981DC680-B46B-40A8-9AF0-7EA992F36F82/data/Containers/Data/Application/F13D3800-7B6E-49E0-9BBF-2CCA950CCB02/tmp/ADB5AEE4-D162-4652-BAEB-72E0692E1D86.png",
+            "can_fill": "true",
+            "pos_x": 615,
+            "width": 30,
+            "height": 15
         },
         "control_14": {
             "aname": "Initial",
             "type": "Signature",
             "required": true,
-            "pos_x": 615,
             "pos_y": 844,
-            "width": 30,
-            "height": 15,
             "name": "Customer Initial",
-            "value": "TEST TEXT VIEW VALUE , length test 123 456 789 000- abcdefg hijklmn opqrstuv wxyz"
-        },
-        "control_20": {
-            "type": "Label",
-            "textAlignment":"center",
-            "required": true,
-            "pos_x": 543,
-            "pos_y": 917,
-            "width": 64,
-            "size": "8",
-            "height": 11,
-            "field": "doc_number",
-            "value": "TEST TEXT VIEW VALUE , length test 123 456 789 000- abcdefg hijklmn opqrstuv wxyz"
-        },
-        "control_19": {
-            
-            "type": "Image",
-            "required": true,
-            "pos_x": 500,
-            "pos_y": 898,
-            "width": 150,
-            "height": 22,
-            "name": "BarCode",
-            "value": "TEST TEXT VIEW VALUE , length test 123 456 789 000- abcdefg hijklmn opqrstuv wxyz"
+            "value": "/Users/Ray/Library/Developer/CoreSimulator/Devices/981DC680-B46B-40A8-9AF0-7EA992F36F82/data/Containers/Data/Application/F13D3800-7B6E-49E0-9BBF-2CCA950CCB02/tmp/ADB5AEE4-D162-4652-BAEB-72E0692E1D86.png",
+            "can_fill": "true",
+            "pos_x": 615,
+            "width": 30,
+            "height": 15
         }
     },
     "page_1": {
-        "count": 21,
         "control_0": {
             "aname": "Initial",
             "type": "Signature",
             "required": true,
-            "pos_x": 615,
             "pos_y": 79,
-            "width": 30,
-            "height": 15,
             "name": "Customer Initial",
-            "value": "TEST TEXT VIEW VALUE , length test 123 456 789 000- abcdefg hijklmn opqrstuv wxyz"
-        },
-        "control_1": {
-            "aname": "Decision Maker",
-            "type": "Signature",
-            "required": true,
-            "pos_x": 230,
-            "pos_y": 87,
-            "width": 200,
-            "height": 20,
-            "name": "Decision Maker",
-            "value": "TEST TEXT VIEW VALUE , length test 123 456 789 000- abcdefg hijklmn opqrstuv wxyz"
+            "value": "/Users/Ray/Library/Developer/CoreSimulator/Devices/981DC680-B46B-40A8-9AF0-7EA992F36F82/data/Containers/Data/Application/F13D3800-7B6E-49E0-9BBF-2CCA950CCB02/tmp/ADB5AEE4-D162-4652-BAEB-72E0692E1D86.png",
+            "can_fill": "true",
+            "pos_x": 615,
+            "width": 30,
+            "height": 15
         },
         "control_2": {
             "aname": "Initial",
             "type": "Signature",
             "required": true,
-            "pos_x": 615,
             "pos_y": 148,
-            "width": 30,
-            "height": 15,
             "name": "Customer Initial",
-            "value": "TEST TEXT VIEW VALUE , length test 123 456 789 000- abcdefg hijklmn opqrstuv wxyz"
-        },
-        "control_3": {
-            "aname": "Initial",
-            "type": "Signature",
-            "required": true,
+            "value": "/Users/Ray/Library/Developer/CoreSimulator/Devices/981DC680-B46B-40A8-9AF0-7EA992F36F82/data/Containers/Data/Application/F13D3800-7B6E-49E0-9BBF-2CCA950CCB02/tmp/ADB5AEE4-D162-4652-BAEB-72E0692E1D86.png",
+            "can_fill": "true",
             "pos_x": 615,
-            "pos_y": 168,
             "width": 30,
-            "height": 15,
-            "name": "Customer Initial",
-            "value": "TEST TEXT VIEW VALUE , length test 123 456 789 000- abcdefg hijklmn opqrstuv wxyz"
+            "height": 15
         },
         "control_4": {
             "aname": "Initial",
             "type": "Signature",
             "required": true,
-            "pos_x": 615,
             "pos_y": 195,
-            "width": 30,
-            "height": 15,
             "name": "Customer Initial",
-            "value": "TEST TEXT VIEW VALUE , length test 123 456 789 000- abcdefg hijklmn opqrstuv wxyz"
+            "value": "/Users/Ray/Library/Developer/CoreSimulator/Devices/981DC680-B46B-40A8-9AF0-7EA992F36F82/data/Containers/Data/Application/F13D3800-7B6E-49E0-9BBF-2CCA950CCB02/tmp/ADB5AEE4-D162-4652-BAEB-72E0692E1D86.png",
+            "can_fill": "true",
+            "pos_x": 615,
+            "width": 30,
+            "height": 15
         },
-        "control_5": {
+        "control_6": {
             "aname": "Initial",
             "type": "Signature",
             "required": true,
+            "pos_y": 280,
+            "name": "Customer Initial",
+            "value": "/Users/Ray/Library/Developer/CoreSimulator/Devices/981DC680-B46B-40A8-9AF0-7EA992F36F82/data/Containers/Data/Application/F13D3800-7B6E-49E0-9BBF-2CCA950CCB02/tmp/ADB5AEE4-D162-4652-BAEB-72E0692E1D86.png",
+            "can_fill": "true",
             "pos_x": 615,
-            "pos_y": 232,
             "width": 30,
-            "height": 15,
-            "name": "Customer Initial",
-            "value": "TEST TEXT VIEW VALUE , length test 123 456 789 000- abcdefg hijklmn opqrstuv wxyz"
+            "height": 15
         },
-        "control_6": {
+        "control_8": {
             "aname": "Initial",
             "type": "Signature",
             "required": true,
+            "pos_y": 333,
+            "name": "Customer Initial",
+            "value": "/Users/Ray/Library/Developer/CoreSimulator/Devices/981DC680-B46B-40A8-9AF0-7EA992F36F82/data/Containers/Data/Application/F13D3800-7B6E-49E0-9BBF-2CCA950CCB02/tmp/ADB5AEE4-D162-4652-BAEB-72E0692E1D86.png",
+            "can_fill": "true",
             "pos_x": 615,
-            "pos_y": 280,
             "width": 30,
-            "height": 15,
-            "name": "Customer Initial",
-            "value": "TEST TEXT VIEW VALUE , length test 123 456 789 000- abcdefg hijklmn opqrstuv wxyz"
+            "height": 15
         },
-        "control_7": {
+        "control_18": {
+            "type": "Image",
+            "pos_y": 898,
+            "required": true,
+            "name": "BarCode",
+            "value": "/Users/Ray/Library/Developer/CoreSimulator/Devices/981DC680-B46B-40A8-9AF0-7EA992F36F82/data/Containers/Data/Application/F13D3800-7B6E-49E0-9BBF-2CCA950CCB02/tmp/AC386FB3-9369-4ED5-BA89-82A0518AF3E6.png",
+            "pos_x": 500,
+            "width": 150,
+            "height": 22
+        },
+        "count": 21,
+        "control_1": {
+            "aname": "Decision Maker",
+            "type": "Signature",
+            "required": true,
+            "pos_y": 87,
+            "name": "Decision Maker",
+            "value": "/Users/Ray/Library/Developer/CoreSimulator/Devices/981DC680-B46B-40A8-9AF0-7EA992F36F82/data/Containers/Data/Application/F13D3800-7B6E-49E0-9BBF-2CCA950CCB02/tmp/90B9A5DC-D1BE-47CE-BDD1-E7F657BA3402.png",
+            "pos_x": 230,
+            "width": 200,
+            "height": 20
+        },
+        "control_3": {
             "aname": "Initial",
             "type": "Signature",
             "required": true,
+            "pos_y": 168,
+            "name": "Customer Initial",
+            "value": "/Users/Ray/Library/Developer/CoreSimulator/Devices/981DC680-B46B-40A8-9AF0-7EA992F36F82/data/Containers/Data/Application/F13D3800-7B6E-49E0-9BBF-2CCA950CCB02/tmp/ADB5AEE4-D162-4652-BAEB-72E0692E1D86.png",
+            "can_fill": "true",
             "pos_x": 615,
-            "pos_y": 307,
             "width": 30,
-            "height": 15,
-            "name": "Customer Initial",
-            "value": "TEST TEXT VIEW VALUE , length test 123 456 789 000- abcdefg hijklmn opqrstuv wxyz"
+            "height": 15
         },
-        "control_8": {
+        "control_5": {
             "aname": "Initial",
             "type": "Signature",
             "required": true,
+            "pos_y": 232,
+            "name": "Customer Initial",
+            "value": "/Users/Ray/Library/Developer/CoreSimulator/Devices/981DC680-B46B-40A8-9AF0-7EA992F36F82/data/Containers/Data/Application/F13D3800-7B6E-49E0-9BBF-2CCA950CCB02/tmp/ADB5AEE4-D162-4652-BAEB-72E0692E1D86.png",
+            "can_fill": "true",
             "pos_x": 615,
-            "pos_y": 333,
             "width": 30,
-            "height": 15,
-            "name": "Customer Initial",
-            "value": "TEST TEXT VIEW VALUE , length test 123 456 789 000- abcdefg hijklmn opqrstuv wxyz"
+            "height": 15
         },
-        "control_20": {
+        "control_7": {
             "aname": "Initial",
             "type": "Signature",
             "required": true,
+            "pos_y": 307,
+            "name": "Customer Initial",
+            "value": "/Users/Ray/Library/Developer/CoreSimulator/Devices/981DC680-B46B-40A8-9AF0-7EA992F36F82/data/Containers/Data/Application/F13D3800-7B6E-49E0-9BBF-2CCA950CCB02/tmp/ADB5AEE4-D162-4652-BAEB-72E0692E1D86.png",
+            "can_fill": "true",
             "pos_x": 615,
-            "pos_y": 370,
             "width": 30,
-            "height": 15,
-            "name": "Customer Initial",
-            "value": "TEST TEXT VIEW VALUE , length test 123 456 789 000- abcdefg hijklmn opqrstuv wxyz"
+            "height": 15
         },
         "control_9": {
-            "aname": "Joint Seams Option",
-            "type": "Check",
-            "required": true,
             "pos_x": 135,
-            "pos_y": 463,
-            "width": 475,
-            "height": 50,
-            "field": "joint_seams",
-            "title": "joint seams",
-            "single_select": true,
-            "show_detail": true,
             "marker_size": 6,
             "cadedate": [
                          [
@@ -587,387 +786,246 @@
                            ]
                           ]
                          ],
-            "value": [2]
+            "single_select": true,
+            "title": "joint seams",
+            "type": "Check",
+            "required": true,
+            "pos_y": 463,
+            "show_detail": true,
+            "height": 50,
+            "value": [
+                      1
+                      ],
+            "width": 475,
+            "field": "joint_seams",
+            "aname": "Joint Seams Option"
         },
-        "control_10": {
+        "control_20": {
             "aname": "Initial",
             "type": "Signature",
             "required": true,
+            "pos_y": 370,
+            "name": "Customer Initial",
+            "value": "/Users/Ray/Library/Developer/CoreSimulator/Devices/981DC680-B46B-40A8-9AF0-7EA992F36F82/data/Containers/Data/Application/F13D3800-7B6E-49E0-9BBF-2CCA950CCB02/tmp/ADB5AEE4-D162-4652-BAEB-72E0692E1D86.png",
+            "can_fill": "true",
             "pos_x": 615,
-            "pos_y": 408,
             "width": 30,
-            "height": 15,
+            "height": 15
+        },
+        "control_10": {
+            "aname": "Initial",
+            "type": "Signature",
+            "required": true,
+            "pos_y": 408,
             "name": "Customer Initial",
-            "value": "TEST TEXT VIEW VALUE , length test 123 456 789 000- abcdefg hijklmn opqrstuv wxyz"
+            "value": "/Users/Ray/Library/Developer/CoreSimulator/Devices/981DC680-B46B-40A8-9AF0-7EA992F36F82/data/Containers/Data/Application/F13D3800-7B6E-49E0-9BBF-2CCA950CCB02/tmp/ADB5AEE4-D162-4652-BAEB-72E0692E1D86.png",
+            "can_fill": "true",
+            "pos_x": 615,
+            "width": 30,
+            "height": 15
         },
         "control_11": {
             "aname": "Initial",
             "type": "Signature",
             "required": true,
-            "pos_x": 615,
             "pos_y": 434,
-            "width": 30,
-            "height": 15,
             "name": "Customer Initial",
-            "value": "TEST TEXT VIEW VALUE , length test 123 456 789 000- abcdefg hijklmn opqrstuv wxyz"
+            "value": "/Users/Ray/Library/Developer/CoreSimulator/Devices/981DC680-B46B-40A8-9AF0-7EA992F36F82/data/Containers/Data/Application/F13D3800-7B6E-49E0-9BBF-2CCA950CCB02/tmp/ADB5AEE4-D162-4652-BAEB-72E0692E1D86.png",
+            "can_fill": "true",
+            "pos_x": 615,
+            "width": 30,
+            "height": 15
         },
         "control_12": {
             "aname": "Initial",
             "type": "Signature",
             "required": true,
-            "pos_x": 615,
             "pos_y": 495,
-            "width": 30,
-            "height": 15,
             "name": "Customer Initial",
-            "value": "TEST TEXT VIEW VALUE , length test 123 456 789 000- abcdefg hijklmn opqrstuv wxyz"
+            "value": "/Users/Ray/Library/Developer/CoreSimulator/Devices/981DC680-B46B-40A8-9AF0-7EA992F36F82/data/Containers/Data/Application/F13D3800-7B6E-49E0-9BBF-2CCA950CCB02/tmp/ADB5AEE4-D162-4652-BAEB-72E0692E1D86.png",
+            "can_fill": "true",
+            "pos_x": 615,
+            "width": 30,
+            "height": 15
         },
         "control_13": {
             "aname": "Initial",
             "type": "Signature",
             "required": true,
-            "pos_x": 615,
             "pos_y": 533,
-            "width": 30,
-            "height": 15,
             "name": "Customer Initial",
-            "value": "TEST TEXT VIEW VALUE , length test 123 456 789 000- abcdefg hijklmn opqrstuv wxyz"
+            "value": "/Users/Ray/Library/Developer/CoreSimulator/Devices/981DC680-B46B-40A8-9AF0-7EA992F36F82/data/Containers/Data/Application/F13D3800-7B6E-49E0-9BBF-2CCA950CCB02/tmp/ADB5AEE4-D162-4652-BAEB-72E0692E1D86.png",
+            "can_fill": "true",
+            "pos_x": 615,
+            "width": 30,
+            "height": 15
         },
         "control_14": {
             "aname": "Initial",
             "type": "Signature",
             "required": true,
-            "pos_x": 615,
             "pos_y": 592,
-            "width": 30,
-            "height": 15,
             "name": "Customer Initial",
-            "value": "TEST TEXT VIEW VALUE , length test 123 456 789 000- abcdefg hijklmn opqrstuv wxyz"
+            "value": "/Users/Ray/Library/Developer/CoreSimulator/Devices/981DC680-B46B-40A8-9AF0-7EA992F36F82/data/Containers/Data/Application/F13D3800-7B6E-49E0-9BBF-2CCA950CCB02/tmp/ADB5AEE4-D162-4652-BAEB-72E0692E1D86.png",
+            "can_fill": "true",
+            "pos_x": 615,
+            "width": 30,
+            "height": 15
         },
         "control_15": {
             "aname": "Initial",
             "type": "Signature",
             "required": true,
-            "pos_x": 615,
             "pos_y": 609,
-            "width": 30,
-            "height": 15,
             "name": "Customer Initial",
-            "value": "TEST TEXT VIEW VALUE , length test 123 456 789 000- abcdefg hijklmn opqrstuv wxyz"
+            "value": "/Users/Ray/Library/Developer/CoreSimulator/Devices/981DC680-B46B-40A8-9AF0-7EA992F36F82/data/Containers/Data/Application/F13D3800-7B6E-49E0-9BBF-2CCA950CCB02/tmp/ADB5AEE4-D162-4652-BAEB-72E0692E1D86.png",
+            "can_fill": "true",
+            "pos_x": 615,
+            "width": 30,
+            "height": 15
         },
         "control_16": {
             "aname": "Initial",
             "type": "Signature",
             "required": true,
-            "pos_x": 615,
             "pos_y": 626,
-            "width": 30,
-            "height": 15,
             "name": "Customer Initial",
-            "value": "TEST TEXT VIEW VALUE , length test 123 456 789 000- abcdefg hijklmn opqrstuv wxyz"
+            "value": "/Users/Ray/Library/Developer/CoreSimulator/Devices/981DC680-B46B-40A8-9AF0-7EA992F36F82/data/Containers/Data/Application/F13D3800-7B6E-49E0-9BBF-2CCA950CCB02/tmp/ADB5AEE4-D162-4652-BAEB-72E0692E1D86.png",
+            "can_fill": "true",
+            "pos_x": 615,
+            "width": 30,
+            "height": 15
         },
         "control_19": {
+            "height": 11,
+            "field": "doc_number",
             "type": "Label",
-            "textAlignment":"center",
+            "pos_y": 917,
             "required": true,
+            "value": "GE2017010507",
             "pos_x": 543,
-            "pos_y": 917,
             "width": 64,
-            "size": "8",
-            "height": 11,
-            "field": "doc_number",
-            "value": "TEST TEXT VIEW VALUE , length test 123 456 789 000- abcdefg hijklmn opqrstuv wxyz"
-        },
-        "control_18": {
-            "type": "Image",
-            "required": true,
-            "pos_x": 500,
-            "pos_y": 898,
-            "width": 150,
-            "height": 22,
-            "name": "BarCode",
-            "value": "TEST TEXT VIEW VALUE , length test 123 456 789 000- abcdefg hijklmn opqrstuv wxyz"
+            "textAlignment": "center",
+            "size": "8"
         }
     },
+    "count": 5,
     "page_2": {
-        "count": 10,
-        "control_0": {
-            "aname": "Agent Signature",
-            "type": "Signature",
+        "control_3": {
+            "pos_x": 472,
+            "type": "TextView",
+            "size": "10",
             "required": true,
-            "pos_x": 143,
-            "pos_y": 746,
-            "width": 200,
-            "height": 45,
-            "name": "Agent Of Contractor",
-            "value": "TEST TEXT VIEW VALUE , length test 123 456 789 000- abcdefg hijklmn opqrstuv wxyz"
+            "textAlignment": "center",
+            "pos_y": 803,
+            "height": 14,
+            "tv_vmargin": 0.5,
+            "value": "Print Name",
+            "margin_top": "2",
+            "width": 165,
+            "field": "customer_name_1",
+            "aname": "Print Name"
         },
         "control_1": {
             "aname": "Homeowner Signature",
             "type": "Signature",
             "required": true,
-            "pos_x": 385,
             "pos_y": 746,
-            "width": 240,
-            "height": 45,
             "name": "Homeowner",
-            "value": "TEST TEXT VIEW VALUE , length test 123 456 789 000- abcdefg hijklmn opqrstuv wxyz"
+            "value": "/Users/Ray/Library/Developer/CoreSimulator/Devices/981DC680-B46B-40A8-9AF0-7EA992F36F82/data/Containers/Data/Application/F13D3800-7B6E-49E0-9BBF-2CCA950CCB02/tmp/BDDD11DB-296F-480B-8E8F-F361BE3BF9F6.png",
+            "pos_x": 385,
+            "width": 240,
+            "height": 45
         },
-        "control_2": {
-            "aname": "Agent Name",
-            "type": "TextView",
-            "textAlignment":"center",
-            "size":"10",
+        "control_8": {
+            "type": "Image",
+            "pos_y": 898,
             "required": true,
-            "pos_x": 194,
-            "pos_y": 803,
-            "width": 160,
-            "height": 14,
-            "field": "agent_name",
-            "value": "TEST TEXT VIEW VALUE , length test 123 456 789 000- abcdefg hijklmn opqrstuv wxyz"
+            "name": "BarCode",
+            "value": "/Users/Ray/Library/Developer/CoreSimulator/Devices/981DC680-B46B-40A8-9AF0-7EA992F36F82/data/Containers/Data/Application/F13D3800-7B6E-49E0-9BBF-2CCA950CCB02/tmp/AC386FB3-9369-4ED5-BA89-82A0518AF3E6.png",
+            "pos_x": 500,
+            "width": 150,
+            "height": 22
         },
-        "control_3": {
-            "aname": "Print Name",
+        "control_6": {
+            "pos_x": 472,
             "type": "TextView",
-            "textAlignment":"center",
-            "size":"10",
+            "size": "10",
             "required": true,
-            "pos_x": 472,
-            "pos_y": 803,
-            "width": 165,
+            "textAlignment": "center",
+            "pos_y": 834,
             "height": 14,
-            "field": "customer_name_1",
-            "value": "TEST TEXT VIEW VALUE , length test 123 456 789 000- abcdefg hijklmn opqrstuv wxyz"
+            "tv_vmargin": 0.5,
+            "value": "(555) 444 3331-11233",
+            "width": 165,
+            "field": "tel1",
+            "margin_top": "2",
+            "aname": "Telephone Number",
+            "format": "us_tel"
         },
         "control_4": {
             "type": "Ignor",
+            "pos_y": 818,
             "required": false,
+            "value": "",
             "pos_x": 194,
-            "pos_y": 818,
             "width": 160,
             "height": 14,
-            "field": "signor_name",
-            "value": "TEST TEXT VIEW VALUE , length test 123 456 789 000- abcdefg hijklmn opqrstuv wxyz"
+            "field": "signor_name"
         },
-        "control_5": {
-            "aname": "Homeowner Name",
-            "type": "TextView",
-            "textAlignment":"center",
-            "required": true,
-            "size":"10",
-            "pos_x": 472,
-            "pos_y": 818,
-            "width": 165,
-            "height": 14,
-            "field": "owner_name",
-            "value": "TEST TEXT VIEW VALUE , length test 123 456 789 000- abcdefg hijklmn opqrstuv wxyz"
-        },
-        "control_6": {
-            "aname": "Telephone Number",
-            "format": "us_tel",
+        "control_2": {
+            "pos_x": 194,
             "type": "TextView",
-            "textAlignment":"center",
-            "size":"10",
+            "margin_top": "2",
+            "size": "10",
             "required": true,
-            "pos_x": 472,
-            "pos_y": 834,
-            "width": 165,
+            "textAlignment": "center",
+            "pos_y": 803,
             "height": 14,
-            "field": "tel1",
-            "value": "1 (555) 444 3333-12345"
-        },
-        "control_9": {
-            "type": "Label",
-            "textAlignment":"center",
-            "required": true,
-            "pos_x": 543,
-            "pos_y": 917,
-            "width": 64,
-            "size": "8",
-            "height": 11,
-            "field": "doc_number",
-            "value": "TEST TEXT VIEW VALUE , length test 123 456 789 000- abcdefg hijklmn opqrstuv wxyz"
+            "tv_vmargin": 0.5,
+            "value": "Agent Name",
+            "width": 160,
+            "field": "agent_name",
+            "aname": "Agent Name"
         },
-        "control_8": {
-            "type": "Image",
-            "required": true,
-            "pos_x": 500,
-            "pos_y": 898,
-            "width": 150,
-            "height": 22,
-            "name": "BarCode",
-            "value": "TEST TEXT VIEW VALUE , length test 123 456 789 000- abcdefg hijklmn opqrstuv wxyz"
-        }
-    },
-    "page_3": {
-        "count": 10,
         "control_0": {
-            "aname": "Initial",
-            "type": "Signature",
-            "required": true,
-            "pos_x": 615,
-            "pos_y": 644,
-            "width": 30,
-            "height": 15,
-            "name": "Customer Initial",
-            "value": "TEST TEXT VIEW VALUE , length test 123 456 789 000- abcdefg hijklmn opqrstuv wxyz"
-        },
-        "control_1": {
-            "aname": "Initial",
-            "type": "Signature",
-            "required": true,
-            "pos_x": 615,
-            "pos_y": 660,
-            "width": 30,
-            "height": 15,
-            "name": "Customer Initial",
-            "value": "TEST TEXT VIEW VALUE , length test 123 456 789 000- abcdefg hijklmn opqrstuv wxyz"
-        },
-        "control_2": {
-            "aname": "Initial",
-            "type": "Signature",
-            "required": true,
-            "pos_x": 615,
-            "pos_y": 687,
-            "width": 30,
-            "height": 15,
-            "name": "Customer Initial",
-            "value": "TEST TEXT VIEW VALUE , length test 123 456 789 000- abcdefg hijklmn opqrstuv wxyz"
-        },
-        "control_3": {
-            "aname": "Initial",
-            "type": "Signature",
-            "required": true,
-            "pos_x": 615,
-            "pos_y": 724,
-            "width": 30,
-            "height": 15,
-            "name": "Customer Initial",
-            "value": "TEST TEXT VIEW VALUE , length test 123 456 789 000- abcdefg hijklmn opqrstuv wxyz"
-        },
-        "control_4": {
-            "aname": "Initial",
-            "type": "Signature",
-            "required": true,
-            "pos_x": 615,
-            "pos_y": 762,
-            "width": 30,
-            "height": 15,
-            "name": "Customer Initial",
-            "value": "TEST TEXT VIEW VALUE , length test 123 456 789 000- abcdefg hijklmn opqrstuv wxyz"
-        },
-        "control_5": {
-            "aname": "Homeowner Signature",
-            "type": "Signature",
-            "required": true,
-            "pos_x": 132,
-            "pos_y": 808,
-            "width": 185,
-            "height": 24,
-            "name": "Homeowner",
-            "value": "TEST TEXT VIEW VALUE , length test 123 456 789 000- abcdefg hijklmn opqrstuv wxyz"
-        },
-        "control_6": {
-            "aname": "Handwrite Print name",
-            "type": "Signature",
-            "required": true,
-            "pos_x": 352,
-            "pos_y": 808,
-            "width": 183,
-            "height": 24,
-            "name": "Homeowner Print Name",
-            "value": "TEST TEXT VIEW VALUE , length test 123 456 789 000- abcdefg hijklmn opqrstuv wxyz"
-        },
-        "control_7": {
-            "aname": "Handwrite Date",
+            "aname": "Agent Signature",
             "type": "Signature",
             "required": true,
-            "pos_x": 566,
-            "pos_y": 808,
-            "width": 60,
-            "height": 24,
-            "name": "Date",
-            "value": "TEST TEXT VIEW VALUE , length test 123 456 789 000- abcdefg hijklmn opqrstuv wxyz"
+            "pos_y": 746,
+            "name": "Agent Of Contractor",
+            "value": "/Users/Ray/Library/Developer/CoreSimulator/Devices/981DC680-B46B-40A8-9AF0-7EA992F36F82/data/Containers/Data/Application/F13D3800-7B6E-49E0-9BBF-2CCA950CCB02/tmp/6D0F0EA1-7752-466F-9F9C-BF351C1CE690.png",
+            "pos_x": 143,
+            "width": 200,
+            "height": 45
         },
         "control_9": {
-            "type": "Label",
-            "textAlignment":"center",
-            "required": true,
-            "pos_x": 543,
-            "pos_y": 917,
-            "width": 64,
-            "size": "8",
             "height": 11,
             "field": "doc_number",
-            "value": "TEST TEXT VIEW VALUE , length test 123 456 789 000- abcdefg hijklmn opqrstuv wxyz"
-        },
-        "control_8": {
-            "type": "Image",
-            "required": true,
-            "pos_x": 500,
-            "pos_y": 898,
-            "width": 150,
-            "height": 22,
-            "name": "BarCode",
-            "value": "TEST TEXT VIEW VALUE , length test 123 456 789 000- abcdefg hijklmn opqrstuv wxyz"
-        }
-    },
-    "page_4": {
-        "count": 5,
-        "control_0": {
-            "aname": "Homeowner Signature",
-            "type": "Signature",
-            "required": true,
-            "pos_x": 127,
-            "pos_y": 537,
-            "width": 146,
-            "height": 40,
-            "name": "Homeowner",
-            "value": "TEST TEXT VIEW VALUE , length test 123 456 789 000- abcdefg hijklmn opqrstuv wxyz"
-        },
-        "control_1": {
-            "aname": "Handwrite Print Name",
-            "type": "Signature",
-            "required": true,
-            "pos_x": 326,
-            "pos_y": 537,
-            "width": 148,
-            "height": 40,
-            "name": "Homeowner Print Name",
-            "value": "TEST TEXT VIEW VALUE , length test 123 456 789 000- abcdefg hijklmn opqrstuv wxyz"
-        },
-        "control_2": {
-            "aname": "Handwrite date",
-            "type": "Signature",
-            "required": true,
-            "pos_x": 546,
-            "pos_y": 537,
-            "width": 75,
-            "height": 40,
-            "name": "Date",
-            "value": "TEST TEXT VIEW VALUE , length test 123 456 789 000- abcdefg hijklmn opqrstuv wxyz"
-        },
-        "control_4": {
             "type": "Label",
-            "textAlignment":"center",
+            "pos_y": 917,
             "required": true,
+            "value": "GE2017010507",
             "pos_x": 543,
-            "pos_y": 917,
             "width": 64,
-            "size": "8",
-            "height": 11,
-            "field": "doc_number",
-            "value": "TEST TEXT VIEW VALUE , length test 123 456 789 000- abcdefg hijklmn opqrstuv wxyz"
+            "textAlignment": "center",
+            "size": "8"
         },
-        "control_3": {
-            "type": "Image",
+        "count": 10,
+        "control_5": {
+            "pos_x": 472,
+            "type": "TextView",
             "required": true,
-            "pos_x": 500,
-            "pos_y": 898,
-            "width": 150,
-            "height": 22,
-            "name": "BarCode",
-            "value": "TEST TEXT VIEW VALUE , length test 123 456 789 000- abcdefg hijklmn opqrstuv wxyz"
+            "margin_top": "2",
+            "size": "10",
+            "textAlignment": "center",
+            "pos_y": 818,
+            "height": 14,
+            "tv_vmargin": 0.5,
+            "value": "House Owner",
+            "width": 165,
+            "field": "owner_name",
+            "aname": "Homeowner Name"
         }
     }
 }

+ 10 - 4
Ants Contract/common/DocumentListViewController.m

@@ -112,7 +112,7 @@
     }];
 }
 
--(void) previewPDF:(NSString*)url
+-(void) previewPDF:(NSString*)url title:(NSString*)title subject:(NSString*)subject
 {
     NSString* name=@"";//[self.content_data[indexPath.row] valueForKey:@"tear_name"];
 //    NSString* url= file;//[self.content_data[indexPath.row] valueForKey:@"pdf_path"];
@@ -126,11 +126,12 @@
     ViewController.canSave = false;
     ViewController.isLocalfile=isLocalFile;
     ViewController.defaultStyle = true;
-    NSString* subject;
+    ViewController.save_name = title;
+ //   NSString* subject;
     //                    if (company.length==0) {
     
 //    NSString* cur_time =[RAUtils current_date];
-    subject =name;//[NSString stringWithFormat:@"NPD Product List %@",cur_time];
+ //   subject =name;//[NSString stringWithFormat:@"NPD Product List %@",cur_time];
     
 //    AppDelegate *appDelegate = (AppDelegate*)[[UIApplication sharedApplication] delegate];
     //    NSString* customer_email=    [appDelegate.customerInfo valueForKey:@"customer_email"];
@@ -802,7 +803,12 @@
     
     NSString* pdf_url = item_json[@"pdf_path1"];
     
-    [self previewPDF:pdf_url];
+    NSString* subject = [NSString stringWithFormat:@"%@ %@, %@ %@",item_json[@"doc_number"],item_json[@"customer_name"],item_json[@"signed_date"],item_json[@"signed_time"]];
+
+    
+    [self previewPDF:pdf_url title:item_json[@"doc_number"] subject:subject];
+    
+
     
 //    if(self.blk_Select)
 //    {

+ 1 - 1
Ants Contract/common/DocumentPageViewController.h

@@ -23,5 +23,5 @@
 @property (strong, nonatomic) NSString* docment_id;
 @property long current_page;
 
-@property (nonatomic , copy) void (^OnSave)(NSString * file);
+@property (nonatomic , copy) void (^OnSave)(NSString * file, NSString* subject );
 @end

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

@@ -92,7 +92,7 @@
 
 - (void)viewDidLoad {
     [super viewDidLoad];
-    
+    self.title = self.docment_id;
     
     //    self.delegate = self;
     //    self.dataSource = self;
@@ -365,7 +365,7 @@
     
    // for(int l=0;l<1;l++)
     {
-     pdffile = [PDFUtils SavePDF:self.controlTemplate source:self.document window_rect:CGRectMake(0, 0, 768, 960)];
+        pdffile = [PDFUtils SavePDF:self.controlTemplate source:self.document window_rect:CGRectMake(0, 0, 768, 960) name:self.docment_id];
     
     
      zipfile=[ACNetwork prepareUploadFile:pdffile json:self.controlTemplate];
@@ -407,9 +407,10 @@
                                     if([[json valueForKey:@"result"] intValue]==2)
                                     {
                 
+                                        
                                         [weakSelf.navigationController popToRootViewControllerAnimated:false];
                                         if(weakSelf.OnSave)
-                                            weakSelf.OnSave(pdffile);
+                                            weakSelf.OnSave(pdffile,json[@"subject"]);
                 
                 
                                     }
@@ -830,7 +831,7 @@
     {
         if(more>0)
         {
-            NSString* msg=[NSString stringWithFormat:@"And %d more missing field.",more];
+            NSString* msg=[NSString stringWithFormat:@"And %d more missing fields.",more];
             
             [fields addObject:@"......"];
                 [fields addObject:msg];

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

@@ -25,4 +25,7 @@
 @property (strong, nonatomic) NSMutableDictionary * controlTemplate;
 
 @property (strong, nonatomic) NSMutableDictionary * signatureData;
+@property (strong, nonatomic) UITextView * hotTextView;
+@property bool keyboard_show;
+@property int keyboard_h;
 @end

+ 196 - 1
Ants Contract/common/PageViewController.m

@@ -32,11 +32,19 @@
 - (void)viewDidLoad {
     [super viewDidLoad];
     
+//    
+//    self.pdfScrollView = [[PDFScrollView alloc]initWithFrame:CGRectMake(0, 64, 768, 960)];
+//    self.pdfScrollView.backgroundColor= [UIColor redColor];
+    
+    //self.edgesForExtendedLayout = UIRectEdgeNone;
     //   self.pageIndex=1;
     
     // self.pdfPageView.pageIndex=self.pageIndex;
     self.pdfPageView.pageRef= self.pageRef;
     
+    self.pdfScrollView.contentSize = self.pdfScrollView.frame.size;
+    self.keyboard_h=0;
+    
     [self initControl];
     
     //    UIPinchGestureRecognizer *pinchGestureRecognizer = [[UIPinchGestureRecognizer alloc]
@@ -49,8 +57,28 @@
 }
 -(void)viewWillAppear:(BOOL)animated
 {
+    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(keyboardWillShow:) name:UIKeyboardWillShowNotification object:nil];
+    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(keyboardWillHide:) name:UIKeyboardWillHideNotification object:nil];
+    
+    // 键盘高度变化通知,ios5.0新增的
+#ifdef __IPHONE_5_0
+    float version = [[[UIDevice currentDevice] systemVersion] floatValue];
+    if (version >= 5.0) {
+        [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(keyboardWillChangeFrame:) name:UIKeyboardWillChangeFrameNotification object:nil];
+    }
+#endif
+    
+//    self.pdfScrollView.contentSize = self.pdfScrollView.frame.size;
+   
     [self refreshControl];
 }
+
+-(void) viewWillDisappear:(BOOL)animated
+{
+    [self.hotTextView endEditing:true];
+    [[NSNotificationCenter defaultCenter] removeObserver:self];
+
+}
 -(void) dealloc
 {
  //   CFBridgingRelease(self.pageRef);
@@ -497,6 +525,20 @@
     return subView;
     
 }
+- (void)scrollViewDidEndZooming:(UIScrollView *)scrollView withView:(nullable UIView *)view atScale:(CGFloat)scale
+{
+    CGPoint contentOffsetPoint = self.pdfScrollView.contentOffset;
+    CGSize contentSize =self.pdfScrollView.contentSize;//frame.size;
+//    CGSize size1 = self.pdfScrollView.bounds.size;
+//    NSLog(@"frame:%@ bound:%@", NSStringFromCGSize(contentSize),NSStringFromCGSize(size1) );
+    contentSize.height+=self.keyboard_h;
+    contentOffsetPoint.y+=self.keyboard_h;
+    
+    
+    
+    self.pdfScrollView.contentSize =contentSize;
+    self.pdfScrollView.contentOffset=contentOffsetPoint;
+}
 //- (void)scrollViewDidEndZooming:(UIScrollView *)scrollView withView:(UIView *)view atScale:(float)scale {
 //
 //
@@ -671,6 +713,7 @@
 }
 
 #pragma mark TextViewDelegate
+
 - (BOOL)textView:(UITextView *)textView shouldChangeTextInRange:(NSRange)range replacementText:(NSString *)text
 {
         long index = textView.tag - CONTROL_BASE;
@@ -776,6 +819,19 @@
     
 
 
+}
+//- (void)textViewDidBeginEditing:(UITextView *)textView
+//{
+//    self.hotTextView = textView;
+//}
+
+- (BOOL)textViewShouldBeginEditing:(UITextView *)textView
+{
+    
+    NSLog(@"textViewShouldBeginEditing");
+    
+    self.hotTextView = textView;//(UITableViewCell*)textView.superview.superview;
+    return textView.editable;
 }
 - (void)textViewDidEndEditing:(UITextView *)textView
 {
@@ -956,7 +1012,7 @@
             
             __block UIImage* signimg=nil;
             SignatureViewController * vc =[ [UIStoryboard storyboardWithName:@"signature" bundle:[NSBundle mainBundle]] instantiateViewControllerWithIdentifier:@"SignatureViewController"];
-            
+            vc.title =[NSString stringWithFormat:@"Signature: %@",control_json[@"name"]];
             vc.onReturnImg = ^(UIImage* img)
             {
                 
@@ -1086,6 +1142,145 @@
     
 }
 
+#pragma mark Responding to keyboard events
+- (CGRect)relativeFrameForScreenWithView:(UIView *)v
+{
+    UIWindow * window=[[[UIApplication sharedApplication] delegate] window];
+    CGRect rect=[v convertRect: v.bounds toView:window];
+    return rect;
+    
+    
+    //    BOOL iOS7 = [[[UIDevice currentDevice] systemVersion] floatValue] >= 7;
+    //
+    //    CGFloat screenHeight = [UIScreen mainScreen].bounds.size.height;
+    //    if (!iOS7) {
+    //        screenHeight -= 20;
+    //    }
+    //    UIView *view = v;
+    //    CGFloat x = .0;
+    //    CGFloat y = .0;
+    //    while (view.frame.size.width != 320 || view.frame.size.height != screenHeight) {
+    //        x += view.frame.origin.x;
+    //        y += view.frame.origin.y;
+    //        view = view.superview;
+    //        if ([view isKindOfClass:[UIScrollView class]]) {
+    //            x -= ((UIScrollView *) view).contentOffset.x;
+    //            y -= ((UIScrollView *) view).contentOffset.y;
+    //        }
+    //    }
+    //    return CGRectMake(x, y, v.frame.size.width, v.frame.size.height);
+}
+
+- (void)keyboardWillChangeFrame:(NSNotification *)notification {
+    NSLog(@"keyboardWillChangeFrame");
+}
+- (void)keyboardWillShow:(NSNotification *)notification {
+    NSLog(@"keyboardWillShow");
+    
+    if(self.keyboard_show)
+        return;
+    
+    self.keyboard_show=true;
+    /*
+     Reduce the size of the text view so that it's not obscured by the keyboard.
+     Animate the resize so that it's in sync with the appearance of the keyboard.
+     */
+    
+    NSDictionary *userInfo = [notification userInfo];
+    
+    NSValue* aValue = [userInfo objectForKey:UIKeyboardFrameEndUserInfoKey];
+    CGSize keyboardSize = [aValue CGRectValue].size;
+    NSLog(@"keyboard height:%f",keyboardSize.height);
+
+    
+    CGRect cellrect_screen = [self relativeFrameForScreenWithView:self.hotTextView];
+    CGRect rect_screen = [ UIScreen mainScreen ].bounds;
+    int cellpos = cellrect_screen.origin.y+cellrect_screen.size.height;
+    if(cellpos>rect_screen.size.height-keyboardSize.height)
+    {
+        //  self.resize = true;
+        
+        self.keyboard_h =keyboardSize.height;
+        CGPoint contentOffsetPoint = self.pdfScrollView.contentOffset;
+        CGSize contentSize =self.pdfScrollView.contentSize;//frame.size;
+        CGSize size1 = self.pdfScrollView.bounds.size;
+        NSLog(@"frame:%@ bound:%@", NSStringFromCGSize(contentSize),NSStringFromCGSize(size1) );
+        contentSize.height+=self.keyboard_h;
+        contentOffsetPoint.y+=self.keyboard_h;
+        
+        
+        
+        self.pdfScrollView.contentSize =contentSize;
+        self.pdfScrollView.contentOffset=contentOffsetPoint;
+        
+    }
+    
+    
+//    self.pdfScrollView.frame = CGRectMake(0, 0, self.view.frame.size.width, self.view.frame.size.height-self.keyboard_h);
+    
+    //    CGSize tablecontent =self.editorTable.contentSize;
+    //    tablecontent.height=tablecontent.height+self.keyboard_h;
+    //    self.editorTable.contentSize=tablecontent;
+    //    }
+    // Animate the resize of the text view's frame in sync with the keyboard's appearance.
+    //  [self moveInputBarWithKeyboardHeight:keyboardRect.size.height withDuration:animationDuration];
+}
+- (void)keyboardWillHide:(NSNotification *)notification {
+    NSLog(@"keyboardWillHide");
+    
+    self.keyboard_show=false;
+//    NSDictionary* userInfo = [notification userInfo];
+    
+    /*
+     Restore the size of the text view (fill self's view).
+     Animate the resize so that it's in sync with the disappearance of the keyboard.
+     */
+//    NSValue *animationDurationValue = [userInfo objectForKey:UIKeyboardAnimationDurationUserInfoKey];
+//    NSTimeInterval animationDuration;
+//    [animationDurationValue getValue:&animationDuration];
+    
+    
+    CGPoint contentOffsetPoint = self.pdfScrollView.contentOffset;
+    CGSize contentSize =self.pdfScrollView.contentSize;//frame.size;
+    contentSize.height-=self.keyboard_h;
+    
+    contentOffsetPoint.y-=self.keyboard_h;
+    
+    self.pdfScrollView.contentSize=contentSize;
+    self.pdfScrollView.contentOffset=contentOffsetPoint;
+//    CGSize tablecontent =self.pdfScrollView.contentSize;
+//    tablecontent.height=tablecontent.height-self.keyboard_h;
+    //    self.editorTable.contentSize=tablecontent;
+    
+ //   self.pdfScrollView.frame = CGRectMake(0, 0, self.view.frame.size.width, self.view.frame.size.height);
+    
+    self.keyboard_h= 0;
+//    NSLog(@"before refresh %@",NSStringFromCGSize(self.editorTable.contentSize));
+    
+    
+    //    if(self.resize)
+    //    {
+    //        NSTimeInterval animationDuration = 0.30f;
+    //        CGRect frame = self.view.frame;
+    //        //    if(prewTag == textField.tag) //当结束编辑的View的TAG是上次的就移动
+    //        //    {   //还原界面
+    //        //        moveY =  prewMoveY;
+    //        frame.origin.y +=self.ioffset;
+    //        frame.size. height -=self.ioffset;
+    //        self.view.frame = frame;
+    //        //    }
+    //        //self.view移回原位置
+    //        [UIView beginAnimations:@"ResizeView" context:nil];
+    //        [UIView setAnimationDuration:animationDuration];
+    //        self.view.frame = frame;
+    //        [UIView commitAnimations];
+    //        //[textField resignFirstResponder];
+    //        self.ioffset=0;
+    //    }
+    
+    
+    //  [self moveInputBarWithKeyboardHeight:0.0 withDuration:animationDuration];
+}
 
 
 @end

+ 8 - 5
Ants Contract/common/RootViewController.m

@@ -150,9 +150,10 @@
                 dvc.templateName = @"GEIC - Home Improvement Contract 2017.json";
                 dvc.pdfName = @"GEIC - Home Improvement Contract 2017.pdf";
                 dvc.docment_id = json[@"doc_number"];
-                dvc.OnSave=^(NSString* file)
+                dvc.OnSave=^(NSString* file, NSString* subject)
                 {
-                    [weakSelf previewPDF:file];
+                    
+                    [weakSelf previewPDF:file title:json[@"doc_number"] subject:subject];
                 };
                 
                 [self.navigationController pushViewController:dvc animated:true];
@@ -301,7 +302,7 @@
     
 }
 
--(void) previewPDF:(NSString*)file
+-(void) previewPDF:(NSString*)file title:(NSString*)title subject:(NSString*)subject
 {
 //    return;
     
@@ -317,11 +318,13 @@
     ViewController.canSave = false;
     ViewController.isLocalfile=isLocalFile;
     ViewController.defaultStyle = true;
-    NSString* subject;
+    ViewController.save_name=title;
+    ViewController.title = title;
+//    NSString* subject;
     //                    if (company.length==0) {
     
 //    NSString* cur_time =[RAUtils current_date];
-    subject =name;//[NSString stringWithFormat:@"NPD Product List %@",cur_time];
+//    subject =name;//[NSString stringWithFormat:@"NPD Product List %@",cur_time];
     
 //    AppDelegate *appDelegate = (AppDelegate*)[[UIApplication sharedApplication] delegate];
     //    NSString* customer_email=    [appDelegate.customerInfo valueForKey:@"customer_email"];

+ 9 - 2
Ants Contract/common/SignatureListViewController.m

@@ -53,7 +53,7 @@
     NSDictionary * item_json = self.signatureData[self.subType][[NSString stringWithFormat:@"item_%ld",(long)indexPath.section]];
     
     
-    NSString* title = [NSString stringWithFormat:@"Fill Document %@ with %@ %ld?",self.subType,self.subType,(long)indexPath.section];
+    NSString* title = [NSString stringWithFormat:@"Fill all %@ with %@ %ld?",self.subType,self.subType,(long)indexPath.section+1];
     UIAlertController *alertControl = [UIAlertController alertControllerWithTitle:title message:nil preferredStyle:UIAlertControllerStyleAlert];
     //block代码块取代了delegate
     
@@ -410,7 +410,7 @@
 {
     if(self.blk_Select)
     {
-        
+        NSLog(@"signature selected.");
 //        SignatureTableViewCell * cell= [tableView cellForRowAtIndexPath:indexPath];
         
         NSDictionary * item_json = self.signatureData[self.subType][[NSString stringWithFormat:@"item_%ld",(long)indexPath.section]];
@@ -422,8 +422,15 @@
 
     }
     
+    NSLog(@"before dismiss signature list");
     [self dismissViewControllerAnimated:false completion:nil];
     
+//    [self dismissViewControllerAnimated:false completion:^{
+//        NSLog(@"dismiss completion");
+//    }];
+    
+    NSLog(@"after dismiss signature list");
+    
 //    if (tableView.isEditing) { // 编辑模式下不响应
 //        return;
 //    }