1.修复Cart和Order Detail Offline判断错误。

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

@@ -2,4 +2,22 @@
 <Bucket
    type = "0"
    version = "2.0">
+   <Breakpoints>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "common/Functions/cart/CartViewController.m"
+            timestampString = "529490015.61261"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "1914"
+            endingLineNumber = "1914"
+            landmarkName = "-tableView:editActionsForRowAtIndexPath:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+   </Breakpoints>
 </Bucket>

RedAnt ERP Mobile/common/Functions/cart/CartViewController.m

@@ -2351,28 +2351,32 @@
 
         NSMutableArray* arr=[@[] mutableCopy];
 
+        BOOL condition = outOfStock;
 #ifdef BUILD_NPD
 #ifdef OFFLINE_MODE
-        if (!appDelegate.offline_mode && outOfStock) {
+        condition = !appDelegate.offline_mode && outOfStock;
+#endif
+        if (condition) {
             [arr addObject:notifyMeAction];
         }
 #endif
-#endif
         
 #ifdef BUILD_HOMER
 #ifdef OFFLINE_MODE
-        if (!appDelegate.offline_mode && outOfStock) {
+        condition = !appDelegate.offline_mode && outOfStock;
+#endif
+        if (condition) {
             [arr addObject:notifyMeAction];
         }
 #endif
-#endif
         
 #ifdef BUILD_GATIT
 #ifdef OFFLINE_MODE
-        if (!appDelegate.offline_mode && outOfStock) {
+        condition = !appDelegate.offline_mode && outOfStock;
+#endif
+        if (condition) {
             [arr addObject:notifyMeAction];
         }
-#endif
 #endif
         
         if(product_id.length>0)

RedAnt ERP Mobile/common/Functions/order/OrderDetailViewController.m

@@ -1234,6 +1234,8 @@
                     BOOL condition = offline_edit;
 #ifdef OFFLINE_MODE
                     condition = condition || appDelegate.offline_mode==false;
+#else
+                    condition = YES;
 #endif
                     if(condition)
                     {
@@ -1258,6 +1260,8 @@
                         BOOL condition = offline_edit;
 #ifdef OFFLINE_MODE
                         condition = condition || appDelegate.offline_mode==false;
+#else
+                        condition = YES;
 #endif
                         if (condition)
                         {
@@ -2214,6 +2218,8 @@
             BOOL condition = offline_edit;
 #ifdef OFFLINE_MODE
             condition = condition || appDelegate.offline_mode==false;
+#else
+            condition = YES;
 #endif
             if (condition)
             {
@@ -2225,6 +2231,8 @@
             BOOL condition = offline_edit;
 #ifdef OFFLINE_MODE
             condition = condition || appDelegate.offline_mode==false;
+#else
+            condition = YES;
 #endif
             if (condition)
             {
@@ -2585,6 +2593,8 @@
             BOOL condition = offline_edit;
 #ifdef OFFLINE_MODE
             condition = condition || appDelegate.offline_mode==false;
+#else
+            condition = YES;
 #endif
             if (condition)
             {
@@ -2596,6 +2606,8 @@
             BOOL condition = offline_edit;
 #ifdef OFFLINE_MODE
             condition = condition || appDelegate.offline_mode==false;
+#else
+            condition = YES;
 #endif
             if (condition)
             {
@@ -2956,6 +2968,8 @@
             BOOL condition = offline_edit;
 #ifdef OFFLINE_MODE
             condition = condition || appDelegate.offline_mode==false;
+#else
+            condition = YES;
 #endif
             if (condition)
             {
@@ -2967,6 +2981,8 @@
             BOOL condition = offline_edit;
 #ifdef OFFLINE_MODE
             condition = condition || appDelegate.offline_mode==false;
+#else
+            condition = YES;
 #endif
             if (condition)
             {
@@ -3329,6 +3345,8 @@
                     BOOL condition = offline_edit;
 #ifdef OFFLINE_MODE
                     condition = condition || appDelegate.offline_mode==false;
+#else
+                    condition = YES;
 #endif
                     if (condition)
                     {
@@ -3340,6 +3358,8 @@
                     BOOL condition = offline_edit;
 #ifdef OFFLINE_MODE
                     condition = condition || appDelegate.offline_mode==false;
+#else
+                    condition = YES;
 #endif
                     if (condition)
                         {

RedAnt ERP Mobile/common/Functions/order/OrderListViewController.m

@@ -1748,6 +1748,8 @@ commitEditingStyle:(UITableViewCellEditingStyle)editingStyle  forRowAtIndexPath:
         BOOL condition = offline_edit;
 #ifdef OFFLINE_MODE
         condition = condition || appDelegate.offline_mode==false;
+#else
+        condition = YES;
 #endif
         if (condition)
             return UITableViewCellEditingStyleDelete;

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

@@ -2293,7 +2293,6 @@
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
-					"-l\"AFNetworking\"",
 					"-framework",
 					"\"CoreGraphics\"",
 					"-framework",
@@ -2336,7 +2335,6 @@
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
-					"-l\"AFNetworking\"",
 					"-framework",
 					"\"CoreGraphics\"",
 					"-framework",

RedAnt ERP Mobile/iSales-HOMER.xcodeproj/project.pbxproj

@@ -2307,7 +2307,6 @@
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
-					"-l\"AFNetworking\"",
 					"-framework",
 					"\"CoreGraphics\"",
 					"-framework",
@@ -2350,7 +2349,6 @@
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
-					"-l\"AFNetworking\"",
 					"-framework",
 					"\"CoreGraphics\"",
 					"-framework",

RedAnt ERP Mobile/iSales-HOMER/config.h

@@ -20,7 +20,7 @@
 #define MPACK
 
 # ifdef DEBUG
-//#define test_server
+#define test_server
 # endif
 
 #define exception_switch 1

RedAnt ERP Mobile/iSales-NPD.xcodeproj/project.pbxproj

@@ -2323,7 +2323,6 @@
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
-					"-l\"AFNetworking\"",
 					"-framework",
 					"\"CoreGraphics\"",
 					"-framework",
@@ -2366,7 +2365,6 @@
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
-					"-l\"AFNetworking\"",
 					"-framework",
 					"\"CoreGraphics\"",
 					"-framework",

RedAnt ERP Mobile/iSales-NPD/config.h

@@ -11,7 +11,7 @@
 #define BUILD_NPD
 
 # ifdef DEBUG
-#define test_server
+//#define test_server
 # endif
 
 #define exception_switch 1