屏蔽在线抽查 修改问题排序

redstar.xcodeproj/project.pbxproj

@@ -197,6 +197,7 @@
 		84F57C4C1BEC785E00DDEEB1 /* AddQuestionViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 84F57C4B1BEC785E00DDEEB1 /* AddQuestionViewController.m */; };
 		84F57C501BEC7AA300DDEEB1 /* AddQuestionFooterView.m in Sources */ = {isa = PBXBuildFile; fileRef = 84F57C4F1BEC7AA300DDEEB1 /* AddQuestionFooterView.m */; };
 		84F57C9C1BECA73800DDEEB1 /* StarBar.m in Sources */ = {isa = PBXBuildFile; fileRef = 84F57C9B1BECA73800DDEEB1 /* StarBar.m */; };
+		84F653661C5F074900B01CD3 /* MoreTaxisView.m in Sources */ = {isa = PBXBuildFile; fileRef = 84F653651C5F074900B01CD3 /* MoreTaxisView.m */; };
 		84FAC7611BFF2C6E00FD094D /* NoDataView.m in Sources */ = {isa = PBXBuildFile; fileRef = 84FAC7601BFF2C6E00FD094D /* NoDataView.m */; };
 		84FD89F21BD9FC71006E442A /* HomeViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 84FD89F11BD9FC71006E442A /* HomeViewController.m */; };
 		84FD8A0A1BDA01D1006E442A /* MineViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 84FD8A091BDA01D1006E442A /* MineViewController.m */; };
@@ -591,6 +592,8 @@
 		84F57C4F1BEC7AA300DDEEB1 /* AddQuestionFooterView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AddQuestionFooterView.m; sourceTree = "<group>"; };
 		84F57C9A1BECA73800DDEEB1 /* StarBar.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StarBar.h; sourceTree = "<group>"; };
 		84F57C9B1BECA73800DDEEB1 /* StarBar.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = StarBar.m; sourceTree = "<group>"; };
+		84F653641C5F074900B01CD3 /* MoreTaxisView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MoreTaxisView.h; sourceTree = "<group>"; };
+		84F653651C5F074900B01CD3 /* MoreTaxisView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MoreTaxisView.m; sourceTree = "<group>"; };
 		84FAC75F1BFF2C6E00FD094D /* NoDataView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NoDataView.h; sourceTree = "<group>"; };
 		84FAC7601BFF2C6E00FD094D /* NoDataView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NoDataView.m; sourceTree = "<group>"; };
 		84FD89F01BD9FC71006E442A /* HomeViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HomeViewController.h; sourceTree = "<group>"; };
@@ -1013,6 +1016,8 @@
 				8487D7711BF19A9C00E63E90 /* SearchToolBar.m */,
 				8480BEA01C14326100E2F18F /* MoreScreenView.h */,
 				8480BEA11C14326100E2F18F /* MoreScreenView.m */,
+				84F653641C5F074900B01CD3 /* MoreTaxisView.h */,
+				84F653651C5F074900B01CD3 /* MoreTaxisView.m */,
 			);
 			path = View;
 			sourceTree = "<group>";
@@ -2545,6 +2550,7 @@
 				84AD4F261BF4356A00BFB37C /* TaskModel.m in Sources */,
 				84E7BD801C16809E0030C441 /* LookOnLineFootView.m in Sources */,
 				841D24FB1BEB75CA0005CC9F /* QuestionDetailFooterView.m in Sources */,
+				84F653661C5F074900B01CD3 /* MoreTaxisView.m in Sources */,
 				84CF0FA21BE9EDA900C855CE /* TakePhotoView.m in Sources */,
 				846206BB1C06AFF50015C456 /* RankCommentCell.m in Sources */,
 				84CEB16B1C28F0E20072ED0A /* LookOnLineModel.m in Sources */,

redstar.xcworkspace/xcuserdata/admin.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -2,4 +2,38 @@
 <Bucket
    type = "0"
    version = "2.0">
+   <Breakpoints>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "redstar/Classes/Module/Home/ViewController/HomeViewController.m"
+            timestampString = "475987960.281766"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "642"
+            endingLineNumber = "642"
+            landmarkName = "-requestLookOnLineList"
+            landmarkType = "5">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "redstar/Classes/Module/Home/ViewController/HomeViewController.m"
+            timestampString = "475987965.153886"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "605"
+            endingLineNumber = "605"
+            landmarkName = "-requestSpotCheckList"
+            landmarkType = "5">
+         </BreakpointContent>
+      </BreakpointProxy>
+   </Breakpoints>
 </Bucket>

redstar/Classes/Macro/Constant.h

@@ -135,6 +135,8 @@
 #define kCommentViewHeight 300
 #define kCommentWithStarViewHeight 325
 #define kTaxisViewHeight 150
+#define kMoreTaxisViewHeight 250
+
 #define kScreenViewHeight 240
 #define kMoreScreenViewHeight 310
 

redstar/Classes/Module/Function/Question/AddQuestion/Cell/AddQuestionTableCell.m

@@ -34,7 +34,7 @@
     UILabel *contentLabel = [[UILabel alloc] init];
     contentLabel.translatesAutoresizingMaskIntoConstraints = NO;
     contentLabel.font = [UIFont systemFontOfSize:16.0];
-    contentLabel.text = @"标题";
+    contentLabel.text = @"联系方式";
     contentLabel.textColor = kOnLineCellTitleColor;
     [self.contentView addSubview:contentLabel];
     
@@ -78,7 +78,7 @@
     self.backImageView1.image = resizingName;
     
     self.contentTextView.backgroundColor = [UIColor clearColor];
-    self.placeholderLabel2.text = @"请输入文字...";
+    self.placeholderLabel2.text = @"请输入联系方式...";
     self.titleTextView.backgroundColor = [UIColor clearColor];
     self.placeholderLabel1.text = @"请输入文字...";
     

redstar/Classes/Module/Function/Question/AddQuestion/ViewController/AddQuestionViewController.m

@@ -178,6 +178,19 @@
         return;
     }
     
+    NSIndexPath *indexPath = [NSIndexPath indexPathForRow:2 inSection:0];
+    
+    AddQuestionTableCell *cell = (AddQuestionTableCell *)[_tableView cellForRowAtIndexPath:indexPath];
+    
+    NSString *title = [cell titleTextView].text;
+    NSString *content = [cell contentTextView].text;
+    
+    if (title.length == 0 || content.length == 0) {
+        UIAlertView *alert = [[UIAlertView alloc] initWithTitle:@"警告" message:@"联系方式和问题与建议描述不能为空！" delegate:self cancelButtonTitle:nil otherButtonTitles:@"确定", nil];
+        [alert show];
+        return;
+    }
+    
     
     UIAlertView *alert = [[UIAlertView alloc] initWithTitle:@"提示" message:@"您确定要提交新问题吗？" delegate:self cancelButtonTitle:@"取消" otherButtonTitles:@"确定", nil];
     alert.tag = 9211232;

redstar/Classes/Module/Function/Question/QuestionList/View/MoreTaxisView.h

+//
+//  MoreTaxisView.h
+//  redstar
+//
+//  Created by admin on 16/2/1.
+//  Copyright © 2016年 ZWF. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+
+@protocol MoreTaxisViewDelegate <NSObject>
+
+- (void)moreTimeChange:(UIButton *)sender;
+
+@end
+
+@interface MoreTaxisView : UIView
+@property (nonatomic, strong) UIButton *defaultBtn; // 默认的
+@property (nonatomic, strong) UIButton *sequenceBtn; // 顺序
+@property (nonatomic, strong) UIButton *changeoverBtn; // 逆序
+
+@property (nonatomic, strong) id <MoreTaxisViewDelegate> delegate;
+@end

redstar/Classes/Module/Function/Question/QuestionList/View/MoreTaxisView.m

+//
+//  MoreTaxisView.m
+//  redstar
+//
+//  Created by admin on 16/2/1.
+//  Copyright © 2016年 ZWF. All rights reserved.
+//
+
+#import "MoreTaxisView.h"
+
+@interface MoreTaxisView ()
+@property (nonatomic, strong) NSMutableArray *buttons;
+
+@end
+
+@implementation MoreTaxisView
+- (void)layoutSubviews
+{
+    self.buttons = [NSMutableArray array];
+    
+    CGFloat buttonW = kScreenWidth;
+    NSArray *titleArray = @[@"默认排序",@"按点赞数由大到小排序",@"按点赞数由小到大排序",@"按时间顺序排序",@"按时间逆序排序"];
+    CGFloat buttonH = self.frame.size.height / titleArray.count;
+
+    
+    for (int i = 0; i < titleArray.count; i++) {
+        UIButton *button = [[UIButton alloc] init];
+        button.titleLabel.font = [UIFont systemFontOfSize:15.0];
+        button.tag = kTAxisBtnTag + i + 1;
+        [button setTitleColor:kLightBlack forState:UIControlStateNormal];
+        [button setTitleColor:[UIColor orangeColor] forState:UIControlStateSelected];
+        button.frame = CGRectMake(0, i * buttonH, buttonW, buttonH);
+        [button setTitle:titleArray[i] forState:UIControlStateNormal];
+        button.layer.borderWidth = 0.5;
+        button.titleEdgeInsets = UIEdgeInsetsMake(0, 20, 0, 0);
+        button.layer.borderColor = kSeparateLineCGColor;
+        button.contentHorizontalAlignment = UIControlContentHorizontalAlignmentLeft ;
+        button.titleLabel.font = [UIFont systemFontOfSize:14.0];
+        [button setImage:[UIImage imageNamed:@"iconfont-duigou2"] forState:UIControlStateNormal];
+        [button setImage:[UIImage imageNamed:@"iconfont-duigou"] forState:UIControlStateSelected];
+        button.imageEdgeInsets = UIEdgeInsetsMake(0, kScreenWidth - 30, 0, 0);
+        button.titleEdgeInsets = UIEdgeInsetsMake(0, 0, 0, 0);
+        button.imageView.contentMode = UIViewContentModeRight;
+        button.titleLabel.contentMode = UIViewContentModeLeft;
+        [button addTarget:self action:@selector(touchDownForButton:) forControlEvents:UIControlEventTouchDown];
+        button.adjustsImageWhenHighlighted = NO;
+        [self addSubview:button];
+        [self.buttons addObject:button];
+    }
+    UIButton *tempBtn = [_buttons objectAtIndex:0];
+    tempBtn.selected = YES;
+}
+
+
+- (void)touchDownForButton:(UIButton *)button{
+    for (UIButton * b in self.buttons) {
+        b.selected = NO;
+    }
+    
+    button.selected = YES;
+    
+    if (_delegate) {
+        [_delegate moreTimeChange:button];
+    }
+    
+}
+
+@end

redstar/Classes/Module/Function/Question/QuestionList/ViewController/QuestionViewController.m

@@ -14,7 +14,7 @@
 #import "HttpClient.h"
 #import "QuestionModel.h"
 #import "SearchToolBar.h"
-#import "TaxisView.h"
+#import "MoreTaxisView.h"
 #import "MoreScreenView.h"
 #import "MenuView.h"
 #import "CustomDropMenuView.h"
@@ -27,14 +27,14 @@
 #define kQuestionListCell @"questionListTableViewCell"
 #define kThumbTag 745645
 
-@interface QuestionViewController () <UITextFieldDelegate,UITableViewDelegate, UITableViewDataSource, TaxisViewDelegate, ScopeTableViewDelegate, GroupTableViewDelegate, CategoryTableViewDelegate, StateTableViewDelegate, TimeTableViewDelegate>
+@interface QuestionViewController () <UITextFieldDelegate,UITableViewDelegate, UITableViewDataSource, MoreTaxisViewDelegate, ScopeTableViewDelegate, GroupTableViewDelegate, CategoryTableViewDelegate, StateTableViewDelegate, TimeTableViewDelegate>
 @property (nonatomic, strong) UITableView *tableView;
 @property (nonatomic, strong) NSMutableArray *allQuestionArray;
 
 @property (nonatomic, strong) SearchToolBar *searchBar;
 @property (nonatomic, strong) MenuView *menuView;
 
-@property (nonatomic, strong) TaxisView *taxisView;
+@property (nonatomic, strong) MoreTaxisView *taxisView;
 @property (nonatomic, strong) MoreScreenView *screenView;
 
 @property (nonatomic, strong) UIView *bgView;
@@ -340,8 +340,8 @@
         [_bgView addGestureRecognizer:tapGR];
     }
     if (!_taxisView) {
-        _taxisView = [[TaxisView alloc] init];
-        _taxisView.tag = 3928342;
+        _taxisView = [[MoreTaxisView alloc] init];
+        //_taxisView.tag = 3928342;
         _taxisView.backgroundColor = [UIColor whiteColor];
     }
     
@@ -352,7 +352,7 @@
     _bgView.alpha = 0;
     _bgView.backgroundColor = [UIColor blackColor];
     
-    CGRect toFrame = CGRectMake(0, 45, kScreenWidth, kTaxisViewHeight);
+    CGRect toFrame = CGRectMake(0, 45, kScreenWidth, kMoreTaxisViewHeight);
     _taxisView.frame = toFrame;
     _taxisView.alpha = 0.0;
     [UIView animateWithDuration:0.2 animations:^{
@@ -711,7 +711,7 @@
 
 
 #pragma mark - TaxisDelegate
-- (void)timeChange:(UIButton *)sender
+- (void)moreTimeChange:(UIButton *)sender
 {
     // 请求地址
     NSString *urlStr = [NSString stringWithFormat:@"%@%@", kRedStarURL, kQuestionListURL];
@@ -723,9 +723,15 @@
         
     } else if (sender.tag - kTAxisBtnTag == 2) {
         
+        queryOrders = @[@{@"field":@"likeCount",
+                          @"direction":@"desc"}];
+        
+    } else if (sender.tag - kTAxisBtnTag == 3) {
+        queryOrders = @[@{@"field":@"likeCount",
+                          @"direction":@"asc"}];
+    } else if (sender.tag - kTAxisBtnTag == 4) {
         queryOrders = @[@{@"field":@"resolveTime",
                           @"direction":@"asc"}];
-        
     } else {
         queryOrders = @[@{@"field":@"resolveTime",
                           @"direction":@"desc"}];

redstar/Classes/Module/Home/ViewController/HomeViewController.m

@@ -110,8 +110,8 @@ typedef NSComparisonResult (^NSComparator)(id obj1, id obj2);
     self.navigationItem.titleView = customLab;
     
     self.titleArray = [NSMutableArray array];
-    self.sectionArray = [NSMutableArray arrayWithObjects:@"口碑报告",@"商场风采",@"优秀案例",@"巡店报告", @"问题知识",@"口碑巡检",@"在线抽查",nil];
-  //  self.sectionArray = [NSMutableArray arrayWithObjects:@"口碑报告",@"商场风采",@"优秀案例",@"巡店报告", @"问题知识",@"口碑巡检",nil];
+  //  self.sectionArray = [NSMutableArray arrayWithObjects:@"口碑报告",@"商场风采",@"优秀案例",@"巡店报告", @"问题知识",@"口碑巡检",@"在线抽查",nil];
+    self.sectionArray = [NSMutableArray arrayWithObjects:@"口碑报告",@"商场风采",@"优秀案例",@"巡店报告", @"问题知识",@"口碑巡检",nil];
 
     self.allRankListArray = [NSMutableArray array];
     self.taskListDataArray = [NSMutableArray array];
@@ -172,24 +172,17 @@ typedef NSComparisonResult (^NSComparator)(id obj1, id obj2);
         [_sectionArray removeObject:@"口碑巡检"];
     }
     
-    if ([permissions containsObject:@"500701"] || [permissions containsObject:@"500702"]) {
-        [self.titleArray addObject:@"在线抽查"];
-        
-        if ([permissions containsObject:@"500701"]) {
-            [self requestLookOnLineList];
-        } else if ([permissions containsObject:@"500702"]){
-            [self requestSpotCheckList];
-        }
-        
-    } else {
-        [_sectionArray removeObject:@"在线抽查"];
-    }
-    
-//    if ([permissions containsObject:@"500702"]) {
+//    if ([permissions containsObject:@"500701"] || [permissions containsObject:@"500702"]) {
 //        [self.titleArray addObject:@"在线抽查"];
-//
+//        
+//        if ([permissions containsObject:@"500701"]) {
+//            [self requestLookOnLineList];
+//        } else if ([permissions containsObject:@"500702"]){
+//            [self requestSpotCheckList];
+//        }
+//        
 //    } else {
-//        [_sectionArray removeObjectAtIndex:7];
+//        [_sectionArray removeObject:@"在线抽查"];
 //    }
 
     
@@ -236,8 +229,8 @@ typedef NSComparisonResult (^NSComparator)(id obj1, id obj2);
     [self refreshRankingList];
     [self refreshQuestionList];
     [self refreshPraiseList];
-    [self refreshSpotCheckList];
-    [self requestLookOnLineList];
+   // [self refreshSpotCheckList];
+   // [self requestLookOnLineList];
 }
 
 - (void)refreshPraiseList