修改Titan使其逻辑和Homer 保持一致

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 = "536830702.209271"
+            timestampString = "537765022.012019"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "101"

RedAnt ERP Mobile/common/Functions/MainViewController.m

@@ -1662,8 +1662,8 @@
 
         
     }
-    
-#ifndef BUILD_HOMER //homer 要求去掉cam scan 2017/12/20
+#if !defined(BUILD_HOMER) && !defined(BUILD_GATIT)
+//#ifndef BUILD_HOMER //homer 要求去掉cam scan 2017/12/20
 
     // if(appDelegate.user_type==USER_ROLE_EMPLOYEE)
     {
@@ -1843,7 +1843,7 @@
     
 #ifdef BUILD_GATIT
     
-    [map setValue:@"GATIT Website" forKey:@"title"];
+    [map setValue:@"TITAN Website" forKey:@"title"];
     [map setValue:@"rect_change_password" forKey:@"img"];
     [self.sideMenuItems addObject:map.copy];
     
@@ -2154,7 +2154,7 @@
 #endif
         
 #ifdef BUILD_GATIT
-        NSString* title = @"GATIT BLOG";
+        NSString* title = @"TITAN BLOG";
         
 #endif
         
@@ -2234,12 +2234,12 @@
         [self.navigationController pushViewController:ViewController animated:YES];
         
     }
-    else if([title isEqualToString:@"GATIT Website"])
+    else if([title isEqualToString:@"TITAN Website"])
     {
         
         NSString* url = COMPANY_WEB;
         
-        NSString* title = @"GATIT";
+        NSString* title = @"TITAN";
         
         
         WebViewController *ViewController = [self.storyboard instantiateViewControllerWithIdentifier:@"WebViewController"];

RedAnt ERP Mobile/common/Functions/category/CategorySearchFilterViewController.h

@@ -33,7 +33,7 @@
 @property (nonatomic , copy) void (^OkClick)(NSString *ids,NSString* modelname,NSString* modeldescrip,NSString* available,NSString* QTY,NSString* alert,NSString* price , NSString* bestseller);
 @property (nonatomic , copy) void (^ResetClick)(void);
 
-#ifdef BUILD_HOMER
+#if defined(BUILD_HOMER) || defined(BUILD_GATIT)
 @property (strong, nonatomic) NSString* sprice_min;
 @property (strong, nonatomic) NSString* sprice_max;
 @property (strong, nonatomic) NSString* savail_min;

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

@@ -86,7 +86,7 @@
     
     
     {
-        #ifndef BUILD_HOMER
+        #if !defined(BUILD_HOMER) && !defined(BUILD_GATIT)
         NSString* price =@"";
         int count = [[self.price_cadedate valueForKey:@"count"] intValue];
         for(int i=0;i<count;i++)
@@ -289,7 +289,7 @@
     self.price_cadedate=[self.default_filter objectForKey:@"price"];
     self.bestseller_cadedate=[self.default_filter objectForKey:@"best_seller"];
     
-#ifdef BUILD_HOMER
+#if defined(BUILD_HOMER) || defined(BUILD_GATIT)
     self.sprice_min=@"";
     self.sprice_max=@"";
     self.savail_min=@"";

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

@@ -170,7 +170,7 @@
     NSMutableDictionary* menu =             [appDelegate.categoryMenu mutableCopy];
     
     
-#ifndef BUILD_HOMER
+#if !defined(BUILD_HOMER) && !defined(BUILD_GATIT)
     
     CategorySearchFilterViewController * filterVC =[ self.storyboard instantiateViewControllerWithIdentifier:@"CategorySearchFilterViewController"];
     

RedAnt ERP Mobile/common/Functions/modelDetail/DetailViewController.m

@@ -184,7 +184,9 @@ dispatch_async(dispatch_get_main_queue(), ^{
                         contents[[NSString stringWithFormat:@"item_%d",count]]=item;
                         count++;
                     }
-#ifndef BUILD_HOMER // homer 要求去掉qrcode 2017/12/20
+//#ifndef BUILD_HOMER
+#if !defined(BUILD_HOMER) && !defined(BUILD_GATIT)
+                    // homer 要求去掉qrcode 2017/12/20
                     NSString* qrpath = [ImageUtils generateQRCodeFile:model_name width:350 height:350];
 //                    UIImage* qrimg=[QRCodeGenerator qrImageForString:model_name imageSize:350];
                     if(qrpath!=nil)
@@ -1604,7 +1606,7 @@ self.isrefreshing=false;
         cell.stack_contents = contents_json;
         int count = [[contents_json valueForKey:@"count"]intValue];
         int hcount=2;
-#ifdef BUILD_HOMER
+#if defined(BUILD_HOMER) || defined(BUILD_GATIT)
         hcount=1; //homer 没有qrcode
 #endif
         if(count<hcount)//1 for qrcode;

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

@@ -205,7 +205,7 @@
     [super viewDidLoad];
     
     
-#ifdef BUILD_HOMER
+#if defined(BUILD_HOMER) || defined(BUILD_GATIT)
     self.switch_matchfull.hidden = true;
     self.label_matchfull.hidden = true;
 #else

RedAnt ERP Mobile/iSales-GATIT/Images.xcassets/AppIcon.appiconset/Contents.json

@@ -51,6 +51,11 @@
       "idiom" : "ipad",
       "filename" : "appicon.png",
       "scale" : "2x"
+    },
+    {
+      "idiom" : "ios-marketing",
+      "size" : "1024x1024",
+      "scale" : "1x"
     }
   ],
   "info" : {

RedAnt ERP Mobile/iSales-GATIT/Images.xcassets/npd_logo.imageset/Contents.json

@@ -2,17 +2,17 @@
   "images" : [
     {
       "idiom" : "universal",
-      "filename" : "21_03.png",
+      "filename" : "Homelegance Logo.png",
       "scale" : "1x"
     },
     {
       "idiom" : "universal",
-      "filename" : "21_03@2x.png",
+      "filename" : "Homelegance Logo@2x.png",
       "scale" : "2x"
     },
     {
       "idiom" : "universal",
-      "filename" : "21_03@3x.png",
+      "filename" : "Homelegance Logo@3x.png",
       "scale" : "3x"
     }
   ],

RedAnt ERP Mobile/iSales-GATIT/config.h

@@ -10,8 +10,8 @@
 #define RedAnt_ERP_Mobile_config_h
 #define BUILD_GATIT
 
-#define  APP_NAME @"GATIT Mobile"
-#define  COMPANY_SHORT_NAME @"GATIT"
+#define  APP_NAME @"Titan"
+#define  COMPANY_SHORT_NAME @"TITAN"
 #define  COMPANY_NAME @"HOMELEGANCE BY TITAN IMPORTER CO."
 #define  COMPANY_INFO @"Sales: titan@homelegance.com\nPhone: 888 349 9980"
 #define  COMPANY_WEB @"https://atl.homelegance.com"
@@ -48,6 +48,7 @@
 
 //------------------- chen server-----------------------
 #define  URL_BACK_ORDER_PREVIEW @""
+#define  URL_MOVE_TO_BACK_ORDER @""
 #define  URL_UPDATE_AUTH  @"http://192.168.0.133:8080/site/isales/login.htm"
 #define  URL_LOGOUT  @"http://192.168.0.133:8080/site/isales/loginOut.htm"
 #define  URL_RETRIEVE_PASS  @"http://192.168.0.133:8080/site/isales/forgotPassword.htm"
@@ -181,7 +182,8 @@
 #else
 
 
-//------------------- NPD server-----------------------
+//------------------- GATIT server-----------------------
+#define  URL_MOVE_TO_BACK_ORDER @""
 #define  URL_UPDATE_AUTH  @"https://atl.homelegance.com/isales/login.htm"
 #define  URL_LOGOUT  @"https://atl.homelegance.com/isales/loginOut.htm"
 #define  URL_RETRIEVE_PASS  @"https://atl.homelegance.com/isales/forgotPassword.htm"

RedAnt ERP Mobile/iSales-GATIT/default_appearance.json

@@ -191,9 +191,9 @@
         },
         "MainLogo": {
             "x": 49.0,
-            "y": 28.0,
-            "width": 110.0,
-            "height": 13.0
+            "y": 22.0,
+            "width": 77.0,
+            "height": 50.0
         },
         "ModePos": {
             "x": 126.0,

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

@@ -17,11 +17,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.90</string>
+	<string>1.94</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>170814</string>
+	<string>180116</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSRequiresIPhoneOS</key>

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

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="13529" targetRuntime="iOS.CocoaTouch.iPad" propertyAccessControl="none" colorMatched="YES" initialViewController="jsC-F8-zYF">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="13771" targetRuntime="iOS.CocoaTouch.iPad" propertyAccessControl="none" colorMatched="YES" initialViewController="jsC-F8-zYF">
     <device id="ipad9_7" orientation="portrait">
         <adaptation id="fullscreen"/>
     </device>
     <dependencies>
         <deployment version="1808" identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13527"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13772"/>
         <capability name="Navigation items with more than one left or right bar item" minToolsVersion="7.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -5458,12 +5458,12 @@
                                         <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                         <nil key="highlightedColor"/>
                                     </label>
-                                    <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="about" id="1Fy-cm-PL2">
-                                        <rect key="frame" x="36" y="8" width="96" height="96"/>
+                                    <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" image="about" id="1Fy-cm-PL2">
+                                        <rect key="frame" x="36" y="19" width="96" height="96"/>
                                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                     </imageView>
-                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="New Pacific Direct" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="sEn-Yk-cgN">
-                                        <rect key="frame" x="140" y="51" width="308" height="53"/>
+                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" text="New Pacific Direct" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="sEn-Yk-cgN">
+                                        <rect key="frame" x="140" y="51" width="308" height="67"/>
                                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                         <fontDescription key="fontDescription" type="system" pointSize="24"/>
                                         <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
@@ -5480,8 +5480,8 @@
                                         <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                         <nil key="highlightedColor"/>
                                     </label>
-                                    <textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" editable="NO" textAlignment="natural" id="i5E-vh-w1y">
-                                        <rect key="frame" x="36" y="110" width="399" height="57"/>
+                                    <textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" misplaced="YES" editable="NO" textAlignment="natural" id="i5E-vh-w1y">
+                                        <rect key="frame" x="36" y="112" width="399" height="57"/>
                                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                         <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                         <string key="text">Sales: sales@newpacificdirect.com
@@ -6603,7 +6603,7 @@ Email: redantsupport@united-us.net</string>
                                     <barButtonItem style="plain" systemItem="flexibleSpace" id="KVd-zF-Tl0"/>
                                     <barButtonItem style="plain" id="joL-Py-zMr">
                                         <searchBar key="customView" contentMode="redraw" searchBarStyle="minimal" placeholder="Name, Address, Phone etc" id="37s-Zo-qJG">
-                                            <rect key="frame" x="305" y="0.0" width="364" height="44"/>
+                                            <rect key="frame" x="297" y="0.0" width="364" height="44"/>
                                             <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
                                             <textInputTraits key="textInputTraits"/>
                                             <connections>
@@ -9850,7 +9850,7 @@ Email: redantsupport@united-us.net</string>
         <image name="mark_wish_32" width="32" height="32"/>
         <image name="menu_open" width="36" height="36"/>
         <image name="more_color_larger" width="32" height="32"/>
-        <image name="newcustomer" width="32" height="32"/>
+        <image name="newcustomer" width="40" height="40"/>
         <image name="neworder" width="40" height="40"/>
         <image name="notifyMe" width="123" height="39"/>
         <image name="npd_logo" width="110" height="13"/>