修复bug 添加问题分组

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

@@ -13,5 +13,53 @@
             stopOnStyle = "0">
          </BreakpointContent>
       </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "redstar/Classes/Module/Function/Question/AddQuestion/ViewController/AddQuestionViewController.m"
+            timestampString = "473677271.6783"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "315"
+            endingLineNumber = "315"
+            landmarkName = "-alertView:clickedButtonAtIndex:"
+            landmarkType = "5">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "redstar/Classes/Module/Function/Question/AddQuestion/ViewController/AddQuestionViewController.m"
+            timestampString = "473677272.558419"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "312"
+            endingLineNumber = "312"
+            landmarkName = "-alertView:clickedButtonAtIndex:"
+            landmarkType = "5">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "redstar/Classes/Module/Function/Question/QuestionList/View/MoreScreenView.m"
+            timestampString = "473679011.613156"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "225"
+            endingLineNumber = "225"
+            landmarkName = "-textView:shouldChangeTextInRange:replacementText:"
+            landmarkType = "5">
+         </BreakpointContent>
+      </BreakpointProxy>
    </Breakpoints>
 </Bucket>

redstar/Classes/Macro/Url.h

@@ -10,10 +10,10 @@
 #define Url_h
 
 // url 测试环境
-#define kRedStarURL  @"http://218.244.151.129:7580/"
+//#define kRedStarURL  @"http://218.244.151.129:7580/"
 
 // 正式环境
-// #define kRedStarURL  @"http://219.235.234.225:7580/"
+ #define kRedStarURL  @"http://219.235.234.225:7580/"
 
 // 最新正式环境
 // #define kRedStarURL  @"http://219.235.234.212:7580/"

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

@@ -50,6 +50,9 @@
 
 @property (nonatomic, strong) NSMutableArray *categoryArray;
 @property (nonatomic, strong) NSMutableDictionary *questionDict;
+@property (nonatomic, assign) NSInteger categoryNum;
+@property (nonatomic, assign) NSInteger questionNum;
+
 
 @end
 
@@ -85,11 +88,13 @@
     // takePhoto代理
     [self.footerView.reportBtn addTarget:self action:@selector(upLoadQuestionPic:) forControlEvents:UIControlEventTouchUpInside];
     
-    self.saveDict = [NSMutableDictionary dictionary];
-    [_saveDict setObject:@"请选择" forKey:@"selectLabel"];
-    [_saveDict setObject:@"请选择" forKey:@"selectLabel1"];
+//    self.saveDict = [NSMutableDictionary dictionary];
+//    [_saveDict setObject:@"请选择" forKey:@"selectLabel"];
+//    [_saveDict setObject:@"请选择" forKey:@"selectLabel1"];
     
     _rowNumber = 4;
+    _categoryNum = 0;
+    _questionNum = 0;
 
 }
 
@@ -98,6 +103,17 @@
 {
     self.categoryArray = [NSMutableArray arrayWithObjects:@"服务", @"环境企划", @"环境物业",@"价格",@"质量",@"商户信用分类",@"审批比价采购",@"送货跟单",@"指标",@"其他", nil];
     self.questionDict = [NSMutableDictionary dictionary];
+    [_questionDict setObject:[NSArray arrayWithObjects:@"15分钟退单",@"便民服务",@"基础管理",@"轻松购系统",@"营运物料",@"服务承诺",@"人员形象",@"全员服务",@"其他", nil] forKey:@"服务"];
+    [_questionDict setObject:[NSArray arrayWithObjects:@"导视系统",@"背景音乐",@"物料规范",@"儿童区",@"休息区",@"其他", nil] forKey:@"环境企划"];
+    [_questionDict setObject:[NSArray arrayWithObjects:@"基础环境",@"物料标识",@"停车场",@"卫生间",@"硬件改造",@"人员",@"其他", nil] forKey:@"环境物业"];
+    [_questionDict setObject:[NSArray arrayWithObjects:@"七折管理",@"价签物料",@"其他", nil] forKey:@"价格"];
+    [_questionDict setObject:[NSArray arrayWithObjects:@"绿色陈展",@"三年质保",@"其他", nil] forKey:@"质量"];
+    [_questionDict setObject:[NSArray arrayWithObjects:@"商户信用分类", nil] forKey:@"商户信用分类"];
+    [_questionDict setObject:[NSArray arrayWithObjects:@"审批、比价、采购", nil] forKey:@"审批比价采购"];
+    [_questionDict setObject:[NSArray arrayWithObjects:@"送货跟单", nil] forKey:@"送货跟单"];
+    [_questionDict setObject:[NSArray arrayWithObjects:@"指标", nil] forKey:@"指标"];
+    [_questionDict setObject:[NSArray arrayWithObjects:@"其他", nil] forKey:@"其他"];
+
 }
 
 - (void)didReceiveMemoryWarning {
@@ -351,11 +367,13 @@
         line.backgroundColor = kSeparateLineColor;
         [cell.contentView addSubview:line];
         
+        
+        NSString *cateStr = _categoryArray[_categoryNum];
         if (indexPath.row == 0) {
             if (!self.selectLabel) {
                 _selectLabel = [[UILabel alloc] init];
             }
-            _selectLabel.text = _saveDict[@"selectLabel"];
+            _selectLabel.text = cateStr;
             _selectLabel.translatesAutoresizingMaskIntoConstraints = NO;
             _selectLabel.textColor = kOnLineCellDetailColor;
             _selectLabel.textAlignment = NSTextAlignmentRight;
@@ -382,7 +400,8 @@
             if (!self.selectLabel1) {
                 self.selectLabel1 = [[UILabel alloc] init];
             }
-            _selectLabel1.text = _saveDict[@"selectLabel1"];
+            NSArray *seleArray = [_questionDict objectForKey:cateStr];
+            _selectLabel1.text = seleArray[_questionNum];
             _selectLabel1.translatesAutoresizingMaskIntoConstraints = NO;
             _selectLabel1.textColor = kOnLineCellDetailColor;
             _selectLabel1.textAlignment = NSTextAlignmentRight;
@@ -492,7 +511,13 @@
         [_categoryActionSheet showInView:self.view];
 
     } else if (indexPath.row == 1) {
-        self.questionActionSheet = [[UIActionSheet alloc] initWithTitle:nil delegate:self cancelButtonTitle:@"取消" destructiveButtonTitle:nil otherButtonTitles:QUESTIONLIST];
+        self.questionActionSheet = [[UIActionSheet alloc] initWithTitle:nil delegate:self cancelButtonTitle:@"取消" destructiveButtonTitle:nil otherButtonTitles:nil];
+        NSString *cateStr = _categoryArray[_categoryNum];
+        NSArray *seleArray = [_questionDict objectForKey:cateStr];
+        for (NSString *selectStr in seleArray) {
+            [_questionActionSheet addButtonWithTitle:selectStr];
+        }
+        
         _questionActionSheet.delegate = self;
         [_questionActionSheet showInView:self.view];
     } else {
@@ -530,14 +555,19 @@
     
     if (actionSheet == _categoryActionSheet) {
         
-        if (buttonIndex < [NSArray arrayWithObjects:CATEGORYLIST].count) {
-            _selectLabel.text = [[NSArray arrayWithObjects:CATEGORYLIST] objectAtIndex:buttonIndex];
-            [_saveDict setObject:[[NSArray arrayWithObjects:CATEGORYLIST] objectAtIndex:buttonIndex] forKey:@"selectLabel"];
+        if (buttonIndex < _categoryArray.count) {
+            _selectLabel.text = [_categoryArray objectAtIndex:buttonIndex];
+            _categoryNum = buttonIndex;
+            _questionNum = 0;
+            [self.tableView reloadData];
         }
     } else if (actionSheet == _questionActionSheet){
-        if (buttonIndex < [NSArray arrayWithObjects:QUESTIONLIST].count) {
-            _selectLabel1.text = [[NSArray arrayWithObjects:QUESTIONLIST] objectAtIndex:buttonIndex];
-            [_saveDict setObject:[[NSArray arrayWithObjects:QUESTIONLIST] objectAtIndex:buttonIndex] forKey:@"selectLabel1"];
+        
+        NSString *cateStr = _categoryArray[_categoryNum];
+        NSArray *seleArray = [_questionDict objectForKey:cateStr];
+        if ((buttonIndex - 1) < seleArray.count) {
+            _selectLabel1.text = [seleArray objectAtIndex:(buttonIndex - 1)];
+            _questionNum = buttonIndex - 1;
         }
     }
 }

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

@@ -145,7 +145,7 @@
             [self.tableView reloadData];
             [MBProgressHUD hideHUDForView:self.view animated:YES];
         }
-
+        [MBProgressHUD hideHUDForView:self.view animated:YES];
         
     }];
 }

redstar/Classes/Module/Function/WordOfMouth/Ranking/RankingList/ViewController/RankingListViewController.m

@@ -102,7 +102,6 @@
     
     _pickRow = 0;
 
-    [self requestShortPraise];
     
     self.shoppingLabel.text = @"商场名称";
     self.scoreLabel.text = @"总分";
@@ -124,6 +123,8 @@
 {
     [super viewWillAppear:animated];
     
+    [self requestShortPraise];
+
     self.tabBarController.tabBar.hidden = YES;
 }
 

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

@@ -806,6 +806,7 @@ typedef NSComparisonResult (^NSComparator)(id obj1, id obj2);
         rankDetailVC.store_uuid = rankList.store_uuid;
         rankDetailVC.storeAddress = rankList.storeAddress;
         rankDetailVC.storePictures = rankList.storePictures;
+        rankDetailVC.commentId = rankList.commentId;
         self.hidesBottomBarWhenPushed = YES;
         [self.navigationController pushViewController:rankDetailVC animated:YES];
     } else if ([_sectionArray[indexPath.section] isEqualToString:@"问题知识"] && indexPath.section == s3) {