Ver código fonte

NPD Mobile 1.96.200116

Ray Zhang 6 anos atrás
pai
commit
a36432d8d2
30 arquivos alterados com 232 adições e 1657 exclusões
  1. 1 1
      RedAnt ERP Mobile/common/AppDelegateBase.m
  2. 1 1
      RedAnt ERP Mobile/common/AutoScrollImage/CycleScrollView.m
  3. 9 7
      RedAnt ERP Mobile/common/ERP_Mobile_Cart.storyboard
  4. 10 10
      RedAnt ERP Mobile/common/Functions/MainViewController.m
  5. 0 47
      RedAnt ERP Mobile/common/Functions/PDF+Web/RAPDFViewController.h
  6. 0 1135
      RedAnt ERP Mobile/common/Functions/PDF+Web/RAPDFViewController.m
  7. 0 31
      RedAnt ERP Mobile/common/Functions/PDF+Web/WebViewController.h
  8. 0 215
      RedAnt ERP Mobile/common/Functions/PDF+Web/WebViewController.m
  9. 7 1
      RedAnt ERP Mobile/common/Functions/cart/CartViewController.m
  10. 1 1
      RedAnt ERP Mobile/common/Functions/home/HomeViewController.m
  11. 1 1
      RedAnt ERP Mobile/common/Functions/modelDetail/DetailHeaderCell.m
  12. 2 2
      RedAnt ERP Mobile/common/Functions/modelDetail/DetailViewController.m
  13. 9 0
      RedAnt ERP Mobile/common/Functions/order/OrderDetailHtmlCell.m
  14. 3 3
      RedAnt ERP Mobile/common/Functions/order/OrderDetailViewController.m
  15. 1 1
      RedAnt ERP Mobile/common/Functions/portfolio/PortfolioListViewController.m
  16. 2 2
      RedAnt ERP Mobile/common/Functions/portfolio/PortfolioViewController.m
  17. 1 1
      RedAnt ERP Mobile/common/Functions/portfolio/TearSheetParamViewController.m
  18. 1 1
      RedAnt ERP Mobile/common/Functions/sidemenu/LoginViewController.m
  19. 1 0
      RedAnt ERP Mobile/common/Functions/signature/SignatureViewController.m
  20. 31 20
      RedAnt ERP Mobile/common/Functions/signature/signature.storyboard
  21. 1 1
      RedAnt ERP Mobile/common/Functions/watchlist/WatchListViewController.m
  22. 24 12
      RedAnt ERP Mobile/iSales-NPD.xcodeproj/project.pbxproj
  23. 7 118
      RedAnt ERP Mobile/iSales-NPD/Base.lproj/Main.storyboard
  24. 57 0
      RedAnt ERP Mobile/iSales-NPD/Launch Screen.storyboard
  25. 2 2
      RedAnt ERP Mobile/iSales-NPD/iSales-NPD-Info.plist
  26. 18 12
      RedAnt ERP Mobile/iSales-TRADESHOW.xcodeproj/project.pbxproj
  27. 3 3
      RedAnt ERP Mobile/iSales-TRADESHOW/iSales-TRADESHOW-Info.plist
  28. 18 14
      RedAnt ERP Mobile/iSales-UNITED WAVER.xcodeproj/project.pbxproj
  29. 18 12
      RedAnt ERP Mobile/iSales-USAI.xcodeproj/project.pbxproj
  30. 3 3
      RedAnt ERP Mobile/iSales-USAI/iSales-USAI-Info.plist

+ 1 - 1
RedAnt ERP Mobile/common/AppDelegateBase.m

@@ -2465,7 +2465,7 @@ void UncaughtExceptionHandler(NSException *exception) {
 
 -(void) printPdf:(NSString*) url company:(NSString*)company send_to:(NSString*)send_to soid:(NSString*)soid content:(NSString*)content
 {
-    RAPDFViewController *ViewController = [[UIStoryboard storyboardWithName:@"Main" bundle:nil] instantiateViewControllerWithIdentifier:@"RAPDFViewController"];
+    RAPDFViewController *ViewController = [[UIStoryboard storyboardWithName:@"wkweb" bundle:nil] instantiateViewControllerWithIdentifier:@"RAPDFViewController"];
     ViewController.url = url;
     ViewController.canSave = false;
     

+ 1 - 1
RedAnt ERP Mobile/common/AutoScrollImage/CycleScrollView.m

@@ -40,7 +40,7 @@
 }
 -(void) animationDuration:(NSTimeInterval)animationDuration
 {
-    return;
+//    return;
     
     if (animationDuration > 0.0) {
 //        self.animationTimer = [NSTimer scheduledTimerWithTimeInterval:(self.animationDuration = animationDuration)

+ 9 - 7
RedAnt ERP Mobile/common/ERP_Mobile_Cart.storyboard

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="15505" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="15702" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="ipad9_7" orientation="portrait" layout="fullscreen" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15510"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15704"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -26,6 +26,7 @@
                                     <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="120" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="OMD-NW-nZo">
                                         <rect key="frame" x="0.0" y="0.0" width="768" height="860"/>
                                         <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                        <color key="sectionIndexBackgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                         <prototypes>
                                             <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="CartItemCell" rowHeight="146" id="9d9-Fh-IGR" customClass="ModelItemCell">
                                                 <rect key="frame" x="0.0" y="28" width="768" height="146"/>
@@ -68,6 +69,7 @@
                                                         <stepper opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" contentHorizontalAlignment="center" contentVerticalAlignment="center" value="1" maximumValue="99999" translatesAutoresizingMaskIntoConstraints="NO" id="Icr-T0-BzH">
                                                             <rect key="frame" x="514" y="41" width="94" height="32"/>
                                                             <constraints>
+                                                                <constraint firstAttribute="height" constant="32" id="8h7-sY-BPG"/>
                                                                 <constraint firstAttribute="width" constant="94" id="wmY-Eg-mTQ"/>
                                                             </constraints>
                                                             <connections>
@@ -284,16 +286,16 @@ Stock</string>
                                         <nil key="highlightedColor"/>
                                     </label>
                                 </subviews>
-                                <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                 <constraints>
-                                    <constraint firstItem="hlZ-3P-GUS" firstAttribute="centerY" secondItem="EdG-w6-IAt" secondAttribute="centerY" id="5FZ-UH-Rc5"/>
                                     <constraint firstItem="OMD-NW-nZo" firstAttribute="leading" secondItem="EdG-w6-IAt" secondAttribute="leading" id="5xf-fZ-QFe"/>
-                                    <constraint firstItem="c8z-jb-g0B" firstAttribute="centerX" secondItem="EdG-w6-IAt" secondAttribute="centerX" id="O8j-8A-cIs"/>
+                                    <constraint firstItem="hlZ-3P-GUS" firstAttribute="centerX" secondItem="EdG-w6-IAt" secondAttribute="centerX" id="7bZ-5R-k1r"/>
+                                    <constraint firstItem="c8z-jb-g0B" firstAttribute="centerY" secondItem="EdG-w6-IAt" secondAttribute="centerY" id="9rJ-q5-Uli"/>
+                                    <constraint firstItem="c8z-jb-g0B" firstAttribute="centerX" secondItem="EdG-w6-IAt" secondAttribute="centerX" id="bqH-3T-CWz"/>
                                     <constraint firstItem="OMD-NW-nZo" firstAttribute="top" secondItem="EdG-w6-IAt" secondAttribute="top" id="clf-AZ-1sA"/>
-                                    <constraint firstItem="c8z-jb-g0B" firstAttribute="centerY" secondItem="EdG-w6-IAt" secondAttribute="centerY" id="cpJ-6v-bQy"/>
-                                    <constraint firstItem="hlZ-3P-GUS" firstAttribute="centerX" secondItem="EdG-w6-IAt" secondAttribute="centerX" id="pc1-sc-MQY"/>
                                     <constraint firstAttribute="trailing" secondItem="OMD-NW-nZo" secondAttribute="trailing" id="qbN-23-abG"/>
                                     <constraint firstAttribute="bottom" secondItem="OMD-NW-nZo" secondAttribute="bottom" id="umh-BG-4VA"/>
+                                    <constraint firstItem="hlZ-3P-GUS" firstAttribute="centerY" secondItem="EdG-w6-IAt" secondAttribute="centerY" id="zRg-dN-0zQ"/>
                                 </constraints>
                             </view>
                             <toolbar hidden="YES" opaque="NO" clearsContextBeforeDrawing="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="JjI-8g-Zx7">

+ 10 - 10
RedAnt ERP Mobile/common/Functions/MainViewController.m

@@ -2221,7 +2221,7 @@
         
         title = [NSString stringWithFormat:@"%@ BLOG",COMPANY_SHORT_NAME];
         
-        WebViewController *ViewController = [[UIStoryboard storyboardWithName:@"Main" bundle:nil] instantiateViewControllerWithIdentifier:@"WebViewController"];
+        WebViewController *ViewController = [[UIStoryboard storyboardWithName:@"wkweb" bundle:nil] instantiateViewControllerWithIdentifier:@"WebViewController"];
         ViewController.url = url;
         ViewController.title = title;
         
@@ -2243,7 +2243,7 @@
         //
         //
         
-        WebViewController *ViewController = [[UIStoryboard storyboardWithName:@"Main" bundle:nil] instantiateViewControllerWithIdentifier:@"WebViewController"];
+        WebViewController *ViewController = [[UIStoryboard storyboardWithName:@"wkweb" bundle:nil] instantiateViewControllerWithIdentifier:@"WebViewController"];
         ViewController.url = url;
         ViewController.title = title;
         
@@ -2265,7 +2265,7 @@
         //
         //
         
-        WebViewController *ViewController = [[UIStoryboard storyboardWithName:@"Main" bundle:nil] instantiateViewControllerWithIdentifier:@"WebViewController"];
+        WebViewController *ViewController = [[UIStoryboard storyboardWithName:@"wkweb" bundle:nil] instantiateViewControllerWithIdentifier:@"WebViewController"];
         ViewController.url = url;
         ViewController.title = title;
         
@@ -2287,7 +2287,7 @@
         //
         //
         
-        WebViewController *ViewController = [[UIStoryboard storyboardWithName:@"Main" bundle:nil] instantiateViewControllerWithIdentifier:@"WebViewController"];
+        WebViewController *ViewController = [[UIStoryboard storyboardWithName:@"wkweb" bundle:nil] instantiateViewControllerWithIdentifier:@"WebViewController"];
         ViewController.url = url;
         ViewController.title = title;
         
@@ -2304,7 +2304,7 @@
         NSString* title = @"HOMER";
 
         
-        WebViewController *ViewController = [[UIStoryboard storyboardWithName:@"Main" bundle:nil] instantiateViewControllerWithIdentifier:@"WebViewController"];
+        WebViewController *ViewController = [[UIStoryboard storyboardWithName:@"wkweb" bundle:nil] instantiateViewControllerWithIdentifier:@"WebViewController"];
         ViewController.url = url;
         ViewController.title = title;
         
@@ -2321,7 +2321,7 @@
         NSString* title = @"TITAN";
         
         
-        WebViewController *ViewController = [[UIStoryboard storyboardWithName:@"Main" bundle:nil] instantiateViewControllerWithIdentifier:@"WebViewController"];
+        WebViewController *ViewController = [[UIStoryboard storyboardWithName:@"wkweb" bundle:nil] instantiateViewControllerWithIdentifier:@"WebViewController"];
         ViewController.url = url;
         ViewController.title = title;
         
@@ -2343,7 +2343,7 @@
         //
         //
         
-        WebViewController *ViewController = [[UIStoryboard storyboardWithName:@"Main" bundle:nil] instantiateViewControllerWithIdentifier:@"WebViewController"];
+        WebViewController *ViewController = [[UIStoryboard storyboardWithName:@"wkweb" bundle:nil] instantiateViewControllerWithIdentifier:@"WebViewController"];
         ViewController.url = url;
         ViewController.title = title;
         
@@ -2360,7 +2360,7 @@
         
         NSString* title = @"USAI Policy";
         
-        WebViewController *ViewController = [[UIStoryboard storyboardWithName:@"Main" bundle:nil] instantiateViewControllerWithIdentifier:@"WebViewController"];
+        WebViewController *ViewController = [[UIStoryboard storyboardWithName:@"wkweb" bundle:nil] instantiateViewControllerWithIdentifier:@"WebViewController"];
         ViewController.url = url;
         ViewController.title = title;
         
@@ -2377,7 +2377,7 @@
         NSString* title = @"HOMER Policy";
 
         
-        WebViewController *ViewController = [[UIStoryboard storyboardWithName:@"Main" bundle:nil] instantiateViewControllerWithIdentifier:@"WebViewController"];
+        WebViewController *ViewController = [[UIStoryboard storyboardWithName:@"wkweb" bundle:nil] instantiateViewControllerWithIdentifier:@"WebViewController"];
         ViewController.url = url;
         ViewController.title = title;
         
@@ -2420,7 +2420,7 @@
         
         NSString* title = @"Privacy Policy";
         
-        WebViewController *ViewController = [[UIStoryboard storyboardWithName:@"Main" bundle:nil] instantiateViewControllerWithIdentifier:@"WebViewController"];
+        WebViewController *ViewController = [[UIStoryboard storyboardWithName:@"wkweb" bundle:nil] instantiateViewControllerWithIdentifier:@"WebViewController"];
         ViewController.url = url;
         ViewController.title = title;
 

+ 0 - 47
RedAnt ERP Mobile/common/Functions/PDF+Web/RAPDFViewController.h

@@ -1,47 +0,0 @@
-//
-//  RAPDFViewController.h
-//  RedAnt ERP Mobile
-//
-//  Created by Ray on 14-8-7.
-//  Copyright (c) 2014年 United Software Applications, Inc. All rights reserved.
-//
-
-#import <UIKit/UIKit.h>
-#import <MessageUI/MessageUI.h>
-#import <WebKit/WebKit.h>
-@interface RAPDFViewController : UIViewController<UIDocumentInteractionControllerDelegate,MFMailComposeViewControllerDelegate,UIPrintInteractionControllerDelegate,WKNavigationDelegate>
-@property (weak, nonatomic) IBOutlet WKWebView *wkWebview;
-
-@property (strong, nonatomic) IBOutlet UIActivityIndicatorView *mum;
-@property (strong,nonatomic) NSString* url; //pdf 路径,可以是网络路径或文件路径
-@property (strong,nonatomic) NSString* filename; // 保存为文件时指定的名称
-@property (strong,nonatomic) NSData* content;
-@property bool isLocalfile;
-@property (strong, nonatomic) IBOutlet UIBarButtonItem *BB_action;
-@property (strong,nonatomic) UIDocumentInteractionController* fileInteractionController;
-@property (nonatomic , copy) void (^onLoadSuccess)(NSString* url );
-@property (nonatomic,copy) NSString *cachePath; //指定的保存路径
-
-@property (nonatomic , copy) void (^onSavePDF)(NSString* name,NSString* file );
-@property (strong,nonatomic) NSString* mail_subject;
-@property (strong,nonatomic) NSString* mail_content;
-@property (strong,nonatomic) NSArray* mail_to;
-@property (strong,nonatomic) NSString* save_name; // save 按钮默认保存名
-@property (strong,nonatomic) NSString* save_note;
-
-@property (strong, nonatomic)  UIBarButtonItem *btnshare;
-@property (strong, nonatomic)  UIBarButtonItem *btnPrint;
-@property (strong, nonatomic)  UIBarButtonItem *btnemail;
-@property (strong, nonatomic)  UIBarButtonItem *btnsave;
-
-
-@property bool autoPrint;
-@property bool hidenavi;
-
-@property bool canSave;
-
-@property bool defaultStyle;
-
-
-@property (strong,nonatomic) NSString* attachment_name; //email 按钮附件名称(已废弃)
-@end

+ 0 - 1135
RedAnt ERP Mobile/common/Functions/PDF+Web/RAPDFViewController.m

@@ -1,1135 +0,0 @@
-//
-//  RAPDFViewController.m
-//  RedAnt ERP Mobile
-//
-//  Created by Ray on 14-8-7.
-//  Copyright (c) 2014年 United Software Applications, Inc. All rights reserved.
-//
-
-#import "RAPDFViewController.h"
-#import "RAUtils.h"
-#import "const.h"
-#import "AppDelegate.h"
-#import "PDFUtils.h"
-#import "TextUtils.h"
-
-
-@interface RAPDFViewController ()
-
-@end
-
-@implementation RAPDFViewController
-
-- (id)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil
-{
-    self = [super initWithNibName:nibNameOrNil bundle:nibBundleOrNil];
-    if (self) {
-        // Custom initialization
-    }
-    return self;
-}
-
-- (void)setFilename:(NSString *)filename {
-    _filename = [TextUtils legalFilename:filename];
-}
-
-- (void)viewDidLoad
-{
-    
-    NSLog(@"pdf viewer loaded");
-    [super viewDidLoad];
-    // Do any additional setup after loading the view.
-    UIRefreshControl *ref = [[UIRefreshControl alloc]init];
-    ref.tag = 200 ;
-    ref.attributedTitle = [[NSAttributedString alloc]initWithString:@"drag to refresh"];
-    ref.tintColor = [UIColor colorWithRed:0.10 green:0.68 blue:0.94 alpha:0.7];
-    //    ref.hidden = true;
-    [ref addTarget:self action:@selector(changeCell) forControlEvents:UIControlEventValueChanged];
-    [self.wkWebview.scrollView addSubview:ref];
-//    self.webView.dataDetectorTypes=UIDataDetectorTypeAll;
-    self.wkWebview.navigationDelegate = self;
-    if (@available(iOS 11, *)) {
-        self.wkWebview.scrollView.contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentNever;
-    }
-    else {
-
-
-
-        self.automaticallyAdjustsScrollViewInsets = NO;
-    }
-
-   // self.btnsave.tintColor = UIColorFromRGB(0x996633);
-    
-    if(self.defaultStyle)
-    {
-
-        self.btnshare =[[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemAction
-                                                                     target:self
-                                                                     action:@selector( onActionClick:)];
-
-        
-        
-        self.btnPrint =[[UIBarButtonItem alloc] initWithTitle:@"Print"
-                                                                    style:UIBarButtonItemStylePlain
-                                                                    target:self
-                                                                    action:@selector( onPrintClick:)];
-        
-        NSMutableArray * items = [[NSMutableArray alloc]init];
-        [items addObject:self.btnshare];
-        [items addObject:self.btnPrint];
-
-        self.navigationItem.rightBarButtonItems =items;
-        
-        
-       if (self.navigationController.viewControllers[0]==self )
-       {
-           UIBarButtonItem *closeButton =nil;
-           
-           
-           
-           closeButton=[[UIBarButtonItem alloc] initWithImage:[[UIImage imageNamed:@"close"] imageWithRenderingMode:UIImageRenderingModeAutomatic]
-                                                        style:UIBarButtonItemStylePlain
-                                                       target:self
-                                                       action:@selector( onCloseClick:)];
-           //[[UIBarButtonItem alloc] initWithTitle:NSLocalizedString(@"Close", nil) style:UIBarButtonItemStylePlain target:self action:@selector(onCloseClick:)];
-           //    closeButton.title = @"Close";
-           
-           self.navigationItem.leftBarButtonItem = closeButton;
-       }
-
-        
-    }
-    else
-    {
-        UIBarButtonItem *closeButton =nil;
-        
-        
-        
-        closeButton=[[UIBarButtonItem alloc] initWithImage:[[UIImage imageNamed:@"back"] imageWithRenderingMode:UIImageRenderingModeAutomatic]
-                                                     style:UIBarButtonItemStylePlain
-                                                    target:self
-                                                    action:@selector( onBackClick:)];
-        //[[UIBarButtonItem alloc] initWithTitle:NSLocalizedString(@"Close", nil) style:UIBarButtonItemStylePlain target:self action:@selector(onCloseClick:)];
-        //    closeButton.title = @"Close";
-        
-        self.navigationItem.leftBarButtonItem = closeButton;
-        
-        
-        
-        
-        self.btnshare = [[UIBarButtonItem alloc] initWithImage:[[UIImage imageNamed:@"share"] imageWithRenderingMode:UIImageRenderingModeAutomatic]
-                                                         style:UIBarButtonItemStylePlain
-                                                        target:self
-                                                        action:@selector(onActionClick:)];//[[UIBarButtonItem alloc] initWithTitle:NSLocalizedString(@"Edit", nil) style:UIBarButtonItemStylePlain target:self action:@selector(onOpenOrderClick:)];
-        
-        // self.btnshare.tintColor = UIColorFromRGB(0x996633);
-        
-        self.btnemail =[[UIBarButtonItem alloc] initWithImage:[[UIImage imageNamed:@"mail"] imageWithRenderingMode:UIImageRenderingModeAutomatic]
-                                                        style:UIBarButtonItemStylePlain
-                                                       target:self
-                                                       action:@selector(onEmailClick:)];// [[UIBarButtonItem alloc] initWithTitle:NSLocalizedString(@"Commit", nil) style:UIBarButtonItemStylePlain target:self action:@selector(onCommitOrderClick:)];
-        
-        //  self.btnemail.tintColor = UIColorFromRGB(0x996633);
-        
-        // self.btnSend = [[UIBarButtonItem alloc] initWithTitle:NSLocalizedString(@"Email", nil) style:UIBarButtonItemStylePlain target:self action:@selector(onSendMailClick:)];
-        
-        
-        
-        self.btnsave = [[UIBarButtonItem alloc] initWithImage:[[UIImage imageNamed:@"save"] imageWithRenderingMode:UIImageRenderingModeAutomatic]
-                                                        style:UIBarButtonItemStylePlain
-                                                       target:self
-                                                       action:@selector(onSaveClick:)];        
-        UIBarButtonItem *fixedItem = [[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemFixedSpace target:nil action:nil];
-        fixedItem.width = 20.0f;
-        NSMutableArray * items = [[NSMutableArray alloc]init];
-        [items addObject:self.btnshare];
-        [items addObject:fixedItem];
-        [items addObject:self.btnemail];
-        
-        if(self.canSave)
-        {
-            [items addObject:fixedItem];
-            [items addObject:self.btnsave];
-        }
-        self.navigationItem.rightBarButtonItems=items;
-        
-        self.btnshare.enabled =false;
-        
-        
-        self.btnemail.enabled =false;
-        self.btnsave.enabled =false;
-        
-    }
-
-    
-//   self.url=@"http://192.168.1.3:8080/npd/test.pdf";
-//    NSURL* url = [NSURL URLWithString:self.url];
-//    
-//    NSMutableURLRequest *request = [[NSMutableURLRequest alloc] initWithURL:[NSURL URLWithString:self.url]        cachePolicy:NSURLRequestReloadIgnoringLocalCacheData timeoutInterval:2000];
-//    
-//    
-//    [self.webView loadRequest:request];
-    
-    
-    [self loadcontent];
-}
-- (void)onBackClick:(UIButton *)sender {
-    
-    
-    [self.navigationController popViewControllerAnimated:FALSE];
-}
-- (void)onCloseClick:(UIButton *)sender {
-    
-    [self dismissViewControllerAnimated:false completion:nil];
-    //[self.navigationController popViewControllerAnimated:FALSE];
-}
--(void)ReloadData
-{
-    
-    //    Count ++ ;
-    //    [mytabelview reloadData];
-    UIRefreshControl *reF = (UIRefreshControl *)[self.view viewWithTag:200];
-    
-    [reF endRefreshing];
-    [self loadcontent];
-
-    
-}
-
-- (void)copyTmpLocalFile:(NSString *)localPath {
-    
-    NSString *path = NSTemporaryDirectory();
-    NSString *filePath = [path stringByAppendingPathComponent:self.filename];
-    NSFileManager *fileManager = [NSFileManager defaultManager];
-    if ([fileManager fileExistsAtPath:filePath]) { // 文件存在就不会拷贝
-        [fileManager removeItemAtPath:filePath error:nil];
-    }
-    [fileManager copyItemAtPath:localPath toPath:filePath error:nil];
-    self.url = filePath;
-}
-
--(void) loadcontent
-{
-    
-    UIAlertView * waitalert = [RAUtils waiting_alert:@"Please wait..." title:@"Loading..."];
-    self.mum.hidden=false;
-    
-    if(self.isLocalfile)
-    {
-        /*
-        NSArray *paths = NSSearchPathForDirectoriesInDomains(NSCachesDirectory, NSUserDomainMask, YES);
-        NSString *cachefolder = [paths objectAtIndex:0];
-        NSString *pdfFolder = [cachefolder stringByAppendingPathComponent:@"pdf_cache"];
-        self.url = [pdfFolder stringByAppendingPathComponent:self.url];
-        */
-        
-        self.content= [NSData dataWithContentsOfFile:self.url];
-        
-        [waitalert dismissWithClickedButtonIndex:0 animated:FALSE];
-        
-        if (self.filename.length <= 0) {
-            self.filename=[self.url lastPathComponent];
-        } else {
-            [self copyTmpLocalFile:self.url];
-        }
-        
-        self.btnshare.enabled =true;
-        
-        
-        self.btnemail.enabled =true;
-        self.btnsave.enabled =true;
-        
-//        if(self.onLoadSuccess)
-//        self.onLoadSuccess(self.url);
-//        
-//        if(self.autoPrint)
-//        [self startAirPrintWithData:self.content];
-        
-//        NSLog(@"put file to webview");
-//        [self.webView loadData:self.content MIMEType:@"application/pdf" textEncodingName:nil baseURL:nil];
-        
-        NSURL *url = [NSURL fileURLWithPath:self.url];
-        NSURLRequest *request = [NSURLRequest requestWithURL:url];
-        [self.wkWebview loadRequest:request];
-        
-    }
-    else
-    dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
-        
-        
-        NSMutableURLRequest *request = [[NSMutableURLRequest alloc] initWithURL:[NSURL URLWithString:self.url]        cachePolicy:NSURLRequestReloadIgnoringLocalCacheData timeoutInterval:60*5];
-        
-        //设置请求方式为get
-        
-        [request setHTTPMethod:@"GET"];
-        
-        //添加用户会话id
-        
-        [request addValue:@"text/html" forHTTPHeaderField:@"Content-Type"];
-        
-        //连接发送请求
-        
-        
-        NSHTTPURLResponse* urlResponse = nil;
-        
-        NSError *error = nil;
-        
-        self.content= [NSURLConnection sendSynchronousRequest:request returningResponse:&urlResponse error:&error];
-        
-        if(self.filename.length<=0)
-            self.filename = [urlResponse suggestedFilename];
-        
-        
-        dispatch_async(dispatch_get_main_queue(), ^{
-            [waitalert dismissWithClickedButtonIndex:0 animated:FALSE];
-            
-            [[self navigationController] setNavigationBarHidden:self.hidenavi animated:NO];
-            self.navigationItem.title = self.save_name;
-            UIRefreshControl *reF = (UIRefreshControl *)[self.view viewWithTag:200];
-          //  self.content=nil;
-            if(self.content!=nil&&self.content.length>0)
-            {
-                [reF removeFromSuperview];
-                
-                
-               // NSArray *paths = NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES);
-                NSString *path = NSTemporaryDirectory();
-                NSString *filePath = [path stringByAppendingPathComponent:self.filename];
-                //    NSError *error = nil;
-                //    BOOL bo = [[NSFileManager defaultManager] createDirectoryAtPath:path withIntermediateDirectories:YES attributes:nil error:&error];
-                //    NSAssert(bo,@"创建目录失败");
-                if (self.cachePath.length) {
-                    filePath = self.cachePath;
-                }
-                
-                [self.content writeToFile:filePath atomically:YES];
-                
-                self.url = filePath;
-                self.isLocalfile = true;
-
-                
-                self.btnshare.enabled =true;
-                
-                
-                self.btnemail.enabled =true;
-                self.btnsave.enabled =true;
-                
-                
-                
-                NSURL *url = [NSURL fileURLWithPath:filePath];
-                NSURLRequest *request = [NSURLRequest requestWithURL:url];
-                [self.wkWebview loadRequest:request];
-                
-                
-
-                
-                
-                
- //               int a=0;
-            }
-            else
-            {
-                [RAUtils message_alert:nil  title:@"Open PDF Failed" controller:self];
-                
-                if(self.autoPrint)
-                    [self.navigationController popViewControllerAnimated:true];
-//                self.content = [self.url dataUsingEncoding:NSUTF8StringEncoding];
-            }
-            
-            ;
-//            DebugLog(@"%@",[[NSString alloc] initWithData:self.content encoding:NSASCIIStringEncoding]);
-            //
-            
-//            DebugLog(urlResponse.MIMEType);
-            
-//            [self.webView loadData:self.content MIMEType:urlResponse.MIMEType textEncodingName:nil baseURL:nil];
-            
-            
-            
-            
-        });
-    });
-    
-    
-    
-    
-}
--(void)changeCell
-{
-    UIRefreshControl *reF = (UIRefreshControl *)[self.view viewWithTag:200];
-    reF.attributedTitle = [[NSAttributedString alloc]initWithString:@"refreshing"];
-    if ([self respondsToSelector:@selector(ReloadData)])
-    [self performSelector:@selector(ReloadData) withObject:nil afterDelay:1];
-//    DebugLog(@"refresh!!!!!!!!");
-    
-}
-- (void)didReceiveMemoryWarning
-{
-    [super didReceiveMemoryWarning];
-    // Dispose of any resources that can be recreated.
-}
--(void) viewWillAppear:(BOOL)animated
-{
-    
-    
-    [super viewWillAppear:animated];
-  
-    [[self navigationController] setNavigationBarHidden:self.hidenavi animated:NO];
-}
-- (IBAction)onPrintClick:(id)sender {
-    
-    
-  //  UIAlertView * waitalert = [RAUtils waiting_alert:@"Please wait..." title:@"preparing print..."];
-    
-    UIPrintInteractionController* airPrinterController=[UIPrintInteractionController sharedPrintController];
-    UIPrintInfo *printInfo = [UIPrintInfo printInfo];
-    printInfo.outputType = UIPrintInfoOutputGeneral;
-    
-    printInfo.orientation = UIPrintInfoOrientationPortrait;
-    printInfo.jobName = [[[NSBundle mainBundle] infoDictionary] objectForKey:@"CFBundleDisplayName"];
-    if(self.filename.length>0)
-        printInfo.jobName = self.filename;
-    airPrinterController.printInfo = printInfo;
-    airPrinterController.printingItem = self.content;
-    airPrinterController.delegate = self;
-    
-    
-    airPrinterController.showsNumberOfCopies=true;
-    airPrinterController.showsPageRange = true;
-    airPrinterController.showsPaperSelectionForLoadedPapers=true;
-    
-    
-    [airPrinterController presentFromBarButtonItem:self.btnPrint
-                                      animated:YES
-                             completionHandler:
-     ^(UIPrintInteractionController *pic, BOOL completed, NSError *error) {
-     }
-     ];
-    
-    
-//    
-//    void (^completionHandler)(UIPrintInteractionController *, BOOL, NSError *) = ^(UIPrintInteractionController *printController, BOOL completed, NSError *error) {
-//        if(completed && error)
-//            DebugLog(@"Printing failed due to error in domain %@ with error code %lu. Localized description: %@, and failure reason: %@", error.domain, (long)error.code, error.localizedDescription, error.localizedFailureReason);
-//    };
-//    
-//    AppDelegate *appDelegate = (AppDelegate*)[[UIApplication sharedApplication] delegate];
-//    
-//    UIPrinter *airPrinter = [UIPrinter printerWithURL:[NSURL URLWithString:appDelegate.printerURL] ];///*self.printer;*/
-//    
-//    
-//    
-//    
-//    [[UIPrinter printerWithURL:[NSURL URLWithString:appDelegate.printerURL]] contactPrinter:^(BOOL available)
-//     {
-//         [waitalert dismissWithClickedButtonIndex:0 animated:FALSE];
-//         
-//         if (available&& appDelegate.printerURL.length>0)
-//         {
-//             
-//             
-//             [airPrinterController printToPrinter:airPrinter completionHandler:completionHandler];
-//             DebugLog(@"AIRPRINTER AVAILABLE");
-//         }
-//         else
-//         {
-//             
-//                          [airPrinterController presentFromRect:CGRectMake(0, 0, 300, 500) inView:self.view animated:YES completionHandler:
-//             
-//             
-//             
-//                           //        [printPicker presentAnimated:YES completionHandler:
-//                           ^(UIPrintInteractionController *printerController, BOOL userDidSelect, NSError *error)
-//                           {
-//                               if (userDidSelect)
-//                               {
-//                                   NSString* sid= printerController.printInfo.printerID;
-//                                   UIPrintPaper*paper=  printerController.printPaper;
-//             
-//                               }
-//                           }];
-//             
-//             
-//             DebugLog(@"AIRPRINTER NOT AVAILABLE");
-//             
-//             
-//             
-////             if (NSFoundationVersionNumber > NSFoundationVersionNumber_iOS_7_1)
-////             {
-////                 UIPrinterPickerController *printPicker = [UIPrinterPickerController printerPickerControllerWithInitiallySelectedPrinter:nil];
-////                 //   [printPicker presentFromBarButtonItem:self.btnSubmitOrder animated:yes completionHandler:
-////                 
-////                 
-////                 
-////                 [ printPicker presentFromBarButtonItem:self.btnPrint animated:YES completionHandler:
-////                  
-////                  
-////                  // [printPicker presentFromRect:CGRectMake(0, 0, 300, 500) inView:self.view animated:YES completionHandler:
-////                  
-////                  
-////                  
-////                  //        [printPicker presentAnimated:YES completionHandler:
-////                  ^(UIPrinterPickerController *printerPicker, BOOL userDidSelect, NSError *error)
-////                  {
-////                      if (userDidSelect)
-////                      {
-////                          //User selected the item in the UIPrinterPickerController and got the printer details.
-////                          
-////                          [UIPrinterPickerController printerPickerControllerWithInitiallySelectedPrinter:printerPicker.selectedPrinter];
-////                          
-////                          //Here you will get the printer and printer details.ie,
-////                          // printerPicker.selectedPrinter, printerPicker.selectedPrinter.displayName, printerPicker.selectedPrinter.URL etc. So you can display the printer name in your label text or button title.
-////                          
-////                          
-////                          
-////                          
-////                          appDelegate.printerURL =printerPicker.selectedPrinter.URL.absoluteString;
-////                          
-////                          [self startAirPrintWithData:self.content];
-////                          
-////                      }
-////                      else
-////                      {
-////                          
-////                          
-////                          //                          AppDelegate *appDelegate = (AppDelegate*)[[UIApplication sharedApplication] delegate];
-////                          //                          if([appDelegate.mode isEqualToString:@"Trade Show Mode"]&& appDelegate.submit_order_logout)
-////                          //                          {
-////                          //
-////                          //                              [((MainViewController*)appDelegate.main_vc) Loginout:false];
-////                          //                          }
-////                          //                          [self prepareReturn:nil];
-////                          
-////                          //[self.navigationController popViewControllerAnimated:true];
-////                      }
-////                  }];
-////             }
-//         }
-//     }];
-//    
-    
-    
-}
-- (IBAction)onActionClick:(id)sender {
-   
-    //NSArray *paths = NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES);
-    
-//    NSString *filePath = nil;
-//    if(!self.isLocalfile)
-//    {
-//    NSString *path = NSTemporaryDirectory();
-//    NSString* filename =self.filename;
-//    
-//   filePath= [path stringByAppendingPathComponent:filename];
-//    
-//    }
-//    else
-//        filePath = self.url;
-
-    
-    
-  
-    
-
-    [self openFile:self.url];
-}
-- (IBAction)onSaveClick:(id)sender {
-    
-    //UIAlertControllerStyle两种类型UIAlertControllerStyleAlert类似UIAlertView
-    //UIAlertControllerStyleActionSheet类似UIActionSheet
-    UIAlertController *alertControl = [UIAlertController alertControllerWithTitle:@"Save pdf" message:nil preferredStyle:UIAlertControllerStyleAlert];
-    //block代码块取代了delegate
-  
-    
-    [alertControl addTextFieldWithConfigurationHandler:^(UITextField *textField) {
-        textField.text = self.save_name;
-       
-        
-    }];
-    
-    UIAlertAction *actionOne = [UIAlertAction actionWithTitle:@"Save" style:UIAlertActionStyleDestructive handler:^(UIAlertAction *action) {
-        
-        UITextField *name = alertControl.textFields.firstObject;
-        if(name.text.length==0)
-        {
-        [RAUtils message_alert:@"Cannot save without name. Save canceled." title:@"Name is missing" controller:self];
-        }
-        else
-        {
-            self.save_name = name.text;
-                            self.btnsave.enabled =false;
-          //  NSMutableDictionary * info =
-            if(self.onSavePDF)
-                self.onSavePDF(self.save_name,self.filename);
-        }
-    }];
-
-    UIAlertAction *alertthree = [UIAlertAction actionWithTitle:@"Cancel" style:UIAlertActionStyleCancel handler:^(UIAlertAction *action) {
-        DebugLog(@"Cancel");
-    }];
-    [alertControl addAction:actionOne];
-
-    [alertControl addAction:alertthree];
-    
-    //UIAlertControllerStyle类型为UIAlertControllerStyleAlert可以添加addTextFieldWithConfigurationHandler:^(UITextField *textField)
-
-    
-    [self presentViewController:alertControl animated:YES completion:nil];
-    
-    
-    
-    
-}
-
-- (IBAction)onEmailClick:(id)sender {
-    //NSArray *paths = NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES);
-//    NSString *path = NSTemporaryDirectory();
-    NSString* filename =self.filename;
-    
-//    NSString *filePath = [path stringByAppendingPathComponent:filename];
-
-    NSString *filePath = self.url;
-
-    
-    
-    
-    
-    MFMailComposeViewController *mc = [[MFMailComposeViewController alloc] init];
-    
-    if(mc==nil)
-    {
-        //[RAUtils message_alert:@"You must create an email account first."  title:@"Send Email" controller:self];
-        return;
-    }
-    mc.mailComposeDelegate = self;
-    [mc setSubject:self.mail_subject];
-    
-    
-    [mc setToRecipients:self.mail_to];
-    
-    
-    if(self.mail_content==nil)
-        self.mail_content=@"";
-    
-    NSString* htmlbody = [NSString stringWithFormat:@"<html><p>%@</p></html>",self.mail_content];
-    
-    [mc setMessageBody:htmlbody
-                isHTML:YES];
-    
-
-    
-    NSData *data = [NSData dataWithContentsOfFile:filePath];
-    
-//    if(self.attachment_name.length>0)
-//        filename = self.attachment_name;
-    [mc addAttachmentData:data mimeType:@"application/pdf" fileName:filename];
-    [self presentModalViewController:mc animated:YES];
-    
-    return;
-}
-
-
--(void)openFile: (NSString *) file_url  {
-    
-    NSURL *file_URL = [NSURL fileURLWithPath:file_url];
-    
-    if (file_URL != nil) {
-        if (self.fileInteractionController == nil) {
-            //_fileInteractionController = [[UIDocumentInteractionController alloc] init];
-            
-            
-            _fileInteractionController = [UIDocumentInteractionController interactionControllerWithURL:file_URL];
-            _fileInteractionController.delegate = self;
-            //  [_fileInteractionController retain];//不适用ARC,记得RETAIN 使用ARC注释这一行
-        }
-        else
-        {
-            self.fileInteractionController.URL = file_URL;
-        }
-        
-        // [self.fileInteractionController presentOpenInMenuFromRect:self.view.frame inView:self.view animated:YES];
-        
-        
-        [self.fileInteractionController setName:self.mail_subject];
-        
-//        [self.fileInteractionController setAnnotation:<#(id _Nullable)#>;
-        
-        [self.fileInteractionController presentOptionsMenuFromBarButtonItem:self.btnshare animated:YES];
-       // [self.fileInteractionController presentOptionsMenuFromRect:self.view.frame inView:self.view animated:YES];
-        //        [self.fileInteractionController  presentPreviewAnimated:YES];
-        
-    }
-}
-//- (void) sendEmail:(NSString *)to cc:(NSString*)cc subject:(NSString*)subject body:(NSString*)body
-//{
-//    NSString* str = [NSString stringWithFormat:@"mailto:%@?cc=%@&subject=%@&body=%@",
-//                     to, cc, subject, body];
-//    str = [str stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding];
-//    
-//    [[UIApplication sharedApplication] openURL:[NSURL URLWithString:str]];
-//    
-//    
-//}
-
-#pragma mark methods for the UIDocumentInteractionControllerDelegate
-
-- (void)documentInteractionControllerDidDismissOptionsMenu:(UIDocumentInteractionController *)controller
-{
-//    if (controller == self.fileInteractionController) {
-//        self.fileInteractionController = nil;
-//    }
-}
-
-- (void)previewDocumentWithURL:(NSURL*)url
-{
-    UIDocumentInteractionController* preview = [UIDocumentInteractionController interactionControllerWithURL:url];
-    preview.delegate = self;
-    [preview presentPreviewAnimated:YES];
-    
-}
-
-- (void)documentInteractionControllerDidEndPreview:(UIDocumentInteractionController *)controller
-{
-    
-}
-
-- (UIViewController *)documentInteractionControllerViewControllerForPreview:(UIDocumentInteractionController *)controller{
-    return self;
-}
-
-- (CGRect)documentInteractionControllerRectForPreview:(UIDocumentInteractionController *)controller{
-    return self.view.frame;
-}
-
-- (UIView *)documentInteractionControllerViewForPreview:(UIDocumentInteractionController *)controller{
-    return self.view;
-}
-- (void)documentInteractionController:(UIDocumentInteractionController *)controller willBeginSendingToApplication:(nullable NSString *)application	 // bundle ID
-{
-    
-}
-#pragma mark - WKNavigationDelegate
-- (void)webView:(WKWebView *)webView didFinishNavigation:(WKNavigation *)navigation
-{
-        self.mum.hidden=true;
-        if(self.onLoadSuccess)
-            self.onLoadSuccess(self.url);
-
-        if(self.autoPrint)
-            [self startAirPrintWithData:self.content];
-    
-}
-
-
-
-#pragma mark -MFMailComposeViewControllerDelegate delegate
-
-- (void)mailComposeController:(MFMailComposeViewController*)controller
-          didFinishWithResult:(MFMailComposeResult)result
-                        error:(NSError*)error {
-    switch (result)
-    {
-        case MFMailComposeResultCancelled:
-            DebugLog(@"Mail send canceled...");
-            break;
-        case MFMailComposeResultSaved:
-            DebugLog(@"Mail saved...");
-            break;
-        case MFMailComposeResultSent:
-            DebugLog(@"Mail sent...");
-            break;
-        case MFMailComposeResultFailed:
-            DebugLog(@"Mail send errored: %@...", [error localizedDescription]);
-            break;
-        default:
-            break;
-    }
-    [self dismissModalViewControllerAnimated:YES];
-}
-/*
-#pragma mark - Navigation
-
- In a storyboard-based application, you will often want to do a little preparation before navigation
-- (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender
-{
-     Get the new view controller using [segue destinationViewController].
-     Pass the selected object to the new view controller.
-}
-*/
-//- (void)startAirPrintWithData:(id )data
-//{
-//
-//
-//    UIAlertView * waitalert = [RAUtils waiting_alert:@"Please wait..." title:@"preparing print..."];
-//
-//    UIPrintInteractionController* airPrinterController=[UIPrintInteractionController sharedPrintController];
-//    UIPrintInfo *printInfo = [UIPrintInfo printInfo];
-//    printInfo.outputType = UIPrintInfoOutputGeneral;
-//    printInfo.orientation = UIPrintInfoOrientationPortrait;
-//    printInfo.jobName = [[[NSBundle mainBundle] infoDictionary] objectForKey:@"CFBundleDisplayName"];
-//    if(self.filename.length>0)
-//        printInfo.jobName = self.filename;
-//    airPrinterController.printInfo = printInfo;
-//    airPrinterController.printingItem = data;
-//    airPrinterController.delegate = self;
-//
-//
-//    airPrinterController.showsNumberOfCopies=true;
-//    airPrinterController.showsPageRange = true;
-//    airPrinterController.showsPaperSelectionForLoadedPapers=true;
-//
-//    void (^completionHandler)(UIPrintInteractionController *, BOOL, NSError *) = ^(UIPrintInteractionController *printController, BOOL completed, NSError *error) {
-//        if(completed && error)
-//            DebugLog(@"Printing failed due to error in domain %@ with error code %lu. Localized description: %@, and failure reason: %@", error.domain, (long)error.code, error.localizedDescription, error.localizedFailureReason);
-//    };
-//
-//    AppDelegate *appDelegate = (AppDelegate*)[[UIApplication sharedApplication] delegate];
-//
-//    UIPrinter *airPrinter = [UIPrinter printerWithURL:[NSURL URLWithString:appDelegate.printerURL] ];///*self.printer;*/
-//
-//
-//
-//
-//    [[UIPrinter printerWithURL:[NSURL URLWithString:appDelegate.printerURL]] contactPrinter:^(BOOL available)
-//     {
-//         [waitalert dismissWithClickedButtonIndex:0 animated:FALSE];
-//
-//         if (available&& appDelegate.printerURL.length>0)
-//         {
-//
-//
-//             [airPrinterController printToPrinter:airPrinter completionHandler:completionHandler];
-//             DebugLog(@"AIRPRINTER AVAILABLE");
-//         }
-//         else
-//         {
-//
-//             //             [airPrinterController presentFromRect:CGRectMake(0, 0, 300, 500) inView:self.view animated:YES completionHandler:
-//             //
-//             //
-//             //
-//             //              //        [printPicker presentAnimated:YES completionHandler:
-//             //              ^(UIPrintInteractionController *printerController, BOOL userDidSelect, NSError *error)
-//             //              {
-//             //                  if (userDidSelect)
-//             //                  {
-//             //                      NSString* sid= printerController.printInfo.printerID;
-//             //                      UIPrintPaper*paper=  printerController.printPaper;
-//             //
-//             //                  }
-//             //              }];
-//
-//
-//             DebugLog(@"AIRPRINTER NOT AVAILABLE");
-//
-//
-//
-//             if (NSFoundationVersionNumber > NSFoundationVersionNumber_iOS_7_1)
-//             {
-//                 UIPrinterPickerController *printPicker = [UIPrinterPickerController printerPickerControllerWithInitiallySelectedPrinter:nil];
-//              //   [printPicker presentFromBarButtonItem:self.btnSubmitOrder animated:yes completionHandler:
-//
-//
-//
-//                [ printPicker presentFromBarButtonItem:self.btnshare animated:YES completionHandler:
-//
-//
-//                // [printPicker presentFromRect:CGRectMake(0, 0, 300, 500) inView:self.view animated:YES completionHandler:
-//
-//
-//
-//                  //        [printPicker presentAnimated:YES completionHandler:
-//                  ^(UIPrinterPickerController *printerPicker, BOOL userDidSelect, NSError *error)
-//                  {
-//                      if (userDidSelect)
-//                      {
-//                          //User selected the item in the UIPrinterPickerController and got the printer details.
-//
-//                          [UIPrinterPickerController printerPickerControllerWithInitiallySelectedPrinter:printerPicker.selectedPrinter];
-//
-//                          //Here you will get the printer and printer details.ie,
-//                          // printerPicker.selectedPrinter, printerPicker.selectedPrinter.displayName, printerPicker.selectedPrinter.URL etc. So you can display the printer name in your label text or button title.
-//
-//
-//
-//
-//                          appDelegate.printerURL =printerPicker.selectedPrinter.URL.absoluteString;
-//
-//                          [self startAirPrintWithData:data];
-//
-//                      }
-//                      else
-//                      {
-//
-//
-////                          AppDelegate *appDelegate = (AppDelegate*)[[UIApplication sharedApplication] delegate];
-////                          if([appDelegate.mode isEqualToString:@"Trade Show Mode"]&& appDelegate.submit_order_logout)
-////                          {
-////
-////                              [((MainViewController*)appDelegate.main_vc) Loginout:false];
-////                          }
-////                          [self prepareReturn:nil];
-//
-//                          //[self.navigationController popViewControllerAnimated:true];
-//                      }
-//                  }];
-//             }
-//         }
-//     }];
-//
-//
-//
-//}
-- (void)startAirPrintWithData:(id )data
-{
-    
-    
-    UIAlertView * waitalert = [RAUtils waiting_alert:@"Please wait..." title:@"preparing print..."];
-    
-    UIPrintInteractionController* airPrinterController=[UIPrintInteractionController sharedPrintController];
-    UIPrintInfo *printInfo = [UIPrintInfo printInfo];
-    printInfo.outputType = UIPrintInfoOutputGeneral;
-    printInfo.orientation = UIPrintInfoOrientationPortrait;
-    printInfo.jobName = [[[NSBundle mainBundle] infoDictionary] objectForKey:@"CFBundleDisplayName"];
-    if(self.filename.length>0)
-        printInfo.jobName = self.filename;
-    airPrinterController.printInfo = printInfo;
-    airPrinterController.printingItem = data;
-    airPrinterController.delegate = self;
-    
-    
-    airPrinterController.showsNumberOfCopies=true;
-    airPrinterController.showsPageRange = true;
-    airPrinterController.showsPaperSelectionForLoadedPapers=true;
-    
-    void (^completionHandler)(UIPrintInteractionController *, BOOL, NSError *) = ^(UIPrintInteractionController *printController, BOOL completed, NSError *error) {
-        if(completed && error)
-        {
-            //                        DebugLog(@"Printing failed due to error in domain %@ with error code %lu. Localized description: %@, and failure reason: %@", error.domain, (long)error.code, error.localizedDescription, error.localizedFailureReason);
-        }
-        
-    };
-    
-    AppDelegate *appDelegate = (AppDelegate*)[[UIApplication sharedApplication] delegate];
-    
-    
-    if(appDelegate.printerURL==nil)
-    {
-        [waitalert dismissWithClickedButtonIndex:0 animated:FALSE];
-        if (NSFoundationVersionNumber > NSFoundationVersionNumber_iOS_7_1)
-        {
-            UIPrinterPickerController *printPicker = [UIPrinterPickerController printerPickerControllerWithInitiallySelectedPrinter:nil];
-            //   [printPicker presentFromBarButtonItem:self.btnSubmitOrder animated:yes completionHandler:
-            
-            
-            
-            //                 [ printPicker presentFromBarButtonItem:self.btnshare animated:YES completionHandler:
-            
-            
-            
-            [printPicker presentFromRect:CGRectMake(100, 100, 300, 500) inView:self.view animated:YES completionHandler:
-             
-             
-             
-             //        [printPicker presentAnimated:YES completionHandler:
-             ^(UIPrinterPickerController *printerPicker, BOOL userDidSelect, NSError *error)
-             {
-                 if (userDidSelect)
-                 {
-                     //User selected the item in the UIPrinterPickerController and got the printer details.
-                     
-                     [UIPrinterPickerController printerPickerControllerWithInitiallySelectedPrinter:printerPicker.selectedPrinter];
-                     
-                     //Here you will get the printer and printer details.ie,
-                     // printerPicker.selectedPrinter, printerPicker.selectedPrinter.displayName, printerPicker.selectedPrinter.URL etc. So you can display the printer name in your label text or button title.
-                     
-                     
-                     
-                     
-                     appDelegate.printerURL =printerPicker.selectedPrinter.URL.absoluteString;
-                     
-                     [self startAirPrintWithData:data];
-                     
-                 }
-                 else
-                 {
-                     
-                     
-                     //                          AppDelegate *appDelegate = (AppDelegate*)[[UIApplication sharedApplication] delegate];
-                     //                          if([appDelegate.mode isEqualToString:@"Trade Show Mode"]&& appDelegate.submit_order_logout)
-                     //                          {
-                     //
-                     //                              [((MainViewController*)appDelegate.main_vc) Loginout:false];
-                     //                          }
-                     //                          [self prepareReturn:nil];
-                     
-                     //[self.navigationController popViewControllerAnimated:true];
-                 }
-             }];
-        }
-    }
-    else
-    {
-        UIPrinter *airPrinter = [UIPrinter printerWithURL:[NSURL URLWithString:appDelegate.printerURL] ];///*self.printer;*/
-        [airPrinter contactPrinter:^(BOOL available)
-         {
-             [waitalert dismissWithClickedButtonIndex:0 animated:FALSE];
-             
-             if (available&& appDelegate.printerURL.length>0)
-             {
-                 
-                 
-                 [airPrinterController printToPrinter:airPrinter completionHandler:completionHandler];
-                 DebugLog(@"AIRPRINTER AVAILABLE");
-             }
-             else
-             {
-                 appDelegate.printerURL = nil;
-                 
-                 //             [airPrinterController presentFromRect:CGRectMake(0, 0, 300, 500) inView:self.view animated:YES completionHandler:
-                 //
-                 //
-                 //
-                 //              //        [printPicker presentAnimated:YES completionHandler:
-                 //              ^(UIPrintInteractionController *printerController, BOOL userDidSelect, NSError *error)
-                 //              {
-                 //                  if (userDidSelect)
-                 //                  {
-                 //                      NSString* sid= printerController.printInfo.printerID;
-                 //                      UIPrintPaper*paper=  printerController.printPaper;
-                 //
-                 //                  }
-                 //              }];
-                 
-                 
-                 DebugLog(@"AIRPRINTER NOT AVAILABLE");
-                 
-                 
-                 
-                 if (NSFoundationVersionNumber > NSFoundationVersionNumber_iOS_7_1)
-                 {
-                     UIPrinterPickerController *printPicker = [UIPrinterPickerController printerPickerControllerWithInitiallySelectedPrinter:nil];
-                     //   [printPicker presentFromBarButtonItem:self.btnSubmitOrder animated:yes completionHandler:
-                     
-                     
-                     
-                     //                 [ printPicker presentFromBarButtonItem:self.btnshare animated:YES completionHandler:
-                     
-                     
-                     
-                     [printPicker presentFromRect:CGRectMake(100, 100, 300, 500) inView:self.view animated:YES completionHandler:
-                      
-                      
-                      
-                      //        [printPicker presentAnimated:YES completionHandler:
-                      ^(UIPrinterPickerController *printerPicker, BOOL userDidSelect, NSError *error)
-                      {
-                          if (userDidSelect)
-                          {
-                              //User selected the item in the UIPrinterPickerController and got the printer details.
-                              
-                              [UIPrinterPickerController printerPickerControllerWithInitiallySelectedPrinter:printerPicker.selectedPrinter];
-                              
-                              //Here you will get the printer and printer details.ie,
-                              // printerPicker.selectedPrinter, printerPicker.selectedPrinter.displayName, printerPicker.selectedPrinter.URL etc. So you can display the printer name in your label text or button title.
-                              
-                              
-                              
-                              
-                              appDelegate.printerURL =printerPicker.selectedPrinter.URL.absoluteString;
-                              
-                              [self startAirPrintWithData:data];
-                              
-                          }
-                          else
-                          {
-                              appDelegate.printerURL = nil;
-                              
-                              //                          AppDelegate *appDelegate = (AppDelegate*)[[UIApplication sharedApplication] delegate];
-                              //                          if([appDelegate.mode isEqualToString:@"Trade Show Mode"]&& appDelegate.submit_order_logout)
-                              //                          {
-                              //
-                              //                              [((MainViewController*)appDelegate.main_vc) Loginout:false];
-                              //                          }
-                              //                          [self prepareReturn:nil];
-                              
-                              //[self.navigationController popViewControllerAnimated:true];
-                          }
-                      }];
-                 }
-             }
-         }];
-    }
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-}
-#pragma mark - UIPrintInteractionControllerDelegate
-- (UIPrintPaper *)printInteractionController:(UIPrintInteractionController *)printInteractionController choosePaper:(NSArray<UIPrintPaper *> *)paperList
-{
-
-    ;
-
-    //    (int) width = 29700
-    //    Printing description of (*( (int *)0x7caa3a40)):
-    //    (int) height = 42000
-    //设置纸张大小
-
-    CGSize paperSize=[PDFUtils QueryPDFSizeFromData:self.content];
-    for(UIPrintPaper* paper in paperList)
-    {
-        if (CGSizeEqualToSize(paper.paperSize, paperSize))
-            return paper;
-
-    }
-    
-    UIPrintPaper * pp=[[UIPrintPaper alloc] init];
-    
-//    CGSize paperSize = CGSizeMake(612, 792);
-    UIPrintPaper * p=[UIPrintPaper bestPaperForPageSize:paperSize withPapersFromArray:paperList];
-    return p;
-}
-- (void)printInteractionControllerWillPresentPrinterOptions:(UIPrintInteractionController *)printInteractionController
-{
-
-}
-- (void)printInteractionControllerDidPresentPrinterOptions:(UIPrintInteractionController *)printInteractionController
-{
-
-}
-- (void)printInteractionControllerWillDismissPrinterOptions:(UIPrintInteractionController *)printInteractionController
-{
-
-}
-- (void)printInteractionControllerDidDismissPrinterOptions:(UIPrintInteractionController *)printInteractionController
-{
-
-}
-
-- (void)printInteractionControllerWillStartJob:(UIPrintInteractionController *)printInteractionController
-{
-
-}
-- (void)printInteractionControllerDidFinishJob:(UIPrintInteractionController *)printInteractionController
-{
-
-//    AppDelegate *appDelegate = (AppDelegate*)[[UIApplication sharedApplication] delegate];
-//    if([appDelegate.mode isEqualToString:@"Trade Show Mode"]&& appDelegate.submit_order_logout)
-//    {
-//
-//        [((MainViewController*)appDelegate.main_vc) Loginout:false];
-//    }
-//
-//    [self prepareReturn:nil];
-
-    if(self.autoPrint)
-    [self.navigationController popViewControllerAnimated:true];
-}
-@end

+ 0 - 31
RedAnt ERP Mobile/common/Functions/PDF+Web/WebViewController.h

@@ -1,31 +0,0 @@
-//
-//  WebViewController.h
-//  RedAnt ERP Mobile
-//
-//  Created by Ray on 1/21/16.
-//  Copyright © 2016 United Software Applications, Inc. All rights reserved.
-//
-
-#import <UIKit/UIKit.h>
-#import <WebKit/WebKit.h>
-
-@interface WebViewController : UIViewController<WKNavigationDelegate>
-
-@property (weak, nonatomic) IBOutlet WKWebView *wkWebview;
-
-
-@property (strong, nonatomic) IBOutlet UIActivityIndicatorView *mum;
-@property (strong,nonatomic) NSString* url;
-//@property (strong,nonatomic) NSString* title;
-@property (strong,nonatomic) NSData* content;
-
-@property (nonatomic,assign) BOOL backItemDismiss;///<返回键响应是否为dismiss
-
-@property (nonatomic , copy) void (^onLoadSuccess)(NSString* url );
-
-
-
-
-
-
-@end

+ 0 - 215
RedAnt ERP Mobile/common/Functions/PDF+Web/WebViewController.m

@@ -1,215 +0,0 @@
-//
-//  WebViewController.m
-//  RedAnt ERP Mobile
-//
-//  Created by Ray on 1/21/16.
-//  Copyright © 2016 United Software Applications, Inc. All rights reserved.
-//
-
-#import "WebViewController.h"
-#import "RAUtils.h"
-#import "const.h"
-@interface WebViewController ()
-
-@end
-
-@implementation WebViewController
-
-- (void)viewWillAppear:(BOOL)animated
-{
-
-        [super viewWillAppear:animated];
-        [[self navigationController] setNavigationBarHidden:NO animated:NO];
-        
-}
-
-- (void)viewDidLoad
-{
-    [super viewDidLoad];
-   // self.edgesForExtendedLayout = UIRectEdgeNone;
-    // Do any additional setup after loading the view.
-    UIRefreshControl *ref = [[UIRefreshControl alloc]init];
-    ref.tag = 200 ;
-    ref.attributedTitle = [[NSAttributedString alloc]initWithString:@"drag to refresh"];
-    ref.tintColor = [UIColor colorWithRed:0.10 green:0.68 blue:0.94 alpha:0.7];
-    //    ref.hidden = true;
-    [ref addTarget:self action:@selector(changeCell) forControlEvents:UIControlEventValueChanged];
-    [self.wkWebview.scrollView addSubview:ref];
-    self.wkWebview.navigationDelegate = self;
-    
-    
-//    self.wkWebview.dataDetectorTypes=UIDataDetectorTypeAll;
-    
-//    self.wkWebview datade
-    
-    
-    UIBarButtonItem *closeButton = [[UIBarButtonItem alloc] initWithImage:[[UIImage imageNamed:@"back"] imageWithRenderingMode:UIImageRenderingModeAutomatic]
-                                                                    style:UIBarButtonItemStylePlain
-                                                                   target:self
-                                                                   action:@selector( onBackClick:)];
-    //[[UIBarButtonItem alloc] initWithTitle:NSLocalizedString(@"Close", nil) style:UIBarButtonItemStylePlain target:self action:@selector(onCloseClick:)];
-    //    closeButton.title = @"Close";
- //   closeButton.tintColor = UIColorFromRGB(0x996633);
-    self.navigationItem.leftBarButtonItem = closeButton;
-    
-    
- 
-    
-    
-    //   self.url=@"http://192.168.1.3:8080/npd/test.pdf";
-    //    NSURL* url = [NSURL URLWithString:self.url];
-    //
-    //    NSMutableURLRequest *request = [[NSMutableURLRequest alloc] initWithURL:[NSURL URLWithString:self.url]        cachePolicy:NSURLRequestReloadIgnoringLocalCacheData timeoutInterval:2000];
-    //
-    //
-    //    [self.webView loadRequest:request];
-    
-    
-    [self loadcontent];
-}
-- (void)onBackClick:(UIButton *)sender {
-    
-    if (self.backItemDismiss)
-        [self.navigationController dismissViewControllerAnimated:YES completion:nil];
-    
-    [self.navigationController popViewControllerAnimated:FALSE];
-}
--(void)ReloadData
-{
-    
-    //    Count ++ ;
-    //    [mytabelview reloadData];
-    UIRefreshControl *reF = (UIRefreshControl *)[self.view viewWithTag:200];
-    
-    [reF endRefreshing];
-    [self loadcontent];
-    
-    
-}
--(void) loadcontent
-{
-    self.mum.hidden=false;
-    
-    
-    NSURL *url =[NSURL URLWithString:self.url];
-    DebugLog(self.url);
-    NSURLRequest *request =[NSURLRequest requestWithURL:url];
-    [self.wkWebview loadRequest:request];
-    
-//    dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
-    
-//        
-//        NSMutableURLRequest *request = [[NSMutableURLRequest alloc] initWithURL:[NSURL URLWithString:self.url]        cachePolicy:NSURLRequestReloadIgnoringLocalCacheData timeoutInterval:60*5];
-//        
-//        //设置请求方式为get
-//        
-//        [request setHTTPMethod:@"GET"];
-//        
-//        //添加用户会话id
-//        
-//        [request addValue:@"text/html" forHTTPHeaderField:@"Content-Type"];
-//        
-//        //连接发送请求
-//        
-//        
-//        NSHTTPURLResponse* urlResponse = nil;
-//        
-//        NSError *error = [[NSError alloc] init];
-//        
-//        self.content= [NSURLConnection sendSynchronousRequest:request returningResponse:&urlResponse error:&error];
-//        
-//  
-//        
-//        dispatch_async(dispatch_get_main_queue(), ^{
-//            
-//            self.navigationItem.title = self.title;
-//            UIRefreshControl *reF = (UIRefreshControl *)[self.view viewWithTag:200];
-//            //  self.content=nil;
-//            if(self.content!=nil&&self.content.length>0)
-//            {
-//                [reF removeFromSuperview];
-//                
-//                
-////                // NSArray *paths = NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES);
-////                NSString *path = NSTemporaryDirectory();
-////                NSString *filePath = [path stringByAppendingPathComponent:self.filename];
-////                //    NSError *error = [[NSError alloc] init];
-////                //    BOOL bo = [[NSFileManager defaultManager] createDirectoryAtPath:path withIntermediateDirectories:YES attributes:nil error:&error];
-////                //    NSAssert(bo,@"创建目录失败");
-////                [self.content writeToFile:filePath atomically:YES];
-////                
-////                
-////                self.btnshare.enabled =true;
-////                
-////                
-////                self.btnemail.enabled =true;
-////                self.btnsave.enabled =true;
-////                
-////                if(self.onLoadSuccess)
-////                    self.onLoadSuccess(self.url);
-//                //               int a=0;
-//            }
-//            else
-//            {
-//                [RAUtils message_alert:nil  title:@"Open URL Failed" controller:self];
-//                //                self.content = [self.url dataUsingEncoding:NSUTF8StringEncoding];
-//            }
-//            
-//            ;
-//            //            DebugLog(@"%@",[[NSString alloc] initWithData:self.content encoding:NSASCIIStringEncoding]);
-//            //
-//            
-//            
-//            [self.webView loadData:self.content MIMEType:urlResponse.MIMEType textEncodingName:nil baseURL:nil];
-//            
-//            
-//            
-//            
-//        });
-//    });
-    
-    
-    
-    
-}
--(void)changeCell
-{
-    UIRefreshControl *reF = (UIRefreshControl *)[self.view viewWithTag:200];
-    reF.attributedTitle = [[NSAttributedString alloc]initWithString:@"refreshing"];
-    if ([self respondsToSelector:@selector(ReloadData)])
-    [self performSelector:@selector(ReloadData) withObject:nil afterDelay:1];
-    //    DebugLog(@"refresh!!!!!!!!");
-    
-}
-- (void)didReceiveMemoryWarning
-{
-    [super didReceiveMemoryWarning];
-    // Dispose of any resources that can be recreated.
-}
-
-
-
-
-
-
-
-#pragma mark - WKNavigationDelegate
-- (void)webView:(WKWebView *)webView didFinishNavigation:(WKNavigation *)navigation
-{
-       self.mum.hidden=true;
-        
-    
-}
-
-
-/*
-#pragma mark - Navigation
-
-// In a storyboard-based application, you will often want to do a little preparation before navigation
-- (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender {
-    // Get the new view controller using [segue destinationViewController].
-    // Pass the selected object to the new view controller.
-}
-*/
-
-@end

+ 7 - 1
RedAnt ERP Mobile/common/Functions/cart/CartViewController.m

@@ -3144,6 +3144,12 @@ commitEditingStyle:(UITableViewCellEditingStyle)editingStyle  forRowAtIndexPath:
 
 - (void)willAnimateRotationToInterfaceOrientation:(UIInterfaceOrientation)toInterfaceOrientation duration:(NSTimeInterval)duration {
     self.sortItemController.view.frame = self.view.bounds;
+     self.toolpanel.layer.shadowPath =[UIBezierPath bezierPathWithRect:self.toolpanel.bounds].CGPath;
+    
+//    [self.itemListTable reloadData];
+    
+    self.cartIndicatorBar.layer.shadowPath =[UIBezierPath bezierPathWithRect:self.cartIndicatorBar.bounds].CGPath;
+    [self layoutCartIndicatorBar];
 }
 
 #pragma mark - notification action
@@ -3238,7 +3244,7 @@ commitEditingStyle:(UITableViewCellEditingStyle)editingStyle  forRowAtIndexPath:
         return;
     }
     
-    RAPDFViewController *ViewController = [[UIStoryboard storyboardWithName:@"Main" bundle:nil] instantiateViewControllerWithIdentifier:@"RAPDFViewController"];
+    RAPDFViewController *ViewController = [[UIStoryboard storyboardWithName:@"wkweb" bundle:nil] instantiateViewControllerWithIdentifier:@"RAPDFViewController"];
     
     ViewController.url = self.print_url;
     ViewController.canSave = false;

+ 1 - 1
RedAnt ERP Mobile/common/Functions/home/HomeViewController.m

@@ -747,7 +747,7 @@
 //        
 //        
         
-        WebViewController *ViewController = [[UIStoryboard storyboardWithName:@"Main" bundle:nil] instantiateViewControllerWithIdentifier:@"WebViewController"];
+        WebViewController *ViewController = [[UIStoryboard storyboardWithName:@"wkweb" bundle:nil] instantiateViewControllerWithIdentifier:@"WebViewController"];
         ViewController.url = url;
         ViewController.title = title;
         

+ 1 - 1
RedAnt ERP Mobile/common/Functions/modelDetail/DetailHeaderCell.m

@@ -116,7 +116,7 @@
                 
                 NSString* url = [editor_json valueForKey:@"pdf_path"];
                 bool isLocalFile = [[editor_json valueForKey:@"isLocalFile"] boolValue];
-                RAPDFViewController *ViewController = [[UIStoryboard storyboardWithName:@"Main" bundle:nil] instantiateViewControllerWithIdentifier:@"RAPDFViewController"];
+                RAPDFViewController *ViewController = [[UIStoryboard storyboardWithName:@"wkweb" bundle:nil] instantiateViewControllerWithIdentifier:@"RAPDFViewController"];
                 ViewController.url = url;
                 ViewController.canSave = false;
                 ViewController.isLocalfile=isLocalFile;

+ 2 - 2
RedAnt ERP Mobile/common/Functions/modelDetail/DetailViewController.m

@@ -500,7 +500,7 @@ self.isrefreshing=false;
                 
                 NSString* url = [editor_json valueForKey:@"pdf_path"];
                 bool isLocalFile = [[editor_json valueForKey:@"isLocalFile"] boolValue];
-                RAPDFViewController *ViewController = [[UIStoryboard storyboardWithName:@"Main" bundle:nil] instantiateViewControllerWithIdentifier:@"RAPDFViewController"];
+                RAPDFViewController *ViewController = [[UIStoryboard storyboardWithName:@"wkweb" bundle:nil] instantiateViewControllerWithIdentifier:@"RAPDFViewController"];
                 ViewController.url = url;
                 ViewController.canSave = false;
                 ViewController.isLocalfile=isLocalFile;
@@ -2463,7 +2463,7 @@ self.isrefreshing=false;
     
     name = [NSString stringWithFormat:@"%@ Assembly Instruction",name];
     
-    RAPDFViewController *ViewController = [[UIStoryboard storyboardWithName:@"Main" bundle:nil] instantiateViewControllerWithIdentifier:@"RAPDFViewController"];
+    RAPDFViewController *ViewController = [[UIStoryboard storyboardWithName:@"wkweb" bundle:nil] instantiateViewControllerWithIdentifier:@"RAPDFViewController"];
     ViewController.url = link;
     ViewController.canSave = false;
     ViewController.isLocalfile=isLocalFile;

+ 9 - 0
RedAnt ERP Mobile/common/Functions/order/OrderDetailHtmlCell.m

@@ -16,6 +16,15 @@
     [[UIDevice currentDevice] beginGeneratingDeviceOrientationNotifications];
     
     [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(deviceOrientationDidChange:) name:UIDeviceOrientationDidChangeNotification object:nil];
+    
+    
+    self.wkwebview.scrollView.scrollEnabled = NO;
+    
+    
+//    self.wkwebview.scrollView.alwaysBounceVertical = NO;
+//    self.wkwebview.scrollView.showsHorizontalScrollIndicator = NO;
+//    self.wkwebview.scrollView.showsVerticalScrollIndicator=NO;
+//    self.wkwebview.scrollView.bouncesZoom = NO;
 }
 - (void)dealloc
 {

+ 3 - 3
RedAnt ERP Mobile/common/Functions/order/OrderDetailViewController.m

@@ -45,7 +45,7 @@
 
 - (void)saleOrderWithPath:(NSString *)path {
     
-    RAPDFViewController *ViewController = [[UIStoryboard storyboardWithName:@"Main" bundle:nil] instantiateViewControllerWithIdentifier:@"RAPDFViewController"];
+    RAPDFViewController *ViewController = [[UIStoryboard storyboardWithName:@"wkweb" bundle:nil] instantiateViewControllerWithIdentifier:@"RAPDFViewController"];
     
     ViewController.url = path;
     ViewController.canSave = false;
@@ -349,7 +349,7 @@
     __weak typeof(self) weakself = self;
     AppDelegate *appDelegate = (AppDelegate*)[[UIApplication sharedApplication] delegate];
     
-    RAPDFViewController *ViewController = [[UIStoryboard storyboardWithName:@"Main" bundle:nil] instantiateViewControllerWithIdentifier:@"RAPDFViewController"];
+    RAPDFViewController *ViewController = [[UIStoryboard storyboardWithName:@"wkweb" bundle:nil] instantiateViewControllerWithIdentifier:@"RAPDFViewController"];
     
     ViewController.mail_content = [self.content_data valueForKey:@"email_content"];
     
@@ -1041,7 +1041,7 @@
 - (void)showSignaturePanel {
     
     __block UIImage* signimg=nil;
-    SignatureViewController * vc =[ [UIStoryboard storyboardWithName:@"signature" bundle:[NSBundle mainBundle]] instantiateViewControllerWithIdentifier:@"SignatureViewController"];
+    SignatureViewController * vc =[ [UIStoryboard storyboardWithName:@"signature" bundle:nil] instantiateViewControllerWithIdentifier:@"SignatureViewController"];
     
     vc.onReturnImg = ^(UIImage* img)
     {

+ 1 - 1
RedAnt ERP Mobile/common/Functions/portfolio/PortfolioListViewController.m

@@ -513,7 +513,7 @@
 
     BOOL isLocalFile= [[self.content_data[indexPath.row] valueForKey:@"isLocalFile"] boolValue];
     
-    RAPDFViewController *ViewController = [[UIStoryboard storyboardWithName:@"Main" bundle:nil] instantiateViewControllerWithIdentifier:@"RAPDFViewController"];
+    RAPDFViewController *ViewController = [[UIStoryboard storyboardWithName:@"wkweb" bundle:nil] instantiateViewControllerWithIdentifier:@"RAPDFViewController"];
     ViewController.url = url;
     ViewController.canSave = false;
     ViewController.isLocalfile=isLocalFile;

+ 2 - 2
RedAnt ERP Mobile/common/Functions/portfolio/PortfolioViewController.m

@@ -436,7 +436,7 @@
         // NSString* name=[self.content_data[indexPath.row] valueForKey:@"tear_name"];
         // NSString* url= [self.content_data[indexPath.row] valueForKey:@"pdf_path"];
         
-        RAPDFViewController *ViewController = [[UIStoryboard storyboardWithName:@"Main" bundle:nil] instantiateViewControllerWithIdentifier:@"RAPDFViewController"];
+        RAPDFViewController *ViewController = [[UIStoryboard storyboardWithName:@"wkweb" bundle:nil] instantiateViewControllerWithIdentifier:@"RAPDFViewController"];
         ViewController.url = url;
         ViewController.canSave = false;
         ViewController.isLocalfile=isLocalFile;
@@ -590,7 +590,7 @@
                 NSString* url = [editor_json valueForKey:@"pdf_path"];
                 NSString* path = [editor_json valueForKey:@"pdf_real_path"];
                 bool isLocalFile = [[editor_json valueForKey:@"isLocalFile"] boolValue];
-                RAPDFViewController *ViewController = [[UIStoryboard storyboardWithName:@"Main" bundle:nil] instantiateViewControllerWithIdentifier:@"RAPDFViewController"];
+                RAPDFViewController *ViewController = [[UIStoryboard storyboardWithName:@"wkweb" bundle:nil] instantiateViewControllerWithIdentifier:@"RAPDFViewController"];
                 ViewController.url = url;
                 ViewController.canSave = true;
                 ViewController.isLocalfile=isLocalFile;

+ 1 - 1
RedAnt ERP Mobile/common/Functions/portfolio/TearSheetParamViewController.m

@@ -296,7 +296,7 @@
                 NSString* url = [editor_json valueForKey:@"pdf_path"];
                 NSString* path = [editor_json valueForKey:@"pdf_real_path"];
                 bool isLocalFile = [[editor_json valueForKey:@"isLocalFile"] boolValue];
-                RAPDFViewController *ViewController = [[UIStoryboard storyboardWithName:@"Main" bundle:nil] instantiateViewControllerWithIdentifier:@"RAPDFViewController"];
+                RAPDFViewController *ViewController = [[UIStoryboard storyboardWithName:@"wkweb" bundle:nil] instantiateViewControllerWithIdentifier:@"RAPDFViewController"];
                 ViewController.url = url;
                 ViewController.canSave = true;
                 ViewController.isLocalfile=isLocalFile;

+ 1 - 1
RedAnt ERP Mobile/common/Functions/sidemenu/LoginViewController.m

@@ -518,7 +518,7 @@
 - (IBAction)requestLoginBtnClicked:(UIButton *)sender {
 
 #if defined(BUILD_NPD) || defined(BUILD_USAI) || defined(BUILD_UWAVER)
-    WebViewController *webVC = [[UIStoryboard storyboardWithName:@"Main" bundle:nil] instantiateViewControllerWithIdentifier:@"WebViewController"];
+    WebViewController *webVC = [[UIStoryboard storyboardWithName:@"wkweb" bundle:nil] instantiateViewControllerWithIdentifier:@"WebViewController"];
     webVC.url = URL_REQUEST_LOGIN;
     webVC.title = @"Request Login";
     webVC.backItemDismiss = YES;

+ 1 - 0
RedAnt ERP Mobile/common/Functions/signature/SignatureViewController.m

@@ -45,6 +45,7 @@
 - (void)viewDidLoad
 {
     [super viewDidLoad];
+//    self.view.backgroundColor = [UIColor redColor];
     self.navigationItem.title = self.title;
     
     if(self.linewidth==0)

+ 31 - 20
RedAnt ERP Mobile/common/Functions/signature/signature.storyboard

@@ -1,11 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14113" targetRuntime="iOS.CocoaTouch.iPad" propertyAccessControl="none" colorMatched="YES">
-    <device id="ipad9_7" orientation="portrait">
-        <adaptation id="fullscreen"/>
-    </device>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="15702" targetRuntime="iOS.CocoaTouch.iPad" propertyAccessControl="none" useAutolayout="YES" useSafeAreas="YES" colorMatched="YES">
+    <device id="ipad9_7" orientation="portrait" layout="fullscreen" appearance="light"/>
     <dependencies>
-        <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14088"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15704"/>
+        <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <scenes>
@@ -17,7 +15,11 @@
                         <rect key="frame" x="0.0" y="0.0" width="768" height="1024"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                         <subviews>
-                            <label hidden="YES" opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" text="Please signature in the yellow area" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="OEo-Ct-kXA">
+                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="8MW-Bu-gt4">
+                                <rect key="frame" x="0.0" y="0.0" width="768" height="1024"/>
+                                <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                            </view>
+                            <label hidden="YES" opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="Please signature in the yellow area" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="OEo-Ct-kXA">
                                 <rect key="frame" x="238" y="64" width="292" height="21"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="17"/>
@@ -25,13 +27,20 @@
                                 <nil key="highlightedColor"/>
                             </label>
                         </subviews>
-                        <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                        <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                        <constraints>
+                            <constraint firstItem="8MW-Bu-gt4" firstAttribute="top" secondItem="BoQ-pl-E34" secondAttribute="top" id="Z1c-rh-QdI"/>
+                            <constraint firstItem="BoQ-pl-E34" firstAttribute="bottom" secondItem="8MW-Bu-gt4" secondAttribute="bottom" id="b4r-uq-on7"/>
+                            <constraint firstItem="BoQ-pl-E34" firstAttribute="trailing" secondItem="8MW-Bu-gt4" secondAttribute="trailing" id="lhZ-86-MuZ"/>
+                            <constraint firstItem="8MW-Bu-gt4" firstAttribute="leading" secondItem="BoQ-pl-E34" secondAttribute="leading" id="usq-id-dkW"/>
+                        </constraints>
+                        <viewLayoutGuide key="safeArea" id="BoQ-pl-E34"/>
                     </view>
                     <navigationItem key="navigationItem" title="Title" id="8c7-vT-omW"/>
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="jvi-8Y-CLK" userLabel="First Responder" sceneMemberID="firstResponder"/>
             </objects>
-            <point key="canvasLocation" x="2696" y="-7394"/>
+            <point key="canvasLocation" x="2106.25" y="-4332.421875"/>
         </scene>
         <!--Title-->
         <scene sceneID="llq-Po-d7N">
@@ -41,7 +50,7 @@
                         <rect key="frame" x="0.0" y="0.0" width="376" height="640"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
-                            <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="44" sectionHeaderHeight="28" sectionFooterHeight="28" id="p4w-Uo-pFK">
+                            <tableView clipsSubviews="YES" contentMode="scaleToFill" fixedFrame="YES" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="44" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="p4w-Uo-pFK">
                                 <rect key="frame" x="0.0" y="0.0" width="376" height="640"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMinY="YES" heightSizable="YES" flexibleMaxY="YES"/>
                                 <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
@@ -50,15 +59,15 @@
                                         <rect key="frame" x="0.0" y="28" width="376" height="128"/>
                                         <autoresizingMask key="autoresizingMask" widthSizable="YES"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="pJ2-Li-nq4" id="hwz-Mn-MnM">
-                                            <rect key="frame" x="0.0" y="0.0" width="376" height="127.5"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="376" height="128"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
-                                                <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" id="5Hk-1I-EQp">
+                                                <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="5Hk-1I-EQp">
                                                     <rect key="frame" x="15" y="0.0" width="223" height="128"/>
                                                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                                 </imageView>
-                                                <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" id="npR-Us-Ywj">
-                                                    <rect key="frame" x="303" y="8" width="65" height="30"/>
+                                                <button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="npR-Us-Ywj">
+                                                    <rect key="frame" x="303" y="8" width="64" height="30"/>
                                                     <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/>
                                                     <color key="backgroundColor" red="0.0" green="0.47843137250000001" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                     <state key="normal" title="Fill All">
@@ -83,6 +92,7 @@
                             </tableView>
                         </subviews>
                         <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                        <viewLayoutGuide key="safeArea" id="ys7-OE-qUL"/>
                     </view>
                     <toolbarItems/>
                     <navigationItem key="navigationItem" title="Title" id="XAK-aB-GtR">
@@ -103,7 +113,7 @@
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="bV8-Sj-hSE" userLabel="First Responder" sceneMemberID="firstResponder"/>
             </objects>
-            <point key="canvasLocation" x="3388" y="-7390.0000000000009"/>
+            <point key="canvasLocation" x="2646.875" y="-4330.078125"/>
         </scene>
         <!--Check Selector View Controller-->
         <scene sceneID="esN-gj-lg0">
@@ -113,7 +123,7 @@
                         <rect key="frame" x="0.0" y="0.0" width="540" height="620"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
-                            <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="44" sectionHeaderHeight="28" sectionFooterHeight="28" id="k8D-US-WZx">
+                            <tableView clipsSubviews="YES" contentMode="scaleToFill" fixedFrame="YES" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="44" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="k8D-US-WZx">
                                 <rect key="frame" x="0.0" y="48" width="540" height="526"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMinY="YES" heightSizable="YES" flexibleMaxY="YES"/>
                                 <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
@@ -122,7 +132,7 @@
                                         <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="9oa-xb-cvi" id="Mqb-XY-jMc">
-                                            <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="44"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="Title" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="g0z-bw-GId">
@@ -148,7 +158,7 @@
                                     <outlet property="delegate" destination="53f-FJ-cIp" id="QgW-Zo-1vd"/>
                                 </connections>
                             </tableView>
-                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" id="fUv-0D-vb5">
+                            <button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="fUv-0D-vb5">
                                 <rect key="frame" x="490" y="582" width="30" height="30"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMinY="YES"/>
                                 <state key="normal" title="OK"/>
@@ -156,7 +166,7 @@
                                     <action selector="OnOKClick:" destination="53f-FJ-cIp" eventType="touchUpInside" id="TXl-ow-jv5"/>
                                 </connections>
                             </button>
-                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" id="W2X-ae-n4Z">
+                            <button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="W2X-ae-n4Z">
                                 <rect key="frame" x="20" y="582" width="48" height="30"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                                 <state key="normal" title="Cancel"/>
@@ -166,6 +176,7 @@
                             </button>
                         </subviews>
                         <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                        <viewLayoutGuide key="safeArea" id="0An-vW-r2C"/>
                     </view>
                     <modalFormSheetSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
                     <connections>
@@ -174,7 +185,7 @@
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="8Dt-jM-eNm" userLabel="First Responder" sceneMemberID="firstResponder"/>
             </objects>
-            <point key="canvasLocation" x="4080" y="-7393.0000000000009"/>
+            <point key="canvasLocation" x="3187.5" y="-4331.8359375"/>
         </scene>
     </scenes>
 </document>

+ 1 - 1
RedAnt ERP Mobile/common/Functions/watchlist/WatchListViewController.m

@@ -1174,7 +1174,7 @@ commitEditingStyle:(UITableViewCellEditingStyle)editingStyle  forRowAtIndexPath:
         [RAUtils message_alert:@"There is no resource to print" title:@"Warning" controller:self];
     }
     
-    RAPDFViewController *ViewController = [[UIStoryboard storyboardWithName:@"Main" bundle:nil] instantiateViewControllerWithIdentifier:@"RAPDFViewController"];
+    RAPDFViewController *ViewController = [[UIStoryboard storyboardWithName:@"wkweb" bundle:nil] instantiateViewControllerWithIdentifier:@"RAPDFViewController"];
     
     ViewController.url = self.print_url;
     ViewController.canSave = false;

+ 24 - 12
RedAnt ERP Mobile/iSales-NPD.xcodeproj/project.pbxproj

@@ -9,6 +9,7 @@
 /* Begin PBXBuildFile section */
 		3C2F99BB237BE1880000808F /* PortfolioListTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 3C2F99BA237BE1880000808F /* PortfolioListTableViewCell.m */; };
 		3C2F99BF237BE7190000808F /* NPD_Mobile.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 3C2F99BE237BE7190000808F /* NPD_Mobile.storyboard */; };
+		3C57169923CEA4120002E9FC /* Launch Screen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 3C57169823CEA4120002E9FC /* Launch Screen.storyboard */; };
 		3C6831A72397884A00AD5BD7 /* iPadCommonEditorCellSignature.xib in Resources */ = {isa = PBXBuildFile; fileRef = 3C68319C2397884A00AD5BD7 /* iPadCommonEditorCellSignature.xib */; };
 		3C6831A82397884A00AD5BD7 /* iPadCommonEditorCellTextView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 3C68319D2397884A00AD5BD7 /* iPadCommonEditorCellTextView.xib */; };
 		3C6831A92397884A00AD5BD7 /* iPadCommonEditorCellEnum.xib in Resources */ = {isa = PBXBuildFile; fileRef = 3C68319E2397884A00AD5BD7 /* iPadCommonEditorCellEnum.xib */; };
@@ -30,6 +31,9 @@
 		3C6831C3239788C100AD5BD7 /* ERP_Mobile_Search.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 3C6831BC239788C100AD5BD7 /* ERP_Mobile_Search.storyboard */; };
 		3C6831C4239788C100AD5BD7 /* ERP_Mobile_Cart.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 3C6831BD239788C100AD5BD7 /* ERP_Mobile_Cart.storyboard */; };
 		3C7E5A91237BDB26006D0105 /* PortfolioListViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 3C7E5A8F237BDB26006D0105 /* PortfolioListViewController.m */; };
+		3CC7E72E23BEDA5000BE5561 /* WebViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 3CC7E72B23BEDA4F00BE5561 /* WebViewController.m */; };
+		3CC7E72F23BEDA5000BE5561 /* RAPDFViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 3CC7E72C23BEDA4F00BE5561 /* RAPDFViewController.m */; };
+		3CC7E73123BEDA7B00BE5561 /* wkweb.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 3CC7E73023BEDA7B00BE5561 /* wkweb.storyboard */; };
 		423A4ADC1D503A53005ECE4A /* createContact.json in Resources */ = {isa = PBXBuildFile; fileRef = 423A4ADB1D503A53005ECE4A /* createContact.json */; };
 		423B49EF1DAC8071004181C2 /* CUL.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 423B49EE1DAC8071004181C2 /* CUL.storyboard */; };
 		424A02D11FFB3A0B0088DC56 /* RABackOrderSubmitAlertController.m in Sources */ = {isa = PBXBuildFile; fileRef = 424A02D01FFB3A0B0088DC56 /* RABackOrderSubmitAlertController.m */; };
@@ -148,8 +152,6 @@
 		7161FEB51D61B24900157EE1 /* creditcardpayment.html in Resources */ = {isa = PBXBuildFile; fileRef = 7161FEB21D61B24900157EE1 /* creditcardpayment.html */; };
 		7161FEB61D61B24900157EE1 /* normalpayment.html in Resources */ = {isa = PBXBuildFile; fileRef = 7161FEB31D61B24900157EE1 /* normalpayment.html */; };
 		7161FEB71D61B24900157EE1 /* orderinfo.html in Resources */ = {isa = PBXBuildFile; fileRef = 7161FEB41D61B24900157EE1 /* orderinfo.html */; };
-		7162A4FE1C585FFB00AB630E /* RAPDFViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 7162A4FB1C585FFB00AB630E /* RAPDFViewController.m */; };
-		7162A4FF1C585FFB00AB630E /* WebViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 7162A4FD1C585FFB00AB630E /* WebViewController.m */; };
 		7162A5021C586F5B00AB630E /* AddressEditorViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 7162A5011C586F5B00AB630E /* AddressEditorViewController.m */; };
 		7162A5091C586FC100AB630E /* CycleScrollView.m in Sources */ = {isa = PBXBuildFile; fileRef = 7162A5041C586FC100AB630E /* CycleScrollView.m */; };
 		7162A50A1C586FC100AB630E /* NSTimer+Addition.m in Sources */ = {isa = PBXBuildFile; fileRef = 7162A5061C586FC100AB630E /* NSTimer+Addition.m */; };
@@ -311,6 +313,7 @@
 		3C2F99B9237BE1880000808F /* PortfolioListTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PortfolioListTableViewCell.h; path = common/Functions/portfolio/PortfolioListTableViewCell.h; sourceTree = SOURCE_ROOT; };
 		3C2F99BA237BE1880000808F /* PortfolioListTableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = PortfolioListTableViewCell.m; path = common/Functions/portfolio/PortfolioListTableViewCell.m; sourceTree = SOURCE_ROOT; };
 		3C2F99BE237BE7190000808F /* NPD_Mobile.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = NPD_Mobile.storyboard; sourceTree = "<group>"; };
+		3C57169823CEA4120002E9FC /* Launch Screen.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = "Launch Screen.storyboard"; sourceTree = "<group>"; };
 		3C68319C2397884A00AD5BD7 /* iPadCommonEditorCellSignature.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = iPadCommonEditorCellSignature.xib; path = ../../common/customUI/CommonEditoriPad/iPadCommonEditorCellSignature.xib; sourceTree = "<group>"; };
 		3C68319D2397884A00AD5BD7 /* iPadCommonEditorCellTextView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = iPadCommonEditorCellTextView.xib; path = ../../common/customUI/CommonEditoriPad/iPadCommonEditorCellTextView.xib; sourceTree = "<group>"; };
 		3C68319E2397884A00AD5BD7 /* iPadCommonEditorCellEnum.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = iPadCommonEditorCellEnum.xib; path = ../../common/customUI/CommonEditoriPad/iPadCommonEditorCellEnum.xib; sourceTree = "<group>"; };
@@ -334,6 +337,11 @@
 		3C6831BD239788C100AD5BD7 /* ERP_Mobile_Cart.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = ERP_Mobile_Cart.storyboard; path = common/ERP_Mobile_Cart.storyboard; sourceTree = SOURCE_ROOT; };
 		3C7E5A8F237BDB26006D0105 /* PortfolioListViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = PortfolioListViewController.m; path = common/Functions/portfolio/PortfolioListViewController.m; sourceTree = SOURCE_ROOT; };
 		3C7E5A90237BDB26006D0105 /* PortfolioListViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PortfolioListViewController.h; path = common/Functions/portfolio/PortfolioListViewController.h; sourceTree = SOURCE_ROOT; };
+		3CC7E72A23BEDA4F00BE5561 /* RAPDFViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RAPDFViewController.h; path = "../../common/WK PDF+Web/RAPDFViewController.h"; sourceTree = "<group>"; };
+		3CC7E72B23BEDA4F00BE5561 /* WebViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = WebViewController.m; path = "../../common/WK PDF+Web/WebViewController.m"; sourceTree = "<group>"; };
+		3CC7E72C23BEDA4F00BE5561 /* RAPDFViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = RAPDFViewController.m; path = "../../common/WK PDF+Web/RAPDFViewController.m"; sourceTree = "<group>"; };
+		3CC7E72D23BEDA4F00BE5561 /* WebViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WebViewController.h; path = "../../common/WK PDF+Web/WebViewController.h"; sourceTree = "<group>"; };
+		3CC7E73023BEDA7B00BE5561 /* wkweb.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = wkweb.storyboard; path = "../../common/WK PDF+Web/wkweb.storyboard"; sourceTree = "<group>"; };
 		423A4ADB1D503A53005ECE4A /* createContact.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = createContact.json; sourceTree = "<group>"; };
 		423B49EE1DAC8071004181C2 /* CUL.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = CUL.storyboard; sourceTree = "<group>"; };
 		424A02CF1FFB3A0B0088DC56 /* RABackOrderSubmitAlertController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = RABackOrderSubmitAlertController.h; path = common/Functions/order/RABackOrderSubmitAlertController.h; sourceTree = SOURCE_ROOT; };
@@ -543,10 +551,6 @@
 		7161FEB21D61B24900157EE1 /* creditcardpayment.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; name = creditcardpayment.html; path = common/Functions/offline/creditcardpayment.html; sourceTree = SOURCE_ROOT; };
 		7161FEB31D61B24900157EE1 /* normalpayment.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; name = normalpayment.html; path = common/Functions/offline/normalpayment.html; sourceTree = SOURCE_ROOT; };
 		7161FEB41D61B24900157EE1 /* orderinfo.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; name = orderinfo.html; path = common/Functions/offline/orderinfo.html; sourceTree = SOURCE_ROOT; };
-		7162A4FA1C585FFB00AB630E /* RAPDFViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RAPDFViewController.h; path = "common/Functions/PDF+Web/RAPDFViewController.h"; sourceTree = SOURCE_ROOT; };
-		7162A4FB1C585FFB00AB630E /* RAPDFViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = RAPDFViewController.m; path = "common/Functions/PDF+Web/RAPDFViewController.m"; sourceTree = SOURCE_ROOT; };
-		7162A4FC1C585FFB00AB630E /* WebViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WebViewController.h; path = "common/Functions/PDF+Web/WebViewController.h"; sourceTree = SOURCE_ROOT; };
-		7162A4FD1C585FFB00AB630E /* WebViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = WebViewController.m; path = "common/Functions/PDF+Web/WebViewController.m"; sourceTree = SOURCE_ROOT; };
 		7162A5001C586F5B00AB630E /* AddressEditorViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AddressEditorViewController.h; path = common/Functions/address/AddressEditorViewController.h; sourceTree = SOURCE_ROOT; };
 		7162A5011C586F5B00AB630E /* AddressEditorViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AddressEditorViewController.m; path = common/Functions/address/AddressEditorViewController.m; sourceTree = SOURCE_ROOT; };
 		7162A5031C586FC100AB630E /* CycleScrollView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CycleScrollView.h; path = common/AutoScrollImage/CycleScrollView.h; sourceTree = SOURCE_ROOT; };
@@ -1723,10 +1727,11 @@
 		7190F1091BBBCAF100B2F243 /* PDF+Web */ = {
 			isa = PBXGroup;
 			children = (
-				7162A4FA1C585FFB00AB630E /* RAPDFViewController.h */,
-				7162A4FB1C585FFB00AB630E /* RAPDFViewController.m */,
-				7162A4FC1C585FFB00AB630E /* WebViewController.h */,
-				7162A4FD1C585FFB00AB630E /* WebViewController.m */,
+				3CC7E72A23BEDA4F00BE5561 /* RAPDFViewController.h */,
+				3CC7E73023BEDA7B00BE5561 /* wkweb.storyboard */,
+				3CC7E72C23BEDA4F00BE5561 /* RAPDFViewController.m */,
+				3CC7E72D23BEDA4F00BE5561 /* WebViewController.h */,
+				3CC7E72B23BEDA4F00BE5561 /* WebViewController.m */,
 			);
 			name = "PDF+Web";
 			sourceTree = "<group>";
@@ -1885,6 +1890,7 @@
 			children = (
 				719562351CF5733500C74A49 /* appearance */,
 				716387D2195408DA006E65E6 /* config */,
+				3C57169823CEA4120002E9FC /* Launch Screen.storyboard */,
 			);
 			name = NPD;
 			sourceTree = "<group>";
@@ -2069,6 +2075,7 @@
 				42A51BF61D62F9AB00F13667 /* orderDetail.json in Resources */,
 				3C2F99BF237BE7190000808F /* NPD_Mobile.storyboard in Resources */,
 				3C6831C3239788C100AD5BD7 /* ERP_Mobile_Search.storyboard in Resources */,
+				3CC7E73123BEDA7B00BE5561 /* wkweb.storyboard in Resources */,
 				7161FEB71D61B24900157EE1 /* orderinfo.html in Resources */,
 				42C9FB151D5B28FA001DCA8B /* contactAdvanceSearch.json in Resources */,
 				7161FEB51D61B24900157EE1 /* creditcardpayment.html in Resources */,
@@ -2090,6 +2097,7 @@
 				42B3C9BB1D642C880053985C /* order_info.html in Resources */,
 				718E71091DE7CEA20035D1FF /* so.json in Resources */,
 				42A225331D6E7D1D00235B62 /* placeOrderTemplate.json in Resources */,
+				3C57169923CEA4120002E9FC /* Launch Screen.storyboard in Resources */,
 				3C6831BE239788C100AD5BD7 /* ERP_Mobile_Model.storyboard in Resources */,
 				3C6831AD2397884A00AD5BD7 /* iPadCommonEditorCellImg.xib in Resources */,
 				7141DD3D1C5726B700F7DF59 /* softScanBeep.wav in Resources */,
@@ -2244,6 +2252,7 @@
 				71CB70751F99DF02009FDCB7 /* FileCache.m in Sources */,
 				7162A54A1C58719D00AB630E /* RATreeView+UIScrollView.m in Sources */,
 				7162A55D1C58724700AB630E /* ContactListViewController.m in Sources */,
+				3CC7E72E23BEDA5000BE5561 /* WebViewController.m in Sources */,
 				7162A5751C58728D00AB630E /* LineView.m in Sources */,
 				712AFEDD1DBA050200254965 /* RAPDFPage.m in Sources */,
 				428980481E249339005F1BD8 /* JKMessageBoxController.m in Sources */,
@@ -2296,7 +2305,6 @@
 				7162A51A1C58704600AB630E /* ModelItemCell.m in Sources */,
 				7141DD511C57459B00F7DF59 /* qrencode.c in Sources */,
 				7162A5451C58719D00AB630E /* RATreeView.m in Sources */,
-				7162A4FE1C585FFB00AB630E /* RAPDFViewController.m in Sources */,
 				71DF74841C57608F00F2789C /* ImageScrollerViewController.m in Sources */,
 				3C7E5A91237BDB26006D0105 /* PortfolioListViewController.m in Sources */,
 				71DF74861C57608F00F2789C /* ImageViewController.m in Sources */,
@@ -2306,7 +2314,6 @@
 				71DF74611C575E7900F2789C /* CommonEditorCellModel.m in Sources */,
 				71DF74341C5757DA00F2789C /* ActiveViewController.m in Sources */,
 				7162A5431C58719D00AB630E /* RATreeNodeInfo.m in Sources */,
-				7162A4FF1C585FFB00AB630E /* WebViewController.m in Sources */,
 				71FFBBE91C60894900D91DC2 /* iSalesDB.m in Sources */,
 				7162A55B1C58724700AB630E /* ContactAdvanceSearchViewController.m in Sources */,
 				7162A5441C58719D00AB630E /* RATreeNodeInfo+Private.m in Sources */,
@@ -2319,6 +2326,7 @@
 				7162A5DA1C5876E300AB630E /* AboutViewController.m in Sources */,
 				7141DD4E1C57459B00F7DF59 /* bitstream.c in Sources */,
 				71DF74851C57608F00F2789C /* ImageUploadViewController.m in Sources */,
+				3CC7E72F23BEDA5000BE5561 /* RAPDFViewController.m in Sources */,
 				7162A5CA1C58761500AB630E /* SignatureView.m in Sources */,
 				7162A5181C58704600AB630E /* CartViewController.m in Sources */,
 				71DF74601C575E7900F2789C /* CommonEditorCellMAction.m in Sources */,
@@ -2482,6 +2490,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
+				CURRENT_PROJECT_VERSION = 200116;
 				DEVELOPMENT_TEAM = HXWLAA5YN5;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
@@ -2498,6 +2507,7 @@
 					"$(PROJECT_DIR)/ScanApiSDK-10.2.227-2/lib",
 					"$(PROJECT_DIR)/GoogleAnalytics/GoogleAnalytics/Libraries",
 				);
+				MARKETING_VERSION = 1.96;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
@@ -2524,6 +2534,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
+				CURRENT_PROJECT_VERSION = 200116;
 				DEVELOPMENT_TEAM = HXWLAA5YN5;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
@@ -2540,6 +2551,7 @@
 					"$(PROJECT_DIR)/ScanApiSDK-10.2.227-2/lib",
 					"$(PROJECT_DIR)/GoogleAnalytics/GoogleAnalytics/Libraries",
 				);
+				MARKETING_VERSION = 1.96;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",

+ 7 - 118
RedAnt ERP Mobile/iSales-NPD/Base.lproj/Main.storyboard

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="15505" targetRuntime="iOS.CocoaTouch.iPad" propertyAccessControl="none" useAutolayout="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="jsC-F8-zYF">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="15702" targetRuntime="iOS.CocoaTouch.iPad" propertyAccessControl="none" useAutolayout="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="jsC-F8-zYF">
     <device id="ipad9_7" orientation="portrait" layout="fullscreen" appearance="light"/>
     <dependencies>
         <deployment version="4352" identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15510"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15704"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -842,7 +842,7 @@
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="3Rk-k3-zwC">
-                                                    <rect key="frame" x="11" y="-10" width="767" height="306"/>
+                                                    <rect key="frame" x="9" y="-13" width="770" height="308"/>
                                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                 </imageView>
                                             </subviews>
@@ -867,12 +867,12 @@
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <view contentMode="scaleToFill" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="AJc-gj-4ib">
-                                                    <rect key="frame" x="-4" y="11" width="768" height="15"/>
+                                                    <rect key="frame" x="-5" y="11" width="766" height="15"/>
                                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
                                                     <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                 </view>
                                                 <collectionView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" fixedFrame="YES" minimumZoomScale="0.0" maximumZoomScale="0.0" dataMode="prototypes" translatesAutoresizingMaskIntoConstraints="NO" id="YZB-OJ-1Vt">
-                                                    <rect key="frame" x="-4" y="16" width="768" height="268"/>
+                                                    <rect key="frame" x="-5" y="16" width="766" height="268"/>
                                                     <autoresizingMask key="autoresizingMask" widthSizable="YES"/>
                                                     <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                     <collectionViewFlowLayout key="collectionViewLayout" scrollDirection="horizontal" minimumLineSpacing="10" minimumInteritemSpacing="10" id="saz-yz-bIb">
@@ -1047,114 +1047,6 @@
             </objects>
             <point key="canvasLocation" x="2221.875" y="-2534.1796875"/>
         </scene>
-        <!--RAPDFViewController-->
-        <scene sceneID="Caf-Ca-4u2">
-            <objects>
-                <viewController storyboardIdentifier="RAPDFViewController" title="RAPDFViewController" useStoryboardIdentifierAsRestorationIdentifier="YES" id="y5K-7T-cJV" customClass="RAPDFViewController" sceneMemberID="viewController">
-                    <view key="view" contentMode="scaleToFill" id="0Ku-Fv-VPN">
-                        <rect key="frame" x="0.0" y="0.0" width="768" height="1024"/>
-                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                        <subviews>
-                            <wkWebView contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="YSI-FK-HZB">
-                                <rect key="frame" x="0.0" y="0.0" width="768" height="1024"/>
-                                <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
-                                <wkWebViewConfiguration key="configuration">
-                                    <audiovisualMediaTypes key="mediaTypesRequiringUserActionForPlayback" none="YES"/>
-                                    <wkPreferences key="preferences"/>
-                                </wkWebViewConfiguration>
-                            </wkWebView>
-                            <activityIndicatorView opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" hidesWhenStopped="YES" animating="YES" style="whiteLarge" translatesAutoresizingMaskIntoConstraints="NO" id="kYq-Oz-pR4">
-                                <rect key="frame" x="365.5" y="493.5" width="37" height="37"/>
-                                <color key="color" red="0.0" green="0.47843137250000001" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                            </activityIndicatorView>
-                        </subviews>
-                        <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                        <constraints>
-                            <constraint firstItem="YSI-FK-HZB" firstAttribute="leading" secondItem="IVC-fF-tZJ" secondAttribute="leading" id="1ru-Q1-MDc"/>
-                            <constraint firstItem="kYq-Oz-pR4" firstAttribute="centerX" secondItem="IVC-fF-tZJ" secondAttribute="centerX" id="5iv-lu-RQ1"/>
-                            <constraint firstItem="kYq-Oz-pR4" firstAttribute="centerY" secondItem="0Ku-Fv-VPN" secondAttribute="centerY" id="BKL-fN-z3I"/>
-                            <constraint firstItem="kYq-Oz-pR4" firstAttribute="centerY" secondItem="0Ku-Fv-VPN" secondAttribute="centerY" id="GwA-MB-gv0"/>
-                            <constraint firstItem="YSI-FK-HZB" firstAttribute="top" secondItem="IVC-fF-tZJ" secondAttribute="top" id="Izq-Db-k2C"/>
-                            <constraint firstItem="IVC-fF-tZJ" firstAttribute="trailing" secondItem="YSI-FK-HZB" secondAttribute="trailing" id="dxL-q6-xBj"/>
-                            <constraint firstItem="kYq-Oz-pR4" firstAttribute="centerX" secondItem="0Ku-Fv-VPN" secondAttribute="centerX" id="rsp-B4-pu4"/>
-                            <constraint firstAttribute="bottom" secondItem="YSI-FK-HZB" secondAttribute="bottom" id="uPL-gL-N8D"/>
-                        </constraints>
-                        <viewLayoutGuide key="safeArea" id="IVC-fF-tZJ"/>
-                    </view>
-                    <navigationItem key="navigationItem" title="Documents" id="Gef-Ww-2lb">
-                        <rightBarButtonItems>
-                            <barButtonItem image="share" id="Rc2-xs-KI3" userLabel="share">
-                                <color key="tintColor" red="0.59999999999999998" green="0.40000000000000002" blue="0.20000000000000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                                <connections>
-                                    <action selector="onActionClick:" destination="y5K-7T-cJV" id="O7q-gL-Jdc"/>
-                                </connections>
-                            </barButtonItem>
-                            <barButtonItem image="mail" id="Yel-O6-Xlk" userLabel="mail">
-                                <color key="tintColor" red="0.59999999999999998" green="0.40000000000000002" blue="0.20000000000000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                                <connections>
-                                    <action selector="onEmailClick:" destination="y5K-7T-cJV" id="poq-Nz-5ZL"/>
-                                </connections>
-                            </barButtonItem>
-                            <barButtonItem image="save" id="bK1-pC-N34" userLabel="save">
-                                <color key="tintColor" red="0.59999999999999998" green="0.40000000000000002" blue="0.20000000000000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                                <connections>
-                                    <action selector="onSaveClick:" destination="y5K-7T-cJV" id="bQv-0i-9IU"/>
-                                </connections>
-                            </barButtonItem>
-                        </rightBarButtonItems>
-                    </navigationItem>
-                    <connections>
-                        <outlet property="BB_action" destination="Rc2-xs-KI3" id="p5i-FC-Iik"/>
-                        <outlet property="mum" destination="kYq-Oz-pR4" id="CVN-pV-Qr1"/>
-                        <outlet property="wkWebview" destination="YSI-FK-HZB" id="HQh-wD-ADb"/>
-                    </connections>
-                </viewController>
-                <placeholder placeholderIdentifier="IBFirstResponder" id="OMm-eM-x2x" userLabel="First Responder" sceneMemberID="firstResponder"/>
-            </objects>
-            <point key="canvasLocation" x="-1006.25" y="-2534.1796875"/>
-        </scene>
-        <!--WebViewController-->
-        <scene sceneID="Kbk-pP-gLb">
-            <objects>
-                <viewController storyboardIdentifier="WebViewController" title="WebViewController" useStoryboardIdentifierAsRestorationIdentifier="YES" id="6LS-Kb-FGx" customClass="WebViewController" sceneMemberID="viewController">
-                    <view key="view" contentMode="scaleToFill" id="a17-LY-Bog">
-                        <rect key="frame" x="0.0" y="0.0" width="768" height="1024"/>
-                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                        <subviews>
-                            <wkWebView contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="gRf-La-v7x">
-                                <rect key="frame" x="0.0" y="0.0" width="768" height="1024"/>
-                                <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
-                                <wkWebViewConfiguration key="configuration">
-                                    <audiovisualMediaTypes key="mediaTypesRequiringUserActionForPlayback" none="YES"/>
-                                    <wkPreferences key="preferences"/>
-                                </wkWebViewConfiguration>
-                            </wkWebView>
-                            <activityIndicatorView opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" hidesWhenStopped="YES" animating="YES" style="whiteLarge" translatesAutoresizingMaskIntoConstraints="NO" id="7tq-EL-ecM">
-                                <rect key="frame" x="365.5" y="493.5" width="37" height="37"/>
-                                <color key="color" red="0.0" green="0.47843137250000001" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                            </activityIndicatorView>
-                        </subviews>
-                        <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                        <constraints>
-                            <constraint firstItem="7tq-EL-ecM" firstAttribute="centerY" secondItem="a17-LY-Bog" secondAttribute="centerY" id="1kU-IR-O6f"/>
-                            <constraint firstItem="gRf-La-v7x" firstAttribute="leading" secondItem="hdg-bJ-w9i" secondAttribute="leading" id="ZEJ-II-xr4"/>
-                            <constraint firstAttribute="bottom" secondItem="gRf-La-v7x" secondAttribute="bottom" id="cXh-8k-Mld"/>
-                            <constraint firstItem="hdg-bJ-w9i" firstAttribute="trailing" secondItem="gRf-La-v7x" secondAttribute="trailing" id="unW-pn-25f"/>
-                            <constraint firstItem="gRf-La-v7x" firstAttribute="top" secondItem="hdg-bJ-w9i" secondAttribute="top" id="vVh-de-JPL"/>
-                            <constraint firstItem="7tq-EL-ecM" firstAttribute="centerX" secondItem="a17-LY-Bog" secondAttribute="centerX" id="yyE-IW-vt5"/>
-                        </constraints>
-                        <viewLayoutGuide key="safeArea" id="hdg-bJ-w9i"/>
-                    </view>
-                    <navigationItem key="navigationItem" title="Documents" id="o2z-NN-7Ie"/>
-                    <connections>
-                        <outlet property="mum" destination="7tq-EL-ecM" id="cqW-fy-Cab"/>
-                        <outlet property="wkWebview" destination="gRf-La-v7x" id="knq-vc-KGy"/>
-                    </connections>
-                </viewController>
-                <placeholder placeholderIdentifier="IBFirstResponder" id="wr0-qf-KTU" userLabel="First Responder" sceneMemberID="firstResponder"/>
-            </objects>
-            <point key="canvasLocation" x="-1664.0625" y="-2534.1796875"/>
-        </scene>
         <!--Cache-->
         <scene sceneID="1T2-gR-ILK">
             <objects>
@@ -1911,23 +1803,20 @@ Email: redantsupport@united-us.net</string>
         <image name="btn_retrieve" width="102" height="30"/>
         <image name="btn_signin" width="100" height="30"/>
         <image name="camera" width="48" height="48"/>
-        <image name="cart_empty" width="96" height="96"/>
+        <image name="cart_empty" width="72" height="72"/>
         <image name="category" width="96" height="96"/>
         <image name="check_1_24" width="24" height="24"/>
         <image name="checkbox" width="16" height="16"/>
-        <image name="close" width="40" height="40"/>
+        <image name="close" width="32" height="32"/>
         <image name="contact" width="72" height="72"/>
-        <image name="mail" width="40" height="40"/>
         <image name="menu_open" width="36" height="36"/>
         <image name="npd_logo" width="110" height="13"/>
         <image name="order" width="72" height="72"/>
         <image name="pick_bg" width="280" height="280"/>
         <image name="profle" width="64" height="64"/>
         <image name="red_ant_logo" width="72" height="72"/>
-        <image name="save" width="40" height="40"/>
         <image name="scan" width="72" height="72"/>
         <image name="search" width="72" height="72"/>
-        <image name="share" width="40" height="40"/>
         <image name="upload" width="48" height="48"/>
         <image name="wishlist" width="72" height="72"/>
     </resources>

+ 57 - 0
RedAnt ERP Mobile/iSales-NPD/Launch Screen.storyboard

@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="15705" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
+    <device id="ipad9_7" orientation="portrait" layout="fullscreen" appearance="light"/>
+    <dependencies>
+        <deployment identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15706"/>
+        <capability name="Safe area layout guides" minToolsVersion="9.0"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
+    </dependencies>
+    <scenes>
+        <!--View Controller-->
+        <scene sceneID="EHf-IW-A2E">
+            <objects>
+                <viewController id="01J-lp-oVM" sceneMemberID="viewController">
+                    <view key="view" contentMode="scaleToFill" id="Ze5-6b-2t3">
+                        <rect key="frame" x="0.0" y="0.0" width="768" height="1024"/>
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <subviews>
+                            <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Copyright © 2020 United Software Applications, Inc. All rights reserved." textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="9" translatesAutoresizingMaskIntoConstraints="NO" id="obG-Y5-kRd">
+                                <rect key="frame" x="0.0" y="983.5" width="768" height="20.5"/>
+                                <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                                <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                <nil key="highlightedColor"/>
+                            </label>
+                            <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="NPD Mobile" textAlignment="center" lineBreakMode="middleTruncation" baselineAdjustment="alignBaselines" minimumFontSize="18" translatesAutoresizingMaskIntoConstraints="NO" id="GJd-Yh-RWb">
+                                <rect key="frame" x="0.0" y="321" width="768" height="43"/>
+                                <fontDescription key="fontDescription" type="boldSystem" pointSize="36"/>
+                                <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                <nil key="highlightedColor"/>
+                            </label>
+                            <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="npd_logo" translatesAutoresizingMaskIntoConstraints="NO" id="HyN-gl-EIp">
+                                <rect key="frame" x="329" y="276" width="110" height="13"/>
+                            </imageView>
+                        </subviews>
+                        <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                        <constraints>
+                            <constraint firstItem="HyN-gl-EIp" firstAttribute="centerX" secondItem="Ze5-6b-2t3" secondAttribute="centerX" id="1tN-h8-Mew"/>
+                            <constraint firstItem="Bcu-3y-fUS" firstAttribute="centerX" secondItem="obG-Y5-kRd" secondAttribute="centerX" id="5cz-MP-9tL"/>
+                            <constraint firstItem="GJd-Yh-RWb" firstAttribute="top" secondItem="HyN-gl-EIp" secondAttribute="bottom" constant="32" id="DGn-OM-M7T"/>
+                            <constraint firstItem="Bcu-3y-fUS" firstAttribute="centerX" secondItem="GJd-Yh-RWb" secondAttribute="centerX" id="Q3B-4B-g5h"/>
+                            <constraint firstItem="obG-Y5-kRd" firstAttribute="leading" secondItem="Bcu-3y-fUS" secondAttribute="leading" symbolic="YES" id="SfN-ll-jLj"/>
+                            <constraint firstAttribute="bottom" secondItem="obG-Y5-kRd" secondAttribute="bottom" constant="20" id="Y44-ml-fuU"/>
+                            <constraint firstItem="GJd-Yh-RWb" firstAttribute="centerY" secondItem="Ze5-6b-2t3" secondAttribute="bottom" multiplier="1/3" constant="1" id="moa-c2-u7t"/>
+                            <constraint firstItem="GJd-Yh-RWb" firstAttribute="leading" secondItem="Bcu-3y-fUS" secondAttribute="leading" symbolic="YES" id="x7j-FC-K8j"/>
+                        </constraints>
+                        <viewLayoutGuide key="safeArea" id="Bcu-3y-fUS"/>
+                    </view>
+                </viewController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="iYj-Kq-Ea1" userLabel="First Responder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="52.34375" y="375"/>
+        </scene>
+    </scenes>
+    <resources>
+        <image name="npd_logo" width="110" height="13"/>
+    </resources>
+</document>

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

@@ -17,11 +17,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.95</string>
+	<string>$(MARKETING_VERSION)</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>180724</string>
+	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSRequiresIPhoneOS</key>

+ 18 - 12
RedAnt ERP Mobile/iSales-TRADESHOW.xcodeproj/project.pbxproj

@@ -28,6 +28,9 @@
 		3C68319623960D7800AD5BD7 /* ERP_Mobile_Contact.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 3C68318F23960D7700AD5BD7 /* ERP_Mobile_Contact.storyboard */; };
 		3C68319A23960E2000AD5BD7 /* ytplayer.html in Resources */ = {isa = PBXBuildFile; fileRef = 3C68319723960E2000AD5BD7 /* ytplayer.html */; };
 		3C68319B23960E2000AD5BD7 /* RAYTPlayer.m in Sources */ = {isa = PBXBuildFile; fileRef = 3C68319823960E2000AD5BD7 /* RAYTPlayer.m */; };
+		3C69618A23C718150075172A /* RAPDFViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 3C69618523C718140075172A /* RAPDFViewController.m */; };
+		3C69618B23C718150075172A /* WebViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 3C69618623C718140075172A /* WebViewController.m */; };
+		3C69618C23C718150075172A /* wkweb.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 3C69618923C718150075172A /* wkweb.storyboard */; };
 		3C7E5A84237BDAA6006D0105 /* PortfolioListViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 3C7E5A83237BDAA6006D0105 /* PortfolioListViewController.m */; };
 		423CC86D21D22F40008BD2C4 /* Launch Screen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 423CC86C21D22F40008BD2C4 /* Launch Screen.storyboard */; };
 		424A02D11FFB3A0B0088DC56 /* RABackOrderSubmitAlertController.m in Sources */ = {isa = PBXBuildFile; fileRef = 424A02D01FFB3A0B0088DC56 /* RABackOrderSubmitAlertController.m */; };
@@ -152,8 +155,6 @@
 		7161FEB51D61B24900157EE1 /* creditcardpayment.html in Resources */ = {isa = PBXBuildFile; fileRef = 7161FEB21D61B24900157EE1 /* creditcardpayment.html */; };
 		7161FEB61D61B24900157EE1 /* normalpayment.html in Resources */ = {isa = PBXBuildFile; fileRef = 7161FEB31D61B24900157EE1 /* normalpayment.html */; };
 		7161FEB71D61B24900157EE1 /* orderinfo.html in Resources */ = {isa = PBXBuildFile; fileRef = 7161FEB41D61B24900157EE1 /* orderinfo.html */; };
-		7162A4FE1C585FFB00AB630E /* RAPDFViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 7162A4FB1C585FFB00AB630E /* RAPDFViewController.m */; };
-		7162A4FF1C585FFB00AB630E /* WebViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 7162A4FD1C585FFB00AB630E /* WebViewController.m */; };
 		7162A5021C586F5B00AB630E /* AddressEditorViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 7162A5011C586F5B00AB630E /* AddressEditorViewController.m */; };
 		7162A5091C586FC100AB630E /* CycleScrollView.m in Sources */ = {isa = PBXBuildFile; fileRef = 7162A5041C586FC100AB630E /* CycleScrollView.m */; };
 		7162A50A1C586FC100AB630E /* NSTimer+Addition.m in Sources */ = {isa = PBXBuildFile; fileRef = 7162A5061C586FC100AB630E /* NSTimer+Addition.m */; };
@@ -330,6 +331,11 @@
 		3C68319723960E2000AD5BD7 /* ytplayer.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; name = ytplayer.html; path = ../../common/Youtube/ytplayer.html; sourceTree = "<group>"; };
 		3C68319823960E2000AD5BD7 /* RAYTPlayer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = RAYTPlayer.m; path = ../../common/Youtube/RAYTPlayer.m; sourceTree = "<group>"; };
 		3C68319923960E2000AD5BD7 /* RAYTPlayer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RAYTPlayer.h; path = ../../common/Youtube/RAYTPlayer.h; sourceTree = "<group>"; };
+		3C69618523C718140075172A /* RAPDFViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = RAPDFViewController.m; path = "../../common/WK PDF+Web/RAPDFViewController.m"; sourceTree = "<group>"; };
+		3C69618623C718140075172A /* WebViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = WebViewController.m; path = "../../common/WK PDF+Web/WebViewController.m"; sourceTree = "<group>"; };
+		3C69618723C718140075172A /* WebViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WebViewController.h; path = "../../common/WK PDF+Web/WebViewController.h"; sourceTree = "<group>"; };
+		3C69618823C718150075172A /* RAPDFViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RAPDFViewController.h; path = "../../common/WK PDF+Web/RAPDFViewController.h"; sourceTree = "<group>"; };
+		3C69618923C718150075172A /* wkweb.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = wkweb.storyboard; path = "../../common/WK PDF+Web/wkweb.storyboard"; sourceTree = "<group>"; };
 		3C7E5A82237BDAA6006D0105 /* PortfolioListViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PortfolioListViewController.h; path = common/Functions/portfolio/PortfolioListViewController.h; sourceTree = SOURCE_ROOT; };
 		3C7E5A83237BDAA6006D0105 /* PortfolioListViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = PortfolioListViewController.m; path = common/Functions/portfolio/PortfolioListViewController.m; sourceTree = SOURCE_ROOT; };
 		423CC86C21D22F40008BD2C4 /* Launch Screen.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = "Launch Screen.storyboard"; sourceTree = SOURCE_ROOT; };
@@ -545,10 +551,6 @@
 		7161FEB21D61B24900157EE1 /* creditcardpayment.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; name = creditcardpayment.html; path = common/Functions/offline/creditcardpayment.html; sourceTree = SOURCE_ROOT; };
 		7161FEB31D61B24900157EE1 /* normalpayment.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; name = normalpayment.html; path = common/Functions/offline/normalpayment.html; sourceTree = SOURCE_ROOT; };
 		7161FEB41D61B24900157EE1 /* orderinfo.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; name = orderinfo.html; path = common/Functions/offline/orderinfo.html; sourceTree = SOURCE_ROOT; };
-		7162A4FA1C585FFB00AB630E /* RAPDFViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RAPDFViewController.h; path = "common/Functions/PDF+Web/RAPDFViewController.h"; sourceTree = SOURCE_ROOT; };
-		7162A4FB1C585FFB00AB630E /* RAPDFViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = RAPDFViewController.m; path = "common/Functions/PDF+Web/RAPDFViewController.m"; sourceTree = SOURCE_ROOT; };
-		7162A4FC1C585FFB00AB630E /* WebViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WebViewController.h; path = "common/Functions/PDF+Web/WebViewController.h"; sourceTree = SOURCE_ROOT; };
-		7162A4FD1C585FFB00AB630E /* WebViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = WebViewController.m; path = "common/Functions/PDF+Web/WebViewController.m"; sourceTree = SOURCE_ROOT; };
 		7162A5001C586F5B00AB630E /* AddressEditorViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AddressEditorViewController.h; path = common/Functions/address/AddressEditorViewController.h; sourceTree = SOURCE_ROOT; };
 		7162A5011C586F5B00AB630E /* AddressEditorViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AddressEditorViewController.m; path = common/Functions/address/AddressEditorViewController.m; sourceTree = SOURCE_ROOT; };
 		7162A5031C586FC100AB630E /* CycleScrollView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CycleScrollView.h; path = common/AutoScrollImage/CycleScrollView.h; sourceTree = SOURCE_ROOT; };
@@ -1715,10 +1717,11 @@
 		7190F1091BBBCAF100B2F243 /* PDF+Web */ = {
 			isa = PBXGroup;
 			children = (
-				7162A4FA1C585FFB00AB630E /* RAPDFViewController.h */,
-				7162A4FB1C585FFB00AB630E /* RAPDFViewController.m */,
-				7162A4FC1C585FFB00AB630E /* WebViewController.h */,
-				7162A4FD1C585FFB00AB630E /* WebViewController.m */,
+				3C69618823C718150075172A /* RAPDFViewController.h */,
+				3C69618523C718140075172A /* RAPDFViewController.m */,
+				3C69618723C718140075172A /* WebViewController.h */,
+				3C69618623C718140075172A /* WebViewController.m */,
+				3C69618923C718150075172A /* wkweb.storyboard */,
 			);
 			name = "PDF+Web";
 			sourceTree = "<group>";
@@ -2087,6 +2090,7 @@
 				3C68318823960D6900AD5BD7 /* iPadCommonEditorCellImg.xib in Resources */,
 				423CC86D21D22F40008BD2C4 /* Launch Screen.storyboard in Resources */,
 				7143E220202FD28900451903 /* TearSheet.json in Resources */,
+				3C69618C23C718150075172A /* wkweb.storyboard in Resources */,
 				71DF74961C57614C00F2789C /* PhotoBorder@2x.png in Resources */,
 				3C68319323960D7800AD5BD7 /* ERP_Mobile_Cart.storyboard in Resources */,
 				7143E226202FD2CA00451903 /* so_thumb.json in Resources */,
@@ -2115,6 +2119,7 @@
 			files = (
 				7141DD531C57459B00F7DF59 /* qrspec.c in Sources */,
 				71BF07081D2F3D2800981938 /* SyncControlPanelViewController.m in Sources */,
+				3C69618B23C718150075172A /* WebViewController.m in Sources */,
 				4289802D1E2492D2005F1BD8 /* PriceSettingViewController.m in Sources */,
 				71FFBBEA1C60894900D91DC2 /* RANetwork.m in Sources */,
 				428980161E24924D005F1BD8 /* SortItemCell.m in Sources */,
@@ -2288,7 +2293,6 @@
 				7162A51A1C58704600AB630E /* ModelItemCell.m in Sources */,
 				7141DD511C57459B00F7DF59 /* qrencode.c in Sources */,
 				7162A5451C58719D00AB630E /* RATreeView.m in Sources */,
-				7162A4FE1C585FFB00AB630E /* RAPDFViewController.m in Sources */,
 				71DF74841C57608F00F2789C /* ImageScrollerViewController.m in Sources */,
 				3C7E5A84237BDAA6006D0105 /* PortfolioListViewController.m in Sources */,
 				71DF74861C57608F00F2789C /* ImageViewController.m in Sources */,
@@ -2298,7 +2302,6 @@
 				71DF74611C575E7900F2789C /* CommonEditorCellModel.m in Sources */,
 				71DF74341C5757DA00F2789C /* ActiveViewController.m in Sources */,
 				7162A5431C58719D00AB630E /* RATreeNodeInfo.m in Sources */,
-				7162A4FF1C585FFB00AB630E /* WebViewController.m in Sources */,
 				71FFBBE91C60894900D91DC2 /* iSalesDB.m in Sources */,
 				7162A55B1C58724700AB630E /* ContactAdvanceSearchViewController.m in Sources */,
 				7162A5441C58719D00AB630E /* RATreeNodeInfo+Private.m in Sources */,
@@ -2319,6 +2322,7 @@
 				71DF745F1C575E7900F2789C /* CommonEditorCellLabel.m in Sources */,
 				7141DD3C1C5726B700F7DF59 /* ScanApiHelper.mm in Sources */,
 				7162A5261C58706C00AB630E /* CategoryViewController.m in Sources */,
+				3C69618A23C718150075172A /* RAPDFViewController.m in Sources */,
 				7162A50A1C586FC100AB630E /* NSTimer+Addition.m in Sources */,
 				71DF745E1C575E7900F2789C /* CommonEditorCellImg.m in Sources */,
 				712AFED91DBA050200254965 /* GroupDrawable.m in Sources */,
@@ -2474,6 +2478,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
+				CURRENT_PROJECT_VERSION = 200114;
 				DEVELOPMENT_TEAM = HXWLAA5YN5;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
@@ -2516,6 +2521,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
+				CURRENT_PROJECT_VERSION = 200114;
 				DEVELOPMENT_TEAM = HXWLAA5YN5;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",

+ 3 - 3
RedAnt ERP Mobile/iSales-TRADESHOW/iSales-TRADESHOW-Info.plist

@@ -21,7 +21,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>190722</string>
+	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSRequiresIPhoneOS</key>
@@ -52,8 +52,6 @@
 	</array>
 	<key>UIRequiresFullScreen</key>
 	<true/>
-	<key>UIUserInterfaceStyle</key>
-	<string>Light</string>
 	<key>UISupportedInterfaceOrientations~ipad</key>
 	<array>
 		<string>UIInterfaceOrientationPortrait</string>
@@ -61,5 +59,7 @@
 		<string>UIInterfaceOrientationLandscapeLeft</string>
 		<string>UIInterfaceOrientationLandscapeRight</string>
 	</array>
+	<key>UIUserInterfaceStyle</key>
+	<string>Light</string>
 </dict>
 </plist>

+ 18 - 14
RedAnt ERP Mobile/iSales-UNITED WAVER.xcodeproj/project.pbxproj

@@ -20,6 +20,9 @@
 		3C9BED082373FED40052241C /* iPadCommonEditorCellSignature.xib in Resources */ = {isa = PBXBuildFile; fileRef = 3C9BED072373FED40052241C /* iPadCommonEditorCellSignature.xib */; };
 		3C9BED0A2373FF1B0052241C /* iPadCommonEditorCellSwitch.xib in Resources */ = {isa = PBXBuildFile; fileRef = 3C9BED092373FF1B0052241C /* iPadCommonEditorCellSwitch.xib */; };
 		3C9BED0C2373FF550052241C /* iPadCommonEditorCellImg.xib in Resources */ = {isa = PBXBuildFile; fileRef = 3C9BED0B2373FF550052241C /* iPadCommonEditorCellImg.xib */; };
+		3CC7E75423C4133A00BE5561 /* RAPDFViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 3CC7E75023C4133900BE5561 /* RAPDFViewController.m */; };
+		3CC7E75523C4133A00BE5561 /* WebViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 3CC7E75123C4133900BE5561 /* WebViewController.m */; };
+		3CC7E75623C4133A00BE5561 /* wkweb.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 3CC7E75223C4133A00BE5561 /* wkweb.storyboard */; };
 		3CD8ACE32373F0D200230A30 /* iPadCommonEditorCellModel.xib in Resources */ = {isa = PBXBuildFile; fileRef = 3CD8ACE22373F0D200230A30 /* iPadCommonEditorCellModel.xib */; };
 		3CD8ACE52373F1F400230A30 /* iPadCommonEditorCellAction.xib in Resources */ = {isa = PBXBuildFile; fileRef = 3CD8ACE42373F1F400230A30 /* iPadCommonEditorCellAction.xib */; };
 		3CD8ACE72373F2A500230A30 /* iPadCommonEditorCellMAction.xib in Resources */ = {isa = PBXBuildFile; fileRef = 3CD8ACE62373F2A500230A30 /* iPadCommonEditorCellMAction.xib */; };
@@ -154,8 +157,6 @@
 		7161FEB51D61B24900157EE1 /* creditcardpayment.html in Resources */ = {isa = PBXBuildFile; fileRef = 7161FEB21D61B24900157EE1 /* creditcardpayment.html */; };
 		7161FEB61D61B24900157EE1 /* normalpayment.html in Resources */ = {isa = PBXBuildFile; fileRef = 7161FEB31D61B24900157EE1 /* normalpayment.html */; };
 		7161FEB71D61B24900157EE1 /* orderinfo.html in Resources */ = {isa = PBXBuildFile; fileRef = 7161FEB41D61B24900157EE1 /* orderinfo.html */; };
-		7162A4FE1C585FFB00AB630E /* RAPDFViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 7162A4FB1C585FFB00AB630E /* RAPDFViewController.m */; };
-		7162A4FF1C585FFB00AB630E /* WebViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 7162A4FD1C585FFB00AB630E /* WebViewController.m */; };
 		7162A5021C586F5B00AB630E /* AddressEditorViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 7162A5011C586F5B00AB630E /* AddressEditorViewController.m */; };
 		7162A5091C586FC100AB630E /* CycleScrollView.m in Sources */ = {isa = PBXBuildFile; fileRef = 7162A5041C586FC100AB630E /* CycleScrollView.m */; };
 		7162A50A1C586FC100AB630E /* NSTimer+Addition.m in Sources */ = {isa = PBXBuildFile; fileRef = 7162A5061C586FC100AB630E /* NSTimer+Addition.m */; };
@@ -325,6 +326,11 @@
 		3C9BED072373FED40052241C /* iPadCommonEditorCellSignature.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = iPadCommonEditorCellSignature.xib; path = ../../common/customUI/CommonEditoriPad/iPadCommonEditorCellSignature.xib; sourceTree = "<group>"; };
 		3C9BED092373FF1B0052241C /* iPadCommonEditorCellSwitch.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = iPadCommonEditorCellSwitch.xib; path = ../../common/customUI/CommonEditoriPad/iPadCommonEditorCellSwitch.xib; sourceTree = "<group>"; };
 		3C9BED0B2373FF550052241C /* iPadCommonEditorCellImg.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = iPadCommonEditorCellImg.xib; path = ../../common/customUI/CommonEditoriPad/iPadCommonEditorCellImg.xib; sourceTree = "<group>"; };
+		3CC7E74F23C4133900BE5561 /* RAPDFViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RAPDFViewController.h; path = "../../common/WK PDF+Web/RAPDFViewController.h"; sourceTree = "<group>"; };
+		3CC7E75023C4133900BE5561 /* RAPDFViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = RAPDFViewController.m; path = "../../common/WK PDF+Web/RAPDFViewController.m"; sourceTree = "<group>"; };
+		3CC7E75123C4133900BE5561 /* WebViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = WebViewController.m; path = "../../common/WK PDF+Web/WebViewController.m"; sourceTree = "<group>"; };
+		3CC7E75223C4133A00BE5561 /* wkweb.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = wkweb.storyboard; path = "../../common/WK PDF+Web/wkweb.storyboard"; sourceTree = "<group>"; };
+		3CC7E75323C4133A00BE5561 /* WebViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WebViewController.h; path = "../../common/WK PDF+Web/WebViewController.h"; sourceTree = "<group>"; };
 		3CD8ACE22373F0D200230A30 /* iPadCommonEditorCellModel.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = iPadCommonEditorCellModel.xib; path = ../../common/customUI/CommonEditoriPad/iPadCommonEditorCellModel.xib; sourceTree = "<group>"; };
 		3CD8ACE42373F1F400230A30 /* iPadCommonEditorCellAction.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = iPadCommonEditorCellAction.xib; path = ../../common/customUI/CommonEditoriPad/iPadCommonEditorCellAction.xib; sourceTree = "<group>"; };
 		3CD8ACE62373F2A500230A30 /* iPadCommonEditorCellMAction.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = iPadCommonEditorCellMAction.xib; path = ../../common/customUI/CommonEditoriPad/iPadCommonEditorCellMAction.xib; sourceTree = "<group>"; };
@@ -553,10 +559,6 @@
 		7161FEB21D61B24900157EE1 /* creditcardpayment.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; name = creditcardpayment.html; path = common/Functions/offline/creditcardpayment.html; sourceTree = SOURCE_ROOT; };
 		7161FEB31D61B24900157EE1 /* normalpayment.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; name = normalpayment.html; path = common/Functions/offline/normalpayment.html; sourceTree = SOURCE_ROOT; };
 		7161FEB41D61B24900157EE1 /* orderinfo.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; name = orderinfo.html; path = common/Functions/offline/orderinfo.html; sourceTree = SOURCE_ROOT; };
-		7162A4FA1C585FFB00AB630E /* RAPDFViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RAPDFViewController.h; path = "common/Functions/PDF+Web/RAPDFViewController.h"; sourceTree = SOURCE_ROOT; };
-		7162A4FB1C585FFB00AB630E /* RAPDFViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = RAPDFViewController.m; path = "common/Functions/PDF+Web/RAPDFViewController.m"; sourceTree = SOURCE_ROOT; };
-		7162A4FC1C585FFB00AB630E /* WebViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WebViewController.h; path = "common/Functions/PDF+Web/WebViewController.h"; sourceTree = SOURCE_ROOT; };
-		7162A4FD1C585FFB00AB630E /* WebViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = WebViewController.m; path = "common/Functions/PDF+Web/WebViewController.m"; sourceTree = SOURCE_ROOT; };
 		7162A5001C586F5B00AB630E /* AddressEditorViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AddressEditorViewController.h; path = common/Functions/address/AddressEditorViewController.h; sourceTree = SOURCE_ROOT; };
 		7162A5011C586F5B00AB630E /* AddressEditorViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AddressEditorViewController.m; path = common/Functions/address/AddressEditorViewController.m; sourceTree = SOURCE_ROOT; };
 		7162A5031C586FC100AB630E /* CycleScrollView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CycleScrollView.h; path = common/AutoScrollImage/CycleScrollView.h; sourceTree = SOURCE_ROOT; };
@@ -1730,10 +1732,11 @@
 		7190F1091BBBCAF100B2F243 /* PDF+Web */ = {
 			isa = PBXGroup;
 			children = (
-				7162A4FA1C585FFB00AB630E /* RAPDFViewController.h */,
-				7162A4FB1C585FFB00AB630E /* RAPDFViewController.m */,
-				7162A4FC1C585FFB00AB630E /* WebViewController.h */,
-				7162A4FD1C585FFB00AB630E /* WebViewController.m */,
+				3CC7E74F23C4133900BE5561 /* RAPDFViewController.h */,
+				3CC7E75023C4133900BE5561 /* RAPDFViewController.m */,
+				3CC7E75323C4133A00BE5561 /* WebViewController.h */,
+				3CC7E75123C4133900BE5561 /* WebViewController.m */,
+				3CC7E75223C4133A00BE5561 /* wkweb.storyboard */,
 			);
 			name = "PDF+Web";
 			sourceTree = "<group>";
@@ -2079,6 +2082,7 @@
 				7161FEB71D61B24900157EE1 /* orderinfo.html in Resources */,
 				7143E221202FD28900451903 /* placeOrderTemplate.json in Resources */,
 				3C233195238244A6002BACE4 /* ERP_Mobile_Search.storyboard in Resources */,
+				3CC7E75623C4133A00BE5561 /* wkweb.storyboard in Resources */,
 				7161FEB51D61B24900157EE1 /* creditcardpayment.html in Resources */,
 				3CD8ACEF2373F3DC00230A30 /* iPadCommonEditorCellEnum.xib in Resources */,
 				42BEAB361FA1D23B0024D647 /* EnumSelectAndSort.storyboard in Resources */,
@@ -2305,10 +2309,10 @@
 				428980171E24924D005F1BD8 /* SortItemViewController.m in Sources */,
 				42D3A4A11EFA6D36007A54C1 /* ContentPreviewController.m in Sources */,
 				7162A5711C58728D00AB630E /* DetailImageCell.m in Sources */,
+				3CC7E75523C4133A00BE5561 /* WebViewController.m in Sources */,
 				7162A51A1C58704600AB630E /* ModelItemCell.m in Sources */,
 				7141DD511C57459B00F7DF59 /* qrencode.c in Sources */,
 				7162A5451C58719D00AB630E /* RATreeView.m in Sources */,
-				7162A4FE1C585FFB00AB630E /* RAPDFViewController.m in Sources */,
 				71DF74841C57608F00F2789C /* ImageScrollerViewController.m in Sources */,
 				71DF74861C57608F00F2789C /* ImageViewController.m in Sources */,
 				7162A5821C5872EF00AB630E /* HomeTableViewCellButtonBanner.m in Sources */,
@@ -2317,7 +2321,6 @@
 				71DF74611C575E7900F2789C /* CommonEditorCellModel.m in Sources */,
 				71DF74341C5757DA00F2789C /* ActiveViewController.m in Sources */,
 				7162A5431C58719D00AB630E /* RATreeNodeInfo.m in Sources */,
-				7162A4FF1C585FFB00AB630E /* WebViewController.m in Sources */,
 				71FFBBE91C60894900D91DC2 /* iSalesDB.m in Sources */,
 				7162A55B1C58724700AB630E /* ContactAdvanceSearchViewController.m in Sources */,
 				7162A5441C58719D00AB630E /* RATreeNodeInfo+Private.m in Sources */,
@@ -2339,6 +2342,7 @@
 				71DF745F1C575E7900F2789C /* CommonEditorCellLabel.m in Sources */,
 				7141DD3C1C5726B700F7DF59 /* ScanApiHelper.mm in Sources */,
 				7162A5261C58706C00AB630E /* CategoryViewController.m in Sources */,
+				3CC7E75423C4133A00BE5561 /* RAPDFViewController.m in Sources */,
 				7162A50A1C586FC100AB630E /* NSTimer+Addition.m in Sources */,
 				71DF745E1C575E7900F2789C /* CommonEditorCellImg.m in Sources */,
 				712AFED91DBA050200254965 /* GroupDrawable.m in Sources */,
@@ -2495,7 +2499,7 @@
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 190933;
+				CURRENT_PROJECT_VERSION = 200107;
 				DEVELOPMENT_TEAM = HXWLAA5YN5;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
@@ -2540,7 +2544,7 @@
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 190933;
+				CURRENT_PROJECT_VERSION = 200107;
 				DEVELOPMENT_TEAM = HXWLAA5YN5;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",

+ 18 - 12
RedAnt ERP Mobile/iSales-USAI.xcodeproj/project.pbxproj

@@ -28,6 +28,9 @@
 		3C6831702396094200AD5BD7 /* iPadCommonEditorCellMAction.xib in Resources */ = {isa = PBXBuildFile; fileRef = 3C6831652396094200AD5BD7 /* iPadCommonEditorCellMAction.xib */; };
 		3C6831712396094200AD5BD7 /* iPadCommonEditorCellSignature.xib in Resources */ = {isa = PBXBuildFile; fileRef = 3C6831662396094200AD5BD7 /* iPadCommonEditorCellSignature.xib */; };
 		3C6831722396094200AD5BD7 /* iPadCommonEditorCellEdit.xib in Resources */ = {isa = PBXBuildFile; fileRef = 3C6831672396094200AD5BD7 /* iPadCommonEditorCellEdit.xib */; };
+		3C69618223C7156D0075172A /* RAPDFViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 3C69617E23C7156D0075172A /* RAPDFViewController.m */; };
+		3C69618323C7156D0075172A /* WebViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 3C69617F23C7156D0075172A /* WebViewController.m */; };
+		3C69618423C7156D0075172A /* wkweb.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 3C69618023C7156D0075172A /* wkweb.storyboard */; };
 		3C7E5A8E237BDB0C006D0105 /* PortfolioListViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 3C7E5A8C237BDB0C006D0105 /* PortfolioListViewController.m */; };
 		423CC87521D22FDE008BD2C4 /* Launch Screen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 423CC87421D22FDE008BD2C4 /* Launch Screen.storyboard */; };
 		424A02D11FFB3A0B0088DC56 /* RABackOrderSubmitAlertController.m in Sources */ = {isa = PBXBuildFile; fileRef = 424A02D01FFB3A0B0088DC56 /* RABackOrderSubmitAlertController.m */; };
@@ -155,8 +158,6 @@
 		7161FEB51D61B24900157EE1 /* creditcardpayment.html in Resources */ = {isa = PBXBuildFile; fileRef = 7161FEB21D61B24900157EE1 /* creditcardpayment.html */; };
 		7161FEB61D61B24900157EE1 /* normalpayment.html in Resources */ = {isa = PBXBuildFile; fileRef = 7161FEB31D61B24900157EE1 /* normalpayment.html */; };
 		7161FEB71D61B24900157EE1 /* orderinfo.html in Resources */ = {isa = PBXBuildFile; fileRef = 7161FEB41D61B24900157EE1 /* orderinfo.html */; };
-		7162A4FE1C585FFB00AB630E /* RAPDFViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 7162A4FB1C585FFB00AB630E /* RAPDFViewController.m */; };
-		7162A4FF1C585FFB00AB630E /* WebViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 7162A4FD1C585FFB00AB630E /* WebViewController.m */; };
 		7162A5021C586F5B00AB630E /* AddressEditorViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 7162A5011C586F5B00AB630E /* AddressEditorViewController.m */; };
 		7162A5091C586FC100AB630E /* CycleScrollView.m in Sources */ = {isa = PBXBuildFile; fileRef = 7162A5041C586FC100AB630E /* CycleScrollView.m */; };
 		7162A50A1C586FC100AB630E /* NSTimer+Addition.m in Sources */ = {isa = PBXBuildFile; fileRef = 7162A5061C586FC100AB630E /* NSTimer+Addition.m */; };
@@ -332,6 +333,11 @@
 		3C6831652396094200AD5BD7 /* iPadCommonEditorCellMAction.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = iPadCommonEditorCellMAction.xib; path = ../../common/customUI/CommonEditoriPad/iPadCommonEditorCellMAction.xib; sourceTree = "<group>"; };
 		3C6831662396094200AD5BD7 /* iPadCommonEditorCellSignature.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = iPadCommonEditorCellSignature.xib; path = ../../common/customUI/CommonEditoriPad/iPadCommonEditorCellSignature.xib; sourceTree = "<group>"; };
 		3C6831672396094200AD5BD7 /* iPadCommonEditorCellEdit.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = iPadCommonEditorCellEdit.xib; path = ../../common/customUI/CommonEditoriPad/iPadCommonEditorCellEdit.xib; sourceTree = "<group>"; };
+		3C69617D23C7156D0075172A /* RAPDFViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RAPDFViewController.h; path = "../../common/WK PDF+Web/RAPDFViewController.h"; sourceTree = "<group>"; };
+		3C69617E23C7156D0075172A /* RAPDFViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = RAPDFViewController.m; path = "../../common/WK PDF+Web/RAPDFViewController.m"; sourceTree = "<group>"; };
+		3C69617F23C7156D0075172A /* WebViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = WebViewController.m; path = "../../common/WK PDF+Web/WebViewController.m"; sourceTree = "<group>"; };
+		3C69618023C7156D0075172A /* wkweb.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = wkweb.storyboard; path = "../../common/WK PDF+Web/wkweb.storyboard"; sourceTree = "<group>"; };
+		3C69618123C7156D0075172A /* WebViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WebViewController.h; path = "../../common/WK PDF+Web/WebViewController.h"; sourceTree = "<group>"; };
 		3C7E5A8C237BDB0C006D0105 /* PortfolioListViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = PortfolioListViewController.m; path = common/Functions/portfolio/PortfolioListViewController.m; sourceTree = SOURCE_ROOT; };
 		3C7E5A8D237BDB0C006D0105 /* PortfolioListViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PortfolioListViewController.h; path = common/Functions/portfolio/PortfolioListViewController.h; sourceTree = SOURCE_ROOT; };
 		423CC87421D22FDE008BD2C4 /* Launch Screen.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = "Launch Screen.storyboard"; sourceTree = SOURCE_ROOT; };
@@ -552,10 +558,6 @@
 		7161FEB21D61B24900157EE1 /* creditcardpayment.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; name = creditcardpayment.html; path = common/Functions/offline/creditcardpayment.html; sourceTree = SOURCE_ROOT; };
 		7161FEB31D61B24900157EE1 /* normalpayment.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; name = normalpayment.html; path = common/Functions/offline/normalpayment.html; sourceTree = SOURCE_ROOT; };
 		7161FEB41D61B24900157EE1 /* orderinfo.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; name = orderinfo.html; path = common/Functions/offline/orderinfo.html; sourceTree = SOURCE_ROOT; };
-		7162A4FA1C585FFB00AB630E /* RAPDFViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RAPDFViewController.h; path = "common/Functions/PDF+Web/RAPDFViewController.h"; sourceTree = SOURCE_ROOT; };
-		7162A4FB1C585FFB00AB630E /* RAPDFViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = RAPDFViewController.m; path = "common/Functions/PDF+Web/RAPDFViewController.m"; sourceTree = SOURCE_ROOT; };
-		7162A4FC1C585FFB00AB630E /* WebViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WebViewController.h; path = "common/Functions/PDF+Web/WebViewController.h"; sourceTree = SOURCE_ROOT; };
-		7162A4FD1C585FFB00AB630E /* WebViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = WebViewController.m; path = "common/Functions/PDF+Web/WebViewController.m"; sourceTree = SOURCE_ROOT; };
 		7162A5001C586F5B00AB630E /* AddressEditorViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AddressEditorViewController.h; path = common/Functions/address/AddressEditorViewController.h; sourceTree = SOURCE_ROOT; };
 		7162A5011C586F5B00AB630E /* AddressEditorViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AddressEditorViewController.m; path = common/Functions/address/AddressEditorViewController.m; sourceTree = SOURCE_ROOT; };
 		7162A5031C586FC100AB630E /* CycleScrollView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CycleScrollView.h; path = common/AutoScrollImage/CycleScrollView.h; sourceTree = SOURCE_ROOT; };
@@ -1721,10 +1723,11 @@
 		7190F1091BBBCAF100B2F243 /* PDF+Web */ = {
 			isa = PBXGroup;
 			children = (
-				7162A4FA1C585FFB00AB630E /* RAPDFViewController.h */,
-				7162A4FB1C585FFB00AB630E /* RAPDFViewController.m */,
-				7162A4FC1C585FFB00AB630E /* WebViewController.h */,
-				7162A4FD1C585FFB00AB630E /* WebViewController.m */,
+				3C69617D23C7156D0075172A /* RAPDFViewController.h */,
+				3C69617E23C7156D0075172A /* RAPDFViewController.m */,
+				3C69618123C7156D0075172A /* WebViewController.h */,
+				3C69617F23C7156D0075172A /* WebViewController.m */,
+				3C69618023C7156D0075172A /* wkweb.storyboard */,
 			);
 			name = "PDF+Web";
 			sourceTree = "<group>";
@@ -2070,6 +2073,7 @@
 				71D30A211CFBEDC6006F9477 /* default_appearance.json in Resources */,
 				3C68315A2396082800AD5BD7 /* ERP_Mobile_Contact.storyboard in Resources */,
 				7161FEB71D61B24900157EE1 /* orderinfo.html in Resources */,
+				3C69618423C7156D0075172A /* wkweb.storyboard in Resources */,
 				3C68316D2396094200AD5BD7 /* iPadCommonEditorCellTextView.xib in Resources */,
 				3C68315C2396082800AD5BD7 /* ERP_Mobile_Portfolio.storyboard in Resources */,
 				7143E221202FD28900451903 /* placeOrderTemplate.json in Resources */,
@@ -2123,6 +2127,7 @@
 			buildActionMask = 2147483647;
 			files = (
 				7141DD531C57459B00F7DF59 /* qrspec.c in Sources */,
+				3C69618323C7156D0075172A /* WebViewController.m in Sources */,
 				71BF07081D2F3D2800981938 /* SyncControlPanelViewController.m in Sources */,
 				4289802D1E2492D2005F1BD8 /* PriceSettingViewController.m in Sources */,
 				714036F921646B8C0029B10F /* AppDelegateBase.m in Sources */,
@@ -2299,7 +2304,6 @@
 				7162A51A1C58704600AB630E /* ModelItemCell.m in Sources */,
 				7141DD511C57459B00F7DF59 /* qrencode.c in Sources */,
 				7162A5451C58719D00AB630E /* RATreeView.m in Sources */,
-				7162A4FE1C585FFB00AB630E /* RAPDFViewController.m in Sources */,
 				71DF74841C57608F00F2789C /* ImageScrollerViewController.m in Sources */,
 				71DF74861C57608F00F2789C /* ImageViewController.m in Sources */,
 				7162A5821C5872EF00AB630E /* HomeTableViewCellButtonBanner.m in Sources */,
@@ -2308,7 +2312,6 @@
 				71DF74611C575E7900F2789C /* CommonEditorCellModel.m in Sources */,
 				71DF74341C5757DA00F2789C /* ActiveViewController.m in Sources */,
 				7162A5431C58719D00AB630E /* RATreeNodeInfo.m in Sources */,
-				7162A4FF1C585FFB00AB630E /* WebViewController.m in Sources */,
 				71FFBBE91C60894900D91DC2 /* iSalesDB.m in Sources */,
 				7162A55B1C58724700AB630E /* ContactAdvanceSearchViewController.m in Sources */,
 				7162A5441C58719D00AB630E /* RATreeNodeInfo+Private.m in Sources */,
@@ -2321,6 +2324,7 @@
 				7162A5DA1C5876E300AB630E /* AboutViewController.m in Sources */,
 				7141DD4E1C57459B00F7DF59 /* bitstream.c in Sources */,
 				71DF74851C57608F00F2789C /* ImageUploadViewController.m in Sources */,
+				3C69618223C7156D0075172A /* RAPDFViewController.m in Sources */,
 				7162A5CA1C58761500AB630E /* SignatureView.m in Sources */,
 				7162A5181C58704600AB630E /* CartViewController.m in Sources */,
 				71DF74601C575E7900F2789C /* CommonEditorCellMAction.m in Sources */,
@@ -2484,6 +2488,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
+				CURRENT_PROJECT_VERSION = 200114;
 				DEVELOPMENT_TEAM = HXWLAA5YN5;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
@@ -2526,6 +2531,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
+				CURRENT_PROJECT_VERSION = 200114;
 				DEVELOPMENT_TEAM = HXWLAA5YN5;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",

+ 3 - 3
RedAnt ERP Mobile/iSales-USAI/iSales-USAI-Info.plist

@@ -21,7 +21,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>190724</string>
+	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSRequiresIPhoneOS</key>
@@ -56,8 +56,6 @@
 	<array>
 		<string>com.socketmobile.chs</string>
 	</array>
-	<key>UIUserInterfaceStyle</key>
-	<string>Light</string>
 	<key>UISupportedInterfaceOrientations~ipad</key>
 	<array>
 		<string>UIInterfaceOrientationPortrait</string>
@@ -65,5 +63,7 @@
 		<string>UIInterfaceOrientationLandscapeLeft</string>
 		<string>UIInterfaceOrientationLandscapeRight</string>
 	</array>
+	<key>UIUserInterfaceStyle</key>
+	<string>Light</string>
 </dict>
 </plist>