Ray Zhang 8 rokov pred
rodič
commit
9ee29b795d

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

@@ -106,7 +106,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/modelDetail/DetailViewController.m"
-            timestampString = "537777448.287532"
+            timestampString = "537947171.822394"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "719"
@@ -122,7 +122,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/modelDetail/DetailViewController.m"
-            timestampString = "537777448.287652"
+            timestampString = "537947171.822526"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "759"
@@ -154,7 +154,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/MainViewController.m"
-            timestampString = "537777448.287804"
+            timestampString = "537947171.822654"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "101"
@@ -170,7 +170,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/category/CategoryViewController.m"
-            timestampString = "537777448.287877"
+            timestampString = "537947171.822789"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "2225"

+ 7 - 7
RedAnt ERP Mobile/iSales-GATIT.xcodeproj/project.pbxproj

@@ -432,7 +432,7 @@
 		712C40B51C7310F4000E6831 /* CartGeneralNotesViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = CartGeneralNotesViewController.m; path = common/Functions/cart/CartGeneralNotesViewController.m; sourceTree = SOURCE_ROOT; };
 		712C40B71C731126000E6831 /* ItemNotesViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ItemNotesViewController.h; path = common/Functions/cart/ItemNotesViewController.h; sourceTree = SOURCE_ROOT; };
 		712C40B81C731126000E6831 /* ItemNotesViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = ItemNotesViewController.m; path = common/Functions/cart/ItemNotesViewController.m; sourceTree = SOURCE_ROOT; };
-		713F76A61929F4A7006A7305 /* Titan.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Titan.app; sourceTree = BUILT_PRODUCTS_DIR; };
+		713F76A61929F4A7006A7305 /* Titan Importer.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Titan Importer.app"; sourceTree = BUILT_PRODUCTS_DIR; };
 		713F76A91929F4A7006A7305 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
 		713F76AB1929F4A7006A7305 /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; };
 		713F76AD1929F4A7006A7305 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; };
@@ -1243,7 +1243,7 @@
 		713F76A71929F4A7006A7305 /* Products */ = {
 			isa = PBXGroup;
 			children = (
-				713F76A61929F4A7006A7305 /* Titan.app */,
+				713F76A61929F4A7006A7305 /* Titan Importer.app */,
 			);
 			name = Products;
 			path = ..;
@@ -1941,7 +1941,7 @@
 			);
 			name = "iSales-GATIT";
 			productName = "iSales-GATIT";
-			productReference = 713F76A61929F4A7006A7305 /* Titan.app */;
+			productReference = 713F76A61929F4A7006A7305 /* Titan Importer.app */;
 			productType = "com.apple.product-type.application";
 		};
 /* End PBXNativeTarget section */
@@ -2333,7 +2333,7 @@
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				LIBRARY_SEARCH_PATHS = "$(PROJECT_DIR)/ScanApiSDK-10.2.227-2/lib";
 				ONLY_ACTIVE_ARCH = YES;
-				PRODUCT_NAME = Titan;
+				PRODUCT_NAME = "Titan Importer";
 				SDKROOT = iphoneos;
 				TARGETED_DEVICE_FAMILY = 2;
 			};
@@ -2383,7 +2383,7 @@
 				);
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				LIBRARY_SEARCH_PATHS = "$(PROJECT_DIR)/ScanApiSDK-10.2.227-2/lib";
-				PRODUCT_NAME = Titan;
+				PRODUCT_NAME = "Titan Importer";
 				SDKROOT = iphoneos;
 				TARGETED_DEVICE_FAMILY = 2;
 				VALIDATE_PRODUCT = YES;
@@ -2426,7 +2426,7 @@
 					"-v",
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = "usai.apex.iSales-GATIT";
-				PRODUCT_NAME = Titan;
+				PRODUCT_NAME = "Titan Importer";
 				PROVISIONING_PROFILE = "";
 				WRAPPER_EXTENSION = app;
 			};
@@ -2468,7 +2468,7 @@
 					"-v",
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = "usai.apex.iSales-GATIT";
-				PRODUCT_NAME = Titan;
+				PRODUCT_NAME = "Titan Importer";
 				PROVISIONING_PROFILE = "";
 				WRAPPER_EXTENSION = app;
 			};

+ 4 - 4
RedAnt ERP Mobile/iSales-GATIT.xcodeproj/xcuserdata/Ray.xcuserdatad/xcschemes/GATIT Mobile.xcscheme

@@ -15,7 +15,7 @@
             <BuildableReference
                BuildableIdentifier = "primary"
                BlueprintIdentifier = "713F76A51929F4A7006A7305"
-               BuildableName = "GATIT Mobile.app"
+               BuildableName = "Titan.app"
                BlueprintName = "iSales-GATIT"
                ReferencedContainer = "container:iSales-GATIT.xcodeproj">
             </BuildableReference>
@@ -44,7 +44,7 @@
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "713F76A51929F4A7006A7305"
-            BuildableName = "GATIT Mobile.app"
+            BuildableName = "Titan.app"
             BlueprintName = "iSales-GATIT"
             ReferencedContainer = "container:iSales-GATIT.xcodeproj">
          </BuildableReference>
@@ -68,7 +68,7 @@
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "713F76A51929F4A7006A7305"
-            BuildableName = "GATIT Mobile.app"
+            BuildableName = "Titan.app"
             BlueprintName = "iSales-GATIT"
             ReferencedContainer = "container:iSales-GATIT.xcodeproj">
          </BuildableReference>
@@ -87,7 +87,7 @@
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "713F76A51929F4A7006A7305"
-            BuildableName = "GATIT Mobile.app"
+            BuildableName = "Titan.app"
             BlueprintName = "iSales-GATIT"
             ReferencedContainer = "container:iSales-GATIT.xcodeproj">
          </BuildableReference>

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

@@ -53,8 +53,9 @@
       "scale" : "2x"
     },
     {
-      "idiom" : "ios-marketing",
       "size" : "1024x1024",
+      "idiom" : "ios-marketing",
+      "filename" : "homelegance.png",
       "scale" : "1x"
     }
   ],

BIN
RedAnt ERP Mobile/iSales-GATIT/Images.xcassets/AppIcon.appiconset/homelegance.png


+ 1 - 1
RedAnt ERP Mobile/iSales-GATIT/config.h

@@ -10,7 +10,7 @@
 #define RedAnt_ERP_Mobile_config_h
 #define BUILD_GATIT
 
-#define  APP_NAME @"Titan"
+#define  APP_NAME @"Titan Importer"
 #define  COMPANY_SHORT_NAME @"TITAN"
 #define  COMPANY_NAME @"HOMELEGANCE BY TITAN IMPORTER CO."
 #define  COMPANY_INFO @"Sales: titan@homelegance.com\nPhone: 888 349 9980"

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

@@ -21,7 +21,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>180116</string>
+	<string>180118</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSRequiresIPhoneOS</key>

+ 2 - 1
RedAnt Mobile/RedAnt Mobile/config.h

@@ -43,7 +43,8 @@
 #define URL_QUERY_SETTIING @""
 #define URL_SAVE_QUERY_SETTIING @""
 #define URL_QUERY_AUTOCOMPLETE @""
-#define  URL_REQUIRE_SERVER  @"http://192.168.0.177/ipad/ant_mobile_company_valid.php"
+//#define  URL_REQUIRE_SERVER  @"http://192.168.0.177/ipad/ant_mobile_company_valid.php"
+#define  URL_REQUIRE_SERVER  @"http://192.168.0.155/wm_postgresql/index.php"
 #define URL_KV_DETAIL @""
 #define URL_ORDER_DETAIL @""
 #define URL_UPLOAD_IMG @""