eSign 20170417

离线合同上传失败不能再次转存，改为提示失败。
离线合同save 按钮改为 upload。

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

@@ -1864,11 +1864,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/DocumentPageViewController.m"
-            timestampString = "513066470.077689"
+            timestampString = "514104063.289192"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "114"
-            endingLineNumber = "114"
+            startingLineNumber = "119"
+            endingLineNumber = "119"
             landmarkName = "-viewDidLoad"
             landmarkType = "7">
          </BreakpointContent>
@@ -2216,11 +2216,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/DocumentPageViewController.m"
-            timestampString = "513835306.249898"
+            timestampString = "514102835.906726"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "446"
-            endingLineNumber = "446"
+            startingLineNumber = "451"
+            endingLineNumber = "451"
             landmarkName = "-onSaveClicked:"
             landmarkType = "7">
          </BreakpointContent>
@@ -2232,11 +2232,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/DocumentPageViewController.m"
-            timestampString = "513835306.249898"
+            timestampString = "514102835.906726"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "441"
-            endingLineNumber = "441"
+            startingLineNumber = "446"
+            endingLineNumber = "446"
             landmarkName = "-onSaveClicked:"
             landmarkType = "7">
          </BreakpointContent>
@@ -2280,11 +2280,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/DocumentPageViewController.m"
-            timestampString = "513835306.249898"
+            timestampString = "514102835.906726"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "429"
-            endingLineNumber = "429"
+            startingLineNumber = "434"
+            endingLineNumber = "434"
             landmarkName = "-onSaveClicked:"
             landmarkType = "7">
          </BreakpointContent>
@@ -2296,11 +2296,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/DocumentPageViewController.m"
-            timestampString = "513840964.55427"
+            timestampString = "514102835.906726"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "879"
-            endingLineNumber = "879"
+            startingLineNumber = "889"
+            endingLineNumber = "889"
             landmarkName = "-extract_data:"
             landmarkType = "7">
          </BreakpointContent>
@@ -2312,11 +2312,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/DocumentPageViewController.m"
-            timestampString = "513840964.55427"
+            timestampString = "514102835.906726"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "887"
-            endingLineNumber = "887"
+            startingLineNumber = "897"
+            endingLineNumber = "897"
             landmarkName = "-extract_data:"
             landmarkType = "7">
          </BreakpointContent>
@@ -2344,11 +2344,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/DocumentPageViewController.m"
-            timestampString = "513673020.015014"
+            timestampString = "514104063.289192"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "108"
-            endingLineNumber = "108"
+            startingLineNumber = "113"
+            endingLineNumber = "113"
             landmarkName = "-viewDidLoad"
             landmarkType = "7">
          </BreakpointContent>
@@ -2513,5 +2513,69 @@
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "common/ACNetwork.m"
+            timestampString = "514100909.3493"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "792"
+            endingLineNumber = "792"
+            landmarkName = "+offline_docnumber"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "common/DocumentPageViewController.m"
+            timestampString = "514102835.906726"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "508"
+            endingLineNumber = "508"
+            landmarkName = "-onSaveClicked:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "common/DocumentPageViewController.m"
+            timestampString = "514102585.994318"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "95"
+            endingLineNumber = "95"
+            landmarkName = "-viewDidLoad"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "common/DocumentPageViewController.m"
+            timestampString = "514104063.289192"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "385"
+            endingLineNumber = "385"
+            landmarkName = "-onSaveClicked:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
    </Breakpoints>
 </Bucket>

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

@@ -207,13 +207,16 @@
                                 <action selector="OnCancelClicked:" destination="UPd-uT-cg4" id="9Sa-o6-7WI"/>
                             </connections>
                         </barButtonItem>
-                        <barButtonItem key="rightBarButtonItem" systemItem="save" id="HzA-Fa-ToQ">
+                        <barButtonItem key="rightBarButtonItem" title="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"/>
+                    <connections>
+                        <outlet property="ibSave" destination="HzA-Fa-ToQ" id="dtM-YE-NrB"/>
+                    </connections>
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="8TC-Iz-v3r" userLabel="First Responder" sceneMemberID="firstResponder"/>
             </objects>
@@ -741,7 +744,7 @@
                                             <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="34" height="21"/>
+                                                    <rect key="frame" x="15" y="5" width="33" height="21"/>
                                                     <autoresizingMask key="autoresizingMask"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                                     <nil key="textColor"/>

Ants Contract/common/ACNetwork.m

@@ -798,7 +798,7 @@
            [defaults setInteger:docint forKey:prefix];
             [defaults synchronize];
     
-    return [NSString stringWithFormat:@"%@%6ld",prefix,docint ];
+    return [NSString stringWithFormat:@"%@%06ld",prefix,docint ];
 }
 
 + (int)heartBeat {

Ants Contract/common/DocumentPageViewController.h

@@ -28,6 +28,7 @@ typedef NS_ENUM(NSInteger, PDFEditAction) {
 @property (strong, nonatomic) NSString* pdfPath;//pdfName;
 @property (strong, nonatomic) NSString* templatePath;//templateName;
 
+@property (weak, nonatomic) IBOutlet UIBarButtonItem *ibSave;
 @property (strong, nonatomic) NSString* docment_id;
 @property long current_page;
 

Ants Contract/common/DocumentPageViewController.m

@@ -94,6 +94,11 @@
     [super viewDidLoad];
     self.title = self.docment_id;
 
+    if(self.hide_control)
+        [self.ibSave setTitle:@"Upload"];
+    else
+        [self.ibSave setTitle:@"Save"];
+    
     
 
     //    self.delegate = self;
@@ -493,7 +498,12 @@
                 {
 //                    [RAUtils message_alert:[json valueForKey:@"err_msg"] title:@"Save document" controller:self] ;
                     
-                    
+                    if(self.hide_control)
+                    {
+                        //提交离线合同
+                        [RAUtils message_alert:@"Can not upload pending documents please try again later." title:@"Save document" controller:self] ;
+                        return;
+                    }
                     
                     UIAlertController *alertControl = [UIAlertController alertControllerWithTitle:@"Create Customer" message:@"Can not create new customer on server, do you want to create an offline document?" preferredStyle:UIAlertControllerStyleAlert];
                     

RedAnt ERP Mobile/common/PDFUtils.m

@@ -392,7 +392,7 @@ isnew:(bool)isNewDocument
                 if(!isNewDocument)
                 {
                     CGRect bg_rect= text_rect;
-                    PDFDrawable * rect_drawable = [[RectDrawable alloc] init:bg_rect color:@"0xffcc66"];
+                    PDFDrawable * rect_drawable = [[RectDrawable alloc] init:bg_rect color:@"0xffff00"];
                     if(rect_drawable)
                         [pdfPage DirectDraw:pdfContext drawable:rect_drawable];
                 }