eSign 20170414

iPad所有新功能已完成，开始测试。

RedAnt ERP Mobile/common/PDFUtils.h

@@ -15,10 +15,11 @@
 
 //+ (CGRect)scaleToSize:(CGRect )from to:(CGSize)to;
 +(NSString*)SavePDF:(NSMutableDictionary*) controlTemplate source:(CGPDFDocumentRef )document window_rect:(CGRect)window_rect name:(NSString*)name isnew:(bool)isNewDocument; 
-+(NSMutableDictionary*) loadControl:(NSString*)templateName;
++(NSMutableDictionary*) loadControl:(NSString*)path;
 +(CGRect)WindowRect2PDFRect:(CGRect)rect pdf_rect:(CGRect)pdf_rect window_size:(CGSize)window_size;
 +(CGRect)PDFRect2WindowRect:(CGRect)rect pdf_rect:(CGRect)pdf_rect window_size:(CGSize)window_size;
 +(CGPDFDocumentRef)OpenPDFFromData:(NSData *)pdfData;
 +(CGRect) QuerySize:(CGPDFDocumentRef)document;
 +(CGSize) QueryPDFSizeFromData:(NSData *)pdfData;
+
 @end

RedAnt ERP Mobile/common/PDFUtils.m

@@ -67,9 +67,9 @@
     }
     
 }
-+(NSMutableDictionary*) loadControl:(NSString*)templateName
++(NSMutableDictionary*) loadControl:(NSString*)path
 {
-    NSString *path = [[NSBundle mainBundle] pathForResource:templateName ofType:nil];
+//    NSString *path = [[NSBundle mainBundle] pathForResource:templateName ofType:nil];
     NSData *data = [NSData dataWithContentsOfFile:path];
     NSMutableDictionary *ret = [[NSJSONSerialization JSONObjectWithData:data options:NSJSONReadingMutableContainers error:nil] mutableCopy];
     return ret;
@@ -114,7 +114,7 @@
      NSString *newFilePath=[saveDirectory stringByAppendingPathComponent:saveFileName];
      */
     
-    NSString *default_path = [[NSBundle mainBundle] pathForResource:file ofType:nil];
+    NSString *default_path = file;//[[NSBundle mainBundle] pathForResource:file ofType:nil];
 //    const char *filename=[default_path UTF8String];
     
     NSLog(@"%@",default_path);
@@ -389,12 +389,14 @@ isnew:(bool)isNewDocument
                 [control_drawable setMargin_top:margin_top];
                 
                 
-                
-                
-                CGRect bg_rect= text_rect;
-                PDFDrawable * rect_drawable = [[RectDrawable alloc] init:bg_rect color:@"0x0000ff"];
-                if(rect_drawable)
-                    [pdfPage DirectDraw:pdfContext drawable:rect_drawable];
+                if(!isNewDocument)
+                {
+                    CGRect bg_rect= text_rect;
+                    PDFDrawable * rect_drawable = [[RectDrawable alloc] init:bg_rect color:@"0xffcc66"];
+                    if(rect_drawable)
+                        [pdfPage DirectDraw:pdfContext drawable:rect_drawable];
+                }
+
             }
             else if([control_type isEqualToString:@"Check"])
             {