Ray Zhang 4 лет назад
Родитель
Сommit
ed702e9926

+ 2 - 2
RA TradeFiling/RA TradeFiling.xcodeproj/project.pbxproj

@@ -2121,7 +2121,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 49981;
+				CURRENT_PROJECT_VERSION = 50030;
 				DEVELOPMENT_TEAM = HXWLAA5YN5;
 				GCC_OPTIMIZATION_LEVEL = 0;
 				INFOPLIST_FILE = "RA TradeFiling/Info.plist";
@@ -2142,7 +2142,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 49981;
+				CURRENT_PROJECT_VERSION = 50030;
 				DEVELOPMENT_TEAM = HXWLAA5YN5;
 				GCC_OPTIMIZATION_LEVEL = s;
 				INFOPLIST_FILE = "RA TradeFiling/Info.plist";

BIN
RA TradeFiling/RA TradeFiling.xcodeproj/project.xcworkspace/xcuserdata/ruizhang.xcuserdatad/UserInterfaceState.xcuserstate


+ 20 - 4
RA TradeFiling/RA TradeFiling.xcodeproj/xcuserdata/ruizhang.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -472,7 +472,7 @@
          BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
          <BreakpointContent
             uuid = "0382CA08-AD50-4ABB-9E96-41E927377CAE"
-            shouldBeEnabled = "No"
+            shouldBeEnabled = "Yes"
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "../common/customUI/commoneditor/CommonEditorViewController.m"
@@ -520,7 +520,7 @@
          BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
          <BreakpointContent
             uuid = "0CB7C988-78C9-4BFB-A945-0A52124549E0"
-            shouldBeEnabled = "Yes"
+            shouldBeEnabled = "No"
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "RA TradeFiling/TFEditor/TFEditorViewController.m"
@@ -536,7 +536,7 @@
          BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
          <BreakpointContent
             uuid = "EBAFD565-EC6A-43EF-AAA4-7645C22E991B"
-            shouldBeEnabled = "Yes"
+            shouldBeEnabled = "No"
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "RA TradeFiling/TFEditor/TFEditorViewController.m"
@@ -552,7 +552,7 @@
          BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
          <BreakpointContent
             uuid = "9ED723BF-A10C-49CF-B15C-FBD4CB06EB2D"
-            shouldBeEnabled = "Yes"
+            shouldBeEnabled = "No"
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "../common/customUI/commoneditor/CommonEditorViewController.m"
@@ -628,5 +628,21 @@
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "01CA9036-089B-4365-A824-A3011E04C4FA"
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "../common/customUI/commoneditor/CommonEditorViewController.m"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "5545"
+            endingLineNumber = "5545"
+            landmarkName = "-setEnumValue:indexPath:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
    </Breakpoints>
 </Bucket>

+ 3 - 2
common/customUI/commoneditor/CommonEditorViewController.m

@@ -5026,7 +5026,8 @@ if(!self.alert.isBeingDismissed)
             if(signimg!=nil)
             {
                 AppDelegate *appDelegate = (AppDelegate*)[[UIApplication sharedApplication] delegate];
-                if(RASingleton.sharedInstance.enable_OfflineOrder)
+#ifdef SCANNER_ORDER
+//                if(RASingleton.sharedInstance.enable_OfflineOrder)
                 {
                     
                    
@@ -5081,7 +5082,7 @@ if(!self.alert.isBeingDismissed)
                     }
                     return;
                 }
-                
+#endif
 #ifdef OFFLINE_MODE
 
                 BOOL offline_mode = [[RASingleton.sharedInstance globalParameterForKey:@"offline_mode"] boolValue];

+ 2 - 0
common/upload/RAUploadManager.m

@@ -501,6 +501,7 @@ static RAUploadManager *sharedInstance;
 //}
 -(void) saveTasks
 {
+    //
         @synchronized(self) {
     NSUserDefaults *defaults =[NSUserDefaults standardUserDefaults];
     
@@ -515,6 +516,7 @@ static RAUploadManager *sharedInstance;
 //    }
     [defaults setObject:self.arr_queue forKey:@"upload_queue"];
     [defaults synchronize];
+            NSLog(@"save upload queue  %@",self.arr_queue);
         }
 }
 -(void) loadTasks