ERP MOBILE

修复首次打开search时错误加载的bug

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

@@ -122,7 +122,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/ActiveViewController.m"
-            timestampString = "555903588.326942"
+            timestampString = "555923023.744771"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "226"
@@ -138,7 +138,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/ActiveViewController.m"
-            timestampString = "555903588.327028"
+            timestampString = "555923023.744873"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "319"
@@ -154,7 +154,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/ActiveViewController.m"
-            timestampString = "555903588.327094"
+            timestampString = "555923023.744947"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "347"
@@ -170,7 +170,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/ActiveViewController.m"
-            timestampString = "555903588.3271509"
+            timestampString = "555923023.745012"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "373"
@@ -186,7 +186,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/ActiveViewController.m"
-            timestampString = "555903588.327208"
+            timestampString = "555923023.745073"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "353"
@@ -202,7 +202,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/portfolio/PortfolioViewController.m"
-            timestampString = "555903588.3272671"
+            timestampString = "555923023.745137"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "474"
@@ -218,7 +218,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/portfolio/PortfolioViewController.m"
-            timestampString = "555903588.327317"
+            timestampString = "555923023.745185"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "879"
@@ -234,7 +234,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/ActiveViewController.m"
-            timestampString = "555903588.327363"
+            timestampString = "555923023.745232"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "138"
@@ -250,7 +250,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/ActiveViewController.m"
-            timestampString = "555903588.32742"
+            timestampString = "555923023.745291"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "53"
@@ -266,7 +266,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/category/CategoryViewController.m"
-            timestampString = "555903588.327477"
+            timestampString = "555923023.7453541"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "1242"
@@ -282,7 +282,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/category/CategoryViewController.m"
-            timestampString = "555903588.327529"
+            timestampString = "555923023.745418"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "1229"
@@ -298,7 +298,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/category/CategoryViewController.m"
-            timestampString = "555903588.3275779"
+            timestampString = "555923023.745488"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "1228"
@@ -330,7 +330,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/category/CategoryViewController.m"
-            timestampString = "555903588.327667"
+            timestampString = "555923023.745623"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "1485"
@@ -346,7 +346,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/category/CategoryViewController.m"
-            timestampString = "555903588.327721"
+            timestampString = "555923023.74568"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "1208"
@@ -522,11 +522,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/category/CategoryViewController.m"
-            timestampString = "555903588.328023"
+            timestampString = "555923023.7461261"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "1929"
-            endingLineNumber = "1929"
+            startingLineNumber = "1931"
+            endingLineNumber = "1931"
             landmarkName = "-collectionCell:setImageForIndexPath:"
             landmarkType = "7">
          </BreakpointContent>
@@ -538,11 +538,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/category/CategoryViewController.m"
-            timestampString = "555903588.328072"
+            timestampString = "555923023.746186"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "1958"
-            endingLineNumber = "1958"
+            startingLineNumber = "1960"
+            endingLineNumber = "1960"
             landmarkName = "-collectionCell:setImageForIndexPath:"
             landmarkType = "7">
          </BreakpointContent>
@@ -586,11 +586,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/category/CategoryViewController.m"
-            timestampString = "555903588.328173"
+            timestampString = "555923023.746292"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "1911"
-            endingLineNumber = "1911"
+            startingLineNumber = "1913"
+            endingLineNumber = "1913"
             landmarkName = "-collectionCell:setImageForIndexPath:"
             landmarkType = "7">
          </BreakpointContent>
@@ -602,7 +602,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/MainViewController.m"
-            timestampString = "555903588.328241"
+            timestampString = "555923023.746344"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "439"
@@ -618,7 +618,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/ActiveViewController.m"
-            timestampString = "555903588.32829"
+            timestampString = "555923023.746395"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "413"
@@ -634,7 +634,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/ActiveViewController.m"
-            timestampString = "555903588.3283401"
+            timestampString = "555923023.746452"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "354"
@@ -666,11 +666,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/category/CategoryViewController.m"
-            timestampString = "555903588.3284349"
+            timestampString = "555923023.746541"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "2543"
-            endingLineNumber = "2543"
+            startingLineNumber = "2545"
+            endingLineNumber = "2545"
             landmarkName = "-onDecodedData:"
             landmarkType = "7">
          </BreakpointContent>
@@ -682,11 +682,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/sidemenu/ScannerSettingViewController.m"
-            timestampString = "555583547.0383511"
+            timestampString = "555923023.746594"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "798"
-            endingLineNumber = "798"
+            startingLineNumber = "800"
+            endingLineNumber = "800"
             landmarkName = "-onDecodedData:"
             landmarkType = "7">
          </BreakpointContent>
@@ -698,7 +698,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/ActiveViewController.m"
-            timestampString = "555903588.328511"
+            timestampString = "555923023.7466429"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "132"
@@ -714,7 +714,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/ActiveViewController.m"
-            timestampString = "555903588.328563"
+            timestampString = "555923023.746698"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "131"
@@ -730,7 +730,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/ActiveViewController.m"
-            timestampString = "555903588.328614"
+            timestampString = "555923023.7467541"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "112"
@@ -746,7 +746,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/ActiveViewController.m"
-            timestampString = "555903588.328663"
+            timestampString = "555923023.746809"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "117"
@@ -762,7 +762,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/ActiveViewController.m"
-            timestampString = "555903588.3287131"
+            timestampString = "555923023.7468621"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "129"
@@ -819,5 +819,69 @@
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "common/Functions/search+itemsearch/SearchViewController.m"
+            timestampString = "555923023.747003"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "189"
+            endingLineNumber = "189"
+            landmarkName = "-viewWillAppear:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "common/Functions/search+itemsearch/SearchViewController.m"
+            timestampString = "555923023.747436"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "2308"
+            endingLineNumber = "2308"
+            landmarkName = "-reload_data"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "common/Functions/search+itemsearch/SearchViewController.m"
+            timestampString = "555923023.747779"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "49"
+            endingLineNumber = "49"
+            landmarkName = "-reload_container_getdata:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "common/ActiveViewController.m"
+            timestampString = "555923023.748098"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "172"
+            endingLineNumber = "172"
+            landmarkName = "-viewWillAppear:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
    </Breakpoints>
 </Bucket>

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

@@ -929,7 +929,9 @@
 - (void)viewDidLoad
 {
     [super viewDidLoad];
+#ifdef RA_NOTIFICATION
     self.support_scanner = true;
+#endif
     self.edit_select_arr= [[NSMutableArray alloc] init];
     self.label_net_err.layer.borderColor = [UIColor darkGrayColor].CGColor;
     self.label_net_err.layer.borderWidth = 2.0;

RedAnt ERP Mobile/common/Functions/category/CategoryViewController.m

@@ -1510,7 +1510,9 @@
 {
     [super viewDidLoad];
     
+#ifdef RA_NOTIFICATION
     self.support_scanner = true;
+#endif
     
     self.toOrientation = [[UIApplication sharedApplication] statusBarOrientation];
     

RedAnt ERP Mobile/common/Functions/modelDetail/DetailViewController.m

@@ -280,7 +280,9 @@ self.isrefreshing=false;
     
     
     [super viewDidLoad];
+#ifdef RA_NOTIFICATION
     self.support_scanner = true;
+#endif
     [self registeObserver];
     self.refresh_type =  REFRESH_VIEW;
     

RedAnt ERP Mobile/common/Functions/search+itemsearch/SearchViewController.m

@@ -43,7 +43,7 @@
     }
     return _dataOperationQueue;
 }
-
+#ifdef RA_NOTIFICATION
 -(void) reload_container_getdata:(bool)update_data
 {
     if(self.disable_refresh)
@@ -74,6 +74,7 @@
 //        }
 //    }
 }
+#endif
 -(void)begin_select
 {
     self.addWishBtn.enabled = true;
@@ -203,7 +204,9 @@
 
 - (void)viewDidLoad {
     [super viewDidLoad];
+#ifdef RA_NOTIFICATION
     self.support_scanner = true;
+#endif
     
 #if defined(BUILD_HOMER) || defined(BUILD_GATIT)
     self.switch_matchfull.hidden = true;
@@ -317,6 +320,7 @@
     //            tap.minimumPressDuration = 0.8; //定义按的时间
     [self.label_net_err addGestureRecognizer:tap];
     self.refresh_type = REFRESH_VIEW;
+    self.notification_refreshLevel = NotificationRefreshLevelView;
 }
 -(void)manually_refresh
 {
@@ -2302,6 +2306,9 @@
 }
 -(void) reload_data
 {
+    if(self.disable_refresh)
+        return;
+    self.offset = 0;
     [self reload];
 }
 @end

RedAnt ERP Mobile/common/Functions/sidemenu/ScannerSettingViewController.m

@@ -43,7 +43,9 @@
 
 - (void)viewDidLoad {
     [super viewDidLoad];
+#ifdef RA_NOTIFICATION
     self.support_scanner = true;
+#endif
     self.edgesForExtendedLayout = UIRectEdgeNone ;
     
     UIBarButtonItem *closeButton = [[UIBarButtonItem alloc] initWithImage:[[UIImage imageNamed:@"close"] imageWithRenderingMode:UIImageRenderingModeAutomatic]

RedAnt ERP Mobile/iSales-UWAVER/config.h

@@ -11,7 +11,7 @@
 #define BUILD_UWAVER
 #define BACKORDER_PROCESS // 允许backorder process
 
-#define RA_NOTIFICATION
+//#define RA_NOTIFICATION
 
 # ifdef DEBUG
 //#define test_server