ERP MOBILE

完善两种消息传递方式的调用隔离。

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 = "555923023.744771"
+            timestampString = "555925718.929659"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "226"
@@ -138,11 +138,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/ActiveViewController.m"
-            timestampString = "555923023.744873"
+            timestampString = "555925718.930117"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "319"
-            endingLineNumber = "319"
+            startingLineNumber = "324"
+            endingLineNumber = "324"
             landmarkName = "-OnRefreshUI:"
             landmarkType = "7">
          </BreakpointContent>
@@ -154,11 +154,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/ActiveViewController.m"
-            timestampString = "555923023.744947"
+            timestampString = "555925718.9304529"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "347"
-            endingLineNumber = "347"
+            startingLineNumber = "352"
+            endingLineNumber = "352"
             landmarkName = "-OnReloadData:"
             landmarkType = "7">
          </BreakpointContent>
@@ -170,11 +170,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/ActiveViewController.m"
-            timestampString = "555923023.745012"
+            timestampString = "555925718.9307801"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "373"
-            endingLineNumber = "373"
+            startingLineNumber = "378"
+            endingLineNumber = "378"
             landmarkName = "-OnClearData:"
             landmarkType = "7">
          </BreakpointContent>
@@ -186,11 +186,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/ActiveViewController.m"
-            timestampString = "555923023.745073"
+            timestampString = "555925718.931095"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "353"
-            endingLineNumber = "353"
+            startingLineNumber = "358"
+            endingLineNumber = "358"
             landmarkName = "-OnReloadData:"
             landmarkType = "7">
          </BreakpointContent>
@@ -202,11 +202,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/portfolio/PortfolioViewController.m"
-            timestampString = "555923023.745137"
+            timestampString = "555925718.931403"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "474"
-            endingLineNumber = "474"
+            startingLineNumber = "476"
+            endingLineNumber = "476"
             landmarkName = "-viewDidLoad"
             landmarkType = "7">
          </BreakpointContent>
@@ -218,11 +218,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/portfolio/PortfolioViewController.m"
-            timestampString = "555923023.745185"
+            timestampString = "555925718.931455"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "879"
-            endingLineNumber = "879"
+            startingLineNumber = "881"
+            endingLineNumber = "881"
             landmarkName = "-viewWillAppear:"
             landmarkType = "7">
          </BreakpointContent>
@@ -234,7 +234,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/ActiveViewController.m"
-            timestampString = "555923023.745232"
+            timestampString = "555925718.931502"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "138"
@@ -250,7 +250,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/ActiveViewController.m"
-            timestampString = "555923023.745291"
+            timestampString = "555925718.931783"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "53"
@@ -266,13 +266,13 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/category/CategoryViewController.m"
-            timestampString = "555923023.7453541"
+            timestampString = "555925718.932062"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "1242"
-            endingLineNumber = "1242"
-            landmarkName = "-willRotateToInterfaceOrientation:duration:"
-            landmarkType = "7">
+            startingLineNumber = "1243"
+            endingLineNumber = "1243"
+            landmarkName = "CategoryViewController"
+            landmarkType = "3">
          </BreakpointContent>
       </BreakpointProxy>
       <BreakpointProxy
@@ -282,11 +282,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/category/CategoryViewController.m"
-            timestampString = "555923023.745418"
+            timestampString = "555925718.93212"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "1229"
-            endingLineNumber = "1229"
+            startingLineNumber = "1230"
+            endingLineNumber = "1230"
             landmarkName = "-didRotateFromInterfaceOrientation:"
             landmarkType = "7">
          </BreakpointContent>
@@ -298,12 +298,12 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/category/CategoryViewController.m"
-            timestampString = "555923023.745488"
+            timestampString = "555925718.932169"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "1228"
-            endingLineNumber = "1228"
-            landmarkName = "-didRotateFromInterfaceOrientation:"
+            startingLineNumber = "1229"
+            endingLineNumber = "1229"
+            landmarkName = "-SelectCategory:"
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
@@ -314,11 +314,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/home/HomeViewController.m"
-            timestampString = "555232522.670557"
+            timestampString = "555925718.932222"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "255"
-            endingLineNumber = "255"
+            startingLineNumber = "257"
+            endingLineNumber = "257"
             landmarkName = "-didRotateFromInterfaceOrientation:"
             landmarkType = "7">
          </BreakpointContent>
@@ -330,13 +330,13 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/category/CategoryViewController.m"
-            timestampString = "555923023.745623"
+            timestampString = "555925718.932274"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "1485"
-            endingLineNumber = "1485"
-            landmarkName = "-viewWillAppear:"
-            landmarkType = "7">
+            startingLineNumber = "1486"
+            endingLineNumber = "1486"
+            landmarkName = "CategoryViewController"
+            landmarkType = "3">
          </BreakpointContent>
       </BreakpointProxy>
       <BreakpointProxy
@@ -346,12 +346,12 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/category/CategoryViewController.m"
-            timestampString = "555923023.74568"
+            timestampString = "555925718.932322"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "1208"
-            endingLineNumber = "1208"
-            landmarkName = "-reload"
+            startingLineNumber = "1209"
+            endingLineNumber = "1209"
+            landmarkName = "-operation_reload"
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
@@ -362,11 +362,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/contact/ContactListViewController.m"
-            timestampString = "555583547.035863"
+            timestampString = "555925718.932372"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "256"
-            endingLineNumber = "256"
+            startingLineNumber = "257"
+            endingLineNumber = "257"
             landmarkName = "-operation_loadpage"
             landmarkType = "7">
          </BreakpointContent>
@@ -378,11 +378,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/contact/ContactListViewController.m"
-            timestampString = "555583547.0359221"
+            timestampString = "555925718.9324189"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "260"
-            endingLineNumber = "260"
+            startingLineNumber = "261"
+            endingLineNumber = "261"
             landmarkName = "-operation_loadpage"
             landmarkType = "7">
          </BreakpointContent>
@@ -394,11 +394,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/contact/ContactListViewController.m"
-            timestampString = "555583547.035982"
+            timestampString = "555925718.932463"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "292"
-            endingLineNumber = "292"
+            startingLineNumber = "293"
+            endingLineNumber = "293"
             landmarkName = "-operation_loadpage"
             landmarkType = "7">
          </BreakpointContent>
@@ -410,11 +410,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/contact/ContactListViewController.m"
-            timestampString = "555583547.036034"
+            timestampString = "555925718.932507"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "296"
-            endingLineNumber = "296"
+            startingLineNumber = "297"
+            endingLineNumber = "297"
             landmarkName = "-operation_loadpage"
             landmarkType = "7">
          </BreakpointContent>
@@ -426,11 +426,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/contact/ContactListViewController.m"
-            timestampString = "555583547.036092"
+            timestampString = "555925718.932552"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "334"
-            endingLineNumber = "334"
+            startingLineNumber = "335"
+            endingLineNumber = "335"
             landmarkName = "-operation_loadpage"
             landmarkType = "7">
          </BreakpointContent>
@@ -442,11 +442,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/contact/ContactListViewController.m"
-            timestampString = "555583547.036155"
+            timestampString = "555925718.932595"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "711"
-            endingLineNumber = "711"
+            startingLineNumber = "712"
+            endingLineNumber = "712"
             landmarkName = "-numberOfSectionsInTableView:"
             landmarkType = "7">
          </BreakpointContent>
@@ -458,11 +458,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/contact/ContactListViewController.m"
-            timestampString = "555583547.036209"
+            timestampString = "555925718.932639"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "717"
-            endingLineNumber = "717"
+            startingLineNumber = "718"
+            endingLineNumber = "718"
             landmarkName = "-tableView:numberOfRowsInSection:"
             landmarkType = "7">
          </BreakpointContent>
@@ -490,11 +490,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/home/HomeViewController.m"
-            timestampString = "555232522.671909"
+            timestampString = "555925718.932719"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "681"
-            endingLineNumber = "681"
+            startingLineNumber = "683"
+            endingLineNumber = "683"
             landmarkName = "-tableView:cellForRowAtIndexPath:"
             landmarkType = "7">
          </BreakpointContent>
@@ -522,11 +522,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/category/CategoryViewController.m"
-            timestampString = "555923023.7461261"
+            timestampString = "555925718.9328001"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "1931"
-            endingLineNumber = "1931"
+            startingLineNumber = "1932"
+            endingLineNumber = "1932"
             landmarkName = "-collectionCell:setImageForIndexPath:"
             landmarkType = "7">
          </BreakpointContent>
@@ -538,11 +538,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/category/CategoryViewController.m"
-            timestampString = "555923023.746186"
+            timestampString = "555925718.932849"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "1960"
-            endingLineNumber = "1960"
+            startingLineNumber = "1961"
+            endingLineNumber = "1961"
             landmarkName = "-collectionCell:setImageForIndexPath:"
             landmarkType = "7">
          </BreakpointContent>
@@ -586,12 +586,12 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/category/CategoryViewController.m"
-            timestampString = "555923023.746292"
+            timestampString = "555925718.93302"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "1913"
-            endingLineNumber = "1913"
-            landmarkName = "-collectionCell:setImageForIndexPath:"
+            startingLineNumber = "1914"
+            endingLineNumber = "1914"
+            landmarkName = "-collectionView:cellForItemAtIndexPath:"
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
@@ -602,7 +602,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/MainViewController.m"
-            timestampString = "555923023.746344"
+            timestampString = "555925718.93311"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "439"
@@ -618,11 +618,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/ActiveViewController.m"
-            timestampString = "555923023.746395"
+            timestampString = "555925718.933226"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "413"
-            endingLineNumber = "413"
+            startingLineNumber = "418"
+            endingLineNumber = "418"
             landmarkName = "+Notify:Message:"
             landmarkType = "7">
          </BreakpointContent>
@@ -634,11 +634,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/ActiveViewController.m"
-            timestampString = "555923023.746452"
+            timestampString = "555925718.933535"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "354"
-            endingLineNumber = "354"
+            startingLineNumber = "359"
+            endingLineNumber = "359"
             landmarkName = "-OnReloadData:"
             landmarkType = "7">
          </BreakpointContent>
@@ -650,7 +650,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/categoryMenu_RATree/RAViewController.m"
-            timestampString = "555583547.038188"
+            timestampString = "555925718.933822"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "343"
@@ -666,12 +666,12 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/category/CategoryViewController.m"
-            timestampString = "555923023.746541"
+            timestampString = "555925718.933874"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "2545"
-            endingLineNumber = "2545"
-            landmarkName = "-onDecodedData:"
+            startingLineNumber = "2548"
+            endingLineNumber = "2548"
+            landmarkName = "-alertView:clickedButtonAtIndex:"
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
@@ -682,7 +682,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/sidemenu/ScannerSettingViewController.m"
-            timestampString = "555923023.746594"
+            timestampString = "555925718.933925"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "800"
@@ -698,7 +698,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/ActiveViewController.m"
-            timestampString = "555923023.7466429"
+            timestampString = "555925718.933973"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "132"
@@ -714,7 +714,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/ActiveViewController.m"
-            timestampString = "555923023.746698"
+            timestampString = "555925718.93425"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "131"
@@ -730,7 +730,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/ActiveViewController.m"
-            timestampString = "555923023.7467541"
+            timestampString = "555925718.934527"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "112"
@@ -746,7 +746,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/ActiveViewController.m"
-            timestampString = "555923023.746809"
+            timestampString = "555925718.934805"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "117"
@@ -762,7 +762,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/ActiveViewController.m"
-            timestampString = "555923023.7468621"
+            timestampString = "555925718.935091"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "129"
@@ -810,11 +810,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/home/HomeViewController.m"
-            timestampString = "555835516.8252749"
+            timestampString = "555925718.935427"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "947"
-            endingLineNumber = "947"
+            startingLineNumber = "949"
+            endingLineNumber = "949"
             landmarkName = "-reload_data"
             landmarkType = "7">
          </BreakpointContent>
@@ -826,11 +826,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/search+itemsearch/SearchViewController.m"
-            timestampString = "555923023.747003"
+            timestampString = "555925718.935486"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "189"
-            endingLineNumber = "189"
+            startingLineNumber = "190"
+            endingLineNumber = "190"
             landmarkName = "-viewWillAppear:"
             landmarkType = "7">
          </BreakpointContent>
@@ -842,11 +842,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/search+itemsearch/SearchViewController.m"
-            timestampString = "555923023.747436"
+            timestampString = "555925718.9355561"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "2308"
-            endingLineNumber = "2308"
+            startingLineNumber = "2309"
+            endingLineNumber = "2309"
             landmarkName = "-reload_data"
             landmarkType = "7">
          </BreakpointContent>
@@ -858,7 +858,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/search+itemsearch/SearchViewController.m"
-            timestampString = "555923023.747779"
+            timestampString = "555925718.935609"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "49"
@@ -874,7 +874,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/ActiveViewController.m"
-            timestampString = "555923023.748098"
+            timestampString = "555925718.93566"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "172"
@@ -883,5 +883,37 @@
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "common/ActiveViewController.m"
+            timestampString = "555925718.9359241"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "225"
+            endingLineNumber = "225"
+            landmarkName = "-refresh_on_login"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "common/Functions/search+itemsearch/SearchViewController.m"
+            timestampString = "555925718.93618"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "141"
+            endingLineNumber = "141"
+            landmarkName = "-end_select:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
    </Breakpoints>
 </Bucket>

RedAnt ERP Mobile/common/ActiveViewController.h

@@ -25,8 +25,9 @@
 @interface ActiveViewController : UIViewController <ActiveViewController,ScannerEventsFeedback>
 #else
 @interface ActiveViewController : UIViewController <ActiveViewController>
-#endif
 -(void) reload_container_getdata:(bool) update_data;
+#endif
+
 -(void) logout;
 -(void) refresh_on_login;
 

RedAnt ERP Mobile/common/ActiveViewController.m

@@ -223,6 +223,9 @@
 }
 -(void) refresh_on_login
 {
+    
+    // useless ??? not sure
+    
     UIApplication * app = [UIApplication sharedApplication];
     AppDelegate *appDelegate = (AppDelegate *)[app delegate];
 #ifndef RA_NOTIFICATION
@@ -234,14 +237,19 @@
         self.refresh_type = REFRESH_DATA;
 #endif
 }
+#ifndef RA_NOTIFICATION
 -(void) reload_container_getdata:(bool) update_data
 {
     self.refresh_type=REFRESH_NONE;
     
 }
+#endif
 -(void)refresh_btn_click:(UILongPressGestureRecognizer*)gestureRecognizer
 {
-    [self reload_container_getdata:true];
+    if([self respondsToSelector:@selector(reload_data)])
+       [self reload_data];
+//    [self reload_container_getdata:true];
+    
 }
 
 /*

RedAnt ERP Mobile/common/Functions/MainViewController.m

@@ -1155,8 +1155,11 @@
     self.itemSearchViewController.p_price = nil;
     self.itemSearchViewController.p_QTY = nil;
     self.itemSearchViewController.p_bestseller = nil;
+#ifdef RA_NOTIFICATION
+    [ActiveViewController Notify:@"ItemSearchViewController" Message:RA_NOTIFICATION_RELOAD_DATA];
+#else
     [self.itemSearchViewController reload_container_getdata:true];
-    
+#endif
     
     //    .categoryString = [@"Category" stringByAppendingString:[self categoryString:categoryid node:appDelegate.categoryMenu level:0]];
     //    self.categoryViewController.cagegoryLabel.text =self.categoryViewController.categoryString;
@@ -1202,7 +1205,12 @@
     
     self.categoryViewController.modelname = nil;
     self.categoryViewController.modeldescrip = nil;
+#ifdef RA_NOTIFICATION
+    [ActiveViewController Notify:@"CategoryViewController" Message:RA_NOTIFICATION_RELOAD_DATA];
+#else
     [self.categoryViewController reload_container_getdata:true];
+#endif
+    
     [self.categoryViewController showCategory];
     if([self.current_VC isKindOfClass:[CategoryViewController class]])
         

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

@@ -426,7 +426,7 @@
     
     [self begin_edit];
 }
-
+#ifndef RA_NOTIFICATION
 -(void) reload_container_getdata:(bool) update_data
 {
     
@@ -439,12 +439,14 @@
         [self refresh_total];
     }
 }
-
+#endif
 
 
 -(void) showHidePrice
 {
+#ifndef RA_NOTIFICATION
     [self reload_container_getdata:false];
+#endif
     //    [self refresh_total];
     
 }

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

@@ -133,7 +133,8 @@
     if(self.disable_refresh)
     {
         self.disable_refresh = false;
-        [self reload_container_getdata:true];
+//        [self reload_container_getdata:true];
+        [self reload];
     }
     else
         [self.collectionview reloadData];
@@ -2083,6 +2084,7 @@
     
     return UIEdgeInsetsMake(10, 10, 10, 10);
 }
+#ifndef RA_NOTIFICATION
 -(void) reload_container_getdata:(bool) update_data
 {
     
@@ -2111,6 +2113,7 @@
     //        }
     //    }
 }
+#endif
 #pragma mark --UICollectionViewDelegate
 
 -(void) showDetailat:(NSString*) item_id category_id:(NSString*) category_id name:(NSString *)name index:(long)index

RedAnt ERP Mobile/common/Functions/contact/ContactListViewController.m

@@ -227,6 +227,7 @@
     
     [[self navigationController] setNavigationBarHidden:!self.showNavibar animated:NO];
 }
+#ifndef RA_NOTIFICATION
 -(void) reload_container_getdata:(bool) update_data
 {
     [super reload_container_getdata:update_data];
@@ -246,7 +247,7 @@
     
     
 }
-
+#endif
 - (void)reRefreshView {
     [self.table reloadData];
 }

RedAnt ERP Mobile/common/Functions/home/HomeViewController.m

@@ -32,6 +32,7 @@
 {
     // do not refresh on login;
 }
+#ifndef RA_NOTIFICATION
 -(void) reload_container_getdata:(bool)update_data
 {
     [super reload_container_getdata:update_data];
@@ -40,6 +41,7 @@
     else
     [self.homeTable reloadData];
 }
+#endif
 - (id)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil
 {
     self = [super initWithNibName:nibNameOrNil bundle:nibBundleOrNil];

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

@@ -57,6 +57,7 @@
 {
         CALayer     *_layer;
 }
+#ifndef RA_NOTIFICATION
 -(void) reload_container_getdata:(bool) update_data
 {
     
@@ -69,7 +70,7 @@
 //        [self refresh_total];
     }
 }
-
+#endif
 -(void)manually_refresh
 {
     UIRefreshControl *reF = (UIRefreshControl *)[self.view viewWithTag:300];

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

@@ -72,7 +72,7 @@
     [self.navigationController pushViewController:ViewController animated:YES];
     
 }
-
+#ifndef RA_NOTIFICATION
 -(void) reload_container_getdata:(bool) update_data
 {
     
@@ -85,7 +85,7 @@
        
     }
 }
-
+#endif
 - (void)onBackClick:(UIButton *)sender {
     
     

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

@@ -68,6 +68,7 @@
     [self.table_order reloadData];
     self.status_cadedate = nil;
 }
+#ifndef RA_NOTIFICATION
 -(void) reload_container_getdata:(bool) update_data
 {
     [super reload_container_getdata:update_data];
@@ -99,10 +100,12 @@
         self.btn_newOrder.enabled = false;
     }
 }
+#endif
 -(void) showHidePrice
 {
+#ifndef RA_NOTIFICATION
     [self reload_container_getdata:false];
-    
+#endif
 }
 
 - (void)viewDidLoad {

RedAnt ERP Mobile/common/Functions/portfolio/PDFListViewController.m

@@ -74,6 +74,7 @@
     [super didReceiveMemoryWarning];
     // Dispose of any resources that can be recreated.
 }
+#ifndef RA_NOTIFICATION
 -(void) reload_container_getdata:(bool) update_data
 {
     [super reload_container_getdata:update_data];
@@ -87,7 +88,7 @@
     else
         [self.table reloadData];
 }
-
+#endif
 - (void)viewWillAppear:(BOOL)animated
 {
     [super viewWillAppear:animated];

RedAnt ERP Mobile/common/Functions/portfolio/PortfolioViewController.m

@@ -53,7 +53,7 @@
     }
     return self;
 }
-
+#ifndef RA_NOTIFICATION
 -(void) reload_container_getdata:(bool) update_data
 {
     [super reload_container_getdata:update_data];
@@ -81,11 +81,13 @@
         self.btnCreatePort.enabled = false;
     }
 }
+#endif
 -(void) showHidePrice
 {
+#ifndef RA_NOTIFICATION
     [self reload_container_getdata:false];
    // [self refresh_total];
-    
+#endif
 }
 - (IBAction)onAddtoCart:(id)sender {
     UIApplication * app = [UIApplication sharedApplication];

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

@@ -46,7 +46,7 @@
     }
     return _dataOperationQueue;
 }
-
+#ifndef RA_NOTIFICATION
 -(void) reload_container_getdata:(bool)update_data
 {
     
@@ -80,6 +80,7 @@
     
 
 }
+#endif
 -(void)begin_select
 {
 //    self.addCartBtn.enabled=false;
@@ -143,7 +144,8 @@
     if(self.disable_refresh)
     {
         self.disable_refresh = false;
-        [self reload_container_getdata:true];
+//        [self reload_container_getdata:true];
+        [self reload_data];
     }
     else
         [self.collectionview reloadData];
@@ -2258,6 +2260,7 @@
 }
 -(void) reload_data
 {
+    self.offset = 0;
     [self reload];
 }
 @end

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

@@ -43,7 +43,7 @@
     }
     return _dataOperationQueue;
 }
-#ifdef RA_NOTIFICATION
+#ifndef RA_NOTIFICATION
 -(void) reload_container_getdata:(bool)update_data
 {
     if(self.disable_refresh)
@@ -141,7 +141,8 @@
     if(self.disable_refresh)
     {
         self.disable_refresh = false;
-        [self reload_container_getdata:true];
+//        [self reload_container_getdata:true];
+        [self reload_data];
     }
     else
         [self.collectionview reloadData];

RedAnt ERP Mobile/common/Functions/watchlist/WatchListViewController.m

@@ -66,7 +66,7 @@
     return self;
 }
 
-
+#ifndef RA_NOTIFICATION
 -(void) reload_container_getdata:(bool) update_data
 {
     [super reload_container_getdata:update_data];
@@ -75,6 +75,7 @@
     else
         [self.itemListTable reloadData];
 }
+#endif
 - (IBAction)onAddtoCart:(id)sender {
     [CartUtils add_to_cart:self selectorholder:self selector:@selector(addtocart)];
     return;

RedAnt ERP Mobile/common/categoryMenu_RATree/RAViewController.m

@@ -40,7 +40,7 @@
 
 
 
-
+#ifndef RA_NOTIFICATION
 -(void) reload_container_getdata:(bool) update_data
 {
     
@@ -88,7 +88,7 @@
     
     
 }
-
+#endif
 
 -(void) SetMenu:(NSDictionary*) menu
 {

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