Răsfoiți Sursa

Apex mobile

替换网络请求接口
引入部分通用工具类
Ray Zhang 8 ani în urmă
părinte
comite
4beed37aee
56 a modificat fișierele cu 1631 adăugiri și 151 ștergeri
  1. 134 54
      Apex Mobile/Apex Mobile.xcodeproj/project.pbxproj
  2. BIN
      Apex Mobile/Apex Mobile.xcodeproj/project.xcworkspace/xcuserdata/Ray.xcuserdatad/UserInterfaceState.xcuserstate
  3. 8 8
      Apex Mobile/Apex Mobile.xcodeproj/xcuserdata/Ray.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
  4. 2 2
      Apex Mobile/Apex Mobile/ApexMobileDB.h
  5. 2 2
      Apex Mobile/Apex Mobile/ApexMobileDB.m
  6. 2 2
      Apex Mobile/Apex Mobile/ApexMobileFirstViewController.h
  7. 1 1
      Apex Mobile/Apex Mobile/ApexMobileFirstViewController.m
  8. 24 0
      Apex Mobile/Apex Mobile/AppDelegate.h
  9. 110 0
      Apex Mobile/Apex Mobile/AppDelegate.m
  10. 1 1
      Apex Mobile/Apex Mobile/ChangePasswordViewController.h
  11. 3 3
      Apex Mobile/Apex Mobile/ChangePasswordViewController.m
  12. 12 20
      Apex Mobile/Apex Mobile/Constant.h
  13. 2 2
      Apex Mobile/Apex Mobile/CustomizeFieldViewController.h
  14. 2 2
      Apex Mobile/Apex Mobile/CustomizeFieldViewController.m
  15. 1 1
      Apex Mobile/Apex Mobile/DetailContent.h
  16. 1 1
      Apex Mobile/Apex Mobile/DetailPageViewController.h
  17. 4 4
      Apex Mobile/Apex Mobile/DetailPageViewController.m
  18. 1 1
      Apex Mobile/Apex Mobile/DetailTabBarController.h
  19. 1 1
      Apex Mobile/Apex Mobile/DetailTabBarController.m
  20. 1 1
      Apex Mobile/Apex Mobile/DocumentsViewController.h
  21. 1 1
      Apex Mobile/Apex Mobile/FavoritesData.h
  22. 1 1
      Apex Mobile/Apex Mobile/FavoritesData.m
  23. 1 1
      Apex Mobile/Apex Mobile/FunctionSelectViewController.m
  24. 1 1
      Apex Mobile/Apex Mobile/HistoryData.h
  25. 1 1
      Apex Mobile/Apex Mobile/HistoryData.m
  26. 1 1
      Apex Mobile/Apex Mobile/HistoryTabBarController.h
  27. 1 1
      Apex Mobile/Apex Mobile/LocalDocumentsViewController.h
  28. 2 2
      Apex Mobile/Apex Mobile/LocationViewController.h
  29. 1 1
      Apex Mobile/Apex Mobile/LocationViewController.m
  30. 2 2
      Apex Mobile/Apex Mobile/LoginViewController.h
  31. 1 1
      Apex Mobile/Apex Mobile/LoginViewController.m
  32. 2 2
      Apex Mobile/Apex Mobile/MessageDetailViewController.m
  33. 1 1
      Apex Mobile/Apex Mobile/MessageViewController.h
  34. 2 2
      Apex Mobile/Apex Mobile/MessageViewController.m
  35. 1 1
      Apex Mobile/Apex Mobile/MylistViewController.m
  36. 1 1
      Apex Mobile/Apex Mobile/NewsViewController.h
  37. 2 2
      Apex Mobile/Apex Mobile/NewsViewController.m
  38. 39 0
      Apex Mobile/Apex Mobile/RANetwork.h
  39. 1070 0
      Apex Mobile/Apex Mobile/RANetwork.m
  40. 2 2
      Apex Mobile/Apex Mobile/ResultViewController.h
  41. 6 6
      Apex Mobile/Apex Mobile/ResultViewController.m
  42. 1 1
      Apex Mobile/Apex Mobile/RetrievePasswordViewController.h
  43. 1 1
      Apex Mobile/Apex Mobile/RetrievePasswordViewController.m
  44. 2 2
      Apex Mobile/Apex Mobile/SearchTableAdapter.h
  45. 1 1
      Apex Mobile/Apex Mobile/SearchTableAdapter.m
  46. 1 1
      Apex Mobile/Apex Mobile/ShipingStatusCell.m
  47. 1 1
      Apex Mobile/Apex Mobile/StaticModelistViewController.m
  48. 1 1
      Apex Mobile/Apex Mobile/ToolsPanelViewController.h
  49. 1 1
      Apex Mobile/Apex Mobile/WebViewController.h
  50. 40 0
      Apex Mobile/Apex Mobile/config.h
  51. 125 0
      Apex Mobile/Apex Mobile/const.h
  52. 2 2
      Apex Mobile/Apex Mobile/main.m
  53. 1 1
      Apex Mobile/SimpleGrid.h
  54. 1 1
      Apex Mobile/SimpleGrid.m
  55. 1 1
      RedAnt ERP Mobile/common/RAUtils.m
  56. 1 1
      RedAnt Mobile/RedAnt Mobile/RANetwork.m

+ 134 - 54
Apex Mobile/Apex Mobile.xcodeproj/project.pbxproj

@@ -32,12 +32,6 @@
 		7120DCFF18BE265100E7546F /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7120DCFE18BE265100E7546F /* QuartzCore.framework */; };
 		7120DD0118BE266000E7546F /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7120DD0018BE266000E7546F /* SystemConfiguration.framework */; };
 		7120DD0418BE273900E7546F /* LocationViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 7120DD0318BE273900E7546F /* LocationViewController.m */; };
-		71286AB418C70061001FDF43 /* AESCrypt.m in Sources */ = {isa = PBXBuildFile; fileRef = 71286AAB18C70061001FDF43 /* AESCrypt.m */; };
-		71286AB518C70061001FDF43 /* LICENSE in Resources */ = {isa = PBXBuildFile; fileRef = 71286AAC18C70061001FDF43 /* LICENSE */; };
-		71286AB618C70061001FDF43 /* NSData+Base64.m in Sources */ = {isa = PBXBuildFile; fileRef = 71286AAE18C70061001FDF43 /* NSData+Base64.m */; };
-		71286AB718C70061001FDF43 /* NSData+CommonCrypto.m in Sources */ = {isa = PBXBuildFile; fileRef = 71286AB018C70061001FDF43 /* NSData+CommonCrypto.m */; };
-		71286AB818C70061001FDF43 /* NSString+Base64.m in Sources */ = {isa = PBXBuildFile; fileRef = 71286AB218C70061001FDF43 /* NSString+Base64.m */; };
-		71286AB918C70061001FDF43 /* README.md in Resources */ = {isa = PBXBuildFile; fileRef = 71286AB318C70061001FDF43 /* README.md */; };
 		712A301318CFEF550022E6E6 /* CustomizeFieldViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 712A301218CFEF550022E6E6 /* CustomizeFieldViewController.m */; };
 		712CBA0318CF38DB00C61394 /* RTLabel.m in Sources */ = {isa = PBXBuildFile; fileRef = 712CBA0218CF38DB00C61394 /* RTLabel.m */; };
 		71308AF7191E7B0E0024B2B0 /* MessageDetailItem.m in Sources */ = {isa = PBXBuildFile; fileRef = 71308AF6191E7B0E0024B2B0 /* MessageDetailItem.m */; };
@@ -67,6 +61,21 @@
 		715643DA201C079F00B04267 /* tools.json in Resources */ = {isa = PBXBuildFile; fileRef = 715643D9201C079F00B04267 /* tools.json */; };
 		715643DC201C117300B04267 /* search.json in Resources */ = {isa = PBXBuildFile; fileRef = 715643DB201C117300B04267 /* search.json */; };
 		715643DE201C1AE600B04267 /* my.json in Resources */ = {isa = PBXBuildFile; fileRef = 715643DD201C1AE600B04267 /* my.json */; };
+		7157098E2021572600EFE5C5 /* NetworkUtils.m in Sources */ = {isa = PBXBuildFile; fileRef = 7157098C2021572600EFE5C5 /* NetworkUtils.m */; };
+		715709922021574D00EFE5C5 /* RAConvertor.m in Sources */ = {isa = PBXBuildFile; fileRef = 715709912021574D00EFE5C5 /* RAConvertor.m */; };
+		71570996202157A600EFE5C5 /* RAUtils.m in Sources */ = {isa = PBXBuildFile; fileRef = 71570995202157A600EFE5C5 /* RAUtils.m */; };
+		71570999202157BD00EFE5C5 /* RANetworkTaskDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 71570997202157BC00EFE5C5 /* RANetworkTaskDelegate.m */; };
+		715709A520215B5100EFE5C5 /* zip.c in Sources */ = {isa = PBXBuildFile; fileRef = 7157099C20215B5000EFE5C5 /* zip.c */; };
+		715709A620215B5100EFE5C5 /* unzip.c in Sources */ = {isa = PBXBuildFile; fileRef = 7157099E20215B5000EFE5C5 /* unzip.c */; };
+		715709A720215B5100EFE5C5 /* ioapi.c in Sources */ = {isa = PBXBuildFile; fileRef = 715709A020215B5000EFE5C5 /* ioapi.c */; };
+		715709A820215B5100EFE5C5 /* mztools.c in Sources */ = {isa = PBXBuildFile; fileRef = 715709A420215B5100EFE5C5 /* mztools.c */; };
+		715709AB20215B6200EFE5C5 /* ZipArchive.mm in Sources */ = {isa = PBXBuildFile; fileRef = 715709AA20215B6200EFE5C5 /* ZipArchive.mm */; };
+		715709AE20215CB000EFE5C5 /* RANetwork.m in Sources */ = {isa = PBXBuildFile; fileRef = 715709AD20215CB000EFE5C5 /* RANetwork.m */; };
+		715709B920215E0000EFE5C5 /* NSData+CommonCrypto.m in Sources */ = {isa = PBXBuildFile; fileRef = 715709B020215DFF00EFE5C5 /* NSData+CommonCrypto.m */; };
+		715709BA20215E0000EFE5C5 /* NSString+Base64.m in Sources */ = {isa = PBXBuildFile; fileRef = 715709B220215DFF00EFE5C5 /* NSString+Base64.m */; };
+		715709BB20215E0000EFE5C5 /* NSData+Base64.m in Sources */ = {isa = PBXBuildFile; fileRef = 715709B320215DFF00EFE5C5 /* NSData+Base64.m */; };
+		715709BC20215E0000EFE5C5 /* LICENSE in Resources */ = {isa = PBXBuildFile; fileRef = 715709B620215DFF00EFE5C5 /* LICENSE */; };
+		715709BD20215E0000EFE5C5 /* AESCrypt.m in Sources */ = {isa = PBXBuildFile; fileRef = 715709B820215DFF00EFE5C5 /* AESCrypt.m */; };
 		7162546B201C3AF1009E3A41 /* readme.txt in Resources */ = {isa = PBXBuildFile; fileRef = 7162546A201C3AF1009E3A41 /* readme.txt */; };
 		7162546D201C412E009E3A41 /* ShippingStatusCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 7162546C201C412E009E3A41 /* ShippingStatusCell.xib */; };
 		71625470201C5205009E3A41 /* fake_container_list.json in Resources */ = {isa = PBXBuildFile; fileRef = 7162546F201C5205009E3A41 /* fake_container_list.json */; };
@@ -84,7 +93,6 @@
 		719A51B418C5A8100080C075 /* ResultViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 719A51B318C5A8100080C075 /* ResultViewController.m */; };
 		719A51BA18C5AB7B0080C075 /* SimpleGridComponent.m in Sources */ = {isa = PBXBuildFile; fileRef = 719A51B918C5AB7B0080C075 /* SimpleGridComponent.m */; };
 		719BEC1718FFAB7B00DFE987 /* ToolsPanelViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 719BEC1618FFAB7B00DFE987 /* ToolsPanelViewController.m */; };
-		719E7E3018C015D0003408FF /* ApexMobileNetwork.m in Sources */ = {isa = PBXBuildFile; fileRef = 719E7E2F18C015D0003408FF /* ApexMobileNetwork.m */; };
 		719E7E3318C0368A003408FF /* ApexMobileDB.m in Sources */ = {isa = PBXBuildFile; fileRef = 719E7E3218C0368A003408FF /* ApexMobileDB.m */; };
 		719E7E3518C0395E003408FF /* libsqlite3.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 719E7E3418C0395E003408FF /* libsqlite3.dylib */; };
 		719EF8E118BB839F00EFFF5F /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 719EF8E018BB839F00EFFF5F /* Foundation.framework */; };
@@ -92,7 +100,7 @@
 		719EF8E518BB839F00EFFF5F /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 719EF8E418BB839F00EFFF5F /* UIKit.framework */; };
 		719EF8EB18BB839F00EFFF5F /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 719EF8E918BB839F00EFFF5F /* InfoPlist.strings */; };
 		719EF8ED18BB839F00EFFF5F /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 719EF8EC18BB839F00EFFF5F /* main.m */; };
-		719EF8F118BB839F00EFFF5F /* ApexMobileAppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 719EF8F018BB839F00EFFF5F /* ApexMobileAppDelegate.m */; };
+		719EF8F118BB839F00EFFF5F /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 719EF8F018BB839F00EFFF5F /* AppDelegate.m */; };
 		719EF8F418BB839F00EFFF5F /* Main_iPhone.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 719EF8F218BB839F00EFFF5F /* Main_iPhone.storyboard */; };
 		719EF8FA18BB839F00EFFF5F /* ApexMobileFirstViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 719EF8F918BB839F00EFFF5F /* ApexMobileFirstViewController.m */; };
 		719EF8FD18BB839F00EFFF5F /* ApexMobileSecondViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 719EF8FC18BB839F00EFFF5F /* ApexMobileSecondViewController.m */; };
@@ -178,16 +186,6 @@
 		7120DD0018BE266000E7546F /* SystemConfiguration.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SystemConfiguration.framework; path = System/Library/Frameworks/SystemConfiguration.framework; sourceTree = SDKROOT; };
 		7120DD0218BE273900E7546F /* LocationViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LocationViewController.h; sourceTree = "<group>"; };
 		7120DD0318BE273900E7546F /* LocationViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LocationViewController.m; sourceTree = "<group>"; };
-		71286AAA18C70061001FDF43 /* AESCrypt.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AESCrypt.h; sourceTree = "<group>"; };
-		71286AAB18C70061001FDF43 /* AESCrypt.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AESCrypt.m; sourceTree = "<group>"; };
-		71286AAC18C70061001FDF43 /* LICENSE */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = LICENSE; sourceTree = "<group>"; };
-		71286AAD18C70061001FDF43 /* NSData+Base64.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSData+Base64.h"; sourceTree = "<group>"; };
-		71286AAE18C70061001FDF43 /* NSData+Base64.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSData+Base64.m"; sourceTree = "<group>"; };
-		71286AAF18C70061001FDF43 /* NSData+CommonCrypto.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSData+CommonCrypto.h"; sourceTree = "<group>"; };
-		71286AB018C70061001FDF43 /* NSData+CommonCrypto.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSData+CommonCrypto.m"; sourceTree = "<group>"; };
-		71286AB118C70061001FDF43 /* NSString+Base64.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSString+Base64.h"; sourceTree = "<group>"; };
-		71286AB218C70061001FDF43 /* NSString+Base64.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSString+Base64.m"; sourceTree = "<group>"; };
-		71286AB318C70061001FDF43 /* README.md */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = README.md; sourceTree = "<group>"; };
 		712A301118CFEF550022E6E6 /* CustomizeFieldViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CustomizeFieldViewController.h; sourceTree = "<group>"; };
 		712A301218CFEF550022E6E6 /* CustomizeFieldViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CustomizeFieldViewController.m; sourceTree = "<group>"; };
 		712CBA0118CF38DB00C61394 /* RTLabel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RTLabel.h; sourceTree = "<group>"; };
@@ -241,6 +239,38 @@
 		715643D9201C079F00B04267 /* tools.json */ = {isa = PBXFileReference; lastKnownFileType = text.json; path = tools.json; sourceTree = "<group>"; };
 		715643DB201C117300B04267 /* search.json */ = {isa = PBXFileReference; lastKnownFileType = text.json; path = search.json; sourceTree = "<group>"; };
 		715643DD201C1AE600B04267 /* my.json */ = {isa = PBXFileReference; lastKnownFileType = text.json; path = my.json; sourceTree = "<group>"; };
+		7157098C2021572600EFE5C5 /* NetworkUtils.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = NetworkUtils.m; path = ../../common/NetworkUtils.m; sourceTree = "<group>"; };
+		7157098D2021572600EFE5C5 /* NetworkUtils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = NetworkUtils.h; path = ../../common/NetworkUtils.h; sourceTree = "<group>"; };
+		715709902021574D00EFE5C5 /* RAConvertor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RAConvertor.h; path = ../../common/RAConvertor.h; sourceTree = "<group>"; };
+		715709912021574D00EFE5C5 /* RAConvertor.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = RAConvertor.m; path = ../../common/RAConvertor.m; sourceTree = "<group>"; };
+		715709932021576A00EFE5C5 /* const.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = const.h; sourceTree = "<group>"; };
+		71570994202157A600EFE5C5 /* RAUtils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RAUtils.h; path = "../../RedAnt ERP Mobile/common/RAUtils.h"; sourceTree = "<group>"; };
+		71570995202157A600EFE5C5 /* RAUtils.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = RAUtils.m; path = "../../RedAnt ERP Mobile/common/RAUtils.m"; sourceTree = "<group>"; };
+		71570997202157BC00EFE5C5 /* RANetworkTaskDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = RANetworkTaskDelegate.m; path = ../../common/upload/RANetworkTaskDelegate.m; sourceTree = "<group>"; };
+		71570998202157BC00EFE5C5 /* RANetworkTaskDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RANetworkTaskDelegate.h; path = ../../common/upload/RANetworkTaskDelegate.h; sourceTree = "<group>"; };
+		7157099A2021591F00EFE5C5 /* config.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = config.h; sourceTree = "<group>"; };
+		7157099C20215B5000EFE5C5 /* zip.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = zip.c; path = "../../RedAnt ERP Mobile/common/zip/minizip/zip.c"; sourceTree = "<group>"; };
+		7157099D20215B5000EFE5C5 /* crypt.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = crypt.h; path = "../../RedAnt ERP Mobile/common/zip/minizip/crypt.h"; sourceTree = "<group>"; };
+		7157099E20215B5000EFE5C5 /* unzip.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = unzip.c; path = "../../RedAnt ERP Mobile/common/zip/minizip/unzip.c"; sourceTree = "<group>"; };
+		7157099F20215B5000EFE5C5 /* zip.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = zip.h; path = "../../RedAnt ERP Mobile/common/zip/minizip/zip.h"; sourceTree = "<group>"; };
+		715709A020215B5000EFE5C5 /* ioapi.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = ioapi.c; path = "../../RedAnt ERP Mobile/common/zip/minizip/ioapi.c"; sourceTree = "<group>"; };
+		715709A120215B5000EFE5C5 /* ioapi.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ioapi.h; path = "../../RedAnt ERP Mobile/common/zip/minizip/ioapi.h"; sourceTree = "<group>"; };
+		715709A220215B5100EFE5C5 /* mztools.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = mztools.h; path = "../../RedAnt ERP Mobile/common/zip/minizip/mztools.h"; sourceTree = "<group>"; };
+		715709A320215B5100EFE5C5 /* unzip.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = unzip.h; path = "../../RedAnt ERP Mobile/common/zip/minizip/unzip.h"; sourceTree = "<group>"; };
+		715709A420215B5100EFE5C5 /* mztools.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = mztools.c; path = "../../RedAnt ERP Mobile/common/zip/minizip/mztools.c"; sourceTree = "<group>"; };
+		715709A920215B6200EFE5C5 /* ZipArchive.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ZipArchive.h; path = "../../RedAnt ERP Mobile/common/zip/ZipArchive.h"; sourceTree = "<group>"; };
+		715709AA20215B6200EFE5C5 /* ZipArchive.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = ZipArchive.mm; path = "../../RedAnt ERP Mobile/common/zip/ZipArchive.mm"; sourceTree = "<group>"; };
+		715709AC20215CB000EFE5C5 /* RANetwork.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RANetwork.h; sourceTree = "<group>"; };
+		715709AD20215CB000EFE5C5 /* RANetwork.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RANetwork.m; sourceTree = "<group>"; };
+		715709B020215DFF00EFE5C5 /* NSData+CommonCrypto.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = "NSData+CommonCrypto.m"; path = "../../RedAnt ERP Mobile/common/AES/NSData+CommonCrypto.m"; sourceTree = "<group>"; };
+		715709B120215DFF00EFE5C5 /* NSString+Base64.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "NSString+Base64.h"; path = "../../RedAnt ERP Mobile/common/AES/NSString+Base64.h"; sourceTree = "<group>"; };
+		715709B220215DFF00EFE5C5 /* NSString+Base64.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = "NSString+Base64.m"; path = "../../RedAnt ERP Mobile/common/AES/NSString+Base64.m"; sourceTree = "<group>"; };
+		715709B320215DFF00EFE5C5 /* NSData+Base64.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = "NSData+Base64.m"; path = "../../RedAnt ERP Mobile/common/AES/NSData+Base64.m"; sourceTree = "<group>"; };
+		715709B420215DFF00EFE5C5 /* AESCrypt.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AESCrypt.h; path = "../../RedAnt ERP Mobile/common/AES/AESCrypt.h"; sourceTree = "<group>"; };
+		715709B520215DFF00EFE5C5 /* NSData+Base64.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "NSData+Base64.h"; path = "../../RedAnt ERP Mobile/common/AES/NSData+Base64.h"; sourceTree = "<group>"; };
+		715709B620215DFF00EFE5C5 /* LICENSE */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = LICENSE; path = "../../RedAnt ERP Mobile/common/AES/LICENSE"; sourceTree = "<group>"; };
+		715709B720215DFF00EFE5C5 /* NSData+CommonCrypto.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "NSData+CommonCrypto.h"; path = "../../RedAnt ERP Mobile/common/AES/NSData+CommonCrypto.h"; sourceTree = "<group>"; };
+		715709B820215DFF00EFE5C5 /* AESCrypt.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AESCrypt.m; path = "../../RedAnt ERP Mobile/common/AES/AESCrypt.m"; sourceTree = "<group>"; };
 		7162546A201C3AF1009E3A41 /* readme.txt */ = {isa = PBXFileReference; lastKnownFileType = text; path = readme.txt; sourceTree = "<group>"; };
 		7162546C201C412E009E3A41 /* ShippingStatusCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = ShippingStatusCell.xib; sourceTree = "<group>"; };
 		7162546F201C5205009E3A41 /* fake_container_list.json */ = {isa = PBXFileReference; lastKnownFileType = text.json; path = fake_container_list.json; sourceTree = "<group>"; };
@@ -272,8 +302,6 @@
 		719A51B918C5AB7B0080C075 /* SimpleGridComponent.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SimpleGridComponent.m; sourceTree = "<group>"; };
 		719BEC1518FFAB7B00DFE987 /* ToolsPanelViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ToolsPanelViewController.h; sourceTree = "<group>"; };
 		719BEC1618FFAB7B00DFE987 /* ToolsPanelViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ToolsPanelViewController.m; sourceTree = "<group>"; };
-		719E7E2E18C015D0003408FF /* ApexMobileNetwork.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ApexMobileNetwork.h; sourceTree = "<group>"; };
-		719E7E2F18C015D0003408FF /* ApexMobileNetwork.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ApexMobileNetwork.m; sourceTree = "<group>"; };
 		719E7E3118C0368A003408FF /* ApexMobileDB.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ApexMobileDB.h; sourceTree = "<group>"; };
 		719E7E3218C0368A003408FF /* ApexMobileDB.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ApexMobileDB.m; sourceTree = "<group>"; };
 		719E7E3418C0395E003408FF /* libsqlite3.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libsqlite3.dylib; path = usr/lib/libsqlite3.dylib; sourceTree = SDKROOT; };
@@ -285,8 +313,8 @@
 		719EF8EA18BB839F00EFFF5F /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = "<group>"; };
 		719EF8EC18BB839F00EFFF5F /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
 		719EF8EE18BB839F00EFFF5F /* Apex Mobile-Prefix.pch */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Apex Mobile-Prefix.pch"; sourceTree = "<group>"; };
-		719EF8EF18BB839F00EFFF5F /* ApexMobileAppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ApexMobileAppDelegate.h; sourceTree = "<group>"; };
-		719EF8F018BB839F00EFFF5F /* ApexMobileAppDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ApexMobileAppDelegate.m; sourceTree = "<group>"; };
+		719EF8EF18BB839F00EFFF5F /* AppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; };
+		719EF8F018BB839F00EFFF5F /* AppDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = "<group>"; };
 		719EF8F318BB839F00EFFF5F /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main_iPhone.storyboard; sourceTree = "<group>"; };
 		719EF8F818BB839F00EFFF5F /* ApexMobileFirstViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ApexMobileFirstViewController.h; sourceTree = "<group>"; };
 		719EF8F918BB839F00EFFF5F /* ApexMobileFirstViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ApexMobileFirstViewController.m; sourceTree = "<group>"; };
@@ -455,23 +483,6 @@
 			name = ShipStatusCell;
 			sourceTree = "<group>";
 		};
-		71286AA918C7002F001FDF43 /* AES */ = {
-			isa = PBXGroup;
-			children = (
-				71286AAA18C70061001FDF43 /* AESCrypt.h */,
-				71286AAB18C70061001FDF43 /* AESCrypt.m */,
-				71286AAC18C70061001FDF43 /* LICENSE */,
-				71286AAD18C70061001FDF43 /* NSData+Base64.h */,
-				71286AAE18C70061001FDF43 /* NSData+Base64.m */,
-				71286AAF18C70061001FDF43 /* NSData+CommonCrypto.h */,
-				71286AB018C70061001FDF43 /* NSData+CommonCrypto.m */,
-				71286AB118C70061001FDF43 /* NSString+Base64.h */,
-				71286AB218C70061001FDF43 /* NSString+Base64.m */,
-				71286AB318C70061001FDF43 /* README.md */,
-			);
-			name = AES;
-			sourceTree = "<group>";
-		};
 		713AA79E1917366A00B44092 /* documents */ = {
 			isa = PBXGroup;
 			children = (
@@ -486,6 +497,10 @@
 		715643B820198A6000B04267 /* new */ = {
 			isa = PBXGroup;
 			children = (
+				7157099A2021591F00EFE5C5 /* config.h */,
+				715709932021576A00EFE5C5 /* const.h */,
+				7157098F2021573600EFE5C5 /* utils */,
+				7157098B202156EC00EFE5C5 /* network */,
 				42604124201C53ED002374A8 /* ShipStatusCell */,
 				425CF088201EAF8800750E32 /* History */,
 				42604123201C53DB002374A8 /* Home */,
@@ -522,6 +537,68 @@
 			name = ModeList;
 			sourceTree = "<group>";
 		};
+		7157098B202156EC00EFE5C5 /* network */ = {
+			isa = PBXGroup;
+			children = (
+				71570998202157BC00EFE5C5 /* RANetworkTaskDelegate.h */,
+				71570997202157BC00EFE5C5 /* RANetworkTaskDelegate.m */,
+				7157098D2021572600EFE5C5 /* NetworkUtils.h */,
+				7157098C2021572600EFE5C5 /* NetworkUtils.m */,
+				715709AC20215CB000EFE5C5 /* RANetwork.h */,
+				715709AD20215CB000EFE5C5 /* RANetwork.m */,
+				717D76E918C7F8120070302D /* Reachability.h */,
+				717D76EA18C7F8120070302D /* Reachability.m */,
+			);
+			name = network;
+			sourceTree = "<group>";
+		};
+		7157098F2021573600EFE5C5 /* utils */ = {
+			isa = PBXGroup;
+			children = (
+				715709AF20215DEC00EFE5C5 /* AES */,
+				7157099B20215B4100EFE5C5 /* zip */,
+				71570994202157A600EFE5C5 /* RAUtils.h */,
+				71570995202157A600EFE5C5 /* RAUtils.m */,
+				715709902021574D00EFE5C5 /* RAConvertor.h */,
+				715709912021574D00EFE5C5 /* RAConvertor.m */,
+			);
+			name = utils;
+			sourceTree = "<group>";
+		};
+		7157099B20215B4100EFE5C5 /* zip */ = {
+			isa = PBXGroup;
+			children = (
+				715709A920215B6200EFE5C5 /* ZipArchive.h */,
+				715709AA20215B6200EFE5C5 /* ZipArchive.mm */,
+				7157099D20215B5000EFE5C5 /* crypt.h */,
+				715709A020215B5000EFE5C5 /* ioapi.c */,
+				715709A120215B5000EFE5C5 /* ioapi.h */,
+				715709A420215B5100EFE5C5 /* mztools.c */,
+				715709A220215B5100EFE5C5 /* mztools.h */,
+				7157099E20215B5000EFE5C5 /* unzip.c */,
+				715709A320215B5100EFE5C5 /* unzip.h */,
+				7157099C20215B5000EFE5C5 /* zip.c */,
+				7157099F20215B5000EFE5C5 /* zip.h */,
+			);
+			name = zip;
+			sourceTree = "<group>";
+		};
+		715709AF20215DEC00EFE5C5 /* AES */ = {
+			isa = PBXGroup;
+			children = (
+				715709B420215DFF00EFE5C5 /* AESCrypt.h */,
+				715709B820215DFF00EFE5C5 /* AESCrypt.m */,
+				715709B620215DFF00EFE5C5 /* LICENSE */,
+				715709B520215DFF00EFE5C5 /* NSData+Base64.h */,
+				715709B320215DFF00EFE5C5 /* NSData+Base64.m */,
+				715709B720215DFF00EFE5C5 /* NSData+CommonCrypto.h */,
+				715709B020215DFF00EFE5C5 /* NSData+CommonCrypto.m */,
+				715709B120215DFF00EFE5C5 /* NSString+Base64.h */,
+				715709B220215DFF00EFE5C5 /* NSString+Base64.m */,
+			);
+			name = AES;
+			sourceTree = "<group>";
+		};
 		7162546E201C51DC009E3A41 /* fake data */ = {
 			isa = PBXGroup;
 			children = (
@@ -685,11 +762,6 @@
 		719E7E2D18C01555003408FF /* utils */ = {
 			isa = PBXGroup;
 			children = (
-				71286AA918C7002F001FDF43 /* AES */,
-				717D76E918C7F8120070302D /* Reachability.h */,
-				717D76EA18C7F8120070302D /* Reachability.m */,
-				719E7E2E18C015D0003408FF /* ApexMobileNetwork.h */,
-				719E7E2F18C015D0003408FF /* ApexMobileNetwork.m */,
 				719E7E3118C0368A003408FF /* ApexMobileDB.h */,
 				719E7E3218C0368A003408FF /* ApexMobileDB.m */,
 				71A565DD18C212EA00CDAC07 /* Constant.h */,
@@ -766,8 +838,8 @@
 				719A51A618C5A4E40080C075 /* CustomUI */,
 				71A565E018C2141C00CDAC07 /* resource */,
 				719E7E2D18C01555003408FF /* utils */,
-				719EF8EF18BB839F00EFFF5F /* ApexMobileAppDelegate.h */,
-				719EF8F018BB839F00EFFF5F /* ApexMobileAppDelegate.m */,
+				719EF8EF18BB839F00EFFF5F /* AppDelegate.h */,
+				719EF8F018BB839F00EFFF5F /* AppDelegate.m */,
 				719EF8F218BB839F00EFFF5F /* Main_iPhone.storyboard */,
 				715643B620198A1400B04267 /* Main.storyboard */,
 				719EF8F818BB839F00EFFF5F /* ApexMobileFirstViewController.h */,
@@ -945,12 +1017,11 @@
 				715643DC201C117300B04267 /* search.json in Resources */,
 				719EF8FF18BB839F00EFFF5F /* Images.xcassets in Resources */,
 				719EF8F418BB839F00EFFF5F /* Main_iPhone.storyboard in Resources */,
+				715709BC20215E0000EFE5C5 /* LICENSE in Resources */,
 				715643DE201C1AE600B04267 /* my.json in Resources */,
-				71286AB518C70061001FDF43 /* LICENSE in Resources */,
 				715643D7201AD99300B04267 /* StaticModeTableViewCell.xib in Resources */,
 				71DA74A818BDDFB5003B46A6 /* about.htm in Resources */,
 				714C39BF19234065004F045B /* Localizable.strings in Resources */,
-				71286AB918C70061001FDF43 /* README.md in Resources */,
 				425660DB202015E1002DB0CA /* Launch.storyboard in Resources */,
 				715643DA201C079F00B04267 /* tools.json in Resources */,
 				715643D5201AD2AB00B04267 /* StaticModelistViewController.xib in Resources */,
@@ -976,6 +1047,7 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				715709A620215B5100EFE5C5 /* unzip.c in Sources */,
 				715643D3201ACB1700B04267 /* StaticModeTableViewCell.m in Sources */,
 				718BE8B2190F9D970046EA6A /* MyAutocompleteItemsSource.m in Sources */,
 				71406DCE18C36A52000914C4 /* TableCellBool.m in Sources */,
@@ -984,6 +1056,7 @@
 				71F67CFC19066375004E8462 /* PulldownMenu.m in Sources */,
 				71406DD118C36A6E000914C4 /* TableCellDate.m in Sources */,
 				717D772F18C84E3F0070302D /* PageData.m in Sources */,
+				715709BB20215E0000EFE5C5 /* NSData+Base64.m in Sources */,
 				71375C8F18D96EDE00EBA026 /* TabBarController.m in Sources */,
 				71951E6F18C6A9A5005024BD /* TouchLabel.m in Sources */,
 				71DA6047190A00F600683003 /* FavoritesData.m in Sources */,
@@ -993,12 +1066,17 @@
 				715643C42019B58400B04267 /* OrderHistoryViewController.m in Sources */,
 				712CBA0318CF38DB00C61394 /* RTLabel.m in Sources */,
 				71CEE3D718CC559B00052C63 /* ApexMobileNavigationController.m in Sources */,
+				715709922021574D00EFE5C5 /* RAConvertor.m in Sources */,
 				71BA50371908F21500D0BD31 /* HistoryData.m in Sources */,
 				71A541D418D151C70017E2BD /* WebViewController.m in Sources */,
 				71330C2018BCC4DA0048956C /* FunctionSelectViewController.m in Sources */,
 				715643D02019BCCE00B04267 /* MylistViewController.m in Sources */,
+				715709B920215E0000EFE5C5 /* NSData+CommonCrypto.m in Sources */,
 				718BE8B4190F9D970046EA6A /* MySuggestion.m in Sources */,
+				715709A520215B5100EFE5C5 /* zip.c in Sources */,
+				715709AE20215CB000EFE5C5 /* RANetwork.m in Sources */,
 				719EF8FD18BB839F00EFFF5F /* ApexMobileSecondViewController.m in Sources */,
+				715709BA20215E0000EFE5C5 /* NSString+Base64.m in Sources */,
 				71AE427318C47AF900B8EC3D /* SearchViewController.m in Sources */,
 				715643BE2019AA9B00B04267 /* LoginViewController.m in Sources */,
 				71308AF7191E7B0E0024B2B0 /* MessageDetailItem.m in Sources */,
@@ -1007,21 +1085,20 @@
 				719BEC1718FFAB7B00DFE987 /* ToolsPanelViewController.m in Sources */,
 				71BA502E1908ED5700D0BD31 /* CellItemHistory.m in Sources */,
 				719A51A518C5A4AF0080C075 /* SimpleGrid.m in Sources */,
-				71286AB718C70061001FDF43 /* NSData+CommonCrypto.m in Sources */,
 				71A003FF18D6BFB40057CDFD /* ChangePasswordViewController.m in Sources */,
 				42604122201C4B41002374A8 /* ShipingStatusCell.m in Sources */,
 				71CEE38A18CB749E00052C63 /* DetailPageViewController.m in Sources */,
-				71286AB618C70061001FDF43 /* NSData+Base64.m in Sources */,
 				719E7E3318C0368A003408FF /* ApexMobileDB.m in Sources */,
 				425CF096201EB2B500750E32 /* JLRefreshFooter.m in Sources */,
 				715643C12019B27500B04267 /* HomeViewController.m in Sources */,
 				715643C72019BB6700B04267 /* StaticModelistViewController.m in Sources */,
-				719E7E3018C015D0003408FF /* ApexMobileNetwork.m in Sources */,
-				719EF8F118BB839F00EFFF5F /* ApexMobileAppDelegate.m in Sources */,
+				7157098E2021572600EFE5C5 /* NetworkUtils.m in Sources */,
+				719EF8F118BB839F00EFFF5F /* AppDelegate.m in Sources */,
 				714C39B81922FEE1004F045B /* NewsDetailViewController.m in Sources */,
 				425CF098201EB2B500750E32 /* JLRefreshBasis.m in Sources */,
 				715643CD2019BC6C00B04267 /* ToolslistViewController.m in Sources */,
 				712A301318CFEF550022E6E6 /* CustomizeFieldViewController.m in Sources */,
+				715709BD20215E0000EFE5C5 /* AESCrypt.m in Sources */,
 				716FF7921904ED2600ED6C3D /* NewsData.m in Sources */,
 				71F67CF619063612004E8462 /* ApexHistoryViewController.m in Sources */,
 				7130B3F41900FB61000610D8 /* NewsViewController.m in Sources */,
@@ -1032,28 +1109,31 @@
 				719A51B418C5A8100080C075 /* ResultViewController.m in Sources */,
 				425CF097201EB2B500750E32 /* JLRefreshHeader.m in Sources */,
 				711DC6B218C30A4800FB1749 /* TableCellEdit.m in Sources */,
-				71286AB818C70061001FDF43 /* NSString+Base64.m in Sources */,
 				71A01D8218C9BA67003307A9 /* DetailContent.m in Sources */,
 				71A003FC18D680560057CDFD /* RetrievePasswordViewController.m in Sources */,
 				71F67CF919065EA8004E8462 /* SimpleMenu.m in Sources */,
 				719A51BA18C5AB7B0080C075 /* SimpleGridComponent.m in Sources */,
+				71570996202157A600EFE5C5 /* RAUtils.m in Sources */,
 				715643BB20198A9900B04267 /* RootViewController.m in Sources */,
 				719EF8ED18BB839F00EFFF5F /* main.m in Sources */,
 				717D76EB18C7F8120070302D /* Reachability.m in Sources */,
+				715709A720215B5100EFE5C5 /* ioapi.c in Sources */,
 				715643CA2019BC4C00B04267 /* SearchlistViewController.m in Sources */,
 				7120DD0418BE273900E7546F /* LocationViewController.m in Sources */,
 				71308AFA191E7B2A0024B2B0 /* MessageDetailViewController.m in Sources */,
-				71286AB418C70061001FDF43 /* AESCrypt.m in Sources */,
 				713AA7A1191736E600B44092 /* DocumentsViewController.m in Sources */,
 				716FF7951904FBC600ED6C3D /* NewsTableViewCell.m in Sources */,
+				715709AB20215B6200EFE5C5 /* ZipArchive.mm in Sources */,
 				425CF09A201EB2B500750E32 /* UIView+JLExtension.m in Sources */,
 				71A01D7918C9AE77003307A9 /* DetailCellKV.m in Sources */,
 				42604127201C578B002374A8 /* ShipSearchController.m in Sources */,
 				713AA7A41917373600B44092 /* LocalDocumentsViewController.m in Sources */,
 				71DA604A190A02CE00683003 /* FavoritesViewController.m in Sources */,
 				71BA50341908EDCF00D0BD31 /* HistoryTabBarController.m in Sources */,
+				715709A820215B5100EFE5C5 /* mztools.c in Sources */,
 				719A51A918C5A5D30080C075 /* SimpleGridDataSource.m in Sources */,
 				718BE8B3190F9D970046EA6A /* MyAutocompletionCellFactory.m in Sources */,
+				71570999202157BD00EFE5C5 /* RANetworkTaskDelegate.m in Sources */,
 				71A565DF18C212EA00CDAC07 /* Constant.m in Sources */,
 				718BE8B0190F9D970046EA6A /* MyAutocompleteView.m in Sources */,
 			);

BIN
Apex Mobile/Apex Mobile.xcodeproj/project.xcworkspace/xcuserdata/Ray.xcuserdatad/UserInterfaceState.xcuserstate


+ 8 - 8
Apex Mobile/Apex Mobile.xcodeproj/xcuserdata/Ray.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -10,7 +10,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "Apex Mobile/ApexMobileNetwork.m"
-            timestampString = "417659513.980336"
+            timestampString = "539058550.993107"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "126"
@@ -26,7 +26,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "Apex Mobile/DetailPageViewController.m"
-            timestampString = "538992817.738045"
+            timestampString = "539058709.182592"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "544"
@@ -42,7 +42,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "Apex Mobile/ApexMobileFirstViewController.m"
-            timestampString = "538552834.9969749"
+            timestampString = "539058709.182654"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "32"
@@ -58,7 +58,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "Apex Mobile/ApexMobileFirstViewController.m"
-            timestampString = "538552834.997056"
+            timestampString = "539058709.183037"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "56"
@@ -74,7 +74,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "Apex Mobile/LoginViewController.m"
-            timestampString = "539053550.295666"
+            timestampString = "539058709.183265"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "53"
@@ -90,7 +90,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "Apex Mobile/StaticModelistViewController.m"
-            timestampString = "538973650.107618"
+            timestampString = "539058709.18332"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "68"
@@ -106,7 +106,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "Apex Mobile/ToolslistViewController.m"
-            timestampString = "538992817.738518"
+            timestampString = "539058550.993516"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "76"
@@ -122,7 +122,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "Apex Mobile/ToolslistViewController.m"
-            timestampString = "538992817.7386889"
+            timestampString = "539058550.993569"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "113"

+ 2 - 2
Apex Mobile/Apex Mobile/ApexMobileDB.h

@@ -8,8 +8,8 @@
 
 #import <Foundation/Foundation.h>
 #import <sqlite3.h>  
-#import "Constant.h"
-#import "ApexMobileAppDelegate.h"
+#import "const.h"
+#import "AppDelegate.h"
 #define DBNAME    @"ApexMobile.db"  
 
 @interface ApexMobileDB : NSObject

+ 2 - 2
Apex Mobile/Apex Mobile/ApexMobileDB.m

@@ -146,7 +146,7 @@
 {
     sqlite3* db = [self get_db ];
     NSMutableArray* ret = [[NSMutableArray alloc] init];
-    ApexMobileAppDelegate *appDelegate = [[UIApplication sharedApplication] delegate];
+    AppDelegate *appDelegate = [[UIApplication sharedApplication] delegate];
     NSString* user = appDelegate.user;
     NSString *sqlQuery = [NSString stringWithFormat:@"select h_val from search_history where h_field='%@' and user='%@' order by h_time desc",field,user];
     sqlite3_stmt * statement;
@@ -175,7 +175,7 @@
 +(void) savehistory:(NSString*) field value:(NSString*) value
 {
     sqlite3* db = [self get_db ];
-    ApexMobileAppDelegate *appDelegate = [[UIApplication sharedApplication] delegate];
+    AppDelegate *appDelegate = [[UIApplication sharedApplication] delegate];
     NSString* user = appDelegate.user;
     int _id = [self get_recordid:db table:@"search_history" where:[NSString stringWithFormat:@"user='%@' and h_field='%@' and h_val ='%@'",user,field,value]];
     if(_id>=0)

+ 2 - 2
Apex Mobile/Apex Mobile/ApexMobileFirstViewController.h

@@ -7,9 +7,9 @@
 //
 
 #import <UIKit/UIKit.h>
-#import "ApexMobileNetwork.h"
+#import "RANetwork.h"
 #import "AESCrypt.h"
-#import "Constant.h"
+#import "const.h"
 @interface
 ApexMobileFirstViewController : UIViewController <UITextFieldDelegate>
 @property (strong, nonatomic) IBOutlet UIButton *checkSavePassword;

+ 1 - 1
Apex Mobile/Apex Mobile/ApexMobileFirstViewController.m

@@ -47,7 +47,7 @@
     dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
         
         
-        int ret=[ApexMobileNetwork Authorize:self.editUser.text password:self.editPassword.text];
+        int ret=[RANetwork Authorize:self.editUser.text password:self.editPassword.text];
         
         dispatch_async(dispatch_get_main_queue(), ^{
             self.mum.hidden=true;

+ 24 - 0
Apex Mobile/Apex Mobile/AppDelegate.h

@@ -0,0 +1,24 @@
+//
+//  ApexMobileAppDelegate.h
+//  Apex Mobile
+//
+//  Created by Ray on 14-2-24.
+//  Copyright (c) 2014年 United Software Applications, Inc. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+#import <GoogleMaps/GoogleMaps.h>
+@interface AppDelegate : UIResponder <UIApplicationDelegate>
+
+@property (strong, nonatomic) UIWindow *window;
+@property (strong,nonatomic) NSString* user;
+@property (strong,nonatomic) NSString * password;
+@property (strong,nonatomic) NSString * sessionid;
+@property (strong,nonatomic) NSString * duid;
+
+
+
+@property (strong,nonatomic) NSString* build;
+@property (strong,nonatomic) NSString* shortver;
+-(void)Logout;
+@end

+ 110 - 0
Apex Mobile/Apex Mobile/AppDelegate.m

@@ -0,0 +1,110 @@
+//
+//  ApexMobileAppDelegate.m
+//  Apex Mobile
+//
+//  Created by Ray on 14-2-24.
+//  Copyright (c) 2014年 United Software Applications, Inc. All rights reserved.
+//
+
+
+#import "AppDelegate.h"
+#import "ApexMobileDB.h"
+#import "RANetwork.h"
+#import "AESCrypt.h"
+@implementation AppDelegate
+
+- (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions
+{
+    // Override point for customization after application launch.
+    [GMSServices provideAPIKey:@"AIzaSyBqS2pF7m1DlR5zwhAX_rBSD_9bTnpjYbQ"];
+    if (! [ApexMobileDB initializeDb])
+        // TODO: alert the user!
+        DebugLog(@"couldn't init db");
+    
+    if ([[[UIDevice currentDevice] systemVersion] floatValue] >= 8.0)
+    {
+                UIUserNotificationSettings *settings = [UIUserNotificationSettings settingsForTypes:(UIUserNotificationTypeBadge |UIUserNotificationTypeSound | UIUserNotificationTypeAlert) categories:nil];
+                [[UIApplication sharedApplication]  registerUserNotificationSettings:settings];
+            [[UIApplication sharedApplication] registerForRemoteNotifications ];
+    }
+    else
+    {
+    [[UIApplication sharedApplication] registerForRemoteNotificationTypes: UIUserNotificationTypeBadge |UIUserNotificationTypeSound | UIUserNotificationTypeAlert];
+    }
+
+
+    NSUserDefaults *defaults =[NSUserDefaults standardUserDefaults];
+    self.user = [AESCrypt decrypt:[defaults stringForKey:@"user"] password:@"usai"];
+    
+  
+    self.password= [AESCrypt decrypt:[defaults stringForKey:@"password"] password:@"usai"];
+
+    
+    return YES;
+}
+-(void)Logout
+{
+    self.user = nil;
+    self.password=nil;
+    self.sessionid=nil;
+    [RANetwork Logout];
+    NSUserDefaults *defaults =[NSUserDefaults standardUserDefaults];
+    [defaults setBool:false forKey:@"autologin"];
+    
+    
+    [defaults synchronize];
+    [UIApplication sharedApplication].applicationIconBadgeNumber = 0;
+    [[UIApplication sharedApplication] cancelAllLocalNotifications ];
+    //self.duid = nil;
+}
+- (void)applicationWillResignActive:(UIApplication *)application
+{
+    // Sent when the application is about to move from active to inactive state. This can occur for certain types of temporary interruptions (such as an incoming phone call or SMS message) or when the user quits the application and it begins the transition to the background state.
+    // Use this method to pause ongoing tasks, disable timers, and throttle down OpenGL ES frame rates. Games should use this method to pause the game.
+}
+
+- (void)applicationDidEnterBackground:(UIApplication *)application
+{
+    // Use this method to release shared resources, save user data, invalidate timers, and store enough application state information to restore your application to its current state in case it is terminated later.
+    // If your application supports background execution, this method is called instead of applicationWillTerminate: when the user quits.
+}
+
+- (void)applicationWillEnterForeground:(UIApplication *)application
+{
+    // Called as part of the transition from the background to the inactive state; here you can undo many of the changes made on entering the background.
+}
+
+- (void)applicationDidBecomeActive:(UIApplication *)application
+{
+    [[UIApplication sharedApplication] cancelAllLocalNotifications ];
+    
+    // Restart any tasks that were paused (or not yet started) while the application was inactive. If the application was previously in the background, optionally refresh the user interface.
+}
+
+- (void)applicationWillTerminate:(UIApplication *)application
+{
+    // Called when the application is about to terminate. Save data if appropriate. See also applicationDidEnterBackground:.
+}
+
+- (void)application:(UIApplication *)application didRegisterForRemoteNotificationsWithDeviceToken:(NSData *)pToken {
+    NSString * sss=[NSString stringWithFormat:@"%@",pToken];
+    self.duid = [[[[NSString stringWithFormat:@"%@",pToken] substringWithRange:NSMakeRange(0, 72)] substringWithRange:NSMakeRange(1, 71)] stringByReplacingOccurrencesOfString:@" " withString:@""];
+    NSLog(@"regisger success:%@",pToken);
+    
+    //注册成功,将deviceToken保存到应用服务器数据库中
+}
+- (void)application:(UIApplication *)application didReceiveRemoteNotification:(NSDictionary *)userInfo{
+    // 处理推送消息
+    NSLog(@"userinfo:%@",userInfo);
+    
+    NSLog(@"收到推送消息:%@",[[userInfo objectForKey:@"aps"] objectForKey:@"alert"]);
+  
+    NSDictionary* objaps = [userInfo objectForKey:@"aps"];
+    [UIApplication sharedApplication].applicationIconBadgeNumber = [[objaps valueForKey:@"badge"] integerValue];
+    [[NSNotificationCenter defaultCenter] postNotificationName:@"new notification" object:nil];
+}
+
+- (void)application:(UIApplication *)application didFailToRegisterForRemoteNotificationsWithError:(NSError *)error {
+    NSLog(@"Registfail%@",error);
+}
+@end

+ 1 - 1
Apex Mobile/Apex Mobile/ChangePasswordViewController.h

@@ -7,7 +7,7 @@
 //
 
 #import <UIKit/UIKit.h>
-#import "ApexMobileNetwork.h"
+#import "RANetwork.h"
 @interface ChangePasswordViewController : UIViewController<UITextFieldDelegate>
 @property (strong, nonatomic) IBOutlet UITextField *editOld;
 @property (strong, nonatomic) IBOutlet UITextField *editNew;

+ 3 - 3
Apex Mobile/Apex Mobile/ChangePasswordViewController.m

@@ -52,7 +52,7 @@
     NSString* oldpass = self.editOld.text;
     NSString* newpass = self.editNew.text;
     NSString* confirmpass = self.editConfirm.text;
-    ApexMobileAppDelegate *appDelegate = [[UIApplication sharedApplication] delegate];
+    AppDelegate *appDelegate = [[UIApplication sharedApplication] delegate];
     NSString* user = appDelegate.user;
     if(oldpass.length==0||oldpass.length==0||confirmpass.length==0)
     {
@@ -76,7 +76,7 @@
     dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
         
         
-        int ret=[ApexMobileNetwork ChangePassword:newpass user:user oldpass:oldpass];
+        int ret=[RANetwork ChangePassword:newpass user:user oldpass:oldpass];
         
         dispatch_async(dispatch_get_main_queue(), ^{
             self.mum.hidden=true;
@@ -85,7 +85,7 @@
             
             if (ret==RESULT_TRUE)
             {
-                 ApexMobileAppDelegate *appDelegate = [[UIApplication sharedApplication] delegate];
+                 AppDelegate *appDelegate = [[UIApplication sharedApplication] delegate];
                 appDelegate.password = newpass;
                 
                 UIAlertView * alert = [[UIAlertView alloc] initWithTitle:NSLocalizedString(@"alert_title_success", nil) message:NSLocalizedString(@"alert_msg_change_success", nil) delegate:nil cancelButtonTitle:NSLocalizedString(@"ok", nil) otherButtonTitles:nil, nil];

+ 12 - 20
Apex Mobile/Apex Mobile/Constant.h

@@ -6,34 +6,26 @@
 //  Copyright (c) 2014年 United Software Applications, Inc. All rights reserved.
 //
 
-#ifdef DEBUG
-#define DebugLog( s, ... ) NSLog( @"<%p %@:(%d)> %@", self, [[NSString stringWithUTF8String:__FILE__] lastPathComponent], __LINE__, [NSString stringWithFormat:(s), ##__VA_ARGS__] )
-#else
-#define DebugLog( s, ... )
-#endif
-#define UIColorFromRGB(rgbValue) [UIColor colorWithRed:((float)((rgbValue & 0xFF0000) >> 16))/255.0 green:((float)((rgbValue & 0xFF00) >> 8))/255.0 blue:((float)(rgbValue & 0xFF))/255.0 alpha:1.0]
+//#ifdef DEBUG
+//#define DebugLog( s, ... ) NSLog( @"<%p %@:(%d)> %@", self, [[NSString stringWithUTF8String:__FILE__] lastPathComponent], __LINE__, [NSString stringWithFormat:(s), ##__VA_ARGS__] )
+//#else
+//#define DebugLog( s, ... )
+//#endif
+//#define UIColorFromRGB(rgbValue) [UIColor colorWithRed:((float)((rgbValue & 0xFF0000) >> 16))/255.0 green:((float)((rgbValue & 0xFF00) >> 8))/255.0 blue:((float)(rgbValue & 0xFF))/255.0 alpha:1.0]
 
 
 #import <Foundation/Foundation.h>
+//#import "const.h"
 
 
 
-#define  URL_UPDATE_AUTH  @"https://ra.apexshipping.com/login.php"
-#define URL_REQUEST_COUNT @"https://ra.apexshipping.com/main.php"
-#define URL_REQUEST_RECORDS @"https://ra.apexshipping.com/main.php"
-#define URL_RETRIEVE_PASS @"https://ra.apexshipping.com/main.php"
-#define URL_REQUEST_DETAIL @"https://ra.apexshipping.com/main.php"
-#define URL_ANNOUNCEMENTS @"https://ra.apexshipping.com/mobile_news.php"
-#define URL_NEWS	@"https://ra.apexshipping.com/mobile_news.php"
-#define URL_LOCATIONS @"https://ra.apexshipping.com/mobile_news.php"
-#define URL_PUSH @"https://ra.apexshipping.com/main.php"
-#define COLOR(R,G,B,A) [UIColor colorWithRed:R/255.0 green:G/255.0 blue:B/255.0 alpha:A]
+//#define COLOR(R,G,B,A) [UIColor colorWithRed:R/255.0 green:G/255.0 blue:B/255.0 alpha:A]
 
 
-#define RESULT_NET_NOTAVAILABLE -4
-#define RESULT_NET_ERROR -3
-#define RESULT_FALSE 0
-#define RESULT_VER_LOW -15
+//#define RESULT_NET_NOTAVAILABLE -4
+//#define RESULT_NET_ERROR -3
+//#define RESULT_FALSE 0
+//#define RESULT_VER_LOW -15
 extern const int MAX_ROW;
 extern const int MAX_COLUMN;
 

+ 2 - 2
Apex Mobile/Apex Mobile/CustomizeFieldViewController.h

@@ -8,10 +8,10 @@
 
 #import <UIKit/UIKit.h>
 #import <sqlite3.h>
-#import "ApexMobileAppDelegate.h"
+#import "AppDelegate.h"
 #import "ApexMobileDB.h"
 #import "SearchViewController.h"
-//#import "ApexMobileNetwork.h"
+//#import "RANetwork.h"
 
 @interface CustomizeFieldViewController : UIViewController<UITableViewDataSource,UITableViewDelegate>
 @property (strong,nonatomic) NSString* function_name;

+ 2 - 2
Apex Mobile/Apex Mobile/CustomizeFieldViewController.m

@@ -27,7 +27,7 @@
     //    self.tableView.editing = true;
     self.displayfields = [[NSMutableArray alloc] init];
     self.hidefields = [[NSMutableArray alloc] init];
-    ApexMobileAppDelegate *appDelegate = [[UIApplication sharedApplication] delegate];
+    AppDelegate *appDelegate = [[UIApplication sharedApplication] delegate];
     //    NSString* required_ver=[objheader objectForKey:@"client_ver"] ;
     //
     //    appDelegate.sessionid = [objheader valueForKey:@"sessionid"];
@@ -89,7 +89,7 @@
         
         
         char *errorMsg;
-        ApexMobileAppDelegate *appDelegate = [[UIApplication sharedApplication] delegate];
+        AppDelegate *appDelegate = [[UIApplication sharedApplication] delegate];
         if (sqlite3_exec(db, "BEGIN", NULL, NULL, &errorMsg)==SQLITE_OK) {
             
               DebugLog(@"begin transaction success");

+ 1 - 1
Apex Mobile/Apex Mobile/DetailContent.h

@@ -7,7 +7,7 @@
 //
 
 #import <Foundation/Foundation.h>
-#import "Constant.h"
+#import "const.h"
 
 
 @interface DetailContent : NSObject

+ 1 - 1
Apex Mobile/Apex Mobile/DetailPageViewController.h

@@ -7,7 +7,7 @@
 //
 
 #import <UIKit/UIKit.h>
-#import "ApexMobileNetwork.h"
+#import "RANetwork.h"
 #import "DetailCellKV.h"
 #import "DetailCellList.h"
 #import "DetailCellWeb.h"

+ 4 - 4
Apex Mobile/Apex Mobile/DetailPageViewController.m

@@ -99,16 +99,16 @@
     
     dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
         
-        self.content=[ApexMobileNetwork get_detailcontent:self.params];
+        self.content=[RANetwork get_detailcontent:self.params];
         
         
         //        PageData* pageData=nil;
         //        if(self.recordCount==-1)
-        //            self.recordCount=[ApexMobileNetwork get_recordcount: self.params ];
+        //            self.recordCount=[RANetwork get_recordcount: self.params ];
         //        if(self.recordCount>0)
         //        {
-        //            self.pageData=[ApexMobileNetwork get_pagedata:self.params];
-        //            //            self.pageData=[ApexMobileNetwork]
+        //            self.pageData=[RANetwork get_pagedata:self.params];
+        //            //            self.pageData=[RANetwork]
         //        }
         //
         dispatch_async(dispatch_get_main_queue(), ^{

+ 1 - 1
Apex Mobile/Apex Mobile/DetailTabBarController.h

@@ -9,7 +9,7 @@
 #import <UIKit/UIKit.h>
 #import "DetailPageViewController.h"
 #import "SearchViewController.h"
-#import "Constant.h"
+#import "const.h"
 
 @interface DetailTabBarController : UITabBarController<UIAlertViewDelegate>
 @property (strong,nonatomic) NSString* function_name;

+ 1 - 1
Apex Mobile/Apex Mobile/DetailTabBarController.m

@@ -169,7 +169,7 @@
 //        
 //        NSString* param = [[NSString alloc] initWithData:myData
 //                                                encoding:NSUTF8StringEncoding];
-        ApexMobileAppDelegate *appDelegate = [[UIApplication sharedApplication] delegate];
+        AppDelegate *appDelegate = [[UIApplication sharedApplication] delegate];
         NSString* user = appDelegate.user;
         
         sqlite3 *db =[ApexMobileDB get_db];

+ 1 - 1
Apex Mobile/Apex Mobile/DocumentsViewController.h

@@ -7,7 +7,7 @@
 //
 
 #import <UIKit/UIKit.h>
-#import "Constant.h"
+#import "const.h"
 #import "SearchViewController.h"
 #import "LocalDocumentsViewController.h"
 @interface DocumentsViewController : UIViewController<UITableViewDataSource,UITableViewDelegate>

+ 1 - 1
Apex Mobile/Apex Mobile/FavoritesData.h

@@ -9,7 +9,7 @@
 #import <Foundation/Foundation.h>
 #import <sqlite3.h>
 #import "ApexMobileDB.h"
-#import "ApexMobileAppDelegate.h"
+#import "AppDelegate.h"
 @interface FavoritesData : NSObject
 @property (strong,nonatomic) NSMutableArray* pagedata;
 -(long) get_count;

+ 1 - 1
Apex Mobile/Apex Mobile/FavoritesData.m

@@ -21,7 +21,7 @@
     if (self) {
         self.pagedata =[[NSMutableArray alloc]init];
         
-        ApexMobileAppDelegate *appDelegate = [[UIApplication sharedApplication] delegate];
+        AppDelegate *appDelegate = [[UIApplication sharedApplication] delegate];
         //    NSString* required_ver=[objheader objectForKey:@"client_ver"] ;
         //
         //    appDelegate.sessionid = [objheader valueForKey:@"sessionid"];

+ 1 - 1
Apex Mobile/Apex Mobile/FunctionSelectViewController.m

@@ -155,7 +155,7 @@
     
 }
 - (IBAction)onExit:(UIButton *)sender {
-    ApexMobileAppDelegate *appDelegate = [[UIApplication sharedApplication] delegate];
+    AppDelegate *appDelegate = [[UIApplication sharedApplication] delegate];
     [appDelegate Logout];
     [self performSegueWithIdentifier:@"LOGIN" sender:self];
 

+ 1 - 1
Apex Mobile/Apex Mobile/HistoryData.h

@@ -9,7 +9,7 @@
 #import <Foundation/Foundation.h>
 #import <sqlite3.h>
 #import "ApexMobileDB.h"
-#import "ApexMobileAppDelegate.h"
+#import "AppDelegate.h"
 @interface HistoryData : NSObject
 @property (strong,nonatomic) NSMutableArray* pagedata;
 -(long) get_count;

+ 1 - 1
Apex Mobile/Apex Mobile/HistoryData.m

@@ -21,7 +21,7 @@
     if (self) {
         self.pagedata =[[NSMutableArray alloc]init];
         
-        ApexMobileAppDelegate *appDelegate = [[UIApplication sharedApplication] delegate];
+        AppDelegate *appDelegate = [[UIApplication sharedApplication] delegate];
         //    NSString* required_ver=[objheader objectForKey:@"client_ver"] ;
         //
         //    appDelegate.sessionid = [objheader valueForKey:@"sessionid"];

+ 1 - 1
Apex Mobile/Apex Mobile/HistoryTabBarController.h

@@ -9,7 +9,7 @@
 #import <UIKit/UIKit.h>
 #import "HistoryViewController.h"
 #import "FavoritesViewController.h"
-#import "Constant.h"
+#import "const.h"
 @interface HistoryTabBarController : UITabBarController
 
 @end

+ 1 - 1
Apex Mobile/Apex Mobile/LocalDocumentsViewController.h

@@ -7,7 +7,7 @@
 //
 
 #import <UIKit/UIKit.h>
-#import "Constant.h"
+#import "const.h"
 @interface LocalDocumentsViewController : UIViewController
 <UITableViewDataSource,UITableViewDelegate,UIDocumentInteractionControllerDelegate>
 @property (strong,nonatomic) NSMutableArray * toolsinfo;

+ 2 - 2
Apex Mobile/Apex Mobile/LocationViewController.h

@@ -9,8 +9,8 @@
 #import <UIKit/UIKit.h>
 #import <GoogleMaps/GoogleMaps.h>
 
-#import "Constant.h"
-#import "ApexMobileNetwork.h"
+#import "const.h"
+#import "RANetwork.h"
 #import <AddressBookUI/AddressBookUI.h>
 
 @interface LocationViewController : UIViewController<GMSMapViewDelegate>

+ 1 - 1
Apex Mobile/Apex Mobile/LocationViewController.m

@@ -332,7 +332,7 @@ didTapInfoWindowOfMarker:(GMSMarker *)marker
     //    [UIView commitAnimations];
     dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
         
-        bool bupdate=[ApexMobileNetwork UpdateServiceLocation];
+        bool bupdate=[RANetwork UpdateServiceLocation];
         
         dispatch_async(dispatch_get_main_queue(), ^{
             if(bupdate)

+ 2 - 2
Apex Mobile/Apex Mobile/LoginViewController.h

@@ -7,9 +7,9 @@
 //
 
 #import <UIKit/UIKit.h>
-#import "ApexMobileNetwork.h"
+#import "RANetwork.h"
 #import "AESCrypt.h"
-#import "Constant.h"
+#import "const.h"
 
 @interface LoginViewController : UIViewController<UITextFieldDelegate>
 

+ 1 - 1
Apex Mobile/Apex Mobile/LoginViewController.m

@@ -41,7 +41,7 @@
     dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
         
         
-        int ret=[ApexMobileNetwork Authorize:self.editUser.text password:self.editPassword.text];
+        int ret=[RANetwork Authorize:self.editUser.text password:self.editPassword.text];
         
         dispatch_async(dispatch_get_main_queue(), ^{
             self.mum.hidden=true;

+ 2 - 2
Apex Mobile/Apex Mobile/MessageDetailViewController.m

@@ -8,7 +8,7 @@
 
 #import "MessageDetailViewController.h"
 #import "MessageDetailItem.h"
-#import "ApexMobileNetwork.h"
+#import "RANetwork.h"
 #import "RTLabel.h"
 #import "DetailTabBarController.h"
 #import "TabBarController.h"
@@ -68,7 +68,7 @@
         
         
         NSData* data=nil;
-        data=[ApexMobileNetwork get_MessageDetail:self.offset limit:self.limit from:self.s_id to:self.e_id];
+        data=[RANetwork get_MessageDetail:self.offset limit:self.limit from:self.s_id to:self.e_id];
         
         
         dispatch_async(dispatch_get_main_queue(), ^{

+ 1 - 1
Apex Mobile/Apex Mobile/MessageViewController.h

@@ -8,7 +8,7 @@
 
 #import <UIKit/UIKit.h>
 #import "ApexMobileDB.h"
-#import "ApexMobileNetwork.h"
+#import "RANetwork.h"
 @interface MessageViewController : UIViewController<UITableViewDataSource,UITableViewDelegate>
 
 @property (strong, nonatomic) IBOutlet UITableView *tableview;

+ 2 - 2
Apex Mobile/Apex Mobile/MessageViewController.m

@@ -60,7 +60,7 @@
         
         
         NSData* data=nil;
-        data=[ApexMobileNetwork pull_message :self.offset];
+        data=[RANetwork pull_message :self.offset];
         
         
         dispatch_async(dispatch_get_main_queue(), ^{
@@ -210,7 +210,7 @@
             
             self.mum.hidden = false;
             
-            int result = [ApexMobileNetwork delAllMessage:_id];;
+            int result = [RANetwork delAllMessage:_id];;
             
             if(result==1)
             {

+ 1 - 1
Apex Mobile/Apex Mobile/MylistViewController.m

@@ -119,7 +119,7 @@
     {
 
         
-        ApexMobileAppDelegate *appDelegate = [[UIApplication sharedApplication] delegate];
+        AppDelegate *appDelegate = [[UIApplication sharedApplication] delegate];
         [appDelegate Logout];
         if(self.logoutSuccessful)
             self.logoutSuccessful();

+ 1 - 1
Apex Mobile/Apex Mobile/NewsViewController.h

@@ -9,7 +9,7 @@
 #import <UIKit/UIKit.h>
 #import "NewsData.h"
 #import "NewsTableViewCell.h"
-#import "ApexMobileNetwork.h"
+#import "RANetwork.h"
 
 @interface NewsViewController : UIViewController<UITableViewDataSource,UITableViewDelegate>
 -(id) init :(NSString*) title ;

+ 2 - 2
Apex Mobile/Apex Mobile/NewsViewController.m

@@ -50,9 +50,9 @@
         
         NSData* data=nil;
         if([self.module_name isEqualToString:@"Announcements"])
-            data=[ApexMobileNetwork get_announcements:self.lastid limit:self.limit];
+            data=[RANetwork get_announcements:self.lastid limit:self.limit];
         else
-            data=[ApexMobileNetwork get_marketnews:self.lastid limit:self.limit];
+            data=[RANetwork get_marketnews:self.lastid limit:self.limit];
         
         
         dispatch_async(dispatch_get_main_queue(), ^{

+ 39 - 0
Apex Mobile/Apex Mobile/RANetwork.h

@@ -0,0 +1,39 @@
+//
+//  RANetwork.h
+//  Apex Mobile
+//
+//  Created by Ray on 31/01/2018.
+//  Copyright © 2018 United Software Applications, Inc. All rights reserved.
+//
+
+#import "NetworkUtils.h"
+#import <sqlite3.h>
+#import "AppDelegate.h"
+#import "ApexMobileDB.h"
+#import "const.h"
+#import "Reachability.h"
+#import "PageData.h"
+#import "DetailContent.h"
+#import <MessageUI/MessageUI.h>
+#import <MessageUI/MFMailComposeViewController.h>
+@interface RANetwork : NetworkUtils
++(void)Logout ;
++(int)Authorize : (NSString*) user password:(NSString*) password ;
++(int)parse_authinfo : (NSData *) json user:(NSString*) user password:(NSString*) password;
+//+(NSData*)get_json : (NSString*) url parameters:(NSMutableDictionary *) params;// delegate:(id < NSURLConnectionDelegate >)delegate;
+//+(int) get_announcements: (NSString*)lastid limit:int limit ;//delegate:(id < NSURLConnectionDelegate >)delegate;
++(NSData*)pull_message : (int) offset;
++(NSData*)get_MessageDetail: (int) offset limit:(int) limit from:(NSString*) sid to:(NSString*) eid;
++(NSData*)get_announcements : (NSString*) id limit: (int) limit ;
++(NSData*)get_marketnews : (NSString*) id limit: (int) limit ;
++(void)post_without_return : (NSString*) url parameters:(NSMutableDictionary *) params;
++(int) get_recordcount: (NSMutableDictionary *) params ;//delegate:(id < NSURLConnectionDelegate >)delegate;
++(PageData*) get_pagedata: (NSMutableDictionary *) params;
++(DetailContent*) get_detailcontent: (NSMutableDictionary *) params;
++(bool) IsNetworkAvailable;
++(int) delAllMessage:(NSString*) before;
+//+(bool) IsHostAvailable : (NSString*) url;
++(int) RetrievePassword : (NSString*) user  email:(NSString*) email;
++(int) ChangePassword : (NSString*) newpass user:(NSString*) user oldpass:(NSString*) oldpass;
++(bool) UpdateServiceLocation;
+@end

Fișier diff suprimat deoarece este prea mare
+ 1070 - 0
Apex Mobile/Apex Mobile/RANetwork.m


+ 2 - 2
Apex Mobile/Apex Mobile/ResultViewController.h

@@ -7,9 +7,9 @@
 //
 
 #import <UIKit/UIKit.h>
-#import "Constant.h"
+#import "const.h"
 #import "SimpleGrid.h"
-#import "ApexMobileNetwork.h"
+#import "RANetwork.h"
 #import "PageData.h"
 #import "DetailTabBarController.h"
 #import "PulldownMenu.h"

+ 6 - 6
Apex Mobile/Apex Mobile/ResultViewController.m

@@ -36,11 +36,11 @@
         
         //        PageData* pageData=nil;
         if(self.recordCount<0)
-            self.recordCount=[ApexMobileNetwork get_recordcount: self.params ];
+            self.recordCount=[RANetwork get_recordcount: self.params ];
         if(self.recordCount>0)
         {
-            self.pageData=[ApexMobileNetwork get_pagedata:self.params];
-            //            self.pageData=[ApexMobileNetwork]
+            self.pageData=[RANetwork get_pagedata:self.params];
+            //            self.pageData=[RANetwork]
         }
         
         dispatch_async(dispatch_get_main_queue(), ^{
@@ -160,7 +160,7 @@
                                                            options:0
                                                              error:nil];
         NSString* param = [[NSString alloc] initWithData:jsonData encoding:NSUTF8StringEncoding];
-        ApexMobileAppDelegate *appDelegate = [[UIApplication sharedApplication] delegate];
+        AppDelegate *appDelegate = [[UIApplication sharedApplication] delegate];
         NSString* user = appDelegate.user;
         
         sqlite3 *db =[ApexMobileDB get_db];
@@ -294,7 +294,7 @@
 {
     DebugLog(@"getActions");
     
-    ApexMobileAppDelegate *appDelegate = [[UIApplication sharedApplication] delegate];
+    AppDelegate *appDelegate = [[UIApplication sharedApplication] delegate];
     
     
     NSMutableArray* actions = [[NSMutableArray alloc]init];
@@ -327,7 +327,7 @@
     //    NSMutableDictionary* header = [[NSMutableDictionary alloc] init];
     //    [header setValue:@"aaa" forKey:@"bbb"];
     DebugLog(@"initHeader");
-    ApexMobileAppDelegate *appDelegate = [[UIApplication sharedApplication] delegate];
+    AppDelegate *appDelegate = [[UIApplication sharedApplication] delegate];
     
     sqlite3 *db =[ApexMobileDB get_db];
     NSString *quary = [NSString stringWithFormat:@"select aname,name from fields_info where function_name='%@' and user='%@' and behavior=%d and show=1 order by priority,aname",self.function_name, appDelegate.user,BEHAVIOR_RESULT];

+ 1 - 1
Apex Mobile/Apex Mobile/RetrievePasswordViewController.h

@@ -7,7 +7,7 @@
 //
 
 #import <UIKit/UIKit.h>
-#import "ApexMobileNetwork.h"
+#import "RANetwork.h"
 
 
 @interface RetrievePasswordViewController : UIViewController<UITextFieldDelegate>

+ 1 - 1
Apex Mobile/Apex Mobile/RetrievePasswordViewController.m

@@ -54,7 +54,7 @@
     dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
         
         
-        int ret=[ApexMobileNetwork RetrievePassword:user email:email];
+        int ret=[RANetwork RetrievePassword:user email:email];
         
         dispatch_async(dispatch_get_main_queue(), ^{
             self.mum.hidden=true;

+ 2 - 2
Apex Mobile/Apex Mobile/SearchTableAdapter.h

@@ -8,9 +8,9 @@
 
 #import <Foundation/Foundation.h>
 #import <sqlite3.h>
-#import "ApexMobileAppDelegate.h"
+#import "AppDelegate.h"
 #import "ApexMobileDB.h"
-#import "ApexMobileNetwork.h"
+#import "RANetwork.h"
 //#import "ApexMobileAppDelegate.h"
 //#import "DB_Field.h"
 

+ 1 - 1
Apex Mobile/Apex Mobile/SearchTableAdapter.m

@@ -33,7 +33,7 @@
 {
     
     
-    ApexMobileAppDelegate *appDelegate = [[UIApplication sharedApplication] delegate];
+    AppDelegate *appDelegate = [[UIApplication sharedApplication] delegate];
     //    NSString* required_ver=[objheader objectForKey:@"client_ver"] ;
     //
     //    appDelegate.sessionid = [objheader valueForKey:@"sessionid"];

+ 1 - 1
Apex Mobile/Apex Mobile/ShipingStatusCell.m

@@ -7,7 +7,7 @@
 //
 
 #import "ShipingStatusCell.h"
-#import "Constant.h"
+#import "const.h"
 
 @interface ShipingStatusCell ()
 

+ 1 - 1
Apex Mobile/Apex Mobile/StaticModelistViewController.m

@@ -8,7 +8,7 @@
 
 #import "StaticModelistViewController.h"
 #import "StaticModeTableViewCell.h"
-#import "Constant.h"
+#import "const.h"
 
 @interface StaticModelistViewController ()
 @property (strong, nonatomic) IBOutlet NSLayoutConstraint *topLayout;

+ 1 - 1
Apex Mobile/Apex Mobile/ToolsPanelViewController.h

@@ -7,7 +7,7 @@
 //
 
 #import <UIKit/UIKit.h>
-#import "Constant.h"
+#import "const.h"
 #import "NewsViewController.h"
 #import "SearchViewController.h"
 #import "ChangePasswordViewController.h"

+ 1 - 1
Apex Mobile/Apex Mobile/WebViewController.h

@@ -7,7 +7,7 @@
 //
 
 #import <UIKit/UIKit.h>
-#import "Constant.h"
+#import "const.h"
 @interface WebViewController : UIViewController
 @property (strong, nonatomic) IBOutlet UIWebView *webview;
 @property (strong,nonatomic) NSString* url;

+ 40 - 0
Apex Mobile/Apex Mobile/config.h

@@ -0,0 +1,40 @@
+//
+//  config.h
+//  Apex Mobile
+//
+//  Created by Ray on 31/01/2018.
+//  Copyright © 2018 United Software Applications, Inc. All rights reserved.
+//
+
+#ifndef config_h
+#define config_h
+# ifdef DEBUG
+
+#define test_server
+# endif
+
+
+#ifdef test_server
+#define  URL_UPDATE_AUTH  @"https://ra.apexshipping.com/login.php"
+#define URL_REQUEST_COUNT @"https://ra.apexshipping.com/main.php"
+#define URL_REQUEST_RECORDS @"https://ra.apexshipping.com/main.php"
+#define URL_RETRIEVE_PASS @"https://ra.apexshipping.com/main.php"
+#define URL_REQUEST_DETAIL @"https://ra.apexshipping.com/main.php"
+#define URL_ANNOUNCEMENTS @"https://ra.apexshipping.com/mobile_news.php"
+#define URL_NEWS    @"https://ra.apexshipping.com/mobile_news.php"
+#define URL_LOCATIONS @"https://ra.apexshipping.com/mobile_news.php"
+#define URL_PUSH @"https://ra.apexshipping.com/main.php"
+#define  URL_ERR_LOG  @""
+#else
+#define  URL_UPDATE_AUTH  @"https://ra.apexshipping.com/login.php"
+#define URL_REQUEST_COUNT @"https://ra.apexshipping.com/main.php"
+#define URL_REQUEST_RECORDS @"https://ra.apexshipping.com/main.php"
+#define URL_RETRIEVE_PASS @"https://ra.apexshipping.com/main.php"
+#define URL_REQUEST_DETAIL @"https://ra.apexshipping.com/main.php"
+#define URL_ANNOUNCEMENTS @"https://ra.apexshipping.com/mobile_news.php"
+#define URL_NEWS    @"https://ra.apexshipping.com/mobile_news.php"
+#define URL_LOCATIONS @"https://ra.apexshipping.com/mobile_news.php"
+#define URL_PUSH @"https://ra.apexshipping.com/main.php"
+#define  URL_ERR_LOG  @""
+#endif
+#endif /* config_h */

+ 125 - 0
Apex Mobile/Apex Mobile/const.h

@@ -0,0 +1,125 @@
+//
+//  const.h
+//  Apex Mobile
+//
+//  Created by Ray on 31/01/2018.
+//  Copyright © 2018 United Software Applications, Inc. All rights reserved.
+//
+
+#ifndef const_h
+#define const_h
+
+
+#define DEBUGLOG 1
+#ifdef DEBUGLOG
+#ifdef DEBUG
+//     #define DebugLog( s, ... ) fprintf(stderr,"%s\n",[[NSString stringWithFormat:s, ##__VA_ARGS__] UTF8String])//
+#define DebugLog( s, ... ) fprintf(stderr, "<%p %s:(%d)> %s \n", self, [[[NSString stringWithUTF8String:__FILE__] lastPathComponent]UTF8String], __LINE__, [[NSString stringWithFormat:(s), ##__VA_ARGS__]UTF8String] )
+
+#define blockDebugLog( s, ... ) fprintf(stderr, "<%p %s:(%d)> %s \n",weakself, [[[NSString stringWithUTF8String:__FILE__] lastPathComponent]UTF8String], __LINE__, [[NSString stringWithFormat:(s), ##__VA_ARGS__]UTF8String] )
+
+#else
+#define DebugLog( s, ... )
+
+#define blockDebugLog( s, ... )
+#endif
+#else
+#define DebugLog( s, ... )
+
+#define blockDebugLog( s, ... )
+#endif
+
+#define UIColorFromRGB(rgbValue) [UIColor colorWithRed:((float)((rgbValue & 0xFF0000) >> 16))/255.0 green:((float)((rgbValue & 0xFF00) >> 8))/255.0 blue:((float)(rgbValue & 0xFF))/255.0 alpha:1.0]
+
+#define URL_REMOTE 1
+#define URL_LOCAL 0
+#define URL_NONE 2
+#define URL_RESTORE 3
+
+
+
+#define REFRESH_NONE 0
+#define REFRESH_VIEW 1
+#define REFRESH_DATA 2
+
+
+// 如何处理commoneditor action 类型调用的返回值
+#define  ACTION_SAVE_DATA 0
+#define ACTION_FILL_SECTION 1
+
+#define RESULT_BARCODE_ERROR             -50
+
+
+
+//#define RESULT_NET_NOTAVAILABLE -4
+//#define RESULT_NET_ERROR -3
+//#define RESULT_FALSE 0
+//#define RESULT_VER_LOW -15
+
+
+#define MAX_ROW 100
+#define MAX_COLUMN 100
+
+#define        BEHAVIOR_SEARCH                     0
+#define        BEHAVIOR_RESULT                     1
+
+
+#define           AP_USER_AUTH                      1
+#define            AP_USER_NOT_AUTH                  2
+#define            AP_USER_NOT_EXIST                  3
+#define           AP_SESSION_EXPIRED                  4
+
+#define           AP_MESSAGE_NEW                  5
+#define            AP_MESSAGE_NONE                      6
+
+
+//const int        RESULT_FALSE                    = 0;
+//#define        RESULT_TRUE                          -1
+//const int        RESULT_NET_ERROR                = -3;
+//const int        RESULT_NET_NOTAVAILABLE            = -4;
+//#define        RESULT_ERROR                      -5
+//#define        RESULT_LOCALFILE_ERROR              -7
+//#define        RESULT_USERAUTH_ERROR              -9
+//#define        RESULT_UPDATE_USERAUTH_ERROR      -11
+//#define        RESULT_SESSION_EXPIRED              -13
+
+
+
+#define RESULT_FALSE 0
+#define RESULT_NO_RESPONSE 1
+#define RESULT_TRUE         -1
+#define RESULT_NO_EMAIL_ADDRESS      3
+#define RESULT_NET_SERVER_ERR         -111
+#define RESULT_NET_ERROR             -3
+#define RESULT_NET_NOTAVAILABLE          -4
+#define RESULT_ERROR                 -5
+#define RESULT_LOCALFILE_ERROR             -7
+#define RESULT_USERAUTH_ERROR             -9
+#define RESULT_UPDATE_USERAUTH_ERROR     -11
+#define RESULT_SESSION_EXPIRED              -13
+#define RESULT_VER_LOW                   -15
+#define RESULT_BACKEND_CRASH                   -20
+#define RESULT_RESPONSE_ERROR                   -30
+#define RESULT_TIMEOUT                   99
+
+#define RESULT_LOGIN_DEVICE                   -18
+
+#define RESULT_NO_MODEL                   8
+
+
+#define JSON_TIMEOUT 60
+
+
+#define MSG_NET_NOTAVAILABLE @"No available network, please check your network setting."
+#define MSG_NET_ERROR @"Net Error. Cannot connect to server for now. Please retry later."
+#define MSG_USERAUTH_ERROR @"Username or password is incorrect.Please check."
+#define MSG_VER_LOW @"Current App version is out of date, please update to the latest version."
+#define MSG_ERROR @"Connection failed with Server, please email your IT Admin."//@"Some error occured on server."
+#define MSG_SUCCESS @"Success."
+#define MSG_LOGIN_DEVICE @"You are currently signed in on another device. Please check."
+#define MSG_TIMEOUT @"Request timeout."
+
+#define MSG_OFFLINE_SUBMIT @"Offline order will be submitted when you login online mode and sync with server."
+#define TITLE_OFFLINE_SUBMIT @"Offline Submit"
+
+#endif /* const_h */

+ 2 - 2
Apex Mobile/Apex Mobile/main.m

@@ -8,11 +8,11 @@
 
 #import <UIKit/UIKit.h>
 
-#import "ApexMobileAppDelegate.h"
+#import "AppDelegate.h"
 
 int main(int argc, char * argv[])
 {
     @autoreleasepool {
-        return UIApplicationMain(argc, argv, nil, NSStringFromClass([ApexMobileAppDelegate class]));
+        return UIApplicationMain(argc, argv, nil, NSStringFromClass([AppDelegate class]));
     }
 }

+ 1 - 1
Apex Mobile/SimpleGrid.h

@@ -9,7 +9,7 @@
 #import <UIKit/UIKit.h>
 #import "TouchLabel.h"
 #import "PageData.h"
-#import "Constant.h"
+#import "const.h"
 
 @class SimpleGrid;
 @protocol SimpleGridDelegate <NSObject>

+ 1 - 1
Apex Mobile/SimpleGrid.m

@@ -7,7 +7,7 @@
 //
  
 #import "SimpleGrid.h"
-#import "Constant.h"
+#import "const.h"
 
 
 #define COLOR(R,G,B,A) [UIColor colorWithRed:R/255.0 green:G/255.0 blue:B/255.0 alpha:A]

+ 1 - 1
RedAnt ERP Mobile/common/RAUtils.m

@@ -13,7 +13,7 @@
 #import <sys/mount.h>
 #import "const.h"
 #import "AppDelegate.h"
-#import "Singleton.h"
+//#import "Singleton.h"
 #include <CommonCrypto/CommonDigest.h>
 
 #import "ZipArchive.h"

+ 1 - 1
RedAnt Mobile/RedAnt Mobile/RANetwork.m

@@ -188,7 +188,7 @@
     
     //    NSString* e=[AESCrypt AES128Encrypt:@"密码学中的高级加密标准(Advanced Encryption Standard,AES),又称 高级加密标准Rijndael加密法,是美国联邦政府采用的一种区块加密标准。这个标准用来替代原先的DES,已经被多方分析且广为全世界所使用。经过五年的甄选流程,高级加密标准由美国国家标准与技术研究院 (NIST)于2001年11月26日发布于FIPS PUB 197,并在2002年5月26日成为有效的标准。2006年,高级加密标准已然成为对称密钥加密中最流行的算法之一。 " key:@"usai2010"];
     //    DebugLog(e);
-    //    NSString* d=[AESCrypt decrypt:@"VzB4+lENfbzWX7ggHh2Os1P69l5YBzKmM51yqA37AfoKgPY8bJgdK8M4WvF+wDyOsLWP\/o8H5+bHMivQp1u8wM2QV7SYzgzPwV85QKtYWIzEgLe9T0HO69EdutWz7k1rdAT\/mftsRin0Hy5SHk7txTZT\/zPH5X+FQiExCTFm5Zus39HYvp+VxCX4+kYeymn8B63AUd3mRQyscUvDjfgU2olKR\/TP8PV3g+VQMZxpKfol3P1iOtz3XQlHZV0pM6SAf+SwT0sPfrdn6CZFfNQlrKA9QjMrnBdMeSCquSIWXnmLv6okzvnlJnT0SjvJuUeqNdBC5EZ0ACnhI0MrXVZEsq1EuM9al7oPzvU5EZbjZpmx+fSFIkMzTT8bYClTnG1bsL1MCcU4pSODDorUj8zalA==" password:@"usai2010"];
+    //    NSString* d=[AESCryptget_jsonget_json decrypt:@"VzB4+lENfbzWX7ggHh2Os1P69l5YBzKmM51yqA37AfoKgPY8bJgdK8M4WvF+wDyOsLWP\/o8H5+bHMivQp1u8wM2QV7SYzgzPwV85QKtYWIzEgLe9T0HO69EdutWz7k1rdAT\/mftsRin0Hy5SHk7txTZT\/zPH5X+FQiExCTFm5Zus39HYvp+VxCX4+kYeymn8B63AUd3mRQyscUvDjfgU2olKR\/TP8PV3g+VQMZxpKfol3P1iOtz3XQlHZV0pM6SAf+SwT0sPfrdn6CZFfNQlrKA9QjMrnBdMeSCquSIWXnmLv6okzvnlJnT0SjvJuUeqNdBC5EZ0ACnhI0MrXVZEsq1EuM9al7oPzvU5EZbjZpmx+fSFIkMzTT8bYClTnG1bsL1MCcU4pSODDorUj8zalA==" password:@"usai2010"];
     params = [self prepare_addtional_params:params];
     
     return [super get_json:url parameters:params file:file err_recorder:URL_ERR_LOG result_handler:^NSMutableDictionary *(NSMutableDictionary *jsobj) {

Unele fișiere nu au fost afișate deoarece prea multe fișiere au fost modificate în acest diff