فهرست منبع

161223

edit & save pdf done
Ray Zhang 9 سال پیش
والد
کامیت
f6db4b92af

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

@@ -17,6 +17,7 @@
 		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 */; };
 		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 */; };
@@ -61,6 +62,8 @@
 		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>"; };
 		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>"; };
@@ -235,6 +238,8 @@
 				71D01AF31E092304006620CE /* GroupDrawable.m */,
 				71D01AF41E092304006620CE /* ImageDrawable.h */,
 				71D01AF51E092304006620CE /* ImageDrawable.m */,
+				7156712E1E0D0AAE006324A0 /* RectDrawable.h */,
+				7156712F1E0D0AAE006324A0 /* RectDrawable.m */,
 				71D01AF61E092304006620CE /* LineDrawable.h */,
 				71D01AF71E092304006620CE /* LineDrawable.m */,
 			);
@@ -338,6 +343,7 @@
 				71D01AF91E092304006620CE /* GridDrawable.m in Sources */,
 				71D01AFC1E092304006620CE /* LineDrawable.m in Sources */,
 				713E83BD1E037C2000C4F12A /* RootViewController.m in Sources */,
+				715671301E0D0AAE006324A0 /* RectDrawable.m in Sources */,
 				71D01ADB1E08CA53006620CE /* SignatureViewController.m in Sources */,
 				71D01AC61E0783BD006620CE /* PDFScrollView.m in Sources */,
 				71D01AF81E092304006620CE /* BasicDrawable.m in Sources */,

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


+ 218 - 10
Ants Contract/AntsContract/AntsContract.xcodeproj/xcuserdata/Ray.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -426,11 +426,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "../../RedAnt ERP Mobile/common/PDFUtils.m"
-            timestampString = "503998532.974148"
+            timestampString = "504173423.737974"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "40"
-            endingLineNumber = "40"
+            startingLineNumber = "43"
+            endingLineNumber = "43"
             landmarkName = "+saveTempSignature:"
             landmarkType = "7">
          </BreakpointContent>
@@ -602,11 +602,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "../../RedAnt ERP Mobile/common/PDFUtils.m"
-            timestampString = "504080341.627162"
+            timestampString = "504173423.737974"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "18"
-            endingLineNumber = "18"
+            startingLineNumber = "21"
+            endingLineNumber = "21"
             landmarkName = "+addSignature:to:"
             landmarkType = "7">
          </BreakpointContent>
@@ -726,18 +726,226 @@
       <BreakpointProxy
          BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
          <BreakpointContent
-            shouldBeEnabled = "Yes"
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "../../RedAnt ERP Mobile/common/PDFUtils.m"
+            timestampString = "504173423.737974"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "279"
+            endingLineNumber = "279"
+            landmarkName = "+SavePDF:source:window_rect:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "../../RedAnt ERP Mobile/common/PDFUtils.m"
+            timestampString = "504173423.737974"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "240"
+            endingLineNumber = "240"
+            landmarkName = "+SavePDF:source:window_rect:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "../../RedAnt ERP Mobile/common/PDFUtils.m"
+            timestampString = "504173423.737974"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "224"
+            endingLineNumber = "224"
+            landmarkName = "+SavePDF:source:window_rect:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "../../RedAnt ERP Mobile/common/PDFUtils.m"
+            timestampString = "504173423.737974"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "137"
+            endingLineNumber = "137"
+            landmarkName = "+WindowRect2PDFRect:pdf_rect:window_size:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "../../RedAnt ERP Mobile/common/pdfCreator/ImageDrawable.m"
+            timestampString = "504165699.657706"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "36"
+            endingLineNumber = "36"
+            landmarkName = "+createImageTemplate:source_type:source:hAlign:vAlign:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "../../RedAnt ERP Mobile/common/pdfCreator/ImageDrawable.m"
+            timestampString = "504165702.803846"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "26"
+            endingLineNumber = "26"
+            landmarkName = "-init:source_type:source:hAlign:vAlign:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "../../RedAnt ERP Mobile/common/pdfCreator/ImageDrawable.m"
+            timestampString = "504169359.519337"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "76"
+            endingLineNumber = "76"
+            landmarkName = "-Draw:dataSource:ParentRect:startX:startY:flipHeight:range:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "../../RedAnt ERP Mobile/common/pdfCreator/ImageDrawable.m"
+            timestampString = "504169359.519337"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "59"
+            endingLineNumber = "59"
+            landmarkName = "-setDrawableTemplate:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "../../RedAnt ERP Mobile/common/pdfCreator/ImageDrawable.m"
+            timestampString = "504169359.519337"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "129"
+            endingLineNumber = "129"
+            landmarkName = "-Draw:dataSource:ParentRect:startX:startY:flipHeight:range:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "../../RedAnt ERP Mobile/common/pdfCreator/ImageDrawable.m"
+            timestampString = "504169359.519337"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "130"
+            endingLineNumber = "130"
+            landmarkName = "-Draw:dataSource:ParentRect:startX:startY:flipHeight:range:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "../../RedAnt ERP Mobile/common/pdfCreator/PDFDrawable.m"
+            timestampString = "504167890.611601"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "56"
+            endingLineNumber = "56"
+            landmarkName = "-DrawBound:dataSource:ParentRect:startX:startY:flipHeight:range:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "../../RedAnt ERP Mobile/common/PDFUtils.m"
-            timestampString = "504156408.812316"
+            timestampString = "504173423.737974"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "214"
-            endingLineNumber = "214"
+            startingLineNumber = "261"
+            endingLineNumber = "261"
             landmarkName = "+SavePDF:source:window_rect:"
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "../../RedAnt ERP Mobile/common/pdfCreator/RectDrawable.m"
+            timestampString = "504174590.89177"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "90"
+            endingLineNumber = "90"
+            landmarkName = "-Draw:dataSource:ParentRect:startX:startY:flipHeight:range:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "AntsContract/PDFPageView.m"
+            timestampString = "504175293.413536"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "42"
+            endingLineNumber = "42"
+            landmarkName = "-MyDisplayPDFPage:index:file:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
    </Breakpoints>
 </Bucket>

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

@@ -97,7 +97,7 @@
                                             <view contentMode="scaleToFill" id="8Hw-OZ-rsH" customClass="PDFPageView">
                                                 <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"/>
-                                                <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                                <color key="backgroundColor" red="0.59999999999999998" green="0.40000000000000002" blue="0.20000000000000001" alpha="1" colorSpace="calibratedRGB"/>
                                             </view>
                                             <view contentMode="scaleToFill" id="wPo-qh-F4Q" customClass="EditControlView">
                                                 <rect key="frame" x="0.0" y="0.0" width="768" height="960"/>

+ 1 - 1
Ants Contract/AntsContract/AntsContract/DocumentPageViewController.m

@@ -153,7 +153,7 @@
     
 }
 - (IBAction)onSaveClicked:(id)sender {
-    [PDFUtils SavePDF:self.controlTemplate source:self.document window_rect:CGRectMake(0, 0, 786, 960)];
+    [PDFUtils SavePDF:self.controlTemplate source:self.document window_rect:CGRectMake(0, 0, 768, 960)];
   //  [PDFUtils savep
 }
 

+ 1 - 1
Ants Contract/AntsContract/AntsContract/GEIC - Home Improvement Contract 2016.json

@@ -11,7 +11,7 @@
             "height": 80,
             "field": "team",
             "title": "team button",
-            "single_select": true,
+            "single_select": false,
             "marker_size": 8,
             "cadedate": [
                          [