NPD Mobile 1.96.200116

修复NPD 用户反映的首页图片滚动消失的问题。
修复ERP Mobile 部分加载指示器颜色不对的问题。
修复ERP Mobile 购物车界面在大屏iPad上显示错位的问题。

RedAnt ERP Mobile/common/Functions/cart/CartViewController.m

@@ -806,7 +806,7 @@
     if(value==nil)
         value=@"";
     unsigned long color = strtoul([value UTF8String],0,16);
-    DefaultTableHeaderView* myView = [[DefaultTableHeaderView alloc] initWithFrame:CGRectMake(0, 0, self.itemListTable.bounds.size.width, 40)];
+    DefaultTableHeaderView* myView = [[DefaultTableHeaderView alloc] initWithFrame:CGRectMake(0, 0, self.view.bounds.size.width, 40)];
     //  myView.backgroundColor = UIColorFromRGB(0x996633);
     myView.autoresizingMask = UIViewAutoresizingFlexibleWidth;
     

RedAnt ERP Mobile/common/Functions/category/CategoryViewController.m

@@ -1459,7 +1459,7 @@
     CGPoint center = self.mum.center;
     self.mum.frame = CGRectMake(0, 0, 100, 100);
     self.mum.center = center;
-    self.mum.backgroundColor = [UIColor colorWithHEX:0xA5A5A5 alpha:0.5];
+//    self.mum.backgroundColor = [UIColor colorWithHEX:0xA5A5A5 alpha:0.5];
     self.mum.layer.cornerRadius = 5.0f;
     self.mum.layer.masksToBounds = YES;
     

RedAnt ERP Mobile/common/Functions/portfolio/PortfolioListViewController.m

@@ -60,7 +60,7 @@
     CGPoint center = self.mum.center;
     self.mum.frame = CGRectMake(0, 0, 100, 100);
     self.mum.center = center;
-    self.mum.backgroundColor = [UIColor colorWithHEX:0xA5A5A5 alpha:0.5];
+//    self.mum.backgroundColor = [UIColor colorWithHEX:0xA5A5A5 alpha:0.5];
     self.mum.layer.cornerRadius = 5.0f;
     self.mum.layer.masksToBounds = YES;
     

RedAnt ERP Mobile/common/Functions/search+itemsearch/ItemSearchViewController.m

@@ -230,7 +230,7 @@
     CGPoint center = self.mum.center;
     self.mum.frame = CGRectMake(0, 0, 100, 100);
     self.mum.center = center;
-    self.mum.backgroundColor = [UIColor colorWithHEX:0xA5A5A5 alpha:0.5];
+//    self.mum.backgroundColor = [UIColor colorWithHEX:0xA5A5A5 alpha:0.5];
     self.mum.layer.cornerRadius = 5.0f;
     self.mum.layer.masksToBounds = YES;
     

RedAnt ERP Mobile/common/Functions/search+itemsearch/SearchViewController.m

@@ -232,7 +232,7 @@
     CGPoint center = self.mum.center;
     self.mum.frame = CGRectMake(0, 0, 100, 100);
     self.mum.center = center;
-    self.mum.backgroundColor = [UIColor colorWithHEX:0xA5A5A5 alpha:0.5];
+//    self.mum.backgroundColor = [UIColor colorWithHEX:0xA5A5A5 alpha:0.5];
     self.mum.layer.cornerRadius = 5.0f;
     self.mum.layer.masksToBounds = YES;
     

RedAnt ERP Mobile/common/Functions/watchlist/WatchListViewController.m

@@ -376,7 +376,7 @@
     CGPoint center = self.mum.center;
     self.mum.frame = CGRectMake(0, 0, 100, 100);
     self.mum.center = center;
-    self.mum.backgroundColor = [UIColor colorWithHEX:0xA5A5A5 alpha:0.5];
+//    self.mum.backgroundColor = [UIColor colorWithHEX:0xA5A5A5 alpha:0.5];
     self.mum.layer.cornerRadius = 5.0f;
     self.mum.layer.masksToBounds = YES;
     

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="15702" 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="15705" 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="15704"/>
+        <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>
@@ -423,7 +423,7 @@
         <scene sceneID="D3N-vL-MY1">
             <objects>
                 <viewController storyboardIdentifier="WatchListViewController" useStoryboardIdentifierAsRestorationIdentifier="YES" id="dSV-Dg-id4" customClass="WatchListViewController" sceneMemberID="viewController">
-                    <view key="view" contentMode="scaleToFill" id="l8z-x6-eMf">
+                    <view key="view" opaque="NO" clipsSubviews="YES" contentMode="center" id="l8z-x6-eMf">
                         <rect key="frame" x="0.0" y="0.0" width="768" height="1024"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
@@ -867,12 +867,12 @@
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <view contentMode="scaleToFill" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="AJc-gj-4ib">
-                                                    <rect key="frame" x="-5" y="11" width="766" height="15"/>
+                                                    <rect key="frame" x="-5" y="11" width="768" 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="-5" y="16" width="766" height="268"/>
+                                                    <rect key="frame" x="-5" y="16" width="768" 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">
@@ -948,7 +948,7 @@
                                 <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"/>
                         <viewLayoutGuide key="safeArea" id="zyS-ws-jOo"/>
                     </view>
                     <toolbarItems/>

RedAnt ERP Mobile/iSales-TRADESHOW.xcodeproj/project.pbxproj

@@ -2478,7 +2478,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
-				CURRENT_PROJECT_VERSION = 200114;
+				CURRENT_PROJECT_VERSION = 200116;
 				DEVELOPMENT_TEAM = HXWLAA5YN5;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
@@ -2495,6 +2495,7 @@
 					"$(PROJECT_DIR)/ScanApiSDK-10.2.227-2/lib",
 					"$(PROJECT_DIR)/GoogleAnalytics/GoogleAnalytics/Libraries",
 				);
+				MARKETING_VERSION = 1.96;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
@@ -2521,7 +2522,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
-				CURRENT_PROJECT_VERSION = 200114;
+				CURRENT_PROJECT_VERSION = 200116;
 				DEVELOPMENT_TEAM = HXWLAA5YN5;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
@@ -2538,6 +2539,7 @@
 					"$(PROJECT_DIR)/ScanApiSDK-10.2.227-2/lib",
 					"$(PROJECT_DIR)/GoogleAnalytics/GoogleAnalytics/Libraries",
 				);
+				MARKETING_VERSION = 1.96;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",

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

@@ -17,7 +17,7 @@
 	<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>

RedAnt ERP Mobile/iSales-USAI.xcodeproj/project.pbxproj

@@ -2488,7 +2488,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
-				CURRENT_PROJECT_VERSION = 200114;
+				CURRENT_PROJECT_VERSION = 200116;
 				DEVELOPMENT_TEAM = HXWLAA5YN5;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
@@ -2531,7 +2531,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
-				CURRENT_PROJECT_VERSION = 200114;
+				CURRENT_PROJECT_VERSION = 200116;
 				DEVELOPMENT_TEAM = HXWLAA5YN5;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",