Forráskód Böngészése

170106
GE eSign release version 1.0.170105

Ray Zhang 9 éve
szülő
commit
6c2e0b3585
22 módosított fájl, 1102 hozzáadás és 394 törlés
  1. BIN
      Ants Contract/AntsContract.xcworkspace/xcuserdata/Ray.xcuserdatad/UserInterfaceState.xcuserstate
  2. 397 61
      Ants Contract/AntsContract.xcworkspace/xcuserdata/Ray.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
  3. 20 9
      Ants Contract/AntsContract.xcworkspace/xcuserdata/Ray.xcuserdatad/xcdebugger/Expressions.xcexplist
  4. 0 42
      Ants Contract/AntsContract/AntsContract.xcodeproj/project.pbxproj
  5. 53 55
      Ants Contract/AntsContract/AntsContract.xcodeproj/xcuserdata/Ray.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
  6. 46 33
      Ants Contract/AntsContract/AntsContract/Base.lproj/Main.storyboard
  7. 4 4
      Ants Contract/Granite Expo eSign/Granite Expo eSign.xcodeproj/project.pbxproj
  8. 19 2
      Ants Contract/Granite Expo eSign/Granite Expo eSign/GEContractFilterViewController.m
  9. 8 8
      Ants Contract/Granite Expo eSign/Granite Expo eSign/GEIC - Home Improvement Contract 2017.json
  10. BIN
      Ants Contract/Granite Expo eSign/Granite Expo eSign/GEIC - Home Improvement Contract 2017.pdf
  11. 3 1
      Ants Contract/Granite Expo eSign/Granite Expo eSign/Info.plist
  12. 2 0
      Ants Contract/Granite Expo eSign/Granite Expo eSign/config.h
  13. 2 0
      Ants Contract/common/ACNetwork.h
  14. 41 6
      Ants Contract/common/ACNetwork.m
  15. 235 1
      Ants Contract/common/AppDelegate.m
  16. 6 6
      Ants Contract/common/DocumentListViewController.m
  17. 239 154
      Ants Contract/common/DocumentPageViewController.m
  18. 2 2
      Ants Contract/common/PageViewController.h
  19. 9 1
      Ants Contract/common/PageViewController.m
  20. 2 1
      Ants Contract/common/RootViewController.m
  21. 3 0
      Ants Contract/common/SignatureListViewController.h
  22. 11 8
      Ants Contract/common/SignatureListViewController.m

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


+ 397 - 61
Ants Contract/AntsContract.xcworkspace/xcuserdata/Ray.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -58,11 +58,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/ACNetwork.m"
-            timestampString = "504773621.562093"
+            timestampString = "505297910.542291"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "529"
-            endingLineNumber = "529"
+            startingLineNumber = "564"
+            endingLineNumber = "564"
             landmarkName = "+request_DocList:"
             landmarkType = "7">
          </BreakpointContent>
@@ -138,12 +138,12 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "../RedAnt ERP Mobile/common/NetworkUtils.m"
-            timestampString = "504688772.531318"
+            timestampString = "505297473.101818"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "144"
-            endingLineNumber = "144"
-            landmarkName = "+get_json:parameters:err_recorder:result_handler:decrypt_handler:"
+            startingLineNumber = "149"
+            endingLineNumber = "149"
+            landmarkName = "+get_json:parameters:file:err_recorder:result_handler:decrypt_handler:"
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
@@ -159,7 +159,7 @@
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "83"
             endingLineNumber = "83"
-            landmarkName = "+get_json:parameters:err_recorder:result_handler:decrypt_handler:"
+            landmarkName = "+get_json:parameters:file:err_recorder:result_handler:decrypt_handler:"
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
@@ -175,7 +175,7 @@
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "101"
             endingLineNumber = "101"
-            landmarkName = "+get_json:parameters:"
+            landmarkName = "+get_json:parameters:file:"
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
@@ -223,7 +223,7 @@
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "59"
             endingLineNumber = "59"
-            landmarkName = "+get_json:parameters:"
+            landmarkName = "+get_json:parameters:file:"
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
@@ -335,7 +335,7 @@
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "99"
             endingLineNumber = "99"
-            landmarkName = "+get_json:parameters:"
+            landmarkName = "+get_json:parameters:file:"
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
@@ -351,7 +351,7 @@
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "102"
             endingLineNumber = "102"
-            landmarkName = "+get_json:parameters:"
+            landmarkName = "+get_json:parameters:file:"
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
@@ -490,11 +490,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/DocumentPageViewController.m"
-            timestampString = "505214292.615182"
+            timestampString = "505298594.173982"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "348"
-            endingLineNumber = "348"
+            startingLineNumber = "427"
+            endingLineNumber = "427"
             landmarkName = "-onSaveClicked:"
             landmarkType = "7">
          </BreakpointContent>
@@ -730,11 +730,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "../RedAnt ERP Mobile/common/PDFUtils.m"
-            timestampString = "505228406.567255"
+            timestampString = "505292436.223469"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "296"
-            endingLineNumber = "296"
+            startingLineNumber = "305"
+            endingLineNumber = "305"
             landmarkName = "+SavePDF:source:window_rect:"
             landmarkType = "7">
          </BreakpointContent>
@@ -746,11 +746,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "../RedAnt ERP Mobile/common/PDFUtils.m"
-            timestampString = "505228406.567255"
+            timestampString = "505292436.223469"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "294"
-            endingLineNumber = "294"
+            startingLineNumber = "303"
+            endingLineNumber = "303"
             landmarkName = "+SavePDF:source:window_rect:"
             landmarkType = "7">
          </BreakpointContent>
@@ -762,11 +762,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "../RedAnt ERP Mobile/common/PDFUtils.m"
-            timestampString = "505228406.567255"
+            timestampString = "505292436.223469"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "293"
-            endingLineNumber = "293"
+            startingLineNumber = "302"
+            endingLineNumber = "302"
             landmarkName = "+SavePDF:source:window_rect:"
             landmarkType = "7">
          </BreakpointContent>
@@ -778,11 +778,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "../RedAnt ERP Mobile/common/PDFUtils.m"
-            timestampString = "505228406.567255"
+            timestampString = "505292436.223469"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "292"
-            endingLineNumber = "292"
+            startingLineNumber = "301"
+            endingLineNumber = "301"
             landmarkName = "+SavePDF:source:window_rect:"
             landmarkType = "7">
          </BreakpointContent>
@@ -794,11 +794,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/DocumentPageViewController.m"
-            timestampString = "505214292.615182"
+            timestampString = "505298594.173982"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "360"
-            endingLineNumber = "360"
+            startingLineNumber = "439"
+            endingLineNumber = "439"
             landmarkName = "-onSaveClicked:"
             landmarkType = "7">
          </BreakpointContent>
@@ -810,11 +810,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/DocumentPageViewController.m"
-            timestampString = "505214292.615182"
+            timestampString = "505298594.173982"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "251"
-            endingLineNumber = "251"
+            startingLineNumber = "330"
+            endingLineNumber = "330"
             landmarkName = "-onSaveClicked:"
             landmarkType = "7">
          </BreakpointContent>
@@ -826,11 +826,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "../RedAnt ERP Mobile/common/PDFUtils.m"
-            timestampString = "505228406.567255"
+            timestampString = "505292436.223469"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "274"
-            endingLineNumber = "274"
+            startingLineNumber = "283"
+            endingLineNumber = "283"
             landmarkName = "+SavePDF:source:window_rect:"
             landmarkType = "7">
          </BreakpointContent>
@@ -842,11 +842,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "../RedAnt ERP Mobile/common/PDFUtils.m"
-            timestampString = "505228406.567255"
+            timestampString = "505292436.223469"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "265"
-            endingLineNumber = "265"
+            startingLineNumber = "274"
+            endingLineNumber = "274"
             landmarkName = "+SavePDF:source:window_rect:"
             landmarkType = "7">
          </BreakpointContent>
@@ -858,11 +858,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "../RedAnt ERP Mobile/common/PDFUtils.m"
-            timestampString = "505228406.567255"
+            timestampString = "505292436.223469"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "278"
-            endingLineNumber = "278"
+            startingLineNumber = "287"
+            endingLineNumber = "287"
             landmarkName = "+SavePDF:source:window_rect:"
             landmarkType = "7">
          </BreakpointContent>
@@ -874,11 +874,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/DocumentPageViewController.m"
-            timestampString = "505214292.615182"
+            timestampString = "505314667.572086"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "550"
-            endingLineNumber = "550"
+            startingLineNumber = "634"
+            endingLineNumber = "634"
             landmarkName = "-verifyData"
             landmarkType = "7">
          </BreakpointContent>
@@ -890,11 +890,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/DocumentPageViewController.m"
-            timestampString = "505214292.615182"
+            timestampString = "505314667.572086"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "565"
-            endingLineNumber = "565"
+            startingLineNumber = "649"
+            endingLineNumber = "649"
             landmarkName = "-verifyData"
             landmarkType = "7">
          </BreakpointContent>
@@ -970,11 +970,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/SignatureListViewController.m"
-            timestampString = "505214292.615182"
+            timestampString = "505291327.107268"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "46"
-            endingLineNumber = "46"
+            startingLineNumber = "49"
+            endingLineNumber = "49"
             landmarkName = "-onFillClick:"
             landmarkType = "7">
          </BreakpointContent>
@@ -982,15 +982,15 @@
       <BreakpointProxy
          BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
          <BreakpointContent
-            shouldBeEnabled = "Yes"
+            shouldBeEnabled = "No"
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/PageViewController.m"
-            timestampString = "505214078.883836"
+            timestampString = "505288376.250959"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "736"
-            endingLineNumber = "736"
+            startingLineNumber = "744"
+            endingLineNumber = "744"
             landmarkName = "-TouchImageViewOnTouche:"
             landmarkType = "7">
          </BreakpointContent>
@@ -1002,11 +1002,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/DocumentPageViewController.m"
-            timestampString = "505214081.92598"
+            timestampString = "505284553.377995"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "140"
-            endingLineNumber = "140"
+            startingLineNumber = "163"
+            endingLineNumber = "163"
             landmarkName = "-onSignatureClicked:"
             landmarkType = "7">
             <Locations>
@@ -1065,14 +1065,350 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/DocumentPageViewController.m"
-            timestampString = "505214085.465608"
+            timestampString = "505284553.377995"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "178"
-            endingLineNumber = "178"
+            startingLineNumber = "201"
+            endingLineNumber = "201"
             landmarkName = "-onSignatureClicked:"
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "common/PageViewController.m"
+            timestampString = "505288376.250959"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "716"
+            endingLineNumber = "716"
+            landmarkName = "-TouchImageViewOnTouche:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "common/PageViewController.m"
+            timestampString = "505288742.81794"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "701"
+            endingLineNumber = "701"
+            landmarkName = "-TouchImageViewOnTouche:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "common/PageViewController.m"
+            timestampString = "505289070.80109"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "33"
+            endingLineNumber = "33"
+            landmarkName = "-viewDidLoad"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "../RedAnt ERP Mobile/common/PDFUtils.m"
+            timestampString = "505292550.255121"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "354"
+            endingLineNumber = "354"
+            landmarkName = "+SavePDF:source:window_rect:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "common/DocumentPageViewController.m"
+            timestampString = "505292681.089907"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "265"
+            endingLineNumber = "265"
+            landmarkName = "-onSaveClicked:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "../RedAnt ERP Mobile/common/PDFUtils.m"
+            timestampString = "505293654.553048"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "176"
+            endingLineNumber = "176"
+            landmarkName = "+SavePDF:source:window_rect:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "common/AppDelegate.m"
+            timestampString = "505299005.563361"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "128"
+            endingLineNumber = "128"
+            landmarkName = "-leakingTest"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "common/AppDelegate.m"
+            timestampString = "505299005.563361"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "163"
+            endingLineNumber = "163"
+            landmarkName = "-leakingTest"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "common/DocumentPageViewController.m"
+            timestampString = "505297845.525978"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "303"
+            endingLineNumber = "303"
+            landmarkName = "-onSaveClicked:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "../RedAnt ERP Mobile/common/NetworkUtils.m"
+            timestampString = "505298112.626891"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "63"
+            endingLineNumber = "63"
+            landmarkName = "+get_json:parameters:file:err_recorder:result_handler:decrypt_handler:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "../RedAnt ERP Mobile/common/NetworkUtils.m"
+            timestampString = "505298144.112073"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "119"
+            endingLineNumber = "119"
+            landmarkName = "+get_json:parameters:file:err_recorder:result_handler:decrypt_handler:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "common/AppDelegate.m"
+            timestampString = "505299005.563361"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "68"
+            endingLineNumber = "68"
+            landmarkName = "-leakingTest"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "common/AppDelegate.m"
+            timestampString = "505299005.563361"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "35"
+            endingLineNumber = "35"
+            landmarkName = "-leakingTest"
+            landmarkType = "7">
+            <Locations>
+               <Location
+                  shouldBeEnabled = "No"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "-[AppDelegate leakingTest]"
+                  moduleName = "eSign"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///ios_workspace/Ants%20Contract/common/AppDelegate.m"
+                  timestampString = "505298873.314566"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "38"
+                  endingLineNumber = "38"
+                  offsetFromSymbolStart = "24">
+               </Location>
+               <Location
+                  shouldBeEnabled = "No"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "__26-[AppDelegate leakingTest]_block_invoke"
+                  moduleName = "eSign"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///ios_workspace/Ants%20Contract/common/AppDelegate.m"
+                  timestampString = "505298873.316653"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "40"
+                  endingLineNumber = "40"
+                  offsetFromSymbolStart = "40">
+               </Location>
+            </Locations>
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "common/AppDelegate.m"
+            timestampString = "505299005.563361"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "36"
+            endingLineNumber = "36"
+            landmarkName = "-leakingTest"
+            landmarkType = "7">
+            <Locations>
+               <Location
+                  shouldBeEnabled = "No"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "-[AppDelegate leakingTest]"
+                  moduleName = "eSign"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///ios_workspace/Ants%20Contract/common/AppDelegate.m"
+                  timestampString = "505298883.45889"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "38"
+                  endingLineNumber = "38"
+                  offsetFromSymbolStart = "24">
+               </Location>
+               <Location
+                  shouldBeEnabled = "No"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "__26-[AppDelegate leakingTest]_block_invoke"
+                  moduleName = "eSign"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///ios_workspace/Ants%20Contract/common/AppDelegate.m"
+                  timestampString = "505298883.46135"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "40"
+                  endingLineNumber = "40"
+                  offsetFromSymbolStart = "40">
+               </Location>
+            </Locations>
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "common/RootViewController.m"
+            timestampString = "505300460.313014"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "268"
+            endingLineNumber = "268"
+            landmarkName = "-OnHICClick:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "common/DocumentPageViewController.m"
+            timestampString = "505314667.572086"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "686"
+            endingLineNumber = "686"
+            landmarkName = "-verifyData"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "common/DocumentPageViewController.m"
+            timestampString = "505313890.297236"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "596"
+            endingLineNumber = "596"
+            landmarkName = "-createDemoView:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
    </Breakpoints>
 </Bucket>

+ 20 - 9
Ants Contract/AntsContract.xcworkspace/xcuserdata/Ray.xcuserdatad/xcdebugger/Expressions.xcexplist

@@ -3,19 +3,24 @@
    version = "1.0">
    <ContextStates>
       <ContextState
-         contextName = "-[PageViewController addTextView:destView:index:]:PageViewController.m">
-      </ContextState>
-      <ContextState
-         contextName = "__41-[PageViewController CheckButtonClicked:]_block_invoke:PageViewController.m">
+         contextName = "+[ACNetwork get_json:parameters:]:ACNetwork.m">
+         <PersistentStrings>
+            <PersistentString
+               value = "[e aes256_encrypt:@&quot;usai2010&quot;]">
+            </PersistentString>
+         </PersistentStrings>
       </ContextState>
       <ContextState
-         contextName = "-[PageViewController addCheck:destView:index:]:PageViewController.m">
+         contextName = "-[DocumentPageViewController createDemoView:]:DocumentPageViewController.m">
          <PersistentStrings>
             <PersistentString
-               value = "item[0][0]">
+               value = "lineLabel.text">
             </PersistentString>
          </PersistentStrings>
       </ContextState>
+      <ContextState
+         contextName = "+[ACNetwork prepare_addtional_params:]:ACNetwork.m">
+      </ContextState>
       <ContextState
          contextName = "-[PageViewController textViewDidEndEditing:]:PageViewController.m">
          <PersistentStrings>
@@ -25,15 +30,21 @@
          </PersistentStrings>
       </ContextState>
       <ContextState
-         contextName = "+[ACNetwork get_json:parameters:]:ACNetwork.m">
+         contextName = "-[PageViewController addCheck:destView:index:]:PageViewController.m">
          <PersistentStrings>
             <PersistentString
-               value = "[e aes256_encrypt:@&quot;usai2010&quot;]">
+               value = "item[0][0]">
             </PersistentString>
          </PersistentStrings>
       </ContextState>
       <ContextState
-         contextName = "+[ACNetwork prepare_addtional_params:]:ACNetwork.m">
+         contextName = "-[PageViewController addTextView:destView:index:]:PageViewController.m">
+      </ContextState>
+      <ContextState
+         contextName = "__41-[PageViewController CheckButtonClicked:]_block_invoke:PageViewController.m">
+      </ContextState>
+      <ContextState
+         contextName = "-[PageViewController viewDidLoad]:PageViewController.m">
       </ContextState>
    </ContextStates>
 </VariablesViewState>

+ 0 - 42
Ants Contract/AntsContract/AntsContract.xcodeproj/project.pbxproj

@@ -31,10 +31,7 @@
 		713E83C01E037C2000C4F12A /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 713E83BE1E037C2000C4F12A /* Main.storyboard */; };
 		713E83C21E037C2000C4F12A /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 713E83C11E037C2000C4F12A /* Assets.xcassets */; };
 		713E83C51E037C2000C4F12A /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 713E83C31E037C2000C4F12A /* LaunchScreen.storyboard */; };
-		713E83CE1E03831C00C4F12A /* PageViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 713E83CD1E03831C00C4F12A /* PageViewController.m */; };
 		713E83D11E038C7400C4F12A /* GEIC - Home Improvement Contract 2016.pdf in Resources */ = {isa = PBXBuildFile; fileRef = 713E83D01E038C7400C4F12A /* GEIC - Home Improvement Contract 2016.pdf */; };
-		713E83D41E03926A00C4F12A /* PDFPageView.m in Sources */ = {isa = PBXBuildFile; fileRef = 713E83D31E03926A00C4F12A /* PDFPageView.m */; };
-		713E83D71E03BF8C00C4F12A /* DocumentPageViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 713E83D61E03BF8C00C4F12A /* DocumentPageViewController.m */; };
 		715671301E0D0AAE006324A0 /* RectDrawable.m in Sources */ = {isa = PBXBuildFile; fileRef = 7156712F1E0D0AAE006324A0 /* RectDrawable.m */; };
 		715671361E10A43D006324A0 /* NetworkUtils.m in Sources */ = {isa = PBXBuildFile; fileRef = 715671351E10A43D006324A0 /* NetworkUtils.m */; };
 		715671391E10A48E006324A0 /* ACNetwork.m in Sources */ = {isa = PBXBuildFile; fileRef = 715671381E10A48E006324A0 /* ACNetwork.m */; };
@@ -52,11 +49,8 @@
 		715671661E10BE28006324A0 /* NSData+Base64.m in Sources */ = {isa = PBXBuildFile; fileRef = 7156715F1E10BE28006324A0 /* NSData+Base64.m */; };
 		715671671E10BE28006324A0 /* NSData+CommonCrypto.m in Sources */ = {isa = PBXBuildFile; fileRef = 715671611E10BE28006324A0 /* NSData+CommonCrypto.m */; };
 		715671681E10BE28006324A0 /* NSString+Base64.m in Sources */ = {isa = PBXBuildFile; fileRef = 715671631E10BE28006324A0 /* NSString+Base64.m */; };
-		71D01AC61E0783BD006620CE /* PDFScrollView.m in Sources */ = {isa = PBXBuildFile; fileRef = 71D01AC51E0783BD006620CE /* PDFScrollView.m */; };
-		71D01AC91E07AAB1006620CE /* EditControlView.m in Sources */ = {isa = PBXBuildFile; fileRef = 71D01AC81E07AAB1006620CE /* EditControlView.m */; };
 		71D01ACB1E07AE34006620CE /* SUBCONTRACTORS REFERRAL LIST.json in Resources */ = {isa = PBXBuildFile; fileRef = 71D01ACA1E07AE34006620CE /* SUBCONTRACTORS REFERRAL LIST.json */; };
 		71D01ACD1E07AF10006620CE /* SUBCONTRACTORS REFERRAL LIST.pdf in Resources */ = {isa = PBXBuildFile; fileRef = 71D01ACC1E07AF10006620CE /* SUBCONTRACTORS REFERRAL LIST.pdf */; };
-		71D01AD11E07D1EA006620CE /* SignatureListViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 71D01AD01E07D1EA006620CE /* SignatureListViewController.m */; };
 		71D01AD41E07D699006620CE /* SignatureTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 71D01AD31E07D699006620CE /* SignatureTableViewCell.m */; };
 		71D01ADA1E08CA53006620CE /* SignatureView.m in Sources */ = {isa = PBXBuildFile; fileRef = 71D01AD71E08CA53006620CE /* SignatureView.m */; };
 		71D01ADB1E08CA53006620CE /* SignatureViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 71D01AD91E08CA53006620CE /* SignatureViewController.m */; };
@@ -75,7 +69,6 @@
 		71D01B241E0A2069006620CE /* PDFUtils.m in Sources */ = {isa = PBXBuildFile; fileRef = 71D01B201E0A2069006620CE /* PDFUtils.m */; };
 		71D01B251E0A2069006620CE /* TextUtils.m in Sources */ = {isa = PBXBuildFile; fileRef = 71D01B221E0A2069006620CE /* TextUtils.m */; };
 		71D01B271E0A2DFE006620CE /* GEIC - Home Improvement Contract 2016.json in Resources */ = {isa = PBXBuildFile; fileRef = 71D01B261E0A2DFE006620CE /* GEIC - Home Improvement Contract 2016.json */; };
-		71D01B2A1E0BB9B3006620CE /* CheckSelectorViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 71D01B291E0BB9B3006620CE /* CheckSelectorViewController.m */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
@@ -128,13 +121,7 @@
 		713E83C11E037C2000C4F12A /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
 		713E83C41E037C2000C4F12A /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
 		713E83C61E037C2000C4F12A /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
-		713E83CC1E03831C00C4F12A /* PageViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PageViewController.h; sourceTree = "<group>"; };
-		713E83CD1E03831C00C4F12A /* PageViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PageViewController.m; sourceTree = "<group>"; };
 		713E83D01E038C7400C4F12A /* GEIC - Home Improvement Contract 2016.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; path = "GEIC - Home Improvement Contract 2016.pdf"; sourceTree = "<group>"; };
-		713E83D21E03926A00C4F12A /* PDFPageView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PDFPageView.h; sourceTree = "<group>"; };
-		713E83D31E03926A00C4F12A /* PDFPageView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PDFPageView.m; sourceTree = "<group>"; };
-		713E83D51E03BF8C00C4F12A /* DocumentPageViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DocumentPageViewController.h; sourceTree = "<group>"; };
-		713E83D61E03BF8C00C4F12A /* DocumentPageViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DocumentPageViewController.m; sourceTree = "<group>"; };
 		7156712E1E0D0AAE006324A0 /* RectDrawable.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RectDrawable.h; path = "../../../RedAnt ERP Mobile/common/pdfCreator/RectDrawable.h"; sourceTree = "<group>"; };
 		7156712F1E0D0AAE006324A0 /* RectDrawable.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = RectDrawable.m; path = "../../../RedAnt ERP Mobile/common/pdfCreator/RectDrawable.m"; sourceTree = "<group>"; };
 		715671341E10A43D006324A0 /* NetworkUtils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = NetworkUtils.h; path = "../../../RedAnt ERP Mobile/common/NetworkUtils.h"; sourceTree = "<group>"; };
@@ -168,15 +155,9 @@
 		715671611E10BE28006324A0 /* NSData+CommonCrypto.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = "NSData+CommonCrypto.m"; path = "../../../RedAnt ERP Mobile/common/AES/NSData+CommonCrypto.m"; sourceTree = "<group>"; };
 		715671621E10BE28006324A0 /* NSString+Base64.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "NSString+Base64.h"; path = "../../../RedAnt ERP Mobile/common/AES/NSString+Base64.h"; sourceTree = "<group>"; };
 		715671631E10BE28006324A0 /* NSString+Base64.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = "NSString+Base64.m"; path = "../../../RedAnt ERP Mobile/common/AES/NSString+Base64.m"; sourceTree = "<group>"; };
-		71D01AC41E0783BD006620CE /* PDFScrollView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PDFScrollView.h; sourceTree = "<group>"; };
-		71D01AC51E0783BD006620CE /* PDFScrollView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PDFScrollView.m; sourceTree = "<group>"; };
-		71D01AC71E07AAB1006620CE /* EditControlView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EditControlView.h; sourceTree = "<group>"; };
-		71D01AC81E07AAB1006620CE /* EditControlView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EditControlView.m; sourceTree = "<group>"; };
 		71D01ACA1E07AE34006620CE /* SUBCONTRACTORS REFERRAL LIST.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = "SUBCONTRACTORS REFERRAL LIST.json"; sourceTree = "<group>"; };
 		71D01ACC1E07AF10006620CE /* SUBCONTRACTORS REFERRAL LIST.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; path = "SUBCONTRACTORS REFERRAL LIST.pdf"; sourceTree = "<group>"; };
 		71D01ACE1E07B71B006620CE /* config.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = config.h; sourceTree = "<group>"; };
-		71D01ACF1E07D1EA006620CE /* SignatureListViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SignatureListViewController.h; sourceTree = "<group>"; };
-		71D01AD01E07D1EA006620CE /* SignatureListViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SignatureListViewController.m; sourceTree = "<group>"; };
 		71D01AD21E07D699006620CE /* SignatureTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SignatureTableViewCell.h; sourceTree = "<group>"; };
 		71D01AD31E07D699006620CE /* SignatureTableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SignatureTableViewCell.m; sourceTree = "<group>"; };
 		71D01AD61E08CA53006620CE /* SignatureView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SignatureView.h; path = "../../../RedAnt ERP Mobile/common/Functions/signature/SignatureView.h"; sourceTree = "<group>"; };
@@ -212,8 +193,6 @@
 		71D01B211E0A2069006620CE /* TextUtils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TextUtils.h; path = "../../../RedAnt ERP Mobile/common/TextUtils.h"; sourceTree = "<group>"; };
 		71D01B221E0A2069006620CE /* TextUtils.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = TextUtils.m; path = "../../../RedAnt ERP Mobile/common/TextUtils.m"; sourceTree = "<group>"; };
 		71D01B261E0A2DFE006620CE /* GEIC - Home Improvement Contract 2016.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = "GEIC - Home Improvement Contract 2016.json"; sourceTree = "<group>"; };
-		71D01B281E0BB9B3006620CE /* CheckSelectorViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CheckSelectorViewController.h; sourceTree = "<group>"; };
-		71D01B291E0BB9B3006620CE /* CheckSelectorViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CheckSelectorViewController.m; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -401,8 +380,6 @@
 				71D01AD81E08CA53006620CE /* SignatureViewController.h */,
 				71D01AD91E08CA53006620CE /* SignatureViewController.m */,
 				71D01ADE1E08CC81006620CE /* signature.storyboard */,
-				71D01ACF1E07D1EA006620CE /* SignatureListViewController.h */,
-				71D01AD01E07D1EA006620CE /* SignatureListViewController.m */,
 				71D01AD21E07D699006620CE /* SignatureTableViewCell.h */,
 				71D01AD31E07D699006620CE /* SignatureTableViewCell.m */,
 			);
@@ -416,18 +393,6 @@
 				71D01AE71E092150006620CE /* PDFCreator */,
 				71D01AE11E08F5D2006620CE /* TouchImageView.h */,
 				71D01AE21E08F5D2006620CE /* TouchImageView.m */,
-				71D01B281E0BB9B3006620CE /* CheckSelectorViewController.h */,
-				71D01B291E0BB9B3006620CE /* CheckSelectorViewController.m */,
-				713E83CC1E03831C00C4F12A /* PageViewController.h */,
-				713E83CD1E03831C00C4F12A /* PageViewController.m */,
-				713E83D51E03BF8C00C4F12A /* DocumentPageViewController.h */,
-				713E83D61E03BF8C00C4F12A /* DocumentPageViewController.m */,
-				71D01AC71E07AAB1006620CE /* EditControlView.h */,
-				71D01AC81E07AAB1006620CE /* EditControlView.m */,
-				713E83D21E03926A00C4F12A /* PDFPageView.h */,
-				713E83D31E03926A00C4F12A /* PDFPageView.m */,
-				71D01AC41E0783BD006620CE /* PDFScrollView.h */,
-				71D01AC51E0783BD006620CE /* PDFScrollView.m */,
 			);
 			name = pdfEdit;
 			sourceTree = "<group>";
@@ -584,36 +549,29 @@
 				715671361E10A43D006324A0 /* NetworkUtils.m in Sources */,
 				7156714A1E10B031006324A0 /* ioapi.c in Sources */,
 				71D01ADB1E08CA53006620CE /* SignatureViewController.m in Sources */,
-				71D01AC61E0783BD006620CE /* PDFScrollView.m in Sources */,
 				71D01AF81E092304006620CE /* BasicDrawable.m in Sources */,
 				71D01AD41E07D699006620CE /* SignatureTableViewCell.m in Sources */,
 				71D01AFB1E092304006620CE /* ImageDrawable.m in Sources */,
-				71D01B2A1E0BB9B3006620CE /* CheckSelectorViewController.m in Sources */,
 				7128C10D1E10E5E300FF635B /* AFURLSessionManager.m in Sources */,
 				7156714D1E10B031006324A0 /* zip.c in Sources */,
 				71D01ADA1E08CA53006620CE /* SignatureView.m in Sources */,
-				713E83CE1E03831C00C4F12A /* PageViewController.m in Sources */,
 				715671641E10BE28006324A0 /* AESCrypt.m in Sources */,
 				7128C1251E10E60C00FF635B /* UIImageView+AFNetworking.m in Sources */,
 				7128C1071E10E5E300FF635B /* AFHTTPSessionManager.m in Sources */,
 				7128C1231E10E60C00FF635B /* UIAlertView+AFNetworking.m in Sources */,
 				71D01AE31E08F5D2006620CE /* TouchImageView.m in Sources */,
 				713E83BA1E037C2000C4F12A /* AppDelegate.m in Sources */,
-				713E83D41E03926A00C4F12A /* PDFPageView.m in Sources */,
 				7128C10C1E10E5E300FF635B /* AFURLResponseSerialization.m in Sources */,
 				71D01AFA1E092304006620CE /* GroupDrawable.m in Sources */,
-				713E83D71E03BF8C00C4F12A /* DocumentPageViewController.m in Sources */,
 				71D01AED1E09215E006620CE /* PDFPage.m in Sources */,
 				7128C1221E10E60C00FF635B /* UIActivityIndicatorView+AFNetworking.m in Sources */,
 				7156713C1E10AF67006324A0 /* RAUtils.m in Sources */,
-				71D01AC91E07AAB1006620CE /* EditControlView.m in Sources */,
 				715671671E10BE28006324A0 /* NSData+CommonCrypto.m in Sources */,
 				7128C1211E10E60C00FF635B /* AFNetworkActivityIndicatorManager.m in Sources */,
 				7128C10B1E10E5E300FF635B /* AFURLRequestSerialization.m in Sources */,
 				7128C1081E10E5E300FF635B /* AFNetworkReachabilityManager.m in Sources */,
 				7156714C1E10B031006324A0 /* unzip.c in Sources */,
 				71D01B251E0A2069006620CE /* TextUtils.m in Sources */,
-				71D01AD11E07D1EA006620CE /* SignatureListViewController.m in Sources */,
 				715671401E10B028006324A0 /* ZipArchive.mm in Sources */,
 				7128C1281E10E60C00FF635B /* UIWebView+AFNetworking.m in Sources */,
 				71D01B061E0928C2006620CE /* TableDrawable.m in Sources */,

+ 53 - 55
Ants Contract/AntsContract/AntsContract.xcodeproj/xcuserdata/Ray.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -14,9 +14,7 @@
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "204"
-            endingLineNumber = "204"
-            landmarkName = "-OnHICClick:"
-            landmarkType = "7">
+            endingLineNumber = "204">
          </BreakpointContent>
       </BreakpointProxy>
       <BreakpointProxy
@@ -117,8 +115,8 @@
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "247"
             endingLineNumber = "247"
-            landmarkName = "@implementation PageViewController"
-            landmarkType = "3">
+            landmarkName = "-ControlButtonClicked:"
+            landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
       <BreakpointProxy
@@ -410,11 +408,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "../../RedAnt ERP Mobile/common/PDFUtils.m"
-            timestampString = "504173423.737974"
+            timestampString = "505288376.250959"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "43"
-            endingLineNumber = "43"
+            startingLineNumber = "49"
+            endingLineNumber = "49"
             landmarkName = "+saveTempSignature:"
             landmarkType = "7">
          </BreakpointContent>
@@ -591,7 +589,7 @@
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "21"
             endingLineNumber = "21"
-            landmarkName = "+addSignature:to:"
+            landmarkName = "+addSignature:to:subType:"
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
@@ -623,7 +621,7 @@
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "145"
             endingLineNumber = "145"
-            landmarkName = "-createMarker:x:y:"
+            landmarkName = "-addCheck:destView:index:"
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
@@ -639,7 +637,7 @@
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "300"
             endingLineNumber = "300"
-            landmarkName = "-CheckButtonClicked:"
+            landmarkName = "-textViewDidEndEditing:"
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
@@ -671,7 +669,7 @@
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "293"
             endingLineNumber = "293"
-            landmarkName = "-CheckButtonClicked:"
+            landmarkName = "-textViewDidEndEditing:"
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
@@ -687,7 +685,7 @@
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "295"
             endingLineNumber = "295"
-            landmarkName = "-CheckButtonClicked:"
+            landmarkName = "-textViewDidEndEditing:"
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
@@ -714,11 +712,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "../../RedAnt ERP Mobile/common/PDFUtils.m"
-            timestampString = "505228406.567255"
+            timestampString = "505292436.223469"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "327"
-            endingLineNumber = "327"
+            startingLineNumber = "336"
+            endingLineNumber = "336"
             landmarkName = "+SavePDF:source:window_rect:"
             landmarkType = "7">
          </BreakpointContent>
@@ -730,11 +728,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "../../RedAnt ERP Mobile/common/PDFUtils.m"
-            timestampString = "505228406.567255"
+            timestampString = "505292436.223469"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "270"
-            endingLineNumber = "270"
+            startingLineNumber = "279"
+            endingLineNumber = "279"
             landmarkName = "+SavePDF:source:window_rect:"
             landmarkType = "7">
          </BreakpointContent>
@@ -746,11 +744,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "../../RedAnt ERP Mobile/common/PDFUtils.m"
-            timestampString = "505228406.567255"
+            timestampString = "505292436.223469"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "254"
-            endingLineNumber = "254"
+            startingLineNumber = "263"
+            endingLineNumber = "263"
             landmarkName = "+SavePDF:source:window_rect:"
             landmarkType = "7">
          </BreakpointContent>
@@ -762,11 +760,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "../../RedAnt ERP Mobile/common/PDFUtils.m"
-            timestampString = "504493781.882488"
+            timestampString = "505288376.250959"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "139"
-            endingLineNumber = "139"
+            startingLineNumber = "145"
+            endingLineNumber = "145"
             landmarkName = "+WindowRect2PDFRect:pdf_rect:window_size:"
             landmarkType = "7">
          </BreakpointContent>
@@ -890,11 +888,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "../../RedAnt ERP Mobile/common/PDFUtils.m"
-            timestampString = "505228406.567255"
+            timestampString = "505292436.223469"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "291"
-            endingLineNumber = "291"
+            startingLineNumber = "300"
+            endingLineNumber = "300"
             landmarkName = "+SavePDF:source:window_rect:"
             landmarkType = "7">
          </BreakpointContent>
@@ -1002,12 +1000,12 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "../../RedAnt ERP Mobile/common/NetworkUtils.m"
-            timestampString = "504416002.766154"
+            timestampString = "505297473.101818"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "195"
-            endingLineNumber = "195"
-            landmarkName = "+get_json:parameters:err_recorder:result_handler:decrypt_handler:"
+            startingLineNumber = "200"
+            endingLineNumber = "200"
+            landmarkName = "+get_json:parameters:file:err_recorder:result_handler:decrypt_handler:"
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
@@ -1050,12 +1048,12 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "../../RedAnt ERP Mobile/common/NetworkUtils.m"
-            timestampString = "504425047.327491"
+            timestampString = "505297473.101818"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "205"
-            endingLineNumber = "205"
-            landmarkName = "+get_json:parameters:err_recorder:result_handler:decrypt_handler:"
+            startingLineNumber = "210"
+            endingLineNumber = "210"
+            landmarkName = "+get_json:parameters:file:err_recorder:result_handler:decrypt_handler:"
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
@@ -1130,12 +1128,12 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "../../RedAnt ERP Mobile/common/NetworkUtils.m"
-            timestampString = "504431280.241134"
+            timestampString = "505297473.101818"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "203"
-            endingLineNumber = "203"
-            landmarkName = "+get_json:parameters:err_recorder:result_handler:decrypt_handler:"
+            startingLineNumber = "208"
+            endingLineNumber = "208"
+            landmarkName = "+get_json:parameters:file:err_recorder:result_handler:decrypt_handler:"
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
@@ -1226,11 +1224,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "../../RedAnt ERP Mobile/common/PDFUtils.m"
-            timestampString = "504494150.099271"
+            timestampString = "505288376.250959"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "70"
-            endingLineNumber = "70"
+            startingLineNumber = "76"
+            endingLineNumber = "76"
             landmarkName = "+OpenPDF:"
             landmarkType = "7">
          </BreakpointContent>
@@ -1290,11 +1288,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "../../RedAnt ERP Mobile/common/Functions/PDF+Web/PDFViewController.m"
-            timestampString = "504500893.635163"
+            timestampString = "505301230.751154"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "302"
-            endingLineNumber = "302"
+            startingLineNumber = "305"
+            endingLineNumber = "305"
             landmarkName = "-onActionClick:"
             landmarkType = "7">
          </BreakpointContent>
@@ -1306,11 +1304,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "../../RedAnt ERP Mobile/common/Functions/PDF+Web/PDFViewController.m"
-            timestampString = "504500893.635163"
+            timestampString = "505301230.751154"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "307"
-            endingLineNumber = "307"
+            startingLineNumber = "310"
+            endingLineNumber = "310"
             landmarkName = "-onActionClick:"
             landmarkType = "7">
             <Locations>
@@ -1354,11 +1352,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "../../RedAnt ERP Mobile/common/Functions/PDF+Web/PDFViewController.m"
-            timestampString = "504500893.635163"
+            timestampString = "505301230.751154"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "316"
-            endingLineNumber = "316"
+            startingLineNumber = "319"
+            endingLineNumber = "319"
             landmarkName = "-onActionClick:"
             landmarkType = "7">
          </BreakpointContent>
@@ -1370,11 +1368,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "../../RedAnt ERP Mobile/common/Functions/PDF+Web/PDFViewController.m"
-            timestampString = "504500893.635163"
+            timestampString = "505301230.751154"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "414"
-            endingLineNumber = "414"
+            startingLineNumber = "417"
+            endingLineNumber = "417"
             landmarkName = "-openFile:"
             landmarkType = "7">
          </BreakpointContent>

+ 46 - 33
Ants Contract/AntsContract/AntsContract/Base.lproj/Main.storyboard

@@ -6,7 +6,6 @@
     <dependencies>
         <deployment identifier="iOS"/>
         <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11757"/>
-        <capability name="Navigation items with more than one left or right bar item" minToolsVersion="7.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <scenes>
@@ -125,7 +124,7 @@
                                                 <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMinY="YES" heightSizable="YES" flexibleMaxY="YES"/>
                                                 <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                                             </view>
-                                            <view contentMode="scaleToFill" id="wPo-qh-F4Q" customClass="EditControlView">
+                                            <view contentMode="scaleToFill" id="wPo-qh-F4Q">
                                                 <rect key="frame" x="0.0" y="0.0" width="768" height="960"/>
                                                 <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMinY="YES" heightSizable="YES" flexibleMaxY="YES"/>
                                             </view>
@@ -162,18 +161,16 @@
                         <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                     </view>
                     <navigationItem key="navigationItem" title="Title" id="ToF-qy-nGL">
-                        <rightBarButtonItems>
-                            <barButtonItem systemItem="save" id="HzA-Fa-ToQ">
-                                <connections>
-                                    <action selector="onSaveClicked:" destination="UPd-uT-cg4" id="pM2-zX-RdY"/>
-                                </connections>
-                            </barButtonItem>
-                            <barButtonItem systemItem="compose" id="ucD-3L-oIm">
-                                <connections>
-                                    <action selector="onSignatureClicked:" destination="UPd-uT-cg4" id="4H2-S3-gQB"/>
-                                </connections>
-                            </barButtonItem>
-                        </rightBarButtonItems>
+                        <barButtonItem key="leftBarButtonItem" title="Cancel" id="hmm-vl-h47">
+                            <connections>
+                                <action selector="OnCancelClicked:" destination="UPd-uT-cg4" id="9Sa-o6-7WI"/>
+                            </connections>
+                        </barButtonItem>
+                        <barButtonItem key="rightBarButtonItem" systemItem="save" id="HzA-Fa-ToQ">
+                            <connections>
+                                <action selector="onSaveClicked:" destination="UPd-uT-cg4" id="pM2-zX-RdY"/>
+                            </connections>
+                        </barButtonItem>
                     </navigationItem>
                     <simulatedNavigationBarMetrics key="simulatedTopBarMetrics" prompted="NO"/>
                 </viewController>
@@ -259,11 +256,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="44"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="360" height="43.5"/>
                                             <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="44"/>
+                                                    <rect key="frame" x="15" y="0.0" width="330" height="43.5"/>
                                                     <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"/>
@@ -379,7 +376,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="128"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="768" height="127.5"/>
                                             <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">
@@ -390,21 +387,14 @@
                                                     <nil key="highlightedColor"/>
                                                 </label>
                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" text="2016-12-12" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="Ewl-Ty-p9Y">
-                                                    <rect key="frame" x="341" y="8" width="97" height="21"/>
-                                                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                                                    <fontDescription key="fontDescription" type="system" pointSize="17"/>
-                                                    <nil key="textColor"/>
-                                                    <nil key="highlightedColor"/>
-                                                </label>
-                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" text="2012-12-30" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="eq9-ea-SjV">
-                                                    <rect key="frame" x="655" y="8" width="97" height="21"/>
+                                                    <rect key="frame" x="345" y="8" width="97" height="21"/>
                                                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                                     <nil key="textColor"/>
                                                     <nil key="highlightedColor"/>
                                                 </label>
                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" text="CUSTOMER NAME" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="GV5-wm-LUp">
-                                                    <rect key="frame" x="138" y="8" width="190" height="21"/>
+                                                    <rect key="frame" x="143" y="8" width="189" height="21"/>
                                                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                                     <nil key="textColor"/>
@@ -423,7 +413,14 @@
                                                     <nil key="highlightedColor"/>
                                                 </label>
                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" text="AGENT NAME" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="tHu-Ic-2Wf">
-                                                    <rect key="frame" x="449" y="8" width="190" height="21"/>
+                                                    <rect key="frame" x="455" y="8" width="189" height="21"/>
+                                                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                                    <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                                                    <nil key="textColor"/>
+                                                    <nil key="highlightedColor"/>
+                                                </label>
+                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" text="2012-12-30" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="eq9-ea-SjV">
+                                                    <rect key="frame" x="657" y="8" width="97" height="21"/>
                                                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                                     <nil key="textColor"/>
@@ -493,7 +490,7 @@
                                 <nil key="highlightedColor"/>
                             </label>
                             <button opaque="NO" contentMode="scaleToFill" misplaced="YES" contentHorizontalAlignment="right" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" id="jWr-7U-jNX">
-                                <rect key="frame" x="417" y="527" width="103" height="30"/>
+                                <rect key="frame" x="417" y="526" width="103" height="30"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                 <state key="normal" title="Click to select"/>
                                 <connections>
@@ -644,27 +641,43 @@
                                 <nil key="highlightedColor"/>
                             </label>
                             <button opaque="NO" contentMode="scaleToFill" misplaced="YES" contentHorizontalAlignment="right" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" id="VCg-d6-wsc">
-                                <rect key="frame" x="417" y="461" width="103" height="30"/>
+                                <rect key="frame" x="417" y="465" width="103" height="30"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                 <state key="normal" title="Click to select"/>
                                 <connections>
                                     <action selector="onSelectJobDate:" destination="x0b-wx-C76" eventType="touchUpInside" id="ghp-sb-Myk"/>
                                 </connections>
                             </button>
-                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="cDk-wo-pqZ">
-                                <rect key="frame" x="162" y="470" width="192" height="21"/>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" text="jd" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="cDk-wo-pqZ">
+                                <rect key="frame" x="162" y="470" width="130" height="21"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                 <nil key="textColor"/>
                                 <nil key="highlightedColor"/>
                             </label>
-                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="6me-ic-7ZY">
-                                <rect key="frame" x="162" y="530" width="192" height="21"/>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" text="sd" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="6me-ic-7ZY">
+                                <rect key="frame" x="162" y="530" width="130" height="21"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                 <nil key="textColor"/>
                                 <nil key="highlightedColor"/>
                             </label>
+                            <button opaque="NO" contentMode="scaleToFill" misplaced="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" id="tQv-ZX-ShO">
+                                <rect key="frame" x="318" y="466" width="36" height="30"/>
+                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                <state key="normal" title="Clear"/>
+                                <connections>
+                                    <action selector="OnClearJDClick:" destination="x0b-wx-C76" eventType="touchUpInside" id="Hoe-4N-E5Z"/>
+                                </connections>
+                            </button>
+                            <button opaque="NO" contentMode="scaleToFill" misplaced="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" id="b6Z-kl-iod">
+                                <rect key="frame" x="318" y="525" width="36" height="30"/>
+                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                <state key="normal" title="Clear"/>
+                                <connections>
+                                    <action selector="OnClearSDClicked:" destination="x0b-wx-C76" eventType="touchUpInside" id="AQL-3Y-tiG"/>
+                                </connections>
+                            </button>
                         </subviews>
                         <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                     </view>

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

@@ -8,7 +8,6 @@
 
 /* Begin PBXBuildFile section */
 		7115D41F1E13AC0200EF4E4C /* GEIC - Home Improvement Contract 2017.json in Resources */ = {isa = PBXBuildFile; fileRef = 7115D41E1E13AC0200EF4E4C /* GEIC - Home Improvement Contract 2017.json */; };
-		7115D4231E13B05300EF4E4C /* GEIC - Home Improvement Contract 2017.pdf in Resources */ = {isa = PBXBuildFile; fileRef = 7115D4221E13B05300EF4E4C /* GEIC - Home Improvement Contract 2017.pdf */; };
 		7115D4271E13B70C00EF4E4C /* DocumentListViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 7115D4261E13B70C00EF4E4C /* DocumentListViewController.m */; };
 		7115D42A1E14DE0A00EF4E4C /* DocListTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 7115D4291E14DE0A00EF4E4C /* DocListTableViewCell.m */; };
 		7115D4561E1606F700EF4E4C /* GEContractFilterViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 7115D4551E1606F700EF4E4C /* GEContractFilterViewController.m */; };
@@ -79,11 +78,11 @@
 		7128C3551E12548C00FF635B /* SignatureListViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 7128C34F1E12548C00FF635B /* SignatureListViewController.m */; };
 		7128C3561E12548C00FF635B /* SignatureTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 7128C3511E12548C00FF635B /* SignatureTableViewCell.m */; };
 		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 */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
 		7115D41E1E13AC0200EF4E4C /* GEIC - Home Improvement Contract 2017.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; name = "GEIC - Home Improvement Contract 2017.json"; path = "Granite Expo eSign/GEIC - Home Improvement Contract 2017.json"; sourceTree = "<group>"; };
-		7115D4221E13B05300EF4E4C /* GEIC - Home Improvement Contract 2017.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; name = "GEIC - Home Improvement Contract 2017.pdf"; path = "Granite Expo eSign/GEIC - Home Improvement Contract 2017.pdf"; sourceTree = "<group>"; };
 		7115D4251E13B70C00EF4E4C /* DocumentListViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DocumentListViewController.h; path = ../../common/DocumentListViewController.h; sourceTree = "<group>"; };
 		7115D4261E13B70C00EF4E4C /* DocumentListViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = DocumentListViewController.m; path = ../../common/DocumentListViewController.m; sourceTree = "<group>"; };
 		7115D4281E14DE0A00EF4E4C /* DocListTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DocListTableViewCell.h; path = ../../common/DocListTableViewCell.h; sourceTree = "<group>"; };
@@ -224,6 +223,7 @@
 		7128C3511E12548C00FF635B /* SignatureTableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SignatureTableViewCell.m; path = ../../common/SignatureTableViewCell.m; sourceTree = "<group>"; };
 		717243421E1CCCEC00800678 /* CustomIOSAlertView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CustomIOSAlertView.h; path = "../../../RedAnt ERP Mobile/common/customUI/CustomIOSAlertView.h"; sourceTree = "<group>"; };
 		717243431E1CCCEC00800678 /* CustomIOSAlertView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = CustomIOSAlertView.m; path = "../../../RedAnt ERP Mobile/common/customUI/CustomIOSAlertView.m"; sourceTree = "<group>"; };
+		717243491E1E208F00800678 /* GEIC - Home Improvement Contract 2017.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; name = "GEIC - Home Improvement Contract 2017.pdf"; path = "Granite Expo eSign/GEIC - Home Improvement Contract 2017.pdf"; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -493,7 +493,7 @@
 			isa = PBXGroup;
 			children = (
 				7115D41E1E13AC0200EF4E4C /* GEIC - Home Improvement Contract 2017.json */,
-				7115D4221E13B05300EF4E4C /* GEIC - Home Improvement Contract 2017.pdf */,
+				717243491E1E208F00800678 /* GEIC - Home Improvement Contract 2017.pdf */,
 			);
 			name = "pdf resource";
 			sourceTree = "<group>";
@@ -570,7 +570,7 @@
 				7128C26F1E124FF200FF635B /* Main.storyboard in Resources */,
 				7128C2701E124FF200FF635B /* LaunchScreen.storyboard in Resources */,
 				7115D45F1E16326C00EF4E4C /* CommonEditor.storyboard in Resources */,
-				7115D4231E13B05300EF4E4C /* GEIC - Home Improvement Contract 2017.pdf in Resources */,
+				7172434A1E1E208F00800678 /* GEIC - Home Improvement Contract 2017.pdf in Resources */,
 				7128C27D1E12500B00FF635B /* signature.storyboard in Resources */,
 				7128C2E81E12511B00FF635B /* LICENSE in Resources */,
 			);

+ 19 - 2
Ants Contract/Granite Expo eSign/Granite Expo eSign/GEContractFilterViewController.m

@@ -39,6 +39,13 @@
     [super didReceiveMemoryWarning];
     // Dispose of any resources that can be recreated.
 }
+- (IBAction)OnClearJDClick:(id)sender {
+    self.labelJobDate.text = nil;
+}
+- (IBAction)OnClearSDClicked:(id)sender {
+    self.labelSignDate.text = nil;
+}
+
 - (IBAction)onSelectSignDate:(id)sender {
     
      __weak __typeof(self)weakSelf = self;
@@ -179,6 +186,16 @@
     [self dismissViewControllerAnimated:false completion:nil];
 }
 - (IBAction)onResetClick:(id)sender {
+    self.filterparams[@"agent_name"] = nil;
+    self.filterparams[@"job_zip"] = nil;
+    self.filterparams[@"job_addr"] = nil;
+    self.filterparams[@"customer_name"] = nil;
+    self.filterparams[@"customer_name"] = nil;
+    self.filterparams[@"doc_number"] = nil;
+    self.filterparams[@"job_state"] = nil;
+    self.filterparams[@"tel"] = nil;
+    self.filterparams[@"job_date"] = nil;
+    self.filterparams[@"signed_date"] = nil;
     self.tfAgent.text = self.filterparams[@"agent_name"];
     self.tfJobZip.text = self.filterparams[@"job_zip"];
     self.tfJobAddr.text = self.filterparams[@"job_addr"];
@@ -188,8 +205,8 @@
     self.tfJobState.text = self.filterparams[@"job_state"];
     self.tfCustomerTel.text = self.filterparams[@"tel"];
     
-    self.labelJobDate =self.filterparams[@"job_date"];
-    self.labelSignDate =self.filterparams[@"signed_date"];
+    self.labelJobDate.text =self.filterparams[@"job_date"];
+    self.labelSignDate.text =self.filterparams[@"signed_date"];
 }
 
 /*

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

@@ -102,9 +102,9 @@
             "aname": "Jobsite Address",
             "type": "TextView",
             "required": true,
-            "pos_x": 222,
+            "pos_x": 248,
             "pos_y": 285,
-            "width": 423,
+            "width": 397,
             "height": 15,
             "field": "job_addr",
             "value": ""
@@ -126,7 +126,7 @@
             "required": true,
             "pos_x": 432,
             "pos_y": 300,
-            "width": 90,
+            "width": 115,
             "height": 15,
             "field": "job_state",
             "value": ""
@@ -135,9 +135,9 @@
             "aname": "Jobsite Zipcode",
             "type": "TextView",
             "required": true,
-            "pos_x": 545,
+            "pos_x": 570,
             "pos_y": 300,
-            "width": 99,
+            "width": 74,
             "height": 15,
             "field": "job_zip",
             "value": ""
@@ -907,7 +907,7 @@
             "pos_y": 537,
             "width": 146,
             "height": 40,
-            "field": "Homeowner",
+            "name": "Homeowner",
             "value": ""
         },
         "control_1": {
@@ -918,7 +918,7 @@
             "pos_y": 537,
             "width": 148,
             "height": 40,
-            "field": "Homeowner Print Name",
+            "name": "Homeowner Print Name",
             "value": ""
         },
         "control_2": {
@@ -929,7 +929,7 @@
             "pos_y": 537,
             "width": 75,
             "height": 40,
-            "field": "Date",
+            "name": "Date",
             "value": ""
         },
         "control_4": {

BIN
Ants Contract/Granite Expo eSign/Granite Expo eSign/GEIC - Home Improvement Contract 2017.pdf


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

@@ -17,7 +17,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>1.0</string>
 	<key>CFBundleVersion</key>
-	<string>170104</string>
+	<string>170105</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>NSAppTransportSecurity</key>
@@ -33,6 +33,8 @@
 	<array>
 		<string>armv7</string>
 	</array>
+	<key>UIRequiresFullScreen</key>
+	<true/>
 	<key>UISupportedInterfaceOrientations~ipad</key>
 	<array>
 		<string>UIInterfaceOrientationPortrait</string>

+ 2 - 0
Ants Contract/Granite Expo eSign/Granite Expo eSign/config.h

@@ -11,6 +11,8 @@
 
 //#define ENCRYPT_OFF
 
+#define NO_SAVE_VERIFY false
+
 #define DEBUG_PDFSIG false
 
 #define PDF_DEBUG false

+ 2 - 0
Ants Contract/common/ACNetwork.h

@@ -17,4 +17,6 @@
 +(NSDictionary*)logout;
 +(NSDictionary*)request_DocList:(NSMutableDictionary*) params;
 +(NSDictionary*)new_document;
+
++(NSDictionary*)save_document:(NSString*)file;
 @end

+ 41 - 6
Ants Contract/common/ACNetwork.m

@@ -47,7 +47,7 @@
     return params;
 }
 
-+(NSData*)get_json : (NSString*) url parameters:(NSMutableDictionary *) params //delegate:(id < NSURLConnectionDelegate >)delegate
++(NSData*)get_json : (NSString*) url parameters:(NSMutableDictionary *) params file:(NSString *) file //delegate:(id < NSURLConnectionDelegate >)delegate
 {
     
     
@@ -58,7 +58,7 @@
 //    NSString* d=[AESCrypt decrypt:@"VzB4+lENfbzWX7ggHh2Os1P69l5YBzKmM51yqA37AfoKgPY8bJgdK8M4WvF+wDyOsLWP\/o8H5+bHMivQp1u8wM2QV7SYzgzPwV85QKtYWIzEgLe9T0HO69EdutWz7k1rdAT\/mftsRin0Hy5SHk7txTZT\/zPH5X+FQiExCTFm5Zus39HYvp+VxCX4+kYeymn8B63AUd3mRQyscUvDjfgU2olKR\/TP8PV3g+VQMZxpKfol3P1iOtz3XQlHZV0pM6SAf+SwT0sPfrdn6CZFfNQlrKA9QjMrnBdMeSCquSIWXnmLv6okzvnlJnT0SjvJuUeqNdBC5EZ0ACnhI0MrXVZEsq1EuM9al7oPzvU5EZbjZpmx+fSFIkMzTT8bYClTnG1bsL1MCcU4pSODDorUj8zalA==" password:@"usai2010"];
     params = [self prepare_addtional_params:params];
     
-    return [super get_json:url parameters:params err_recorder:URL_ERR_LOG result_handler:^NSMutableDictionary *(NSMutableDictionary *jsobj) {
+    return [super get_json:url parameters:params file:(NSString*)file err_recorder:URL_ERR_LOG result_handler:^NSMutableDictionary *(NSMutableDictionary *jsobj) {
         int result=[[jsobj valueForKey:@"result"] intValue];
 //        UIApplication * app = [UIApplication sharedApplication];
 //        AppDelegate *appDelegate = (AppDelegate *)[app delegate];
@@ -132,7 +132,7 @@
         return [RAUtils error_json:RESULT_NET_NOTAVAILABLE err_msg:nil];
         //        return nil;
     }
-    NSData* json=[self get_json:URL_NEW_DOCUMENT parameters:params];
+    NSData* json=[self get_json:URL_NEW_DOCUMENT parameters:params file:nil];
     //if(json==nil)
     
     
@@ -143,6 +143,41 @@
     int result = [[jsobj valueForKey:@"result"] intValue];
     
 
+    return jsobj;
+}
++(NSDictionary*)save_document:(NSString*)file
+{
+    
+    
+    
+    NSMutableDictionary* params = [[NSMutableDictionary alloc] init];
+//    AppDelegate *appDelegate = (AppDelegate*)[[UIApplication sharedApplication] delegate];
+//    if(appDelegate.user!=nil)
+//        [params setValue:appDelegate.user forKey:@"user"];
+//    
+//    
+//    if(appDelegate.password!=nil)
+//        [params setValue:appDelegate.password forKey:@"password"];
+    params[@"_operate"]=@"deviceMain";
+    
+    if(![self IsNetworkAvailable])
+    {
+        DebugLog(@"NET ERR");
+        
+        return [RAUtils error_json:RESULT_NET_NOTAVAILABLE err_msg:nil];
+        //        return nil;
+    }
+    NSData* json=[self get_json:URL_UPLOAD_PDF parameters:params file:file];
+    //if(json==nil)
+    
+    
+    if(json==nil)
+        return nil;
+    NSError *error=nil;
+    NSDictionary *jsobj = [NSJSONSerialization JSONObjectWithData:json options:NSJSONReadingMutableLeaves error:&error];
+    int result = [[jsobj valueForKey:@"result"] intValue];
+    
+    
     return jsobj;
 }
 +(NSDictionary*)logout
@@ -167,7 +202,7 @@
         return [RAUtils error_json:RESULT_NET_NOTAVAILABLE err_msg:nil];
         //        return nil;
     }
-    NSData* json=[self get_json:URL_LOGOUT parameters:params];
+    NSData* json=[self get_json:URL_LOGOUT parameters:params file:nil];
     //if(json==nil)
     
     
@@ -225,7 +260,7 @@
     
         if(![self IsNetworkAvailable])
             return RESULT_NET_NOTAVAILABLE;
-        json =[self get_json:URL_UPDATE_AUTH parameters:params];
+        json =[self get_json:URL_UPDATE_AUTH parameters:params file:nil];
         
     
     
@@ -535,7 +570,7 @@
         return [RAUtils error_json:RESULT_NET_NOTAVAILABLE err_msg:nil];
         //        return nil;
     }
-    NSData* json=[self get_json:URL_REQUEST_DOC parameters:params];
+    NSData* json=[self get_json:URL_REQUEST_DOC parameters:params file:nil];
     //if(json==nil)
     
     

+ 235 - 1
Ants Contract/common/AppDelegate.m

@@ -7,7 +7,9 @@
 //
 
 #import "AppDelegate.h"
+#import "ACNetwork.h"
 
+//#import "AFHTTPSessionManager.h"
 @interface AppDelegate ()
 
 @end
@@ -19,9 +21,241 @@
     // Override point for customization after application launch.
     
     self.bEnable_Cache = true;
+    
+    
+    [self leakingTest];
     return YES;
 }
-
+ -(void)leakingTest
+{
+ //   return;
+    
+    return;
+    
+    {
+        
+        
+//        UIAlertView * waitalert = [RAUtils waiting_alert:@"Please wait..." title:@"Sign out"];
+        
+        dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
+            
+            NSDictionary* json = nil;
+            
+                        NSString *zipfile = [[NSBundle mainBundle]pathForResource:@"GEIC - Home Improvement Contract 2017" ofType:@"pdf"];
+            ////            NSData* data = [NSData dataWithContentsOfFile: filePath];
+            
+            json = [ACNetwork save_document:zipfile];
+            
+            dispatch_async(dispatch_get_main_queue(), ^{
+                
+                
+//                [waitalert dismissWithClickedButtonIndex:0 animated:FALSE];
+                //                if([[logout_json valueForKey:@"result"] intValue]==2)
+                //                {
+                //                    self.welcomeLabel.text=@"Not sign in";
+                //                    //                        [sender setTitle:@"Sign in" forState:UIControlStateNormal];
+                //                    [bbitem setTitle:@"Sign in"];
+                //
+                //                    self.buttonHIC.enabled = false;
+                //                    self.buttonSRL.enabled = false;
+                //                    self.coverView.hidden = false;
+                //                }
+                //                else
+                //                {
+                //                    [RAUtils message_alert:[logout_json valueForKey:@"err_msg"] title:@"Sign out" controller:self] ;
+                //                }
+                
+                if([[json valueForKey:@"result"] intValue]==2)
+                {
+                    
+//                    [weakSelf.navigationController popToRootViewControllerAnimated:false];
+                    //                                        if(weakSelf.OnSave)
+                    //                                            weakSelf.OnSave(pdffile);
+                    
+                    
+                }
+                else
+                {
+                    //                                        [RAUtils message_alert:[json valueForKey:@"err_msg"] title:@"Save document" controller:self] ;
+                }
+                
+                
+            });
+        });
+        
+        
+        
+    }
+    
+//    {
+//        
+//        
+//        
+//        
+//        //        self.uploadProgress.progress = 0;
+//        
+//        AppDelegate *appDelegate = (AppDelegate*)[[UIApplication sharedApplication] delegate];
+//        
+//        
+//        {
+//            
+//            //    UIAlertView * waitalert = [[UIAlertView alloc] initWithTitle:@"wait" message:@"uploading" delegate:nil cancelButtonTitle:nil otherButtonTitles:nil, nil];
+//            //    [waitalert show];
+////            
+////            //            NSData *imageData = UIImagePNGRepresentation(self.imgview.image);
+////            
+////            AFHTTPRequestSerializer* serializer=[AFHTTPRequestSerializer serializer] ;
+////            
+////            
+////            
+////            NSMutableDictionary* params = [[NSMutableDictionary alloc] init];
+////            
+////                        if(appDelegate.user!=nil)
+////                            [params setValue:appDelegate.user forKey:@"user"];
+////                        //    if(appDelegate.contact_id!=nil)
+////                        //        [params setValue:appDelegate.contact_id forKey:@"contactId"];
+////                        if(appDelegate.password!=nil)
+////                            [params setValue:appDelegate.password forKey:@"password"];
+////            
+////            
+////            [params setValue:[AESCrypt AES128Encrypt:appDelegate.user  key:@"usai2010"] forKey:@"user"];
+////            [params setValue:[AESCrypt AES128Encrypt:appDelegate.password  key:@"usai2010"] forKey:@"password"];
+////            
+////            [params setValue:@"deviceMain" forKey:@"_operate"];
+////
+////            
+////            UIDevice * dev = [UIDevice currentDevice];
+////            NSUUID* uuid =dev.identifierForVendor;
+////#if TARGET_IPHONE_SIMULATOR//模拟器
+////            [params setValue:@"simulator_uuid" forKey:@"deviceid"];
+////#elif TARGET_OS_IPHONE//真机
+////            [params setValue:uuid.UUIDString forKey:@"deviceid"];
+////#endif
+//            
+//            
+////            
+////            NSMutableString *body=[[NSMutableString alloc]init];
+//            //参数的集合的所有key的集合
+////            NSArray *keys= [params allKeys];
+//////            DebugLog(@"================parms==================");
+////            //遍历keys
+////            for(int i=0;i<[keys count];i++)
+////            {
+////                //得到当前key
+////                NSString *key=[keys objectAtIndex:i];
+////                //如果key不是pic,说明value是字符类型,比如name:Boris
+////                if(![key isEqualToString:@"pic"])
+////                {
+////                    //                    //添加分界线,换行
+////                    //                    [body appendFormat:@"%@\r\n",MPboundary];
+////                    //添加字段名称,换2行
+////                    [body appendFormat:@"Content-Disposition: form-data; name=\"%@\"\r\n\r\n",key];
+////                    //添加字段的值
+////                    [body appendFormat:@"%@\r\n",[params objectForKey:key]];
+//////                    DebugLog(@"parameter: key=%@   value=%@",key,[params objectForKey:key]);
+////                }
+////            }
+////            DebugLog(@"================parms==================");
+//            
+//            
+//            
+////            NSString *filePath = [[NSBundle mainBundle]pathForResource:@"GEIC - Home Improvement Contract 2017" ofType:@"pdf"];
+////            NSData* data = [NSData dataWithContentsOfFile: filePath];
+////            
+////            NSMutableURLRequest *request = [serializer multipartFormRequestWithMethod:@"POST" URLString:@"http://192.168.0.155/phpcms/admin.php" parameters:nil constructingBodyWithBlock:^(id<AFMultipartFormData> formData) {
+////                [formData appendPartWithFileData:data name:@"upfile" fileName:@"leak test" mimeType:@"application/zip"];
+////            } error:nil];
+//            
+//            
+//            //        NSMutableURLRequest *request = [[AFHTTPRequestSerializer serializer] multipartFormRequestWithMethod:@"POST" URLString:WEBSERVICE_URL parameters:nil constructingBodyWithBlock:^(id<AFMultipartFormData> formData) {
+//            //            [formData appendPartWithFileData:imageData name:@"upfile" fileName:@"test" mimeType:@"image/png"];
+//            //        } error:nil];
+//            //
+//            AFURLSessionManager *manager = [[AFURLSessionManager alloc] initWithSessionConfiguration:[NSURLSessionConfiguration defaultSessionConfiguration]];
+//            
+//            
+//            
+//            //manager.responseSerializer.acceptableContentTypes = [self.operationManager.responseSerializer.acceptableContentTypes setByAddingObject:@"text/html"];
+//            
+//            //manager.responseSerializer.acceptableContentTypes = [NSSet setWithObject:@"text/html"];
+//            
+//            //
+//            NSProgress *progress = nil;
+//            
+//            NSURLSessionUploadTask *uploadTask = [manager uploadTaskWithStreamedRequest:request progress:&progress completionHandler:^(NSURLResponse *response, id responseObject, NSError *error) {
+//                
+//                //        [progress removeObserver:self forKeyPath:@"fractionCompleted"];
+//                
+//                
+////                [waitalert dismissWithClickedButtonIndex:0 animated:FALSE];
+//                
+//                if (error) {
+//                    
+////                    NSString* err_msg = [error localizedDescription];
+////                    DebugLog(@"%@",err_msg);// [self.view updateWithMessage:[NSString stringWithFormat:@"Error : %@!", error.debugDescription]];
+////                    
+////                    
+////                    NSMutableString *str = [[NSMutableString alloc] initWithData:responseObject encoding:NSUTF8StringEncoding];
+////                    
+////                    DebugLog(@"data string: %@",str);
+////                    [RAUtils message_alert:@"Can not connect to server please try again." title:@"Save document" controller:weakSelf] ;
+//                    
+//                } else {
+////                    DebugLog(@"response ");
+//                    
+//                    
+//                    
+////                    NSData *data = [NSJSONSerialization dataWithJSONObject:(NSDictionary*)responseObject options:kNilOptions error:nil];
+////                    
+////                    // 再将NSData转为字符串
+////                    NSString *jsonStr = [[NSString alloc] initWithData:data encoding:NSUTF8StringEncoding];
+////                    
+////                    //            NSMutableString *str = [[NSMutableString alloc] initWithData:responseObject encoding:NSUTF8StringEncoding];
+////                    
+////                    DebugLog(@"data string: %@",jsonStr);
+////                    
+////                    NSDictionary* json = responseObject;
+////                    
+////                    
+////                    
+////                    
+////                    if([[json valueForKey:@"result"] intValue]==2)
+////                    {
+////                        
+////                        [weakSelf.navigationController popToRootViewControllerAnimated:false];
+////                        //
+////                        //
+////                        if(weakSelf.OnSave)
+////                            weakSelf.OnSave(pdffile);
+////                        
+////                        
+////                    }
+////                    else
+////                    {
+////                        [RAUtils message_alert:[json valueForKey:@"err_msg"] title:@"Save document" controller:self] ;
+////                    }
+//                    
+//                    
+//                }
+//                //  [waitalert dismissWithClickedButtonIndex:0 animated:FALSE];
+//            }];
+//            
+//            
+//            
+//            
+//            //  [self.uploadProgress setProgressWithUploadProgressOfTask:uploadTask animated:true];
+//            //
+//            
+//            
+//            
+//            
+//            
+//            
+//            [uploadTask resume];
+//            
+//        }
+//    }
+}
 
 - (void)applicationWillResignActive:(UIApplication *)application {
     // Sent when the application is about to move from active to inactive state. This can occur for certain types of temporary interruptions (such as an incoming phone call or SMS message) or when the user quits the application and it begins the transition to the background state.

+ 6 - 6
Ants Contract/common/DocumentListViewController.m

@@ -434,21 +434,21 @@
     myView.layer.shadowRadius = 2.0;
     
     
-    UILabel *statuslabel = [[UILabel alloc] initWithFrame:CGRectMake(15, 2, 130, 22)];
+    UILabel *statuslabel = [[UILabel alloc] initWithFrame:CGRectMake(8, 2, 130, 22)];
     statuslabel.textColor=UIColorFromRGB(color);
     statuslabel.backgroundColor = [UIColor clearColor];
     statuslabel.text=NSLocalizedString(@"Document #", nil);
     [statuslabel sizeToFit];
     [myView addSubview:statuslabel];
     
-    UILabel *solabel = [[UILabel alloc] initWithFrame:CGRectMake(15, 21, 130, 22)];
+    UILabel *solabel = [[UILabel alloc] initWithFrame:CGRectMake(8, 21, 130, 22)];
     solabel.textColor=UIColorFromRGB(color);
     solabel.backgroundColor = [UIColor clearColor];
     solabel.text=NSLocalizedString(@"Address", nil);
     [solabel sizeToFit];
     [myView addSubview:solabel];
     
-    UILabel *userlabel = [[UILabel alloc] initWithFrame:CGRectMake(155, 11, 135, 22)];
+    UILabel *userlabel = [[UILabel alloc] initWithFrame:CGRectMake(143, 2, 135, 22)];
     userlabel.textColor=UIColorFromRGB(color);
     userlabel.backgroundColor = [UIColor clearColor];
     userlabel.text=NSLocalizedString(@"Customer", nil);
@@ -462,7 +462,7 @@
 //    [creatorlabel sizeToFit];
 //    [myView addSubview:creatorlabel];
     
-    UILabel *contactlabel = [[UILabel alloc] initWithFrame:CGRectMake(350, 11, 150, 22)];
+    UILabel *contactlabel = [[UILabel alloc] initWithFrame:CGRectMake(345, 2, 150, 22)];
     
     contactlabel.textColor=UIColorFromRGB(color);
     contactlabel.backgroundColor = [UIColor clearColor];
@@ -486,7 +486,7 @@
     //    [modellabel sizeToFit];
     //    [myView addSubview:modellabel];
     
-    UILabel *pricelabel = [[UILabel alloc] initWithFrame:CGRectMake(/*492*/self.tableView.frame.size.width-300, 11, 100, 22)];
+    UILabel *pricelabel = [[UILabel alloc] initWithFrame:CGRectMake(/*492*/self.tableView.frame.size.width-313, 2, 100, 22)];
     pricelabel.autoresizingMask=UIViewAutoresizingFlexibleLeftMargin;
     pricelabel.textColor=UIColorFromRGB(color);
     pricelabel.backgroundColor = [UIColor clearColor];
@@ -494,7 +494,7 @@
     [pricelabel sizeToFit];
     [myView addSubview:pricelabel];
     
-    UILabel *timelabel = [[UILabel alloc] initWithFrame:CGRectMake(self.tableView.frame.size.width-113/*605*/,11, 148, 22)];
+    UILabel *timelabel = [[UILabel alloc] initWithFrame:CGRectMake(self.tableView.frame.size.width-111/*605*/,2, 148, 22)];
     timelabel.autoresizingMask=UIViewAutoresizingFlexibleLeftMargin;
     timelabel.textColor=UIColorFromRGB(color);
     timelabel.backgroundColor = [UIColor clearColor];

+ 239 - 154
Ants Contract/common/DocumentPageViewController.m

@@ -122,6 +122,29 @@
     [super didReceiveMemoryWarning];
     // Dispose of any resources that can be recreated.
 }
+
+- (IBAction)OnCancelClicked:(id)sender {
+    
+    UIAlertController *alertControl = [UIAlertController alertControllerWithTitle:@"Are you sure cancel customer? All your entered information will lost." message:nil preferredStyle:UIAlertControllerStyleAlert];
+    
+    UIAlertAction *alertthree = [UIAlertAction actionWithTitle:@"Yes" style:UIAlertActionStyleDestructive handler:^(UIAlertAction *action) {
+        [self.navigationController popToRootViewControllerAnimated:false];
+    }];
+    // [alertControl addAction:actionOne];
+    
+    [alertControl addAction:alertthree];
+    
+    
+    UIAlertAction *alertcancel = [UIAlertAction actionWithTitle:@"No" style:UIAlertActionStyleCancel handler:^(UIAlertAction *action) {
+    }];
+    [alertControl addAction:alertcancel];
+    //UIAlertControllerStyle类型为UIAlertControllerStyleAlert可以添加addTextFieldWithConfigurationHandler:^(UITextField *textField)
+    
+    
+    
+    
+    [self presentViewController:alertControl animated:YES completion:nil];
+}
 - (IBAction)onSignatureClicked:(id)sender {
     
     //    CGRect cellrect_screen = [RAUtils relativeFrameForScreenWithView:trigger];
@@ -147,9 +170,9 @@
             
             signimg = img;
             
-            if(signimg!=nil)
-                [PDFUtils addSignature:signimg to:self.signatureData];
-                //[self addSignature:signimg];
+//            if(signimg!=nil)
+//                [PDFUtils addSignature:signimg to:self.signatureData];
+                
                 
             
             
@@ -243,174 +266,230 @@
     
     NSString* zipfile=[ACNetwork prepareUploadFile:pdffile json:self.controlTemplate];
     
-  //  return;
+    
     
     {
         
         
         UIAlertView * waitalert = [RAUtils waiting_alert:@"Please wait..." title:@"Saving"];
         
-
-//        self.uploadProgress.progress = 0;
-        
-        AppDelegate *appDelegate = (AppDelegate*)[[UIApplication sharedApplication] delegate];
-        
-
-        {
-            
-            //    UIAlertView * waitalert = [[UIAlertView alloc] initWithTitle:@"wait" message:@"uploading" delegate:nil cancelButtonTitle:nil otherButtonTitles:nil, nil];
-            //    [waitalert show];
-            
-//            NSData *imageData = UIImagePNGRepresentation(self.imgview.image);
-            
-            AFHTTPRequestSerializer* serializer=[AFHTTPRequestSerializer serializer] ;
-            
-            
-            
-            NSMutableDictionary* params = [[NSMutableDictionary alloc] init];
-            
-//            if(appDelegate.user!=nil)
-//                [params setValue:appDelegate.user forKey:@"user"];
-//            //    if(appDelegate.contact_id!=nil)
-//            //        [params setValue:appDelegate.contact_id forKey:@"contactId"];
-//            if(appDelegate.password!=nil)
-//                [params setValue:appDelegate.password forKey:@"password"];
-            
+        dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
             
-            [params setValue:[AESCrypt AES128Encrypt:appDelegate.user  key:@"usai2010"] forKey:@"user"];
-            [params setValue:[AESCrypt AES128Encrypt:appDelegate.password  key:@"usai2010"] forKey:@"password"];
+            NSDictionary* json = nil;
             
-            [params setValue:@"deviceMain" forKey:@"_operate"];
             
             
-            UIDevice * dev = [UIDevice currentDevice];
-            NSUUID* uuid =dev.identifierForVendor;
-#if TARGET_IPHONE_SIMULATOR//模拟器
-            [params setValue:@"simulator_uuid" forKey:@"deviceid"];
-#elif TARGET_OS_IPHONE//真机
-            [params setValue:uuid.UUIDString forKey:@"deviceid"];
-#endif
-
-            
-            
-            NSMutableString *body=[[NSMutableString alloc]init];
-            //参数的集合的所有key的集合
-            NSArray *keys= [params allKeys];
-            DebugLog(@"================parms==================");
-            //遍历keys
-            for(int i=0;i<[keys count];i++)
-            {
-                //得到当前key
-                NSString *key=[keys objectAtIndex:i];
-                //如果key不是pic,说明value是字符类型,比如name:Boris
-                if(![key isEqualToString:@"pic"])
-                {
-//                    //添加分界线,换行
-//                    [body appendFormat:@"%@\r\n",MPboundary];
-                    //添加字段名称,换2行
-                    [body appendFormat:@"Content-Disposition: form-data; name=\"%@\"\r\n\r\n",key];
-                    //添加字段的值
-                    [body appendFormat:@"%@\r\n",[params objectForKey:key]];
-                    DebugLog(@"parameter: key=%@   value=%@",key,[params objectForKey:key]);
-                }
-            }
-            DebugLog(@"================parms==================");
-            
-            NSData* data = [NSData dataWithContentsOfFile: zipfile];
+            json = [ACNetwork save_document:zipfile];
             
-            NSMutableURLRequest *request = [serializer multipartFormRequestWithMethod:@"POST" URLString:URL_UPLOAD_PDF parameters:params constructingBodyWithBlock:^(id<AFMultipartFormData> formData) {
-                [formData appendPartWithFileData:data name:@"upfile" fileName:[zipfile lastPathComponent] mimeType:@"application/zip"];
-            } error:nil];
-            
-            
-            //        NSMutableURLRequest *request = [[AFHTTPRequestSerializer serializer] multipartFormRequestWithMethod:@"POST" URLString:WEBSERVICE_URL parameters:nil constructingBodyWithBlock:^(id<AFMultipartFormData> formData) {
-            //            [formData appendPartWithFileData:imageData name:@"upfile" fileName:@"test" mimeType:@"image/png"];
-            //        } error:nil];
-            //
-            AFURLSessionManager *manager = [[AFURLSessionManager alloc] initWithSessionConfiguration:[NSURLSessionConfiguration defaultSessionConfiguration]];
-            
-            
-            
-            //manager.responseSerializer.acceptableContentTypes = [self.operationManager.responseSerializer.acceptableContentTypes setByAddingObject:@"text/html"];
-            
-            //manager.responseSerializer.acceptableContentTypes = [NSSet setWithObject:@"text/html"];
-            
-            //
-            NSProgress *progress = nil;
-            
-            NSURLSessionUploadTask *uploadTask = [manager uploadTaskWithStreamedRequest:request progress:&progress completionHandler:^(NSURLResponse *response, id responseObject, NSError *error) {
+            dispatch_async(dispatch_get_main_queue(), ^{
                 
-                //        [progress removeObserver:self forKeyPath:@"fractionCompleted"];
                 
+                [waitalert dismissWithClickedButtonIndex:0 animated:FALSE];
+//                if([[logout_json valueForKey:@"result"] intValue]==2)
+//                {
+//                    self.welcomeLabel.text=@"Not sign in";
+//                    //                        [sender setTitle:@"Sign in" forState:UIControlStateNormal];
+//                    [bbitem setTitle:@"Sign in"];
+//                    
+//                    self.buttonHIC.enabled = false;
+//                    self.buttonSRL.enabled = false;
+//                    self.coverView.hidden = false;
+//                }
+//                else
+//                {
+//                    [RAUtils message_alert:[logout_json valueForKey:@"err_msg"] title:@"Sign out" controller:self] ;
+//                }
                 
-                 [waitalert dismissWithClickedButtonIndex:0 animated:FALSE];
+                                    if([[json valueForKey:@"result"] intValue]==2)
+                                    {
                 
-                if (error) {
-                    
-                    NSString* err_msg = [error localizedDescription];
-                    DebugLog(@"%@",err_msg);// [self.view updateWithMessage:[NSString stringWithFormat:@"Error : %@!", error.debugDescription]];
-                    
-                    
-                    NSMutableString *str = [[NSMutableString alloc] initWithData:responseObject encoding:NSUTF8StringEncoding];
-                    
-                    DebugLog(@"data string: %@",str);
-                    [RAUtils message_alert:@"Can not connect to server please try again." title:@"Save document" controller:self] ;
-                    
-                } else {
-                    DebugLog(@"response ");
-                    
-                    
-                    
-                    NSData *data = [NSJSONSerialization dataWithJSONObject:(NSDictionary*)responseObject options:kNilOptions error:nil];
-                    
-                    // 再将NSData转为字符串
-                    NSString *jsonStr = [[NSString alloc] initWithData:data encoding:NSUTF8StringEncoding];
-                    
-                    //            NSMutableString *str = [[NSMutableString alloc] initWithData:responseObject encoding:NSUTF8StringEncoding];
-                    
-                    DebugLog(@"data string: %@",jsonStr);
-                    
-                    NSDictionary* json = responseObject;
-                    
-                    
-                    
-                    
-                    if([[json valueForKey:@"result"] intValue]==2)
-                    {
+                                        [weakSelf.navigationController popToRootViewControllerAnimated:false];
+                                        if(weakSelf.OnSave)
+                                            weakSelf.OnSave(pdffile);
+                
+                
+                                    }
+                                    else
+                                    {
+                                        [RAUtils message_alert:[json valueForKey:@"err_msg"] title:@"Save document" controller:self] ;
+                                    }
+                
+                
+            });
+        });
+        
+        
+        
+    }
 
-                        [weakSelf.navigationController popToRootViewControllerAnimated:false];
+  //  return;
+    
+//    {
+//
+//
+//        UIAlertView * waitalert = [RAUtils waiting_alert:@"Please wait..." title:@"Saving"];
+//
+//
+////        self.uploadProgress.progress = 0;
+//        
+//        AppDelegate *appDelegate = (AppDelegate*)[[UIApplication sharedApplication] delegate];
+//        
+//
+//        {
+//            
+//            //    UIAlertView * waitalert = [[UIAlertView alloc] initWithTitle:@"wait" message:@"uploading" delegate:nil cancelButtonTitle:nil otherButtonTitles:nil, nil];
+//            //    [waitalert show];
+//            
+////            NSData *imageData = UIImagePNGRepresentation(self.imgview.image);
+//            
+//            AFHTTPRequestSerializer* serializer=[AFHTTPRequestSerializer serializer] ;
+//            
+//            
+//            
+//            NSMutableDictionary* params = [[NSMutableDictionary alloc] init];
+//            
+////            if(appDelegate.user!=nil)
+////                [params setValue:appDelegate.user forKey:@"user"];
+////            //    if(appDelegate.contact_id!=nil)
+////            //        [params setValue:appDelegate.contact_id forKey:@"contactId"];
+////            if(appDelegate.password!=nil)
+////                [params setValue:appDelegate.password forKey:@"password"];
+//            
+//            
+//            [params setValue:[AESCrypt AES128Encrypt:appDelegate.user  key:@"usai2010"] forKey:@"user"];
+//            [params setValue:[AESCrypt AES128Encrypt:appDelegate.password  key:@"usai2010"] forKey:@"password"];
+//            
+//            [params setValue:@"deviceMain" forKey:@"_operate"];
+//            
+//            
+//            UIDevice * dev = [UIDevice currentDevice];
+//            NSUUID* uuid =dev.identifierForVendor;
+//#if TARGET_IPHONE_SIMULATOR//模拟器
+//            [params setValue:@"simulator_uuid" forKey:@"deviceid"];
+//#elif TARGET_OS_IPHONE//真机
+//            [params setValue:uuid.UUIDString forKey:@"deviceid"];
+//#endif
+//
+//            
+//            
+//            NSMutableString *body=[[NSMutableString alloc]init];
+//            //参数的集合的所有key的集合
+//            NSArray *keys= [params allKeys];
+//            DebugLog(@"================parms==================");
+//            //遍历keys
+//            for(int i=0;i<[keys count];i++)
+//            {
+//                //得到当前key
+//                NSString *key=[keys objectAtIndex:i];
+//                //如果key不是pic,说明value是字符类型,比如name:Boris
+//                if(![key isEqualToString:@"pic"])
+//                {
+////                    //添加分界线,换行
+////                    [body appendFormat:@"%@\r\n",MPboundary];
+//                    //添加字段名称,换2行
+//                    [body appendFormat:@"Content-Disposition: form-data; name=\"%@\"\r\n\r\n",key];
+//                    //添加字段的值
+//                    [body appendFormat:@"%@\r\n",[params objectForKey:key]];
+//                    DebugLog(@"parameter: key=%@   value=%@",key,[params objectForKey:key]);
+//                }
+//            }
+//            DebugLog(@"================parms==================");
+//            
+//            NSData* data = [NSData dataWithContentsOfFile: zipfile];
+//            
+//            NSMutableURLRequest *request = [serializer multipartFormRequestWithMethod:@"POST" URLString:URL_UPLOAD_PDF parameters:params constructingBodyWithBlock:^(id<AFMultipartFormData> formData) {
+//                [formData appendPartWithFileData:data name:@"upfile" fileName:[zipfile lastPathComponent] mimeType:@"application/zip"];
+//            } error:nil];
+//            
+//            
+//            //        NSMutableURLRequest *request = [[AFHTTPRequestSerializer serializer] multipartFormRequestWithMethod:@"POST" URLString:WEBSERVICE_URL parameters:nil constructingBodyWithBlock:^(id<AFMultipartFormData> formData) {
+//            //            [formData appendPartWithFileData:imageData name:@"upfile" fileName:@"test" mimeType:@"image/png"];
+//            //        } error:nil];
+//            //
+//            AFURLSessionManager *manager = [[AFURLSessionManager alloc] initWithSessionConfiguration:[NSURLSessionConfiguration defaultSessionConfiguration]];
+//            
+//            
+//            
+//            //manager.responseSerializer.acceptableContentTypes = [self.operationManager.responseSerializer.acceptableContentTypes setByAddingObject:@"text/html"];
+//            
+//            //manager.responseSerializer.acceptableContentTypes = [NSSet setWithObject:@"text/html"];
+//            
+//            //
+//            NSProgress *progress = nil;
+//            
+//            NSURLSessionUploadTask *uploadTask = [manager uploadTaskWithStreamedRequest:request progress:&progress completionHandler:^(NSURLResponse *response, id responseObject, NSError *error) {
+//                
+//                //        [progress removeObserver:self forKeyPath:@"fractionCompleted"];
+//                
+//                
+//                 [waitalert dismissWithClickedButtonIndex:0 animated:FALSE];
+//                
+//                if (error) {
+//                    
+//                    NSString* err_msg = [error localizedDescription];
+//                    DebugLog(@"%@",err_msg);// [self.view updateWithMessage:[NSString stringWithFormat:@"Error : %@!", error.debugDescription]];
+//                    
+//                    
+//                    NSMutableString *str = [[NSMutableString alloc] initWithData:responseObject encoding:NSUTF8StringEncoding];
+//                    
+//                    DebugLog(@"data string: %@",str);
+//                    [RAUtils message_alert:@"Can not connect to server please try again." title:@"Save document" controller:weakSelf] ;
+//                    
+//                } else {
+//                    DebugLog(@"response ");
+//                    
+//                    
+//                    
+//                    NSData *data = [NSJSONSerialization dataWithJSONObject:(NSDictionary*)responseObject options:kNilOptions error:nil];
+//                    
+//                    // 再将NSData转为字符串
+//                    NSString *jsonStr = [[NSString alloc] initWithData:data encoding:NSUTF8StringEncoding];
+//                    
+//                    //            NSMutableString *str = [[NSMutableString alloc] initWithData:responseObject encoding:NSUTF8StringEncoding];
+//                    
+//                    DebugLog(@"data string: %@",jsonStr);
+//                    
+//                    NSDictionary* json = responseObject;
+//                    
+//                    
+//                    
+//                    
+//                    if([[json valueForKey:@"result"] intValue]==2)
+//                    {
+//
+//                        [weakSelf.navigationController popToRootViewControllerAnimated:false];
+////
+////                        
+//                        if(weakSelf.OnSave)
+//                            weakSelf.OnSave(pdffile);
 //
 //                        
-                        if(weakSelf.OnSave)
-                            weakSelf.OnSave(pdffile);
-
-                        
-                    }
-                    else
-                    {
-                        [RAUtils message_alert:[json valueForKey:@"err_msg"] title:@"Save document" controller:self] ;
-                    }
-                    
-                    
-                }
-                //  [waitalert dismissWithClickedButtonIndex:0 animated:FALSE];
-            }];
-            
-            
-            
-            
-          //  [self.uploadProgress setProgressWithUploadProgressOfTask:uploadTask animated:true];
-            //
-            
-            
-            
-            
-            
-            
-            [uploadTask resume];
-            
-        }
-    }
+//                    }
+//                    else
+//                    {
+//                        [RAUtils message_alert:[json valueForKey:@"err_msg"] title:@"Save document" controller:self] ;
+//                    }
+//                    
+//                    
+//                }
+//                //  [waitalert dismissWithClickedButtonIndex:0 animated:FALSE];
+//            }];
+//            
+//            
+//            
+//            
+//          //  [self.uploadProgress setProgressWithUploadProgressOfTask:uploadTask animated:true];
+//            //
+//            
+//            
+//            
+//            
+//            
+//            
+//            [uploadTask resume];
+//            
+//        }
+//    }
     
   //  [PDFUtils savep
 }
@@ -535,6 +614,8 @@
     lineLabel.numberOfLines = 0;
     lineLabel.lineBreakMode =NSLineBreakByWordWrapping;
     
+    
+    constraintkey = CGSizeMake(260, 20000.0f);
     CGSize sizemsg = [msg sizeWithFont:[UIFont boldSystemFontOfSize:17.0] constrainedToSize:constraintkey lineBreakMode:NSLineBreakByWordWrapping];
     
     lineLabel.frame = CGRectMake(15, titleLabel.frame.origin.y+ titleLabel.frame.size.height+20, 260, sizemsg.height);
@@ -546,7 +627,10 @@
 }
 -(bool) verifyData
 {
-    return true;
+    
+    if(NO_SAVE_VERIFY)
+        return true;
+ //   return true;
     bool ret=true;
     int more=0;
     NSMutableArray* fields=[[NSMutableArray alloc] init];
@@ -602,6 +686,7 @@
         if(more>0)
         {
             NSString* msg=[NSString stringWithFormat:@"And %d more missing field.",more];
+            
             [fields addObject:@"......"];
                 [fields addObject:msg];
         }

+ 2 - 2
Ants Contract/common/PageViewController.h

@@ -9,13 +9,13 @@
 #import <UIKit/UIKit.h>
 #import "PDFPageView.h"
 #import "PDFScrollView.h"
-#import "EditControlView.h"
+//#import "EditControlView.h"
 #import "TouchImageView.h"
 
 @interface PageViewController : UIViewController<UITextViewDelegate,TouchImageViewDelegate>
 
 @property (strong, nonatomic) IBOutlet PDFPageView *pdfPageView;
-@property (strong, nonatomic) IBOutlet EditControlView *editControlView;
+@property (strong, nonatomic) IBOutlet UIView *editControlView;
 @property size_t pageIndex;
 @property CGPDFPageRef pageRef;
 @property (strong, nonatomic) IBOutlet PDFScrollView *pdfScrollView;

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

@@ -697,6 +697,13 @@
     
     
     {
+    
+        long index = touchImageView.tag - CONTROL_BASE;
+        
+        
+        NSMutableDictionary* control_json = self.controlTemplate [[NSString stringWithFormat:@"control_%ld",index] ];
+
+        
         
         //    CGRect cellrect_screen = [RAUtils relativeFrameForScreenWithView:trigger];
         //
@@ -707,6 +714,7 @@
         SignatureListViewController *signatureVC = [ [UIStoryboard storyboardWithName:@"signature" bundle:[NSBundle mainBundle]] instantiateViewControllerWithIdentifier:@"SignatureListViewController"];
         signatureVC.title=@"Signatures";
         signatureVC.signatureData = self.signatureData;
+        signatureVC.subType = control_json[@"name"];
         
 //        signatureVC.imageView = touchImageView;
         
@@ -766,7 +774,7 @@
                 
                 if(signimg!=nil)
                 {
-                    NSString* file=[PDFUtils addSignature:signimg to:self.signatureData];
+                    NSString* file=[PDFUtils addSignature:signimg to:self.signatureData subType:control_json[@"name"]];
                         long index = touchImageView.tag - CONTROL_BASE;
                         self.controlTemplate [[NSString stringWithFormat:@"control_%ld",index] ][@"value"] = file;
                     touchImageView.image = signimg;

+ 2 - 1
Ants Contract/common/RootViewController.m

@@ -209,6 +209,7 @@
 
 -(void) previewPDF:(NSString*)file
 {
+    
     NSString* name=@"";//[self.content_data[indexPath.row] valueForKey:@"tear_name"];
     NSString* url= file;//[self.content_data[indexPath.row] valueForKey:@"pdf_path"];
     
@@ -264,7 +265,7 @@
     
     dvc.OnSave=^(NSString* file)
     {
-        [weakSelf previewPDF:file];
+     //   [weakSelf previewPDF:file];
     };
     
     [self.navigationController pushViewController:dvc animated:true];

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

@@ -13,6 +13,9 @@
 @property (strong, nonatomic) IBOutlet UITableView *tableView;
 
 @property (strong, nonatomic) NSMutableDictionary* signatureData;
+@property (strong, nonatomic) NSString* subType;
+
+@property (strong, nonatomic) IBOutlet UIBarButtonItem *bbAdd;
 
 //@property (strong, nonatomic)  UIImageView *imageView;
 @property (nonatomic , copy) void (^blk_Add)();

+ 11 - 8
Ants Contract/common/SignatureListViewController.m

@@ -17,6 +17,9 @@
 
 - (void)viewDidLoad {
     [super viewDidLoad];
+    
+    if([self.signatureData[self.subType][@"count"] intValue]==0)
+        [self onAddClick:self.bbAdd];
     // Do any additional setup after loading the view.
 }
 
@@ -26,12 +29,12 @@
 }
 - (IBAction)onAddClick:(id)sender {
     
-    
+    __weak __typeof(self)weakSelf = self;
     [self dismissViewControllerAnimated:false completion:^{
         
         
-        if(self.blk_Add)
-            self.blk_Add();
+        if(weakSelf.blk_Add)
+            weakSelf.blk_Add();
         
      }];
     
@@ -45,7 +48,7 @@
         NSIndexPath *   indexPath = [self.tableView indexPathForCell:cell];
     
     
-    NSDictionary * item_json = self.signatureData[[NSString stringWithFormat:@"item_%ld",(long)indexPath.section]];
+    NSDictionary * item_json = self.signatureData[self.subType][[NSString stringWithFormat:@"item_%ld",(long)indexPath.section]];
     
     //        UIImage* img = [UIImage imageWithContentsOfFile:item_json[@"file"]];
     
@@ -212,12 +215,12 @@
 
 - (NSString *)tableView:(UITableView *)tableView titleForHeaderInSection:(NSInteger)section {
     
-    return [NSString stringWithFormat:@"Signature%ld",(long)section+1];
+    return [NSString stringWithFormat:@"%@ %ld",self.subType,(long)section+1];
     
 }
 - (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView
 {
-    return [self.signatureData[@"count"] intValue];
+    return [self.signatureData[self.subType][@"count"] intValue];
 }
 //- (CGFloat)tableView:(UITableView *)tableView heightForHeaderInSection:(NSInteger)section
 //{
@@ -236,7 +239,7 @@
     
     NSString *CellIdentifier = @"SignatureTableViewCell";
     SignatureTableViewCell * cell= [tableView dequeueReusableCellWithIdentifier:CellIdentifier forIndexPath:indexPath];
-    NSDictionary * item_json = self.signatureData[[NSString stringWithFormat:@"item_%ld",(long)indexPath.section]];
+    NSDictionary * item_json = self.signatureData[self.subType][[NSString stringWithFormat:@"item_%ld",(long)indexPath.section]];
     
     UIImage* img = [UIImage imageWithContentsOfFile:item_json[@"file"]];
     
@@ -347,7 +350,7 @@
         
 //        SignatureTableViewCell * cell= [tableView cellForRowAtIndexPath:indexPath];
         
-        NSDictionary * item_json = self.signatureData[[NSString stringWithFormat:@"item_%ld",(long)indexPath.section]];
+        NSDictionary * item_json = self.signatureData[self.subType][[NSString stringWithFormat:@"item_%ld",(long)indexPath.section]];
         
 //        UIImage* img = [UIImage imageWithContentsOfFile:item_json[@"file"]];