ERP MOBILE.

增加首页功能按钮appearance 控制

RedAnt ERP Mobile/RedAnt ERP Mobile.xcworkspace/xcuserdata/Ray.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -154,7 +154,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/MainViewController.m"
-            timestampString = "554191896.038866"
+            timestampString = "554266116.9687051"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "102"
@@ -202,12 +202,12 @@
                   moduleName = "UWAVER Mobile"
                   usesParentBreakpointCondition = "Yes"
                   urlString = "file:///Users/ray/Documents/CODE_ERPSuiteIOS/RedAnt%20ERP%20Mobile/common/Functions/search+itemsearch/ItemSearchViewController.m"
-                  timestampString = "554194161.882076"
+                  timestampString = "554266118.070549"
                   startingColumnNumber = "9223372036854775807"
                   endingColumnNumber = "9223372036854775807"
                   startingLineNumber = "1999"
                   endingLineNumber = "1999"
-                  offsetFromSymbolStart = "1624">
+                  offsetFromSymbolStart = "1544">
                </Location>
                <Location
                   shouldBeEnabled = "Yes"
@@ -217,12 +217,12 @@
                   moduleName = "UWAVER Mobile"
                   usesParentBreakpointCondition = "Yes"
                   urlString = "file:///Users/ray/Documents/CODE_ERPSuiteIOS/RedAnt%20ERP%20Mobile/common/Functions/search+itemsearch/ItemSearchViewController.m"
-                  timestampString = "554194161.887109"
+                  timestampString = "554266118.0737"
                   startingColumnNumber = "9223372036854775807"
                   endingColumnNumber = "9223372036854775807"
                   startingLineNumber = "1999"
                   endingLineNumber = "1999"
-                  offsetFromSymbolStart = "1636">
+                  offsetFromSymbolStart = "1552">
                </Location>
             </Locations>
          </BreakpointContent>
@@ -314,7 +314,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/MainViewController.m"
-            timestampString = "554191896.039155"
+            timestampString = "554266116.968871"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "131"
@@ -330,7 +330,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/ActiveViewController.m"
-            timestampString = "554191896.039238"
+            timestampString = "554200679.726438"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "168"
@@ -346,7 +346,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/ActiveViewController.m"
-            timestampString = "554191896.039309"
+            timestampString = "554200679.726511"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "147"
@@ -602,7 +602,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/order/OrderDetailViewController.m"
-            timestampString = "554194161.727193"
+            timestampString = "554203827.046164"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "3497"
@@ -611,5 +611,133 @@
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "common/ActiveViewController.m"
+            timestampString = "554200679.72682"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "98"
+            endingLineNumber = "98"
+            landmarkName = "-refresh_on_login"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "common/ActiveViewController.m"
+            timestampString = "554200679.726871"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "110"
+            endingLineNumber = "110"
+            landmarkName = "-refresh_btn_click:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "common/ActiveViewController.m"
+            timestampString = "554200679.726921"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "57"
+            endingLineNumber = "57"
+            landmarkName = "-viewWillAppear:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "common/Functions/DefaultAppearance.m"
+            timestampString = "554264432.654189"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "77"
+            endingLineNumber = "77"
+            landmarkName = "+load_appearance"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "common/Functions/DefaultAppearance.m"
+            timestampString = "554264432.6542619"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "30"
+            endingLineNumber = "30"
+            landmarkName = "+init_appearance"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "common/Functions/DefaultAppearance.m"
+            timestampString = "554264432.654318"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "90"
+            endingLineNumber = "90"
+            landmarkName = "+load_appearance"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "common/Functions/DefaultAppearance.m"
+            timestampString = "554264432.654366"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "250"
+            endingLineNumber = "250"
+            landmarkName = "+set_appearance_item:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "common/Functions/DefaultAppearance.m"
+            timestampString = "554264432.654418"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "104"
+            endingLineNumber = "104"
+            landmarkName = "+get_appearance:container:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
    </Breakpoints>
 </Bucket>

RedAnt ERP Mobile/common/Functions/MainHeaderViewColorPanel.h

@@ -0,0 +1,13 @@
+//
+//  MainHeaderView.h
+//  iSales-UWAVER
+//
+//  Created by Ray on 2018/7/26.
+//  Copyright © 2018 United Software Applications, Inc. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+
+@interface MainHeaderViewColorPanel : UIView
+
+@end

RedAnt ERP Mobile/common/Functions/MainHeaderViewColorPanel.m

@@ -0,0 +1,21 @@
+//
+//  MainHeaderView.m
+//  iSales-UWAVER
+//
+//  Created by Ray on 2018/7/26.
+//  Copyright © 2018 United Software Applications, Inc. All rights reserved.
+//
+
+#import "MainHeaderViewColorPanel.h"
+
+@implementation MainHeaderViewColorPanel
+
+/*
+// Only override drawRect: if you perform custom drawing.
+// An empty implementation adversely affects performance during animation.
+- (void)drawRect:(CGRect)rect {
+    // Drawing code
+}
+*/
+
+@end

RedAnt ERP Mobile/common/Functions/MainViewController.h

@@ -20,7 +20,7 @@
 #import "PDFListViewController.h"
 #import "PortfolioViewController.h"
 #import "ContactListViewController.h"
-
+#import "MainHeaderViewColorPanel.h"
 
 //#import "OrderInfoViewController.h"
 //#define VC_HOME 0
@@ -75,6 +75,7 @@
 - (void) reload;
 - (void) checklogin:(bool) reloadCurrentVC;
 @property (strong, nonatomic) IBOutlet UIView *headerView;
+//MainHeaderView
 - (UIImage*)screen_shot;
 @property (strong, nonatomic) IBOutlet UIButton *openMenuButton;
 @property bool menuShown;
@@ -98,8 +99,8 @@
 
 
 
-@property (strong, nonatomic) IBOutlet UIView *employee_bp;
-@property (strong, nonatomic) IBOutlet UIView *customer_bp;
+@property (strong, nonatomic) IBOutlet MainHeaderViewColorPanel *employee_bp;
+@property (strong, nonatomic) IBOutlet MainHeaderViewColorPanel *customer_bp;
 @property (strong, nonatomic) IBOutlet UILabel *label_cccount;
 @property (strong, nonatomic) IBOutlet UILabel *label_cwcount;
 

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

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14109" targetRuntime="iOS.CocoaTouch.iPad" propertyAccessControl="none" colorMatched="YES" initialViewController="jsC-F8-zYF">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14113" targetRuntime="iOS.CocoaTouch.iPad" propertyAccessControl="none" colorMatched="YES" initialViewController="jsC-F8-zYF">
     <device id="ipad9_7" orientation="portrait">
         <adaptation id="fullscreen"/>
     </device>
@@ -26,30 +26,22 @@
                                 <rect key="frame" x="0.0" y="0.0" width="768" height="100"/>
                                 <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                 <subviews>
-                                    <view clipsSubviews="YES" contentMode="scaleToFill" id="hTL-PV-pUp">
+                                    <view clipsSubviews="YES" contentMode="scaleToFill" id="hTL-PV-pUp" customClass="MainHeaderViewColorPanel">
                                         <rect key="frame" x="160" y="20" width="467" height="72"/>
                                         <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
                                         <subviews>
-                                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="xhl-jK-vdP" userLabel="category button">
+                                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" id="xhl-jK-vdP" userLabel="category button">
                                                 <rect key="frame" x="0.0" y="0.0" width="72" height="72"/>
                                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                                                <fontDescription key="fontDescription" type="system" pointSize="16"/>
-                                                <state key="normal" image="category">
-                                                    <color key="titleColor" red="0.59999999999999998" green="0.40000000000000002" blue="0.20000000000000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                                                    <color key="titleShadowColor" red="0.5" green="0.5" blue="0.5" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                                                </state>
+                                                <state key="normal" image="category"/>
                                                 <connections>
                                                     <action selector="showCategoryMenu:" destination="BYZ-38-t0r" eventType="touchUpInside" id="lqZ-JH-nyi"/>
                                                 </connections>
                                             </button>
-                                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="qK2-gY-nOG" userLabel="cart button">
+                                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" id="qK2-gY-nOG" userLabel="cart button">
                                                 <rect key="frame" x="79" y="0.0" width="72" height="72"/>
                                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                                                <fontDescription key="fontDescription" type="system" pointSize="16"/>
-                                                <state key="normal" image="cart_empty">
-                                                    <color key="titleColor" red="0.59999999999999998" green="0.40000000000000002" blue="0.20000000000000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                                                    <color key="titleShadowColor" red="0.5" green="0.5" blue="0.5" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                                                </state>
+                                                <state key="normal" image="cart_empty"/>
                                                 <connections>
                                                     <action selector="switchToCart:" destination="BYZ-38-t0r" eventType="touchUpInside" id="MmJ-aK-UGJ"/>
                                                 </connections>
@@ -67,31 +59,23 @@
                                                     </userDefinedRuntimeAttribute>
                                                 </userDefinedRuntimeAttributes>
                                             </label>
-                                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="wordWrap" id="04b-vI-vkz" userLabel="order button">
+                                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="wordWrap" id="04b-vI-vkz" userLabel="order button">
                                                 <rect key="frame" x="158" y="0.0" width="72" height="72"/>
                                                 <autoresizingMask key="autoresizingMask" flexibleMaxY="YES"/>
-                                                <fontDescription key="fontDescription" type="system" pointSize="16"/>
-                                                <state key="normal" image="order">
-                                                    <color key="titleColor" red="0.59999999999999998" green="0.40000000000000002" blue="0.20000000000000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                                                    <color key="titleShadowColor" red="0.5" green="0.5" blue="0.5" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                                                </state>
+                                                <state key="normal" image="order"/>
                                                 <connections>
                                                     <action selector="switchToOrder:" destination="BYZ-38-t0r" eventType="touchUpInside" id="GdL-E5-zaV"/>
                                                 </connections>
                                             </button>
-                                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="Nz4-iJ-NSG" userLabel="search button">
+                                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" id="Nz4-iJ-NSG" userLabel="search button">
                                                 <rect key="frame" x="230" y="0.0" width="72" height="72"/>
                                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                                                <fontDescription key="fontDescription" type="system" pointSize="16"/>
-                                                <state key="normal" image="search">
-                                                    <color key="titleColor" red="0.59999999999999998" green="0.40000000000000002" blue="0.20000000000000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                                                    <color key="titleShadowColor" red="0.5" green="0.5" blue="0.5" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                                                </state>
+                                                <state key="normal" image="search"/>
                                                 <connections>
                                                     <action selector="switchToSearch:" destination="BYZ-38-t0r" eventType="touchUpInside" id="RSU-nZ-6zb"/>
                                                 </connections>
                                             </button>
-                                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="7N7-Ov-11Q" userLabel="contact button">
+                                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" id="7N7-Ov-11Q" userLabel="contact button">
                                                 <rect key="frame" x="309" y="0.0" width="72" height="72"/>
                                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                                 <state key="normal" image="contact"/>
@@ -99,7 +83,7 @@
                                                     <action selector="switchToContact:" destination="BYZ-38-t0r" eventType="touchUpInside" id="g9f-ON-eJd"/>
                                                 </connections>
                                             </button>
-                                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="e9G-wT-bVC" userLabel="wishlist button">
+                                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" id="e9G-wT-bVC" userLabel="wishlist button">
                                                 <rect key="frame" x="388" y="0.0" width="72" height="72"/>
                                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                                 <state key="normal" image="wishlist"/>
@@ -120,14 +104,10 @@
                                                     </userDefinedRuntimeAttribute>
                                                 </userDefinedRuntimeAttributes>
                                             </label>
-                                            <button hidden="YES" opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="nIa-ra-HBo" userLabel="scan button">
+                                            <button hidden="YES" opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" id="nIa-ra-HBo" userLabel="scan button">
                                                 <rect key="frame" x="467" y="0.0" width="72" height="72"/>
                                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                                                <fontDescription key="fontDescription" type="system" pointSize="16"/>
-                                                <state key="normal" image="scan">
-                                                    <color key="titleColor" red="0.59999999999999998" green="0.40000000000000002" blue="0.20000000000000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                                                    <color key="titleShadowColor" red="0.5" green="0.5" blue="0.5" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                                                </state>
+                                                <state key="normal" image="scan"/>
                                                 <connections>
                                                     <action selector="onScanClick:" destination="BYZ-38-t0r" eventType="touchUpInside" id="Pgk-0c-nqg"/>
                                                 </connections>
@@ -135,30 +115,22 @@
                                         </subviews>
                                         <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" id="Udz-7n-3ZO">
+                                    <view hidden="YES" clipsSubviews="YES" contentMode="scaleToFill" id="Udz-7n-3ZO" customClass="MainHeaderViewColorPanel">
                                         <rect key="frame" x="160" y="20" width="467" height="72"/>
                                         <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
                                         <subviews>
-                                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="dB4-yd-OKw" userLabel="category button">
+                                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" id="dB4-yd-OKw" userLabel="category button">
                                                 <rect key="frame" x="0.0" y="0.0" width="72" height="72"/>
                                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                                                <fontDescription key="fontDescription" type="system" pointSize="16"/>
-                                                <state key="normal" image="category">
-                                                    <color key="titleColor" red="0.59999999999999998" green="0.40000000000000002" blue="0.20000000000000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                                                    <color key="titleShadowColor" red="0.5" green="0.5" blue="0.5" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                                                </state>
+                                                <state key="normal" image="category"/>
                                                 <connections>
                                                     <action selector="showCategoryMenu:" destination="BYZ-38-t0r" eventType="touchUpInside" id="GxO-wH-K20"/>
                                                 </connections>
                                             </button>
-                                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="6Xo-MD-4L0" userLabel="cart button">
+                                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" id="6Xo-MD-4L0" userLabel="cart button">
                                                 <rect key="frame" x="79" y="0.0" width="72" height="72"/>
                                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                                                <fontDescription key="fontDescription" type="system" pointSize="16"/>
-                                                <state key="normal" image="cart_empty">
-                                                    <color key="titleColor" red="0.59999999999999998" green="0.40000000000000002" blue="0.20000000000000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                                                    <color key="titleShadowColor" red="0.5" green="0.5" blue="0.5" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                                                </state>
+                                                <state key="normal" image="cart_empty"/>
                                                 <connections>
                                                     <action selector="switchToCart:" destination="BYZ-38-t0r" eventType="touchUpInside" id="4pZ-iU-9mA"/>
                                                 </connections>
@@ -176,31 +148,23 @@
                                                     </userDefinedRuntimeAttribute>
                                                 </userDefinedRuntimeAttributes>
                                             </label>
-                                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="wordWrap" id="GTI-Wn-UP4" userLabel="order button">
+                                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="wordWrap" id="GTI-Wn-UP4" userLabel="order button">
                                                 <rect key="frame" x="158" y="0.0" width="72" height="72"/>
                                                 <autoresizingMask key="autoresizingMask" flexibleMaxY="YES"/>
-                                                <fontDescription key="fontDescription" type="system" pointSize="16"/>
-                                                <state key="normal" image="order">
-                                                    <color key="titleColor" red="0.59999999999999998" green="0.40000000000000002" blue="0.20000000000000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                                                    <color key="titleShadowColor" red="0.5" green="0.5" blue="0.5" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                                                </state>
+                                                <state key="normal" image="order"/>
                                                 <connections>
                                                     <action selector="switchToOrder:" destination="BYZ-38-t0r" eventType="touchUpInside" id="qMf-pm-hYx"/>
                                                 </connections>
                                             </button>
-                                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="taE-ut-WBx" userLabel="search button">
+                                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" id="taE-ut-WBx" userLabel="search button">
                                                 <rect key="frame" x="230" y="0.0" width="72" height="72"/>
                                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                                                <fontDescription key="fontDescription" type="system" pointSize="16"/>
-                                                <state key="normal" image="search">
-                                                    <color key="titleColor" red="0.59999999999999998" green="0.40000000000000002" blue="0.20000000000000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                                                    <color key="titleShadowColor" red="0.5" green="0.5" blue="0.5" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                                                </state>
+                                                <state key="normal" image="search"/>
                                                 <connections>
                                                     <action selector="switchToSearch:" destination="BYZ-38-t0r" eventType="touchUpInside" id="Z5m-Tu-eRu"/>
                                                 </connections>
                                             </button>
-                                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="hkn-sR-Oh1" userLabel="wishlist button">
+                                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" id="hkn-sR-Oh1" userLabel="wishlist button">
                                                 <rect key="frame" x="309" y="0.0" width="72" height="72"/>
                                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                                 <state key="normal" image="wishlist"/>
@@ -221,14 +185,10 @@
                                                     </userDefinedRuntimeAttribute>
                                                 </userDefinedRuntimeAttributes>
                                             </label>
-                                            <button hidden="YES" opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="0dP-o2-4Xj" userLabel="scan button">
+                                            <button hidden="YES" opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" id="0dP-o2-4Xj" userLabel="scan button">
                                                 <rect key="frame" x="388" y="0.0" width="72" height="72"/>
                                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                                                <fontDescription key="fontDescription" type="system" pointSize="16"/>
-                                                <state key="normal" image="scan">
-                                                    <color key="titleColor" red="0.59999999999999998" green="0.40000000000000002" blue="0.20000000000000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                                                    <color key="titleShadowColor" red="0.5" green="0.5" blue="0.5" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                                                </state>
+                                                <state key="normal" image="scan"/>
                                                 <connections>
                                                     <action selector="onScanClick:" destination="BYZ-38-t0r" eventType="touchUpInside" id="AYO-6T-huA"/>
                                                 </connections>
@@ -240,7 +200,7 @@
                                         <rect key="frame" x="49" y="21" width="69" height="50"/>
                                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                         <state key="normal" image="npd_logo">
-                                            <color key="titleShadowColor" red="0.5" green="0.5" blue="0.5" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                            <color key="titleColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                         </state>
                                         <connections>
                                             <action selector="switchToHome:" destination="BYZ-38-t0r" eventType="touchUpInside" id="7U3-RK-7hh"/>
@@ -426,9 +386,9 @@
                         <outlet property="btn_sideMenu_UserName" destination="Rki-F9-VV1" id="U1D-pK-gzg"/>
                         <outlet property="buttonUser" destination="0eT-W5-bga" id="F4r-LC-G5r"/>
                         <outlet property="container" destination="Knj-5z-t35" id="xY9-0x-HET"/>
-                        <outlet property="customer_bp" destination="Udz-7n-3ZO" id="SmC-uT-b7z"/>
-                        <outlet property="employee_bp" destination="hTL-PV-pUp" id="Kih-X9-mJg"/>
-                        <outlet property="headerView" destination="NhN-BH-vsu" id="CXR-0b-ERw"/>
+                        <outlet property="customer_bp" destination="Udz-7n-3ZO" id="2Qw-rc-L5I"/>
+                        <outlet property="employee_bp" destination="hTL-PV-pUp" id="WrQ-II-a4s"/>
+                        <outlet property="headerView" destination="NhN-BH-vsu" id="ueD-EJ-r33"/>
                         <outlet property="labelMode" destination="zoc-d5-pNq" id="7Cb-3e-Hxa"/>
                         <outlet property="labelSo" destination="A6K-Xr-CN6" id="5WI-2k-wyU"/>
                         <outlet property="labelVer" destination="MTI-0q-XWj" id="aGz-th-8qe"/>
@@ -9845,7 +9805,7 @@ Email: redantsupport@united-us.net</string>
         <image name="check_0_24" width="24" height="24"/>
         <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="continue" width="131" height="30"/>
         <image name="filter" width="32" height="32"/>

RedAnt ERP Mobile/iSales-NPD/config.h

@@ -12,7 +12,7 @@
 #define BACKORDER_PROCESS // 允许backorder process
 
 # ifdef DEBUG
-#define test_server
+//#define test_server
 # endif
 
 #define exception_switch 1

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

@@ -233,6 +233,7 @@
 		71BF33031EFA1D6100842CB4 /* YTViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 71BF33001EFA1D6100842CB4 /* YTViewController.m */; };
 		71C1D84E1F456CAA00CEA1C9 /* HWWeakTimer.m in Sources */ = {isa = PBXBuildFile; fileRef = 71C1D84D1F456CAA00CEA1C9 /* HWWeakTimer.m */; };
 		71C1D8541F456D2700CEA1C9 /* ModelDescriptionController.m in Sources */ = {isa = PBXBuildFile; fileRef = 71C1D8531F456D2700CEA1C9 /* ModelDescriptionController.m */; };
+		71CB63E321095E0700DC90F9 /* MainHeaderViewColorPanel.m in Sources */ = {isa = PBXBuildFile; fileRef = 71CB63E221095E0700DC90F9 /* MainHeaderViewColorPanel.m */; };
 		71CB70751F99DF02009FDCB7 /* FileCache.m in Sources */ = {isa = PBXBuildFile; fileRef = 71CB70731F99DF01009FDCB7 /* FileCache.m */; };
 		71CB70781F99E338009FDCB7 /* RAConvertor.m in Sources */ = {isa = PBXBuildFile; fileRef = 71CB70771F99E338009FDCB7 /* RAConvertor.m */; };
 		71D01ADD1E08CB1C006620CE /* signature.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 71D01ADC1E08CB1C006620CE /* signature.storyboard */; };
@@ -699,6 +700,8 @@
 		71C1D84D1F456CAA00CEA1C9 /* HWWeakTimer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = HWWeakTimer.m; path = common/AutoScrollImage/HWWeakTimer.m; sourceTree = SOURCE_ROOT; };
 		71C1D8521F456D2700CEA1C9 /* ModelDescriptionController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ModelDescriptionController.h; path = common/Functions/modelDetail/ModelDescriptionController.h; sourceTree = SOURCE_ROOT; };
 		71C1D8531F456D2700CEA1C9 /* ModelDescriptionController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = ModelDescriptionController.m; path = common/Functions/modelDetail/ModelDescriptionController.m; sourceTree = SOURCE_ROOT; };
+		71CB63E121095E0700DC90F9 /* MainHeaderViewColorPanel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = MainHeaderViewColorPanel.h; path = common/Functions/MainHeaderViewColorPanel.h; sourceTree = SOURCE_ROOT; };
+		71CB63E221095E0700DC90F9 /* MainHeaderViewColorPanel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = MainHeaderViewColorPanel.m; path = common/Functions/MainHeaderViewColorPanel.m; sourceTree = SOURCE_ROOT; };
 		71CB70731F99DF01009FDCB7 /* FileCache.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = FileCache.m; path = ../../common/FileCache.m; sourceTree = "<group>"; };
 		71CB70741F99DF02009FDCB7 /* FileCache.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = FileCache.h; path = ../../common/FileCache.h; sourceTree = "<group>"; };
 		71CB70761F99E337009FDCB7 /* RAConvertor.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = RAConvertor.h; path = ../../common/RAConvertor.h; sourceTree = "<group>"; };
@@ -1305,6 +1308,8 @@
 				428980031E2490C1005F1BD8 /* NotificationNameCenter.m */,
 				7162A5E71C5899F700AB630E /* MainViewController.h */,
 				7162A5E81C5899F700AB630E /* MainViewController.m */,
+				71CB63E121095E0700DC90F9 /* MainHeaderViewColorPanel.h */,
+				71CB63E221095E0700DC90F9 /* MainHeaderViewColorPanel.m */,
 				7162A5E41C58781000AB630E /* iSalesNavigationController.h */,
 				7162A5E51C58781000AB630E /* iSalesNavigationController.m */,
 				7143E20A202FCEEC00451903 /* Main.storyboard */,
@@ -2199,6 +2204,7 @@
 				42D3A4A31EFA6D36007A54C1 /* PhotoPreviewCell.m in Sources */,
 				7162A5DB1C5876E300AB630E /* CacheViewController.m in Sources */,
 				7162A5C21C5873BB00AB630E /* FilterCellValue.m in Sources */,
+				71CB63E321095E0700DC90F9 /* MainHeaderViewColorPanel.m in Sources */,
 				71DF74971C57614C00F2789C /* PhotoStackView.m in Sources */,
 				7162A50B1C586FC100AB630E /* SliderPage.m in Sources */,
 				712BABF31C897E3A0007466B /* CategorySearchFilterViewController.m in Sources */,

RedAnt ERP Mobile/iSales-UWAVER/default_appearance.json

@@ -3,7 +3,7 @@
         "count": 6,
         "group_0": {
             "name": "global",
-            "count": 11,
+            "count": 12,
             "item_0": {
                 "note": "全局按钮",
                 "control": "UIButton",
@@ -108,6 +108,17 @@
                     "count": 1,
                     "item_0": "DefaultTableHeaderView"
                 }
+            },
+            "item_11": {
+                "note": "MainViewController 功能按钮",
+                "control": "UIButton",
+                "function": "TintColor",
+                "value": "0x474747",
+                "info": "NPD GRAY",
+                "container": {
+                    "count": 1,
+                    "item_0": "MainHeaderViewColorPanel"
+                }
             }
             
             

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

@@ -17,11 +17,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.94</string>
+	<string>1.95</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>180518</string>
+	<string>180725</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSRequiresIPhoneOS</key>