刷新跳转

Podfile

@@ -7,4 +7,4 @@ pod 'FMDB', '~> 2.5'
 pod 'Base64nl', '~> 1.2'
 pod 'Reveal-iOS-SDK', '~> 1.5.1'
 pod 'BaiduMapAPI', '~> 2.8.0'
-
+pod 'MJRefresh'

Podfile.lock

@@ -35,6 +35,7 @@ PODS:
   - FMDB/standard (2.5):
     - FMDB/common
   - MBProgressHUD (0.9.1)
+  - MJRefresh (2.2.0)
   - Reveal-iOS-SDK (1.5.1)
   - SDWebImage (3.7.2):
     - SDWebImage/Core (= 3.7.2)
@@ -47,6 +48,7 @@ DEPENDENCIES:
   - Base64nl (~> 1.2)
   - FMDB (~> 2.5)
   - MBProgressHUD (~> 0.9.1)
+  - MJRefresh
   - Reveal-iOS-SDK (~> 1.5.1)
   - SDWebImage (~> 3.7.2)
   - SSKeychain (~> 1.2.3)
@@ -57,6 +59,7 @@ SPEC CHECKSUMS:
   Base64nl: a497bdcd1c01ea793d36b399016195a8713c0e95
   FMDB: 96e8f1bcc1329e269330f99770ad4285d9003e52
   MBProgressHUD: c47f2c166c126cf2ce36498d80f33e754d4e93ad
+  MJRefresh: 65a2bf14abb6feeaed8696aa1551f70e15ab0a08
   Reveal-iOS-SDK: c9c55cad2729c85f6ced415f1b21857c9a2d8ef9
   SDWebImage: 71b7cdc1d1721d6a82ed62889030225f2c249e29
   SSKeychain: 3f42991739c6c60a9cf1bbd4dff6c0d3694bcf3d

XFFruit/Images.xcassets/Survey/back.imageset/Contents.json

+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x",
+      "filename" : "back.png"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x",
+      "filename" : "back@2x.png"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file

XFFruit/ViewControllers/Business/BusinessViewController.m

@@ -136,6 +136,7 @@
         {
             SurveyViewController *svc = [[SurveyViewController alloc] init];
             svc.title = [IBTCommon localizableString:@"Survey"];
+            svc.navigationItem.hidesBackButton = YES;
             [self PushViewController:svc animated:YES];
         }
             break;

XFFruit/ViewControllers/Survey/Views/SortMaskView.m

@@ -28,8 +28,10 @@
         if (orderDirection.length >0) {
             if ([orderDirection isEqualToString:@"asc"]) {
                 _currentIndexPath = [NSIndexPath indexPathForRow:0 inSection:0];
-            }else{
+            }else if ([orderDirection isEqualToString:@"des"]){
                 _currentIndexPath = [NSIndexPath indexPathForRow:1 inSection:0];
+            }else{
+                _currentIndexPath = [NSIndexPath indexPathForRow:2 inSection:0];
             }
         }
     }

XFFruit/ViewControllers/Survey/controllers/NewSurveyViewController.m

@@ -10,6 +10,7 @@
 
 #import "NewSurveyViewController.h"
 #import "SurveyCell.h"
+#import "SurveyViewController.h"
 #import "HPGrowingTextView.h"
 #import "StartTimeView.h"
 #import "ChosePersonViewController.h"
@@ -142,12 +143,18 @@ typedef enum : NSUInteger {
             NSString *message = data[@"message"];
             if (success == 1) {
                 //成功
-                [IBTLoadingView showTips:@"操作成功"];
-                [self clearAllInformation];
-                if (self.survey) {
-                    [ICRUserUtil sharedInstance].needFresh = YES;
-                    [self.navigationController popViewControllerAnimated:YES];
+                if ([state isEqualToString:@"initial"]) {//保存成功
+                    [IBTLoadingView showTips:@"操作成功"];
+                }else{//提交成功
+                    SurveyViewController *svc = [SurveyViewController new];
+                    [self PushViewController:svc animated:YES];
                 }
+//
+//                [self clearAllInformation];
+//                if (self.survey) {
+//                    [ICRUserUtil sharedInstance].needFresh = YES;
+//                    [self.navigationController popViewControllerAnimated:YES];
+//                }
             }else{
                 [IBTLoadingView showTips:message];
             }

XFFruit/ViewControllers/Survey/controllers/SurveyDetailViewController.m

@@ -192,7 +192,7 @@ typedef enum : NSUInteger {
     }
 
     
-    _bottomView= [[UIView alloc]initWithFrame:CGRectMake(0, CGRectGetMaxY(_surveyView.frame) + TopMargin, ScreenSize.width, 200)];
+    _bottomView= [[UIView alloc]initWithFrame:CGRectMake(0, CGRectGetMaxY(_surveyView.frame) + TopMargin, ScreenSize.width, 300)];
     _bottomView.backgroundColor = [UIColor whiteColor];
     [_scrollView addSubview:_bottomView];
     

XFFruit/ViewControllers/Survey/controllers/SurveyViewController.m

@@ -14,7 +14,7 @@
 #import "SurveyDetailViewController.h"
 #import "NewSurveyViewController.h"
 #import "QueryOrder.h"
-
+#import "MJRefresh.h"
 
 #define TopMargin 44
 #define TableHeight 120
@@ -37,6 +37,9 @@ typedef enum : NSUInteger {
     UIBarButtonItem  *_sureBtn;
     UIButton *_sortBtn;
     UIButton *_boltBtn;
+    BOOL _isRefresh;
+    BOOL _isLoadMore;
+    NSInteger _currentPage;
 }
 @property (nonatomic,strong)NSMutableArray *dataArr;
 @property (nonatomic,strong)UITableView *tableView;
@@ -54,14 +57,42 @@ typedef enum : NSUInteger {
     [super viewDidLoad];
     self.title = @"行情调研";
     self.view.backgroundColor  = XXFBgColor;
+    [self createBackBtn];
     [self initData];
     [self createTableView];
     [self getData];
+    //刷新
+    [self createRefresh];
 }
 - (void)initData{
     self.dataArr = [NSMutableArray array];
 }
 
+- (void)createRefresh{
+    self.tableView.header = [MJRefreshNormalHeader headerWithRefreshingBlock:^{
+        if (_isLoadMore) {
+            return ;
+        }
+        _isLoadMore = YES;
+        _currentPage = 0;
+        [self getData];
+    }];
+    self.tableView.footer = [MJRefreshAutoNormalFooter footerWithRefreshingBlock:^{
+        if (_isLoadMore) {
+            return ;
+        }
+        _isLoadMore = YES;
+        _currentPage ++;
+        [self getData];
+    } ];
+}
+#pragma mark - 结束刷新
+- (void)endRefreshing{
+    _isLoadMore = NO;
+    _isRefresh = NO;
+    [self.tableView.header endRefreshing];
+    [self.tableView.footer endRefreshing];
+}
 - (void)viewWillAppear:(BOOL)animated{
     [super viewWillAppear:animated];
     if ([ICRUserUtil sharedInstance].needFresh) {
@@ -134,8 +165,8 @@ typedef enum : NSUInteger {
                            @"titleLike":titleObject,
                            @"queryOrders":orderArr,
                            @"userUuid":userUtil.userId,
-                           @"pageNumber":@(0),
-                           @"pageSize":@(100)};
+                           @"pageNumber":@(_currentPage),
+                           @"pageSize":@(20)};
     [[ICRHTTPController sharedController] querySurveyWithBillData:dict success:succ failure:fail];
 }
 #pragma mark -成功
@@ -144,8 +175,10 @@ typedef enum : NSUInteger {
         NSInteger success = [data[@"success"] integerValue];
         NSString *message  = data[@"message"] ;
         if (success == 1) {
-            if (self.dataArr.count > 0) {
-                [self.dataArr removeAllObjects];
+            if (_currentPage == 0) {
+                if (self.dataArr.count > 0) {
+                    [self.dataArr removeAllObjects];
+                }
             }
             NSArray *recodesArr = data[ @"data" ][ @"records" ];
             for (NSDictionary *surveyDict in recodesArr) {
@@ -153,7 +186,13 @@ typedef enum : NSUInteger {
                 [survey setValuesForKeysWithDictionary:surveyDict];
                 [self.dataArr addObject:survey];
             }
+            NSDictionary *pageDict = data[ @"data" ][ @"paging" ];
+            NSInteger pageCount = [pageDict[@"pageCount"] integerValue];
             [self.tableView reloadData];
+            [self endRefreshing];
+            if (pageCount <= _currentPage) {
+                [self.tableView.footer noticeNoMoreData];
+            }
         }else{
             [IBTLoadingView showTips:message];
         }
@@ -396,11 +435,18 @@ typedef enum : NSUInteger {
         svc.surveyUuid = survey.uuid;
         [self PushViewController:svc animated:YES];
     }
-
-
 }
-
-
+- (void)createBackBtn{
+    UIButton *btn = [UIButton buttonWithType:UIButtonTypeCustom];
+    [btn setImage:[UIImage imageNamed:@"back"] forState:UIControlStateNormal];
+    btn.frame  = CGRectMake(0, 0, 12, 20);
+    [btn addTarget:self action:@selector(backRV) forControlEvents:UIControlEventTouchUpInside];
+    UIBarButtonItem *back = [[UIBarButtonItem alloc]initWithCustomView:btn];
+    self.navigationItem.leftBarButtonItem = back;
+}
+- (void)backRV{
+    [self PopToRootViewControllerAnimated:YES];
+}
 
 - (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath{
     return TableHeight;