TradeFiling fix build issue

Optimize ERP Mobile build warring

Ants Contract/AntsContract/AntsContract/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="19162" targetRuntime="iOS.CocoaTouch.iPad" propertyAccessControl="none" useAutolayout="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="UmP-Fl-ZUI">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="21701" targetRuntime="iOS.CocoaTouch.iPad" propertyAccessControl="none" useAutolayout="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="UmP-Fl-ZUI">
     <device id="ipad9_7" orientation="portrait" layout="fullscreen" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="19144"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="21678"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -498,7 +498,7 @@ textAlignment</string>
                                 <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                 <prototypes>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="LoginListCell" textLabel="Ofv-pg-h2w" style="IBUITableViewCellStyleDefault" id="v4l-du-pTm">
-                                        <rect key="frame" x="0.0" y="44.5" width="360" height="44"/>
+                                        <rect key="frame" x="0.0" y="50" width="360" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="v4l-du-pTm" id="JkA-pY-NIV">
                                             <rect key="frame" x="0.0" y="0.0" width="360" height="44"/>
@@ -635,7 +635,7 @@ textAlignment</string>
                                 <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                                 <prototypes>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="DocListTableViewCell" rowHeight="128" id="KmC-hR-Rfo" customClass="DocListTableViewCell">
-                                        <rect key="frame" x="0.0" y="44.5" width="768" height="128"/>
+                                        <rect key="frame" x="0.0" y="50" width="768" height="128"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="KmC-hR-Rfo" id="twt-7p-gUd">
                                             <rect key="frame" x="0.0" y="0.0" width="768" height="128"/>
@@ -1060,7 +1060,7 @@ textAlignment</string>
                                 <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                                 <prototypes>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="ADTableViewCell" textLabel="93T-5h-JKV" detailTextLabel="mtf-OD-AFL" style="IBUITableViewCellStyleSubtitle" id="K5M-kB-Cox">
-                                        <rect key="frame" x="0.0" y="44.5" width="540" height="44"/>
+                                        <rect key="frame" x="0.0" y="50" width="540" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="K5M-kB-Cox" id="8bB-hy-1xQ">
                                             <rect key="frame" x="0.0" y="0.0" width="540" height="44"/>
@@ -1451,7 +1451,7 @@ textAlignment</string>
                                 <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                                 <prototypes>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" restorationIdentifier="PendingDocumentsTableViewCell" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="PendingDocumentsTableViewCell" id="bC4-0A-Qjh" customClass="PendingDocumentsTableViewCell">
-                                        <rect key="frame" x="0.0" y="44.5" width="768" height="44"/>
+                                        <rect key="frame" x="0.0" y="50" width="768" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="bC4-0A-Qjh" id="rna-0d-wd1">
                                             <rect key="frame" x="0.0" y="0.0" width="768" height="44"/>
@@ -1609,7 +1609,7 @@ textAlignment</string>
                                                 <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                                                 <prototypes>
                                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="textfield_cell_identifier" rowHeight="40" id="9Ik-wx-I7e" customClass="AttributeTextFieldCell">
-                                                        <rect key="frame" x="0.0" y="44.5" width="300.5" height="40"/>
+                                                        <rect key="frame" x="0.0" y="50" width="300.5" height="40"/>
                                                         <autoresizingMask key="autoresizingMask"/>
                                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="9Ik-wx-I7e" id="ZJs-5D-8bY">
                                                             <rect key="frame" x="0.0" y="0.0" width="300.5" height="40"/>
@@ -1647,7 +1647,7 @@ textAlignment</string>
                                                         </connections>
                                                     </tableViewCell>
                                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="label_cell_identifier" rowHeight="40" id="ES2-nV-P7X" customClass="AttributeLabelCell">
-                                                        <rect key="frame" x="0.0" y="84.5" width="300.5" height="40"/>
+                                                        <rect key="frame" x="0.0" y="90" width="300.5" height="40"/>
                                                         <autoresizingMask key="autoresizingMask"/>
                                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="ES2-nV-P7X" id="5cN-ns-rLy">
                                                             <rect key="frame" x="0.0" y="0.0" width="300.5" height="40"/>
@@ -1687,7 +1687,7 @@ textAlignment</string>
                                                         </connections>
                                                     </tableViewCell>
                                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="switch_cell_identifier" rowHeight="40" id="Hfp-lV-yMb" customClass="AttributeSwitchCell">
-                                                        <rect key="frame" x="0.0" y="124.5" width="300.5" height="40"/>
+                                                        <rect key="frame" x="0.0" y="130" width="300.5" height="40"/>
                                                         <autoresizingMask key="autoresizingMask"/>
                                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="Hfp-lV-yMb" id="A8G-jm-GXE">
                                                             <rect key="frame" x="0.0" y="0.0" width="300.5" height="40"/>
@@ -1866,7 +1866,7 @@ textAlignment</string>
                                         <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                                         <prototypes>
                                             <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="item_cell" rowHeight="40" id="Sis-8R-Rqy" customClass="PageItemCell">
-                                                <rect key="frame" x="0.0" y="44.5" width="310.5" height="40"/>
+                                                <rect key="frame" x="0.0" y="50" width="310.5" height="40"/>
                                                 <autoresizingMask key="autoresizingMask"/>
                                                 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="Sis-8R-Rqy" id="iqu-NN-xx0">
                                                     <rect key="frame" x="0.0" y="0.0" width="310.5" height="40"/>
@@ -1917,7 +1917,7 @@ textAlignment</string>
                                                 </connections>
                                             </tableViewCell>
                                             <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="subitem_cell" rowHeight="40" id="sg5-Io-RFc" customClass="PageSubItemCell">
-                                                <rect key="frame" x="0.0" y="84.5" width="310.5" height="40"/>
+                                                <rect key="frame" x="0.0" y="90" width="310.5" height="40"/>
                                                 <autoresizingMask key="autoresizingMask"/>
                                                 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="sg5-Io-RFc" id="XEY-QN-oaW">
                                                     <rect key="frame" x="0.0" y="0.0" width="310.5" height="40"/>
@@ -2037,6 +2037,52 @@ textAlignment</string>
             </objects>
             <point key="canvasLocation" x="950.78125" y="645.703125"/>
         </scene>
+        <!--Check Selector View Controller-->
+        <scene sceneID="KmI-Gk-5M4">
+            <objects>
+                <viewController storyboardIdentifier="CheckSelectorViewController" useStoryboardIdentifierAsRestorationIdentifier="YES" id="cO6-hP-rJ9" customClass="CheckSelectorViewController" sceneMemberID="viewController">
+                    <view key="view" contentMode="scaleToFill" id="5wX-ao-g8G">
+                        <rect key="frame" x="0.0" y="0.0" width="540" height="600"/>
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <subviews>
+                            <tableView clipsSubviews="YES" contentMode="scaleToFill" fixedFrame="YES" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="44" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="C00-8H-wCP">
+                                <rect key="frame" x="0.0" y="46" width="540" height="509"/>
+                                <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMinY="YES" heightSizable="YES" flexibleMaxY="YES"/>
+                                <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                <connections>
+                                    <outlet property="dataSource" destination="cO6-hP-rJ9" id="rPE-y6-CTh"/>
+                                    <outlet property="delegate" destination="cO6-hP-rJ9" id="uFe-t4-0ja"/>
+                                </connections>
+                            </tableView>
+                            <button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="lvI-f7-Ll8">
+                                <rect key="frame" x="490" y="562" width="30" height="30"/>
+                                <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMinY="YES"/>
+                                <state key="normal" title="OK"/>
+                                <connections>
+                                    <action selector="OnOKClick:" destination="cO6-hP-rJ9" eventType="touchUpInside" id="Gdf-dV-rtf"/>
+                                </connections>
+                            </button>
+                            <button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="H5P-zJ-pco">
+                                <rect key="frame" x="20" y="562" width="48" height="30"/>
+                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                                <state key="normal" title="Cancel"/>
+                                <connections>
+                                    <action selector="OnCancelClick:" destination="cO6-hP-rJ9" eventType="touchUpInside" id="FoM-Ie-F7J"/>
+                                </connections>
+                            </button>
+                        </subviews>
+                        <viewLayoutGuide key="safeArea" id="nlb-OK-uqu"/>
+                        <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                    </view>
+                    <modalFormSheetSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
+                    <connections>
+                        <outlet property="tableView" destination="C00-8H-wCP" id="FEQ-lP-sdf"/>
+                    </connections>
+                </viewController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="rLi-8Y-Ozx" userLabel="First Responder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="3187.5" y="-4331.8359375"/>
+        </scene>
     </scenes>
     <resources>
         <image name="NewDoc" width="100" height="100"/>

Ants Contract/Granite Expo eSign/Granite Expo eSign.xcodeproj/project.pbxproj

@@ -3,13 +3,10 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 46;
+	objectVersion = 53;
 	objects = {
 
 /* Begin PBXBuildFile section */
-		3C23B3DC29CACDA7008E7C14 /* PopWaitAlert.m in Sources */ = {isa = PBXBuildFile; fileRef = 3C23B3D929CACDA7008E7C14 /* PopWaitAlert.m */; };
-		3C23B3DD29CACDA7008E7C14 /* MessageBox.m in Sources */ = {isa = PBXBuildFile; fileRef = 3C23B3DA29CACDA7008E7C14 /* MessageBox.m */; };
-		3C23B3DE29CACDA7008E7C14 /* RAPopviewContainer.m in Sources */ = {isa = PBXBuildFile; fileRef = 3C23B3DB29CACDA7008E7C14 /* RAPopviewContainer.m */; };
 		3C2B045B253D27AD00B52A74 /* RAUtils.m in Sources */ = {isa = PBXBuildFile; fileRef = 3C2B045A253D27AD00B52A74 /* RAUtils.m */; };
 		3C64CA9D29B8605C00CB0B07 /* GECI - Home Improvement Contract - Tan.pdf in Resources */ = {isa = PBXBuildFile; fileRef = 3C64CA9529B8605B00CB0B07 /* GECI - Home Improvement Contract - Tan.pdf */; };
 		3C64CA9E29B8605C00CB0B07 /* GECI - Home Improvement Contract - Fong Huang.pdf in Resources */ = {isa = PBXBuildFile; fileRef = 3C64CA9629B8605C00CB0B07 /* GECI - Home Improvement Contract - Fong Huang.pdf */; };
@@ -26,6 +23,9 @@
 		3C6B628127102F7C00E74CF9 /* DatePickerViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 3C6B628027102F7B00E74CF9 /* DatePickerViewController.m */; };
 		3C6B62842710324B00E74CF9 /* TouchImageView.m in Sources */ = {isa = PBXBuildFile; fileRef = 3C6B62822710324B00E74CF9 /* TouchImageView.m */; };
 		3C6B62872710325500E74CF9 /* CustomIOSAlertView.m in Sources */ = {isa = PBXBuildFile; fileRef = 3C6B62852710325500E74CF9 /* CustomIOSAlertView.m */; };
+		3C70C0A72A2DC2B2008C2400 /* PopWaitAlert.m in Sources */ = {isa = PBXBuildFile; fileRef = 3C70C0A42A2DC2B2008C2400 /* PopWaitAlert.m */; };
+		3C70C0A82A2DC2B2008C2400 /* MessageBox.m in Sources */ = {isa = PBXBuildFile; fileRef = 3C70C0A52A2DC2B2008C2400 /* MessageBox.m */; };
+		3C70C0A92A2DC2B2008C2400 /* RAPopviewContainer.m in Sources */ = {isa = PBXBuildFile; fileRef = 3C70C0A62A2DC2B2008C2400 /* RAPopviewContainer.m */; };
 		3C9FFAA9274B87DE0067830C /* TouchLabel.m in Sources */ = {isa = PBXBuildFile; fileRef = 3C9FFAA7274B87DD0067830C /* TouchLabel.m */; };
 		3C9FFAAC274B8FA20067830C /* EnumSelectViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 3C9FFAAA274B8FA20067830C /* EnumSelectViewController.m */; };
 		3C9FFAAF274B908E0067830C /* RTLabel.m in Sources */ = {isa = PBXBuildFile; fileRef = 3C9FFAAE274B908E0067830C /* RTLabel.m */; };
@@ -112,12 +112,6 @@
 
 /* Begin PBXFileReference section */
 		3C200FD6248A2165000E2FD5 /* RANetwork.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RANetwork.h; sourceTree = "<group>"; };
-		3C23B3D629CACDA7008E7C14 /* MessageBox.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MessageBox.h; sourceTree = "<group>"; };
-		3C23B3D729CACDA7008E7C14 /* PopWaitAlert.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PopWaitAlert.h; sourceTree = "<group>"; };
-		3C23B3D829CACDA7008E7C14 /* RAPopviewContainer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RAPopviewContainer.h; sourceTree = "<group>"; };
-		3C23B3D929CACDA7008E7C14 /* PopWaitAlert.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PopWaitAlert.m; sourceTree = "<group>"; };
-		3C23B3DA29CACDA7008E7C14 /* MessageBox.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MessageBox.m; sourceTree = "<group>"; };
-		3C23B3DB29CACDA7008E7C14 /* RAPopviewContainer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RAPopviewContainer.m; sourceTree = "<group>"; };
 		3C2B0459253D27AD00B52A74 /* RAUtils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RAUtils.h; path = ../../../common/RAUtils.h; sourceTree = "<group>"; };
 		3C2B045A253D27AD00B52A74 /* RAUtils.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = RAUtils.m; path = ../../../common/RAUtils.m; sourceTree = "<group>"; };
 		3C64CA9529B8605B00CB0B07 /* GECI - Home Improvement Contract - Tan.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; path = "GECI - Home Improvement Contract - Tan.pdf"; sourceTree = "<group>"; };
@@ -140,6 +134,12 @@
 		3C6B62832710324B00E74CF9 /* TouchImageView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TouchImageView.h; path = ../../../common/customUI/TouchImageView.h; sourceTree = "<group>"; };
 		3C6B62852710325500E74CF9 /* CustomIOSAlertView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = CustomIOSAlertView.m; path = ../../../common/customUI/CustomIOSAlertView.m; sourceTree = "<group>"; };
 		3C6B62862710325500E74CF9 /* CustomIOSAlertView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CustomIOSAlertView.h; path = ../../../common/customUI/CustomIOSAlertView.h; sourceTree = "<group>"; };
+		3C70C0A12A2DC2B2008C2400 /* MessageBox.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MessageBox.h; sourceTree = "<group>"; };
+		3C70C0A22A2DC2B2008C2400 /* PopWaitAlert.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PopWaitAlert.h; sourceTree = "<group>"; };
+		3C70C0A32A2DC2B2008C2400 /* RAPopviewContainer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RAPopviewContainer.h; sourceTree = "<group>"; };
+		3C70C0A42A2DC2B2008C2400 /* PopWaitAlert.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PopWaitAlert.m; sourceTree = "<group>"; };
+		3C70C0A52A2DC2B2008C2400 /* MessageBox.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MessageBox.m; sourceTree = "<group>"; };
+		3C70C0A62A2DC2B2008C2400 /* RAPopviewContainer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RAPopviewContainer.m; sourceTree = "<group>"; };
 		3C9FFAA7274B87DD0067830C /* TouchLabel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = TouchLabel.m; path = "../../../RedAnt ERP Mobile/common/customUI/TouchLabel.m"; sourceTree = "<group>"; };
 		3C9FFAA8274B87DE0067830C /* TouchLabel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TouchLabel.h; path = "../../../RedAnt ERP Mobile/common/customUI/TouchLabel.h"; sourceTree = "<group>"; };
 		3C9FFAAA274B8FA20067830C /* EnumSelectViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = EnumSelectViewController.m; path = ../../../common/customUI/commoneditor/EnumSelectViewController.m; sourceTree = "<group>"; };
@@ -307,15 +307,15 @@
 /* End PBXFrameworksBuildPhase section */
 
 /* Begin PBXGroup section */
-		3C23B3D529CACDA7008E7C14 /* MessageBox */ = {
+		3C70C0A02A2DC2B2008C2400 /* MessageBox */ = {
 			isa = PBXGroup;
 			children = (
-				3C23B3D629CACDA7008E7C14 /* MessageBox.h */,
-				3C23B3D729CACDA7008E7C14 /* PopWaitAlert.h */,
-				3C23B3D829CACDA7008E7C14 /* RAPopviewContainer.h */,
-				3C23B3D929CACDA7008E7C14 /* PopWaitAlert.m */,
-				3C23B3DA29CACDA7008E7C14 /* MessageBox.m */,
-				3C23B3DB29CACDA7008E7C14 /* RAPopviewContainer.m */,
+				3C70C0A12A2DC2B2008C2400 /* MessageBox.h */,
+				3C70C0A22A2DC2B2008C2400 /* PopWaitAlert.h */,
+				3C70C0A32A2DC2B2008C2400 /* RAPopviewContainer.h */,
+				3C70C0A42A2DC2B2008C2400 /* PopWaitAlert.m */,
+				3C70C0A52A2DC2B2008C2400 /* MessageBox.m */,
+				3C70C0A62A2DC2B2008C2400 /* RAPopviewContainer.m */,
 			);
 			name = MessageBox;
 			path = ../../../common/MessageBox;
@@ -548,7 +548,7 @@
 		7128C2B91E1250F000FF635B /* utils */ = {
 			isa = PBXGroup;
 			children = (
-				3C23B3D529CACDA7008E7C14 /* MessageBox */,
+				3C70C0A02A2DC2B2008C2400 /* MessageBox */,
 				3C2B0459253D27AD00B52A74 /* RAUtils.h */,
 				3C2B045A253D27AD00B52A74 /* RAUtils.m */,
 				3C200FD6248A2165000E2FD5 /* RANetwork.h */,
@@ -674,7 +674,8 @@
 		7128C2331E124F4500FF635B /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 1200;
+				BuildIndependentTargetsInParallel = YES;
+				LastUpgradeCheck = 1430;
 				ORGANIZATIONNAME = "United Software Applications, Inc";
 				TargetAttributes = {
 					7128C23A1E124F4500FF635B = {
@@ -769,7 +770,7 @@
 				3C9FFAAF274B908E0067830C /* RTLabel.m in Sources */,
 				42D49E721F8DFF5000AE39D5 /* AttributeTableDataSourceAndDelegate.m in Sources */,
 				42DDB8791F91DCE8002CCE22 /* ControlTemplateCell.m in Sources */,
-				3C23B3DD29CACDA7008E7C14 /* MessageBox.m in Sources */,
+				3C70C0A82A2DC2B2008C2400 /* MessageBox.m in Sources */,
 				7128C2B81E1250CA00FF635B /* LineDrawable.m in Sources */,
 				42D49E641F8DFA3100AE39D5 /* PageItemCell.m in Sources */,
 				7128C2DB1E12510900FF635B /* zip.c in Sources */,
@@ -790,7 +791,7 @@
 				42D49E561F8DF13A00AE39D5 /* AttributeTextFieldCell.m in Sources */,
 				7115D4561E1606F700EF4E4C /* GEContractFilterViewController.m in Sources */,
 				7128C2DA1E12510900FF635B /* unzip.c in Sources */,
-				3C23B3DC29CACDA7008E7C14 /* PopWaitAlert.m in Sources */,
+				3C70C0A72A2DC2B2008C2400 /* PopWaitAlert.m in Sources */,
 				42D49E671F8DFA4B00AE39D5 /* PageSubItemCell.m in Sources */,
 				3C64CAAD29BB12C800CB0B07 /* RASingleton.m in Sources */,
 				42DDB8741F91C081002CCE22 /* ControlTemplateVC.m in Sources */,
@@ -804,7 +805,7 @@
 				7128C3551E12548C00FF635B /* SignatureListViewController.m in Sources */,
 				3CBB92F2248A26EB0099E429 /* NetworkUtils.m in Sources */,
 				714B37041E70F2BF00E99B90 /* ScannerControllerView.m in Sources */,
-				3C23B3DE29CACDA7008E7C14 /* RAPopviewContainer.m in Sources */,
+				3C70C0A92A2DC2B2008C2400 /* RAPopviewContainer.m in Sources */,
 				7128C2EA1E12511B00FF635B /* NSData+CommonCrypto.m in Sources */,
 				7128C2B01E1250CA00FF635B /* TextDrawable.m in Sources */,
 				71BBFC371E6419D4008668A7 /* ExtDocumentsViewController.m in Sources */,
@@ -952,7 +953,10 @@
 				DEVELOPMENT_TEAM = HXWLAA5YN5;
 				INFOPLIST_FILE = "Granite Expo eSign/Info.plist";
 				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
+				LD_RUNPATH_SEARCH_PATHS = (
+					"$(inherited)",
+					"@executable_path/Frameworks",
+				);
 				MARKETING_VERSION = 1.74;
 				PRODUCT_BUNDLE_IDENTIFIER = "usai.redant.Granite-Expo-eSign";
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -967,7 +971,10 @@
 				DEVELOPMENT_TEAM = HXWLAA5YN5;
 				INFOPLIST_FILE = "Granite Expo eSign/Info.plist";
 				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
+				LD_RUNPATH_SEARCH_PATHS = (
+					"$(inherited)",
+					"@executable_path/Frameworks",
+				);
 				MARKETING_VERSION = 1.74;
 				PRODUCT_BUNDLE_IDENTIFIER = "usai.redant.Granite-Expo-eSign";
 				PRODUCT_NAME = "$(TARGET_NAME)";

Ants Contract/Granite Expo eSign/Granite Expo eSign/TemplateViewController.m

@@ -1137,7 +1137,7 @@ if (!update) {
     bool show_detail = [self.page_controlTemplate [[NSString stringWithFormat:@"control_%ld",index] ][@"show_detail"] boolValue];
     NSArray* rowData = self.page_controlTemplate [[NSString stringWithFormat:@"control_%ld",index] ][@"cadedate"];
     NSArray* checkedData = self.page_controlTemplate [[NSString stringWithFormat:@"control_%ld",index] ][@"value"];
-    CheckSelectorViewController *checkVC = [ [UIStoryboard storyboardWithName:@"signature" bundle:[NSBundle mainBundle]] instantiateViewControllerWithIdentifier:@"CheckSelectorViewController"];
+    CheckSelectorViewController *checkVC = [ [UIStoryboard storyboardWithName:@"Main" bundle:[NSBundle mainBundle]] instantiateViewControllerWithIdentifier:@"CheckSelectorViewController"];
     
     checkVC.blk_OK = ^(NSArray* checkedData){
         

Ants Contract/common/PageViewController.m

@@ -1271,7 +1271,7 @@ typedef enum {
     bool show_detail = [self.page_controlTemplate [[NSString stringWithFormat:@"control_%ld",index] ][@"show_detail"] boolValue];
     NSArray* rowData = self.page_controlTemplate [[NSString stringWithFormat:@"control_%ld",index] ][@"cadedate"];
     NSArray* checkedData = self.page_controlTemplate [[NSString stringWithFormat:@"control_%ld",index] ][@"value"];
-    CheckSelectorViewController *checkVC = [ [UIStoryboard storyboardWithName:@"signature" bundle:[NSBundle mainBundle]] instantiateViewControllerWithIdentifier:@"CheckSelectorViewController"];
+    CheckSelectorViewController *checkVC = [ [UIStoryboard storyboardWithName:@"Main" bundle:[NSBundle mainBundle]] instantiateViewControllerWithIdentifier:@"CheckSelectorViewController"];
     
     checkVC.blk_OK = ^(NSArray* checkedData){
         

RA TradeFiling/RA TradeFiling.xcodeproj/project.pbxproj

@@ -3,7 +3,7 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 50;
+	objectVersion = 53;
 	objects = {
 
 /* Begin PBXBuildFile section */
@@ -211,6 +211,9 @@
 		3C5FBF57263AA5D800130F65 /* MonthPickerViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 3C5FBF54263AA5D800130F65 /* MonthPickerViewController.m */; };
 		3C5FBF58263AA5D800130F65 /* DatePickerViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 3C5FBF55263AA5D800130F65 /* DatePickerViewController.m */; };
 		3C5FBF63263BAD3A00130F65 /* edit_party.json in Resources */ = {isa = PBXBuildFile; fileRef = 3C5FBF62263BAD3A00130F65 /* edit_party.json */; };
+		3C70C0B12A317F15008C2400 /* PopWaitAlert.m in Sources */ = {isa = PBXBuildFile; fileRef = 3C70C0AE2A317F15008C2400 /* PopWaitAlert.m */; };
+		3C70C0B22A317F15008C2400 /* MessageBox.m in Sources */ = {isa = PBXBuildFile; fileRef = 3C70C0AF2A317F15008C2400 /* MessageBox.m */; };
+		3C70C0B32A317F15008C2400 /* RAPopviewContainer.m in Sources */ = {isa = PBXBuildFile; fileRef = 3C70C0B02A317F15008C2400 /* RAPopviewContainer.m */; };
 		3C7670342595932D00588DB5 /* TFNavigationController.m in Sources */ = {isa = PBXBuildFile; fileRef = 3C7670332595932D00588DB5 /* TFNavigationController.m */; };
 		3C7670392595BE2A00588DB5 /* detail.json in Resources */ = {isa = PBXBuildFile; fileRef = 3C7670382595BE2900588DB5 /* detail.json */; };
 		3C7670482599B1E000588DB5 /* ResulteManifestModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 3C7670472599B1E000588DB5 /* ResulteManifestModel.m */; };
@@ -627,6 +630,12 @@
 		3C5FBF55263AA5D800130F65 /* DatePickerViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = DatePickerViewController.m; path = ../../common/customUI/commoneditor/DatePickerViewController.m; sourceTree = "<group>"; };
 		3C5FBF56263AA5D800130F65 /* MonthPickerViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = MonthPickerViewController.h; path = ../../common/customUI/commoneditor/MonthPickerViewController.h; sourceTree = "<group>"; };
 		3C5FBF62263BAD3A00130F65 /* edit_party.json */ = {isa = PBXFileReference; lastKnownFileType = text.json; path = edit_party.json; sourceTree = "<group>"; };
+		3C70C0AB2A317F15008C2400 /* MessageBox.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MessageBox.h; sourceTree = "<group>"; };
+		3C70C0AC2A317F15008C2400 /* PopWaitAlert.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PopWaitAlert.h; sourceTree = "<group>"; };
+		3C70C0AD2A317F15008C2400 /* RAPopviewContainer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RAPopviewContainer.h; sourceTree = "<group>"; };
+		3C70C0AE2A317F15008C2400 /* PopWaitAlert.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PopWaitAlert.m; sourceTree = "<group>"; };
+		3C70C0AF2A317F15008C2400 /* MessageBox.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MessageBox.m; sourceTree = "<group>"; };
+		3C70C0B02A317F15008C2400 /* RAPopviewContainer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RAPopviewContainer.m; sourceTree = "<group>"; };
 		3C7670322595932D00588DB5 /* TFNavigationController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TFNavigationController.h; sourceTree = "<group>"; };
 		3C7670332595932D00588DB5 /* TFNavigationController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TFNavigationController.m; sourceTree = "<group>"; };
 		3C7670382595BE2900588DB5 /* detail.json */ = {isa = PBXFileReference; lastKnownFileType = text.json; path = detail.json; sourceTree = "<group>"; };
@@ -1401,6 +1410,20 @@
 			name = EditorCell;
 			sourceTree = "<group>";
 		};
+		3C70C0AA2A317F15008C2400 /* MessageBox */ = {
+			isa = PBXGroup;
+			children = (
+				3C70C0AB2A317F15008C2400 /* MessageBox.h */,
+				3C70C0AC2A317F15008C2400 /* PopWaitAlert.h */,
+				3C70C0AD2A317F15008C2400 /* RAPopviewContainer.h */,
+				3C70C0AE2A317F15008C2400 /* PopWaitAlert.m */,
+				3C70C0AF2A317F15008C2400 /* MessageBox.m */,
+				3C70C0B02A317F15008C2400 /* RAPopviewContainer.m */,
+			);
+			name = MessageBox;
+			path = ../../common/MessageBox;
+			sourceTree = "<group>";
+		};
 		3C7670BF25AC257F00588DB5 /* Localize */ = {
 			isa = PBXGroup;
 			children = (
@@ -1512,6 +1535,7 @@
 		3C7F37382563CD9A0033BF82 /* Utils */ = {
 			isa = PBXGroup;
 			children = (
+				3C70C0AA2A317F15008C2400 /* MessageBox */,
 				3C2C277126355AAF009460F5 /* FileCache.h */,
 				3C2C277226355AAF009460F5 /* FileCache.m */,
 				3C5F8C6325650C3F00CFD26A /* RAConvertor.h */,
@@ -1608,7 +1632,8 @@
 		3C0CB329255E56BF00718A03 /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 1210;
+				BuildIndependentTargetsInParallel = YES;
+				LastUpgradeCheck = 1430;
 				TargetAttributes = {
 					3C0CB330255E56BF00718A03 = {
 						CreatedOnToolsVersion = 12.1;
@@ -1847,6 +1872,7 @@
 				3C5F8B552564FDD100CFD26A /* ResultViewController.m in Sources */,
 				3C5F8C272565099300CFD26A /* MyAutocompletionCellFactory.m in Sources */,
 				3C452FA825BE98410035AF5F /* HomeDasheManifestCellE.m in Sources */,
+				3C70C0B12A317F15008C2400 /* PopWaitAlert.m in Sources */,
 				3C0CB3BA255E829000718A03 /* SearchlistViewController.m in Sources */,
 				3C2C270B26355810009460F5 /* CommonEditorCellLabel.m in Sources */,
 				3C7F382D2564C78C0033BF82 /* JLRefreshFooter.m in Sources */,
@@ -1918,6 +1944,7 @@
 				3C452F9825BE97430035AF5F /* HomeDashACEM1CellE.m in Sources */,
 				3C02E83B2653B488008DA531 /* EnumSelectOnlineViewController.m in Sources */,
 				3C2C26EC2635578F009460F5 /* CommonEditorCellAction.m in Sources */,
+				3C70C0B32A317F15008C2400 /* RAPopviewContainer.m in Sources */,
 				3C76708825A6DD7400588DB5 /* ChangePasswordViewController.m in Sources */,
 				3C2C274726355996009460F5 /* CommonEditorCellTextView.m in Sources */,
 				3C2431B2258B48AA00555555 /* ResultISFModel.m in Sources */,
@@ -1929,6 +1956,7 @@
 				3C452F7E25BE73190035AF5F /* HomeDashISFCellE.m in Sources */,
 				3C0CB3CB2562739F00718A03 /* StaticModelistViewController.m in Sources */,
 				3C5F8C4425650B0E00CFD26A /* ResultACEM1Cell.m in Sources */,
+				3C70C0B22A317F15008C2400 /* MessageBox.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -2125,6 +2153,7 @@
 				DEVELOPMENT_TEAM = HXWLAA5YN5;
 				GCC_OPTIMIZATION_LEVEL = 0;
 				INFOPLIST_FILE = "RA TradeFiling/Info.plist";
+				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -2146,6 +2175,7 @@
 				DEVELOPMENT_TEAM = HXWLAA5YN5;
 				GCC_OPTIMIZATION_LEVEL = s;
 				INFOPLIST_FILE = "RA TradeFiling/Info.plist";
+				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",

RA TradeFiling/RA TradeFiling.xcodeproj/xcuserdata/ruizhang.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -16,7 +16,7 @@
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "1971"
             endingLineNumber = "1971"
-            landmarkName = "-didReceiveMemoryWarning"
+            landmarkName = "-handle_action_return:indexPath:action:"
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
@@ -32,7 +32,7 @@
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "2935"
             endingLineNumber = "2935"
-            landmarkName = "-HideSction:"
+            landmarkName = "-returnValue:indexPath:"
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
@@ -48,7 +48,7 @@
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "1977"
             endingLineNumber = "1977"
-            landmarkName = "-prepareReturn:"
+            landmarkName = "-handle_action_return:indexPath:action:"
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
@@ -64,7 +64,7 @@
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "1980"
             endingLineNumber = "1980"
-            landmarkName = "-prepareReturn:"
+            landmarkName = "-handle_action_return:indexPath:action:"
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
@@ -96,7 +96,7 @@
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "5913"
             endingLineNumber = "5913"
-            landmarkName = "-textView:shouldChangeTextInRange:replacementText:"
+            landmarkName = "-textField:shouldChangeCharactersInRange:replacementString:"
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
@@ -240,7 +240,7 @@
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "1981"
             endingLineNumber = "1981"
-            landmarkName = "-prepareReturn:"
+            landmarkName = "-handle_action_return:indexPath:action:"
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
@@ -272,8 +272,8 @@
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "1387"
             endingLineNumber = "1387"
-            landmarkName = "CommonEditorViewController"
-            landmarkType = "3">
+            landmarkName = "-refresh:discardDirty:"
+            landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
       <BreakpointProxy
@@ -288,7 +288,7 @@
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "1985"
             endingLineNumber = "1985"
-            landmarkName = "-prepareReturn:"
+            landmarkName = "-handle_action_return:indexPath:action:"
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
@@ -320,8 +320,8 @@
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "1345"
             endingLineNumber = "1345"
-            landmarkName = "-get_refresh_param"
-            landmarkType = "7">
+            landmarkName = "CommonEditorViewController"
+            landmarkType = "3">
          </BreakpointContent>
       </BreakpointProxy>
       <BreakpointProxy
@@ -336,7 +336,7 @@
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "1360"
             endingLineNumber = "1360"
-            landmarkName = "-CopyDirty:to:"
+            landmarkName = "-refresh:discardDirty:"
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
@@ -352,7 +352,7 @@
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "6675"
             endingLineNumber = "6675"
-            landmarkName = "-fill_enum_subitem:subid:source:mapping:"
+            landmarkName = "-keyboardWillChangeFrame:"
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
@@ -368,8 +368,8 @@
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "6815"
             endingLineNumber = "6815"
-            landmarkName = "-keyboardWillChangeFrame:"
-            landmarkType = "7">
+            landmarkName = "CommonEditorViewController"
+            landmarkType = "3">
          </BreakpointContent>
       </BreakpointProxy>
       <BreakpointProxy
@@ -384,8 +384,8 @@
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "6700"
             endingLineNumber = "6700"
-            landmarkName = "CommonEditorViewController"
-            landmarkType = "3">
+            landmarkName = "-keyboardWillChangeFrame:"
+            landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
       <BreakpointProxy
@@ -400,7 +400,7 @@
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "5793"
             endingLineNumber = "5793"
-            landmarkName = "-textViewDidEndEditing:"
+            landmarkName = "-textField:shouldChangeCharactersInRange:replacementString:"
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
@@ -416,8 +416,8 @@
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "5762"
             endingLineNumber = "5762"
-            landmarkName = "CommonEditorViewController"
-            landmarkType = "3">
+            landmarkName = "-textView:shouldChangeTextInRange:replacementText:"
+            landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
       <BreakpointProxy
@@ -432,7 +432,7 @@
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "5449"
             endingLineNumber = "5449"
-            landmarkName = "-MPValueChanged:indexPath:"
+            landmarkName = "-setEnumValue:indexPath:"
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
@@ -448,7 +448,7 @@
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "5501"
             endingLineNumber = "5501"
-            landmarkName = "-DateTimeValueChanged:indexPath:"
+            landmarkName = "-setEnumValue:indexPath:"
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
@@ -464,7 +464,7 @@
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "5500"
             endingLineNumber = "5500"
-            landmarkName = "-DateTimeValueChanged:indexPath:"
+            landmarkName = "-setEnumValue:indexPath:"
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
@@ -480,8 +480,8 @@
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "1388"
             endingLineNumber = "1388"
-            landmarkName = "CommonEditorViewController"
-            landmarkType = "3">
+            landmarkName = "-refresh:discardDirty:"
+            landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
       <BreakpointProxy
@@ -496,7 +496,7 @@
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "1240"
             endingLineNumber = "1240"
-            landmarkName = "-download_failed"
+            landmarkName = "-get_refresh_param"
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
@@ -526,8 +526,8 @@
             filePath = "RA TradeFiling/TFEditor/TFEditorViewController.m"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "332"
-            endingLineNumber = "332"
+            startingLineNumber = "341"
+            endingLineNumber = "341"
             landmarkName = "-commonAction:index:data:"
             landmarkType = "7">
          </BreakpointContent>
@@ -542,8 +542,8 @@
             filePath = "RA TradeFiling/TFEditor/TFEditorViewController.m"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "356"
-            endingLineNumber = "356"
+            startingLineNumber = "365"
+            endingLineNumber = "365"
             landmarkName = "-commonAction:index:data:"
             landmarkType = "7">
          </BreakpointContent>
@@ -560,7 +560,7 @@
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "1986"
             endingLineNumber = "1986"
-            landmarkName = "-prepareReturn:"
+            landmarkName = "-handle_action_return:indexPath:action:"
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
@@ -640,7 +640,7 @@
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "5545"
             endingLineNumber = "5545"
-            landmarkName = "-DateTimeValueChanged:indexPath:"
+            landmarkName = "-EnumValueChanged:indexPath:"
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
@@ -656,7 +656,7 @@
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "6394"
             endingLineNumber = "6394"
-            landmarkName = "-sync_loadCadidate:"
+            landmarkName = "-fill_switch_subitem:subid:source:mapping:"
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
@@ -672,7 +672,7 @@
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "6367"
             endingLineNumber = "6367"
-            landmarkName = "-textFieldShouldBeginEditing:"
+            landmarkName = "-fill_switch_subitem:subid:source:mapping:"
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>

RA TradeFiling/RA TradeFiling/DataProvider/RADataProvider.h

@@ -15,7 +15,7 @@
 //#import "on"
 //@class RAEditImageBaseModel,CLLocation;
 @interface RADataProvider : NSObject
-
++(void)request_autocomplete:(NSMutableDictionary*)param completionHandler:(resultHandler)result;
 + (void)Login : (NSString*) user password:(NSString*) password completionHandler:(resultHandler)result;
 + (void)RetrievePassword : (NSString*)user  email:(NSString*)email completionHandler:(resultHandler)result;
 + (void)Logout :(resultHandler)result;
@@ -25,7 +25,7 @@
 //+ (void)RetrievePassword : (NSString*)user  email:(NSString*)email completionHandler:(resultHandler)result;
 + (void) TabDetail: (NSMutableDictionary *) params completionHandler:(resultHandler)result;
 + (void)DownloadFile:(NSMutableDictionary *)params url:(NSString *)url completionHandler:(resultHandler)result;
-+ (void)SavePanel:(NSString*)panel_setting completionHandler:(resultHandler)result;
+//+ (void)SavePanel:(NSString*)panel_setting completionHandler:(resultHandler)result;
 + (void)Signup : (NSString*) user password:(NSString*) password completionHandler:(resultHandler)result;
 
 + (void)GetCadedate:(NSMutableDictionary *)params completionHandler:(resultHandler)result;

RA TradeFiling/RA TradeFiling/DataProvider/RADataProvider.m

@@ -19,7 +19,13 @@
 //
 //
 @implementation RADataProvider
-
++(void)request_autocomplete:(NSMutableDictionary*)param completionHandler:(resultHandler)result
+{
+    NSMutableDictionary* ret=[[NSMutableDictionary alloc]init];
+    ret[@"result"]=@"8";
+    ret[@"err_msg"]=@"offline mode does not support this function.";
+    result(ret);
+}
 
 //+ (void)SavePanel:(NSString*)panel_setting completionHandler:(resultHandler)result
 //{
@@ -135,6 +141,8 @@
         
     }
 }
+
+
 + (void)Search:(NSMutableDictionary *)params completionHandler:(resultHandler)result
 {
     if(fake_data)

RA TradeFiling/RA TradeFiling/Detail/DetailTabBarController.m

@@ -214,7 +214,12 @@
         NSString* name = txt.text;
         if(name.length==0)
         {
-            [RAUtils message_alert:@"Name can not be empty." title:NSLocalizedString(@"save_detail", nil) controller:weakSelf];
+            
+            
+            [RAUtils message_box:NSLocalizedString(@"save_detail", nil)  message:@"Name can not be empty." completion:^{
+
+            }];
+//            [RAUtils message_alert:@"Name can not be empty." title:NSLocalizedString(@"save_detail", nil) controller:weakSelf];
             return;
         }
         

RA TradeFiling/RA TradeFiling/Home/RAHomeViewController.m

@@ -315,7 +315,12 @@
     if(!RASingleton.sharedInstance.active)
     {
         NSString * msg=@"Our customer service will contact you to assist you complete the user activation.";
-        [RAUtils message_alert:msg title:@"Message" controller:self];
+//        [RAUtils message_alert:msg title:@"Message" controller:self];
+        
+        
+        [RAUtils message_box:@"Message" message:msg completion:^{
+
+        }];
     }
 }
 - (void)viewWillAppear:(BOOL)animated {

RA TradeFiling/RA TradeFiling/Result/ResultViewController.m

@@ -288,7 +288,11 @@
         NSString* name = txt.text;
         if(name.length==0)
         {
-            [RAUtils message_alert:@"Name can not be empty." title:@"Save Search" controller:self];
+//            [RAUtils message_alert:@"Name can not be empty." title:@"Save Search" controller:self];
+            
+            [RAUtils message_box:@"Save Search" message:@"Name can not be empty." completion:^{
+
+            }];
             return;
         }
         

RA TradeFiling/RA TradeFiling/SignUp/SignupViewController.m

@@ -86,7 +86,9 @@
     
     if(email.length<1||password.length<1)
     {
-        [RAUtils message_alert:@"EMAIL or PASSWORD can't be empty." title:@"ERROR" controller:self];
+//        [RAUtils message_alert:@"EMAIL or PASSWORD can't be empty." title:@"ERROR" controller:self];
+        [RAUtils message_box:@"ERROR" message:@"EMAIL or PASSWORD can't be empty." completion:nil];
+        
         return;
     }
     
@@ -98,7 +100,9 @@
     
     if(!pass_match)
     {
-        [RAUtils message_alert:@"PASSWORD does not match." title:@"ERROR" controller:self];
+        
+        [RAUtils message_box:@"ERROR" message:@"PASSWORD does not match." completion:nil];
+//        [RAUtils message_alert:@"PASSWORD does not match." title:@"ERROR" controller:self];
         return;
     }
     
@@ -107,14 +111,16 @@
     
     if(!email_valid)
     {
-        [RAUtils message_alert:@"EMAIL is invalid." title:@"ERROR" controller:self];
+//        [RAUtils message_alert:@"EMAIL is invalid." title:@"ERROR" controller:self];
+        [RAUtils message_box:@"ERROR" message:@"EMAIL is invalid." completion:nil];
         return;
     }
     
     bool pass_valid =[RAUtils checkPassword:password];
     if(!pass_valid)
     {
-        [RAUtils message_alert:@"PASSWORD is invalid.\r\nPassword must 8-16 characters, letters, numbers and uppercase letters are allowed." title:@"ERROR" controller:self];
+        [RAUtils message_box:@"ERROR" message:@"PASSWORD is invalid.\r\nPassword must 8-16 characters, letters, numbers and uppercase letters are allowed." completion:nil];
+//        [RAUtils message_alert:@"PASSWORD is invalid.\r\nPassword must 8-16 characters, letters, numbers and uppercase letters are allowed." title:@"ERROR" controller:self];
         return;
     }
     
@@ -132,14 +138,16 @@
         if (ret==RESULT_TRUE)
         {
             
-            
-            [RAUtils message_alert:@"Successful" title:@"Signup" controller:self action_handler:^(UIAlertAction * _Nonnull action) {
-                [self.navigationController popToRootViewControllerAnimated:YES];;
-            }  completion:^{
-                
-                
-                
+            [RAUtils message_box:@"Signup" message:@"Successful" completion:^{
+                [self.navigationController popToRootViewControllerAnimated:YES];
             }];
+//            [RAUtils message_alert:@"Successful" title:@"Signup" controller:self action_handler:^(UIAlertAction * _Nonnull action) {
+//                [self.navigationController popToRootViewControllerAnimated:YES];;
+//            }  completion:^{
+//
+//
+//
+//            }];
 //            NSUserDefaults *defaults =[NSUserDefaults standardUserDefaults];
 //            [defaults removeObjectForKey:@"user"];
 //            [defaults removeObjectForKey:@"password"];

RA TradeFiling/RA TradeFiling/TFEditor/TFEditorViewController.m

@@ -80,15 +80,18 @@
                         if (ret==RESULT_TRUE)
                         {
                             
-                            
-                            [RAUtils message_alert:@"Successful" title:@"Save" controller:self action_handler:^(UIAlertAction * _Nonnull action) {
+                            [RAUtils message_box:@"Save" message:@"Successful" completion:^{
                                 [self.navigationController popViewControllerAnimated:YES];
                                 [self prepareReturn:nil];
-                            }  completion:^{
-                                
-                                
-                                
                             }];
+//                            [RAUtils message_alert:@"Successful" title:@"Save" controller:self action_handler:^(UIAlertAction * _Nonnull action) {
+//                                [self.navigationController popViewControllerAnimated:YES];
+//                                [self prepareReturn:nil];
+//                            }  completion:^{
+//
+//
+//
+//                            }];
                 //            NSUser
                             
 //                            [self.navigationController popViewControllerAnimated:true];
@@ -147,17 +150,20 @@
                             
                             if (ret==RESULT_TRUE)
                             {
-                                
-                                
-                                [RAUtils message_alert:@"Successful" title:@"Save" controller:self action_handler:^(UIAlertAction * _Nonnull action) {
+                                [RAUtils message_box:@"Save" message:@"Successful" completion:^{
                                     [self.navigationController popViewControllerAnimated:YES];
                                     [self prepareReturn:nil];
-                                    
-                                }  completion:^{
-                                    
-                                    
-                                    
                                 }];
+                                
+//                                [RAUtils message_alert:@"Successful" title:@"Save" controller:self action_handler:^(UIAlertAction * _Nonnull action) {
+//                                    [self.navigationController popViewControllerAnimated:YES];
+//                                    [self prepareReturn:nil];
+//
+//                                }  completion:^{
+//
+//
+//
+//                                }];
                     //            NSUser
                                 
     //                            [self.navigationController popViewControllerAnimated:true];
@@ -217,15 +223,18 @@
                                 if (ret==RESULT_TRUE)
                                 {
                                     
-                                    
-                                    [RAUtils message_alert:@"Successful" title:@"Delete" controller:self action_handler:^(UIAlertAction * _Nonnull action) {
+                                    [RAUtils message_box:@"Save" message:@"Delete" completion:^{
                                         [self.navigationController popViewControllerAnimated:YES];
                                         [self prepareReturn:nil];
-                                    }  completion:^{
-                                        
-                                        
-                                        
                                     }];
+//                                    [RAUtils message_alert:@"Successful" title:@"Delete" controller:self action_handler:^(UIAlertAction * _Nonnull action) {
+//                                        [self.navigationController popViewControllerAnimated:YES];
+//                                        [self prepareReturn:nil];
+//                                    }  completion:^{
+//
+//
+//
+//                                    }];
                         //            NSUser
                                     
         //                            [self.navigationController popViewControllerAnimated:true];

RA TradeFiling/RA TradeFiling/TFNavigationController.m

@@ -144,13 +144,16 @@
     [[NSNotificationCenter defaultCenter] postNotificationName:RA_NOTIFICATION_LOGOUT object:nil];
 
     NSLog(@"show kick out alert %@",notification.object);
-                [RAUtils message_alert:notification.object title:@"Warrning" controller:self action_handler:^(UIAlertAction * _Nonnull action) {
-//                    [vc.navigationController popToRootViewControllerAnimated:true];
-                } completion:^{
     
+    [RAUtils message_box:@"Warrning" message:notification.object completion:nil];
     
-                            }];
-    
+//                [RAUtils message_alert:notification.object title:@"Warrning" controller:self action_handler:^(UIAlertAction * _Nonnull action) {
+////                    [vc.navigationController popToRootViewControllerAnimated:true];
+//                } completion:^{
+//    
+//    
+//                            }];
+//    
     
     
 //    return;

RedAnt ERP Mobile/HMLG Scan Order.xcodeproj/project.pbxproj

@@ -9,9 +9,6 @@
 /* Begin PBXBuildFile section */
 		3C16916C27FE7E3000026FE5 /* SignUpViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 3C16916B27FE7E3000026FE5 /* SignUpViewController.m */; };
 		3C16916F280004E000026FE5 /* ChangePasswordViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 3C16916E280004E000026FE5 /* ChangePasswordViewController.m */; };
-		3C23B3F029CD70F9008E7C14 /* PopWaitAlert.m in Sources */ = {isa = PBXBuildFile; fileRef = 3C23B3ED29CD70F9008E7C14 /* PopWaitAlert.m */; };
-		3C23B3F129CD70F9008E7C14 /* MessageBox.m in Sources */ = {isa = PBXBuildFile; fileRef = 3C23B3EE29CD70F9008E7C14 /* MessageBox.m */; };
-		3C23B3F229CD70F9008E7C14 /* RAPopviewContainer.m in Sources */ = {isa = PBXBuildFile; fileRef = 3C23B3EF29CD70F9008E7C14 /* RAPopviewContainer.m */; };
 		3C2D0483285B242800423D97 /* ScanDiscountViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 3C2D0482285B242800423D97 /* ScanDiscountViewController.m */; };
 		3C2F437B28B748E800F50E0E /* PriceGroupListViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 3C2F437A28B748E800F50E0E /* PriceGroupListViewController.m */; };
 		3C2F99B8237BE1790000808F /* PortfolioListTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 3C2F99B6237BE1790000808F /* PortfolioListTableViewCell.m */; };
@@ -50,7 +47,6 @@
 		3C514993273E091500F78617 /* ContentPreviewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 3C51498B273E091500F78617 /* ContentPreviewController.m */; };
 		3C514994273E091500F78617 /* VideoPreviewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 3C51498E273E091500F78617 /* VideoPreviewCell.m */; };
 		3C514995273E091500F78617 /* PhotoPreviewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 3C514990273E091500F78617 /* PhotoPreviewCell.m */; };
-		3C514999273E097C00F78617 /* RAProgressHUD.m in Sources */ = {isa = PBXBuildFile; fileRef = 3C514998273E097B00F78617 /* RAProgressHUD.m */; };
 		3C51E7BD27B2599E00E61163 /* ScanOrderListViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 3C51E7BC27B2599E00E61163 /* ScanOrderListViewController.m */; };
 		3C51E7CB27B261EC00E61163 /* RAUploadOperation.m in Sources */ = {isa = PBXBuildFile; fileRef = 3C51E7C327B261EC00E61163 /* RAUploadOperation.m */; };
 		3C51E7CC27B261EC00E61163 /* RAUploadListViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 3C51E7C527B261EC00E61163 /* RAUploadListViewController.m */; };
@@ -81,6 +77,9 @@
 		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 */; };
+		3C70C0752A2DC22D008C2400 /* PopWaitAlert.m in Sources */ = {isa = PBXBuildFile; fileRef = 3C70C0722A2DC22D008C2400 /* PopWaitAlert.m */; };
+		3C70C0762A2DC22D008C2400 /* MessageBox.m in Sources */ = {isa = PBXBuildFile; fileRef = 3C70C0732A2DC22D008C2400 /* MessageBox.m */; };
+		3C70C0772A2DC22D008C2400 /* RAPopviewContainer.m in Sources */ = {isa = PBXBuildFile; fileRef = 3C70C0742A2DC22D008C2400 /* RAPopviewContainer.m */; };
 		3C7E5A8E237BDB0C006D0105 /* PortfolioListViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 3C7E5A8C237BDB0C006D0105 /* PortfolioListViewController.m */; };
 		3C872A1E27955CF300BE1FC8 /* scan_cart.json in Resources */ = {isa = PBXBuildFile; fileRef = 3C872A1D27955CF300BE1FC8 /* scan_cart.json */; };
 		3C872A262797FE7C00BE1FC8 /* scan_order.json in Resources */ = {isa = PBXBuildFile; fileRef = 3C872A252797FE7C00BE1FC8 /* scan_order.json */; };
@@ -249,7 +248,6 @@
 		7162A5821C5872EF00AB630E /* HomeTableViewCellButtonBanner.m in Sources */ = {isa = PBXBuildFile; fileRef = 7162A57A1C5872EF00AB630E /* HomeTableViewCellButtonBanner.m */; };
 		7162A5831C5872EF00AB630E /* HomeTableViewCellSlide.m in Sources */ = {isa = PBXBuildFile; fileRef = 7162A57C1C5872EF00AB630E /* HomeTableViewCellSlide.m */; };
 		7162A5841C5872EF00AB630E /* HomeTableViewCellTopic.m in Sources */ = {isa = PBXBuildFile; fileRef = 7162A57E1C5872EF00AB630E /* HomeTableViewCellTopic.m */; };
-		7162A5851C5872EF00AB630E /* HomeViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 7162A5801C5872EF00AB630E /* HomeViewController.m */; };
 		7162A5981C58733400AB630E /* CreateOrderViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 7162A5871C58733400AB630E /* CreateOrderViewController.m */; };
 		7162A5991C58733400AB630E /* OrderDetailHtmlCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 7162A5891C58733400AB630E /* OrderDetailHtmlCell.m */; };
 		7162A59A1C58733400AB630E /* OrderDetailInfoCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 7162A58B1C58733400AB630E /* OrderDetailInfoCell.m */; };
@@ -340,12 +338,6 @@
 		3C16916B27FE7E3000026FE5 /* SignUpViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SignUpViewController.m; sourceTree = "<group>"; };
 		3C16916D280004E000026FE5 /* ChangePasswordViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ChangePasswordViewController.h; sourceTree = "<group>"; };
 		3C16916E280004E000026FE5 /* ChangePasswordViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ChangePasswordViewController.m; sourceTree = "<group>"; };
-		3C23B3EA29CD70F9008E7C14 /* MessageBox.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MessageBox.h; sourceTree = "<group>"; };
-		3C23B3EB29CD70F9008E7C14 /* PopWaitAlert.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PopWaitAlert.h; sourceTree = "<group>"; };
-		3C23B3EC29CD70F9008E7C14 /* RAPopviewContainer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RAPopviewContainer.h; sourceTree = "<group>"; };
-		3C23B3ED29CD70F9008E7C14 /* PopWaitAlert.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PopWaitAlert.m; sourceTree = "<group>"; };
-		3C23B3EE29CD70F9008E7C14 /* MessageBox.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MessageBox.m; sourceTree = "<group>"; };
-		3C23B3EF29CD70F9008E7C14 /* RAPopviewContainer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RAPopviewContainer.m; sourceTree = "<group>"; };
 		3C2D0481285B242800423D97 /* ScanDiscountViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ScanDiscountViewController.h; sourceTree = "<group>"; };
 		3C2D0482285B242800423D97 /* ScanDiscountViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ScanDiscountViewController.m; sourceTree = "<group>"; };
 		3C2F437928B748E800F50E0E /* PriceGroupListViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PriceGroupListViewController.h; sourceTree = "<group>"; };
@@ -418,8 +410,6 @@
 		3C51498F273E091500F78617 /* PhotoPreviewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PhotoPreviewCell.h; sourceTree = "<group>"; };
 		3C514990273E091500F78617 /* PhotoPreviewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PhotoPreviewCell.m; sourceTree = "<group>"; };
 		3C514991273E091500F78617 /* VideoPreviewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VideoPreviewCell.h; sourceTree = "<group>"; };
-		3C514997273E097B00F78617 /* RAProgressHUD.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RAProgressHUD.h; sourceTree = "<group>"; };
-		3C514998273E097B00F78617 /* RAProgressHUD.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RAProgressHUD.m; sourceTree = "<group>"; };
 		3C51499A273E0B6400F78617 /* common_const.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = common_const.h; path = ../../common/common_const.h; sourceTree = "<group>"; };
 		3C51E7BB27B2599E00E61163 /* ScanOrderListViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = ScanOrderListViewController.h; path = common/Functions/OLO/ScanOrderListViewController.h; sourceTree = SOURCE_ROOT; };
 		3C51E7BC27B2599E00E61163 /* ScanOrderListViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = ScanOrderListViewController.m; path = common/Functions/OLO/ScanOrderListViewController.m; sourceTree = SOURCE_ROOT; };
@@ -461,6 +451,12 @@
 		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>"; };
+		3C70C06F2A2DC22D008C2400 /* MessageBox.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MessageBox.h; sourceTree = "<group>"; };
+		3C70C0702A2DC22D008C2400 /* PopWaitAlert.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PopWaitAlert.h; sourceTree = "<group>"; };
+		3C70C0712A2DC22D008C2400 /* RAPopviewContainer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RAPopviewContainer.h; sourceTree = "<group>"; };
+		3C70C0722A2DC22D008C2400 /* PopWaitAlert.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PopWaitAlert.m; sourceTree = "<group>"; };
+		3C70C0732A2DC22D008C2400 /* MessageBox.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MessageBox.m; sourceTree = "<group>"; };
+		3C70C0742A2DC22D008C2400 /* RAPopviewContainer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RAPopviewContainer.m; 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; };
 		3C872A1D27955CF300BE1FC8 /* scan_cart.json */ = {isa = PBXFileReference; lastKnownFileType = text.json; name = scan_cart.json; path = common/Functions/OLO/scan_cart.json; sourceTree = SOURCE_ROOT; };
@@ -754,8 +750,6 @@
 		7162A57C1C5872EF00AB630E /* HomeTableViewCellSlide.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = HomeTableViewCellSlide.m; path = common/Functions/home/HomeTableViewCellSlide.m; sourceTree = SOURCE_ROOT; };
 		7162A57D1C5872EF00AB630E /* HomeTableViewCellTopic.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = HomeTableViewCellTopic.h; path = common/Functions/home/HomeTableViewCellTopic.h; sourceTree = SOURCE_ROOT; };
 		7162A57E1C5872EF00AB630E /* HomeTableViewCellTopic.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = HomeTableViewCellTopic.m; path = common/Functions/home/HomeTableViewCellTopic.m; sourceTree = SOURCE_ROOT; };
-		7162A57F1C5872EF00AB630E /* HomeViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = HomeViewController.h; path = common/Functions/home/HomeViewController.h; sourceTree = SOURCE_ROOT; };
-		7162A5801C5872EF00AB630E /* HomeViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = HomeViewController.m; path = common/Functions/home/HomeViewController.m; sourceTree = SOURCE_ROOT; };
 		7162A5861C58733400AB630E /* CreateOrderViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CreateOrderViewController.h; path = common/Functions/order/CreateOrderViewController.h; sourceTree = SOURCE_ROOT; };
 		7162A5871C58733400AB630E /* CreateOrderViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = CreateOrderViewController.m; path = common/Functions/order/CreateOrderViewController.m; sourceTree = SOURCE_ROOT; };
 		7162A5881C58733400AB630E /* OrderDetailHtmlCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = OrderDetailHtmlCell.h; path = common/Functions/order/OrderDetailHtmlCell.h; sourceTree = SOURCE_ROOT; };
@@ -937,19 +931,6 @@
 /* End PBXFrameworksBuildPhase section */
 
 /* Begin PBXGroup section */
-		3C23B3E929CD70F9008E7C14 /* MessageBox */ = {
-			isa = PBXGroup;
-			children = (
-				3C23B3EA29CD70F9008E7C14 /* MessageBox.h */,
-				3C23B3EB29CD70F9008E7C14 /* PopWaitAlert.h */,
-				3C23B3EC29CD70F9008E7C14 /* RAPopviewContainer.h */,
-				3C23B3ED29CD70F9008E7C14 /* PopWaitAlert.m */,
-				3C23B3EE29CD70F9008E7C14 /* MessageBox.m */,
-				3C23B3EF29CD70F9008E7C14 /* RAPopviewContainer.m */,
-			);
-			path = MessageBox;
-			sourceTree = "<group>";
-		};
 		3C514975273E07C400F78617 /* EnumSelectAndSort\ */ = {
 			isa = PBXGroup;
 			children = (
@@ -1006,8 +987,6 @@
 		3C514996273E097B00F78617 /* HUD */ = {
 			isa = PBXGroup;
 			children = (
-				3C514997273E097B00F78617 /* RAProgressHUD.h */,
-				3C514998273E097B00F78617 /* RAProgressHUD.m */,
 			);
 			name = HUD;
 			path = ../../common/HUD;
@@ -1027,6 +1006,20 @@
 			path = ../../common/upload;
 			sourceTree = "<group>";
 		};
+		3C70C06E2A2DC22D008C2400 /* MessageBox */ = {
+			isa = PBXGroup;
+			children = (
+				3C70C06F2A2DC22D008C2400 /* MessageBox.h */,
+				3C70C0702A2DC22D008C2400 /* PopWaitAlert.h */,
+				3C70C0712A2DC22D008C2400 /* RAPopviewContainer.h */,
+				3C70C0722A2DC22D008C2400 /* PopWaitAlert.m */,
+				3C70C0732A2DC22D008C2400 /* MessageBox.m */,
+				3C70C0742A2DC22D008C2400 /* RAPopviewContainer.m */,
+			);
+			name = MessageBox;
+			path = ../../common/MessageBox;
+			sourceTree = "<group>";
+		};
 		3C7D31F127882A5F005EB380 /* OLO */ = {
 			isa = PBXGroup;
 			children = (
@@ -1522,7 +1515,7 @@
 		716387C71953CDB4006E65E6 /* utils */ = {
 			isa = PBXGroup;
 			children = (
-				3C23B3E929CD70F9008E7C14 /* MessageBox */,
+				3C70C06E2A2DC22D008C2400 /* MessageBox */,
 				3C51499A273E0B6400F78617 /* common_const.h */,
 				71DF74311C5757C800F2789C /* CommonUI */,
 				71C1D84C1F456CAA00CEA1C9 /* HWWeakTimer.h */,
@@ -1880,8 +1873,6 @@
 				7162A57C1C5872EF00AB630E /* HomeTableViewCellSlide.m */,
 				7162A57D1C5872EF00AB630E /* HomeTableViewCellTopic.h */,
 				7162A57E1C5872EF00AB630E /* HomeTableViewCellTopic.m */,
-				7162A57F1C5872EF00AB630E /* HomeViewController.h */,
-				7162A5801C5872EF00AB630E /* HomeViewController.m */,
 			);
 			name = HomeView;
 			sourceTree = "<group>";
@@ -2174,7 +2165,7 @@
 				7162A5B41C58738600AB630E /* ScannerControllerView.m in Sources */,
 				7162A5831C5872EF00AB630E /* HomeTableViewCellSlide.m in Sources */,
 				4289800A1E24918F005F1BD8 /* CartUtils.m in Sources */,
-				7162A5851C5872EF00AB630E /* HomeViewController.m in Sources */,
+				3C70C0772A2DC22D008C2400 /* RAPopviewContainer.m in Sources */,
 				7162A5E31C5877CE00AB630E /* WatchListViewController.m in Sources */,
 				715001FF1D114D9100F5927F /* BundleDetailButton.m in Sources */,
 				7162A5421C58719D00AB630E /* RATreeNodeCollectionController.m in Sources */,
@@ -2233,10 +2224,10 @@
 				71D01B1C1E0A2055006620CE /* TextUtils.m in Sources */,
 				7162A5981C58733400AB630E /* CreateOrderViewController.m in Sources */,
 				4289809E1E24B526005F1BD8 /* JKTimerManager.m in Sources */,
-				3C514999273E097C00F78617 /* RAProgressHUD.m in Sources */,
 				3C51494F273D095900F78617 /* CommonEditorCellAction.m in Sources */,
 				7162A5021C586F5B00AB630E /* AddressEditorViewController.m in Sources */,
 				71131F921CA1372300DBF6E2 /* SimplifiedBuyingProgramViewController.m in Sources */,
+				3C70C0752A2DC22D008C2400 /* PopWaitAlert.m in Sources */,
 				7162A55C1C58724700AB630E /* ContactListTableViewCell.m in Sources */,
 				7186C25D1C97A6EE00CB43F4 /* FunctionTestViewController.m in Sources */,
 				71C1D84E1F456CAA00CEA1C9 /* HWWeakTimer.m in Sources */,
@@ -2307,7 +2298,6 @@
 				3C514956273D097E00F78617 /* CommonEditorTableContainerView.m in Sources */,
 				7162A5E61C58781000AB630E /* iSalesNavigationController.m in Sources */,
 				7141DD631C5747CE00F7DF59 /* NSString+Base64.m in Sources */,
-				3C23B3F029CD70F9008E7C14 /* PopWaitAlert.m in Sources */,
 				71E9F6BC1F8B52DD0052C78E /* NetworkUtils.m in Sources */,
 				7162A5C41C5873BB00AB630E /* ItemSearchViewController.m in Sources */,
 				7162A5481C58719D00AB630E /* RATreeView+TableViewDataSource.m in Sources */,
@@ -2335,7 +2325,6 @@
 				428980171E24924D005F1BD8 /* SortItemViewController.m in Sources */,
 				3CF33C8B27BF4936001CBEEC /* ServerSettingViewController.m in Sources */,
 				7162A5711C58728D00AB630E /* DetailImageCell.m in Sources */,
-				3C23B3F229CD70F9008E7C14 /* RAPopviewContainer.m in Sources */,
 				7162A51A1C58704600AB630E /* ModelItemCell.m in Sources */,
 				7141DD511C57459B00F7DF59 /* qrencode.c in Sources */,
 				7162A5451C58719D00AB630E /* RATreeView.m in Sources */,
@@ -2375,9 +2364,9 @@
 				7141DD3C1C5726B700F7DF59 /* ScanApiHelper.mm in Sources */,
 				7162A5261C58706C00AB630E /* CategoryViewController.m in Sources */,
 				7162A50A1C586FC100AB630E /* NSTimer+Addition.m in Sources */,
-				3C23B3F129CD70F9008E7C14 /* MessageBox.m in Sources */,
 				3C3A5AFE27D74E50005F4EFB /* ScanResultViewController.m in Sources */,
 				3C514949273D095900F78617 /* CommonEditorCellEnum.m in Sources */,
+				3C70C0762A2DC22D008C2400 /* MessageBox.m in Sources */,
 				712AFED91DBA050200254965 /* GroupDrawable.m in Sources */,
 				3C51E7CD27B261EC00E61163 /* RAUploadManager.m in Sources */,
 			);

RedAnt ERP Mobile/HMLG Scan Order.xcodeproj/xcuserdata/ruizhang.xcuserdatad/xcschemes/xcschememanagement.plist

@@ -7,7 +7,7 @@
 		<key>HMLG Scan Order.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>3</integer>
+			<integer>4</integer>
 		</dict>
 	</dict>
 </dict>

RedAnt ERP Mobile/HMLG Scan Order/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="21507" 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="21701" targetRuntime="iOS.CocoaTouch.iPad" propertyAccessControl="none" useAutolayout="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="jsC-F8-zYF">
     <device id="ipad7_9" orientation="portrait" layout="fullscreen" appearance="light"/>
     <dependencies>
         <deployment version="4352" identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="21505"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="21678"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -696,7 +696,7 @@
                         </constraints>
                     </view>
                     <navigationItem key="navigationItem" title="Sign In" id="InA-1X-4Kd">
-                        <barButtonItem key="rightBarButtonItem" image="close" style="plain" id="Rl4-6e-kHm">
+                        <barButtonItem key="rightBarButtonItem" image="close" id="Rl4-6e-kHm">
                             <connections>
                                 <action selector="CloseClick:" destination="Q1j-qK-Nq8" id="pAM-ui-IMx"/>
                             </connections>
@@ -1582,7 +1582,7 @@
                         </constraints>
                     </view>
                     <navigationItem key="navigationItem" title="NPD" id="5uK-LV-Wk4">
-                        <barButtonItem key="rightBarButtonItem" image="close" style="plain" id="3MC-QS-uFr">
+                        <barButtonItem key="rightBarButtonItem" image="close" id="3MC-QS-uFr">
                             <connections>
                                 <action selector="CloseClick:" destination="7jS-F0-BYF" id="his-7P-5QX"/>
                             </connections>

RedAnt ERP Mobile/HMLG Scan Order/CartViewController.m

@@ -1478,6 +1478,8 @@
         [self reload_data];
     }];
     
+    //%25 逻辑应HMLG要求去掉
+    /*
     UIAlertAction *action3 = [UIAlertAction actionWithTitle:@"%25" style:UIAlertActionStyleDefault handler:^(UIAlertAction *action) {
 
 //        self.btnPrice.titleLabel.text = @"%25";
@@ -1501,7 +1503,7 @@
         [self.view addSubview:self.cartIndicatorBar];
         [self reload_data];
     }];
-    
+    */
     UIAlertAction *alertCancel = [UIAlertAction actionWithTitle:@"Cancel" style:UIAlertActionStyleCancel handler:^(UIAlertAction *action) {
         
     }];
@@ -2820,12 +2822,12 @@
     
 
     
-    NSString* product_id = [item_json valueForKey:@"product_id"];
-    
-
-    
-    
-    CGRect frame = cell.frame;
+//    NSString* product_id = [item_json valueForKey:@"product_id"];
+//
+//
+//
+//
+//    CGRect frame = cell.frame;
     cell.labelMpack.text =[NSString stringWithFormat:@"Sold in QTY of:%d", stockUom];
     
   
@@ -2956,7 +2958,7 @@
         
         cell.labelUnitPrice.text =  newunitprice;
     }
-    bool check = [[item_json valueForKey:@"check"] boolValue];
+//    bool check = [[item_json valueForKey:@"check"] boolValue];
 
     
     NSString* cart_item_id= [item_json valueForKey:@"cart_item_id"];
@@ -3380,7 +3382,7 @@
     }
     
     NSString* productID = [item_json valueForKey:@"product_id"];
-    BOOL outOfStock = [[item_json valueForKey:@"is_out_of_stock"] boolValue];
+//    BOOL outOfStock = [[item_json valueForKey:@"is_out_of_stock"] boolValue];
     
     __weak typeof(self) weakself = self;
     
@@ -4085,52 +4087,18 @@
         }
         NSString* product_id = [item_json valueForKey:@"product_id"];
         
-        int is_rate = [item_json[@"is_rate"] intValue];
+       
 
         NSMutableArray* arr=[@[] mutableCopy];
 
-        BOOL condition = outOfStock;
-#if defined(BUILD_NPD) || defined(BUILD_USAI) || defined(BUILD_UWAVER)|| defined (BUILD_CONTRAST)
-#ifdef OFFLINE_MODE
-        condition = !appDelegate.offline_mode && outOfStock;
-#endif
-        if (condition) {
-            [arr addObject:notifyMeAction];
-        }
-
-        NSDictionary *section_json = [self jsonAtSection:indexPath.section];
-        BOOL available = [[section_json objectForKey:@"available"] boolValue]; // available list
-        
-        if (self.back_order_flag && available) {
-            [arr addObject:move2BackAction];
-        }
-        
-#endif
         
-#if defined(BUILD_HOMER) || defined(BUILD_GATIT)
-#ifdef OFFLINE_MODE
-        condition = !appDelegate.offline_mode && outOfStock;
-#endif
-        if (condition) {
-            [arr addObject:notifyMeAction];
-        }
-#endif
+     
         
         if(product_id.length>0)
             [arr addObject:noteRowAction];
         
         [arr addObject:deleteRowAction];
-        
-#ifndef SCANNER_ORDER
-        if(product_id.length>0&& is_rate==0)
-            [arr addObject:addWatchAction];
-        if(appDelegate.can_set_cart_price && product_id.length>0&& is_rate==0)
-        {
-            [arr addObject:editRowAction];
-            // [arr addObject:freeRowAction];
-        }
-#endif
-
+    
         
         
         
@@ -4139,13 +4107,10 @@
         //    return @[deleteRowAction,addWatchAction, editRowAction,freeRowAction];
     } else if (appDelegate.user_type == USER_ROLE_CUSTOMER) {
         if (appDelegate.customer_type == CustomerTypeStore) {
-#ifndef SCANNER_ORDER
-//            return @[notifyMeAction,deleteRowAction,addWatchAction,editRowAction];
-            return  [UISwipeActionsConfiguration configurationWithActions:@[notifyMeAction,deleteRowAction,addWatchAction,editRowAction]];
-#else
+
 //            return @[deleteRowAction];
             return  [UISwipeActionsConfiguration configurationWithActions:@[deleteRowAction]];
-#endif
+
         } else {
             
             // normal
@@ -4182,13 +4147,10 @@
         }
     }
     else
-#ifndef SCANNER_ORDER
-//        return @[deleteRowAction,addWatchAction];
-        return  [UISwipeActionsConfiguration configurationWithActions:@[deleteRowAction,addWatchAction]];
-#else
+
 //    return @[deleteRowAction];
     return  [UISwipeActionsConfiguration configurationWithActions:@[deleteRowAction]];
-#endif
+
     
     
 }

RedAnt ERP Mobile/HMLG Scan Order/MainViewController.h

@@ -105,8 +105,8 @@
 @property (strong, nonatomic) IBOutlet UILabel *labelMode;
 -(void)topicViewSelected:(int) type _id: (int) _id;
 -(void)categoryMenuSelected:(NSString*)_id;
-- (void)switchToCagegory:(NSString* )category;
-- (void)switchToItemSearch:(NSString* )coverttype;
+//- (void)switchToCagegory:(NSString* )category;
+//- (void)switchToItemSearch:(NSString* )coverttype;
 
 
 

RedAnt ERP Mobile/HMLG Scan Order/MainViewController.m

@@ -609,35 +609,35 @@
 }
 - (void)of_test
 {
-    NSString* str =@"[\"5688\",\"5808-68\",\"DINING TBL, ACACIA VNER\",\"1\",\"123.45\",\"123.45\",\"123.45\",\"123.45\",\"123.45\",\"1\",\"10.96\",\"viet\",\"vcsf\",\"42 X 68 x 30.5H\",\"234.56\"]";
-    NSDictionary* item = [RAConvertor string2dict:str];
-    NSMutableDictionary* of = [NSMutableDictionary new];
-    for(int i=0;i<4000;i++)
-    {
-        of[[NSString stringWithFormat:@"model_%d",i]]=item;
-    }
-    
-    NSString* strof=[RAConvertor dict2string:of];
-    
-    
-           NSString* str2 = [AESCrypt encrypt:strof password:@"usai2010"];
-    NSString * str3 = [AESCrypt decrypt:@"x6P5P+DUN+s4mYoSoipdmvaPtU1mGvGGHtoqQF3GlMg=" password:@"usai2010"];
-    
-    NSString * str123 = [AESCrypt decrypt:@"706dZ9zTqNPauH3j2S7MQg==" password:@"usai"];
-//    NSString * str333 = [AESCrypt decrypt:@"RQtrNBCGKxNq6Bk5QGkPiw==" password:@"usai2010\0\0\0\0\0\0\0\0"];
-//    NSString * str33 = [AESCrypt decrypt:@"0s0+JiC2ZzoDiBGQaCnT1g==" password:@"usai2010"];
-    
-    
-    [self sortedDictionary:of];
-    
-    NSDictionary* test1 = of[@"model_1234"];
-    NSDictionary* test2 = of[@"model_9876"];
-    NSDictionary* test3 = of[@"model_4567"];
-    NSDictionary* test4 = of[@"model_7654"];
-    
-    [self of_search:of keyword:@"12"];
-    
-    
+//    NSString* str =@"[\"5688\",\"5808-68\",\"DINING TBL, ACACIA VNER\",\"1\",\"123.45\",\"123.45\",\"123.45\",\"123.45\",\"123.45\",\"1\",\"10.96\",\"viet\",\"vcsf\",\"42 X 68 x 30.5H\",\"234.56\"]";
+//    NSDictionary* item = [RAConvertor string2dict:str];
+//    NSMutableDictionary* of = [NSMutableDictionary new];
+//    for(int i=0;i<4000;i++)
+//    {
+//        of[[NSString stringWithFormat:@"model_%d",i]]=item;
+//    }
+//    
+//    NSString* strof=[RAConvertor dict2string:of];
+//    
+//    
+////           NSString* str2 = [AESCrypt encrypt:strof password:@"usai2010"];
+////    NSString * str3 = [AESCrypt decrypt:@"x6P5P+DUN+s4mYoSoipdmvaPtU1mGvGGHtoqQF3GlMg=" password:@"usai2010"];
+////
+////    NSString * str123 = [AESCrypt decrypt:@"706dZ9zTqNPauH3j2S7MQg==" password:@"usai"];
+////    NSString * str333 = [AESCrypt decrypt:@"RQtrNBCGKxNq6Bk5QGkPiw==" password:@"usai2010\0\0\0\0\0\0\0\0"];
+////    NSString * str33 = [AESCrypt decrypt:@"0s0+JiC2ZzoDiBGQaCnT1g==" password:@"usai2010"];
+//    
+//    
+//    [self sortedDictionary:of];
+//    
+////    NSDictionary* test1 = of[@"model_1234"];
+////    NSDictionary* test2 = of[@"model_9876"];
+////    NSDictionary* test3 = of[@"model_4567"];
+////    NSDictionary* test4 = of[@"model_7654"];
+//    
+//    [self of_search:of keyword:@"12"];
+//    
+//    
 }
 /**
  对字典(Key-Value)排序 区分大小写
@@ -705,7 +705,7 @@
         
     }
     
-    int a=0;
+    
     
 }
 - (void)viewDidLoad
@@ -760,7 +760,7 @@
     
 //    self.btnContact.hidden = NO;
     
-    self.automaticallyAdjustsScrollViewInsets = NO;
+  //  self.automaticallyAdjustsScrollViewInsets = NO;
     NSString* value =[DefaultAppearance get_noneappearance_value:@"DefaultColor" valuename:@"labelcolor"];
     
     if(value==nil)
@@ -943,94 +943,7 @@
 -(void) Loginout:(bool)showlogin
 {
     return;
-    UIApplication * app = [UIApplication sharedApplication];
-    AppDelegate *appDelegate = (AppDelegate *)[app delegate];
-    
-    if(appDelegate.bLogin)
-    {
-//        __block UIAlertController * waitalert = [RAUtils waiting_alert:self title:@"Sign out" completion:^{
-        
-        PopWaitAlert* pop = [RAUtils waiting_pop:@"Sign out" completion:nil];
-            [RANetwork request_logout:^(NSMutableDictionary *result) {
-                NSMutableDictionary* return_json =result;
-                
-//                [waitalert dismissViewControllerAnimated:YES completion:^{
-                
-                [pop hide];
-                    if([[return_json valueForKey:@"result"] intValue]==2)
-                    {
-                        //                    [self hideMenu];
-                        //                    [self switchToHome:nil];
-                        [appDelegate Logout];
-                        [self checklogin :false];
-                        if(showlogin)
-                        {
-                            LoginViewController * loginvc =[[UIStoryboard storyboardWithName:@"Main" bundle:nil] instantiateViewControllerWithIdentifier:@"LoginViewController"];
-                            loginvc.returnValue = ^(bool blogin){
-                                
-                                [self checklogin :true];
-                                
-                            };
-                            
-                            UINavigationController* navi = [[UINavigationController alloc] initWithRootViewController:loginvc] ;
-                            
-                            
-                            
-                            
-                            
-                            
-                            navi.modalPresentationStyle = UIModalPresentationFormSheet;//有三种状态，自己看看是哪种
-                            [self presentViewController:navi animated:YES completion:^{
-                                
-                                DebugLog(@"login present.........");
-                                
-                            }];
-                        }
-                    }
-                    else
-                    {
-                        [RAUtils message_box:@"Sign Out" message:[return_json valueForKey:@"err_msg"] completion:nil] ;
-                        
-                    }
-//                }];
-                                
-                                
-                                
-                                
-                                
-                                
-                                
-                            
-            }];
-
-//        }];
-        
-                
-    }
-    else
-    {
-        LoginViewController * loginvc =[[UIStoryboard storyboardWithName:@"Main" bundle:nil] instantiateViewControllerWithIdentifier:@"LoginViewController"];
-        loginvc.returnValue = ^(bool blogin){
-            
-            
-            [self checklogin :true];
-            
-        };
-        
-        UINavigationController* navi = [[UINavigationController alloc] initWithRootViewController:loginvc] ;
-        
-        
-        
-        
-        
-        
-        navi.modalPresentationStyle = UIModalPresentationFormSheet;//有三种状态，自己看看是哪种
-        [self presentViewController:navi animated:YES completion:^{
-            
-            DebugLog(@"login present.........");
-            
-        }];
-    }
+    // 此接口 scan order 不会调用，但为了保证公共模块变异不会报错，保留空接口。
     
 }
 
@@ -1293,8 +1206,8 @@
 //    [OLDataProvider moveScanTemp2Order];
     
 //        NSString *orderdir = [OLDataProvider getScanPath];
-    NSString* userdir = [OLDataProvider getUserPath];
-    NSString *orderPath = [orderdir stringByAppendingPathComponent:@"order.json"];
+//    NSString* userdir = [OLDataProvider getUserPath];
+//    NSString *orderPath = [orderdir stringByAppendingPathComponent:@"order.json"];
     
     
     
@@ -1376,7 +1289,7 @@
 //            }
     float p =0;
     float s =0;
-    NSDictionary* price_group = [RADataProvider get_price_group:appDelegate.price_group];
+//    NSDictionary* price_group = [RADataProvider get_price_group:appDelegate.price_group];
     int order_qty=0;
     for(int j=0;j<[RASingleton.sharedInstance.scan_cart[@"section_0"][@"count"] intValue];j++)
     {
@@ -1414,7 +1327,7 @@
     orderitem[@"purchase_time"] = [RAUtils current_date_time];
         orderitem[@"order_status"] = @"Saved Order";
     orderitem[@"order_code"] = appDelegate.order_code;
-    NSMutableDictionary* section =RASingleton.sharedInstance.scan_cart[@"section_0"];
+//    NSMutableDictionary* section =RASingleton.sharedInstance.scan_cart[@"section_0"];
 
 //        orderitem[@"model_count"] =[ NSString stringWithFormat:@"%d",order_qty];//RASingleton.sharedInstance.scan_cart[@"section_0"][@"count"] ];
     
@@ -1775,7 +1688,7 @@
 
 -(void)categoryMenuSelected:(NSString*)_id
 {
-    [self switchToCagegory:_id];
+//    [self switchToCagegory:_id];
     
     //    [self.categoryViewController showCategory];
     
@@ -2323,7 +2236,7 @@
         return;
     
     UIApplication * app = [UIApplication sharedApplication];
-    AppDelegate *appDelegate = (AppDelegate *)[app delegate];
+//    AppDelegate *appDelegate = (AppDelegate *)[app delegate];
                 [self flipFromViewController:self.current_VC toViewController:self.scanorderViewController withDirection:UIViewAnimationOptionTransitionCrossDissolve];
         
 }
@@ -2338,7 +2251,7 @@
 #pragma mark - CategoryMenuDelegate
 -(void)SelectCategory:(NSString *)category
 {
-    [self switchToCagegory:category];
+//    [self switchToCagegory:category];
     
 }
 

RedAnt ERP Mobile/common/AppDelegateBase.m

@@ -91,6 +91,11 @@
 
 #pragma mark - Setter
 
+//
+//- (void)setAlert_sold_in_quantities:(bool)alert_sold_in_quantities
+//{
+//    _alert_sold_in_quantities =alert_sold_in_quantities;
+//}
 - (void)setUrgencyDic:(NSMutableDictionary *)urgencyDic {
     _urgencyDic = urgencyDic;
     [RASingleton.sharedInstance setGlobalParameter:_urgencyDic forKey:@"urgencyDic"];
@@ -3723,7 +3728,10 @@ void UncaughtExceptionHandler(NSException *exception) {
 -(void) disconnectDevice
 {
     if(self.peripheral)
-        [self.manager cancelPeripheralConnection:self.peripheral];
+    {   [self.manager cancelPeripheralConnection:self.peripheral];
+        self.peripheral = nil;
+    }
+    [self setBLEAutoReconnect:false];
     
     if( self.bAppBTOn ==true)
        [self scanBLE];
@@ -3854,7 +3862,34 @@ void UncaughtExceptionHandler(NSException *exception) {
 }
 
 
-
+-(NSString *) NSDataToHex:(NSData *)data {
+//    NSUInteger i, len;
+//    unsigned char *buf, *bytes;
+//
+//    len = data.length;
+//    bytes = (unsigned char*)data.bytes;
+//    buf = malloc(len*2);
+//
+//    for (i=0; i<len; i++) {
+//        buf[i*2] = itoh((bytes[i] >> 4) & 0xF);
+//        buf[i*2+1] = itoh(bytes[i] & 0xF);
+//    }
+//
+//    return [[NSString alloc] initWithBytesNoCopy:buf
+//                                          length:len*2
+//                                        encoding:NSASCIIStringEncoding
+//                                    freeWhenDone:YES];
+    
+    
+    
+    NSUInteger dataLength = [data length];
+    NSMutableString *string = [NSMutableString stringWithCapacity:dataLength*2];
+    const unsigned char *dataBytes = [data bytes];
+    for (NSInteger idx = 0; idx < dataLength; ++idx) {
+        [string appendFormat:@"%02x", dataBytes[idx]];
+    }
+    return string;
+}
 
 //查到外设后，停止扫描，连接设备
 -(void)centralManager:(CBCentralManager *)central didDiscoverPeripheral:(CBPeripheral *)peripheral advertisementData:(NSDictionary *)advertisementData RSSI:(NSNumber *)RSSI
@@ -3882,6 +3917,11 @@ void UncaughtExceptionHandler(NSException *exception) {
     if (!replace) {
         [_nDevices addObject:peripheral];
         [self updateLog:[NSString stringWithFormat:@"Found device: %@ rssi: %@, UUID: %@ advertisementData: %@ ", peripheral, RSSI, peripheral.identifier, advertisementData]];
+//        advertisementData[@"kCBAdvDataManufacturerData"];
+//        NSString* a=[[NSString alloc] initWithData:advertisementData[@"kCBAdvDataManufacturerData"]   encoding:NSASCIIStringEncoding];
+//        NSString* b=[[NSString alloc] initWithData:advertisementData[@"kCBAdvDataManufacturerData"]   encoding:NSUTF8StringEncoding];
+//        NSString* d = [self NSDataToHex:advertisementData[@"kCBAdvDataManufacturerData"]];
+//        int c=0;
     }
     
     if((_eventsFeedback!=nil)&&([_eventsFeedback respondsToSelector:@selector(OnUpdateDevicesList)])){
@@ -3999,6 +4039,8 @@ void UncaughtExceptionHandler(NSException *exception) {
 }
 
 - (void)centralManager:(CBCentralManager *)central didDisconnectPeripheral:(CBPeripheral *)peripheral error:(NSError *)error {
+    if(error)
+        DebugLog(@"!Disconnect %ld   %@",error.code,[error localizedDescription]);
     [self updateLog:[NSString stringWithFormat:@"Disconnect device:[%@]", peripheral.name]];
     if((_eventsFeedback!=nil)&&([_eventsFeedback respondsToSelector:@selector(onStatusChanged:)])){
         [_eventsFeedback onStatusChanged:@"Disconnected"];
@@ -4017,7 +4059,11 @@ void UncaughtExceptionHandler(NSException *exception) {
 {
     DebugLog(@"didUpdateValueForCharacteristic from Characteristic %@",characteristic.UUID);
     NSData * data = characteristic.value;
-    
+    if(data==nil)
+    {
+        DebugLog(@"Scan Data is empty");
+        return;
+    }
     
     NSString *datastring = [[NSString alloc] initWithData:data encoding:NSUTF8StringEncoding];
     
@@ -4105,6 +4151,10 @@ void UncaughtExceptionHandler(NSException *exception) {
 - (void)peripheral:(CBPeripheral *)peripheral didUpdateNotificationStateForCharacteristic:(CBCharacteristic *)characteristic error:(NSError *)error {
     if (error) {
         DebugLog(@"Error changing notification state: %@", error.localizedDescription);
+        [self updateLog:[NSString stringWithFormat:@"Error changing notification state: %@. Disconnect", error.localizedDescription]];
+//        [self.manager cancelPeripheralConnection:self.peripheral];
+        
+       
     }
     // Notification has started
     if (characteristic.isNotifying) {
@@ -4113,7 +4163,8 @@ void UncaughtExceptionHandler(NSException *exception) {
         // so disconnect from the peripheral
         DebugLog(@"Notification stopped on %@.  Disconnecting", characteristic);
         [self updateLog:[NSString stringWithFormat:@"Notification stopped on %@.  Disconnecting", characteristic]];
-        [self.manager cancelPeripheralConnection:self.peripheral];
+//        [self.manager cancelPeripheralConnection:self.peripheral];
+        [self disconnectDevice];
     }
 }
 //用于检测中心向外设写数据是否成功

RedAnt ERP Mobile/common/ERP_Mobile_Portfolio.storyboard

@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="21701" targetRuntime="iOS.CocoaTouch.iPad" propertyAccessControl="none" useAutolayout="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="21701" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="ipad9_7" orientation="portrait" layout="fullscreen" appearance="light"/>
     <dependencies>
         <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="21678"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
-        <capability name="System colors in document resources" minToolsVersion="11.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <scenes>
@@ -34,7 +33,6 @@
                                                         <constraint firstAttribute="width" constant="175" id="cB4-0g-vPZ"/>
                                                     </constraints>
                                                     <fontDescription key="fontDescription" type="system" pointSize="17"/>
-                                                    <color key="textColor" name="labelColor" catalog="iPhoneSDK" colorSpace="catalog"/>
                                                     <nil key="highlightedColor"/>
                                                 </label>
                                                 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="1r5-8h-r4Y" userLabel="img">
@@ -64,7 +62,6 @@
                                                         <constraint firstAttribute="width" constant="175" id="YJr-PB-djd"/>
                                                     </constraints>
                                                     <fontDescription key="fontDescription" type="system" pointSize="17"/>
-                                                    <color key="textColor" name="labelColor" catalog="iPhoneSDK" colorSpace="catalog"/>
                                                     <nil key="highlightedColor"/>
                                                 </label>
                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Available QTY:" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="esh-zx-ipX">
@@ -90,7 +87,6 @@
                                                 <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="name aaaaaaaaaaaaa aaaaaaaaaa BBBBB  CCCCC" lineBreakMode="wordWrap" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="quP-Jk-B7a" userLabel="description">
                                                     <rect key="frame" x="123" y="10" width="397" height="100"/>
                                                     <fontDescription key="fontDescription" name="HelveticaNeue" family="Helvetica Neue" pointSize="22"/>
-                                                    <color key="textColor" name="labelColor" catalog="iPhoneSDK" colorSpace="catalog"/>
                                                     <nil key="highlightedColor"/>
                                                 </label>
                                             </subviews>
@@ -170,17 +166,17 @@
                                 <color key="tintColor" red="0.59999999999999998" green="0.40000000000000002" blue="0.20000000000000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                             </toolbar>
                         </subviews>
-                        <viewLayoutGuide key="safeArea" id="YKc-nG-XYX"/>
+                        <viewLayoutGuide key="safeArea" id="g6l-je-DpQ"/>
                         <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         <constraints>
-                            <constraint firstItem="cL9-GG-7lo" firstAttribute="centerX" secondItem="YKc-nG-XYX" secondAttribute="centerX" id="00t-rC-6e1"/>
-                            <constraint firstItem="ANG-AP-5Eg" firstAttribute="centerX" secondItem="YKc-nG-XYX" secondAttribute="centerX" id="4x2-dE-LVR"/>
-                            <constraint firstItem="YKc-nG-XYX" firstAttribute="bottom" secondItem="bey-MA-fr3" secondAttribute="bottom" id="8PJ-3L-XrR"/>
-                            <constraint firstItem="usD-6y-qq3" firstAttribute="trailing" secondItem="YKc-nG-XYX" secondAttribute="trailing" id="BYX-Va-OnA"/>
-                            <constraint firstItem="usD-6y-qq3" firstAttribute="leading" secondItem="YKc-nG-XYX" secondAttribute="leading" id="OAs-fD-S8l"/>
-                            <constraint firstItem="bey-MA-fr3" firstAttribute="trailing" secondItem="YKc-nG-XYX" secondAttribute="trailing" id="SzU-g5-PS1"/>
-                            <constraint firstItem="usD-6y-qq3" firstAttribute="top" secondItem="YKc-nG-XYX" secondAttribute="top" id="UWx-Nr-Aux"/>
-                            <constraint firstItem="bey-MA-fr3" firstAttribute="leading" secondItem="YKc-nG-XYX" secondAttribute="leading" id="WWu-Ew-8E8"/>
+                            <constraint firstItem="cL9-GG-7lo" firstAttribute="centerX" secondItem="g6l-je-DpQ" secondAttribute="centerX" id="00t-rC-6e1"/>
+                            <constraint firstItem="ANG-AP-5Eg" firstAttribute="centerX" secondItem="g6l-je-DpQ" secondAttribute="centerX" id="4x2-dE-LVR"/>
+                            <constraint firstItem="g6l-je-DpQ" firstAttribute="bottom" secondItem="bey-MA-fr3" secondAttribute="bottom" id="8PJ-3L-XrR"/>
+                            <constraint firstItem="usD-6y-qq3" firstAttribute="trailing" secondItem="g6l-je-DpQ" secondAttribute="trailing" id="BYX-Va-OnA"/>
+                            <constraint firstItem="usD-6y-qq3" firstAttribute="leading" secondItem="g6l-je-DpQ" secondAttribute="leading" id="OAs-fD-S8l"/>
+                            <constraint firstItem="bey-MA-fr3" firstAttribute="trailing" secondItem="g6l-je-DpQ" secondAttribute="trailing" id="SzU-g5-PS1"/>
+                            <constraint firstItem="usD-6y-qq3" firstAttribute="top" secondItem="g6l-je-DpQ" secondAttribute="top" id="UWx-Nr-Aux"/>
+                            <constraint firstItem="bey-MA-fr3" firstAttribute="leading" secondItem="g6l-je-DpQ" secondAttribute="leading" id="WWu-Ew-8E8"/>
                             <constraint firstItem="cL9-GG-7lo" firstAttribute="centerY" secondItem="aoy-3H-jC3" secondAttribute="centerY" id="pXI-Mr-1zD"/>
                             <constraint firstItem="ANG-AP-5Eg" firstAttribute="centerY" secondItem="aoy-3H-jC3" secondAttribute="centerY" id="pjc-Fa-VfM"/>
                             <constraint firstItem="bey-MA-fr3" firstAttribute="top" secondItem="usD-6y-qq3" secondAttribute="bottom" id="t7k-Kk-Yeh"/>
@@ -198,7 +194,7 @@
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="GvG-E4-m4S" userLabel="First Responder" sceneMemberID="firstResponder"/>
             </objects>
-            <point key="canvasLocation" x="564" y="-2815"/>
+            <point key="canvasLocation" x="440.625" y="-1649.4140625"/>
         </scene>
         <!--PortfolioEditQTYViewController-->
         <scene sceneID="8u3-Pe-3Wg">
@@ -252,7 +248,6 @@
                                 <constraints>
                                     <constraint firstAttribute="width" constant="180" id="U3R-C6-QEI"/>
                                 </constraints>
-                                <color key="textColor" name="labelColor" catalog="iPhoneSDK" colorSpace="catalog"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                 <textInputTraits key="textInputTraits" keyboardType="numbersAndPunctuation"/>
                                 <connections>
@@ -302,7 +297,6 @@
                                 <constraints>
                                     <constraint firstAttribute="width" constant="180" id="qd7-Sf-xHQ"/>
                                 </constraints>
-                                <color key="textColor" name="labelColor" catalog="iPhoneSDK" colorSpace="catalog"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                 <textInputTraits key="textInputTraits" keyboardType="numbersAndPunctuation"/>
                                 <connections>
@@ -325,7 +319,6 @@
                                 <constraints>
                                     <constraint firstAttribute="width" constant="180" id="Mho-aE-PyK"/>
                                 </constraints>
-                                <color key="textColor" name="labelColor" catalog="iPhoneSDK" colorSpace="catalog"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                 <textInputTraits key="textInputTraits" keyboardType="decimalPad"/>
                                 <connections>
@@ -338,7 +331,6 @@
                                 <constraints>
                                     <constraint firstAttribute="width" constant="240" id="6Sc-gE-osw"/>
                                 </constraints>
-                                <color key="textColor" name="labelColor" catalog="iPhoneSDK" colorSpace="catalog"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                 <textInputTraits key="textInputTraits" keyboardType="decimalPad"/>
                             </textField>
@@ -427,7 +419,7 @@
                                 <nil key="highlightedColor"/>
                             </label>
                         </subviews>
-                        <viewLayoutGuide key="safeArea" id="NQv-Jg-8sw"/>
+                        <viewLayoutGuide key="safeArea" id="8wC-ch-Wki"/>
                         <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         <constraints>
                             <constraint firstItem="YO5-Wc-hv3" firstAttribute="centerY" secondItem="joH-dq-9dr" secondAttribute="centerY" id="0BB-KW-9lv"/>
@@ -436,21 +428,21 @@
                             <constraint firstItem="Tf8-iU-Ipy" firstAttribute="leading" secondItem="GQa-zm-VRC" secondAttribute="leading" id="6Hw-cB-Pn4"/>
                             <constraint firstItem="ex0-jE-cOn" firstAttribute="firstBaseline" secondItem="i9L-B6-ncy" secondAttribute="firstBaseline" id="7d8-RZ-I64"/>
                             <constraint firstItem="g20-nR-GJM" firstAttribute="top" secondItem="Tf8-iU-Ipy" secondAttribute="bottom" constant="25" id="80T-ar-GwT"/>
-                            <constraint firstItem="NQv-Jg-8sw" firstAttribute="bottom" secondItem="5Z5-Sd-PeA" secondAttribute="bottom" constant="20" id="83d-hK-TNM"/>
+                            <constraint firstItem="8wC-ch-Wki" firstAttribute="bottom" secondItem="5Z5-Sd-PeA" secondAttribute="bottom" constant="20" id="83d-hK-TNM"/>
                             <constraint firstItem="26h-JF-dLL" firstAttribute="firstBaseline" secondItem="g20-nR-GJM" secondAttribute="firstBaseline" id="8k7-3t-xgl"/>
                             <constraint firstItem="qQ5-G3-Vai" firstAttribute="trailing" secondItem="26h-JF-dLL" secondAttribute="trailing" id="9eQ-cW-jem"/>
-                            <constraint firstItem="NQv-Jg-8sw" firstAttribute="trailing" secondItem="k64-66-LJI" secondAttribute="trailing" constant="60" id="AjM-Oi-4BF"/>
-                            <constraint firstItem="NQv-Jg-8sw" firstAttribute="trailing" secondItem="qQ5-G3-Vai" secondAttribute="trailing" constant="24" id="Bwp-CG-nef"/>
-                            <constraint firstItem="GQa-zm-VRC" firstAttribute="leading" secondItem="NQv-Jg-8sw" secondAttribute="leading" constant="60" id="DAt-Ey-UwC"/>
+                            <constraint firstItem="8wC-ch-Wki" firstAttribute="trailing" secondItem="k64-66-LJI" secondAttribute="trailing" constant="60" id="AjM-Oi-4BF"/>
+                            <constraint firstItem="8wC-ch-Wki" firstAttribute="trailing" secondItem="qQ5-G3-Vai" secondAttribute="trailing" constant="24" id="Bwp-CG-nef"/>
+                            <constraint firstItem="GQa-zm-VRC" firstAttribute="leading" secondItem="8wC-ch-Wki" secondAttribute="leading" constant="60" id="DAt-Ey-UwC"/>
                             <constraint firstItem="gPJ-Fo-wnW" firstAttribute="firstBaseline" secondItem="weO-dk-M11" secondAttribute="firstBaseline" id="DwG-As-jt2"/>
                             <constraint firstItem="GQa-zm-VRC" firstAttribute="leading" secondItem="O0z-WA-hqd" secondAttribute="trailing" constant="15" id="Gbt-Va-6fT"/>
                             <constraint firstItem="qQ5-G3-Vai" firstAttribute="trailing" secondItem="gPJ-Fo-wnW" secondAttribute="trailing" id="Gnk-0y-XgK"/>
                             <constraint firstItem="qQ5-G3-Vai" firstAttribute="trailing" secondItem="Ees-Xd-7k4" secondAttribute="trailing" id="L0y-O9-0Ii"/>
-                            <constraint firstItem="NQv-Jg-8sw" firstAttribute="trailing" secondItem="5Z5-Sd-PeA" secondAttribute="trailing" constant="24" id="Lfg-iL-gPq"/>
-                            <constraint firstItem="NQv-Jg-8sw" firstAttribute="trailing" secondItem="Qmo-qr-77s" secondAttribute="trailing" constant="60" id="M6k-KG-vIT"/>
+                            <constraint firstItem="8wC-ch-Wki" firstAttribute="trailing" secondItem="5Z5-Sd-PeA" secondAttribute="trailing" constant="24" id="Lfg-iL-gPq"/>
+                            <constraint firstItem="8wC-ch-Wki" firstAttribute="trailing" secondItem="Qmo-qr-77s" secondAttribute="trailing" constant="60" id="M6k-KG-vIT"/>
                             <constraint firstItem="YO5-Wc-hv3" firstAttribute="leading" secondItem="GQa-zm-VRC" secondAttribute="leading" id="Maa-ae-Z2f"/>
                             <constraint firstItem="ex0-jE-cOn" firstAttribute="leading" secondItem="i9L-B6-ncy" secondAttribute="trailing" constant="15" id="Mey-gC-7hE"/>
-                            <constraint firstItem="NQv-Jg-8sw" firstAttribute="trailing" secondItem="Qmo-qr-77s" secondAttribute="trailing" constant="60" id="OXd-Yq-2Ih"/>
+                            <constraint firstItem="8wC-ch-Wki" firstAttribute="trailing" secondItem="Qmo-qr-77s" secondAttribute="trailing" constant="60" id="OXd-Yq-2Ih"/>
                             <constraint firstItem="WMB-4W-q6p" firstAttribute="firstBaseline" secondItem="YO5-Wc-hv3" secondAttribute="firstBaseline" id="Obs-BB-7gl"/>
                             <constraint firstItem="Ees-Xd-7k4" firstAttribute="leading" secondItem="Tf8-iU-Ipy" secondAttribute="trailing" constant="8" id="Po6-KN-8u7"/>
                             <constraint firstItem="eTr-vX-bwU" firstAttribute="top" secondItem="GQa-zm-VRC" secondAttribute="bottom" constant="25" id="QXc-rA-Lof"/>
@@ -462,14 +454,14 @@
                             <constraint firstItem="Qmo-qr-77s" firstAttribute="top" secondItem="k64-66-LJI" secondAttribute="bottom" constant="8" id="U88-Vj-Wk2"/>
                             <constraint firstItem="qQ5-G3-Vai" firstAttribute="trailing" secondItem="ex0-jE-cOn" secondAttribute="trailing" id="VGJ-RS-kCu"/>
                             <constraint firstItem="YO5-Wc-hv3" firstAttribute="top" secondItem="weO-dk-M11" secondAttribute="bottom" constant="25" id="WPW-Wq-pV8"/>
-                            <constraint firstItem="Qmo-qr-77s" firstAttribute="leading" secondItem="NQv-Jg-8sw" secondAttribute="leading" constant="60" id="bWa-0Q-p8F"/>
+                            <constraint firstItem="Qmo-qr-77s" firstAttribute="leading" secondItem="8wC-ch-Wki" secondAttribute="leading" constant="60" id="bWa-0Q-p8F"/>
                             <constraint firstItem="qQ5-G3-Vai" firstAttribute="firstBaseline" secondItem="GQa-zm-VRC" secondAttribute="firstBaseline" id="bdH-in-OHP"/>
                             <constraint firstItem="eTr-vX-bwU" firstAttribute="leading" secondItem="GQa-zm-VRC" secondAttribute="leading" id="czv-3H-Jaw"/>
                             <constraint firstItem="weO-dk-M11" firstAttribute="leading" secondItem="cGx-gI-KS4" secondAttribute="trailing" constant="15" id="ekh-H9-l9H"/>
-                            <constraint firstItem="k64-66-LJI" firstAttribute="top" secondItem="NQv-Jg-8sw" secondAttribute="top" constant="20" id="ems-JO-ir8"/>
+                            <constraint firstItem="k64-66-LJI" firstAttribute="top" secondItem="8wC-ch-Wki" secondAttribute="top" constant="20" id="ems-JO-ir8"/>
                             <constraint firstItem="weO-dk-M11" firstAttribute="centerY" secondItem="cGx-gI-KS4" secondAttribute="centerY" id="faA-Cd-cQa"/>
                             <constraint firstItem="g20-nR-GJM" firstAttribute="centerY" secondItem="Xyw-kE-20W" secondAttribute="centerY" id="gFM-MB-aiW"/>
-                            <constraint firstItem="k64-66-LJI" firstAttribute="leading" secondItem="NQv-Jg-8sw" secondAttribute="leading" constant="60" id="hBt-lg-MAO"/>
+                            <constraint firstItem="k64-66-LJI" firstAttribute="leading" secondItem="8wC-ch-Wki" secondAttribute="leading" constant="60" id="hBt-lg-MAO"/>
                             <constraint firstItem="Ees-Xd-7k4" firstAttribute="firstBaseline" secondItem="Tf8-iU-Ipy" secondAttribute="firstBaseline" id="iCL-m0-w2k"/>
                             <constraint firstItem="GQa-zm-VRC" firstAttribute="top" secondItem="Qmo-qr-77s" secondAttribute="bottom" constant="25" id="js1-fc-ihm"/>
                             <constraint firstItem="weO-dk-M11" firstAttribute="leading" secondItem="GQa-zm-VRC" secondAttribute="leading" id="pba-Ud-wzt"/>
@@ -511,7 +503,7 @@
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="bGe-ri-RAl" userLabel="First Responder" sceneMemberID="firstResponder"/>
             </objects>
-            <point key="canvasLocation" x="1561" y="-2815"/>
+            <point key="canvasLocation" x="1219.53125" y="-1649.4140625"/>
         </scene>
         <!--PortfolioListViewController-->
         <scene sceneID="1tV-iB-sci">
@@ -530,7 +522,7 @@
                                 <color key="barTintColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                 <items>
                                     <navigationItem title="View Portfolios" id="St9-UE-SQI">
-                                        <barButtonItem key="rightBarButtonItem" style="plain" id="iKi-Jv-qX7">
+                                        <barButtonItem key="rightBarButtonItem" id="iKi-Jv-qX7">
                                             <searchBar key="customView" contentMode="redraw" searchBarStyle="minimal" placeholder="Name" id="4ye-Sw-UjX">
                                                 <rect key="frame" x="468" y="3" width="280" height="44"/>
                                                 <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
@@ -559,21 +551,21 @@
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="Label" textAlignment="natural" lineBreakMode="wordWrap" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="j5I-zo-iGe" userLabel="name">
-                                                    <rect key="frame" x="45" y="-47" width="23" height="51"/>
+                                                    <rect key="frame" x="15" y="8" width="201" height="50"/>
                                                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                                     <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" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="7zF-7S-Bxq" userLabel="time">
-                                                    <rect key="frame" x="-86" y="60" width="17" height="66"/>
+                                                    <rect key="frame" x="514" y="23" width="208" height="21"/>
                                                     <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/>
                                                     <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" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="Label" textAlignment="natural" lineBreakMode="wordWrap" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="FKE-5d-7eq" userLabel="name">
-                                                    <rect key="frame" x="-56" y="-60" width="80" height="27"/>
+                                                    <rect key="frame" x="209" y="8" width="769" height="50"/>
                                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
                                                     <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"/>
@@ -600,21 +592,21 @@
                                 <nil key="highlightedColor"/>
                             </label>
                         </subviews>
-                        <viewLayoutGuide key="safeArea" id="mZe-e6-73O"/>
+                        <viewLayoutGuide key="safeArea" id="WWb-vK-ElA"/>
                         <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         <constraints>
                             <constraint firstItem="GUB-XJ-Xjd" firstAttribute="top" secondItem="OvS-DC-8eY" secondAttribute="bottom" id="1Eb-r1-nfs"/>
-                            <constraint firstItem="OvS-DC-8eY" firstAttribute="top" secondItem="mZe-e6-73O" secondAttribute="top" id="49S-hC-QIn"/>
-                            <constraint firstItem="dP6-eo-w8h" firstAttribute="centerX" secondItem="mZe-e6-73O" secondAttribute="centerX" id="51m-cs-jA4"/>
-                            <constraint firstItem="GUB-XJ-Xjd" firstAttribute="leading" secondItem="mZe-e6-73O" secondAttribute="leading" id="NAD-X9-EPi"/>
-                            <constraint firstItem="MG5-Qo-QiV" firstAttribute="centerX" secondItem="mZe-e6-73O" secondAttribute="centerX" id="NJS-Lt-QRJ"/>
+                            <constraint firstItem="OvS-DC-8eY" firstAttribute="top" secondItem="WWb-vK-ElA" secondAttribute="top" id="49S-hC-QIn"/>
+                            <constraint firstItem="dP6-eo-w8h" firstAttribute="centerX" secondItem="WWb-vK-ElA" secondAttribute="centerX" id="51m-cs-jA4"/>
+                            <constraint firstItem="GUB-XJ-Xjd" firstAttribute="leading" secondItem="WWb-vK-ElA" secondAttribute="leading" id="NAD-X9-EPi"/>
+                            <constraint firstItem="MG5-Qo-QiV" firstAttribute="centerX" secondItem="WWb-vK-ElA" secondAttribute="centerX" id="NJS-Lt-QRJ"/>
                             <constraint firstItem="OvS-DC-8eY" firstAttribute="centerX" secondItem="MG5-Qo-QiV" secondAttribute="centerX" id="W4M-aO-jOh"/>
                             <constraint firstItem="OvS-DC-8eY" firstAttribute="centerX" secondItem="dP6-eo-w8h" secondAttribute="centerX" id="ezG-WL-z1s"/>
                             <constraint firstItem="OvS-DC-8eY" firstAttribute="leading" secondItem="GUB-XJ-Xjd" secondAttribute="leading" id="jEp-fw-40a"/>
                             <constraint firstItem="dP6-eo-w8h" firstAttribute="centerY" secondItem="WFW-Hb-Uqm" secondAttribute="centerY" id="tN9-2P-ZOS"/>
-                            <constraint firstItem="mZe-e6-73O" firstAttribute="bottom" secondItem="GUB-XJ-Xjd" secondAttribute="bottom" id="tPF-nl-MlC"/>
+                            <constraint firstItem="WWb-vK-ElA" firstAttribute="bottom" secondItem="GUB-XJ-Xjd" secondAttribute="bottom" id="tPF-nl-MlC"/>
                             <constraint firstItem="MG5-Qo-QiV" firstAttribute="centerY" secondItem="WFW-Hb-Uqm" secondAttribute="centerY" id="wdr-8Y-BVF"/>
-                            <constraint firstItem="GUB-XJ-Xjd" firstAttribute="trailing" secondItem="mZe-e6-73O" secondAttribute="trailing" id="xCc-C6-7dD"/>
+                            <constraint firstItem="GUB-XJ-Xjd" firstAttribute="trailing" secondItem="WWb-vK-ElA" secondAttribute="trailing" id="xCc-C6-7dD"/>
                         </constraints>
                     </view>
                     <connections>
@@ -627,7 +619,7 @@
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="qdT-Ce-tiq" userLabel="First Responder" sceneMemberID="firstResponder"/>
             </objects>
-            <point key="canvasLocation" x="2492.1599999999999" y="-2814.2933333333335"/>
+            <point key="canvasLocation" x="1947" y="-1649"/>
         </scene>
         <!--Portfolio Input Dialog-->
         <scene sceneID="MXM-3T-p81">
@@ -651,7 +643,6 @@
                             </label>
                             <textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="oWD-f5-Wg8">
                                 <rect key="frame" x="10" y="91" width="748" height="34"/>
-                                <color key="textColor" name="labelColor" catalog="iPhoneSDK" colorSpace="catalog"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                 <textInputTraits key="textInputTraits"/>
                             </textField>
@@ -663,7 +654,6 @@
                             </label>
                             <textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="vW3-hY-Gcz">
                                 <rect key="frame" x="10" y="165.5" width="748" height="34"/>
-                                <color key="textColor" name="labelColor" catalog="iPhoneSDK" colorSpace="catalog"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                 <textInputTraits key="textInputTraits"/>
                             </textField>
@@ -726,7 +716,7 @@
                                 </constraints>
                             </view>
                         </subviews>
-                        <viewLayoutGuide key="safeArea" id="Hnu-G6-TGZ"/>
+                        <viewLayoutGuide key="safeArea" id="dDq-6U-meY"/>
                         <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                         <constraints>
                             <constraint firstItem="OuM-pW-LFG" firstAttribute="leading" secondItem="Ann-Cc-MnG" secondAttribute="leading" id="0Sg-xw-UW8"/>
@@ -735,16 +725,16 @@
                             <constraint firstItem="nv4-fy-vKK" firstAttribute="leading" secondItem="oWD-f5-Wg8" secondAttribute="leading" id="A4W-5F-5Yk"/>
                             <constraint firstItem="oWD-f5-Wg8" firstAttribute="top" secondItem="OuM-pW-LFG" secondAttribute="bottom" constant="10" id="Cic-Q5-3dN"/>
                             <constraint firstItem="5IO-YO-doG" firstAttribute="width" secondItem="8UU-Rs-B6c" secondAttribute="width" id="Duk-TR-sXH"/>
-                            <constraint firstItem="5IO-YO-doG" firstAttribute="leading" secondItem="Hnu-G6-TGZ" secondAttribute="leading" id="Gk1-Vy-DbO"/>
-                            <constraint firstItem="Hnu-G6-TGZ" firstAttribute="trailing" secondItem="Ann-Cc-MnG" secondAttribute="trailing" constant="10" id="NIc-hX-0Qt"/>
+                            <constraint firstItem="5IO-YO-doG" firstAttribute="leading" secondItem="dDq-6U-meY" secondAttribute="leading" id="Gk1-Vy-DbO"/>
+                            <constraint firstItem="dDq-6U-meY" firstAttribute="trailing" secondItem="Ann-Cc-MnG" secondAttribute="trailing" constant="10" id="NIc-hX-0Qt"/>
                             <constraint firstItem="nv4-fy-vKK" firstAttribute="trailing" secondItem="oWD-f5-Wg8" secondAttribute="trailing" id="PAD-26-do7"/>
                             <constraint firstItem="2sG-qD-RU4" firstAttribute="leading" secondItem="vW3-hY-Gcz" secondAttribute="leading" id="PbO-vt-JxL"/>
                             <constraint firstItem="2sG-qD-RU4" firstAttribute="top" secondItem="5IO-YO-doG" secondAttribute="bottom" constant="5" id="Sun-LM-Hln"/>
                             <constraint firstItem="vW3-hY-Gcz" firstAttribute="trailing" secondItem="nv4-fy-vKK" secondAttribute="trailing" id="Sxh-eM-6QC"/>
                             <constraint firstItem="oWD-f5-Wg8" firstAttribute="trailing" secondItem="OuM-pW-LFG" secondAttribute="trailing" id="WKC-j1-9Mu"/>
                             <constraint firstItem="vW3-hY-Gcz" firstAttribute="leading" secondItem="nv4-fy-vKK" secondAttribute="leading" id="Zgb-i2-CMh"/>
-                            <constraint firstItem="Ann-Cc-MnG" firstAttribute="leading" secondItem="Hnu-G6-TGZ" secondAttribute="leading" constant="10" id="b4A-f1-Cxg"/>
-                            <constraint firstItem="Ann-Cc-MnG" firstAttribute="top" secondItem="Hnu-G6-TGZ" secondAttribute="top" constant="10" id="coq-Rq-zpx"/>
+                            <constraint firstItem="Ann-Cc-MnG" firstAttribute="leading" secondItem="dDq-6U-meY" secondAttribute="leading" constant="10" id="b4A-f1-Cxg"/>
+                            <constraint firstItem="Ann-Cc-MnG" firstAttribute="top" secondItem="dDq-6U-meY" secondAttribute="top" constant="10" id="coq-Rq-zpx"/>
                             <constraint firstItem="nv4-fy-vKK" firstAttribute="top" secondItem="oWD-f5-Wg8" secondAttribute="bottom" constant="10" id="eUw-n0-vhA"/>
                             <constraint firstItem="2sG-qD-RU4" firstAttribute="trailing" secondItem="vW3-hY-Gcz" secondAttribute="trailing" id="gkR-Jg-MId"/>
                             <constraint firstItem="OuM-pW-LFG" firstAttribute="top" secondItem="Ann-Cc-MnG" secondAttribute="bottom" constant="10" id="mek-0l-vgX"/>
@@ -762,7 +752,7 @@
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="958-ZU-33d" userLabel="First Responder" sceneMemberID="firstResponder"/>
             </objects>
-            <point key="canvasLocation" x="-655.36000000000001" y="-2814.2933333333335"/>
+            <point key="canvasLocation" x="-512" y="-1649"/>
         </scene>
     </scenes>
     <resources>

RedAnt ERP Mobile/common/Functions/MainViewController.m

@@ -459,7 +459,7 @@
 //    NSLog(@"decrypt:%@",[AESCrypt fastdecrypt:@"vafHUwfRPIUbPNVnKhLc5aAVK7sOFRztlfJVRHW7QVa/qGgm11E5UwfYWZEBTQpH"]);
  
     
-    self.automaticallyAdjustsScrollViewInsets = NO;
+//    self.automaticallyAdjustsScrollViewInsets = NO;
     NSString* value =[DefaultAppearance get_noneappearance_value:@"DefaultColor" valuename:@"labelcolor"];
     
     if(value==nil)

RedAnt ERP Mobile/common/Functions/camscan/ScannerViewController.m

@@ -236,7 +236,7 @@
 - (void)viewDidLoad
 {
     [super viewDidLoad];
-#ifdef SCANNER_ORDER
+
 #if TARGET_IPHONE_SIMULATOR//模拟器
     
 //    if(RASingleton.sharedInstance.enable_OfflineOrder)
@@ -248,10 +248,10 @@
     }
 
     return;
-#endif
+#else
+    
     
 
-#endif
   
 #ifdef SCANNER_ORDER
     self.auto_style = true;
@@ -454,7 +454,7 @@
 #endif
     
     
-
+#endif
 }
 //#pragma mark - ScannerControllerDelegate
 //-(void)BeginScan:(bool)begin

RedAnt ERP Mobile/common/Functions/contact/CustomerInfoViewController.m

@@ -101,7 +101,7 @@
         
     }
     return;
-#endif
+#else
     
     AppDelegate *appDelegate = (AppDelegate*)[[UIApplication sharedApplication] delegate];
     if(self.update_order && appDelegate.order_code!=nil)
@@ -146,7 +146,7 @@
         }
         
     }
-    
+#endif
     
 }
 
@@ -171,7 +171,7 @@
         
     }
     return;
-#endif
+#else
             
             
 //            __block UIAlertController * waitalert = [RAUtils waiting_alert:self title:@"Release Order" completion:^{
@@ -217,7 +217,7 @@
 
 //            }];
             
-
+#endif
         }];
         
         UIAlertAction *alertthree = [UIAlertAction actionWithTitle:@"No" style:UIAlertActionStyleCancel handler:^(UIAlertAction *action) {
@@ -250,7 +250,7 @@
         
     }
     return;
-#endif
+#else
             
             
             if(appDelegate.user_type!=USER_ROLE_CUSTOMER)
@@ -260,7 +260,7 @@
             }
             
             [self.navigationController popViewControllerAnimated:(false)];
-
+#endif
         }];
         
         UIAlertAction *alertthree = [UIAlertAction actionWithTitle:@"No" style:UIAlertActionStyleCancel handler:^(UIAlertAction *action) {

RedAnt ERP Mobile/common/Functions/offline/OLDataProvider.m

@@ -5546,6 +5546,10 @@ if(stockUom==0)
             [header setValue:[NSNumber numberWithBool:can_submit_order]   forKey:@"can_submit_order"];
             [header setValue:[NSNumber numberWithBool:can_set_tearsheet_price]   forKey:@"can_set_tearsheet_price"];
             [header setValue:[NSNumber numberWithBool:can_create_order]   forKey:@"can_create_order"];
+            
+#ifdef BUILD_CONTRAST
+            [header setValue:[NSNumber numberWithBool:1]   forKey:@"alert_sold_in_quantities"];
+#endif
             [header setObject:@(YES) forKey:@"can_create_backorder"];
             
             [header setValue:[NSNumber numberWithBool:can_update_contact_info]   forKey:@"can_update_contact_info"];

RedAnt ERP Mobile/common/Functions/order/CreateOrderViewController.m

@@ -195,7 +195,7 @@
             json=[NSData dataWithContentsOfFile:[[NSBundle mainBundle]  pathForResource:self.request_url ofType:@"json" ]];
         else
             json=[NSData dataWithContentsOfFile:self.request_url];
-        NSError *error=nil;
+//        NSError *error=nil;
         self.content_data_download = [[NSJSONSerialization JSONObjectWithData:json options:NSJSONReadingMutableLeaves error:nil] mutableCopy];
         self.content_data_control=[self translate_json:self.content_data_download changed:self.changed_data];
         
@@ -355,7 +355,7 @@
             json=[NSData dataWithContentsOfFile:[[NSBundle mainBundle]  pathForResource:self.request_url ofType:@"json" ]];
         else
             json=[NSData dataWithContentsOfFile:self.request_url];
-        NSError *error=nil;
+//        NSError *error=nil;
         self.content_data_download = [[NSJSONSerialization JSONObjectWithData:json options:NSJSONReadingMutableLeaves error:nil] mutableCopy];
         self.content_data_control=[self translate_json:self.content_data_download changed:self.changed_data];
         
@@ -633,7 +633,7 @@
     
     self.isResume = [[[NSUserDefaults standardUserDefaults] objectForKey:@"urgency_resume"] boolValue];
     self.userType = [[[NSUserDefaults standardUserDefaults] objectForKey:@"urgency_userType"] integerValue];
-    BOOL canSubmit = [[[NSUserDefaults standardUserDefaults] objectForKey:@"urgency_submitOrder"] boolValue];
+    
     
     // 检查权限
     NSMutableArray * items = [[NSMutableArray alloc]init];
@@ -686,6 +686,7 @@
         if([self.content_data_download[@"readonly"] boolValue])
            [items removeAllObjects];
 #else
+    BOOL canSubmit = [[[NSUserDefaults standardUserDefaults] objectForKey:@"urgency_submitOrder"] boolValue];
     if (!self.isResume) {
         // 正常情况
         if (appDelegate.user_type == USER_ROLE_CUSTOMER && appDelegate.customer_type == CustomerTypeStore) {
@@ -1108,7 +1109,7 @@
         
     }
     return;
-#endif
+#else
     
      AppDelegate *appDelegate = (AppDelegate*)[[UIApplication sharedApplication] delegate];
     if (self.resumeOrder) {
@@ -1167,30 +1168,30 @@
             AppDelegate *appDelegate = (AppDelegate*)[[UIApplication sharedApplication] delegate];
 //            __block UIAlertController * waitalert = [RAUtils waiting_alert:self title:@"Release Order" completion:^{
             PopWaitAlert* pop = [RAUtils waiting_pop:@"Release Order" completion:nil];
-                
-#ifdef SCANNER_ORDER
-//      if(RASingleton.sharedInstance.enable_OfflineOrder)
-      {
-          [pop hide];
-//          [waitalert dismissViewControllerAnimated:YES completion:^{
-              [OLDataProvider deleteScanOrder:appDelegate.order_code];
-              [appDelegate closeOrder];
-              
-              
-    //
-
-              
-              [self prepareReturn:nil];
-              
-              
-              
-              [self.navigationController popViewControllerAnimated:true];
-              [((MainViewController*)appDelegate.main_vc) switchToOrder];
-//          }];
-      
-          return;
-      }
-#endif
+//                
+//#ifdef SCANNER_ORDER
+////      if(RASingleton.sharedInstance.enable_OfflineOrder)
+//      {
+//          [pop hide];
+////          [waitalert dismissViewControllerAnimated:YES completion:^{
+//              [OLDataProvider deleteScanOrder:appDelegate.order_code];
+//              [appDelegate closeOrder];
+//              
+//              
+//    //
+//
+//              
+//              [self prepareReturn:nil];
+//              
+//              
+//              
+//              [self.navigationController popViewControllerAnimated:true];
+//              [((MainViewController*)appDelegate.main_vc) switchToOrder];
+////          }];
+//      
+//          return;
+//      }
+//#endif
                 
                 [RANetwork request_release_order:appDelegate.order_code withScreen:nil completionHandler:^(NSMutableDictionary *result) {
                                 NSDictionary* order_json = result;
@@ -1261,7 +1262,7 @@
         [self presentViewController:alertController animated:YES completion:nil];
         
         
-
+#endif
     
     
 }
@@ -1276,7 +1277,7 @@
         
         
     NSString *orderdir = [OLDataProvider getScanPath];
-    NSString* userdir = [OLDataProvider getUserPath];
+//    NSString* userdir = [OLDataProvider getUserPath];
     NSString *orderPath = [orderdir stringByAppendingPathComponent:@"order.json"];
     
     
@@ -1471,10 +1472,10 @@
         if([item[@"order_code"] isEqualToString: appDelegate.order_code ])
         {
             checkordercode++;
-            if(checkordercode>1)
-            {
-                int dbg=1;
-            }
+//            if(checkordercode>1)
+//            {
+//                int dbg=1;
+//            }
             continue;
         }
         else
@@ -1588,7 +1589,7 @@
 
         return;
     }
-#endif
+#else
     
     
     
@@ -1673,7 +1674,7 @@
             }];
 
 //    }];
-
+#endif
 }
 
 
@@ -2788,7 +2789,7 @@
 }
 -(NSMutableDictionary*) convertScanOrder :(NSMutableDictionary*) dict
 {
-    [[[UIApplication sharedApplication] keyWindow] endEditing:YES];
+    [[RAUtils keyWindow] endEditing:YES];
     // [[UIApplication sharedApplication] sendAction:@selector(resignFirstResponder)];
     
     
@@ -2894,8 +2895,8 @@
     AppDelegate *appDelegate = (AppDelegate*)[[UIApplication sharedApplication] delegate];
     
     
-    NSArray *paths = NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES);
-    NSString *documents = [paths objectAtIndex:0];
+//    NSArray *paths = NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES);
+//    NSString *documents = [paths objectAtIndex:0];
     
         
         
@@ -2961,7 +2962,7 @@
                     NSError* err;
                     
                     [fileManager copyItemAtURL:[NSURL fileURLWithPath:[img_cache stringByAppendingPathComponent:img_url_0]] toURL:[NSURL fileURLWithPath:[orderdir stringByAppendingPathComponent:img_url_0]] error:&err];
-                    int i=0;
+                 
                 }
                 if(img_url_1.length>0&&[fileManager fileExistsAtPath:[img_cache stringByAppendingPathComponent:img_url_1]])
                 {
@@ -3296,7 +3297,7 @@
                     StockViewController * vc =[[UIStoryboard storyboardWithName:@"SO" bundle:nil] instantiateViewControllerWithIdentifier:@"StockViewController"];
 //
 //                            NSMutableArray* testmodels =[[RAConvertor string2dict:@"[{\"model\":\"1420-1*\",\"count\":1,\"is_back_order\":true,\"etd\":\"2022-06-23\"},{\"model\":\"1420-1*\",\"count\":1,\"is_back_order\":false,\"etd\":\"2022-06-23\"}]"] mutableCopy];
-                    NSMutableArray* testmodels =[[RAConvertor string2dict:@"[{\"model\":\"1420-1*\",\"count\":1,\"is_back_order\":false,\"etd\":\"2022-06-23\"}]"] mutableCopy];
+//                    NSMutableArray* testmodels =[[RAConvertor string2dict:@"[{\"model\":\"1420-1*\",\"count\":1,\"is_back_order\":false,\"etd\":\"2022-06-23\"}]"] mutableCopy];
                     
 //                    models = testmodels;
                     
@@ -3400,7 +3401,7 @@
     }
     return;
     
-#endif
+#else
     
     [upparams setValue:@"false" forKey:@"isHold"];
 //    __block UIAlertController * waitalert = [RAUtils waiting_alert:self title:@"Order Submission" completion:^{
@@ -3492,7 +3493,7 @@
             }];
 
 //    }];
-   
+#endif
 }
 
 

RedAnt ERP Mobile/common/Functions/order/OrderListViewController.m

@@ -2011,7 +2011,7 @@ commitEditingStyle:(UITableViewCellEditingStyle)editingStyle  forRowAtIndexPath:
     NSInteger orderStatus = [[order objectForKey:@"orderStatus"] integerValue];
     NSString *so = [order objectForKey:@"so#"];
     
-    __weak typeof(self) weakself = self;
+//    __weak typeof(self) weakself = self;
     
     [RANetwork request_open_order:orderCode completionHandler:^(NSMutableDictionary *result) {
         NSDictionary* order_json = result ;

RedAnt ERP Mobile/common/Functions/sidemenu/FunctionTestViewController.m

@@ -40,7 +40,7 @@ self.airPrinterController = [UIPrintInteractionController sharedPrintController]
 
     __block UIImage* signimg=nil;
     SignatureViewController * vc =[ [UIStoryboard storyboardWithName:@"signature" bundle:[NSBundle mainBundle]] instantiateViewControllerWithIdentifier:@"SignatureViewController"];
-    __weak typeof(self) weakself = self;
+//    __weak typeof(self) weakself = self;
     vc.onReturnImg = ^(UIImage* img)
     {
         signimg = img;

RedAnt ERP Mobile/common/Functions/signature/SignatureRenderer.m

@@ -137,7 +137,7 @@
         
         
         
-        id<MTLBuffer> buffer = [view.device newBufferWithBytes:self.SignatureVertexData length:sizeof(PPSSignaturePoint)*self.vertexTotal options:nil];
+        id<MTLBuffer> buffer = [view.device newBufferWithBytes:self.SignatureVertexData length:sizeof(PPSSignaturePoint)*self.vertexTotal options:MTLResourceOptionCPUCacheModeDefault];
         [renderEncoder setVertexBuffer:buffer offset:0 atIndex:0];
         
 //        id<MTLBuffer> buffer = [view.device newBufferWithBytes:triangleVertices length:sizeof(PPSSignaturePoint)*self.vertexTotal options:nil];

RedAnt ERP Mobile/common/Functions/signature/signature.storyboard

@@ -1,8 +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">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="21701" targetRuntime="iOS.CocoaTouch.iPad" propertyAccessControl="none" useAutolayout="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="ipad9_7" orientation="portrait" layout="fullscreen" appearance="light"/>
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15704"/>
+        <deployment identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="21678"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -16,7 +17,7 @@
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                         <subviews>
                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="8MW-Bu-gt4">
-                                <rect key="frame" x="0.0" y="0.0" width="768" height="1024"/>
+                                <rect key="frame" x="0.0" y="20" width="768" height="1004"/>
                                 <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">
@@ -27,6 +28,7 @@
                                 <nil key="highlightedColor"/>
                             </label>
                         </subviews>
+                        <viewLayoutGuide key="safeArea" id="BoQ-pl-E34"/>
                         <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"/>
@@ -34,7 +36,6 @@
                             <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>
@@ -56,7 +57,7 @@
                                 <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                                 <prototypes>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" restorationIdentifier="SignatureTableViewCell" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="SignatureTableViewCell" rowHeight="128" id="pJ2-Li-nq4" customClass="SignatureTableViewCell">
-                                        <rect key="frame" x="0.0" y="28" width="376" height="128"/>
+                                        <rect key="frame" x="0.0" y="50" 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="128"/>
@@ -66,7 +67,7 @@
                                                     <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" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="npR-Us-Ywj">
+                                                <button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" 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"/>
@@ -91,8 +92,8 @@
                                 </connections>
                             </tableView>
                         </subviews>
-                        <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                         <viewLayoutGuide key="safeArea" id="ys7-OE-qUL"/>
+                        <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                     </view>
                     <toolbarItems/>
                     <navigationItem key="navigationItem" title="Title" id="XAK-aB-GtR">
@@ -115,77 +116,5 @@
             </objects>
             <point key="canvasLocation" x="2646.875" y="-4330.078125"/>
         </scene>
-        <!--Check Selector View Controller-->
-        <scene sceneID="esN-gj-lg0">
-            <objects>
-                <viewController storyboardIdentifier="CheckSelectorViewController" useStoryboardIdentifierAsRestorationIdentifier="YES" id="53f-FJ-cIp" customClass="CheckSelectorViewController" sceneMemberID="viewController">
-                    <view key="view" contentMode="scaleToFill" id="Wob-uP-qMj">
-                        <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" 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"/>
-                                <prototypes>
-                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" textLabel="g0z-bw-GId" detailTextLabel="PC3-Mi-xw7" style="IBUITableViewCellStyleSubtitle" id="9oa-xb-cvi">
-                                        <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="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">
-                                                    <rect key="frame" x="15" y="5" width="33.5" height="20.5"/>
-                                                    <autoresizingMask key="autoresizingMask"/>
-                                                    <fontDescription key="fontDescription" type="system" pointSize="17"/>
-                                                    <nil key="textColor"/>
-                                                    <nil key="highlightedColor"/>
-                                                </label>
-                                                <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="Detail" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="PC3-Mi-xw7">
-                                                    <rect key="frame" x="15" y="25.5" width="33" height="14.5"/>
-                                                    <autoresizingMask key="autoresizingMask"/>
-                                                    <fontDescription key="fontDescription" type="system" pointSize="12"/>
-                                                    <nil key="textColor"/>
-                                                    <nil key="highlightedColor"/>
-                                                </label>
-                                            </subviews>
-                                        </tableViewCellContentView>
-                                    </tableViewCell>
-                                </prototypes>
-                                <connections>
-                                    <outlet property="dataSource" destination="53f-FJ-cIp" id="keR-kb-vck"/>
-                                    <outlet property="delegate" destination="53f-FJ-cIp" id="QgW-Zo-1vd"/>
-                                </connections>
-                            </tableView>
-                            <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"/>
-                                <connections>
-                                    <action selector="OnOKClick:" destination="53f-FJ-cIp" eventType="touchUpInside" id="TXl-ow-jv5"/>
-                                </connections>
-                            </button>
-                            <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"/>
-                                <connections>
-                                    <action selector="OnCancelClick:" destination="53f-FJ-cIp" eventType="touchUpInside" id="cin-8b-BoO"/>
-                                </connections>
-                            </button>
-                        </subviews>
-                        <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
-                        <viewLayoutGuide key="safeArea" id="0An-vW-r2C"/>
-                    </view>
-                    <modalFormSheetSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
-                    <connections>
-                        <outlet property="tableView" destination="k8D-US-WZx" id="0xG-5O-sy5"/>
-                    </connections>
-                </viewController>
-                <placeholder placeholderIdentifier="IBFirstResponder" id="8Dt-jM-eNm" userLabel="First Responder" sceneMemberID="firstResponder"/>
-            </objects>
-            <point key="canvasLocation" x="3187.5" y="-4331.8359375"/>
-        </scene>
     </scenes>
 </document>

RedAnt ERP Mobile/common/common Scanner/CommonScannerSettingViewController.m

@@ -184,9 +184,14 @@
 }
 -(void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(nonnull NSIndexPath *)indexPath
 {
-    
     AppDelegate *appDelegate = (AppDelegate*)[[UIApplication sharedApplication] delegate];
     CBPeripheral *p=appDelegate.nDevices[indexPath.item];
+
+
+    // 如果点到当前连接设备，则忽略。
+    if([appDelegate.peripheral.identifier.UUIDString isEqualToString:p.identifier.UUIDString])
+        return;
+    [self onDisconnect:nil];
 //    self.needVerifyUUID=p.identifier.UUIDString;
     appDelegate.peripheral = p;
         [appDelegate.manager connectPeripheral:appDelegate.peripheral options:nil];

RedAnt ERP Mobile/common/common Scanner/commonScanner.storyboard

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="21225" 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="21701" 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="21207"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="21678"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="System colors in document resources" minToolsVersion="11.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
@@ -73,16 +73,6 @@
                             <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="-1" estimatedSectionHeaderHeight="-1" sectionFooterHeight="-1" estimatedSectionFooterHeight="-1" translatesAutoresizingMaskIntoConstraints="NO" id="ajA-cg-Bq5">
                                 <rect key="frame" x="30" y="224" width="708" height="349.5"/>
                                 <color key="backgroundColor" systemColor="systemBackgroundColor"/>
-                                <prototypes>
-                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" id="983-SP-dfI">
-                                        <rect key="frame" x="0.0" y="50" width="708" height="43.5"/>
-                                        <autoresizingMask key="autoresizingMask"/>
-                                        <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="983-SP-dfI" id="6qQ-0v-tSA">
-                                            <rect key="frame" x="0.0" y="0.0" width="708" height="43.5"/>
-                                            <autoresizingMask key="autoresizingMask"/>
-                                        </tableViewCellContentView>
-                                    </tableViewCell>
-                                </prototypes>
                                 <connections>
                                     <outlet property="dataSource" destination="Y6W-OH-hqX" id="NH0-Zb-RP5"/>
                                     <outlet property="delegate" destination="Y6W-OH-hqX" id="G27-ls-d5E"/>

RedAnt ERP Mobile/common/customUI/ImageUploadViewController.m

@@ -220,7 +220,7 @@
     }
     self.uploadProgress.progress = 0;
     
-    AppDelegate *appDelegate = (AppDelegate*)[[UIApplication sharedApplication] delegate];
+    
 #ifdef SCANNER_ORDER
 //    if(RASingleton.sharedInstance.enable_OfflineOrder)
     {
@@ -257,7 +257,8 @@
         
         return;
     }
-#endif
+#else
+    AppDelegate *appDelegate = (AppDelegate*)[[UIApplication sharedApplication] delegate];
 #ifdef OFFLINE_MODE
     if(appDelegate.offline_mode)
     {
@@ -342,6 +343,7 @@
         } DecryptHandler:nil];
         
     }
+#endif
 }
 
 

RedAnt ERP Mobile/common/data_provider/RADataProvider.m

@@ -102,39 +102,39 @@
     
     return;
     
-    NSMutableDictionary* params = [[NSMutableDictionary alloc] init];
-    AppDelegate *appDelegate = nil;
-    
-    appDelegate=(AppDelegate*)[[UIApplication sharedApplication] delegate];
-
-    [params setValue:keywords forKey:@"keyword"];
-    [params setValue:@"search" forKey:@"_method"];
-    params[@"site_name"]=[self getSiteName];
-    [params setValue:[NSString stringWithFormat:@"%ld",limit]  forKey:@"limit"];
-    [params setValue:[NSString stringWithFormat:@"%ld",offset]  forKey:@"offset"];
- 
-
-    [self request_interface:URL_SEARCH parameters:params err_record_url:nil completionHandler:result retry:0];
+//    NSMutableDictionary* params = [[NSMutableDictionary alloc] init];
+//    AppDelegate *appDelegate = nil;
+//
+//    appDelegate=(AppDelegate*)[[UIApplication sharedApplication] delegate];
+//
+//    [params setValue:keywords forKey:@"keyword"];
+//    [params setValue:@"search" forKey:@"_method"];
+//    params[@"site_name"]=[self getSiteName];
+//    [params setValue:[NSString stringWithFormat:@"%ld",limit]  forKey:@"limit"];
+//    [params setValue:[NSString stringWithFormat:@"%ld",offset]  forKey:@"offset"];
+//
+//
+//    [self request_interface:URL_SEARCH parameters:params err_record_url:nil completionHandler:result retry:0];
 
 }
 +(void)encrypt_scan_models
 {
     return;
-    NSArray *paths = NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES);
-    NSString *documents = [paths objectAtIndex:0];
-    NSString* unZipTo=[documents stringByAppendingPathComponent:@"download"];
-    NSString* templatefile = [unZipTo stringByAppendingPathComponent:@"offline_models.json"];
-
-    NSString* str = [NSString stringWithContentsOfFile:templatefile encoding:NSUTF8StringEncoding error:nil];
-    NSString * stre = [AESCrypt encrypt:str password:@"usai2010"];
-//    NSString *writePath = [NSHomeDirectory() stringByAppendingPathComponent:@"tmp/haha.txt"];
-    NSError *error;
-    [stre writeToFile:templatefile atomically:YES encoding:NSUTF8StringEncoding error:&error];
-    if (error) {
-        DebugLog(@"导出失败");
-    }else {
-        DebugLog(@"导出成功");
-    }
+//    NSArray *paths = NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES);
+//    NSString *documents = [paths objectAtIndex:0];
+//    NSString* unZipTo=[documents stringByAppendingPathComponent:@"download"];
+//    NSString* templatefile = [unZipTo stringByAppendingPathComponent:@"offline_models.json"];
+//
+//    NSString* str = [NSString stringWithContentsOfFile:templatefile encoding:NSUTF8StringEncoding error:nil];
+//    NSString * stre = [AESCrypt encrypt:str password:@"usai2010"];
+////    NSString *writePath = [NSHomeDirectory() stringByAppendingPathComponent:@"tmp/haha.txt"];
+//    NSError *error;
+//    [stre writeToFile:templatefile atomically:YES encoding:NSUTF8StringEncoding error:&error];
+//    if (error) {
+//        DebugLog(@"导出失败");
+//    }else {
+//        DebugLog(@"导出成功");
+//    }
 }
 
 +(NSArray*)request_scan_model_by_names:(NSString*)names

RedAnt ERP Mobile/common/data_provider/RANetwork.m

@@ -1635,6 +1635,7 @@ NSString *const ScreenCodeOfflineSync = @"Offline Sync Screen";
 }
 +(NSDictionary*)err_log:(NSString*) up_params result:(NSString*)result module:(NSString*) module code:(int) code//device:(NSString*) device
 {
+    
     return nil;
     NSMutableDictionary* params = [[NSMutableDictionary alloc] init];
     __block AppDelegate *appDelegate = nil;
@@ -6532,11 +6533,7 @@ NSString *const ScreenCodeOfflineSync = @"Offline Sync Screen";
 
 +(void) request_remove_cart:(NSString* ) item_ids completionHandler:(resultHandler)result
 {
-    NSMutableDictionary* params = [[NSMutableDictionary alloc] init];
-    AppDelegate *appDelegate = nil;
-    
-    
-    appDelegate=(AppDelegate*)[[UIApplication sharedApplication] delegate];
+   
     
     
 #ifdef SCANNER_ORDER
@@ -6567,7 +6564,7 @@ NSString *const ScreenCodeOfflineSync = @"Offline Sync Screen";
         {
             NSMutableDictionary* item = [section[[NSString stringWithFormat:@"item_%d",i]] mutableCopy];
             
-            int index  = [arr indexOfObject:item[@"cart_item_id"]] ;
+            long index  = [arr indexOfObject:item[@"cart_item_id"]] ;
             if(index <0)
             {
                 newsection[[NSString stringWithFormat:@"item_%d",newcount]] = item;
@@ -6584,7 +6581,12 @@ NSString *const ScreenCodeOfflineSync = @"Offline Sync Screen";
         return;
     }
     
-#endif
+#else
+    NSMutableDictionary* params = [[NSMutableDictionary alloc] init];
+    AppDelegate *appDelegate = nil;
+    
+    
+    appDelegate=(AppDelegate*)[[UIApplication sharedApplication] delegate];
     
     if(appDelegate.user!=nil)
         [params setValue:appDelegate.user forKey:@"user"];
@@ -6633,38 +6635,7 @@ NSString *const ScreenCodeOfflineSync = @"Offline Sync Screen";
         };
         result(resulti);
     } retry:0];
-    //
-    //    NSData* json=nil;
-    //    if(appDelegate.offline_mode)
-    //    {
-    //        json= [OLDataProvider offline_cartremove:params];
-    //    }
-    //    else
-    //    {
-    //    if(![self IsNetworkAvailable])
-    //        return [RAUtils error_json:RESULT_NET_NOTAVAILABLE err_msg:nil];
-    //
-    //    json=[self get_json:URL_CART_REMOVE parameters:params];
-    //    }
-    //    if(json!=nil)
-    //    {
-    //        NSError *error=nil;
-    //        NSDictionary *jsobj = [NSJSONSerialization JSONObjectWithData:json options:NSJSONReadingMutableLeaves error:&error];
-    //
-    //        int result = [[jsobj valueForKey:@"result"] intValue];
-    //
-    //        if (result==2)
-    //        {
-    //
-    //            appDelegate.cart_count = [[jsobj valueForKey:@"cart_count"] intValue];
-    //
-    //
-    //            [appDelegate update_count_mark];
-    //        }
-    //        return jsobj;
-    //    }
-    //    else
-    //        return nil;
+#endif
 }
 +(void)request_delete_account:(resultHandler)result
 {

RedAnt ERP Mobile/common/pdfCreator/ImageDrawable.m

@@ -9,7 +9,7 @@
 #import "ImageDrawable.h"
 #import "ImageUtils.h"
 //#import "iSalesDB.h"
-
+#import "RAUtils.h"
 @implementation ImageDrawable
 
 
@@ -22,8 +22,8 @@
         //        [self setDrawableTemplate:[[RAUtils string2dict:[RAUtils dict2string:drawableTemplate]]  mutableCopy] ];
         
         NSMutableDictionary * drawableTemplate = [ImageDrawable createImageTemplate:rect source_type:source_type source:source hAlign:hAlign vAlign:vAlign];
-        
-        [self setDrawableTemplate:[NSKeyedUnarchiver unarchiveObjectWithData:[NSKeyedArchiver archivedDataWithRootObject:drawableTemplate]] ];
+        [self setDrawableTemplate: [[RAUtils copyDict:drawableTemplate] mutableCopy]];
+//        [self setDrawableTemplate:[NSKeyedUnarchiver unarchiveObjectWithData:[NSKeyedArchiver archivedDataWithRootObject:drawableTemplate]] ];
         
     }
     return self;

RedAnt ERP Mobile/common/pdfCreator/PDFDrawable.m

@@ -9,7 +9,7 @@
 #import "PDFDrawable.h"
 #import "LineDrawable.h"
 #import "config.h"
-//#import "RAUtils.h"
+#import "RAUtils.h"
 
 
 @implementation PDFDrawable
@@ -32,7 +32,17 @@
 //        NSMutableDictionary* m1=[drawableTemplate mutableCopy];
 //        NSMutableDictionary* m2=[drawableTemplate mutableCopy];
 //        [self setDrawableTemplate:[[RAUtils string2dict:[RAUtils dict2string:drawableTemplate]]  mutableCopy] ];
-        [self setDrawableTemplate:[NSKeyedUnarchiver unarchiveObjectWithData:[NSKeyedArchiver archivedDataWithRootObject:drawableTemplate]] ];
+//        
+//        NSMutableDictionary* a = [NSMutableDictionary new];
+//        NSMutableDictionary* b =[NSJSONSerialization JSONObjectWithData:[NSJSONSerialization dataWithJSONObject:a options:kNilOptions error:nil]
+//    options: NSJSONReadingMutableContainers
+//      error: nil];
+        
+        
+        
+        [self setDrawableTemplate: [[RAUtils copyDict:drawableTemplate] mutableCopy]];
+        
+//        [self setDrawableTemplate:[NSKeyedUnarchiver unarchiveObjectWithData:[NSKeyedArchiver archivedDataWithRootObject:drawableTemplate]] ];
 
     }
     return self;

RedAnt ERP Mobile/common/pdfCreator/RectDrawable.h

@@ -14,6 +14,6 @@
 @property (assign, nonatomic) double  alpha;
 -(instancetype) init:(CGRect) rect color:(NSString*) color;
 -(instancetype) init:(CGRect) rect color:(NSString*) color alpha:(double) alpha;
-+(NSMutableDictionary *) createRectTemplate:(CGRect) rect color:(NSString*) color;
+//+(NSMutableDictionary *) createRectTemplate:(CGRect) rect color:(NSString*) color;
 
 @end

RedAnt ERP Mobile/common/pdfCreator/RectDrawable.m

@@ -7,7 +7,7 @@
 //
 
 #import "RectDrawable.h"
-
+#import "RAUtils.h"
 @implementation RectDrawable
 
 
@@ -29,8 +29,8 @@
         //        [self setDrawableTemplate:[[RAUtils string2dict:[RAUtils dict2string:drawableTemplate]]  mutableCopy] ];
         
         NSMutableDictionary * drawableTemplate = [RectDrawable createRectTemplate:rect color:color alpha:alpha];
-        
-        [self setDrawableTemplate:[NSKeyedUnarchiver unarchiveObjectWithData:[NSKeyedArchiver archivedDataWithRootObject:drawableTemplate]] ];
+        [self setDrawableTemplate: [[RAUtils copyDict:drawableTemplate] mutableCopy]];
+//        [self setDrawableTemplate:[NSKeyedUnarchiver unarchiveObjectWithData:[NSKeyedArchiver archivedDataWithRootObject:drawableTemplate]] ];
         
     }
     return self;

RedAnt ERP Mobile/common/pdfCreator/TableDrawable.m

@@ -9,7 +9,7 @@
 #import "TableDrawable.h"
 #import "GroupDrawable.h"
 #import "LineDrawable.h"
-
+#import "RAUtils.h"
 
 @implementation TableDrawable
 -(void) setDrawableTemplate:(NSMutableDictionary *)drawableTemplate
@@ -320,7 +320,10 @@
                         double height = between_header_and_footer.location+between_header_and_footer.length-(row_rect.origin.y);
                         if(height>0)
                         {
-                            NSMutableDictionary * fixjson =[NSKeyedUnarchiver unarchiveObjectWithData:[NSKeyedArchiver archivedDataWithRootObject:rowjson]];
+                            
+                            
+                            NSMutableDictionary * fixjson = [[RAUtils copyDict:rowjson] mutableCopy];
+//                            NSMutableDictionary * fixjson =[NSKeyedUnarchiver unarchiveObjectWithData:[NSKeyedArchiver archivedDataWithRootObject:rowjson]];
                             fixjson[@"height"]=[NSNumber numberWithInt:height];
                             fixjson[@"expand"]=@"false";
                             PDFDrawable* fix_obj= [[GroupDrawable alloc] init:fixjson];
@@ -347,7 +350,8 @@
                         double height = between_header_and_footer.location+between_header_and_footer.length-(row_rect.origin.y);
                         if(height>0)
                         {
-                            NSMutableDictionary * fixjson =[NSKeyedUnarchiver unarchiveObjectWithData:[NSKeyedArchiver archivedDataWithRootObject:rowjson]];
+                            NSMutableDictionary * fixjson = [[RAUtils copyDict:rowjson] mutableCopy];
+//                            NSMutableDictionary * fixjson =[NSKeyedUnarchiver unarchiveObjectWithData:[NSKeyedArchiver archivedDataWithRootObject:rowjson]];
                             fixjson[@"height"]=[NSNumber numberWithInt:height];
                             fixjson[@"expand"]=@"false";
                             PDFDrawable* fix_obj= [[GroupDrawable alloc] init:fixjson];

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

@@ -3,13 +3,10 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 46;
+	objectVersion = 53;
 	objects = {
 
 /* Begin PBXBuildFile section */
-		3C23B3FA29D4202A008E7C14 /* PopWaitAlert.m in Sources */ = {isa = PBXBuildFile; fileRef = 3C23B3F729D4202A008E7C14 /* PopWaitAlert.m */; };
-		3C23B3FB29D4202A008E7C14 /* MessageBox.m in Sources */ = {isa = PBXBuildFile; fileRef = 3C23B3F829D4202A008E7C14 /* MessageBox.m */; };
-		3C23B3FC29D4202A008E7C14 /* RAPopviewContainer.m in Sources */ = {isa = PBXBuildFile; fileRef = 3C23B3F929D4202A008E7C14 /* RAPopviewContainer.m */; };
 		3C284E5E29753C9900E5491B /* wrong.wav in Resources */ = {isa = PBXBuildFile; fileRef = 3C284E5D29753C9900E5491B /* wrong.wav */; };
 		3C284E6029753EAE00E5491B /* add.wav in Resources */ = {isa = PBXBuildFile; fileRef = 3C284E5F29753EAD00E5491B /* add.wav */; };
 		3C2F99B8237BE1790000808F /* PortfolioListTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 3C2F99B6237BE1790000808F /* PortfolioListTableViewCell.m */; };
@@ -47,7 +44,6 @@
 		3C514993273E091500F78617 /* ContentPreviewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 3C51498B273E091500F78617 /* ContentPreviewController.m */; };
 		3C514994273E091500F78617 /* VideoPreviewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 3C51498E273E091500F78617 /* VideoPreviewCell.m */; };
 		3C514995273E091500F78617 /* PhotoPreviewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 3C514990273E091500F78617 /* PhotoPreviewCell.m */; };
-		3C514999273E097C00F78617 /* RAProgressHUD.m in Sources */ = {isa = PBXBuildFile; fileRef = 3C514998273E097B00F78617 /* RAProgressHUD.m */; };
 		3C68314D239607B500AD5BD7 /* ytplayer.html in Resources */ = {isa = PBXBuildFile; fileRef = 3C68314A239607B500AD5BD7 /* ytplayer.html */; };
 		3C68314E239607B500AD5BD7 /* RAYTPlayer.m in Sources */ = {isa = PBXBuildFile; fileRef = 3C68314B239607B500AD5BD7 /* RAYTPlayer.m */; };
 		3C6831562396082800AD5BD7 /* ERP_Mobile_Discard.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 3C68314F2396082700AD5BD7 /* ERP_Mobile_Discard.storyboard */; };
@@ -71,6 +67,9 @@
 		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 */; };
+		3C70C06B2A2DC1E2008C2400 /* PopWaitAlert.m in Sources */ = {isa = PBXBuildFile; fileRef = 3C70C0682A2DC1E2008C2400 /* PopWaitAlert.m */; };
+		3C70C06C2A2DC1E2008C2400 /* MessageBox.m in Sources */ = {isa = PBXBuildFile; fileRef = 3C70C0692A2DC1E2008C2400 /* MessageBox.m */; };
+		3C70C06D2A2DC1E2008C2400 /* RAPopviewContainer.m in Sources */ = {isa = PBXBuildFile; fileRef = 3C70C06A2A2DC1E2008C2400 /* RAPopviewContainer.m */; };
 		3C7E5A8E237BDB0C006D0105 /* PortfolioListViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 3C7E5A8C237BDB0C006D0105 /* PortfolioListViewController.m */; };
 		3C87DB692A0E3B1D00B44F61 /* AAPLShaders.metal in Sources */ = {isa = PBXBuildFile; fileRef = 3C87DB642A0E3B1D00B44F61 /* AAPLShaders.metal */; };
 		3C87DB6A2A0E3B1D00B44F61 /* SignatureViewM.m in Sources */ = {isa = PBXBuildFile; fileRef = 3C87DB662A0E3B1D00B44F61 /* SignatureViewM.m */; };
@@ -312,12 +311,6 @@
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
-		3C23B3F429D4202A008E7C14 /* MessageBox.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MessageBox.h; sourceTree = "<group>"; };
-		3C23B3F529D4202A008E7C14 /* PopWaitAlert.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PopWaitAlert.h; sourceTree = "<group>"; };
-		3C23B3F629D4202A008E7C14 /* RAPopviewContainer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RAPopviewContainer.h; sourceTree = "<group>"; };
-		3C23B3F729D4202A008E7C14 /* PopWaitAlert.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PopWaitAlert.m; sourceTree = "<group>"; };
-		3C23B3F829D4202A008E7C14 /* MessageBox.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MessageBox.m; sourceTree = "<group>"; };
-		3C23B3F929D4202A008E7C14 /* RAPopviewContainer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RAPopviewContainer.m; sourceTree = "<group>"; };
 		3C284E5D29753C9900E5491B /* wrong.wav */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; name = wrong.wav; path = ../../../../../Downloads/wrong.wav; sourceTree = "<group>"; };
 		3C284E5F29753EAD00E5491B /* add.wav */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; path = add.wav; sourceTree = "<group>"; };
 		3C2F99B6237BE1790000808F /* PortfolioListTableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = PortfolioListTableViewCell.m; path = common/Functions/portfolio/PortfolioListTableViewCell.m; sourceTree = SOURCE_ROOT; };
@@ -383,8 +376,6 @@
 		3C51498F273E091500F78617 /* PhotoPreviewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PhotoPreviewCell.h; sourceTree = "<group>"; };
 		3C514990273E091500F78617 /* PhotoPreviewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PhotoPreviewCell.m; sourceTree = "<group>"; };
 		3C514991273E091500F78617 /* VideoPreviewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VideoPreviewCell.h; sourceTree = "<group>"; };
-		3C514997273E097B00F78617 /* RAProgressHUD.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RAProgressHUD.h; sourceTree = "<group>"; };
-		3C514998273E097B00F78617 /* RAProgressHUD.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RAProgressHUD.m; sourceTree = "<group>"; };
 		3C51499A273E0B6400F78617 /* common_const.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = common_const.h; path = ../../common/common_const.h; sourceTree = "<group>"; };
 		3C68314A239607B500AD5BD7 /* ytplayer.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; name = ytplayer.html; path = ../../common/Youtube/ytplayer.html; sourceTree = "<group>"; };
 		3C68314B239607B500AD5BD7 /* RAYTPlayer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = RAYTPlayer.m; path = ../../common/Youtube/RAYTPlayer.m; sourceTree = "<group>"; };
@@ -412,6 +403,12 @@
 		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>"; };
+		3C70C0652A2DC1E2008C2400 /* MessageBox.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MessageBox.h; sourceTree = "<group>"; };
+		3C70C0662A2DC1E2008C2400 /* PopWaitAlert.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PopWaitAlert.h; sourceTree = "<group>"; };
+		3C70C0672A2DC1E2008C2400 /* RAPopviewContainer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RAPopviewContainer.h; sourceTree = "<group>"; };
+		3C70C0682A2DC1E2008C2400 /* PopWaitAlert.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PopWaitAlert.m; sourceTree = "<group>"; };
+		3C70C0692A2DC1E2008C2400 /* MessageBox.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MessageBox.m; sourceTree = "<group>"; };
+		3C70C06A2A2DC1E2008C2400 /* RAPopviewContainer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RAPopviewContainer.m; 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; };
 		3C87DB642A0E3B1D00B44F61 /* AAPLShaders.metal */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.metal; name = AAPLShaders.metal; path = common/Functions/signature/AAPLShaders.metal; sourceTree = SOURCE_ROOT; };
@@ -866,20 +863,6 @@
 /* End PBXFrameworksBuildPhase section */
 
 /* Begin PBXGroup section */
-		3C23B3F329D4202A008E7C14 /* MessageBox */ = {
-			isa = PBXGroup;
-			children = (
-				3C23B3F429D4202A008E7C14 /* MessageBox.h */,
-				3C23B3F529D4202A008E7C14 /* PopWaitAlert.h */,
-				3C23B3F629D4202A008E7C14 /* RAPopviewContainer.h */,
-				3C23B3F729D4202A008E7C14 /* PopWaitAlert.m */,
-				3C23B3F829D4202A008E7C14 /* MessageBox.m */,
-				3C23B3F929D4202A008E7C14 /* RAPopviewContainer.m */,
-			);
-			name = MessageBox;
-			path = "HMLG Scan Order/MessageBox";
-			sourceTree = SOURCE_ROOT;
-		};
 		3C3300B529430F0A005CFE7C /* common Scanner */ = {
 			isa = PBXGroup;
 			children = (
@@ -947,13 +930,25 @@
 		3C514996273E097B00F78617 /* HUD */ = {
 			isa = PBXGroup;
 			children = (
-				3C514997273E097B00F78617 /* RAProgressHUD.h */,
-				3C514998273E097B00F78617 /* RAProgressHUD.m */,
 			);
 			name = HUD;
 			path = ../../common/HUD;
 			sourceTree = "<group>";
 		};
+		3C70C0642A2DC1E2008C2400 /* MessageBox */ = {
+			isa = PBXGroup;
+			children = (
+				3C70C0652A2DC1E2008C2400 /* MessageBox.h */,
+				3C70C0662A2DC1E2008C2400 /* PopWaitAlert.h */,
+				3C70C0672A2DC1E2008C2400 /* RAPopviewContainer.h */,
+				3C70C0682A2DC1E2008C2400 /* PopWaitAlert.m */,
+				3C70C0692A2DC1E2008C2400 /* MessageBox.m */,
+				3C70C06A2A2DC1E2008C2400 /* RAPopviewContainer.m */,
+			);
+			name = MessageBox;
+			path = ../../common/MessageBox;
+			sourceTree = "<group>";
+		};
 		3C88558E27E1D233005DC3FA /* upload */ = {
 			isa = PBXGroup;
 			children = (
@@ -1409,7 +1404,7 @@
 		716387C71953CDB4006E65E6 /* utils */ = {
 			isa = PBXGroup;
 			children = (
-				3C23B3F329D4202A008E7C14 /* MessageBox */,
+				3C70C0642A2DC1E2008C2400 /* MessageBox */,
 				3C51499A273E0B6400F78617 /* common_const.h */,
 				71C1D84C1F456CAA00CEA1C9 /* HWWeakTimer.h */,
 				71C1D84D1F456CAA00CEA1C9 /* HWWeakTimer.m */,
@@ -1909,7 +1904,8 @@
 		713F769E1929F4A7006A7305 /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 1330;
+				BuildIndependentTargetsInParallel = YES;
+				LastUpgradeCheck = 1430;
 				ORGANIZATIONNAME = "United Software Applications, Inc";
 				TargetAttributes = {
 					713F76A51929F4A7006A7305 = {
@@ -2046,6 +2042,7 @@
 				7162A5701C58728D00AB630E /* DetailHeaderCell.m in Sources */,
 				71BBA2271CEAC16000C91DED /* ZipArchive.mm in Sources */,
 				7162A5491C58719D00AB630E /* RATreeView+TableViewDelegate.m in Sources */,
+				3C70C06D2A2DC1E2008C2400 /* RAPopviewContainer.m in Sources */,
 				3C514950273D095900F78617 /* CommonEditorCellModel.m in Sources */,
 				428980451E249339005F1BD8 /* JKDotView.m in Sources */,
 				7162A5B41C58738600AB630E /* ScannerControllerView.m in Sources */,
@@ -2081,7 +2078,6 @@
 				7162A5991C58733400AB630E /* OrderDetailHtmlCell.m in Sources */,
 				7162A5091C586FC100AB630E /* CycleScrollView.m in Sources */,
 				715F30BD1DAB37EB00490EED /* OfflineUnlockViewController.m in Sources */,
-				3C23B3FB29D4202A008E7C14 /* MessageBox.m in Sources */,
 				7162A5161C58704600AB630E /* BundleModelCell.m in Sources */,
 				42DC12F11F0CD98E00A4C011 /* OrderDetailPickInfoCell.m in Sources */,
 				3C51494A273D095900F78617 /* CommonEditorCellEdit.m in Sources */,
@@ -2090,7 +2086,6 @@
 				3C51494E273D095900F78617 /* CommonEditorCellImg.m in Sources */,
 				71DF74891C57608F00F2789C /* RadioButton.m in Sources */,
 				7162A5DF1C5876E300AB630E /* ScannerSettingViewController.m in Sources */,
-				3C23B3FC29D4202A008E7C14 /* RAPopviewContainer.m in Sources */,
 				71DF74831C57608F00F2789C /* ImageScrollerView.m in Sources */,
 				71DF74871C57608F00F2789C /* NIDropDown.m in Sources */,
 				710274251CC606C4009FD219 /* UserListViewController.m in Sources */,
@@ -2107,7 +2102,6 @@
 				71D01B1C1E0A2055006620CE /* TextUtils.m in Sources */,
 				7162A5981C58733400AB630E /* CreateOrderViewController.m in Sources */,
 				4289809E1E24B526005F1BD8 /* JKTimerManager.m in Sources */,
-				3C514999273E097C00F78617 /* RAProgressHUD.m in Sources */,
 				3C51494F273D095900F78617 /* CommonEditorCellAction.m in Sources */,
 				7162A5021C586F5B00AB630E /* AddressEditorViewController.m in Sources */,
 				71131F921CA1372300DBF6E2 /* SimplifiedBuyingProgramViewController.m in Sources */,
@@ -2130,9 +2124,9 @@
 				7141DD4F1C57459B00F7DF59 /* mask.c in Sources */,
 				7162A54E1C58722200AB630E /* CreditCardEditorViewController.m in Sources */,
 				7162A5C31C5873BB00AB630E /* ItemSearchFilterViewController.m in Sources */,
-				3C23B3FA29D4202A008E7C14 /* PopWaitAlert.m in Sources */,
 				3C51497F273E07D600F78617 /* EnumSelectAndSortCell.m in Sources */,
 				71D30A2D1CFC0EF8006F9477 /* DefaultImageButton.m in Sources */,
+				3C70C06C2A2DC1E2008C2400 /* MessageBox.m in Sources */,
 				7162A5841C5872EF00AB630E /* HomeTableViewCellTopic.m in Sources */,
 				3C87DB6B2A0E3B1D00B44F61 /* SViewController.m in Sources */,
 				7162A59F1C58733400AB630E /* OrderListViewController.m in Sources */,
@@ -2213,6 +2207,7 @@
 				71BF06FE1D2F3CBA00981938 /* OfflineSettingViewController.m in Sources */,
 				71DF74341C5757DA00F2789C /* ActiveViewController.m in Sources */,
 				7162A5431C58719D00AB630E /* RATreeNodeInfo.m in Sources */,
+				3C70C06B2A2DC1E2008C2400 /* PopWaitAlert.m in Sources */,
 				3C51494B273D095900F78617 /* CommonEditorCellLabel.m in Sources */,
 				71FFBBE91C60894900D91DC2 /* iSalesDB.m in Sources */,
 				7162A55B1C58724700AB630E /* ContactAdvanceSearchViewController.m in Sources */,
@@ -2394,7 +2389,7 @@
 				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = NO;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
-				CURRENT_PROJECT_VERSION = 230116;
+				CURRENT_PROJECT_VERSION = 230608;
 				DEVELOPMENT_TEAM = HXWLAA5YN5;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
@@ -2444,7 +2439,7 @@
 				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = NO;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
-				CURRENT_PROJECT_VERSION = 230116;
+				CURRENT_PROJECT_VERSION = 230608;
 				DEVELOPMENT_TEAM = HXWLAA5YN5;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",

RedAnt ERP Mobile/iSales-CONTRAST/config.h

@@ -20,7 +20,7 @@
 #define RA_NOTIFICATION
 
 # ifdef DEBUG
-    # define test_server
+//    # define test_server
 # endif
 
 #define exception_switch 1
@@ -203,7 +203,7 @@
 #define  URL_UPDATE_AUTH  @"https://redant.contrast-inc.com/isales/login.htm"
 #define  URL_LOGOUT  @"https://redant.contrast-inc.com/isales/loginOut.htm"
 #define  URL_RETRIEVE_PASS  @"https://redant.contrast-inc.com/isales/forgotPassword.htm"
-#define  URL_ORDER_DISCOUNT  @"https://redant.contrast-inc.com/isales/setOrderItemDiscount.htm"
+#define  URL_ORDER_DISCOUNT  @"https://redant.contrast-inc.com/isales/setOrderDiscount.htm"
 #define  URL_REQUEST_CATMENU  @"https://redant.contrast-inc.com/isales/menu.htm"
 #define  URL_LOAD_HOME  @"https://redant.contrast-inc.com/isales/homePage.htm"
 #define  URL_CATEGORY @"https://redant.contrast-inc.com/isales/distinctCategory.htm"

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

@@ -7,9 +7,6 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
-		3C23B40429D4226F008E7C14 /* PopWaitAlert.m in Sources */ = {isa = PBXBuildFile; fileRef = 3C23B40129D4226F008E7C14 /* PopWaitAlert.m */; };
-		3C23B40529D4226F008E7C14 /* MessageBox.m in Sources */ = {isa = PBXBuildFile; fileRef = 3C23B40229D4226F008E7C14 /* MessageBox.m */; };
-		3C23B40629D4226F008E7C14 /* RAPopviewContainer.m in Sources */ = {isa = PBXBuildFile; fileRef = 3C23B40329D4226F008E7C14 /* RAPopviewContainer.m */; };
 		3C2F99BB237BE1880000808F /* PortfolioListTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 3C2F99BA237BE1880000808F /* PortfolioListTableViewCell.m */; };
 		3C2F99BF237BE7190000808F /* NPD_Mobile.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 3C2F99BE237BE7190000808F /* NPD_Mobile.storyboard */; };
 		3C3E26B527CDF87000EF6F5C /* UIView+Toast.m in Sources */ = {isa = PBXBuildFile; fileRef = 3C3E26B327CDF87000EF6F5C /* UIView+Toast.m */; };
@@ -34,6 +31,9 @@
 		3C6831C2239788C100AD5BD7 /* ERP_Mobile_Contact.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 3C6831BB239788C100AD5BD7 /* ERP_Mobile_Contact.storyboard */; };
 		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 */; };
+		3C70C07F2A2DC244008C2400 /* PopWaitAlert.m in Sources */ = {isa = PBXBuildFile; fileRef = 3C70C07C2A2DC244008C2400 /* PopWaitAlert.m */; };
+		3C70C0802A2DC244008C2400 /* MessageBox.m in Sources */ = {isa = PBXBuildFile; fileRef = 3C70C07D2A2DC244008C2400 /* MessageBox.m */; };
+		3C70C0812A2DC244008C2400 /* RAPopviewContainer.m in Sources */ = {isa = PBXBuildFile; fileRef = 3C70C07E2A2DC244008C2400 /* RAPopviewContainer.m */; };
 		3C7E5A91237BDB26006D0105 /* PortfolioListViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 3C7E5A8F237BDB26006D0105 /* PortfolioListViewController.m */; };
 		3CA210A82761DA66000FC2F3 /* PhotoList.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 3CA2109F2761DA66000FC2F3 /* PhotoList.storyboard */; };
 		3CA210A92761DA66000FC2F3 /* ContentPreviewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 3CA210A12761DA66000FC2F3 /* ContentPreviewController.m */; };
@@ -70,7 +70,6 @@
 		3CA211042761DC95000FC2F3 /* CommonEditor.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 3CA210FD2761DC95000FC2F3 /* CommonEditor.storyboard */; };
 		3CA211072761E9F8000FC2F3 /* DBUtil.m in Sources */ = {isa = PBXBuildFile; fileRef = 3CA211052761E9F8000FC2F3 /* DBUtil.m */; };
 		3CA2110A2761EA31000FC2F3 /* RADataProvider.m in Sources */ = {isa = PBXBuildFile; fileRef = 3CA211082761EA31000FC2F3 /* RADataProvider.m */; };
-		3CA2110E2761EA7E000FC2F3 /* RAProgressHUD.m in Sources */ = {isa = PBXBuildFile; fileRef = 3CA2110D2761EA7E000FC2F3 /* RAProgressHUD.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 */; };
@@ -302,12 +301,6 @@
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
-		3C23B3FE29D4226F008E7C14 /* MessageBox.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MessageBox.h; sourceTree = "<group>"; };
-		3C23B3FF29D4226F008E7C14 /* PopWaitAlert.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PopWaitAlert.h; sourceTree = "<group>"; };
-		3C23B40029D4226F008E7C14 /* RAPopviewContainer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RAPopviewContainer.h; sourceTree = "<group>"; };
-		3C23B40129D4226F008E7C14 /* PopWaitAlert.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PopWaitAlert.m; sourceTree = "<group>"; };
-		3C23B40229D4226F008E7C14 /* MessageBox.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MessageBox.m; sourceTree = "<group>"; };
-		3C23B40329D4226F008E7C14 /* RAPopviewContainer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RAPopviewContainer.m; sourceTree = "<group>"; };
 		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>"; };
@@ -335,6 +328,12 @@
 		3C6831BB239788C100AD5BD7 /* ERP_Mobile_Contact.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = ERP_Mobile_Contact.storyboard; path = common/ERP_Mobile_Contact.storyboard; sourceTree = SOURCE_ROOT; };
 		3C6831BC239788C100AD5BD7 /* ERP_Mobile_Search.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = ERP_Mobile_Search.storyboard; path = common/ERP_Mobile_Search.storyboard; sourceTree = SOURCE_ROOT; };
 		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; };
+		3C70C0792A2DC244008C2400 /* MessageBox.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MessageBox.h; sourceTree = "<group>"; };
+		3C70C07A2A2DC244008C2400 /* PopWaitAlert.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PopWaitAlert.h; sourceTree = "<group>"; };
+		3C70C07B2A2DC244008C2400 /* RAPopviewContainer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RAPopviewContainer.h; sourceTree = "<group>"; };
+		3C70C07C2A2DC244008C2400 /* PopWaitAlert.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PopWaitAlert.m; sourceTree = "<group>"; };
+		3C70C07D2A2DC244008C2400 /* MessageBox.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MessageBox.m; sourceTree = "<group>"; };
+		3C70C07E2A2DC244008C2400 /* RAPopviewContainer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RAPopviewContainer.m; sourceTree = "<group>"; };
 		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; };
 		3CA2109F2761DA66000FC2F3 /* PhotoList.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = PhotoList.storyboard; sourceTree = "<group>"; };
@@ -404,8 +403,6 @@
 		3CA211062761E9F8000FC2F3 /* DBUtil.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DBUtil.h; path = common/DBUtil.h; sourceTree = SOURCE_ROOT; };
 		3CA211082761EA31000FC2F3 /* RADataProvider.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = RADataProvider.m; path = common/data_provider/RADataProvider.m; sourceTree = SOURCE_ROOT; };
 		3CA211092761EA31000FC2F3 /* RADataProvider.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RADataProvider.h; path = common/data_provider/RADataProvider.h; sourceTree = SOURCE_ROOT; };
-		3CA2110C2761EA7E000FC2F3 /* RAProgressHUD.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RAProgressHUD.h; sourceTree = "<group>"; };
-		3CA2110D2761EA7E000FC2F3 /* RAProgressHUD.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RAProgressHUD.m; sourceTree = "<group>"; };
 		3CA2110F2761EBC8000FC2F3 /* common_const.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = common_const.h; path = ../../common/common_const.h; sourceTree = "<group>"; };
 		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>"; };
@@ -839,19 +836,19 @@
 /* End PBXFrameworksBuildPhase section */
 
 /* Begin PBXGroup section */
-		3C23B3FD29D4226F008E7C14 /* MessageBox */ = {
+		3C70C0782A2DC244008C2400 /* MessageBox */ = {
 			isa = PBXGroup;
 			children = (
-				3C23B3FE29D4226F008E7C14 /* MessageBox.h */,
-				3C23B3FF29D4226F008E7C14 /* PopWaitAlert.h */,
-				3C23B40029D4226F008E7C14 /* RAPopviewContainer.h */,
-				3C23B40129D4226F008E7C14 /* PopWaitAlert.m */,
-				3C23B40229D4226F008E7C14 /* MessageBox.m */,
-				3C23B40329D4226F008E7C14 /* RAPopviewContainer.m */,
+				3C70C0792A2DC244008C2400 /* MessageBox.h */,
+				3C70C07A2A2DC244008C2400 /* PopWaitAlert.h */,
+				3C70C07B2A2DC244008C2400 /* RAPopviewContainer.h */,
+				3C70C07C2A2DC244008C2400 /* PopWaitAlert.m */,
+				3C70C07D2A2DC244008C2400 /* MessageBox.m */,
+				3C70C07E2A2DC244008C2400 /* RAPopviewContainer.m */,
 			);
 			name = MessageBox;
-			path = "HMLG Scan Order/MessageBox";
-			sourceTree = SOURCE_ROOT;
+			path = ../../common/MessageBox;
+			sourceTree = "<group>";
 		};
 		3CA2109D2761DA66000FC2F3 /* PhotoList */ = {
 			isa = PBXGroup;
@@ -910,8 +907,6 @@
 		3CA2110B2761EA7E000FC2F3 /* HUD */ = {
 			isa = PBXGroup;
 			children = (
-				3CA2110C2761EA7E000FC2F3 /* RAProgressHUD.h */,
-				3CA2110D2761EA7E000FC2F3 /* RAProgressHUD.m */,
 			);
 			name = HUD;
 			path = ../../common/HUD;
@@ -1343,7 +1338,7 @@
 		716387C71953CDB4006E65E6 /* utils */ = {
 			isa = PBXGroup;
 			children = (
-				3C23B3FD29D4226F008E7C14 /* MessageBox */,
+				3C70C0782A2DC244008C2400 /* MessageBox */,
 				3CA2110F2761EBC8000FC2F3 /* common_const.h */,
 				3CA211062761E9F8000FC2F3 /* DBUtil.h */,
 				3CA211052761E9F8000FC2F3 /* DBUtil.m */,
@@ -2063,11 +2058,11 @@
 				712AFEE21DBA077F00254965 /* pdfCreator.m in Sources */,
 				71BBA2401CEAEF0700C91DED /* ioapi.c in Sources */,
 				71CB63E62109B8CC00DC90F9 /* MainHeaderViewColorPanel.m in Sources */,
-				3C23B40629D4226F008E7C14 /* RAPopviewContainer.m in Sources */,
 				7162A5461C58719D00AB630E /* RATreeView+Enums.m in Sources */,
 				7162A54B1C58719D00AB630E /* RAViewController.m in Sources */,
 				71BBA2411CEAEF0700C91DED /* mztools.c in Sources */,
 				7162A59C1C58733400AB630E /* OrderDetailPriceCell.m in Sources */,
+				3C70C07F2A2DC244008C2400 /* PopWaitAlert.m in Sources */,
 				715850461CF6F0E500856B20 /* DefaultAppearance.m in Sources */,
 				4295AE1C1FE74D46007BE365 /* CommonEditorAutoCompleteView.m in Sources */,
 				7162A5B61C58738600AB630E /* SCShapeView.m in Sources */,
@@ -2081,7 +2076,6 @@
 				3CA211072761E9F8000FC2F3 /* DBUtil.m in Sources */,
 				3CA210B42761DAF2000FC2F3 /* RAUtils.m in Sources */,
 				428980481E249339005F1BD8 /* JKMessageBoxController.m in Sources */,
-				3C23B40429D4226F008E7C14 /* PopWaitAlert.m in Sources */,
 				7162A5741C58728D00AB630E /* DetailViewController.m in Sources */,
 				7162A52A1C58713200AB630E /* CategoryCellNPD.m in Sources */,
 				71DF748E1C57608F00F2789C /* UILabel+FontAppearance.m in Sources */,
@@ -2111,6 +2105,7 @@
 				3CA210AB2761DA66000FC2F3 /* PhotoPreviewCell.m in Sources */,
 				3CA211012761DC95000FC2F3 /* CommonEditorTableContainerView.m in Sources */,
 				7162A5481C58719D00AB630E /* RATreeView+TableViewDataSource.m in Sources */,
+				3C70C0802A2DC244008C2400 /* MessageBox.m in Sources */,
 				71CB70781F99E338009FDCB7 /* RAConvertor.m in Sources */,
 				7162A5DB1C5876E300AB630E /* CacheViewController.m in Sources */,
 				7162A5C21C5873BB00AB630E /* FilterCellValue.m in Sources */,
@@ -2124,6 +2119,7 @@
 				3CA210E92761DC2C000FC2F3 /* CommonEditorCellEdit.m in Sources */,
 				7162A5471C58719D00AB630E /* RATreeView+Private.m in Sources */,
 				428980041E2490C1005F1BD8 /* NotificationNameCenter.m in Sources */,
+				3C70C0812A2DC244008C2400 /* RAPopviewContainer.m in Sources */,
 				3CA210E82761DC2C000FC2F3 /* CommonEditorCellLabel.m in Sources */,
 				4289802C1E2492D2005F1BD8 /* CategoryPriceViewController.m in Sources */,
 				71DF748D1C57608F00F2789C /* TouchLabel.m in Sources */,
@@ -2136,8 +2132,6 @@
 				7162A5451C58719D00AB630E /* RATreeView.m in Sources */,
 				71DF74841C57608F00F2789C /* ImageScrollerViewController.m in Sources */,
 				3C7E5A91237BDB26006D0105 /* PortfolioListViewController.m in Sources */,
-				3CA2110E2761EA7E000FC2F3 /* RAProgressHUD.m in Sources */,
-				3C23B40529D4226F008E7C14 /* MessageBox.m in Sources */,
 				71DF74861C57608F00F2789C /* ImageViewController.m in Sources */,
 				3CA211032761DC95000FC2F3 /* EnumSelectorCell.m in Sources */,
 				7162A5821C5872EF00AB630E /* HomeTableViewCellButtonBanner.m in Sources */,

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

@@ -2,7 +2,7 @@
 <document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="21701" targetRuntime="iOS.CocoaTouch.iPad" propertyAccessControl="none" useAutolayout="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="jsC-F8-zYF">
     <device id="ipad7_9" orientation="portrait" layout="fullscreen" appearance="light"/>
     <dependencies>
-        <deployment version="4352" identifier="iOS"/>
+        <deployment version="4864" identifier="iOS"/>
         <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="21678"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
@@ -784,7 +784,7 @@
                         </constraints>
                     </view>
                     <navigationItem key="navigationItem" title="NPD" id="InA-1X-4Kd">
-                        <barButtonItem key="rightBarButtonItem" image="close" style="plain" id="Rl4-6e-kHm">
+                        <barButtonItem key="rightBarButtonItem" image="close" id="Rl4-6e-kHm">
                             <connections>
                                 <action selector="CloseClick:" destination="Q1j-qK-Nq8" id="pAM-ui-IMx"/>
                             </connections>
@@ -1677,7 +1677,7 @@
                         </constraints>
                     </view>
                     <navigationItem key="navigationItem" title="NPD" id="5uK-LV-Wk4">
-                        <barButtonItem key="rightBarButtonItem" image="close" style="plain" id="3MC-QS-uFr">
+                        <barButtonItem key="rightBarButtonItem" image="close" id="3MC-QS-uFr">
                             <connections>
                                 <action selector="CloseClick:" destination="7jS-F0-BYF" id="his-7P-5QX"/>
                             </connections>
@@ -1819,7 +1819,7 @@ Email: redantsupport@united-us.net</string>
         </scene>
     </scenes>
     <resources>
-        <image name="about" width="96" height="96"/>
+        <image name="about" width="72" height="72"/>
         <image name="album" width="48" height="48"/>
         <image name="btn_cancel" width="102" height="30"/>
         <image name="btn_retrieve" width="102" height="30"/>

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

@@ -31,6 +31,9 @@
 		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 */; };
+		3C70C09D2A2DC277008C2400 /* PopWaitAlert.m in Sources */ = {isa = PBXBuildFile; fileRef = 3C70C09A2A2DC277008C2400 /* PopWaitAlert.m */; };
+		3C70C09E2A2DC277008C2400 /* MessageBox.m in Sources */ = {isa = PBXBuildFile; fileRef = 3C70C09B2A2DC277008C2400 /* MessageBox.m */; };
+		3C70C09F2A2DC277008C2400 /* RAPopviewContainer.m in Sources */ = {isa = PBXBuildFile; fileRef = 3C70C09C2A2DC277008C2400 /* RAPopviewContainer.m */; };
 		3C7E5A84237BDAA6006D0105 /* PortfolioListViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 3C7E5A83237BDAA6006D0105 /* PortfolioListViewController.m */; };
 		3C9FFA20274795690067830C /* RASingleton.m in Sources */ = {isa = PBXBuildFile; fileRef = 3C9FFA1F274795690067830C /* RASingleton.m */; };
 		3C9FFA26274795C90067830C /* RAUtils.m in Sources */ = {isa = PBXBuildFile; fileRef = 3C9FFA24274795C90067830C /* RAUtils.m */; };
@@ -67,7 +70,6 @@
 		3C9FFA9B274798BB0067830C /* EnumSelectAndSortCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 3C9FFA97274798BB0067830C /* EnumSelectAndSortCell.m */; };
 		3C9FFA9E274798CC0067830C /* DefaultTableHeaderView.m in Sources */ = {isa = PBXBuildFile; fileRef = 3C9FFA9C274798CC0067830C /* DefaultTableHeaderView.m */; };
 		3C9FFAA1274799040067830C /* RADataProvider.m in Sources */ = {isa = PBXBuildFile; fileRef = 3C9FFAA0274799040067830C /* RADataProvider.m */; };
-		3C9FFAA52747996B0067830C /* RAProgressHUD.m in Sources */ = {isa = PBXBuildFile; fileRef = 3C9FFAA42747996B0067830C /* RAProgressHUD.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 */; };
 		4254CCDE1FB1AC2B00C8B4B6 /* RAOrderEditorViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 4254CCDD1FB1AC2B00C8B4B6 /* RAOrderEditorViewController.m */; };
@@ -338,6 +340,12 @@
 		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>"; };
+		3C70C0972A2DC277008C2400 /* MessageBox.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MessageBox.h; sourceTree = "<group>"; };
+		3C70C0982A2DC277008C2400 /* PopWaitAlert.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PopWaitAlert.h; sourceTree = "<group>"; };
+		3C70C0992A2DC277008C2400 /* RAPopviewContainer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RAPopviewContainer.h; sourceTree = "<group>"; };
+		3C70C09A2A2DC277008C2400 /* PopWaitAlert.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PopWaitAlert.m; sourceTree = "<group>"; };
+		3C70C09B2A2DC277008C2400 /* MessageBox.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MessageBox.m; sourceTree = "<group>"; };
+		3C70C09C2A2DC277008C2400 /* RAPopviewContainer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RAPopviewContainer.m; 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; };
 		3C9FFA1E274795690067830C /* RASingleton.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RASingleton.h; path = common/RASingleton.h; sourceTree = SOURCE_ROOT; };
@@ -407,8 +415,6 @@
 		3C9FFA9D274798CC0067830C /* DefaultTableHeaderView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DefaultTableHeaderView.h; path = ../../common/customUI/commoneditor/DefaultTableHeaderView.h; sourceTree = "<group>"; };
 		3C9FFA9F274799040067830C /* RADataProvider.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RADataProvider.h; path = common/data_provider/RADataProvider.h; sourceTree = SOURCE_ROOT; };
 		3C9FFAA0274799040067830C /* RADataProvider.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = RADataProvider.m; path = common/data_provider/RADataProvider.m; sourceTree = SOURCE_ROOT; };
-		3C9FFAA32747996B0067830C /* RAProgressHUD.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RAProgressHUD.h; sourceTree = "<group>"; };
-		3C9FFAA42747996B0067830C /* RAProgressHUD.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RAProgressHUD.m; sourceTree = "<group>"; };
 		3C9FFAA6274799C90067830C /* common_const.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = common_const.h; path = ../../common/common_const.h; sourceTree = "<group>"; };
 		423CC86C21D22F40008BD2C4 /* Launch Screen.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = "Launch Screen.storyboard"; sourceTree = SOURCE_ROOT; };
 		424A02CF1FFB3A0B0088DC56 /* RABackOrderSubmitAlertController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = RABackOrderSubmitAlertController.h; path = common/Functions/order/RABackOrderSubmitAlertController.h; sourceTree = SOURCE_ROOT; };
@@ -877,6 +883,20 @@
 /* End PBXFrameworksBuildPhase section */
 
 /* Begin PBXGroup section */
+		3C70C0962A2DC277008C2400 /* MessageBox */ = {
+			isa = PBXGroup;
+			children = (
+				3C70C0972A2DC277008C2400 /* MessageBox.h */,
+				3C70C0982A2DC277008C2400 /* PopWaitAlert.h */,
+				3C70C0992A2DC277008C2400 /* RAPopviewContainer.h */,
+				3C70C09A2A2DC277008C2400 /* PopWaitAlert.m */,
+				3C70C09B2A2DC277008C2400 /* MessageBox.m */,
+				3C70C09C2A2DC277008C2400 /* RAPopviewContainer.m */,
+			);
+			name = MessageBox;
+			path = ../../common/MessageBox;
+			sourceTree = "<group>";
+		};
 		3C9FFA3A274796B30067830C /* PhotoList */ = {
 			isa = PBXGroup;
 			children = (
@@ -934,8 +954,6 @@
 		3C9FFAA22747996B0067830C /* HUD */ = {
 			isa = PBXGroup;
 			children = (
-				3C9FFAA32747996B0067830C /* RAProgressHUD.h */,
-				3C9FFAA42747996B0067830C /* RAProgressHUD.m */,
 			);
 			name = HUD;
 			path = ../../common/HUD;
@@ -1531,6 +1549,7 @@
 		716387C71953CDB4006E65E6 /* utils */ = {
 			isa = PBXGroup;
 			children = (
+				3C70C0962A2DC277008C2400 /* MessageBox */,
 				3C9FFAA6274799C90067830C /* common_const.h */,
 				3C9FFA56274797850067830C /* DBUtil.h */,
 				3C9FFA55274797840067830C /* DBUtil.m */,
@@ -2187,6 +2206,7 @@
 				7141DD5F1C5747CE00F7DF59 /* AESCrypt.m in Sources */,
 				7162A5991C58733400AB630E /* OrderDetailHtmlCell.m in Sources */,
 				7162A5091C586FC100AB630E /* CycleScrollView.m in Sources */,
+				3C70C09E2A2DC277008C2400 /* MessageBox.m in Sources */,
 				715F30BD1DAB37EB00490EED /* OfflineUnlockViewController.m in Sources */,
 				7162A5161C58704600AB630E /* BundleModelCell.m in Sources */,
 				42DC12F11F0CD98E00A4C011 /* OrderDetailPickInfoCell.m in Sources */,
@@ -2196,6 +2216,7 @@
 				7162A5DF1C5876E300AB630E /* ScannerSettingViewController.m in Sources */,
 				3C9FFA53274797460067830C /* StrikethroughLabel.m in Sources */,
 				71DF74831C57608F00F2789C /* ImageScrollerView.m in Sources */,
+				3C70C09F2A2DC277008C2400 /* RAPopviewContainer.m in Sources */,
 				71DF74871C57608F00F2789C /* NIDropDown.m in Sources */,
 				710274251CC606C4009FD219 /* UserListViewController.m in Sources */,
 				7141DD551C57459B00F7DF59 /* split.c in Sources */,
@@ -2235,6 +2256,7 @@
 				71D30A2D1CFC0EF8006F9477 /* DefaultImageButton.m in Sources */,
 				7162A5841C5872EF00AB630E /* HomeTableViewCellTopic.m in Sources */,
 				7162A59F1C58733400AB630E /* OrderListViewController.m in Sources */,
+				3C70C09D2A2DC277008C2400 /* PopWaitAlert.m in Sources */,
 				4254CCDE1FB1AC2B00C8B4B6 /* RAOrderEditorViewController.m in Sources */,
 				712AFEE21DBA077F00254965 /* pdfCreator.m in Sources */,
 				71BBA2401CEAEF0700C91DED /* ioapi.c in Sources */,
@@ -2267,7 +2289,6 @@
 				4289802E1E2492D2005F1BD8 /* SetCategoryPriceController.m in Sources */,
 				71D01B1A1E0A2055006620CE /* ImageUtils.m in Sources */,
 				3C9FFA84274798670067830C /* DatePickerViewController.m in Sources */,
-				3C9FFAA52747996B0067830C /* RAProgressHUD.m in Sources */,
 				7141DD521C57459B00F7DF59 /* qrinput.c in Sources */,
 				7162A5601C58724700AB630E /* CustomerEditViewController.m in Sources */,
 				7162A5DC1C5876E300AB630E /* LoginViewController.m in Sources */,
@@ -2507,7 +2528,7 @@
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "iSales-TRADESHOW/iSales-TRADESHOW-Prefix.pch";
 				INFOPLIST_FILE = "$(SRCROOT)/iSales-TRADESHOW/iSales-TRADESHOW-Info.plist";
-				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 				LIBRARY_SEARCH_PATHS = (
 					"$(PROJECT_DIR)/ScanApiSDK-10.2.227-2/lib",
 					"$(PROJECT_DIR)/GoogleAnalytics/GoogleAnalytics/Libraries",
@@ -2551,7 +2572,7 @@
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "iSales-TRADESHOW/iSales-TRADESHOW-Prefix.pch";
 				INFOPLIST_FILE = "$(SRCROOT)/iSales-TRADESHOW/iSales-TRADESHOW-Info.plist";
-				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 				LIBRARY_SEARCH_PATHS = (
 					"$(PROJECT_DIR)/ScanApiSDK-10.2.227-2/lib",
 					"$(PROJECT_DIR)/GoogleAnalytics/GoogleAnalytics/Libraries",

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

@@ -45,8 +45,10 @@
 		3C3F4EF1276B33EC00B091AE /* TouchImageView.m in Sources */ = {isa = PBXBuildFile; fileRef = 3C3F4EED276B33EC00B091AE /* TouchImageView.m */; };
 		3C3F4EF4276B342A00B091AE /* RADataProvider.m in Sources */ = {isa = PBXBuildFile; fileRef = 3C3F4EF2276B342A00B091AE /* RADataProvider.m */; };
 		3C3F4EF7276B346200B091AE /* DBUtil.m in Sources */ = {isa = PBXBuildFile; fileRef = 3C3F4EF6276B346200B091AE /* DBUtil.m */; };
-		3C3F4EFB276B34AD00B091AE /* RAProgressHUD.m in Sources */ = {isa = PBXBuildFile; fileRef = 3C3F4EFA276B34AD00B091AE /* RAProgressHUD.m */; };
 		3C623FD5237566A800780211 /* CommonEditor.iPad.xib in Resources */ = {isa = PBXBuildFile; fileRef = 3C623FD4237566A800780211 /* CommonEditor.iPad.xib */; };
+		3C70C0932A2DC269008C2400 /* PopWaitAlert.m in Sources */ = {isa = PBXBuildFile; fileRef = 3C70C0902A2DC269008C2400 /* PopWaitAlert.m */; };
+		3C70C0942A2DC269008C2400 /* MessageBox.m in Sources */ = {isa = PBXBuildFile; fileRef = 3C70C0912A2DC269008C2400 /* MessageBox.m */; };
+		3C70C0952A2DC269008C2400 /* RAPopviewContainer.m in Sources */ = {isa = PBXBuildFile; fileRef = 3C70C0922A2DC269008C2400 /* RAPopviewContainer.m */; };
 		3C7E5A81237BD953006D0105 /* PortfolioListViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 3C7E5A7F237BD952006D0105 /* PortfolioListViewController.m */; };
 		3C9BED082373FED40052241C /* iPadCommonEditorCellSignature.xib in Resources */ = {isa = PBXBuildFile; fileRef = 3C9BED072373FED40052241C /* iPadCommonEditorCellSignature.xib */; };
 		3C9BED0A2373FF1B0052241C /* iPadCommonEditorCellSwitch.xib in Resources */ = {isa = PBXBuildFile; fileRef = 3C9BED092373FF1B0052241C /* iPadCommonEditorCellSwitch.xib */; };
@@ -375,10 +377,14 @@
 		3C3F4EF3276B342A00B091AE /* RADataProvider.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RADataProvider.h; path = common/data_provider/RADataProvider.h; sourceTree = SOURCE_ROOT; };
 		3C3F4EF5276B346200B091AE /* DBUtil.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DBUtil.h; path = common/DBUtil.h; sourceTree = SOURCE_ROOT; };
 		3C3F4EF6276B346200B091AE /* DBUtil.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = DBUtil.m; path = common/DBUtil.m; sourceTree = SOURCE_ROOT; };
-		3C3F4EF9276B34AD00B091AE /* RAProgressHUD.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RAProgressHUD.h; sourceTree = "<group>"; };
-		3C3F4EFA276B34AD00B091AE /* RAProgressHUD.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RAProgressHUD.m; sourceTree = "<group>"; };
 		3C3F4EFC276B34F400B091AE /* common_const.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = common_const.h; path = ../../common/common_const.h; sourceTree = "<group>"; };
 		3C623FD4237566A800780211 /* CommonEditor.iPad.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = CommonEditor.iPad.xib; path = ../../common/customUI/CommonEditoriPad/CommonEditor.iPad.xib; sourceTree = "<group>"; };
+		3C70C08D2A2DC269008C2400 /* MessageBox.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MessageBox.h; sourceTree = "<group>"; };
+		3C70C08E2A2DC269008C2400 /* PopWaitAlert.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PopWaitAlert.h; sourceTree = "<group>"; };
+		3C70C08F2A2DC269008C2400 /* RAPopviewContainer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RAPopviewContainer.h; sourceTree = "<group>"; };
+		3C70C0902A2DC269008C2400 /* PopWaitAlert.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PopWaitAlert.m; sourceTree = "<group>"; };
+		3C70C0912A2DC269008C2400 /* MessageBox.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MessageBox.m; sourceTree = "<group>"; };
+		3C70C0922A2DC269008C2400 /* RAPopviewContainer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RAPopviewContainer.m; sourceTree = "<group>"; };
 		3C7E5A7F237BD952006D0105 /* PortfolioListViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = PortfolioListViewController.m; path = common/Functions/portfolio/PortfolioListViewController.m; sourceTree = SOURCE_ROOT; };
 		3C7E5A80237BD953006D0105 /* PortfolioListViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PortfolioListViewController.h; path = common/Functions/portfolio/PortfolioListViewController.h; sourceTree = SOURCE_ROOT; };
 		3C9BED072373FED40052241C /* iPadCommonEditorCellSignature.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = iPadCommonEditorCellSignature.xib; path = ../../common/customUI/CommonEditoriPad/iPadCommonEditorCellSignature.xib; sourceTree = "<group>"; };
@@ -895,13 +901,25 @@
 		3C3F4EF8276B34AD00B091AE /* HUD */ = {
 			isa = PBXGroup;
 			children = (
-				3C3F4EF9276B34AD00B091AE /* RAProgressHUD.h */,
-				3C3F4EFA276B34AD00B091AE /* RAProgressHUD.m */,
 			);
 			name = HUD;
 			path = ../../common/HUD;
 			sourceTree = "<group>";
 		};
+		3C70C08C2A2DC269008C2400 /* MessageBox */ = {
+			isa = PBXGroup;
+			children = (
+				3C70C08D2A2DC269008C2400 /* MessageBox.h */,
+				3C70C08E2A2DC269008C2400 /* PopWaitAlert.h */,
+				3C70C08F2A2DC269008C2400 /* RAPopviewContainer.h */,
+				3C70C0902A2DC269008C2400 /* PopWaitAlert.m */,
+				3C70C0912A2DC269008C2400 /* MessageBox.m */,
+				3C70C0922A2DC269008C2400 /* RAPopviewContainer.m */,
+			);
+			name = MessageBox;
+			path = ../../common/MessageBox;
+			sourceTree = "<group>";
+		};
 		3C9FFA29274796620067830C /* PhotoList */ = {
 			isa = PBXGroup;
 			children = (
@@ -1533,6 +1551,7 @@
 		716387C71953CDB4006E65E6 /* utils */ = {
 			isa = PBXGroup;
 			children = (
+				3C70C08C2A2DC269008C2400 /* MessageBox */,
 				3C3F4EFC276B34F400B091AE /* common_const.h */,
 				3C3F4EF5276B346200B091AE /* DBUtil.h */,
 				3C3F4EF6276B346200B091AE /* DBUtil.m */,
@@ -2201,6 +2220,7 @@
 				71DF74891C57608F00F2789C /* RadioButton.m in Sources */,
 				7162A5DF1C5876E300AB630E /* ScannerSettingViewController.m in Sources */,
 				71DF74831C57608F00F2789C /* ImageScrollerView.m in Sources */,
+				3C70C0952A2DC269008C2400 /* RAPopviewContainer.m in Sources */,
 				71DF74871C57608F00F2789C /* NIDropDown.m in Sources */,
 				3C3F4E9E276B326300B091AE /* RASingleton.m in Sources */,
 				710274251CC606C4009FD219 /* UserListViewController.m in Sources */,
@@ -2213,13 +2233,13 @@
 				3C9FFA23274795B20067830C /* RAUtils.m in Sources */,
 				7162A5731C58728D00AB630E /* DetailTopicCell.m in Sources */,
 				71BBA2421CEAEF0700C91DED /* unzip.c in Sources */,
+				3C70C0932A2DC269008C2400 /* PopWaitAlert.m in Sources */,
 				7162A5AC1C58735900AB630E /* PortfolioViewController.m in Sources */,
 				71D01B1C1E0A2055006620CE /* TextUtils.m in Sources */,
 				7162A5981C58733400AB630E /* CreateOrderViewController.m in Sources */,
 				3C3F4EC8276B330F00B091AE /* CommonEditorCellMAction.m in Sources */,
 				4289809E1E24B526005F1BD8 /* JKTimerManager.m in Sources */,
 				7162A5021C586F5B00AB630E /* AddressEditorViewController.m in Sources */,
-				3C3F4EFB276B34AD00B091AE /* RAProgressHUD.m in Sources */,
 				71131F921CA1372300DBF6E2 /* SimplifiedBuyingProgramViewController.m in Sources */,
 				7162A55C1C58724700AB630E /* ContactListTableViewCell.m in Sources */,
 				7186C25D1C97A6EE00CB43F4 /* FunctionTestViewController.m in Sources */,
@@ -2335,6 +2355,7 @@
 				7162A5181C58704600AB630E /* CartViewController.m in Sources */,
 				42BF67CC1E5179970081F90A /* ERPUtils.m in Sources */,
 				42FD1A031FBD1A3000C5D9A8 /* RAOrderPreviewController.m in Sources */,
+				3C70C0942A2DC269008C2400 /* MessageBox.m in Sources */,
 				3C9FFA39274796A00067830C /* ContentPreviewController.m in Sources */,
 				3C2F99AC237BE1320000808F /* PortfolioListTableViewCell.m in Sources */,
 				3C3F4EAA276B32C100B091AE /* EnumSelectAndSortCell.m in Sources */,
@@ -2511,7 +2532,7 @@
 				GCC_PREFIX_HEADER = "iSales-UWAVER/iSales-UWAVER-Prefix.pch";
 				GCC_WARN_INHIBIT_ALL_WARNINGS = NO;
 				INFOPLIST_FILE = "$(SRCROOT)/iSales-UWAVER/iSales-UWAVER-Info.plist";
-				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 				LIBRARY_SEARCH_PATHS = (
 					"$(PROJECT_DIR)/ScanApiSDK-10.2.227-2/lib",
 					"$(PROJECT_DIR)/GoogleAnalytics/GoogleAnalytics/Libraries",
@@ -2557,7 +2578,7 @@
 				GCC_PREFIX_HEADER = "iSales-UWAVER/iSales-UWAVER-Prefix.pch";
 				GCC_WARN_INHIBIT_ALL_WARNINGS = NO;
 				INFOPLIST_FILE = "$(SRCROOT)/iSales-UWAVER/iSales-UWAVER-Info.plist";
-				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 				LIBRARY_SEARCH_PATHS = (
 					"$(PROJECT_DIR)/ScanApiSDK-10.2.227-2/lib",
 					"$(PROJECT_DIR)/GoogleAnalytics/GoogleAnalytics/Libraries",

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

@@ -7,9 +7,6 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
-		3C23B40E29D422B7008E7C14 /* PopWaitAlert.m in Sources */ = {isa = PBXBuildFile; fileRef = 3C23B40B29D422B6008E7C14 /* PopWaitAlert.m */; };
-		3C23B40F29D422B7008E7C14 /* MessageBox.m in Sources */ = {isa = PBXBuildFile; fileRef = 3C23B40C29D422B6008E7C14 /* MessageBox.m */; };
-		3C23B41029D422B7008E7C14 /* RAPopviewContainer.m in Sources */ = {isa = PBXBuildFile; fileRef = 3C23B40D29D422B6008E7C14 /* RAPopviewContainer.m */; };
 		3C2F99B8237BE1790000808F /* PortfolioListTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 3C2F99B6237BE1790000808F /* PortfolioListTableViewCell.m */; };
 		3C51492F273CF9B900F78617 /* DBUtil.m in Sources */ = {isa = PBXBuildFile; fileRef = 3C51492E273CF9B900F78617 /* DBUtil.m */; };
 		3C514932273D092A00F78617 /* EnumSelectViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 3C514931273D092A00F78617 /* EnumSelectViewController.m */; };
@@ -40,7 +37,6 @@
 		3C514993273E091500F78617 /* ContentPreviewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 3C51498B273E091500F78617 /* ContentPreviewController.m */; };
 		3C514994273E091500F78617 /* VideoPreviewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 3C51498E273E091500F78617 /* VideoPreviewCell.m */; };
 		3C514995273E091500F78617 /* PhotoPreviewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 3C514990273E091500F78617 /* PhotoPreviewCell.m */; };
-		3C514999273E097C00F78617 /* RAProgressHUD.m in Sources */ = {isa = PBXBuildFile; fileRef = 3C514998273E097B00F78617 /* RAProgressHUD.m */; };
 		3C68314D239607B500AD5BD7 /* ytplayer.html in Resources */ = {isa = PBXBuildFile; fileRef = 3C68314A239607B500AD5BD7 /* ytplayer.html */; };
 		3C68314E239607B500AD5BD7 /* RAYTPlayer.m in Sources */ = {isa = PBXBuildFile; fileRef = 3C68314B239607B500AD5BD7 /* RAYTPlayer.m */; };
 		3C6831562396082800AD5BD7 /* ERP_Mobile_Discard.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 3C68314F2396082700AD5BD7 /* ERP_Mobile_Discard.storyboard */; };
@@ -64,6 +60,9 @@
 		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 */; };
+		3C70C0892A2DC256008C2400 /* PopWaitAlert.m in Sources */ = {isa = PBXBuildFile; fileRef = 3C70C0862A2DC256008C2400 /* PopWaitAlert.m */; };
+		3C70C08A2A2DC256008C2400 /* MessageBox.m in Sources */ = {isa = PBXBuildFile; fileRef = 3C70C0872A2DC256008C2400 /* MessageBox.m */; };
+		3C70C08B2A2DC256008C2400 /* RAPopviewContainer.m in Sources */ = {isa = PBXBuildFile; fileRef = 3C70C0882A2DC256008C2400 /* RAPopviewContainer.m */; };
 		3C7E5A8E237BDB0C006D0105 /* PortfolioListViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 3C7E5A8C237BDB0C006D0105 /* PortfolioListViewController.m */; };
 		3CC1122B279163F4004ACA57 /* offline_order_new_contact.json in Resources */ = {isa = PBXBuildFile; fileRef = 3CC1122A279163F4004ACA57 /* offline_order_new_contact.json */; };
 		3CDDB25C273A564200681F78 /* DefaultTableHeaderView.m in Sources */ = {isa = PBXBuildFile; fileRef = 3CDDB25A273A564200681F78 /* DefaultTableHeaderView.m */; };
@@ -312,12 +311,6 @@
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
-		3C23B40829D422B6008E7C14 /* MessageBox.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MessageBox.h; sourceTree = "<group>"; };
-		3C23B40929D422B6008E7C14 /* PopWaitAlert.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PopWaitAlert.h; sourceTree = "<group>"; };
-		3C23B40A29D422B6008E7C14 /* RAPopviewContainer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RAPopviewContainer.h; sourceTree = "<group>"; };
-		3C23B40B29D422B6008E7C14 /* PopWaitAlert.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PopWaitAlert.m; sourceTree = "<group>"; };
-		3C23B40C29D422B6008E7C14 /* MessageBox.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MessageBox.m; sourceTree = "<group>"; };
-		3C23B40D29D422B6008E7C14 /* RAPopviewContainer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RAPopviewContainer.m; sourceTree = "<group>"; };
 		3C2F99B6237BE1790000808F /* PortfolioListTableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = PortfolioListTableViewCell.m; path = common/Functions/portfolio/PortfolioListTableViewCell.m; sourceTree = SOURCE_ROOT; };
 		3C2F99B7237BE1790000808F /* PortfolioListTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PortfolioListTableViewCell.h; path = common/Functions/portfolio/PortfolioListTableViewCell.h; sourceTree = SOURCE_ROOT; };
 		3C51492D273CF9B900F78617 /* DBUtil.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = DBUtil.h; path = common/DBUtil.h; sourceTree = SOURCE_ROOT; };
@@ -375,8 +368,6 @@
 		3C51498F273E091500F78617 /* PhotoPreviewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PhotoPreviewCell.h; sourceTree = "<group>"; };
 		3C514990273E091500F78617 /* PhotoPreviewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PhotoPreviewCell.m; sourceTree = "<group>"; };
 		3C514991273E091500F78617 /* VideoPreviewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VideoPreviewCell.h; sourceTree = "<group>"; };
-		3C514997273E097B00F78617 /* RAProgressHUD.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RAProgressHUD.h; sourceTree = "<group>"; };
-		3C514998273E097B00F78617 /* RAProgressHUD.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RAProgressHUD.m; sourceTree = "<group>"; };
 		3C51499A273E0B6400F78617 /* common_const.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = common_const.h; path = ../../common/common_const.h; sourceTree = "<group>"; };
 		3C68314A239607B500AD5BD7 /* ytplayer.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; name = ytplayer.html; path = ../../common/Youtube/ytplayer.html; sourceTree = "<group>"; };
 		3C68314B239607B500AD5BD7 /* RAYTPlayer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = RAYTPlayer.m; path = ../../common/Youtube/RAYTPlayer.m; sourceTree = "<group>"; };
@@ -404,6 +395,12 @@
 		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>"; };
+		3C70C0832A2DC256008C2400 /* MessageBox.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MessageBox.h; sourceTree = "<group>"; };
+		3C70C0842A2DC256008C2400 /* PopWaitAlert.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PopWaitAlert.h; sourceTree = "<group>"; };
+		3C70C0852A2DC256008C2400 /* RAPopviewContainer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RAPopviewContainer.h; sourceTree = "<group>"; };
+		3C70C0862A2DC256008C2400 /* PopWaitAlert.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PopWaitAlert.m; sourceTree = "<group>"; };
+		3C70C0872A2DC256008C2400 /* MessageBox.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MessageBox.m; sourceTree = "<group>"; };
+		3C70C0882A2DC256008C2400 /* RAPopviewContainer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RAPopviewContainer.m; 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; };
 		3CC1122A279163F4004ACA57 /* offline_order_new_contact.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; name = offline_order_new_contact.json; path = common/Functions/contact/offline_order_new_contact.json; sourceTree = SOURCE_ROOT; };
@@ -889,20 +886,6 @@
 /* End PBXFrameworksBuildPhase section */
 
 /* Begin PBXGroup section */
-		3C23B40729D422B6008E7C14 /* MessageBox */ = {
-			isa = PBXGroup;
-			children = (
-				3C23B40829D422B6008E7C14 /* MessageBox.h */,
-				3C23B40929D422B6008E7C14 /* PopWaitAlert.h */,
-				3C23B40A29D422B6008E7C14 /* RAPopviewContainer.h */,
-				3C23B40B29D422B6008E7C14 /* PopWaitAlert.m */,
-				3C23B40C29D422B6008E7C14 /* MessageBox.m */,
-				3C23B40D29D422B6008E7C14 /* RAPopviewContainer.m */,
-			);
-			name = MessageBox;
-			path = "HMLG Scan Order/MessageBox";
-			sourceTree = SOURCE_ROOT;
-		};
 		3C514975273E07C400F78617 /* EnumSelectAndSort\ */ = {
 			isa = PBXGroup;
 			children = (
@@ -959,13 +942,25 @@
 		3C514996273E097B00F78617 /* HUD */ = {
 			isa = PBXGroup;
 			children = (
-				3C514997273E097B00F78617 /* RAProgressHUD.h */,
-				3C514998273E097B00F78617 /* RAProgressHUD.m */,
 			);
 			name = HUD;
 			path = ../../common/HUD;
 			sourceTree = "<group>";
 		};
+		3C70C0822A2DC256008C2400 /* MessageBox */ = {
+			isa = PBXGroup;
+			children = (
+				3C70C0832A2DC256008C2400 /* MessageBox.h */,
+				3C70C0842A2DC256008C2400 /* PopWaitAlert.h */,
+				3C70C0852A2DC256008C2400 /* RAPopviewContainer.h */,
+				3C70C0862A2DC256008C2400 /* PopWaitAlert.m */,
+				3C70C0872A2DC256008C2400 /* MessageBox.m */,
+				3C70C0882A2DC256008C2400 /* RAPopviewContainer.m */,
+			);
+			name = MessageBox;
+			path = ../../common/MessageBox;
+			sourceTree = "<group>";
+		};
 		4254CCDB1FB1AB6600C8B4B6 /* Order Editor */ = {
 			isa = PBXGroup;
 			children = (
@@ -1556,7 +1551,7 @@
 		716387C71953CDB4006E65E6 /* utils */ = {
 			isa = PBXGroup;
 			children = (
-				3C23B40729D422B6008E7C14 /* MessageBox */,
+				3C70C0822A2DC256008C2400 /* MessageBox */,
 				3C51499A273E0B6400F78617 /* common_const.h */,
 				71DF74311C5757C800F2789C /* CommonUI */,
 				71C1D84C1F456CAA00CEA1C9 /* HWWeakTimer.h */,
@@ -2191,7 +2186,6 @@
 				3C2F99B8237BE1790000808F /* PortfolioListTableViewCell.m in Sources */,
 				71DF742B1C57560600F2789C /* Reachability.m in Sources */,
 				7162A5701C58728D00AB630E /* DetailHeaderCell.m in Sources */,
-				3C23B40F29D422B7008E7C14 /* MessageBox.m in Sources */,
 				71BBA2271CEAC16000C91DED /* ZipArchive.mm in Sources */,
 				7162A5491C58719D00AB630E /* RATreeView+TableViewDelegate.m in Sources */,
 				3C514950273D095900F78617 /* CommonEditorCellModel.m in Sources */,
@@ -2217,7 +2211,6 @@
 				3C514947273D095900F78617 /* CommonEditorCellSwitch.m in Sources */,
 				7162A5251C58706C00AB630E /* CategoryCellSmall.m in Sources */,
 				712AFEDA1DBA050200254965 /* ImageDrawable.m in Sources */,
-				3C23B40E29D422B7008E7C14 /* PopWaitAlert.m in Sources */,
 				428980721E24B1E9005F1BD8 /* RASingleton.m in Sources */,
 				3C514953273D096A00F78617 /* CommonEditorViewController.m in Sources */,
 				71E9F6C21F8B57E40052C78E /* RANetworkTaskDelegate.m in Sources */,
@@ -2255,7 +2248,6 @@
 				71D01B1C1E0A2055006620CE /* TextUtils.m in Sources */,
 				7162A5981C58733400AB630E /* CreateOrderViewController.m in Sources */,
 				4289809E1E24B526005F1BD8 /* JKTimerManager.m in Sources */,
-				3C514999273E097C00F78617 /* RAProgressHUD.m in Sources */,
 				3C51494F273D095900F78617 /* CommonEditorCellAction.m in Sources */,
 				7162A5021C586F5B00AB630E /* AddressEditorViewController.m in Sources */,
 				71131F921CA1372300DBF6E2 /* SimplifiedBuyingProgramViewController.m in Sources */,
@@ -2276,6 +2268,7 @@
 				3CDDB26E273A5A7800681F78 /* RAUtils.m in Sources */,
 				7141DD4F1C57459B00F7DF59 /* mask.c in Sources */,
 				7162A54E1C58722200AB630E /* CreditCardEditorViewController.m in Sources */,
+				3C70C08B2A2DC256008C2400 /* RAPopviewContainer.m in Sources */,
 				7162A5C31C5873BB00AB630E /* ItemSearchFilterViewController.m in Sources */,
 				3C51497F273E07D600F78617 /* EnumSelectAndSortCell.m in Sources */,
 				71D30A2D1CFC0EF8006F9477 /* DefaultImageButton.m in Sources */,
@@ -2293,6 +2286,7 @@
 				4295AE1C1FE74D46007BE365 /* CommonEditorAutoCompleteView.m in Sources */,
 				7162A5B61C58738600AB630E /* SCShapeView.m in Sources */,
 				71CB70751F99DF02009FDCB7 /* FileCache.m in Sources */,
+				3C70C0892A2DC256008C2400 /* PopWaitAlert.m in Sources */,
 				7162A54A1C58719D00AB630E /* RATreeView+UIScrollView.m in Sources */,
 				7162A55D1C58724700AB630E /* ContactListViewController.m in Sources */,
 				3C514995273E091500F78617 /* PhotoPreviewCell.m in Sources */,
@@ -2314,7 +2308,6 @@
 				7162A5601C58724700AB630E /* CustomerEditViewController.m in Sources */,
 				7162A5DC1C5876E300AB630E /* LoginViewController.m in Sources */,
 				3C51495F273D09B800F78617 /* MonthPickerViewController.m in Sources */,
-				3C23B41029D422B7008E7C14 /* RAPopviewContainer.m in Sources */,
 				4289805D1E249375005F1BD8 /* UIColor+JK_HEX.m in Sources */,
 				7162A5811C5872EF00AB630E /* HomeTableViewCellBanner.m in Sources */,
 				3C514956273D097E00F78617 /* CommonEditorTableContainerView.m in Sources */,
@@ -2349,6 +2342,7 @@
 				7162A5451C58719D00AB630E /* RATreeView.m in Sources */,
 				3C514974273E074500F78617 /* CommonEditorCellEditor.m in Sources */,
 				71DF74841C57608F00F2789C /* ImageScrollerViewController.m in Sources */,
+				3C70C08A2A2DC256008C2400 /* MessageBox.m in Sources */,
 				3CDDB25C273A564200681F78 /* DefaultTableHeaderView.m in Sources */,
 				71DF74861C57608F00F2789C /* ImageViewController.m in Sources */,
 				7162A5821C5872EF00AB630E /* HomeTableViewCellButtonBanner.m in Sources */,
@@ -2547,7 +2541,7 @@
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "iSales-USAI/iSales-USAI-Prefix.pch";
 				INFOPLIST_FILE = "$(SRCROOT)/iSales-USAI/iSales-USAI-Info.plist";
-				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 				LIBRARY_SEARCH_PATHS = (
 					"$(PROJECT_DIR)/ScanApiSDK-10.2.227-2/lib",
 					"$(PROJECT_DIR)/GoogleAnalytics/GoogleAnalytics/Libraries",
@@ -2590,7 +2584,7 @@
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "iSales-USAI/iSales-USAI-Prefix.pch";
 				INFOPLIST_FILE = "$(SRCROOT)/iSales-USAI/iSales-USAI-Info.plist";
-				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 				LIBRARY_SEARCH_PATHS = (
 					"$(PROJECT_DIR)/ScanApiSDK-10.2.227-2/lib",
 					"$(PROJECT_DIR)/GoogleAnalytics/GoogleAnalytics/Libraries",

common/HUD/RAProgressHUD.m

@@ -87,7 +87,7 @@ static const CGFloat HUDSIZE = 100.0f;
 
 - (UIActivityIndicatorView *)activityIndicator {
     if (!_activityIndicator) {
-        _activityIndicator = [[UIActivityIndicatorView alloc] initWithActivityIndicatorStyle:UIActivityIndicatorViewStyleWhiteLarge];
+        _activityIndicator = [[UIActivityIndicatorView alloc] initWithActivityIndicatorStyle:UIActivityIndicatorViewStyleLarge];
         [_activityIndicator startAnimating];
     }
     return _activityIndicator;

common/NetworkUtils.m

@@ -583,7 +583,7 @@ repeat:
 {
 //    __block int retry = 0;
     
-    DebugLog(url);
+    DebugLog(@"%@",url);
     
         if(![NetworkUtils IsNetworkAvailable])
         {

common/RAConvertor.h

@@ -21,7 +21,7 @@
 
 +(NSData*) dict2data:(NSDictionary*) dict;
 +(NSDictionary*) data2dict:(NSData*) data;
-+(NSDictionary*) string2dict:(NSString*) str;
++(id) string2dict:(NSString*) str;
 +(NSString*) dict2string:(id) dict;
 +(NSString*) currencyNumber:(double) num;
 +(NSString*) separateNumber:(double) num;

common/RAConvertor.m

@@ -165,13 +165,13 @@ begin:
     return data;
 }
 
-+(NSDictionary*) string2dict:(NSString*) str
++(id) string2dict:(NSString*) str
 {
     
     if(str==nil||(NSNull *)str==[NSNull null])
         return nil;
     NSError *error = nil;
-    NSDictionary *string2dic = [NSJSONSerialization JSONObjectWithData: [str dataUsingEncoding:NSUTF8StringEncoding]
+    id string2dic = [NSJSONSerialization JSONObjectWithData: [str dataUsingEncoding:NSUTF8StringEncoding]
                                                                options: NSJSONReadingMutableContainers
                                                                  error: &error];
 //    DebugLog(@"%@",string2dic);

common/customUI/commoneditor/CommonEditor.storyboard

@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="20037" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="21701" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
     <device id="ipad9_7" orientation="portrait" layout="fullscreen" appearance="light"/>
     <dependencies>
-        <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="20020"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="21678"/>
         <capability name="System colors in document resources" minToolsVersion="11.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -24,6 +23,7 @@
                                 <rect key="frame" x="224" y="93" width="320" height="216"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="216" id="i19-IZ-5lG"/>
+                                    <constraint firstAttribute="width" constant="320" id="kgj-3V-Kud"/>
                                 </constraints>
                                 <connections>
                                     <action selector="ValueChanged:" destination="hDO-yf-YYU" eventType="valueChanged" id="zq5-tB-PNW"/>
@@ -175,7 +175,7 @@
                                 <color key="backgroundColor" red="0.93725490199999995" green="0.93725490199999995" blue="0.95686274510000002" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                 <prototypes>
                                     <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="CommonEditorCellModel" rowHeight="140" id="Oph-ee-jLz" customClass="CommonEditorCellModel">
-                                        <rect key="frame" x="0.0" y="49.5" width="768" height="140"/>
+                                        <rect key="frame" x="0.0" y="55.5" width="768" height="140"/>
                                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="Oph-ee-jLz" id="QtW-xN-XkR">
                                             <rect key="frame" x="0.0" y="0.0" width="768" height="140"/>
@@ -304,7 +304,7 @@
                                         </connections>
                                     </tableViewCell>
                                     <tableViewCell contentMode="scaleToFill" restorationIdentifier="CommonEditorCellAction" selectionStyle="default" indentationWidth="10" reuseIdentifier="CommonEditorCellAction" id="ssj-oz-bAi" customClass="CommonEditorCellAction">
-                                        <rect key="frame" x="0.0" y="189.5" width="768" height="44"/>
+                                        <rect key="frame" x="0.0" y="195.5" width="768" height="44"/>
                                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="ssj-oz-bAi" id="vUH-NQ-LZ9">
                                             <rect key="frame" x="0.0" y="0.0" width="768" height="44"/>
@@ -330,14 +330,14 @@
                                         </connections>
                                     </tableViewCell>
                                     <tableViewCell contentMode="scaleToFill" restorationIdentifier="CommonEditorCellMAction" selectionStyle="default" indentationWidth="10" reuseIdentifier="CommonEditorCellMAction" id="07f-ff-k30" customClass="CommonEditorCellMAction">
-                                        <rect key="frame" x="0.0" y="233.5" width="768" height="44"/>
+                                        <rect key="frame" x="0.0" y="239.5" width="768" height="44"/>
                                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="07f-ff-k30" id="Ume-mi-cJc">
                                             <rect key="frame" x="0.0" y="0.0" width="768" height="44"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
-                                                <button opaque="NO" contentMode="scaleToFill" misplaced="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="CnD-CA-7GQ" userLabel="action0">
-                                                    <rect key="frame" x="583" y="7" width="170" height="30"/>
+                                                <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="CnD-CA-7GQ" userLabel="action0">
+                                                    <rect key="frame" x="583" y="7" width="169" height="30"/>
                                                     <color key="backgroundColor" red="0.59999999999999998" green="0.40000000000000002" blue="0.20000000000000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                     <state key="normal" title="Button">
                                                         <color key="titleColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
@@ -373,6 +373,7 @@
                                             </subviews>
                                             <constraints>
                                                 <constraint firstItem="fb7-qu-iUy" firstAttribute="leading" secondItem="Hv6-Vm-wzL" secondAttribute="trailing" constant="19" id="DpG-we-uAu"/>
+                                                <constraint firstItem="CnD-CA-7GQ" firstAttribute="leading" secondItem="bPv-vc-eg3" secondAttribute="trailing" constant="20" id="EHK-Ow-zyO"/>
                                                 <constraint firstItem="Hv6-Vm-wzL" firstAttribute="leading" secondItem="Ume-mi-cJc" secondAttribute="leadingMargin" id="GQe-fB-0A5"/>
                                                 <constraint firstItem="fb7-qu-iUy" firstAttribute="baseline" secondItem="bPv-vc-eg3" secondAttribute="baseline" id="UYh-JX-JWb"/>
                                                 <constraint firstItem="Hv6-Vm-wzL" firstAttribute="baseline" secondItem="fb7-qu-iUy" secondAttribute="baseline" id="Wqg-kZ-4HO"/>
@@ -391,7 +392,7 @@
                                         </connections>
                                     </tableViewCell>
                                     <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="CommonEditorCellLabel" id="6Qk-ct-Qby" customClass="CommonEditorCellLabel">
-                                        <rect key="frame" x="0.0" y="277.5" width="768" height="44"/>
+                                        <rect key="frame" x="0.0" y="283.5" width="768" height="44"/>
                                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="6Qk-ct-Qby" id="RHD-Jr-MC2">
                                             <rect key="frame" x="0.0" y="0.0" width="768" height="44"/>
@@ -429,7 +430,7 @@
                                         </connections>
                                     </tableViewCell>
                                     <tableViewCell contentMode="scaleToFill" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="CommonEditorCellEdit" rowHeight="44" id="PEs-Tx-N1l" customClass="CommonEditorCellEdit">
-                                        <rect key="frame" x="0.0" y="321.5" width="768" height="44"/>
+                                        <rect key="frame" x="0.0" y="327.5" width="768" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="PEs-Tx-N1l" id="g6q-oB-WEG">
                                             <rect key="frame" x="0.0" y="0.0" width="768" height="44"/>
@@ -476,7 +477,7 @@
                                         </connections>
                                     </tableViewCell>
                                     <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="CommonEditorCellEnum" id="9AR-rS-Bcu" customClass="CommonEditorCellEnum">
-                                        <rect key="frame" x="0.0" y="365.5" width="768" height="44"/>
+                                        <rect key="frame" x="0.0" y="371.5" width="768" height="44"/>
                                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="9AR-rS-Bcu" id="jAQ-Sk-bhV">
                                             <rect key="frame" x="0.0" y="0.0" width="768" height="44"/>
@@ -522,7 +523,7 @@
                                         </connections>
                                     </tableViewCell>
                                     <tableViewCell contentMode="scaleToFill" restorationIdentifier="CommonEditorCellTextView" selectionStyle="default" indentationWidth="10" reuseIdentifier="CommonEditorCellTextView" rowHeight="140" id="dmX-be-8Su" customClass="CommonEditorCellTextView">
-                                        <rect key="frame" x="0.0" y="409.5" width="768" height="140"/>
+                                        <rect key="frame" x="0.0" y="415.5" width="768" height="140"/>
                                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="dmX-be-8Su" id="OGD-ef-ifx">
                                             <rect key="frame" x="0.0" y="0.0" width="768" height="140"/>
@@ -543,7 +544,7 @@
                                                     <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                     <nil key="highlightedColor"/>
                                                 </label>
-                                                <textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" showsHorizontalScrollIndicator="NO" textAlignment="natural" translatesAutoresizingMaskIntoConstraints="NO" id="Exn-gg-C5X">
+                                                <textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" showsHorizontalScrollIndicator="NO" editable="NO" textAlignment="natural" translatesAutoresizingMaskIntoConstraints="NO" id="Exn-gg-C5X">
                                                     <rect key="frame" x="172" y="6" width="581" height="128"/>
                                                     <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                     <string key="text">Lorem ipsum dolor sit er elit lamet, consectetaur cillium adipisicing pecu, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. Nam liber te conscient to factor tum poen legum odioque civiuda.</string>
@@ -571,7 +572,7 @@
                                         </connections>
                                     </tableViewCell>
                                     <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="CommonEditorCellSignature" rowHeight="140" id="1AQ-3f-NcM" customClass="CommonEditorCellSignature">
-                                        <rect key="frame" x="0.0" y="549.5" width="768" height="140"/>
+                                        <rect key="frame" x="0.0" y="555.5" width="768" height="140"/>
                                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="1AQ-3f-NcM" id="1Ve-Rc-Loo">
                                             <rect key="frame" x="0.0" y="0.0" width="768" height="140"/>
@@ -616,7 +617,7 @@
                                         </connections>
                                     </tableViewCell>
                                     <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="CommonEditorCellSwitch" rowHeight="44" id="Prk-wJ-Ou5" customClass="CommonEditorCellSwitch">
-                                        <rect key="frame" x="0.0" y="689.5" width="768" height="44"/>
+                                        <rect key="frame" x="0.0" y="695.5" width="768" height="44"/>
                                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="Prk-wJ-Ou5" id="gzm-zc-a8m">
                                             <rect key="frame" x="0.0" y="0.0" width="768" height="44"/>
@@ -658,7 +659,7 @@
                                         </connections>
                                     </tableViewCell>
                                     <tableViewCell contentMode="scaleToFill" restorationIdentifier="CommonEditorCellImg" selectionStyle="default" indentationWidth="10" reuseIdentifier="CommonEditorCellImg" rowHeight="120" id="z4d-pv-B8K" customClass="CommonEditorCellImg">
-                                        <rect key="frame" x="0.0" y="733.5" width="768" height="120"/>
+                                        <rect key="frame" x="0.0" y="739.5" width="768" height="120"/>
                                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="z4d-pv-B8K" id="8bH-ma-t1U">
                                             <rect key="frame" x="0.0" y="0.0" width="768" height="120"/>
@@ -842,7 +843,7 @@
                                 <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                 <prototypes>
                                     <tableViewCell contentMode="scaleToFill" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="EnumSelectorCell" id="b1D-ac-iWB" customClass="EnumSelectorCell">
-                                        <rect key="frame" x="0.0" y="44.5" width="540" height="44"/>
+                                        <rect key="frame" x="0.0" y="50" width="540" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="b1D-ac-iWB" id="kPb-Xs-gEw">
                                             <rect key="frame" x="0.0" y="0.0" width="540" height="44"/>
@@ -941,11 +942,11 @@
                                 <nil key="highlightedColor"/>
                             </label>
                             <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="44" sectionHeaderHeight="22" sectionFooterHeight="22" translatesAutoresizingMaskIntoConstraints="NO" id="O1P-gK-hbP">
-                                <rect key="frame" x="0.0" y="71" width="768" height="953"/>
+                                <rect key="frame" x="0.0" y="76" width="768" height="948"/>
                                 <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                 <prototypes>
                                     <tableViewCell contentMode="scaleToFill" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="EnumSelectorCell" id="bae-sl-DbK" customClass="EnumSelectorCell">
-                                        <rect key="frame" x="0.0" y="44.5" width="768" height="44"/>
+                                        <rect key="frame" x="0.0" y="50" width="768" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="bae-sl-DbK" id="FgK-hs-kBJ">
                                             <rect key="frame" x="0.0" y="0.0" width="768" height="44"/>
@@ -974,7 +975,7 @@
                                 </connections>
                             </tableView>
                             <searchBar contentMode="redraw" placeholder="KEYWORDS" translatesAutoresizingMaskIntoConstraints="NO" id="8tc-Zi-o4x">
-                                <rect key="frame" x="0.0" y="20" width="768" height="51"/>
+                                <rect key="frame" x="0.0" y="20" width="768" height="56"/>
                                 <textInputTraits key="textInputTraits"/>
                                 <connections>
                                     <outlet property="delegate" destination="A1a-tK-2BG" id="HpF-dm-AwJ"/>

common/customUI/commoneditor/CommonEditorViewController.m

@@ -5086,7 +5086,7 @@ DebugLog(@"endedit %@",[RAConvertor dict2string:self.content_data_control]);
                     }
                     return;
                 }
-#endif
+#else
 #ifdef OFFLINE_MODE
 
                 BOOL offline_mode = [[RASingleton.sharedInstance globalParameterForKey:@"offline_mode"] boolValue];
@@ -5213,6 +5213,7 @@ DebugLog(@"endedit %@",[RAConvertor dict2string:self.content_data_control]);
                 
                 
             }
+#endif
         }
         
             

common/customUI/commoneditor/DatePickerViewController.m

@@ -38,6 +38,7 @@
 - (void)viewDidLoad
 {
     [super viewDidLoad];
+    self.title = @"";
     // Do any additional setup after loading the view.
     self.datePicker.datePickerMode = self.pickerMode;
     //self.datePicla

common/customUI/commoneditor/EnumSelectOnlineViewController.h

@@ -8,7 +8,7 @@
 #import <UIKit/UIKit.h>
 #import "EnumSelectViewController.h"
 #import "EnumSelectDelegate.h"
-#import "RAProgressHUD.h"
+//#import "RAProgressHUD.h"
 NS_ASSUME_NONNULL_BEGIN
 
 @class EnumSelectOnlineViewController;

common/customUI/commoneditor/EnumSelectOnlineViewController.m

@@ -540,7 +540,11 @@
 //                //        UIAlertView *alert=[[UIAlertView alloc]initWithTitle:@"Error!" message:@"User&Password can not be empty!" delegate:nil cancelButtonTitle:NSLocalizedString(@"ok", nil) , nil];
 //                [alert show];
                 
-                [RAUtils message_alert:[NSString stringWithFormat:@"%d items at most for this field.",self.max_select ] title:@"Max count reached" controller:self];
+                [RAUtils message_box:@"Max count reached" message:[NSString stringWithFormat:@"%d items at most for this field.",self.max_select ] completion:^{
+
+                }];
+                
+//                [RAUtils message_alert:[NSString stringWithFormat:@"%d items at most for this field.",self.max_select ] title:@"Max count reached" controller:self];
 //                [RAUtils alert_view:[NSString stringWithFormat:@"%d items at most for this field.",self.max_select ] title:@"Max count reached"];
                 
                 return;