Просмотр исходного кода

160902
add clear image for signature view
rebuild HMLG

Ray Zhang 9 лет назад
Родитель
Сommit
5549361245

+ 4 - 4
RedAnt ERP Mobile/HMLG Mobile.xcodeproj/project.pbxproj

@@ -9,6 +9,7 @@
 /* Begin PBXBuildFile section */
 /* Begin PBXBuildFile section */
 		715002021D13CDBE00F5927F /* BundleDetailButton.m in Sources */ = {isa = PBXBuildFile; fileRef = 715002011D13CDBE00F5927F /* BundleDetailButton.m */; };
 		715002021D13CDBE00F5927F /* BundleDetailButton.m in Sources */ = {isa = PBXBuildFile; fileRef = 715002011D13CDBE00F5927F /* BundleDetailButton.m */; };
 		715850431CF6F0C400856B20 /* DefaultAppearance.m in Sources */ = {isa = PBXBuildFile; fileRef = 715850421CF6F0C400856B20 /* DefaultAppearance.m */; };
 		715850431CF6F0C400856B20 /* DefaultAppearance.m in Sources */ = {isa = PBXBuildFile; fileRef = 715850421CF6F0C400856B20 /* DefaultAppearance.m */; };
+		716AF8DE1D792157001188E0 /* offline_status_filter_cadedate.json in Resources */ = {isa = PBXBuildFile; fileRef = 716AF8DD1D792157001188E0 /* offline_status_filter_cadedate.json */; };
 		7183E8491CF2913E00524787 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 7183E8481CF2913E00524787 /* main.m */; };
 		7183E8491CF2913E00524787 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 7183E8481CF2913E00524787 /* main.m */; };
 		7183E8541CF2913E00524787 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 7183E8531CF2913E00524787 /* Assets.xcassets */; };
 		7183E8541CF2913E00524787 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 7183E8531CF2913E00524787 /* Assets.xcassets */; };
 		7183E8571CF2913E00524787 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 7183E8551CF2913E00524787 /* LaunchScreen.storyboard */; };
 		7183E8571CF2913E00524787 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 7183E8551CF2913E00524787 /* LaunchScreen.storyboard */; };
@@ -129,7 +130,6 @@
 		7183EA191CF29FCB00524787 /* OrderListTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 7183E99E1CF29FCB00524787 /* OrderListTableViewCell.m */; };
 		7183EA191CF29FCB00524787 /* OrderListTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 7183E99E1CF29FCB00524787 /* OrderListTableViewCell.m */; };
 		7183EA1A1CF29FCB00524787 /* OrderListViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 7183E9A01CF29FCB00524787 /* OrderListViewController.m */; };
 		7183EA1A1CF29FCB00524787 /* OrderListViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 7183E9A01CF29FCB00524787 /* OrderListViewController.m */; };
 		7183EA1B1CF29FCB00524787 /* status_filter_cadedate_open.json in Resources */ = {isa = PBXBuildFile; fileRef = 7183E9A11CF29FCB00524787 /* status_filter_cadedate_open.json */; };
 		7183EA1B1CF29FCB00524787 /* status_filter_cadedate_open.json in Resources */ = {isa = PBXBuildFile; fileRef = 7183E9A11CF29FCB00524787 /* status_filter_cadedate_open.json */; };
-		7183EA1C1CF29FCB00524787 /* status_filter_cadedate.json in Resources */ = {isa = PBXBuildFile; fileRef = 7183E9A21CF29FCB00524787 /* status_filter_cadedate.json */; };
 		7183EA1D1CF29FCB00524787 /* OrderDetailSignatureCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 7183E9A41CF29FCB00524787 /* OrderDetailSignatureCell.m */; };
 		7183EA1D1CF29FCB00524787 /* OrderDetailSignatureCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 7183E9A41CF29FCB00524787 /* OrderDetailSignatureCell.m */; };
 		7183EA1E1CF29FCB00524787 /* PDFListTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 7183E9A71CF29FCB00524787 /* PDFListTableViewCell.m */; };
 		7183EA1E1CF29FCB00524787 /* PDFListTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 7183E9A71CF29FCB00524787 /* PDFListTableViewCell.m */; };
 		7183EA1F1CF29FCB00524787 /* PDFListViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 7183E9A91CF29FCB00524787 /* PDFListViewController.m */; };
 		7183EA1F1CF29FCB00524787 /* PDFListViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 7183E9A91CF29FCB00524787 /* PDFListViewController.m */; };
@@ -193,6 +193,7 @@
 		715002011D13CDBE00F5927F /* BundleDetailButton.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = BundleDetailButton.m; path = common/Functions/BundleDetailButton.m; sourceTree = SOURCE_ROOT; };
 		715002011D13CDBE00F5927F /* BundleDetailButton.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = BundleDetailButton.m; path = common/Functions/BundleDetailButton.m; sourceTree = SOURCE_ROOT; };
 		715850411CF6F0C400856B20 /* DefaultAppearance.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DefaultAppearance.h; path = common/Functions/DefaultAppearance.h; sourceTree = SOURCE_ROOT; };
 		715850411CF6F0C400856B20 /* DefaultAppearance.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DefaultAppearance.h; path = common/Functions/DefaultAppearance.h; sourceTree = SOURCE_ROOT; };
 		715850421CF6F0C400856B20 /* DefaultAppearance.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = DefaultAppearance.m; path = common/Functions/DefaultAppearance.m; sourceTree = SOURCE_ROOT; };
 		715850421CF6F0C400856B20 /* DefaultAppearance.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = DefaultAppearance.m; path = common/Functions/DefaultAppearance.m; sourceTree = SOURCE_ROOT; };
+		716AF8DD1D792157001188E0 /* offline_status_filter_cadedate.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; name = offline_status_filter_cadedate.json; path = common/Functions/order/offline_status_filter_cadedate.json; sourceTree = SOURCE_ROOT; };
 		7183E8441CF2913E00524787 /* HMLG Mobile.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "HMLG Mobile.app"; sourceTree = BUILT_PRODUCTS_DIR; };
 		7183E8441CF2913E00524787 /* HMLG Mobile.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "HMLG Mobile.app"; sourceTree = BUILT_PRODUCTS_DIR; };
 		7183E8481CF2913E00524787 /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
 		7183E8481CF2913E00524787 /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
 		7183E8531CF2913E00524787 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
 		7183E8531CF2913E00524787 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
@@ -426,7 +427,6 @@
 		7183E99F1CF29FCB00524787 /* OrderListViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = OrderListViewController.h; path = ../common/Functions/order/OrderListViewController.h; sourceTree = "<group>"; };
 		7183E99F1CF29FCB00524787 /* OrderListViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = OrderListViewController.h; path = ../common/Functions/order/OrderListViewController.h; sourceTree = "<group>"; };
 		7183E9A01CF29FCB00524787 /* OrderListViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = OrderListViewController.m; path = ../common/Functions/order/OrderListViewController.m; sourceTree = "<group>"; };
 		7183E9A01CF29FCB00524787 /* OrderListViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = OrderListViewController.m; path = ../common/Functions/order/OrderListViewController.m; sourceTree = "<group>"; };
 		7183E9A11CF29FCB00524787 /* status_filter_cadedate_open.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; name = status_filter_cadedate_open.json; path = ../common/Functions/order/status_filter_cadedate_open.json; sourceTree = "<group>"; };
 		7183E9A11CF29FCB00524787 /* status_filter_cadedate_open.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; name = status_filter_cadedate_open.json; path = ../common/Functions/order/status_filter_cadedate_open.json; sourceTree = "<group>"; };
-		7183E9A21CF29FCB00524787 /* status_filter_cadedate.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; name = status_filter_cadedate.json; path = ../common/Functions/order/status_filter_cadedate.json; sourceTree = "<group>"; };
 		7183E9A31CF29FCB00524787 /* OrderDetailSignatureCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = OrderDetailSignatureCell.h; path = ../common/Functions/order/OrderDetailSignatureCell.h; sourceTree = "<group>"; };
 		7183E9A31CF29FCB00524787 /* OrderDetailSignatureCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = OrderDetailSignatureCell.h; path = ../common/Functions/order/OrderDetailSignatureCell.h; sourceTree = "<group>"; };
 		7183E9A41CF29FCB00524787 /* OrderDetailSignatureCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = OrderDetailSignatureCell.m; path = ../common/Functions/order/OrderDetailSignatureCell.m; sourceTree = "<group>"; };
 		7183E9A41CF29FCB00524787 /* OrderDetailSignatureCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = OrderDetailSignatureCell.m; path = ../common/Functions/order/OrderDetailSignatureCell.m; sourceTree = "<group>"; };
 		7183E9A61CF29FCB00524787 /* PDFListTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PDFListTableViewCell.h; path = ../common/Functions/portfolio/PDFListTableViewCell.h; sourceTree = "<group>"; };
 		7183E9A61CF29FCB00524787 /* PDFListTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PDFListTableViewCell.h; path = ../common/Functions/portfolio/PDFListTableViewCell.h; sourceTree = "<group>"; };
@@ -1040,7 +1040,7 @@
 				7183E99F1CF29FCB00524787 /* OrderListViewController.h */,
 				7183E99F1CF29FCB00524787 /* OrderListViewController.h */,
 				7183E9A01CF29FCB00524787 /* OrderListViewController.m */,
 				7183E9A01CF29FCB00524787 /* OrderListViewController.m */,
 				7183E9A11CF29FCB00524787 /* status_filter_cadedate_open.json */,
 				7183E9A11CF29FCB00524787 /* status_filter_cadedate_open.json */,
-				7183E9A21CF29FCB00524787 /* status_filter_cadedate.json */,
+				716AF8DD1D792157001188E0 /* offline_status_filter_cadedate.json */,
 				7183E9A31CF29FCB00524787 /* OrderDetailSignatureCell.h */,
 				7183E9A31CF29FCB00524787 /* OrderDetailSignatureCell.h */,
 				7183E9A41CF29FCB00524787 /* OrderDetailSignatureCell.m */,
 				7183E9A41CF29FCB00524787 /* OrderDetailSignatureCell.m */,
 			);
 			);
@@ -1258,6 +1258,7 @@
 			isa = PBXResourcesBuildPhase;
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			buildActionMask = 2147483647;
 			files = (
 			files = (
+				716AF8DE1D792157001188E0 /* offline_status_filter_cadedate.json in Resources */,
 				7183EA4C1CF2A1F300524787 /* Pods.release.xcconfig in Resources */,
 				7183EA4C1CF2A1F300524787 /* Pods.release.xcconfig in Resources */,
 				7183E8571CF2913E00524787 /* LaunchScreen.storyboard in Resources */,
 				7183E8571CF2913E00524787 /* LaunchScreen.storyboard in Resources */,
 				7183E8541CF2913E00524787 /* Assets.xcassets in Resources */,
 				7183E8541CF2913E00524787 /* Assets.xcassets in Resources */,
@@ -1272,7 +1273,6 @@
 				719562441CF6937F00C74A49 /* default_appearance.json in Resources */,
 				719562441CF6937F00C74A49 /* default_appearance.json in Resources */,
 				7183E8A21CF29F3900524787 /* LICENSE in Resources */,
 				7183E8A21CF29F3900524787 /* LICENSE in Resources */,
 				7183E8FE1CF29F4500524787 /* PhotoBorder@2x.png in Resources */,
 				7183E8FE1CF29F4500524787 /* PhotoBorder@2x.png in Resources */,
-				7183EA1C1CF29FCB00524787 /* status_filter_cadedate.json in Resources */,
 				7183EA4B1CF2A1F300524787 /* Pods.debug.xcconfig in Resources */,
 				7183EA4B1CF2A1F300524787 /* Pods.debug.xcconfig in Resources */,
 				7183EA031CF29FCB00524787 /* customer_advanced_search.json in Resources */,
 				7183EA031CF29FCB00524787 /* customer_advanced_search.json in Resources */,
 				7183E8FD1CF29F4500524787 /* PhotoBorder.png in Resources */,
 				7183E8FD1CF29F4500524787 /* PhotoBorder.png in Resources */,

+ 23 - 0
RedAnt ERP Mobile/HMLG Mobile/Assets.xcassets/clear.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "appicon.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "appicon-1.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "appicon-2.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

BIN
RedAnt ERP Mobile/HMLG Mobile/Assets.xcassets/clear.imageset/appicon-1.png


BIN
RedAnt ERP Mobile/HMLG Mobile/Assets.xcassets/clear.imageset/appicon-2.png


BIN
RedAnt ERP Mobile/HMLG Mobile/Assets.xcassets/clear.imageset/appicon.png


+ 1 - 1
RedAnt ERP Mobile/HMLG Mobile/config.h

@@ -206,7 +206,6 @@
 
 
 
 
 
 
-
 #define  URL_ERR_LOG  @"http://207.140.24.83/isales/er_log.htm"
 #define  URL_ERR_LOG  @"http://207.140.24.83/isales/er_log.htm"
 
 
 #define  URL_UPLOAD_IMG  @"http://207.140.24.83/isales/uploadImg.htm"
 #define  URL_UPLOAD_IMG  @"http://207.140.24.83/isales/uploadImg.htm"
@@ -225,6 +224,7 @@
 #define  URL_CHECK_OFFLINE  @"http://192.168.1.3/check.json"
 #define  URL_CHECK_OFFLINE  @"http://192.168.1.3/check.json"
 
 
 #define  URL_DOWNLOAD_OFFLINE  @"http://192.168.1.3/update.json"
 #define  URL_DOWNLOAD_OFFLINE  @"http://192.168.1.3/update.json"
+#define  URL_UPLOAD_OFFLINE  @"http://192.168.0.126:8080/site/offline/uploadOfflineData.htm"
 
 
 #endif
 #endif
 /*
 /*