فهرست منبع

增加Request Login接口。
部分ViewController类在继承的方法中增加super调用。

Pen Li 9 سال پیش
والد
کامیت
011d721ce4

BIN
RedAnt ERP Mobile/RedAnt ERP Mobile.xcworkspace/xcuserdata/macmini1.xcuserdatad/UserInterfaceState.xcuserstate


+ 2 - 0
RedAnt ERP Mobile/common/CommonEditor/CommonEditorViewController.m

@@ -101,6 +101,7 @@
 }
 -(void) viewWillAppear:(BOOL)animated
 {
+    [super viewWillAppear:animated];
     [self start_urgency_timer];
     [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(keyboardWillShow:) name:UIKeyboardWillShowNotification object:nil];
     [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(keyboardWillHide:) name:UIKeyboardWillHideNotification object:nil];
@@ -116,6 +117,7 @@
 }
 -(void) viewWillDisappear:(BOOL)animated
 {
+    [super viewWillDisappear:animated];
     [[NSNotificationCenter defaultCenter] removeObserver:self];
     [self cancel_urgency_timer];
 }

+ 1 - 0
RedAnt ERP Mobile/common/CommonEditor/EnumSelectViewController.m

@@ -124,6 +124,7 @@
 }
 - (void)viewWillDisappear:(BOOL)animated
 {
+    [super viewWillDisappear:animated];
     if(self.dirty == false)
     return;
     if (self.delegate && [self.delegate respondsToSelector:@selector(EnumValueChanged:indexPath:)]) {

+ 1 - 0
RedAnt ERP Mobile/common/CommonGridViewController.m

@@ -75,6 +75,7 @@
 }
 -(void)viewDidDisappear:(BOOL)animated
 {
+    [super viewDidDisappear:animated];
      AppDelegate *app = (AppDelegate *)[[UIApplication sharedApplication] delegate];
      [app.window removeGestureRecognizer:self.tapGesture];
 }

+ 1 - 1
RedAnt ERP Mobile/common/Functions/MainViewController.m

@@ -174,7 +174,7 @@
 -(void) viewWillAppear:(BOOL)animated
 {
     
-    
+    [super viewWillAppear:animated];
     //  [self.label_ccount.layer setMasksToBounds:YES];
     
     UIApplication * app = [UIApplication sharedApplication];

+ 1 - 0
RedAnt ERP Mobile/common/Functions/camscan/ScannerViewController.m

@@ -151,6 +151,7 @@
 }
 - (void)viewWillAppear:(BOOL)animated
 {
+    [super viewWillAppear:animated];
     [[self navigationController] setNavigationBarHidden:NO animated:NO];
     
     

+ 1 - 0
RedAnt ERP Mobile/common/Functions/modelDetail/DetailViewController.m

@@ -279,6 +279,7 @@ self.isrefreshing=false;
 }
 - (void) viewWillDisappear:(BOOL)animated
 {
+    [super viewWillDisappear:animated];
     if(self.ispush)
         [[self navigationController] setNavigationBarHidden:YES animated:NO];
     

+ 3 - 2
RedAnt ERP Mobile/common/Functions/order/OrderDetailViewController.m

@@ -263,7 +263,7 @@
     // Do any additional setup after loading the view.
     
     
-    [self loaddata];
+//    [self loaddata];
   //  AppDelegate *appDelegate = (AppDelegate*)[[UIApplication sharedApplication] delegate];
 }
 
@@ -999,7 +999,7 @@
 - (void)viewWillAppear:(BOOL)animated
 {
     
-    
+    [super viewWillAppear:animated];
     //    if(appDelegate.can_submit_order)
     //    {
     //
@@ -1014,6 +1014,7 @@
     //    }
     //
     [[self navigationController] setNavigationBarHidden:NO animated:NO];
+    
 }
 - (IBAction)imgbtnClicked:(UIButton*)sender {
     UITableViewCell* cell =(UITableViewCell*) sender.superview.superview;

+ 1 - 1
RedAnt ERP Mobile/common/Functions/sidemenu/LoginViewController.m

@@ -502,7 +502,7 @@
 - (IBAction)requestLoginBtnClicked:(UIButton *)sender {
     
     WebViewController *webVC = [self.storyboard instantiateViewControllerWithIdentifier:@"WebViewController"];
-    webVC.url = @"http://www.cnblogs.com/buakaw/";
+    webVC.url = URL_REQUEST_LOGIN;
     webVC.title = @"Request Login";
     webVC.backItemDismiss = YES;
     

+ 1 - 0
RedAnt ERP Mobile/common/Functions/sidemenu/PopupNavigationController.m

@@ -36,6 +36,7 @@
 }
 -(void)viewDidDisappear:(BOOL)animated
 {
+    [super viewDidDisappear:animated];
     AppDelegate *app = (AppDelegate*)[[UIApplication sharedApplication] delegate];
     [app.window removeGestureRecognizer:self.tapGesture];
     

+ 4 - 0
RedAnt ERP Mobile/iSales-NPD/config.h

@@ -157,6 +157,8 @@
 
 #define URL_SET_MERGE_ORDER @"http://192.168.0.112:8080/site/isales/mergeOrder.htm"
 
+#define URL_REQUEST_LOGIN @"http://192.168.0.112:8080/site/isales/requestLogin.htm"
+
 #else
 
 
@@ -274,6 +276,8 @@
 
 #define URL_SET_MERGE_ORDER @"https://www.newpacificdirect.com/isales/mergeOrder.htm"
 
+#define URL_REQUEST_LOGIN @"https://www.newpacificdirect.com/isales/requestLogin.htm"
+
 
 #endif