NPD MOBILE

修复 Contact list 点行上 assign 按钮 切换窗口不对的问题

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

@@ -454,7 +454,7 @@
       <BreakpointProxy
          BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
          <BreakpointContent
-            shouldBeEnabled = "Yes"
+            shouldBeEnabled = "No"
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/CartUtils.m"
@@ -579,5 +579,53 @@
             landmarkType = "0">
          </BreakpointContent>
       </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "common/Functions/MainViewController.m"
+            timestampString = "529915479.289486"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "2680"
+            endingLineNumber = "2680"
+            landmarkName = "-neworderforCart"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "common/Functions/MainViewController.m"
+            timestampString = "529915479.289589"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "2664"
+            endingLineNumber = "2664"
+            landmarkName = "-neworderforCart"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "common/Functions/contact/ContactListViewController.m"
+            timestampString = "529915479.289654"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "531"
+            endingLineNumber = "531"
+            landmarkName = "-onAssignClick:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
    </Breakpoints>
 </Bucket>

RedAnt ERP Mobile/common/Functions/MainViewController.m

@@ -1053,7 +1053,7 @@
     
     [self transitionFromViewController:fromController
                       toViewController:toController
-                              duration:0.2
+                              duration:0.0
                                options:direction | UIViewAnimationOptionCurveEaseIn
                             animations:nil
                             completion:^(BOOL finished) {
@@ -2683,7 +2683,7 @@
                     appDelegate.order_status = [[return_json valueForKey:@"orderStatus"] intValue];
                     
                     self.previous_VC = self.current_VC;
-//                    [self flipFromViewController:self.current_VC toViewController:self.cartViewController withDirection:UIViewAnimationOptionTransitionCrossDissolve];
+                    [self flipFromViewController:self.current_VC toViewController:self.cartViewController withDirection:UIViewAnimationOptionTransitionCrossDissolve];
 
                     [self reloadCart:true immediately:false];
                     

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

@@ -528,7 +528,7 @@ self.label_net_err.hidden=true;
                 
                 data_init[@"is_subaction"]=self.is_subaction;
                 data_init[@"subaction_tag"]= self.subaction_tag;
-//                [self.navigationController popViewControllerAnimated:false];
+                [self.navigationController popToRootViewControllerAnimated:false];
                 
                 
                 [self.table reloadData];