eSign 20170419

调整填空位置

Ants Contract/AntsContract.xcworkspace/xcuserdata/Ray.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -83,5 +83,37 @@
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "common/PageViewController.m"
+            timestampString = "514277720.719844"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "538"
+            endingLineNumber = "538"
+            landmarkName = "-addTextView:destView:index:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "common/PageViewController.m"
+            timestampString = "514280056.103676"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "491"
+            endingLineNumber = "491"
+            landmarkName = "-addTextView:destView:index:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
    </Breakpoints>
 </Bucket>

Ants Contract/AntsContract/AntsContract/Base.lproj/Main.storyboard

@@ -449,7 +449,7 @@
                                         <rect key="frame" x="0.0" y="28" width="768" height="128"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="KmC-hR-Rfo" id="twt-7p-gUd">
-                                            <rect key="frame" x="0.0" y="0.0" width="768" height="127.5"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="768" height="128"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" text="GE2016121201" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="eH3-OQ-M6Q">
@@ -494,33 +494,33 @@
                                                 </label>
                                                 <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" image="picture_icon" id="81n-fk-zWB">
                                                     <rect key="frame" x="657" y="38" width="20" height="20"/>
-                                                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                                    <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/>
                                                 </imageView>
                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" text="pic" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="Xb0-aM-Zkx">
                                                     <rect key="frame" x="685" y="37" width="69" height="21"/>
-                                                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                                    <autoresizingMask key="autoresizingMask" flexibleMinX="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="file" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="kGK-fH-w0V">
                                                     <rect key="frame" x="685" y="64" width="69" height="21"/>
-                                                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                                    <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                                     <nil key="textColor"/>
                                                     <nil key="highlightedColor"/>
                                                 </label>
                                                 <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" image="file_icon" id="9ba-hT-bka">
                                                     <rect key="frame" x="657" y="65" width="20" height="20"/>
-                                                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                                    <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/>
                                                 </imageView>
                                                 <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" image="note_icon" id="srU-k9-4zC">
                                                     <rect key="frame" x="657" y="94" width="20" height="20"/>
-                                                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                                    <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/>
                                                 </imageView>
                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" text="Notes" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="5pm-I2-dZ8">
                                                     <rect key="frame" x="685" y="93" width="69" height="21"/>
-                                                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                                    <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                                     <nil key="textColor"/>
                                                     <nil key="highlightedColor"/>
@@ -763,18 +763,18 @@
                                         <rect key="frame" x="0.0" y="28" width="540" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="K5M-kB-Cox" id="8bB-hy-1xQ">
-                                            <rect key="frame" x="0.0" y="0.0" width="540" height="43.5"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="540" height="43"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="Title" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="93T-5h-JKV">
-                                                    <rect key="frame" x="15" y="5" width="33.5" height="20.5"/>
+                                                    <rect key="frame" x="15" y="5" width="33" height="21"/>
                                                     <autoresizingMask key="autoresizingMask"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                                     <nil key="textColor"/>
                                                     <nil key="highlightedColor"/>
                                                 </label>
                                                 <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="Subtitle" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="mtf-OD-AFL">
-                                                    <rect key="frame" x="15" y="25.5" width="44" height="14.5"/>
+                                                    <rect key="frame" x="15" y="26" width="44" height="14"/>
                                                     <autoresizingMask key="autoresizingMask"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="12"/>
                                                     <nil key="textColor"/>
@@ -1068,10 +1068,10 @@
                                 <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                                 <prototypes>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" restorationIdentifier="PendingDocumentsTableViewCell" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="PendingDocumentsTableViewCell" id="bC4-0A-Qjh" customClass="PendingDocumentsTableViewCell">
-                                        <rect key="frame" x="0.0" y="28" width="1024" height="44"/>
+                                        <rect key="frame" x="0.0" y="28" width="768" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="bC4-0A-Qjh" id="rna-0d-wd1">
-                                            <rect key="frame" x="0.0" y="0.0" width="1024" height="44"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="768" height="44"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" text="GE2016121201" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="5Tt-7m-QFz">

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

@@ -80,7 +80,8 @@
             "aname": "Invoice Number",
             "type": "TextView","margin_left":"4",
             "margin_top":"1",
-            
+            "tv_vmargin":0.6,
+            "size":"12",
             "required": false,
             "pos_x": 222,
             "pos_y": 253,
@@ -92,8 +93,9 @@
         "control_2": {
             "aname": "Customer Name",
             "type": "TextView","margin_left":"4",
+            "size":"12",
             "margin_top":"1",
-            
+            "tv_vmargin":0.6,
             "required": true,
             "pos_x": 222,
             "pos_y": 280,
@@ -106,6 +108,7 @@
             "aname": "Job Date",
             "type": "DatePicker","margin_left":"4",
             "required": false,
+            "size":"12",
             "pos_x": 488,
             "pos_y": 280,
             "width": 156,
@@ -117,7 +120,7 @@
             "aname": "Jobsite Address",
             "type": "TextView","margin_left":"1",
             "required": true,
-            "tv_vmargin":0.6,
+            "tv_vmargin":0.3,
             "margin_top": "3",
             "size":"10",
             "pos_x": 248,
@@ -173,6 +176,7 @@
         "control_8": {
             "aname": "Telephone",
             "format": "us_tel",
+            "size":"12",
             "keyboard":"tel",
             "type": "TextView","margin_left":"4",
             "required": true,
@@ -187,6 +191,7 @@
             "aname": "Today's Date","margin_left":"4",
             "type": "DatePicker",
             "required": true,
+            "size":"12",
             "pos_x": 488,
             "pos_y": 344,
             "width": 156,
@@ -198,6 +203,7 @@
             "aname": "Contract Price",
             "type": "TextView","margin_left":"4",
             "required": true,
+            "size":"12",
             "pos_x": 222,
             "pos_y": 376,
             "width": 183,
@@ -229,7 +235,8 @@
             "required": true,
             "pos_x": 488,
             "pos_y": 376,
-            "width": 85,
+            "width": 88,
+            "size":"10",
             "height": 30,
             "keyboard":"number",
             "field": "labor_deposit",
@@ -307,6 +314,7 @@
             "aname": "Balance on Account",
             "type": "TextView","margin_left":"4",
             "required": true,
+            "size":"12",
             "prefix_str":"$ ",
             "value_type":"float",
             "pos_x": 222,
@@ -768,7 +776,7 @@
             "textAlignment":"center",
             "margin_top": "2",
             "size":"10",
-            "tv_vmargin":0.5,
+            "tv_vmargin":0.3,
             "required": true,
             "pos_x": 194,
             "pos_y": 838,
@@ -779,7 +787,7 @@
         },
         "control_3": {
             "aname": "Print Name",
-            "tv_vmargin":0.5,
+            "tv_vmargin":0.3,
             "type": "TextView",
             "textAlignment":"center",
             "margin_top": "2",
@@ -804,7 +812,7 @@
         },
         "control_5": {
             "aname": "Homeowner Name",
-            "tv_vmargin":0.5,
+            "tv_vmargin":0.3,
             "type": "TextView",
             "textAlignment":"center",
             "required": true,
@@ -819,7 +827,7 @@
         },
         "control_6": {
             "aname": "Telephone Number",
-            "tv_vmargin":0.5,
+            "tv_vmargin":0.3,
             "format": "us_tel",
             "keyboard":"tel",
             "type": "TextView",
@@ -945,9 +953,9 @@
             "margin_left":"4",
             "margin_top":"1",
             "required": true,
-            "pos_x": 563,
+            "pos_x": 560,
             "pos_y": 833,
-            "width": 60,
+            "width": 66,
             "height": 24,
             "field": "demolition_date",
             "value": ""

Ants Contract/common/PageViewController.m

@@ -497,7 +497,9 @@ typedef enum {
         tv.returnKeyType=UIReturnKeyNext;
     float fontsize = [template[@"size"] floatValue];
     if(fontsize==0)
-        fontsize=12;
+        fontsize=10;
+    if(self.currentAppOrientation==ScreenOrientationLand)
+        fontsize=fontsize*0.8; // 缩小字体否则textview显示不下。
     [tv setFont:[UIFont systemFontOfSize:fontsize]];
     bool isdisable = [template[@"disable"] boolValue];
     
@@ -648,6 +650,9 @@ typedef enum {
     float fontsize = [template[@"size"] floatValue];
     if(fontsize==0)
         fontsize=10;
+    
+    if(self.currentAppOrientation==ScreenOrientationLand)
+        fontsize=fontsize*0.8; // 缩小字体否则textview显示不下。
     btn.titleLabel.font = [UIFont systemFontOfSize: fontsize];
     btn.tag = index+ CONTROL_BASE;
     [btn setTitleColor:[UIColor blackColor] forState:UIControlStateNormal];

RedAnt ERP Mobile/iSales-NPD/iSales-NPD-Info.plist

@@ -21,7 +21,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>170414</string>
+	<string>170419</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSRequiresIPhoneOS</key>