HMLG Scan Order 1.32

Fix crash 
Modify UI
Modify order template

Contrast 1.99
Add scanner refresh logic
Fix blank screen issue

Erp mobile 

Remove UIWebview

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

@@ -2517,9 +2517,10 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = NO;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
-				CURRENT_PROJECT_VERSION = 52313;
+				CURRENT_PROJECT_VERSION = 52604;
 				DEVELOPMENT_TEAM = HXWLAA5YN5;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
@@ -2536,7 +2537,7 @@
 					"$(PROJECT_DIR)/ScanApiSDK-10.2.227-2/lib",
 					"$(PROJECT_DIR)/GoogleAnalytics/GoogleAnalytics/Libraries",
 				);
-				MARKETING_VERSION = 1.30;
+				MARKETING_VERSION = 1.32;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
@@ -2565,9 +2566,10 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = NO;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
-				CURRENT_PROJECT_VERSION = 52313;
+				CURRENT_PROJECT_VERSION = 52604;
 				DEVELOPMENT_TEAM = HXWLAA5YN5;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
@@ -2584,7 +2586,7 @@
 					"$(PROJECT_DIR)/ScanApiSDK-10.2.227-2/lib",
 					"$(PROJECT_DIR)/GoogleAnalytics/GoogleAnalytics/Libraries",
 				);
-				MARKETING_VERSION = 1.30;
+				MARKETING_VERSION = 1.32;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",

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>4</integer>
+			<integer>1</integer>
 		</dict>
 	</dict>
 </dict>

RedAnt ERP Mobile/HMLG Scan Order/SO.storyboard

@@ -1774,37 +1774,30 @@ Stock</string>
                                 <rect key="frame" x="0.0" y="1009" width="744" height="124"/>
                                 <subviews>
                                     <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Total QTY:" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="DdS-4S-1zx" userLabel="total price">
-                                        <rect key="frame" x="219" y="6" width="110" height="20"/>
+                                        <rect key="frame" x="309.5" y="6" width="74.5" height="20"/>
                                         <constraints>
-                                            <constraint firstAttribute="width" constant="110" id="JkE-9G-otz"/>
                                             <constraint firstAttribute="height" constant="20" id="eFU-xu-5Ku"/>
                                         </constraints>
                                         <fontDescription key="fontDescription" type="system" pointSize="16"/>
                                         <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                         <nil key="highlightedColor"/>
                                     </label>
-                                    <label hidden="YES" opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Subtotal Price:" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="lRq-Ow-fEk" userLabel="total price">
-                                        <rect key="frame" x="487" y="6" width="110" height="20"/>
-                                        <constraints>
-                                            <constraint firstAttribute="height" constant="20" id="Baf-Qx-Zjc"/>
-                                            <constraint firstAttribute="width" constant="110" id="dah-IQ-F5m"/>
-                                        </constraints>
+                                    <label hidden="YES" opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="Subtotal Price:" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="lRq-Ow-fEk" userLabel="total price">
+                                        <rect key="frame" x="259" y="65" width="110" height="20"/>
+                                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                         <fontDescription key="fontDescription" type="system" pointSize="16"/>
                                         <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                         <nil key="highlightedColor"/>
                                     </label>
-                                    <label hidden="YES" opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="eiF-G7-95R" userLabel="val_subtotal">
-                                        <rect key="frame" x="605" y="6" width="124" height="20"/>
-                                        <constraints>
-                                            <constraint firstAttribute="width" constant="124" id="KRd-69-btU"/>
-                                            <constraint firstAttribute="height" constant="20" id="cob-nE-6nX"/>
-                                        </constraints>
+                                    <label hidden="YES" opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="eiF-G7-95R" userLabel="val_subtotal">
+                                        <rect key="frame" x="230" y="61" width="124" height="20"/>
+                                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                         <fontDescription key="fontDescription" type="system" pointSize="16"/>
                                         <nil key="textColor"/>
                                         <nil key="highlightedColor"/>
                                     </label>
                                     <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="8gM-ne-ChU" userLabel="val_cuft">
-                                        <rect key="frame" x="337" y="55.5" width="124" height="20"/>
+                                        <rect key="frame" x="605" y="6" width="124" height="20"/>
                                         <constraints>
                                             <constraint firstAttribute="height" constant="20" id="5Nx-rU-92d"/>
                                             <constraint firstAttribute="width" constant="124" id="LBs-do-I4g"/>
@@ -1844,18 +1837,14 @@ Stock</string>
                                         </connections>
                                     </button>
                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Total CuFt:" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="IpA-sg-I9m">
-                                        <rect key="frame" x="250.5" y="55.5" width="78.5" height="20"/>
-                                        <constraints>
-                                            <constraint firstAttribute="height" constant="20" id="BSO-lV-Isl"/>
-                                        </constraints>
+                                        <rect key="frame" x="518.5" y="6" width="78.5" height="20"/>
                                         <fontDescription key="fontDescription" type="system" pointSize="16"/>
                                         <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" text="Total  Items:" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="UVG-on-4aI">
-                                        <rect key="frame" x="219" y="30.5" width="110" height="20"/>
+                                        <rect key="frame" x="296" y="30.5" width="88" height="20"/>
                                         <constraints>
-                                            <constraint firstAttribute="width" constant="110" id="kM6-ac-A26"/>
                                             <constraint firstAttribute="height" constant="20" id="tXP-jf-Jbq"/>
                                         </constraints>
                                         <fontDescription key="fontDescription" type="system" pointSize="16"/>
@@ -1874,10 +1863,10 @@ Stock</string>
                                         </connections>
                                     </button>
                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="sS1-r0-cLw">
-                                        <rect key="frame" x="337" y="6" width="124" height="20"/>
+                                        <rect key="frame" x="392" y="6" width="100" height="20"/>
                                         <constraints>
                                             <constraint firstAttribute="height" constant="20" id="QK3-oa-eZO"/>
-                                            <constraint firstAttribute="width" constant="124" id="r2b-D2-1Q0"/>
+                                            <constraint firstAttribute="width" constant="100" id="r2b-D2-1Q0"/>
                                         </constraints>
                                         <fontDescription key="fontDescription" type="system" pointSize="16"/>
                                         <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
@@ -1959,35 +1948,31 @@ Stock</string>
                                             <action selector="onScanChangeCustomerType:" destination="oRS-pB-8jo" eventType="touchUpInside" id="bfl-wr-XOX"/>
                                         </connections>
                                     </button>
-                                    <label hidden="YES" opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Surcharge Fee:" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="pfb-lq-2lh">
-                                        <rect key="frame" x="481" y="30" width="116" height="21"/>
+                                    <label hidden="YES" opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="Surcharge Fee:" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="pfb-lq-2lh">
+                                        <rect key="frame" x="219" y="61" width="116" height="21"/>
+                                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                         <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                         <nil key="textColor"/>
                                         <nil key="highlightedColor"/>
                                     </label>
                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Total Price:" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="y4m-c1-DFh">
-                                        <rect key="frame" x="512" y="55" width="85" height="21"/>
-                                        <fontDescription key="fontDescription" type="system" pointSize="17"/>
-                                        <nil key="textColor"/>
-                                        <nil key="highlightedColor"/>
-                                    </label>
-                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Dx2-do-qf9" userLabel="val_total">
-                                        <rect key="frame" x="605" y="65.5" width="124" height="0.0"/>
+                                        <rect key="frame" x="512" y="30" width="85" height="21"/>
                                         <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                         <nil key="textColor"/>
                                         <nil key="highlightedColor"/>
                                     </label>
-                                    <label hidden="YES" opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Dd5-g0-8Ub" userLabel="val_surcharge">
-                                        <rect key="frame" x="605" y="19.5" width="124" height="42"/>
+                                    <label hidden="YES" opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" fixedFrame="YES" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Dd5-g0-8Ub" userLabel="val_surcharge">
+                                        <rect key="frame" x="219" y="61" width="158" height="25"/>
+                                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                         <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                         <nil key="textColor"/>
                                         <nil key="highlightedColor"/>
                                     </label>
                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="DcE-qL-jJq">
-                                        <rect key="frame" x="337" y="30.5" width="124" height="20"/>
+                                        <rect key="frame" x="392" y="30.5" width="100" height="20"/>
                                         <constraints>
                                             <constraint firstAttribute="height" constant="20" id="6he-ZG-y1N"/>
-                                            <constraint firstAttribute="width" constant="124" id="oco-zZ-8nm"/>
+                                            <constraint firstAttribute="width" constant="100" id="oco-zZ-8nm"/>
                                         </constraints>
                                         <fontDescription key="fontDescription" type="system" pointSize="16"/>
                                         <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
@@ -2002,61 +1987,59 @@ Stock</string>
                                             <action selector="onBulkDiscount:" destination="oRS-pB-8jo" eventType="touchUpInside" id="dcf-oc-bXG"/>
                                         </connections>
                                     </button>
+                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Dx2-do-qf9" userLabel="val_total">
+                                        <rect key="frame" x="605" y="30.5" width="124" height="20"/>
+                                        <constraints>
+                                            <constraint firstAttribute="height" constant="20" id="APX-py-DFH"/>
+                                            <constraint firstAttribute="width" constant="124" id="SOB-al-OHg"/>
+                                        </constraints>
+                                        <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                                        <nil key="textColor"/>
+                                        <nil key="highlightedColor"/>
+                                    </label>
                                 </subviews>
                                 <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                 <constraints>
+                                    <constraint firstItem="Dx2-do-qf9" firstAttribute="trailing" secondItem="8gM-ne-ChU" secondAttribute="trailing" id="08O-Yo-RZE"/>
                                     <constraint firstAttribute="bottom" secondItem="MkS-tT-MEd" secondAttribute="bottom" constant="9" id="0NU-Hk-RyZ"/>
                                     <constraint firstAttribute="trailing" secondItem="Prh-BQ-CkY" secondAttribute="trailing" constant="15" id="0by-01-SwR"/>
                                     <constraint firstItem="3hY-G2-bAt" firstAttribute="leading" secondItem="g1j-nr-vEW" secondAttribute="trailing" constant="20" id="1Fc-Xk-22e"/>
                                     <constraint firstItem="Prh-BQ-CkY" firstAttribute="leading" secondItem="MkS-tT-MEd" secondAttribute="trailing" constant="20" id="2Ei-HL-QLf"/>
                                     <constraint firstAttribute="bottom" secondItem="EcM-RL-hry" secondAttribute="bottom" constant="10" id="2Z3-SC-CW7"/>
                                     <constraint firstItem="cPY-vO-WZ0" firstAttribute="top" secondItem="Fkc-Lk-5jB" secondAttribute="bottom" constant="6" id="39l-Lx-DdN"/>
-                                    <constraint firstItem="Dx2-do-qf9" firstAttribute="trailing" secondItem="eiF-G7-95R" secondAttribute="trailing" id="6Um-xe-vpu"/>
-                                    <constraint firstItem="sS1-r0-cLw" firstAttribute="centerY" secondItem="DdS-4S-1zx" secondAttribute="centerY" id="7tL-kh-m4G"/>
-                                    <constraint firstItem="Dx2-do-qf9" firstAttribute="leading" secondItem="y4m-c1-DFh" secondAttribute="trailing" constant="8" id="7zD-OG-qN5"/>
-                                    <constraint firstItem="8gM-ne-ChU" firstAttribute="leading" secondItem="IpA-sg-I9m" secondAttribute="trailing" constant="8" id="8LW-Qd-1SA"/>
-                                    <constraint firstItem="sS1-r0-cLw" firstAttribute="leading" secondItem="DdS-4S-1zx" secondAttribute="trailing" constant="8" id="9kd-tB-d7V"/>
                                     <constraint firstAttribute="height" constant="124" id="Adt-4W-5pA"/>
                                     <constraint firstItem="3hY-G2-bAt" firstAttribute="bottom" secondItem="XBV-xN-bZf" secondAttribute="bottom" id="FJg-9B-RhK"/>
-                                    <constraint firstItem="sS1-r0-cLw" firstAttribute="trailing" secondItem="8gM-ne-ChU" secondAttribute="trailing" id="Fdi-w6-6FZ"/>
-                                    <constraint firstItem="y4m-c1-DFh" firstAttribute="centerY" secondItem="IpA-sg-I9m" secondAttribute="centerY" id="Ier-bH-HNo"/>
+                                    <constraint firstItem="y4m-c1-DFh" firstAttribute="leading" secondItem="DcE-qL-jJq" secondAttribute="trailing" constant="20" id="Fv6-oP-dvy"/>
                                     <constraint firstItem="Prh-BQ-CkY" firstAttribute="leading" secondItem="3hY-G2-bAt" secondAttribute="trailing" constant="20" id="JNx-Ee-BQv"/>
                                     <constraint firstItem="XBV-xN-bZf" firstAttribute="leading" secondItem="jbJ-5K-Qgr" secondAttribute="trailing" constant="20" id="Jh4-cl-d5N"/>
-                                    <constraint firstItem="Dx2-do-qf9" firstAttribute="width" secondItem="eiF-G7-95R" secondAttribute="width" id="Jqd-oi-Yb2"/>
+                                    <constraint firstItem="IpA-sg-I9m" firstAttribute="centerY" secondItem="sS1-r0-cLw" secondAttribute="centerY" id="LdZ-ad-eXE"/>
                                     <constraint firstItem="g1j-nr-vEW" firstAttribute="leading" secondItem="XBV-xN-bZf" secondAttribute="trailing" constant="20" id="MD2-e8-SCH"/>
                                     <constraint firstItem="Fkc-Lk-5jB" firstAttribute="leading" secondItem="G78-MN-iaL" secondAttribute="leading" constant="15" id="MEJ-ty-xl7"/>
-                                    <constraint firstItem="lRq-Ow-fEk" firstAttribute="centerY" secondItem="DdS-4S-1zx" secondAttribute="centerY" id="MSq-ha-BfK"/>
-                                    <constraint firstItem="Dd5-g0-8Ub" firstAttribute="trailing" secondItem="Dx2-do-qf9" secondAttribute="trailing" id="OFt-aB-Lir"/>
+                                    <constraint firstItem="sS1-r0-cLw" firstAttribute="leading" secondItem="DdS-4S-1zx" secondAttribute="trailing" constant="8" id="NDK-Jt-80j"/>
                                     <constraint firstItem="Fkc-Lk-5jB" firstAttribute="top" secondItem="G78-MN-iaL" secondAttribute="top" constant="10" id="R0N-8I-YGp"/>
-                                    <constraint firstItem="Dd5-g0-8Ub" firstAttribute="leading" secondItem="pfb-lq-2lh" secondAttribute="trailing" constant="8" id="S4u-zG-m5P"/>
+                                    <constraint firstItem="UVG-on-4aI" firstAttribute="top" secondItem="DdS-4S-1zx" secondAttribute="bottom" constant="4.5" id="R6c-F3-2yS"/>
                                     <constraint firstItem="EcM-RL-hry" firstAttribute="leading" secondItem="G78-MN-iaL" secondAttribute="leading" constant="15" id="U1h-9m-98l"/>
-                                    <constraint firstItem="Dx2-do-qf9" firstAttribute="top" secondItem="Dd5-g0-8Ub" secondAttribute="bottom" constant="4" id="UCm-qj-4i1"/>
-                                    <constraint firstItem="pfb-lq-2lh" firstAttribute="centerY" secondItem="UVG-on-4aI" secondAttribute="centerY" id="UgX-Nr-jCj"/>
-                                    <constraint firstItem="3hY-G2-bAt" firstAttribute="top" secondItem="y4m-c1-DFh" secondAttribute="bottom" constant="8" symbolic="YES" id="VbZ-74-TKJ"/>
-                                    <constraint firstItem="Dx2-do-qf9" firstAttribute="centerY" secondItem="y4m-c1-DFh" secondAttribute="centerY" id="X2k-c2-n9v"/>
+                                    <constraint firstItem="DdS-4S-1zx" firstAttribute="top" secondItem="G78-MN-iaL" secondAttribute="top" constant="6" id="U5d-cg-ZkS"/>
+                                    <constraint firstItem="8gM-ne-ChU" firstAttribute="centerY" secondItem="DdS-4S-1zx" secondAttribute="centerY" id="VRS-T5-fLs"/>
+                                    <constraint firstAttribute="trailing" secondItem="Dx2-do-qf9" secondAttribute="trailing" constant="15" id="Vy3-wo-mWp"/>
+                                    <constraint firstItem="UVG-on-4aI" firstAttribute="trailing" secondItem="DdS-4S-1zx" secondAttribute="trailing" id="XuP-kL-6zS"/>
                                     <constraint firstItem="g1j-nr-vEW" firstAttribute="bottom" secondItem="XBV-xN-bZf" secondAttribute="bottom" id="ZAm-rp-exn"/>
-                                    <constraint firstItem="Dd5-g0-8Ub" firstAttribute="centerY" secondItem="pfb-lq-2lh" secondAttribute="centerY" id="arw-Jf-7XY"/>
+                                    <constraint firstItem="IpA-sg-I9m" firstAttribute="centerY" secondItem="DdS-4S-1zx" secondAttribute="centerY" id="aHz-vB-UrV"/>
+                                    <constraint firstItem="Dx2-do-qf9" firstAttribute="leading" secondItem="y4m-c1-DFh" secondAttribute="trailing" constant="8" symbolic="YES" id="bE6-ie-m0t"/>
                                     <constraint firstItem="0i6-zY-RD3" firstAttribute="leading" secondItem="ubF-HT-6Rg" secondAttribute="trailing" constant="10" id="cY6-Bd-slj"/>
                                     <constraint firstAttribute="bottom" secondItem="Prh-BQ-CkY" secondAttribute="bottom" constant="10" id="d7A-oO-Jo6"/>
-                                    <constraint firstItem="eiF-G7-95R" firstAttribute="centerY" secondItem="lRq-Ow-fEk" secondAttribute="centerY" id="eLd-54-oYn"/>
                                     <constraint firstItem="ubF-HT-6Rg" firstAttribute="leading" secondItem="EcM-RL-hry" secondAttribute="leading" id="eRY-Ny-QmT"/>
                                     <constraint firstItem="Prh-BQ-CkY" firstAttribute="bottom" secondItem="XBV-xN-bZf" secondAttribute="bottom" id="eSI-6t-C2i"/>
-                                    <constraint firstItem="eiF-G7-95R" firstAttribute="centerY" secondItem="lRq-Ow-fEk" secondAttribute="centerY" id="gHc-dR-peo"/>
-                                    <constraint firstItem="pfb-lq-2lh" firstAttribute="leading" secondItem="DcE-qL-jJq" secondAttribute="trailing" constant="20" id="gMX-6c-gtH"/>
-                                    <constraint firstItem="8gM-ne-ChU" firstAttribute="centerY" secondItem="IpA-sg-I9m" secondAttribute="centerY" id="gqF-yN-NoD"/>
+                                    <constraint firstItem="DcE-qL-jJq" firstAttribute="trailing" secondItem="sS1-r0-cLw" secondAttribute="trailing" id="hDE-Fq-LAy"/>
                                     <constraint firstItem="jbJ-5K-Qgr" firstAttribute="firstBaseline" secondItem="EcM-RL-hry" secondAttribute="firstBaseline" id="hvb-Hs-p0i"/>
-                                    <constraint firstItem="DcE-qL-jJq" firstAttribute="leading" secondItem="UVG-on-4aI" secondAttribute="trailing" constant="8" id="lra-rF-9Kp"/>
-                                    <constraint firstAttribute="trailing" secondItem="Dx2-do-qf9" secondAttribute="trailing" constant="15" id="n0m-0v-x5e"/>
-                                    <constraint firstItem="DcE-qL-jJq" firstAttribute="trailing" secondItem="8gM-ne-ChU" secondAttribute="trailing" id="nPe-ck-WmZ"/>
+                                    <constraint firstItem="y4m-c1-DFh" firstAttribute="centerY" secondItem="DcE-qL-jJq" secondAttribute="centerY" id="nlm-qt-atO"/>
                                     <constraint firstItem="jbJ-5K-Qgr" firstAttribute="leading" secondItem="EcM-RL-hry" secondAttribute="trailing" id="o2n-hY-mEQ"/>
                                     <constraint firstItem="0i6-zY-RD3" firstAttribute="centerY" secondItem="ubF-HT-6Rg" secondAttribute="centerY" id="odm-FA-KLw"/>
                                     <constraint firstItem="EcM-RL-hry" firstAttribute="leading" secondItem="cPY-vO-WZ0" secondAttribute="leading" id="rsP-6m-uiG"/>
-                                    <constraint firstItem="y4m-c1-DFh" firstAttribute="top" secondItem="pfb-lq-2lh" secondAttribute="bottom" constant="4" id="vMz-bA-3MY"/>
-                                    <constraint firstItem="DcE-qL-jJq" firstAttribute="centerY" secondItem="UVG-on-4aI" secondAttribute="centerY" id="w9o-01-z1E"/>
+                                    <constraint firstItem="Dx2-do-qf9" firstAttribute="centerY" secondItem="y4m-c1-DFh" secondAttribute="centerY" id="tw4-Wi-3ZY"/>
+                                    <constraint firstItem="8gM-ne-ChU" firstAttribute="leading" secondItem="IpA-sg-I9m" secondAttribute="trailing" constant="8" id="uBl-rg-L3q"/>
                                     <constraint firstItem="DdS-4S-1zx" firstAttribute="centerY" secondItem="ubF-HT-6Rg" secondAttribute="centerY" id="xuh-fD-gA1"/>
-                                    <constraint firstItem="pfb-lq-2lh" firstAttribute="top" secondItem="lRq-Ow-fEk" secondAttribute="bottom" constant="4" id="xum-Fh-kcO"/>
-                                    <constraint firstItem="eiF-G7-95R" firstAttribute="leading" secondItem="lRq-Ow-fEk" secondAttribute="trailing" constant="8" id="zdd-AC-WId"/>
-                                    <constraint firstItem="Dd5-g0-8Ub" firstAttribute="width" secondItem="eiF-G7-95R" secondAttribute="width" id="zy5-1Q-Hx3"/>
+                                    <constraint firstItem="Dx2-do-qf9" firstAttribute="centerY" secondItem="UVG-on-4aI" secondAttribute="centerY" id="znF-0k-lli"/>
                                 </constraints>
                             </view>
                         </subviews>

RedAnt ERP Mobile/common/AppDelegateBase.h

@@ -220,7 +220,9 @@ typedef enum {
 
 #endif
 
+@property (nonatomic,strong) NSDate *forgroundDate;
 
+#ifdef USE_BLE_SCANNER
 
 @property (nonatomic, strong) CBCentralManager *manager;
 @property (nonatomic, strong) CBPeripheral *peripheral;
@@ -229,7 +231,7 @@ typedef enum {
 @property (strong,nonatomic) NSMutableArray *nServices;
 @property (strong,nonatomic) NSMutableArray *nCharacteristics;
 @property (strong,nonatomic) NSString *strBTLog;
-@property (nonatomic,strong) NSDate *forgroundDate;
+
 @property bool bAutoConnect;
 @property bool cbReady;
 @property bool bAppBTOn;
@@ -244,4 +246,5 @@ typedef enum {
 
 
 -(void) enableBLE:(bool) bEnable;
+#endif
 @end

RedAnt ERP Mobile/common/AppDelegateBase.m

@@ -2665,7 +2665,7 @@ void UncaughtExceptionHandler(NSException *exception) {
             }
             else if([type isEqualToString:@"sql"])
             {
-                AppDelegate *appDelegate = (AppDelegate*)[[UIApplication sharedApplication] delegate];
+              //  AppDelegate *appDelegate = (AppDelegate*)[[UIApplication sharedApplication] delegate];
                 NSString * ver = self.download_task[@"ver"];
                 NSString* tempdb=[NSString stringWithFormat:@"%@/%@",ver,DBNAME];
                 tempdb=[temp stringByAppendingPathComponent:tempdb];
@@ -2905,9 +2905,9 @@ void UncaughtExceptionHandler(NSException *exception) {
 - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions
 {
     
-    
+    NSUserDefaults *defaults =[NSUserDefaults standardUserDefaults];
     // 蓝牙扫描枪
-    
+#ifdef USE_BLE_SCANNER
     
     self.manager = [[CBCentralManager alloc] initWithDelegate:self queue:nil];
     _cbReady = false;
@@ -2917,7 +2917,7 @@ void UncaughtExceptionHandler(NSException *exception) {
     
     
     
-    NSUserDefaults *defaults =[NSUserDefaults standardUserDefaults];
+    
     self.bAutoConnect=[defaults boolForKey:@"BLE_AutoReconnect"];
     self.bAppBTOn=[defaults boolForKey:@"BLE_Enable"];
     if(self.bAutoConnect)
@@ -2925,7 +2925,7 @@ void UncaughtExceptionHandler(NSException *exception) {
         self.strDeviceName = [defaults valueForKey:@"BLE_Name"];
         self.strDeviceUUID = [defaults valueForKey:@"BLE_UUID"];
     }
-
+#endif
     
 
 //    [defaults removeObjectForKey:@"BLE_AutoReconnect"];
@@ -3875,6 +3875,8 @@ void UncaughtExceptionHandler(NSException *exception) {
 }
 #endif
 
+
+#ifdef USE_BLE_SCANNER
 #pragma mark - core bluetooth
 
 -(void) disconnectDevice
@@ -4198,9 +4200,12 @@ void UncaughtExceptionHandler(NSException *exception) {
     
     datastring = [datastring stringByReplacingOccurrencesOfString:@"\r" withString:@""];
     if(datastring.length==0)
+    {
         NSLog(@"Scan Data is empty");
+        return;
+    }
     else
-        NSLog(datastring);
+        NSLog(@"Scan value %@",datastring);
     
     
     if((_eventsFeedback!=nil)&&([_eventsFeedback respondsToSelector:@selector(onDecodedData:)])){
@@ -4272,7 +4277,7 @@ void UncaughtExceptionHandler(NSException *exception) {
 }
 
 
-
+#endif
 //
 ////#parammark tableview
 //

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

@@ -78,6 +78,7 @@
 #if defined(USE_BLE_SCANNER) || defined(USE_MFI_SCANNER)
 @property bool batch_scan;
 @property bool stop_response;
+//@property (strong, nonatomic) NSLock *scanlock ;
 #endif
 
 

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

@@ -110,6 +110,10 @@
         #ifndef RA_NOTIFICATION
     [[NSNotificationCenter defaultCenter] removeObserver:self];
 #endif
+#if defined(USE_BLE_SCANNER) || defined(USE_MFI_SCANNER)
+    [[NSNotificationCenter defaultCenter] removeObserver:self];
+#endif
+    
 }
 
 -(void) logout
@@ -1043,7 +1047,217 @@
 }
 
 
+-(void) operation_scan_reload_data
+{
+    if (self.dataOperationQueue.operationCount > 1) {
+        
+        NSLog(@"operationCount >1 cancel");
+        return;
+    }
+    
+    NSLog(@"operating...");
+    
+    __block AppDelegate *appDelegate = nil;
+    
+    dispatch_sync(dispatch_get_main_queue(), ^{
+        //some UI methods ej
+        appDelegate=(AppDelegate*)[[UIApplication sharedApplication] delegate];
+    });
+//    AppDelegate *appDelegate = (AppDelegate *)[UIApplication sharedApplication].delegate;
+#ifndef SCANNER_ORDER
+    
+    //扫码订单允许后建订单
+    if (appDelegate.order_code == nil || appDelegate.order_code.length == 0) {
+        [self clearContent];
+        return;
+    }
+#endif
+    
+    __weak typeof(self) weakself = self;
+    dispatch_async(dispatch_get_main_queue(), ^{
+        if(weakself.isrefreshing)
+            return;
+        
+        weakself.available = YES;
+        weakself.itemListTable.hidden = true;
+        weakself.label_net_err.hidden=true;
+        weakself.isrefreshing=true;
+        //    [self.content_data removeAllObjects];
+        // [self.itemListTable reloadData];
+        //    UIRefreshControl *reF = (UIRefreshControl *)[self.view viewWithTag:200];
+        //
+        //    [reF endRefreshing];
+        //
+        //    reF.attributedTitle = [[NSAttributedString alloc]initWithString:@"Pull to refresh"];
+        
+        weakself.mum.center = weakself.view.center;
+        weakself.mum.hidden = YES;
+//        [self.mum startAnimating];
+        DebugLog(@"reloading...");
+//        __block UIAlertController *loadingView = [RAUtils waiting_alert:self title:@"Loading" completion:^{
+            [RANetwork request_cart:weakself.sortIndex completionHandler:^(NSMutableDictionary *result) {
+                        DebugLog(@"BEGIN LOAD CART");
+                        NSDictionary* cart_json = result;
+                        
+                        //
+                        //                [self.mum stopAnimating];
+//                        [loadingView dismissViewControllerAnimated:YES completion:^{
+                            //            [loadingView dismissWithClickedButtonIndex:0 animated:YES];
+                            
+                            //            self.content_data = [cart_json mutableCopy];
+            #ifdef BACKORDER_PROCESS
+                            weakself.back_order_flag = [[cart_json objectForKey:@"back_order_version"] boolValue];
+            #else
+                            weakself.back_order_flag = NO;
+            #endif
+                            
+                            if (!weakself.back_order_flag) {
+                                weakself.freejson = [cart_json objectForKey:@"freeGiveaway"];
+                                weakself.notes = [cart_json valueForKey:@"general_note"];
+                                weakself.content_arr = [RAUtils dictionary2array:cart_json count_fields:@"count" item_mark:@"item_" items_mark:nil];
+                                weakself.currentOrderIsMerged = [[cart_json valueForKey:@"is_merged_order"] boolValue];
+                                [RASingleton sharedInstance].currentOrderIsMerged = weakself.currentOrderIsMerged;
+                                [weakself.itemListTable reloadData];
+                                weakself.print_url = [cart_json valueForKey:@"cart_print_url"];
+                                
+                                
+                                [weakself checkProductAvailable:weakself.content_arr];
+                                
+                                
+                                [weakself refresh_total];
+                            } else {
+                                // v1.94
+                                weakself.freejson = [cart_json objectForKey:@"freeGiveaway"];
+                                weakself.notes = [cart_json valueForKey:@"general_note"];
+                                weakself.cart_json = cart_json;
+                                [weakself.itemListTable reloadData];
+                                weakself.print_url = [cart_json valueForKey:@"cart_print_url"];
+                                [weakself checkProductAvailable:weakself.content_arr];
+                            }
+                            
+                            int result_code=[[cart_json valueForKey:@"result"] intValue];
+                            
+                            if (weakself.dataOperationQueue.operationCount > 1) {
+                                weakself.isrefreshing=false;
+                                return;
+                            }
+                            
+                            if(result_code==2||result_code==1||result_code==0)
+                            {
+                                
+                                [weakself.edit_select_arr removeAllObjects];
+                                
+                                weakself.itemListTable.hidden = false;
+                                //                    UIApplication * app = [UIApplication sharedApplication];
+                                //                    AppDelegate *appDelegate = (AppDelegate *)[app delegate];
+                                //                    appDelegate.cart_count =weakself.content_arr.count;//[[self.content_data valueForKey:@"count"] intValue];
+                                weakself.itemListTable.hidden=false;
+                                if(weakself.onFinishLoad)
+                                    weakself.onFinishLoad();
+                            }
+                            else
+                                if(result_code==RESULT_NET_ERROR)
+                                {
+                                    weakself.label_net_err.hidden=false;
+                                    weakself.itemListTable.hidden=true;
+                                }
+                                else
+                                {
+                                    if(result_code!=1)
+                                        [RAUtils message_alert:[cart_json valueForKey:@"err_msg"] title:@"Loading Cart" controller:weakself] ;
+                                }
+                            
+                            weakself.isrefreshing=false;
+                            DebugLog(@"FINISH LOAD CART");
+//                        }];
+
+                        
+                        
+                    }];
 
+//        }];
+        
+                
+//        dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
+//            DebugLog(@"BEGIN LOAD CART");
+//            NSDictionary* cart_json = [RANetwork request_Cart:weakself.sortIndex];
+//
+//            dispatch_async(dispatch_get_main_queue(), ^{
+//                //
+////                [self.mum stopAnimating];
+//                [loadingView dismissWithClickedButtonIndex:0 animated:YES];
+//
+//                //            self.content_data = [cart_json mutableCopy];
+//#ifdef BACKORDER_PROCESS
+//                weakself.back_order_flag = [[cart_json objectForKey:@"back_order_version"] boolValue];
+//#else
+//                weakself.back_order_flag = NO;
+//#endif
+//
+//                if (!weakself.back_order_flag) {
+//                    weakself.freejson = [cart_json objectForKey:@"freeGiveaway"];
+//                    weakself.notes = [cart_json valueForKey:@"general_note"];
+//                    weakself.content_arr = [RAUtils dictionary2array:cart_json count_fields:@"count" item_mark:@"item_" items_mark:nil];
+//                    weakself.currentOrderIsMerged = [[cart_json valueForKey:@"is_merged_order"] boolValue];
+//                    [Singleton sharedInstance].currentOrderIsMerged = weakself.currentOrderIsMerged;
+//                    [weakself.itemListTable reloadData];
+//                    weakself.print_url = [cart_json valueForKey:@"cart_print_url"];
+//
+//
+//                    [weakself checkProductAvailable:weakself.content_arr];
+//
+//
+//                    [weakself refresh_total];
+//                } else {
+//                    // v1.94
+//                    weakself.freejson = [cart_json objectForKey:@"freeGiveaway"];
+//                    weakself.notes = [cart_json valueForKey:@"general_note"];
+//                    weakself.cart_json = cart_json;
+//                    [weakself.itemListTable reloadData];
+//                    weakself.print_url = [cart_json valueForKey:@"cart_print_url"];
+//                    [weakself checkProductAvailable:weakself.content_arr];
+//                }
+//
+//                int result=[[cart_json valueForKey:@"result"] intValue];
+//
+//                if (weakself.dataOperationQueue.operationCount > 1) {
+//                    weakself.isrefreshing=false;
+//                    return;
+//                }
+//
+//                if(result==2||result==1||result==0)
+//                {
+//
+//                    [weakself.edit_select_arr removeAllObjects];
+//
+//                    weakself.itemListTable.hidden = false;
+////                    UIApplication * app = [UIApplication sharedApplication];
+////                    AppDelegate *appDelegate = (AppDelegate *)[app delegate];
+////                    appDelegate.cart_count =weakself.content_arr.count;//[[self.content_data valueForKey:@"count"] intValue];
+//                    weakself.itemListTable.hidden=false;
+//                    if(weakself.onFinishLoad)
+//                        weakself.onFinishLoad();
+//                }
+//                else
+//                    if(result==RESULT_NET_ERROR)
+//                    {
+//                        weakself.label_net_err.hidden=false;
+//                        weakself.itemListTable.hidden=true;
+//                    }
+//                    else
+//                    {
+//                        if(result!=1)
+//                            [RAUtils message_alert:[cart_json valueForKey:@"err_msg"] title:@"Loading Cart" controller:weakself] ;
+//                    }
+//
+//                weakself.isrefreshing=false;
+//                DebugLog(@"FINISH LOAD CART");
+//
+//            });
+//        });
+    });
+    //    [[self navigationController] setNavigationBarHidden:YES animated:NO];
+}
 -(void)manually_refresh
 {
     UIRefreshControl *reF = (UIRefreshControl *)[self.view viewWithTag:200];
@@ -1209,7 +1423,8 @@
 - (void)viewDidLoad
 {
     [super viewDidLoad];
-    
+//    if(_scanlock==nil)
+//        _scanlock=  [[NSLock alloc] init];
     
 #if defined(USE_BLE_SCANNER) || defined(USE_MFI_SCANNER)
     self.batch_scan=false;
@@ -1246,6 +1461,10 @@
     self.label_net_err.layer.masksToBounds=true;
     
     
+#if defined(USE_BLE_SCANNER) || defined(USE_MFI_SCANNER)
+
+    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(scanner_refresh) name:RA_NOTIFICATION_SCAN_RELOAD_DATA object:nil];
+#endif
     
 #ifdef SCANNER_ORDER
     [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(cartrefresh:) name:@"RA_NOTIFICATION_CART_REFRESH" object:nil];
@@ -5582,13 +5801,15 @@ commitEditingStyle:(UITableViewCellEditingStyle)editingStyle  forRowAtIndexPath:
     
     
     
-    
-#if defined(USE_BLE_SCANNER) || defined(USE_MFI_SCANNER)
+//
+//#if defined(USE_BLE_SCANNER) || defined(USE_MFI_SCANNER)
     if(self.stop_response)
         return;
+
+
+//#endif
     
-#endif
-    
+ 
     
     int cqty=0;
     
@@ -5665,7 +5886,7 @@ commitEditingStyle:(UITableViewCellEditingStyle)editingStyle  forRowAtIndexPath:
     {
         
 #if defined(USE_BLE_SCANNER) || defined(USE_MFI_SCANNER)
-        self.stop_response=true;
+//        self.stop_response=true;
         
     
 #endif
@@ -5683,34 +5904,18 @@ commitEditingStyle:(UITableViewCellEditingStyle)editingStyle  forRowAtIndexPath:
                 
                 
                 
-    #ifdef RA_NOTIFICATION
-                [ActiveViewController Notify:@"CartViewController,OrderListViewController" Message:RA_NOTIFICATION_RELOAD_DATA];
-    #else
-                
-                AppDelegate *appDelegate = (AppDelegate*)[[UIApplication sharedApplication] delegate];
-                [((MainViewController*)appDelegate.main_vc) reloadOrder:true immediately:false];
-                [((MainViewController*)appDelegate.main_vc) reloadCart:true immediately:false];
-    #endif
-                
-#if defined(USE_BLE_SCANNER) || defined(USE_MFI_SCANNER)
 
-        self.stop_response=false;
-        
-    
-#endif
+                [ActiveViewController Notify:@"OrderListViewController" Message:RA_NOTIFICATION_RELOAD_DATA];
+                [ActiveViewController Notify:@"CartViewController" Message:RA_NOTIFICATION_SCAN_RELOAD_DATA];
                 
             }
             else
             {
-                
-                
+                self.stop_response=true;
                 
                 [RAUtils message_alert:return_json[@"err_msg"] title:@"Add To Cart" controller:self action_handler:^(UIAlertAction * _Nonnull action) {
-#if defined(USE_BLE_SCANNER) || defined(USE_MFI_SCANNER)
         self.stop_response=false;
-        
-    
-#endif
+
                 } completion:^{
 
                 }];
@@ -5718,7 +5923,12 @@ commitEditingStyle:(UITableViewCellEditingStyle)editingStyle  forRowAtIndexPath:
             }
             
             
+//#if defined(USE_BLE_SCANNER) || defined(USE_MFI_SCANNER)
+//
             
+//
+//
+//#endif
             
             
         }];
@@ -6325,10 +6535,11 @@ commitEditingStyle:(UITableViewCellEditingStyle)editingStyle  forRowAtIndexPath:
     [self refresh_ui];
 }
 - (void) reload_data {
-    
-    
-    
-    
+//
+//    [NSObject cancelPreviousPerformRequestsWithTarget:self selector:@selector(delayRun) object:nil];
+//    [self performSelector:@selector(delayRun) withObject:nil afterDelay:0.8];
+//
+
     __weak typeof(self) weakself = self;
     self.currentOrderIsMerged = NO;
     NSBlockOperation *operation = [NSBlockOperation blockOperationWithBlock:^{
@@ -6342,4 +6553,36 @@ commitEditingStyle:(UITableViewCellEditingStyle)editingStyle  forRowAtIndexPath:
     
     [self.dataOperationQueue addOperation:operation];
 }
+
+-(void) scanner_refresh
+{
+    __weak typeof(self) weakself = self;
+    self.currentOrderIsMerged = NO;
+    NSBlockOperation *operation = [NSBlockOperation blockOperationWithBlock:^{
+        
+        if (weakself) {
+            __strong typeof(weakself) strongself = weakself;
+            [strongself operation_scan_reload_data];
+        }
+        
+    }];
+    
+    [self.dataOperationQueue addOperation:operation];
+}
+
+//-(void) delayRun
+//{
+//    __weak typeof(self) weakself = self;
+//    self.currentOrderIsMerged = NO;
+//    NSBlockOperation *operation = [NSBlockOperation blockOperationWithBlock:^{
+//
+//        if (weakself) {
+//            __strong typeof(weakself) strongself = weakself;
+//            [strongself operation_reload_data];
+//        }
+//
+//    }];
+//
+//    [self.dataOperationQueue addOperation:operation];
+//}
 @end

RedAnt ERP Mobile/common/Functions/modelDetail/DetailHeaderCell.h

@@ -10,7 +10,7 @@
 #import "PhotoStackView.h"
 #import "RTLabel.h"
 #import "NotificationNameCenter.h"
-//#import "YTPlayerView.h"
+
 #import "RAYTPlayer.h"
 
 
@@ -101,7 +101,7 @@
 @property int quantity;
 
 @property (weak, nonatomic) IBOutlet RAYTPlayer *ytplayerView;
-//@property (weak, nonatomic) IBOutlet YTPlayerView *playerView;
+
 @property (weak, nonatomic) IBOutlet UILabel *hmlg_stock_lb;
 @property (weak, nonatomic) IBOutlet UILabel *hmlg_stock_count_lb;
 @property (weak, nonatomic) IBOutlet UILabel *on_sale_lb;

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

@@ -1999,369 +1999,7 @@
  // Pass the selected object to the new view controller.
  }
  */
-//#pragma mark - UIAlertViewDelegate
-//// Called when a button is clicked. The view will be automatically dismissed after this call returns
-//- (void)alertView:(UIAlertView *)alertView clickedButtonAtIndex:(NSInteger)buttonIndex
-//{
-//
-//    if(alertView.tag == CLOSE_ACTION)
-//    {
-//        if(buttonIndex==1)
-//        {
-//
-//            [self.navigationController popViewControllerAnimated:true];
-//            // back to cart;
-//            //            [self.navigationController dismissViewControllerAnimated:true completion:^{
-//            //                ;
-//            //            }];
-//            //    if ([[upparams valueForKey:@"close_on_save"] boolValue]) {
-//            //        appDelegate.order_code = nil;
-//            //
-//            //    }
-//        }
-//        if(buttonIndex==2)
-//        {
-//
-//            [self.navigationController popViewControllerAnimated:false];
-//
-//
-//
-//            AppDelegate *appDelegate = (AppDelegate*)[[UIApplication sharedApplication] delegate];
-//
-//
-//            [((MainViewController*)appDelegate.main_vc) switchToOrder];
-//            // back to cart;
-//            //            [self.navigationController dismissViewControllerAnimated:true completion:^{
-//            //                ;
-//            //            }];
-//            //    if ([[upparams valueForKey:@"close_on_save"] boolValue]) {
-//            //        appDelegate.order_code = nil;
-//            //
-//            //    }
-//        }
-//        else if(buttonIndex==3)
-//        {
-//            // close order;
-//
-//
-//            AppDelegate *appDelegate = (AppDelegate*)[[UIApplication sharedApplication] delegate];
-//            UIAlertController * waitalert = [RAUtils waiting_alert:self title:@"Release Order"];
-//            dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
-//
-//                NSDictionary* order_json = [RANetwork release_Order:appDelegate.order_code withScreen:nil];
-//
-//                dispatch_async(dispatch_get_main_queue(), ^{
-//                    [waitalert dismissViewControllerAnimated:YES completion:nil];
-//                    if([[order_json valueForKey:@"result"] intValue]==2)
-//                    {
-//                        AppDelegate *appDelegate = (AppDelegate*)[[UIApplication sharedApplication] delegate];
-//                        //                        appDelegate.order_code = nil;
-//
-//                        [appDelegate closeOrder];
-//
-//
-//#ifdef RA_NOTIFICATION
-//                        [ActiveViewController Notify:@"CartViewController,OrderListViewController" Message:RA_NOTIFICATION_RELOAD_DATA];
-//#else
-//                        [((MainViewController*)appDelegate.main_vc) reloadCart:true immediately:false];
-//                        [((MainViewController*)appDelegate.main_vc) reloadOrder:true immediately:false];
-//#endif
-//
-//                        [((MainViewController*)appDelegate.main_vc) switchToHome];
-//
-//                        if([appDelegate.mode isEqualToString:@"TM"]&& appDelegate.submit_order_logout)
-//                        {
-//                            [((MainViewController*)appDelegate.main_vc) Loginout:false];
-//                        }
-//
-//                        [self prepareReturn:nil];
-//
-//
-//                        [self.navigationController popViewControllerAnimated:true];
-//                        //                        [self.navigationController dismissViewControllerAnimated:true completion:^{
-//                        //                            ;
-//                        //                        }];
-//
-//                    }
-//                    else
-//                    {
-//                        [RAUtils message_alert:[order_json valueForKey:@"err_msg"] title:@"Open Order"controller:self] ;
-//                    }
-//
-//
-//
-//                });
-//            });
-//
-//
-//
-//
-//
-//            //
-//            //    }
-//        }
-//    }
-//}
-//
-//
-//-(void) downloadpdf:(NSString* )url
-//{
-//    UIAlertController * waitalert = [RAUtils waiting_alert:self title:@"Printing..."];
-//    dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
-//        
-//        
-//        NSMutableURLRequest *request = [[NSMutableURLRequest alloc] initWithURL:[NSURL URLWithString:url]        cachePolicy:NSURLRequestReloadIgnoringLocalCacheData timeoutInterval:60*5];
-//        
-//        //设置请求方式为get
-//        
-//        [request setHTTPMethod:@"GET"];
-//        
-//        //添加用户会话id
-//        
-//        [request addValue:@"text/html" forHTTPHeaderField:@"Content-Type"];
-//        
-//        //连接发送请求
-//        
-//        
-//        NSHTTPURLResponse* urlResponse = nil;
-//        
-//        NSError *error = [[NSError alloc] init];
-//        
-//        NSData* content= [NSURLConnection sendSynchronousRequest:request returningResponse:&urlResponse error:&error];
-//        
-//        //      self.filename = [urlResponse suggestedFilename];
-//        
-//        
-//        dispatch_async(dispatch_get_main_queue(), ^{
-//            [waitalert dismissViewControllerAnimated:YES completion:nil];
-//            //  self.navigationItem.title = self.save_name;
-//            //   UIRefreshControl *reF = (UIRefreshControl *)[self.view viewWithTag:200];
-//            //  self.content=nil;
-//            if(content!=nil&&content.length>0)
-//            {
-//                
-//                
-//                [self startAirPrintWithData:content];
-//                
-//                
-//            }
-//            else
-//            {
-//                [RAUtils message_alert:nil  title:@"Open PDF Failed" controller:self];
-//                //                self.content = [self.url dataUsingEncoding:NSUTF8StringEncoding];
-//            }
-//            
-//            ;
-//            //            DebugLog(@"%@",[[NSString alloc] initWithData:self.content encoding:NSASCIIStringEncoding]);
-//            //
-//            
-//            
-//            // [self.webView loadData:self.content MIMEType:urlResponse.MIMEType textEncodingName:nil baseURL:nil];
-//            
-//            
-//            
-//            
-//        });
-//    });
-//}
-//
-//- (void)startAirPrintWithData:(id )data
-//{
-//    
-//    
-//    
-//    
-//    UIPrintInteractionController* airPrinterController=[UIPrintInteractionController sharedPrintController];
-//    UIPrintInfo *printInfo = [UIPrintInfo printInfo];
-//    printInfo.outputType = UIPrintInfoOutputGeneral;
-//    printInfo.orientation = UIPrintInfoOrientationPortrait;
-//    printInfo.jobName = @"CoolVisitAirPrint";
-//    airPrinterController.printInfo = printInfo;
-//    airPrinterController.printingItem = data;
-//    airPrinterController.delegate = self;
-//    
-//    
-//    airPrinterController.showsNumberOfCopies=true;
-//    airPrinterController.showsPageRange = true;
-//    airPrinterController.showsPaperSelectionForLoadedPapers=true;
-//    
-//    void (^completionHandler)(UIPrintInteractionController *, BOOL, NSError *) = ^(UIPrintInteractionController *printController, BOOL completed, NSError *error) {
-//        if(completed && error)
-//            DebugLog(@"Printing failed due to error in domain %@ with error code %lu. Localized description: %@, and failure reason: %@", error.domain, (long)error.code, error.localizedDescription, error.localizedFailureReason);
-//    };
-//    
-//    AppDelegate *appDelegate = (AppDelegate*)[[UIApplication sharedApplication] delegate];
-//    
-//    UIPrinter *airPrinter = [UIPrinter printerWithURL:[NSURL URLWithString:appDelegate.printerURL] ];///*self.printer;*/
-//    
-//    
-//    
-//    
-//    [[UIPrinter printerWithURL:[NSURL URLWithString:appDelegate.printerURL]] contactPrinter:^(BOOL available)
-//     {
-//         if (available&& appDelegate.printerURL.length>0)
-//         {
-//             
-//             [airPrinterController printToPrinter:airPrinter completionHandler:completionHandler];
-//             DebugLog(@"AIRPRINTER AVAILABLE");
-//         }
-//         else
-//         {
-//             
-//             //             [airPrinterController presentFromRect:CGRectMake(0, 0, 300, 500) inView:self.view animated:YES completionHandler:
-//             //              
-//             //              
-//             //              
-//             //              //        [printPicker presentAnimated:YES completionHandler:
-//             //              ^(UIPrintInteractionController *printerController, BOOL userDidSelect, NSError *error)
-//             //              {
-//             //                  if (userDidSelect)
-//             //                  {
-//             //                      NSString* sid= printerController.printInfo.printerID;
-//             //                      UIPrintPaper*paper=  printerController.printPaper;
-//             //  
-//             //                  }
-//             //              }];
-//             
-//             
-//             DebugLog(@"AIRPRINTER NOT AVAILABLE");
-//             
-//             
-//             
-//             if (NSFoundationVersionNumber > NSFoundationVersionNumber_iOS_7_1)
-//             {
-//                 UIPrinterPickerController *printPicker = [UIPrinterPickerController printerPickerControllerWithInitiallySelectedPrinter:nil];
-//              //   [printPicker presentFromBarButtonItem:self.btnSubmitOrder animated:yes completionHandler:
-//                 
-//                 
-//                 
-//                [ printPicker presentFromBarButtonItem:self.btnSubmitOrder animated:YES completionHandler:
-//                 
-//                 
-//                // [printPicker presentFromRect:CGRectMake(0, 0, 300, 500) inView:self.view animated:YES completionHandler:
-//                  
-//                  
-//                  
-//                  //        [printPicker presentAnimated:YES completionHandler:
-//                  ^(UIPrinterPickerController *printerPicker, BOOL userDidSelect, NSError *error)
-//                  {
-//                      if (userDidSelect)
-//                      {
-//                          //User selected the item in the UIPrinterPickerController and got the printer details.
-//                          
-//                          [UIPrinterPickerController printerPickerControllerWithInitiallySelectedPrinter:printerPicker.selectedPrinter];
-//                          
-//                          //Here you will get the printer and printer details.ie,
-//                          // printerPicker.selectedPrinter, printerPicker.selectedPrinter.displayName, printerPicker.selectedPrinter.URL etc. So you can display the printer name in your label text or button title.
-//                          
-//                          
-//                          
-//                          
-//                          appDelegate.printerURL =printerPicker.selectedPrinter.URL.absoluteString;
-//                          
-//                          [self startAirPrintWithData:data];
-//                          
-//                      }
-//                      else
-//                      {
-//                          
-//                          
-//                          AppDelegate *appDelegate = (AppDelegate*)[[UIApplication sharedApplication] delegate];
-//                          if([appDelegate.mode isEqualToString:@"Trade Show Mode"]&& appDelegate.submit_order_logout)
-//                          {
-//                              
-//                              [((MainViewController*)appDelegate.main_vc) Loginout:false];
-//                          }
-//                          [self prepareReturn:nil];
-//                          
-//                          [self.navigationController popViewControllerAnimated:true];
-//                      }
-//                  }];
-//             }
-//         }
-//     }];
-//    
-//    
-//    
-//}
-//
-//#pragma mark - UIPrintInteractionControllerDelegate
-//- (UIPrintPaper *)printInteractionController:(UIPrintInteractionController *)printInteractionController choosePaper:(NSArray<UIPrintPaper *> *)paperList
-//{
-//    
-//    ;
-//    
-//    //    (int) width = 29700
-//    //    Printing description of (*( (int *)0x7caa3a40)):
-//    //    (int) height = 42000
-//    //设置纸张大小
-//    
-//    
-//    for(UIPrintPaper* paper in paperList)
-//    {
-//        if (CGSizeEqualToSize(paper.paperSize, CGSizeMake(612, 792)))
-//            return paper;
-//        
-//    }
-//    CGSize paperSize = CGSizeMake(612, 792);
-//    UIPrintPaper * p=[UIPrintPaper bestPaperForPageSize:paperSize withPapersFromArray:paperList];
-//    return p;
-//}
-//- (void)printInteractionControllerWillPresentPrinterOptions:(UIPrintInteractionController *)printInteractionController
-//{
-//    
-//}
-//- (void)printInteractionControllerDidPresentPrinterOptions:(UIPrintInteractionController *)printInteractionController
-//{
-//    
-//}
-//- (void)printInteractionControllerWillDismissPrinterOptions:(UIPrintInteractionController *)printInteractionController
-//{
-//    
-//}
-//- (void)printInteractionControllerDidDismissPrinterOptions:(UIPrintInteractionController *)printInteractionController
-//{
-//    
-//}
-//
-//- (void)printInteractionControllerWillStartJob:(UIPrintInteractionController *)printInteractionController
-//{
-//    
-//}
-//- (void)printInteractionControllerDidFinishJob:(UIPrintInteractionController *)printInteractionController
-//{
-//    
-//    AppDelegate *appDelegate = (AppDelegate*)[[UIApplication sharedApplication] delegate];
-//    if([appDelegate.mode isEqualToString:@"Trade Show Mode"]&& appDelegate.submit_order_logout)
-//    {
-//        
-//        [((MainViewController*)appDelegate.main_vc) Loginout:false];
-//    }
-//    
-//    [self prepareReturn:nil];
-//    
-//    [self.navigationController popViewControllerAnimated:true];
-//}
-//
-//- (NSString *)currentPriceTypeName {
-//    NSInteger priceType = [Singleton sharedInstance].npd_shop_price_type;
-//        
-//    NSString* pricename = nil;
-//    switch (priceType) {
-//        case 0:
-//            pricename=[Singleton sharedInstance].deliveryString;
-//            break;
-//        case 1:
-//            pricename=flat_price;
-//            break;
-//        case 2:
-//            pricename=given_price;
-//            break;
-//        default:
-//            break;
-//    }
-//    return pricename;
-//}
+
 
 - (void)releaseOrderAfterSave {
     

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

@@ -2054,9 +2054,7 @@
             if(height==0)
                 height=DEF_TABLE_HEIGHT;
             
-            
-            //          DebugLog(@"heightForRowAtIndexPath...............webview,hight = %f  section=%ld",height,indexPath.section);
-            //wait(1000);
+
             return height;
         }
             break;
@@ -2597,7 +2595,7 @@
         cell.wkwebview.tag = indexPath.section;
         
         cell.wkwebview.navigationDelegate = self;
-        //        cell.webView.scrollView.contentSize.height = 0;
+        
         cell.wkwebview.scrollView.bounces=NO;
         cell.wkwebview.scrollView.directionalLockEnabled = true;
         CGSize size= cell.wkwebview.scrollView.contentSize;
@@ -2608,9 +2606,9 @@
         cell.wkwebview.userInteractionEnabled = YES;
         
         cell.html =[section valueForKey:@"data"];
-        NSLog(@"webview loadHTMLString 0");
+        NSLog(@"wkwebview loadHTMLString 0");
         [cell.wkwebview loadHTMLString:[section valueForKey:@"data"] baseURL:nil];
-        NSLog(@"webview loadHTMLString 1");
+        NSLog(@"wkwebview loadHTMLString 1");
 
         return cell;
     } else if ([type isEqualToString:@"sign_url"]) { /** Sign */
@@ -2721,7 +2719,7 @@
         
         cell.wkwebview.tag = indexPath.section;
         cell.wkwebview.navigationDelegate = self;
-        //        cell.webView.scrollView.contentSize.height = 0;
+        
         cell.wkwebview.scrollView.bounces=NO;
         cell.wkwebview.scrollView.directionalLockEnabled = true;
         CGSize size= cell.wkwebview.scrollView.contentSize;
@@ -2730,9 +2728,9 @@
         
         
         
-        NSLog(@"webview loadHTMLString 3");
+        NSLog(@"wkwebview loadHTMLString 3");
         [cell.wkwebview loadHTMLString:[section valueForKey:@"data"] baseURL:nil];
-        NSLog(@"webview loadHTMLString 4");
+        NSLog(@"wkwebview loadHTMLString 4");
         
         cell.backgroundColor = [UIColor whiteColor];
         return cell;
@@ -2981,31 +2979,6 @@
     
     if ([type isEqualToString:@"order_info"]) {/** Order Info */
         
-//        NSString *CellIdentifier = @"OrderDetailHtmlCell";
-//        OrderDetailHtmlCell * cell= [tableView dequeueReusableCellWithIdentifier:CellIdentifier forIndexPath:indexPath];
-//
-//
-//
-//
-//
-//        cell.webview.tag = indexPath.section;
-//
-//        cell.webview.delegate = self;
-//        //        cell.webView.scrollView.contentSize.height = 0;
-//        cell.webview.scrollView.bounces=NO;
-//        cell.webview.scrollView.directionalLockEnabled = true;
-//        CGSize size= cell.webview.scrollView.contentSize;
-//        size.height=10;
-//        cell.webview.scrollView.contentSize=size;
-//
-//        [cell.webview loadHTMLString:[section valueForKey:@"data"] baseURL:nil];
-//
-//        cell.backgroundColor = [UIColor whiteColor];
-//        return cell;
-//
-//
-//
-        
         NSString *CellIdentifier = @"OrderDetailHtmlCell";
         OrderDetailHtmlCell * cell= [tableView dequeueReusableCellWithIdentifier:CellIdentifier forIndexPath:indexPath];
         
@@ -3016,7 +2989,7 @@
         cell.wkwebview.tag = indexPath.section;
         
         cell.wkwebview.navigationDelegate = self;
-        //        cell.webView.scrollView.contentSize.height = 0;
+        
         cell.wkwebview.scrollView.bounces=NO;
         cell.wkwebview.scrollView.directionalLockEnabled = true;
         CGSize size= cell.wkwebview.scrollView.contentSize;
@@ -3027,9 +3000,9 @@
         cell.wkwebview.userInteractionEnabled = YES;
         
         cell.html =[section valueForKey:@"data"];
-        NSLog(@"webview loadHTMLString 0");
+        NSLog(@"wkwebview loadHTMLString 0");
         [cell.wkwebview loadHTMLString:[section valueForKey:@"data"] baseURL:nil];
-        NSLog(@"webview loadHTMLString 1");
+        NSLog(@"wkwebview loadHTMLString 1");
 
         return cell;
     } else if ([type isEqualToString:@"sign_url"]) { /** Sign */
@@ -3131,29 +3104,7 @@
         return cell;
     } else if ([type isEqualToString:@"more_order_info"]) { /** More Info */
         
-//        NSString *CellIdentifier = @"OrderDetailHtmlCell";
-//        OrderDetailHtmlCell * cell= [tableView dequeueReusableCellWithIdentifier:CellIdentifier forIndexPath:indexPath];
-//        
-//        
-//        
-//        
-//        cell.webview.tag = indexPath.section;
-//        cell.webview.delegate = self;
-//        //        cell.webView.scrollView.contentSize.height = 0;
-//        cell.webview.scrollView.bounces=NO;
-//        cell.webview.scrollView.directionalLockEnabled = true;
-//        CGSize size= cell.webview.scrollView.contentSize;
-//        size.height=10;
-//        cell.webview.scrollView.contentSize=size;
-//        
-//        
-//        
-//        [cell.webview loadHTMLString:[section valueForKey:@"data"] baseURL:nil];
-//        
-//        cell.backgroundColor = [UIColor whiteColor];
-//        return cell;
-        
-        
+
         NSString *CellIdentifier = @"OrderDetailHtmlCell";
               OrderDetailHtmlCell * cell= [tableView dequeueReusableCellWithIdentifier:CellIdentifier forIndexPath:indexPath];
               
@@ -3162,7 +3113,7 @@
               
               cell.wkwebview.tag = indexPath.section;
               cell.wkwebview.navigationDelegate = self;
-              //        cell.webView.scrollView.contentSize.height = 0;
+              
               cell.wkwebview.scrollView.bounces=NO;
               cell.wkwebview.scrollView.directionalLockEnabled = true;
               CGSize size= cell.wkwebview.scrollView.contentSize;
@@ -3171,9 +3122,9 @@
               
               
               
-              NSLog(@"webview loadHTMLString 3");
+              NSLog(@"wkwebview loadHTMLString 3");
               [cell.wkwebview loadHTMLString:[section valueForKey:@"data"] baseURL:nil];
-              NSLog(@"webview loadHTMLString 4");
+              NSLog(@"wkwebview loadHTMLString 4");
               
               cell.backgroundColor = [UIColor whiteColor];
               return cell;
@@ -3432,7 +3383,7 @@
                 cell.wkwebview.tag = indexPath.section;
                 
                 cell.wkwebview.navigationDelegate = self;
-                //        cell.webView.scrollView.contentSize.height = 0;
+                
                 cell.wkwebview.scrollView.bounces=NO;
                 cell.wkwebview.scrollView.directionalLockEnabled = true;
                 CGSize size= cell.wkwebview.scrollView.contentSize;
@@ -3451,34 +3402,7 @@
 //                cell.backgroundColor = [UIColor whiteColor];
                 return cell;
                 
-                
-//
-//                NSString *CellIdentifier = @"OrderDetailHtmlCell";
-//                OrderDetailHtmlCell * cell= [tableView dequeueReusableCellWithIdentifier:CellIdentifier forIndexPath:indexPath];
-//
-//                cell.html = nil;
-//
-//
-//
-//                cell.wkwebview.tag = indexPath.section;
-//
-//                cell.wkwebview.navigationDelegate = self;
-//                //        cell.webView.scrollView.contentSize.height = 0;
-//                cell.wkwebview.scrollView.bounces=NO;
-//                cell.wkwebview.scrollView.directionalLockEnabled = true;
-//                CGSize size= cell.wkwebview.scrollView.contentSize;
-//                size.height=10;
-//                cell.wkwebview.scrollView.contentSize=size;
-//                cell.backgroundColor = [UIColor whiteColor];
-//
-//                cell.wkwebview.userInteractionEnabled = YES;
-//
-//                cell.html =[section valueForKey:@"data"];
-//                NSLog(@"webview loadHTMLString 0");
-//                [cell.wkwebview loadHTMLString:[section valueForKey:@"data"] baseURL:nil];
-//                NSLog(@"webview loadHTMLString 1");
-//
-//                return cell;
+              
                 
             }
             else
@@ -3592,7 +3516,7 @@
             
             cell.wkwebview.tag = indexPath.section;
                           cell.wkwebview.navigationDelegate = self;
-                          //        cell.webView.scrollView.contentSize.height = 0;
+                          
                           cell.wkwebview.scrollView.bounces=NO;
                           cell.wkwebview.scrollView.directionalLockEnabled = true;
                           CGSize size= cell.wkwebview.scrollView.contentSize;
@@ -3601,99 +3525,17 @@
                           
                           
                           
-                          NSLog(@"webview loadHTMLString 3");
+                          NSLog(@"wkwebview loadHTMLString 3");
                           [cell.wkwebview loadHTMLString:[self.content_data valueForKey:@"more_order_info"] baseURL:nil];
-                          NSLog(@"webview loadHTMLString 4");
+                          NSLog(@"wkwebview loadHTMLString 4");
                           
                           cell.backgroundColor = [UIColor whiteColor];
                           return cell;
             
-            
-//            cell.webview.tag = indexPath.section;
-//            cell.webview.delegate = self;
-//            //        cell.webView.scrollView.contentSize.height = 0;
-//            cell.webview.scrollView.bounces=NO;
-//            cell.webview.scrollView.directionalLockEnabled = true;
-//            CGSize size= cell.webview.scrollView.contentSize;
-//            size.height=10;
-//            cell.webview.scrollView.contentSize=size;
-//
-//
-//
-//            [cell.webview loadHTMLString:[self.content_data valueForKey:@"more_order_info"] baseURL:nil];
-//
-//            cell.backgroundColor = [UIColor whiteColor];
+            \
             return cell;
             
-//            { /** More Info */
-//                
-//                NSString *CellIdentifier = @"OrderDetailHtmlCell";
-//                OrderDetailHtmlCell * cell= [tableView dequeueReusableCellWithIdentifier:CellIdentifier forIndexPath:indexPath];
-//                
-//                
-//                
-//                
-//                cell.wkwebview.tag = indexPath.section;
-//                cell.wkwebview.navigationDelegate = self;
-//                //        cell.webView.scrollView.contentSize.height = 0;
-//                cell.wkwebview.scrollView.bounces=NO;
-//                cell.wkwebview.scrollView.directionalLockEnabled = true;
-//                CGSize size= cell.wkwebview.scrollView.contentSize;
-//                size.height=10;
-//                cell.wkwebview.scrollView.contentSize=size;
-//                
-//                
-//                
-//                NSLog(@"webview loadHTMLString 3");
-//                [cell.wkwebview loadHTMLString:[section valueForKey:@"data"] baseURL:nil];
-//                NSLog(@"webview loadHTMLString 4");
-//                
-//                cell.backgroundColor = [UIColor whiteColor];
-//                return cell;
-//                
-//            }
-            
-            
-            
-            //            NSString *CellIdentifier = @"OrderDetailInfoCell";
-            //            OrderDetailInfoCell * cell= [tableView dequeueReusableCellWithIdentifier:CellIdentifier forIndexPath:indexPath];
-            //
-            //            cell.infoLabel.text =[self.content_data valueForKey:@"more_order_info"];
-            //
-            //
-            //
-            ////            float width = tableView.frame.size.width;
-            ////            width-=CELL_MARGIN*2;
-            ////            CGSize constraintkey = CGSizeMake(width-2*LABEL_MARGIN, 10.0f);//key label width is 40% cell width;
-            ////
-            ////            NSString* key =[self.content_data valueForKey:@"order_info"];
-            ////
-            ////
-            ////
-            ////            CGRect frame;
-            ////            frame.size = constraintkey;
-            ////            frame.origin.x=0;
-            ////            frame.origin.y=0;
-            ////
-            ////            RTLabel* rtlabel = [[RTLabel alloc] initWithFrame:frame];
-            ////
-            ////            [rtlabel setText: key];
-            ////            CGSize optimumSize = [rtlabel optimumSize];
-            ////
-            ////            float height = optimumSize.height;
-            ////            height = MAX(height+LINE_WIDTH+2*LABEL_MARGIN, DEF_CELL_HEIGHT);
-            ////
-            ////
-            ////            frame.origin.x=LABEL_MARGIN;
-            ////            frame.size=CGSizeMake(width, height);
-            ////
-            ////            cell.infoLabel.frame = frame;
-            //
-            //
-            //
-            //
-            //            cell.backgroundColor = [UIColor whiteColor];
-            //            return cell;
+
         }
             break;
         case 2:
@@ -4180,7 +4022,7 @@
 #pragma mark - WKNavigationDelegate
 - (void)webView:(WKWebView *)webView didFinishNavigation:(WKNavigation *)navigation
 {
-     NSLog(@"webview didFinishNavigation");
+     NSLog(@"wkwebview didFinishNavigation");
     
 //    [webView  evaluateJavaScript:@"document.documentElement.outerHTML.toString()" completionHandler:^(id _Nullable html ,NSError * _Nullable error) {
 //
@@ -4215,11 +4057,11 @@
         
     [webView  evaluateJavaScript:@"document.body.scrollHeight;" completionHandler:^(id _Nullable fitHeight,NSError * _Nullable error) {
         
-        NSLog(@"webview evaluateJavaScript");
+        NSLog(@"wkwebview evaluateJavaScript");
         CGRect frame = webView.frame;
        if(height==[fitHeight floatValue])
             {
-                NSLog(@"webview return no need reload table");
+                NSLog(@"wkwebview return no need reload table");
                 
                 
                  return;
@@ -4228,15 +4070,14 @@
         //webView.frame = frame;
         
         
-        //      DebugLog(@"webViewDidFinishLoad ^^^^^^^^^^^^^^^^^Saveheight height=%f   section=%ld",webView.scrollView.contentSize.height,indexPath.section);
+        //      DebugLog(@"wkwebviewDidFinishLoad ^^^^^^^^^^^^^^^^^Saveheight height=%f   section=%ld",webView.scrollView.contentSize.height,indexPath.section);
         
         if(indexPath.section==0)
             self.web_info_height=frame.size.height;
         else
             self.web_moreinfo_height = frame.size.height;
-        //    [self.content.webviewHeight setObject:[NSString stringWithFormat:@"%f",frame.size.height/*webView.scrollView.contentSize.height*/] forKey:[NSString stringWithFormat:@"%ld",(long)indexPath.section]];
-        
-        NSLog(@"webview need call table reload");
+         
+        NSLog(@"wkwebview need call table reload");
         
         
         dispatch_async(dispatch_get_main_queue(), ^{
@@ -4254,57 +4095,10 @@
         });
     }];
     
-//
-//        NSString *fitHeight = [webView stringByEvaluatingJavaScriptFromString:@"document.body.scrollHeight;"];
-    //
- 
-        
-
-        //    [self.table beginUpdates];
 
-        //    [self.table endUpdates];
-        
-        //        [self.webviewoprationQueue addOperationWithBlock:^{
-        //    }];
-        
-        
-        //        [self.table endUpdates];
-        //    }
-        
-        
     
 }
 
-//-(void) rtable
-//{
-//    [self.detailTable reloadData];
-//}
-////禁止链接跳转
-//- (void)webView:(WKWebView *)webView decidePolicyForNavigationAction:(WKNavigationAction *)navigationAction decisionHandler:(void (^)(WKNavigationActionPolicy))decisionHandler {
-//
-//    NSLog(@"%s",__func__);
-//    NSLog(@"navigationAction = %@, \r!!!!!!!!!!!!!!!!!!!!!!\n request = %@",navigationAction,navigationAction.request.URL);
-//
-////    NSString *url = navigationAction.request.URL.absoluteString;
-////    if (![url containsString:[NSBundle mainBundle].bundleURL.absoluteString]) {
-////        self.url = url;
-////    }
-//
-//
-//
-//
-//
-//
-//    if (navigationAction.navigationType != WKNavigationTypeLinkActivated ) {
-//        return decisionHandler(WKNavigationActionPolicyAllow);
-//    }
-//
-//    if ([[UIApplication sharedApplication] canOpenURL:navigationAction.request.URL]) {
-//        [[UIApplication sharedApplication] openURL:navigationAction.request.URL];
-//    }
-//
-//    return decisionHandler(WKNavigationActionPolicyCancel);
-//}
 
 #pragma mark - web view delegate
 

RedAnt ERP Mobile/common/NotificationNameCenter.h

@@ -33,6 +33,9 @@ UIKIT_EXTERN  NSString  *RA_NOTIFICATION_CLEAR_DATA;///<清空数据
 //UIKIT_EXTERN  NSString  *RA_NOTIFICATION_SHOW_PRICE;///<隐藏价格
 //UIKIT_EXTERN  NSString  *RA_NOTIFICATION_HIDE_PRICE;///<显示价格
 UIKIT_EXTERN  NSString  *RA_NOTIFICATION_UPDATE_PRICE;///<刷新价格显示
+
+UIKIT_EXTERN  NSString  *RA_NOTIFICATION_SCAN_RELOAD_DATA;///<重新请求，加载数据
+
 ///<
 ///<
 ///<

RedAnt ERP Mobile/common/NotificationNameCenter.m

@@ -25,6 +25,8 @@ const NSString  *User_LoginOK_Notification = @"User_LoginOK_Notification";
 
 const NSString  *RA_NOTIFICATION_REFRESH_UI = @"RA_NOTIFICATION_REFRESH_UI";
 const NSString  *RA_NOTIFICATION_RELOAD_DATA = @"RA_NOTIFICATION_RELOAD_DATA";
+const NSString  *RA_NOTIFICATION_SCAN_RELOAD_DATA = @"RA_NOTIFICATION_SCAN_RELOAD_DATA";
+
 
 const NSString  *RA_NOTIFICATION_CART_REFRESH = @"RA_NOTIFICATION_CART_REFRESH";
 //const NSString  *RA_NOTIFICATION_SHOW_PRICE = @"RA_NOTIFICATION_SHOW_PRICE";

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

@@ -99,14 +99,10 @@
 		4295AE1C1FE74D46007BE365 /* CommonEditorAutoCompleteView.m in Sources */ = {isa = PBXBuildFile; fileRef = 4295AE1A1FE74D46007BE365 /* CommonEditorAutoCompleteView.m */; };
 		4295AE1D1FE74D46007BE365 /* CommonEditorAutoCompleteView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4295AE1B1FE74D46007BE365 /* CommonEditorAutoCompleteView.xib */; };
 		42B309791E45BA32007AFC62 /* status_filter_cadedate_po.json in Resources */ = {isa = PBXBuildFile; fileRef = 42B309781E45BA32007AFC62 /* status_filter_cadedate_po.json */; };
-		42BEF3571E89FE1200632AB6 /* libGoogleAnalytics.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 42BEF33C1E89FE1100632AB6 /* libGoogleAnalytics.a */; };
-		42BEF3581E89FE1200632AB6 /* GTMNSData+zlib.m in Sources */ = {isa = PBXBuildFile; fileRef = 42BEF34B1E89FE1100632AB6 /* GTMNSData+zlib.m */; };
 		42BEF35D1E89FECD00632AB6 /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 42BEF35C1E89FECD00632AB6 /* SystemConfiguration.framework */; };
 		42BEF35F1E89FEE300632AB6 /* CoreData.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 42BEF35E1E89FEE300632AB6 /* CoreData.framework */; };
-		42BEF3621E8A005800632AB6 /* GoogleAnalyst.m in Sources */ = {isa = PBXBuildFile; fileRef = 42BEF3611E8A005800632AB6 /* GoogleAnalyst.m */; };
 		42BF67CC1E5179970081F90A /* ERPUtils.m in Sources */ = {isa = PBXBuildFile; fileRef = 42BF67CB1E5179970081F90A /* ERPUtils.m */; };
 		42D9A0231EB02DA6008AF7AF /* AdSupport.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 42D9A0221EB02DA6008AF7AF /* AdSupport.framework */; };
-		42D9A0251EB03994008AF7AF /* libAdIdAccess.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 42D9A0241EB03994008AF7AF /* libAdIdAccess.a */; };
 		42DC12F11F0CD98E00A4C011 /* OrderDetailPickInfoCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 42DC12F01F0CD98E00A4C011 /* OrderDetailPickInfoCell.m */; };
 		42E489611EE63F4E007256A0 /* more_color_64.png in Resources */ = {isa = PBXBuildFile; fileRef = 42E489601EE63F4E007256A0 /* more_color_64.png */; };
 		42FD1A031FBD1A3000C5D9A8 /* RAOrderPreviewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 42FD1A021FBD1A3000C5D9A8 /* RAOrderPreviewController.m */; };
@@ -464,43 +460,11 @@
 		4295AE1A1FE74D46007BE365 /* CommonEditorAutoCompleteView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = CommonEditorAutoCompleteView.m; path = ../../common/customUI/commoneditor/CommonEditorAutoCompleteView.m; sourceTree = "<group>"; };
 		4295AE1B1FE74D46007BE365 /* CommonEditorAutoCompleteView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = CommonEditorAutoCompleteView.xib; path = ../../common/customUI/commoneditor/CommonEditorAutoCompleteView.xib; sourceTree = "<group>"; };
 		42B309781E45BA32007AFC62 /* status_filter_cadedate_po.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; name = status_filter_cadedate_po.json; path = common/Functions/order/status_filter_cadedate_po.json; sourceTree = SOURCE_ROOT; };
-		42BEF3241E89FE1100632AB6 /* FirebaseAnalytics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = FirebaseAnalytics.framework; sourceTree = "<group>"; };
-		42BEF3271E89FE1100632AB6 /* FirebaseCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = FirebaseCore.framework; sourceTree = "<group>"; };
-		42BEF3291E89FE1100632AB6 /* CHANGELOG.md */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = net.daringfireball.markdown; path = CHANGELOG.md; sourceTree = "<group>"; };
-		42BEF32B1E89FE1100632AB6 /* FirebaseInstanceID.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = FirebaseInstanceID.framework; sourceTree = "<group>"; };
-		42BEF32C1E89FE1100632AB6 /* README.md */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = net.daringfireball.markdown; path = README.md; sourceTree = "<group>"; };
-		42BEF32F1E89FE1100632AB6 /* GGLAnalytics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = GGLAnalytics.framework; sourceTree = "<group>"; };
-		42BEF3301E89FE1100632AB6 /* GGLCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = GGLCore.framework; sourceTree = "<group>"; };
-		42BEF3321E89FE1100632AB6 /* Analytics.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Analytics.h; sourceTree = "<group>"; };
-		42BEF3331E89FE1100632AB6 /* Core.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Core.h; sourceTree = "<group>"; };
-		42BEF3341E89FE1100632AB6 /* module.modulemap */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = "sourcecode.module-map"; path = module.modulemap; sourceTree = "<group>"; };
-		42BEF3361E89FE1100632AB6 /* Analytics-Module.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "Analytics-Module.h"; sourceTree = "<group>"; };
-		42BEF3371E89FE1100632AB6 /* Core-Module.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "Core-Module.h"; sourceTree = "<group>"; };
-		42BEF3381E89FE1100632AB6 /* SignIn-Module.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "SignIn-Module.h"; sourceTree = "<group>"; };
-		42BEF3391E89FE1100632AB6 /* README.md */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = net.daringfireball.markdown; path = README.md; sourceTree = "<group>"; };
-		42BEF33C1E89FE1100632AB6 /* libGoogleAnalytics.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libGoogleAnalytics.a; sourceTree = "<group>"; };
-		42BEF33E1E89FE1100632AB6 /* GAI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GAI.h; sourceTree = "<group>"; };
-		42BEF33F1E89FE1100632AB6 /* GAIDictionaryBuilder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GAIDictionaryBuilder.h; sourceTree = "<group>"; };
-		42BEF3401E89FE1100632AB6 /* GAIEcommerceFields.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GAIEcommerceFields.h; sourceTree = "<group>"; };
-		42BEF3411E89FE1100632AB6 /* GAIEcommerceProduct.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GAIEcommerceProduct.h; sourceTree = "<group>"; };
-		42BEF3421E89FE1100632AB6 /* GAIEcommerceProductAction.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GAIEcommerceProductAction.h; sourceTree = "<group>"; };
-		42BEF3431E89FE1100632AB6 /* GAIEcommercePromotion.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GAIEcommercePromotion.h; sourceTree = "<group>"; };
-		42BEF3441E89FE1100632AB6 /* GAIFields.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GAIFields.h; sourceTree = "<group>"; };
-		42BEF3451E89FE1100632AB6 /* GAILogger.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GAILogger.h; sourceTree = "<group>"; };
-		42BEF3461E89FE1100632AB6 /* GAITrackedViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GAITrackedViewController.h; sourceTree = "<group>"; };
-		42BEF3471E89FE1100632AB6 /* GAITracker.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GAITracker.h; sourceTree = "<group>"; };
-		42BEF34A1E89FE1100632AB6 /* GTMNSData+zlib.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "GTMNSData+zlib.h"; sourceTree = "<group>"; };
-		42BEF34B1E89FE1100632AB6 /* GTMNSData+zlib.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "GTMNSData+zlib.m"; sourceTree = "<group>"; };
-		42BEF34C1E89FE1100632AB6 /* GTMDefines.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GTMDefines.h; sourceTree = "<group>"; };
-		42BEF34E1E89FE1100632AB6 /* README.md */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = net.daringfireball.markdown; path = README.md; sourceTree = "<group>"; };
 		42BEF35C1E89FECD00632AB6 /* SystemConfiguration.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SystemConfiguration.framework; path = System/Library/Frameworks/SystemConfiguration.framework; sourceTree = SDKROOT; };
 		42BEF35E1E89FEE300632AB6 /* CoreData.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreData.framework; path = System/Library/Frameworks/CoreData.framework; sourceTree = SDKROOT; };
-		42BEF3601E8A005800632AB6 /* GoogleAnalyst.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GoogleAnalyst.h; sourceTree = "<group>"; };
-		42BEF3611E8A005800632AB6 /* GoogleAnalyst.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GoogleAnalyst.m; sourceTree = "<group>"; };
 		42BF67CA1E5179970081F90A /* ERPUtils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ERPUtils.h; path = common/ERPUtils.h; sourceTree = SOURCE_ROOT; };
 		42BF67CB1E5179970081F90A /* ERPUtils.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = ERPUtils.m; path = common/ERPUtils.m; sourceTree = SOURCE_ROOT; };
 		42D9A0221EB02DA6008AF7AF /* AdSupport.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AdSupport.framework; path = System/Library/Frameworks/AdSupport.framework; sourceTree = SDKROOT; };
-		42D9A0241EB03994008AF7AF /* libAdIdAccess.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libAdIdAccess.a; sourceTree = "<group>"; };
 		42DC12EF1F0CD98E00A4C011 /* OrderDetailPickInfoCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = OrderDetailPickInfoCell.h; path = common/Functions/order/OrderDetailPickInfoCell.h; sourceTree = SOURCE_ROOT; };
 		42DC12F01F0CD98E00A4C011 /* OrderDetailPickInfoCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = OrderDetailPickInfoCell.m; path = common/Functions/order/OrderDetailPickInfoCell.m; sourceTree = SOURCE_ROOT; };
 		42E489601EE63F4E007256A0 /* more_color_64.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = more_color_64.png; sourceTree = "<group>"; };
@@ -863,7 +827,6 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				42D9A0251EB03994008AF7AF /* libAdIdAccess.a in Frameworks */,
 				42D9A0231EB02DA6008AF7AF /* AdSupport.framework in Frameworks */,
 				42BEF35F1E89FEE300632AB6 /* CoreData.framework in Frameworks */,
 				42BEF35D1E89FECD00632AB6 /* SystemConfiguration.framework in Frameworks */,
@@ -878,7 +841,6 @@
 				713F76AC1929F4A7006A7305 /* CoreGraphics.framework in Frameworks */,
 				713F76AE1929F4A7006A7305 /* UIKit.framework in Frameworks */,
 				713F76AA1929F4A7006A7305 /* Foundation.framework in Frameworks */,
-				42BEF3571E89FE1200632AB6 /* libGoogleAnalytics.a in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -1052,165 +1014,6 @@
 			name = AutoComplete;
 			sourceTree = "<group>";
 		};
-		42BEF3211E89FE1100632AB6 /* GoogleAnalytics */ = {
-			isa = PBXGroup;
-			children = (
-				42BEF3601E8A005800632AB6 /* GoogleAnalyst.h */,
-				42BEF3611E8A005800632AB6 /* GoogleAnalyst.m */,
-				42BEF3221E89FE1100632AB6 /* FirebaseAnalytics */,
-				42BEF3251E89FE1100632AB6 /* FirebaseCore */,
-				42BEF3281E89FE1100632AB6 /* FirebaseInstanceID */,
-				42BEF32D1E89FE1100632AB6 /* Google */,
-				42BEF33A1E89FE1100632AB6 /* GoogleAnalytics */,
-				42BEF3481E89FE1100632AB6 /* GoogleToolboxForMac */,
-			);
-			path = GoogleAnalytics;
-			sourceTree = SOURCE_ROOT;
-		};
-		42BEF3221E89FE1100632AB6 /* FirebaseAnalytics */ = {
-			isa = PBXGroup;
-			children = (
-				42BEF3231E89FE1100632AB6 /* Frameworks */,
-			);
-			path = FirebaseAnalytics;
-			sourceTree = "<group>";
-		};
-		42BEF3231E89FE1100632AB6 /* Frameworks */ = {
-			isa = PBXGroup;
-			children = (
-				42BEF3241E89FE1100632AB6 /* FirebaseAnalytics.framework */,
-			);
-			path = Frameworks;
-			sourceTree = "<group>";
-		};
-		42BEF3251E89FE1100632AB6 /* FirebaseCore */ = {
-			isa = PBXGroup;
-			children = (
-				42BEF3261E89FE1100632AB6 /* Frameworks */,
-			);
-			path = FirebaseCore;
-			sourceTree = "<group>";
-		};
-		42BEF3261E89FE1100632AB6 /* Frameworks */ = {
-			isa = PBXGroup;
-			children = (
-				42BEF3271E89FE1100632AB6 /* FirebaseCore.framework */,
-			);
-			path = Frameworks;
-			sourceTree = "<group>";
-		};
-		42BEF3281E89FE1100632AB6 /* FirebaseInstanceID */ = {
-			isa = PBXGroup;
-			children = (
-				42BEF3291E89FE1100632AB6 /* CHANGELOG.md */,
-				42BEF32A1E89FE1100632AB6 /* Frameworks */,
-				42BEF32C1E89FE1100632AB6 /* README.md */,
-			);
-			path = FirebaseInstanceID;
-			sourceTree = "<group>";
-		};
-		42BEF32A1E89FE1100632AB6 /* Frameworks */ = {
-			isa = PBXGroup;
-			children = (
-				42BEF32B1E89FE1100632AB6 /* FirebaseInstanceID.framework */,
-			);
-			path = Frameworks;
-			sourceTree = "<group>";
-		};
-		42BEF32D1E89FE1100632AB6 /* Google */ = {
-			isa = PBXGroup;
-			children = (
-				42BEF32E1E89FE1100632AB6 /* Frameworks */,
-				42BEF3311E89FE1100632AB6 /* Headers */,
-				42BEF3391E89FE1100632AB6 /* README.md */,
-			);
-			path = Google;
-			sourceTree = "<group>";
-		};
-		42BEF32E1E89FE1100632AB6 /* Frameworks */ = {
-			isa = PBXGroup;
-			children = (
-				42BEF32F1E89FE1100632AB6 /* GGLAnalytics.framework */,
-				42BEF3301E89FE1100632AB6 /* GGLCore.framework */,
-			);
-			path = Frameworks;
-			sourceTree = "<group>";
-		};
-		42BEF3311E89FE1100632AB6 /* Headers */ = {
-			isa = PBXGroup;
-			children = (
-				42BEF3321E89FE1100632AB6 /* Analytics.h */,
-				42BEF3331E89FE1100632AB6 /* Core.h */,
-				42BEF3341E89FE1100632AB6 /* module.modulemap */,
-				42BEF3351E89FE1100632AB6 /* ModuleHeaders */,
-			);
-			path = Headers;
-			sourceTree = "<group>";
-		};
-		42BEF3351E89FE1100632AB6 /* ModuleHeaders */ = {
-			isa = PBXGroup;
-			children = (
-				42BEF3361E89FE1100632AB6 /* Analytics-Module.h */,
-				42BEF3371E89FE1100632AB6 /* Core-Module.h */,
-				42BEF3381E89FE1100632AB6 /* SignIn-Module.h */,
-			);
-			path = ModuleHeaders;
-			sourceTree = "<group>";
-		};
-		42BEF33A1E89FE1100632AB6 /* GoogleAnalytics */ = {
-			isa = PBXGroup;
-			children = (
-				42BEF33B1E89FE1100632AB6 /* Libraries */,
-				42BEF33D1E89FE1100632AB6 /* Sources */,
-			);
-			path = GoogleAnalytics;
-			sourceTree = "<group>";
-		};
-		42BEF33B1E89FE1100632AB6 /* Libraries */ = {
-			isa = PBXGroup;
-			children = (
-				42BEF33C1E89FE1100632AB6 /* libGoogleAnalytics.a */,
-				42D9A0241EB03994008AF7AF /* libAdIdAccess.a */,
-			);
-			path = Libraries;
-			sourceTree = "<group>";
-		};
-		42BEF33D1E89FE1100632AB6 /* Sources */ = {
-			isa = PBXGroup;
-			children = (
-				42BEF33E1E89FE1100632AB6 /* GAI.h */,
-				42BEF33F1E89FE1100632AB6 /* GAIDictionaryBuilder.h */,
-				42BEF3401E89FE1100632AB6 /* GAIEcommerceFields.h */,
-				42BEF3411E89FE1100632AB6 /* GAIEcommerceProduct.h */,
-				42BEF3421E89FE1100632AB6 /* GAIEcommerceProductAction.h */,
-				42BEF3431E89FE1100632AB6 /* GAIEcommercePromotion.h */,
-				42BEF3441E89FE1100632AB6 /* GAIFields.h */,
-				42BEF3451E89FE1100632AB6 /* GAILogger.h */,
-				42BEF3461E89FE1100632AB6 /* GAITrackedViewController.h */,
-				42BEF3471E89FE1100632AB6 /* GAITracker.h */,
-			);
-			path = Sources;
-			sourceTree = "<group>";
-		};
-		42BEF3481E89FE1100632AB6 /* GoogleToolboxForMac */ = {
-			isa = PBXGroup;
-			children = (
-				42BEF3491E89FE1100632AB6 /* Foundation */,
-				42BEF34C1E89FE1100632AB6 /* GTMDefines.h */,
-				42BEF34E1E89FE1100632AB6 /* README.md */,
-			);
-			path = GoogleToolboxForMac;
-			sourceTree = "<group>";
-		};
-		42BEF3491E89FE1100632AB6 /* Foundation */ = {
-			isa = PBXGroup;
-			children = (
-				42BEF34A1E89FE1100632AB6 /* GTMNSData+zlib.h */,
-				42BEF34B1E89FE1100632AB6 /* GTMNSData+zlib.m */,
-			);
-			path = Foundation;
-			sourceTree = "<group>";
-		};
 		42BEF35B1E89FECC00632AB6 /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
@@ -1568,7 +1371,6 @@
 				3C51499A273E0B6400F78617 /* common_const.h */,
 				71C1D84C1F456CAA00CEA1C9 /* HWWeakTimer.h */,
 				71C1D84D1F456CAA00CEA1C9 /* HWWeakTimer.m */,
-				42BEF3211E89FE1100632AB6 /* GoogleAnalytics */,
 				4289809B1E24B526005F1BD8 /* JKTimer */,
 				4289805A1E249375005F1BD8 /* UIColor+HEX */,
 				4289803C1E249339005F1BD8 /* JKLock */,
@@ -2196,7 +1998,6 @@
 				712AFED81DBA050200254965 /* GridDrawable.m in Sources */,
 				424A02D11FFB3A0B0088DC56 /* RABackOrderSubmitAlertController.m in Sources */,
 				7162A5C11C5873BB00AB630E /* FilterCellCadedate.m in Sources */,
-				42BEF3581E89FE1200632AB6 /* GTMNSData+zlib.m in Sources */,
 				3C2F99B8237BE1790000808F /* PortfolioListTableViewCell.m in Sources */,
 				71DF742B1C57560600F2789C /* Reachability.m in Sources */,
 				7162A5701C58728D00AB630E /* DetailHeaderCell.m in Sources */,
@@ -2219,7 +2020,6 @@
 				7162A5E01C5876E300AB630E /* SettingViewController.m in Sources */,
 				712AFEDB1DBA050200254965 /* LineDrawable.m in Sources */,
 				71DF748B1C57608F00F2789C /* SimpleGrid.m in Sources */,
-				42BEF3621E8A005800632AB6 /* GoogleAnalyst.m in Sources */,
 				7162A5171C58704600AB630E /* BundleModelViewController.m in Sources */,
 				7162A5411C58719D00AB630E /* RATreeNode.m in Sources */,
 				3C514947273D095900F78617 /* CommonEditorCellSwitch.m in Sources */,
@@ -2544,9 +2344,10 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = NO;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
-				CURRENT_PROJECT_VERSION = 2211221;
+				CURRENT_PROJECT_VERSION = 230111;
 				DEVELOPMENT_TEAM = HXWLAA5YN5;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
@@ -2593,9 +2394,10 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = NO;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
-				CURRENT_PROJECT_VERSION = 2211221;
+				CURRENT_PROJECT_VERSION = 230111;
 				DEVELOPMENT_TEAM = HXWLAA5YN5;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",

RedAnt ERP Mobile/iSales-CONTRAST.xcodeproj/xcuserdata/ruizhang.xcuserdatad/xcschemes/xcschememanagement.plist

@@ -7,7 +7,7 @@
 		<key>iSales-CONTRAST.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>1</integer>
+			<integer>4</integer>
 		</dict>
 		<key>iSales-USAI.xcscheme_^#shared#^_</key>
 		<dict>

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

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="19529" 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="21507" 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="19519"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="21505"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -17,7 +17,7 @@
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <containerView contentMode="scaleToFill" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Knj-5z-t35">
-                                <rect key="frame" x="0.0" y="100" width="744" height="1033"/>
+                                <rect key="frame" x="0.0" y="100" width="744" height="1032"/>
                                 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                             </containerView>
                             <view contentMode="scaleToFill" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="NhN-BH-vsu" userLabel="headerView">
@@ -25,7 +25,7 @@
                                 <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                 <subviews>
                                     <view clipsSubviews="YES" contentMode="scaleToFill" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="hTL-PV-pUp" customClass="MainHeaderViewColorPanel">
-                                        <rect key="frame" x="160" y="20" width="443" height="72"/>
+                                        <rect key="frame" x="159" y="20" width="454" height="72"/>
                                         <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
                                         <subviews>
                                             <button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="xhl-jK-vdP" userLabel="category button">
@@ -114,7 +114,7 @@
                                         <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
                                     </view>
                                     <view hidden="YES" clipsSubviews="YES" contentMode="scaleToFill" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Udz-7n-3ZO" customClass="MainHeaderViewColorPanel">
-                                        <rect key="frame" x="160" y="20" width="443" height="72"/>
+                                        <rect key="frame" x="159" y="20" width="454" height="72"/>
                                         <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
                                         <subviews>
                                             <button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="dB4-yd-OKw" userLabel="category button">
@@ -260,11 +260,11 @@
                                 <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                             </view>
                             <imageView userInteractionEnabled="NO" alpha="0.0" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="tzq-zw-ENK">
-                                <rect key="frame" x="0.0" y="0.0" width="744" height="1133"/>
+                                <rect key="frame" x="0.0" y="-1" width="744" height="1133"/>
                                 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                             </imageView>
                             <button hidden="YES" opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="DGA-Jz-ciO">
-                                <rect key="frame" x="0.0" y="0.0" width="744" height="1133"/>
+                                <rect key="frame" x="0.0" y="-1" width="744" height="1133"/>
                                 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                 <state key="normal">
                                     <color key="titleColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
@@ -274,7 +274,7 @@
                                 </connections>
                             </button>
                             <view hidden="YES" contentMode="scaleToFill" fixedFrame="YES" restorationIdentifier="menuView" translatesAutoresizingMaskIntoConstraints="NO" id="Qz1-qV-4fT" userLabel="sidemenuView">
-                                <rect key="frame" x="-300" y="0.0" width="364" height="1133"/>
+                                <rect key="frame" x="-300" y="-1" width="364" height="1133"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" heightSizable="YES"/>
                                 <subviews>
                                     <view alpha="0.80000000000000004" contentMode="scaleToFill" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="dR0-Te-FbY" userLabel="backgroundView">
@@ -288,7 +288,7 @@
                                         <color key="backgroundColor" red="0.79277843236923218" green="0.79277843236923218" blue="0.79277843236923218" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                     </view>
                                     <tableView clipsSubviews="YES" contentMode="scaleToFill" fixedFrame="YES" alwaysBounceVertical="YES" dataMode="prototypes" style="grouped" separatorStyle="default" rowHeight="44" sectionHeaderHeight="10" sectionFooterHeight="10" translatesAutoresizingMaskIntoConstraints="NO" id="h0d-S7-vmO">
-                                        <rect key="frame" x="0.0" y="150" width="290" height="900"/>
+                                        <rect key="frame" x="0.0" y="150" width="290" height="899"/>
                                         <autoresizingMask key="autoresizingMask" heightSizable="YES" flexibleMaxY="YES"/>
                                         <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
                                         <color key="separatorColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
@@ -296,7 +296,7 @@
                                         <color key="sectionIndexTrackingBackgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
                                         <prototypes>
                                             <tableViewCell contentMode="scaleToFill" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="SideMenuItem" textLabel="pki-xD-OOT" detailTextLabel="a18-fA-KeX" style="IBUITableViewCellStyleValue1" id="3MW-qC-tOm">
-                                                <rect key="frame" x="0.0" y="49.5" width="290" height="44"/>
+                                                <rect key="frame" x="0.0" y="55.5" width="290" height="44"/>
                                                 <autoresizingMask key="autoresizingMask"/>
                                                 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="3MW-qC-tOm" id="1li-xE-7Vx">
                                                     <rect key="frame" x="0.0" y="0.0" width="290" height="44"/>
@@ -374,7 +374,7 @@
                                         <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                     </view>
                                     <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="Ver:1.0" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="MTI-0q-XWj" userLabel="ver">
-                                        <rect key="frame" x="25" y="1089" width="250" height="21"/>
+                                        <rect key="frame" x="25" y="1087" width="250" height="22"/>
                                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="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"/>
@@ -432,7 +432,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="WatchListItemCell" rowHeight="120" id="Hjj-gq-Qs5" customClass="ModelItemCell">
-                                        <rect key="frame" x="0.0" y="44.5" width="744" height="120"/>
+                                        <rect key="frame" x="0.0" y="50" width="744" height="120"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="Hjj-gq-Qs5" id="bKF-1X-6DE">
                                             <rect key="frame" x="0.0" y="0.0" width="744" height="120"/>
@@ -718,7 +718,7 @@
                                 <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="AxX-hS-Jtg" style="IBUITableViewCellStyleDefault" id="kAP-gb-Gce">
-                                        <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="kAP-gb-Gce" id="Ilc-6o-RhI">
                                             <rect key="frame" x="0.0" y="0.0" width="360" height="44"/>
@@ -817,17 +817,17 @@
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <view hidden="YES" contentMode="scaleToFill" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="hF1-Cm-X4t" userLabel="home category menu">
-                                <rect key="frame" x="-280" y="0.0" width="256" height="1133"/>
+                                <rect key="frame" x="-281" y="-1" width="257" height="1134"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMinX="YES" heightSizable="YES" flexibleMaxY="YES"/>
                                 <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                             </view>
                             <tableView clipsSubviews="YES" contentMode="scaleToFill" fixedFrame="YES" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="none" rowHeight="44" sectionHeaderHeight="22" sectionFooterHeight="22" translatesAutoresizingMaskIntoConstraints="NO" id="nqT-Hf-Ep7" userLabel="home content table">
-                                <rect key="frame" x="0.0" y="0.0" width="744" height="1133"/>
+                                <rect key="frame" x="-1" y="-1" width="744" height="1134"/>
                                 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES" flexibleMaxY="YES"/>
                                 <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="HomeTableViewCellSlide" id="c21-Hy-QJU" customClass="HomeTableViewCellSlide">
-                                        <rect key="frame" x="0.0" y="44.5" width="744" height="44"/>
+                                        <rect key="frame" x="0.0" y="50" width="744" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="c21-Hy-QJU" id="2Mt-ve-YI4">
                                             <rect key="frame" x="0.0" y="0.0" width="744" height="44"/>
@@ -835,7 +835,7 @@
                                         </tableViewCellContentView>
                                     </tableViewCell>
                                     <tableViewCell contentMode="scaleToFill" restorationIdentifier="HomeTableViewCellBanner" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="HomeTableViewCellBanner" rowHeight="317" id="rvl-UX-dny" customClass="HomeTableViewCellBanner">
-                                        <rect key="frame" x="0.0" y="88.5" width="744" height="317"/>
+                                        <rect key="frame" x="0.0" y="94" width="744" height="317"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="rvl-UX-dny" id="ULg-i3-NWf">
                                             <rect key="frame" x="0.0" y="0.0" width="744" height="317"/>
@@ -852,7 +852,7 @@
                                         </connections>
                                     </tableViewCell>
                                     <tableViewCell contentMode="scaleToFill" restorationIdentifier="HomeTableViewCellButtonBanner" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="HomeTableViewCellButtonBanner" rowHeight="317" id="Put-35-LxJ" customClass="HomeTableViewCellButtonBanner">
-                                        <rect key="frame" x="0.0" y="405.5" width="744" height="317"/>
+                                        <rect key="frame" x="0.0" y="411" width="744" height="317"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="Put-35-LxJ" id="Lai-zl-Z6Z">
                                             <rect key="frame" x="0.0" y="0.0" width="744" height="317"/>
@@ -860,7 +860,7 @@
                                         </tableViewCellContentView>
                                     </tableViewCell>
                                     <tableViewCell contentMode="scaleToFill" restorationIdentifier="HomeTableViewCellTopic" selectionStyle="default" indentationWidth="10" reuseIdentifier="HomeTableViewCellTopic" rowHeight="310" id="Pbg-ua-PLt" customClass="HomeTableViewCellTopic">
-                                        <rect key="frame" x="0.0" y="722.5" width="744" height="310"/>
+                                        <rect key="frame" x="0.0" y="728" width="744" height="310"/>
                                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="Pbg-ua-PLt" id="dGe-fL-Pfl">
                                             <rect key="frame" x="0.0" y="0.0" width="744" height="310"/>
@@ -936,12 +936,12 @@
                                 </connections>
                             </tableView>
                             <activityIndicatorView opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" fixedFrame="YES" hidesWhenStopped="YES" animating="YES" style="whiteLarge" translatesAutoresizingMaskIntoConstraints="NO" id="Fnh-SM-ihl">
-                                <rect key="frame" x="354" y="547" width="37" height="37"/>
+                                <rect key="frame" x="353" y="547" width="37" height="37"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
                                 <color key="color" red="0.59999999999999998" green="0.40000000000000002" blue="0.20000000000000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                             </activityIndicatorView>
                             <label hidden="YES" opaque="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="Cannot get data from server.
Tap to try again." textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="95F-9e-vAS">
-                                <rect key="frame" x="233" y="531" width="277" height="73"/>
+                                <rect key="frame" x="232" y="530" width="277" height="73"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="19"/>
                                 <color key="textColor" red="0.33333333333333331" green="0.33333333333333331" blue="0.33333333333333331" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
@@ -1072,7 +1072,7 @@
                             <tableViewSection id="Dxk-o0-QTQ">
                                 <cells>
                                     <tableViewCell contentMode="scaleToFill" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" id="QWz-EJ-Yzy">
-                                        <rect key="frame" x="0.0" y="44.5" width="744" height="44"/>
+                                        <rect key="frame" x="0.0" y="50" width="744" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="QWz-EJ-Yzy" id="E1L-su-dvV">
                                             <rect key="frame" x="0.0" y="0.0" width="744" height="44"/>
@@ -1105,7 +1105,7 @@
                                         </tableViewCellContentView>
                                     </tableViewCell>
                                     <tableViewCell contentMode="scaleToFill" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" id="TID-OY-afi">
-                                        <rect key="frame" x="0.0" y="88.5" width="744" height="44"/>
+                                        <rect key="frame" x="0.0" y="94" width="744" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="TID-OY-afi" id="yuC-0D-Ebs">
                                             <rect key="frame" x="0.0" y="0.0" width="744" height="44"/>
@@ -1153,10 +1153,10 @@
                                         </tableViewCellContentView>
                                     </tableViewCell>
                                     <tableViewCell contentMode="scaleToFill" selectionStyle="blue" accessoryType="disclosureIndicator" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" id="Pol-lE-P45">
-                                        <rect key="frame" x="0.0" y="132.5" width="744" height="44"/>
+                                        <rect key="frame" x="0.0" y="138" width="744" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="Pol-lE-P45" id="FAm-1c-nX0">
-                                            <rect key="frame" x="0.0" y="0.0" width="715.5" height="44"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="713.5" height="44"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Clean Cache" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="AHm-p1-51h">
@@ -1439,7 +1439,7 @@
                                 </constraints>
                                 <prototypes>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="device_cell" textLabel="HwF-54-hzr" style="IBUITableViewCellStyleDefault" id="nP5-gn-0Jl">
-                                        <rect key="frame" x="0.0" y="44.5" width="714" height="44"/>
+                                        <rect key="frame" x="0.0" y="50" width="714" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="nP5-gn-0Jl" id="MCy-CI-ivv">
                                             <rect key="frame" x="0.0" y="0.0" width="714" height="44"/>
@@ -1633,7 +1633,7 @@
                                 <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="NOt-hZ-Ysa" style="IBUITableViewCellStyleDefault" id="FV6-lD-g7T">
-                                        <rect key="frame" x="0.0" y="44.5" width="440" height="44"/>
+                                        <rect key="frame" x="0.0" y="50" width="440" height="44"/>
                                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="FV6-lD-g7T" id="FCT-G6-wmp">
                                             <rect key="frame" x="0.0" y="0.0" width="440" height="44"/>
@@ -1810,19 +1810,19 @@ 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"/>
         <image name="btn_signin" width="100" height="30"/>
         <image name="camera" width="48" height="48"/>
-        <image name="cart_empty" width="96" height="96"/>
-        <image name="category" width="96" height="96"/>
+        <image name="cart_empty" width="72" height="72"/>
+        <image name="category" width="72" height="72"/>
         <image name="check_1_24" width="24" height="24"/>
         <image name="checkbox" width="16" height="16"/>
-        <image name="close" width="32" height="32"/>
+        <image name="close" width="40" height="40"/>
         <image name="contact" width="72" height="72"/>
-        <image name="menu_open" width="36" height="36"/>
+        <image name="menu_open" width="72" height="72"/>
         <image name="npd_logo" width="110" height="13"/>
         <image name="order" width="72" height="72"/>
         <image name="pick_bg" width="280" height="280"/>

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

@@ -67,7 +67,6 @@
 		3CD8ACEB2373F33A00230A30 /* iPadCommonEditorCellEdit.xib in Resources */ = {isa = PBXBuildFile; fileRef = 3CD8ACEA2373F33A00230A30 /* iPadCommonEditorCellEdit.xib */; };
 		3CD8ACEF2373F3DC00230A30 /* iPadCommonEditorCellEnum.xib in Resources */ = {isa = PBXBuildFile; fileRef = 3CD8ACEE2373F3DC00230A30 /* iPadCommonEditorCellEnum.xib */; };
 		3CD8ACF12373F40400230A30 /* iPadCommonEditorCellTextView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 3CD8ACF02373F40400230A30 /* iPadCommonEditorCellTextView.xib */; };
-		3CD95BE6236D20FC00043F00 /* test.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 3CD95BE5236D20FC00043F00 /* test.storyboard */; };
 		3CF55F9C238D20D3009D9414 /* RAYTPlayer.m in Sources */ = {isa = PBXBuildFile; fileRef = 3CF55F9B238D20D3009D9414 /* RAYTPlayer.m */; };
 		3CF55FA0238D2590009D9414 /* ytplayer.html in Resources */ = {isa = PBXBuildFile; fileRef = 3CF55F9F238D258F009D9414 /* ytplayer.html */; };
 		423CC86B21D22D7A008BD2C4 /* Launch Screen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 423CC86A21D22D79008BD2C4 /* Launch Screen.storyboard */; };
@@ -410,7 +409,6 @@
 		3CD8ACEA2373F33A00230A30 /* iPadCommonEditorCellEdit.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = iPadCommonEditorCellEdit.xib; path = ../../common/customUI/CommonEditoriPad/iPadCommonEditorCellEdit.xib; sourceTree = "<group>"; };
 		3CD8ACEE2373F3DC00230A30 /* iPadCommonEditorCellEnum.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = iPadCommonEditorCellEnum.xib; path = ../../common/customUI/CommonEditoriPad/iPadCommonEditorCellEnum.xib; sourceTree = "<group>"; };
 		3CD8ACF02373F40400230A30 /* iPadCommonEditorCellTextView.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = iPadCommonEditorCellTextView.xib; path = ../../common/customUI/CommonEditoriPad/iPadCommonEditorCellTextView.xib; sourceTree = "<group>"; };
-		3CD95BE5236D20FC00043F00 /* test.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = test.storyboard; sourceTree = "<group>"; };
 		3CF55F9A238D20D3009D9414 /* RAYTPlayer.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = RAYTPlayer.h; path = ../../common/Youtube/RAYTPlayer.h; sourceTree = "<group>"; };
 		3CF55F9B238D20D3009D9414 /* RAYTPlayer.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = RAYTPlayer.m; path = ../../common/Youtube/RAYTPlayer.m; sourceTree = "<group>"; };
 		3CF55F9F238D258F009D9414 /* ytplayer.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; name = ytplayer.html; path = ../../common/Youtube/ytplayer.html; sourceTree = "<group>"; };
@@ -1373,7 +1371,6 @@
 				71CB63E221095E0700DC90F9 /* MainHeaderViewColorPanel.m */,
 				7162A5E41C58781000AB630E /* iSalesNavigationController.h */,
 				7162A5E51C58781000AB630E /* iSalesNavigationController.m */,
-				3CD95BE5236D20FC00043F00 /* test.storyboard */,
 				42ED85ED215B734E00C3B9FE /* UWA_Mobile.storyboard */,
 				3C23319823850E4E002BACE4 /* ERP_Mobile_Cart.storyboard */,
 				3C23318D23824473002BACE4 /* ERP_Mobile_Contact.storyboard */,
@@ -2102,7 +2099,6 @@
 				71E5A0101DC99370005BF655 /* config.plist in Resources */,
 				3CD8ACE72373F2A500230A30 /* iPadCommonEditorCellMAction.xib in Resources */,
 				71DF74951C57614C00F2789C /* PhotoBorder.png in Resources */,
-				3CD95BE6236D20FC00043F00 /* test.storyboard in Resources */,
 				3C23319923850E4E002BACE4 /* ERP_Mobile_Cart.storyboard in Resources */,
 				7143E229202FD2CA00451903 /* so.json in Resources */,
 				3C9FFA33274796930067830C /* PhotoList.storyboard in Resources */,

common/WK PDF+Web/RAPDFViewController.m

@@ -46,7 +46,7 @@
     //    ref.hidden = true;
     [ref addTarget:self action:@selector(changeCell) forControlEvents:UIControlEventValueChanged];
     [self.wkWebview.scrollView addSubview:ref];
-//    self.webView.dataDetectorTypes=UIDataDetectorTypeAll;
+
     self.wkWebview.navigationDelegate = self;
     if (@available(iOS 11, *)) {
         self.wkWebview.scrollView.contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentNever;
@@ -162,15 +162,6 @@
     }
 
     
-//   self.url=@"http://192.168.1.3:8080/npd/test.pdf";
-//    NSURL* url = [NSURL URLWithString:self.url];
-//    
-//    NSMutableURLRequest *request = [[NSMutableURLRequest alloc] initWithURL:[NSURL URLWithString:self.url]        cachePolicy:NSURLRequestReloadIgnoringLocalCacheData timeoutInterval:2000];
-//    
-//    
-//    [self.webView loadRequest:request];
-    
-    
     [self loadcontent];
 }
 - (void)onBackClick:(UIButton *)sender {
@@ -239,15 +230,8 @@
                 self.btnemail.enabled =true;
                 self.btnsave.enabled =true;
                 
-        //        if(self.onLoadSuccess)
-        //        self.onLoadSuccess(self.url);
-        //
-        //        if(self.autoPrint)
-        //        [self startAirPrintWithData:self.content];
-                
-        //        NSLog(@"put file to webview");
-        //        [self.webView loadData:self.content MIMEType:@"application/pdf" textEncodingName:nil baseURL:nil];
-                
+
+
                 NSURL *url = [NSURL fileURLWithPath:self.url];
                 NSURLRequest *request = [NSURLRequest requestWithURL:url];
                 [self.wkWebview loadRequest:request];
@@ -323,100 +307,6 @@
                 
                 
                 
-        //        dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
-        //
-        //                NSMutableURLRequest *request = [[NSMutableURLRequest alloc] initWithURL:[NSURL URLWithString:self.url]        cachePolicy:NSURLRequestReloadIgnoringLocalCacheData timeoutInterval:60*5];
-        //
-        //                //设置请求方式为get
-        //
-        //                [request setHTTPMethod:@"GET"];
-        //
-        //                //添加用户会话id
-        //
-        //                [request addValue:@"text/html" forHTTPHeaderField:@"Content-Type"];
-        //
-        //                //连接发送请求
-        //
-        //
-        //                NSHTTPURLResponse* urlResponse = nil;
-        //
-        //                NSError *error = nil;
-        //
-        //                self.content= [NSURLConnection sendSynchronousRequest:request returningResponse:&urlResponse error:&error];
-        //
-        //                if(self.filename.length<=0)
-        //                    self.filename = [urlResponse suggestedFilename];
-        //
-        //
-        //                dispatch_async(dispatch_get_main_queue(), ^{
-        //                    [waitalert dismissViewControllerAnimated:YES completion:nil];
-        //
-        //                    [[self navigationController] setNavigationBarHidden:self.hidenavi animated:NO];
-        //                    self.navigationItem.title = self.save_name;
-        //                    UIRefreshControl *reF = (UIRefreshControl *)[self.view viewWithTag:200];
-        //                  //  self.content=nil;
-        //                    if(self.content!=nil&&self.content.length>0)
-        //                    {
-        //                        [reF removeFromSuperview];
-        //
-        //
-        //                       // NSArray *paths = NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES);
-        //                        NSString *path = NSTemporaryDirectory();
-        //                        NSString *filePath = [path stringByAppendingPathComponent:self.filename];
-        //                        //    NSError *error = nil;
-        //                        //    BOOL bo = [[NSFileManager defaultManager] createDirectoryAtPath:path withIntermediateDirectories:YES attributes:nil error:&error];
-        //                        //    NSAssert(bo,@"创建目录失败");
-        //                        if (self.cachePath.length) {
-        //                            filePath = self.cachePath;
-        //                        }
-        //
-        //                        [self.content writeToFile:filePath atomically:YES];
-        //
-        //                        self.url = filePath;
-        //                        self.isLocalfile = true;
-        //
-        //
-        //                        self.btnshare.enabled =true;
-        //
-        //
-        //                        self.btnemail.enabled =true;
-        //                        self.btnsave.enabled =true;
-        //
-        //
-        //
-        //                        NSURL *url = [NSURL fileURLWithPath:filePath];
-        //                        NSURLRequest *request = [NSURLRequest requestWithURL:url];
-        //                        [self.wkWebview loadRequest:request];
-        //
-        //
-        //
-        //
-        //
-        //
-        //         //               int a=0;
-        //                    }
-        //                    else
-        //                    {
-        //                        [RAUtils message_alert:nil  title:@"Open PDF Failed" controller:self];
-        //
-        //                        if(self.autoPrint)
-        //                            [self.navigationController popViewControllerAnimated:true];
-        //        //                self.content = [self.url dataUsingEncoding:NSUTF8StringEncoding];
-        //                    }
-        //
-        //                    ;
-        //        //            DebugLog(@"%@",[[NSString alloc] initWithData:self.content encoding:NSASCIIStringEncoding]);
-        //                    //
-        //
-        //        //            DebugLog(urlResponse.MIMEType);
-        //
-        //        //            [self.webView loadData:self.content MIMEType:urlResponse.MIMEType textEncodingName:nil baseURL:nil];
-        //
-        //
-        //
-        //
-        //                });
-        //        });
             }
     }];
     

common/WK PDF+Web/WebViewController.m

@@ -61,16 +61,6 @@
     
  
     
-    
-    //   self.url=@"http://192.168.1.3:8080/npd/test.pdf";
-    //    NSURL* url = [NSURL URLWithString:self.url];
-    //
-    //    NSMutableURLRequest *request = [[NSMutableURLRequest alloc] initWithURL:[NSURL URLWithString:self.url]        cachePolicy:NSURLRequestReloadIgnoringLocalCacheData timeoutInterval:2000];
-    //
-    //
-    //    [self.webView loadRequest:request];
-    
-    
     [self loadcontent];
 }
 - (void)onBackClick:(UIButton *)sender {
@@ -112,76 +102,7 @@
     [self.wkWebview loadRequest:request];
     
 //    dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
-    
-//        
-//        NSMutableURLRequest *request = [[NSMutableURLRequest alloc] initWithURL:[NSURL URLWithString:self.url]        cachePolicy:NSURLRequestReloadIgnoringLocalCacheData timeoutInterval:60*5];
-//        
-//        //设置请求方式为get
-//        
-//        [request setHTTPMethod:@"GET"];
-//        
-//        //添加用户会话id
-//        
-//        [request addValue:@"text/html" forHTTPHeaderField:@"Content-Type"];
-//        
-//        //连接发送请求
-//        
-//        
-//        NSHTTPURLResponse* urlResponse = nil;
-//        
-//        NSError *error = [[NSError alloc] init];
-//        
-//        self.content= [NSURLConnection sendSynchronousRequest:request returningResponse:&urlResponse error:&error];
-//        
-//  
-//        
-//        dispatch_async(dispatch_get_main_queue(), ^{
-//            
-//            self.navigationItem.title = self.title;
-//            UIRefreshControl *reF = (UIRefreshControl *)[self.view viewWithTag:200];
-//            //  self.content=nil;
-//            if(self.content!=nil&&self.content.length>0)
-//            {
-//                [reF removeFromSuperview];
-//                
-//                
-////                // NSArray *paths = NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES);
-////                NSString *path = NSTemporaryDirectory();
-////                NSString *filePath = [path stringByAppendingPathComponent:self.filename];
-////                //    NSError *error = [[NSError alloc] init];
-////                //    BOOL bo = [[NSFileManager defaultManager] createDirectoryAtPath:path withIntermediateDirectories:YES attributes:nil error:&error];
-////                //    NSAssert(bo,@"创建目录失败");
-////                [self.content writeToFile:filePath atomically:YES];
-////                
-////                
-////                self.btnshare.enabled =true;
-////                
-////                
-////                self.btnemail.enabled =true;
-////                self.btnsave.enabled =true;
-////                
-////                if(self.onLoadSuccess)
-////                    self.onLoadSuccess(self.url);
-//                //               int a=0;
-//            }
-//            else
-//            {
-//                [RAUtils message_alert:nil  title:@"Open URL Failed" controller:self];
-//                //                self.content = [self.url dataUsingEncoding:NSUTF8StringEncoding];
-//            }
-//            
-//            ;
-//            //            DebugLog(@"%@",[[NSString alloc] initWithData:self.content encoding:NSASCIIStringEncoding]);
-//            //
-//            
-//            
-//            [self.webView loadData:self.content MIMEType:urlResponse.MIMEType textEncodingName:nil baseURL:nil];
-//            
-//            
-//            
-//            
-//        });
-//    });
+
     
     
     

common/customUI/PhotoList/View/VideoPreviewCell.m

@@ -53,7 +53,7 @@
             
             [self.playerView LoadWithVid:video_code];
             
-//            self.playerView.wkwebView.configuration.allowsPictureInPictureMediaPlayback=false;
+
             
             self.isPlay = YES;
         }

common/customUI/commoneditor/CommonEditorViewController.m

@@ -761,7 +761,7 @@ if(!self.alert.isBeingDismissed)
                 {
                     int min_length = [[itemjson valueForKey:@"min_length"] intValue];
                     NSString* check_len_val =itemjson[@"value"];
-                    if( check_len_val.length<min_length)
+                    if( check_len_val.length<min_length && check_len_val.length!=0)
                     {
                         self.cancommit = false;
                         
@@ -4694,9 +4694,9 @@ if(!self.alert.isBeingDismissed)
 //
 //            cell.htmlLabel.attributedText = attrStr;
             
-        //    [cell.webview stopLoading];
-            [cell.webview loadHTMLString:html_str baseURL:nil];
-//            [cell.webview loadRequest:[NSURLRequest requestWithURL:[NSURL URLWithString:@"https://www.baidu.com/"]]];
+        
+            [cell.wkwebview loadHTMLString:html_str baseURL:nil];
+
             
             return cell;
         }

common/customUI/commoneditor/CommonEditorWebCell.h

@@ -18,7 +18,7 @@
 @interface CommonEditorWebCell : UITableViewCell
 
 @property (nonatomic,weak) id<CommonEditorWebCellDelegate> webDelegate;
-@property (strong, nonatomic) IBOutlet WKWebView *webview;
+@property (strong, nonatomic) IBOutlet WKWebView *wkwebview;
 @property (weak, nonatomic) IBOutlet UILabel *htmlLabel;
 
 @end

common/customUI/commoneditor/CommonEditorWebCell.m

@@ -8,7 +8,6 @@
 
 #import "CommonEditorWebCell.h"
 
-//@interface CommonEditorWebCell() <UIWebViewDelegate>
 
 @interface CommonEditorWebCell() <WKNavigationDelegate>
 
@@ -43,23 +42,23 @@
 }
 
 - (void)dealloc {
-//    [self removeObserver:self forKeyPath:@"self.webview.scrollView.frame"];
+
 }
 
 - (void)setup {
-    self.webview.scrollView.bounces=NO;
-    self.webview.scrollView.directionalLockEnabled = true;
+    self.wkwebview.scrollView.bounces=NO;
+    self.wkwebview.scrollView.directionalLockEnabled = true;
     
-    self.webview.navigationDelegate = self;
+    self.wkwebview.navigationDelegate = self;
     if (@available(iOS 11, *)) {
-        self.webview.scrollView.contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentNever;
+        self.wkwebview.scrollView.contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentNever;
     }
     
-//    [self addObserver:self forKeyPath:@"self.webview.scrollView.frame" options:NSKeyValueObservingOptionNew context:nil];
+
 }
 
 - (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(NSDictionary<NSKeyValueChangeKey,id> *)change context:(void *)context {
-    if ([keyPath isEqualToString:@"self.webview.scrollView.frame"]) {
+    if ([keyPath isEqualToString:@"self.wkwebview.scrollView.frame"]) {
         [self updateContentHeight];
     }
 }
@@ -70,8 +69,8 @@
     
     
 //    return;
-    [self.webview evaluateJavaScript:@"document.body.scrollHeight;" completionHandler:^(id _Nullable fitHeight, NSError * _Nullable error) {
-//        NSString *h_str = [self.webview stringByEvaluatingJavaScriptFromString:@"document.body.scrollHeight;"];
+    [self.wkwebview evaluateJavaScript:@"document.body.scrollHeight;" completionHandler:^(id _Nullable fitHeight, NSError * _Nullable error) {
+
         
         NSString *h_str =fitHeight;
         float h = [h_str floatValue];
@@ -89,13 +88,6 @@
         
     
 }
-//- (void)webViewDidFinishLoad:(UIWebView *)webView {
-//    
-//    [self updateContentHeight];
-//}
-
-//- (void)webView:(UIWebView *)webView didFailLoadWithError:(NSError *)error {
-////    [self updateContentHeight];
-//}
+
 
 @end