讨论已去掉，全站搜索中还有讨论关键字

Author: wanghengheng

Coding_iOS/.DS_Store

@@ -74,7 +74,8 @@ - (void)dealloc {
 
 - (NSArray *)titlesArray{
     if (!_titlesArray) {
-        _titlesArray = @[@"项目", @"任务", @"讨论", @"冒泡", @"文档", @"用户", @"合并请求", @"Pull 请求"];
+//        _titlesArray = @[@"项目", @"任务", @"讨论", @"冒泡", @"文档", @"用户", @"合并请求", @"Pull 请求"];
+        _titlesArray = @[@"项目", @"任务", @"冒泡", @"文档", @"用户", @"合并请求"];
     }
     return _titlesArray;
 }
@@ -261,10 +262,11 @@ - (void)initSearchHistoryView {
             make.height.mas_equalTo(_historyHeight);
         }];
         _searchHistoryView.contentSize = CGSizeMake(kScreen_Width, _historyHeight);
+        NSInteger itemNum = 3;
         CGFloat designScale = (kScreen_Width/ 375);
         CGFloat tipVWidth = 210 * designScale;
         CGFloat imageWidth = 24 * designScale;
-        CGFloat paddingWidth = MAX(0, (tipVWidth - 4* imageWidth)/ 3);
+        CGFloat paddingWidth = MAX(0, (tipVWidth - itemNum* imageWidth)/ (itemNum - 1));
         CGFloat fontSize = 13 * designScale;
 
         UIView *tipV = [UIView new];
@@ -283,7 +285,8 @@ - (void)initSearchHistoryView {
             make.top.equalTo(titleL.mas_bottom).offset(15);
             make.height.mas_equalTo(1);
         }];
-        NSArray *imageArray = @[@"project", @"task", @"topic", @"tweet", @"file", @"user", @"mr", @"pr"];
+//        NSArray *imageArray = @[@"project", @"task", @"topic", @"tweet", @"file", @"user", @"mr", @"pr"];
+        NSArray *imageArray = @[@"project", @"task", @"tweet", @"file", @"user", @"mr"];
         for (int index = 0; index < self.titlesArray.count && index < imageArray.count; index++) {
             UIImageView *imageV = [[UIImageView alloc] initWithImage:[UIImage imageNamed:[NSString stringWithFormat:@"search_icon_%@", imageArray[index]]]];
             UILabel *label = [UILabel labelWithSystemFontSize:fontSize textColorHexString:@"0x999999"];
@@ -292,8 +295,8 @@ - (void)initSearchHistoryView {
             [tipV addSubview:label];
             [imageV mas_makeConstraints:^(MASConstraintMaker *make) {
                 make.size.mas_equalTo(CGSizeMake(imageWidth, imageWidth));
-                make.top.equalTo(lineV.mas_bottom).offset(20 + (imageWidth + 45) * (index / 4));
-                make.left.equalTo(tipV).offset((paddingWidth + imageWidth) * (index % 4));
+                make.top.equalTo(lineV.mas_bottom).offset(20 + (imageWidth + 45) * (index / itemNum));
+                make.left.equalTo(tipV).offset((paddingWidth + imageWidth) * (index % itemNum));
             }];
             [label mas_makeConstraints:^(MASConstraintMaker *make) {
                 make.top.equalTo(imageV.mas_bottom).offset(10);
@@ -352,13 +355,14 @@ - (void)cellClickedObj:(id)obj type:(eSearchType)type{
         [self goToUserInfo:obj];
     }else if (type==eSearchType_Task){
         [self goToTask:obj];
-    }else if (type==eSearchType_Topic){
-        [self goToTopic:obj];
+//    }else if (type==eSearchType_Topic){
+//        [self goToTopic:obj];
     }else if (type==eSearchType_Merge){
         [self goToMRDetail:obj];
-    }else if(type==eSearchType_Pull){
-        [self goToMRDetail:obj];
     }
+//    else if(type==eSearchType_Pull){
+//        [self goToMRDetail:obj];
+//    }
 }
 
 - (void)goToProject:(Project *)project{

Coding_iOS/Controllers/AllSearchDisplayVC.m

@@ -90,8 +90,8 @@ - (void)requestJsonDataWithPath:(NSString *)aPath
     }
     //log请求数据
     DebugLog(@"\n===========request===========\n%@\n%@:\n%@", kNetworkMethodName[method], aPath, params);
-//    aPath = [aPath stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding];
-    aPath = [aPath stringByAddingPercentEncodingWithAllowedCharacters:NSCharacterSet.URLPathAllowedCharacterSet];
+    aPath = [aPath stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding];//卧槽了，有些把 params 放在 path 里面的 GET 方法
+//    aPath = [aPath stringByAddingPercentEncodingWithAllowedCharacters:NSCharacterSet.URLPathAllowedCharacterSet];
 //    发起请求
     switch (method) {
         case Get:{

Coding_iOS/Util/Manager/CodingNetAPIClient.m

@@ -3903,7 +3903,8 @@ - (void)requestWithSearchString:(NSString *)strSearch typeStr:(NSString*)type an
 
     NSString *path = [NSString stringWithFormat:@"/api/esearch/%@?q=%@&page=%d",type,strSearch, (int)page];
     if ([type isEqualToString:@"all"]) {
-        path=[NSString stringWithFormat:@"%@&types=projects,project_topics,tasks,tweets,files,friends,merge_requests,pull_requests",path];
+//        path=[NSString stringWithFormat:@"%@&types=projects,project_topics,tasks,tweets,files,friends,merge_requests,pull_requests",path];
+        path=[NSString stringWithFormat:@"%@&types=projects,tasks,tweets,files,friends,merge_requests",path];
     }else if ([type isEqualToString:@"public_project"]) {
         path=[NSString stringWithFormat:@"/api/esearch/project?q=%@  related:false&page=%d",strSearch,(int)page];
     }

Coding_iOS/Util/Manager/Coding_NetAPIManager.m

@@ -9,12 +9,12 @@
 typedef NS_ENUM(NSUInteger, eSearchType) {
     eSearchType_Project=0,
     eSearchType_Task,
-    eSearchType_Topic,
+//    eSearchType_Topic,
     eSearchType_Tweet,
     eSearchType_Document,
     eSearchType_User,
     eSearchType_Merge,
-    eSearchType_Pull,
+//    eSearchType_Pull,
     eSearchType_All
 };
 

Coding_iOS/Views/TableListView/CodingSearchDisplayView.h

@@ -121,15 +121,15 @@ - (void)setSearchPros:(PublicSearchModel *)searchPros{
         case eSearchType_Task:
             [self.dateSource addObjectsFromArray:_searchPros.tasks.list];
             break;
-        case eSearchType_Topic:
-            [self.dateSource addObjectsFromArray:_searchPros.project_topics.list];
-            break;
+//        case eSearchType_Topic:
+//            [self.dateSource addObjectsFromArray:_searchPros.project_topics.list];
+//            break;
         case eSearchType_Merge:
             [self.dateSource addObjectsFromArray:_searchPros.merge_requests.list];
             break;
-        case eSearchType_Pull:
-            [self.dateSource addObjectsFromArray:_searchPros.pull_requests.list];
-            break;
+//        case eSearchType_Pull:
+//            [self.dateSource addObjectsFromArray:_searchPros.pull_requests.list];
+//            break;
         default:
             break;
     }
@@ -185,18 +185,18 @@ - (void)loadMore {
             currentPage=[_searchPros.tasks.page intValue];
             totalPage=[_searchPros.tasks.totalPage intValue];
             break;
-        case eSearchType_Topic:
-            currentPage=[_searchPros.project_topics.page intValue];
-            totalPage=[_searchPros.project_topics.totalPage intValue];
-            break;
+//        case eSearchType_Topic:
+//            currentPage=[_searchPros.project_topics.page intValue];
+//            totalPage=[_searchPros.project_topics.totalPage intValue];
+//            break;
         case eSearchType_Merge:
             currentPage=[_searchPros.merge_requests.page intValue];
             totalPage=[_searchPros.merge_requests.totalPage intValue];
             break;
-        case eSearchType_Pull:
-            currentPage=[_searchPros.pull_requests.page intValue];
-            totalPage=[_searchPros.pull_requests.totalPage intValue];
-            break;
+//        case eSearchType_Pull:
+//            currentPage=[_searchPros.pull_requests.page intValue];
+//            totalPage=[_searchPros.pull_requests.totalPage intValue];
+//            break;
         default:
             break;
     }
@@ -279,22 +279,22 @@ - (void)requestDataWithPage:(NSInteger)page {
             }
             weakSelf.isLoading = NO;
         }];
-    }else if(_curSearchType==eSearchType_Pull){
-        [[Coding_NetAPIManager sharedManager] requestWithSearchString:_searchBarText typeStr:@"pr" andPage:page andBlock:^(id data, NSError *error) {
-            if(data) {
-                NSDictionary *dataDic = (NSDictionary *)data;
-                NSArray *resultA = [NSObject arrayFromJSON:dataDic[@"list"] ofObjects:@"MRPR"];
-                [weakSelf.searchPros.pull_requests.list addObjectsFromArray:resultA];
-                //更新page
-                weakSelf.searchPros.pull_requests.page = dataDic[@"page"] ;
-                weakSelf.searchPros.pull_requests.totalPage = dataDic[@"totalPage"] ;
-                [weakSelf.dateSource addObjectsFromArray:resultA];
-                [weakSelf.searchTableView reloadData];
-                [weakSelf.searchTableView.infiniteScrollingView stopAnimating];
-                weakSelf.searchTableView.showsInfiniteScrolling = [weakSelf showTotalPage];
-            }
-            weakSelf.isLoading = NO;
-        }];
+//    }else if(_curSearchType==eSearchType_Pull){
+//        [[Coding_NetAPIManager sharedManager] requestWithSearchString:_searchBarText typeStr:@"pr" andPage:page andBlock:^(id data, NSError *error) {
+//            if(data) {
+//                NSDictionary *dataDic = (NSDictionary *)data;
+//                NSArray *resultA = [NSObject arrayFromJSON:dataDic[@"list"] ofObjects:@"MRPR"];
+//                [weakSelf.searchPros.pull_requests.list addObjectsFromArray:resultA];
+//                //更新page
+//                weakSelf.searchPros.pull_requests.page = dataDic[@"page"] ;
+//                weakSelf.searchPros.pull_requests.totalPage = dataDic[@"totalPage"] ;
+//                [weakSelf.dateSource addObjectsFromArray:resultA];
+//                [weakSelf.searchTableView reloadData];
+//                [weakSelf.searchTableView.infiniteScrollingView stopAnimating];
+//                weakSelf.searchTableView.showsInfiniteScrolling = [weakSelf showTotalPage];
+//            }
+//            weakSelf.isLoading = NO;
+//        }];
     }else if(_curSearchType==eSearchType_Task){
         [[Coding_NetAPIManager sharedManager] requestWithSearchString:_searchBarText typeStr:@"task" andPage:page andBlock:^(id data, NSError *error) {
             if(data) {
@@ -339,32 +339,32 @@ - (void)requestDataWithPage:(NSInteger)page {
             }
             weakSelf.isLoading = NO;
         }];
-    }else if(_curSearchType==eSearchType_Topic){
-        [[Coding_NetAPIManager sharedManager] requestWithSearchString:_searchBarText typeStr:@"topic" andPage:page andBlock:^(id data, NSError *error) {
-            if(data) {
-                NSDictionary *dataDic = (NSDictionary *)data;
-                NSArray *resultA = [NSObject arrayFromJSON:dataDic[@"list"] ofObjects:@"ProjectTopic"];
-                
-                //topic 处理 content 关键字
-                NSArray *resultTopic =dataDic[@"list"];
-                for (int i=0;i<[resultA count];i++) {
-                    ProjectTopic *curTopic=[resultA objectAtIndex:i];
-                    if ([resultTopic count]>i) {
-                        curTopic.contentStr= [[[resultTopic objectAtIndex:i] objectForKey:@"content"] firstObject];
-                    }
-                }
-                
-                [weakSelf.searchPros.project_topics.list addObjectsFromArray:resultA];
-                //更新page
-                weakSelf.searchPros.project_topics.page = dataDic[@"page"] ;
-                weakSelf.searchPros.project_topics.totalPage = dataDic[@"totalPage"] ;
-                [weakSelf.dateSource addObjectsFromArray:resultA];
-                [weakSelf.searchTableView reloadData];
-                [weakSelf.searchTableView.infiniteScrollingView stopAnimating];
-                weakSelf.searchTableView.showsInfiniteScrolling = [weakSelf showTotalPage];
-            }
-            weakSelf.isLoading = NO;
-        }];
+//    }else if(_curSearchType==eSearchType_Topic){
+//        [[Coding_NetAPIManager sharedManager] requestWithSearchString:_searchBarText typeStr:@"topic" andPage:page andBlock:^(id data, NSError *error) {
+//            if(data) {
+//                NSDictionary *dataDic = (NSDictionary *)data;
+//                NSArray *resultA = [NSObject arrayFromJSON:dataDic[@"list"] ofObjects:@"ProjectTopic"];
+//
+//                //topic 处理 content 关键字
+//                NSArray *resultTopic =dataDic[@"list"];
+//                for (int i=0;i<[resultA count];i++) {
+//                    ProjectTopic *curTopic=[resultA objectAtIndex:i];
+//                    if ([resultTopic count]>i) {
+//                        curTopic.contentStr= [[[resultTopic objectAtIndex:i] objectForKey:@"content"] firstObject];
+//                    }
+//                }
+//
+//                [weakSelf.searchPros.project_topics.list addObjectsFromArray:resultA];
+//                //更新page
+//                weakSelf.searchPros.project_topics.page = dataDic[@"page"] ;
+//                weakSelf.searchPros.project_topics.totalPage = dataDic[@"totalPage"] ;
+//                [weakSelf.dateSource addObjectsFromArray:resultA];
+//                [weakSelf.searchTableView reloadData];
+//                [weakSelf.searchTableView.infiniteScrollingView stopAnimating];
+//                weakSelf.searchTableView.showsInfiniteScrolling = [weakSelf showTotalPage];
+//            }
+//            weakSelf.isLoading = NO;
+//        }];
     }else{
         [self.searchTableView.infiniteScrollingView stopAnimating];
         self.searchTableView.showsInfiniteScrolling = NO;
@@ -411,27 +411,27 @@ - (void)refreshHeaderTitle{
                 titleStr=[NSString stringWithFormat:@"共搜索到 %ld 个与\"%@\"相关的任务", [_searchPros.tasks.totalRow longValue],_searchBarText];
             }
             break;
-        case eSearchType_Topic:
-            if ([_searchPros.project_topics.totalRow longValue]==0) {
-                titleStr=nil;
-            }else{
-                titleStr=[NSString stringWithFormat:@"共搜索到 %ld 个与\"%@\"相关的讨论", [_searchPros.project_topics.totalRow longValue],_searchBarText];
-            }
-            break;
+//        case eSearchType_Topic:
+//            if ([_searchPros.project_topics.totalRow longValue]==0) {
+//                titleStr=nil;
+//            }else{
+//                titleStr=[NSString stringWithFormat:@"共搜索到 %ld 个与\"%@\"相关的讨论", [_searchPros.project_topics.totalRow longValue],_searchBarText];
+//            }
+//            break;
         case eSearchType_Merge:
             if ([_searchPros.merge_requests.totalRow longValue]==0) {
                 titleStr=nil;
             }else{
                 titleStr=[NSString stringWithFormat:@"共搜索到 %ld 个与\"%@\"相关的合并请求", [_searchPros.merge_requests.totalRow longValue],_searchBarText];
             }
             break;
-        case eSearchType_Pull:
-            if ([_searchPros.pull_requests.totalRow longValue]==0) {
-                titleStr=nil;
-            }else{
-                titleStr=[NSString stringWithFormat:@"共搜索到 %ld 个与\"%@\"相关的 Pull 请求", [_searchPros.pull_requests.totalRow longValue],_searchBarText];
-            }
-            break;
+//        case eSearchType_Pull:
+//            if ([_searchPros.pull_requests.totalRow longValue]==0) {
+//                titleStr=nil;
+//            }else{
+//                titleStr=[NSString stringWithFormat:@"共搜索到 %ld 个与\"%@\"相关的 Pull 请求", [_searchPros.pull_requests.totalRow longValue],_searchBarText];
+//            }
+//            break;
         default:
             break;
     }
@@ -456,15 +456,15 @@ -(BOOL)showTotalPage{
         case eSearchType_Task:
             return  _searchPros.tasks.page<_searchPros.tasks.totalPage;
             break;
-        case eSearchType_Topic:
-            return  _searchPros.project_topics.page<_searchPros.project_topics.totalPage;
-            break;
+//        case eSearchType_Topic:
+//            return  _searchPros.project_topics.page<_searchPros.project_topics.totalPage;
+//            break;
         case eSearchType_Merge:
             return  _searchPros.merge_requests.page<_searchPros.merge_requests.totalPage;
             break;
-        case eSearchType_Pull:
-            return  _searchPros.pull_requests.page<_searchPros.pull_requests.totalPage;
-            break;
+//        case eSearchType_Pull:
+//            return  _searchPros.pull_requests.page<_searchPros.pull_requests.totalPage;
+//            break;
         default:
             return NO;
             break;
@@ -489,15 +489,15 @@ -(BOOL)noEmptyList{
         case eSearchType_Task:
             return  [_searchPros.tasks.list count];
             break;
-        case eSearchType_Topic:
-            return  [_searchPros.project_topics.list count];
-            break;
+//        case eSearchType_Topic:
+//            return  [_searchPros.project_topics.list count];
+//            break;
         case eSearchType_Merge:
             return  [_searchPros.merge_requests.list count];
             break;
-        case eSearchType_Pull:
-            return  [_searchPros.pull_requests.list count];
-            break;
+//        case eSearchType_Pull:
+//            return  [_searchPros.pull_requests.list count];
+//            break;
         default:
             return TRUE;
             break;
@@ -550,24 +550,24 @@ - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(N
         cell.task=task;
         [tableView addLineforPlainCell:cell forRowAtIndexPath:indexPath withLeftSpace:kPaddingLeftWidth];
         return cell;
-    }else if(_curSearchType==eSearchType_Topic){
-        TopicSearchCell *cell = [tableView dequeueReusableCellWithIdentifier:@"TopicSearchCell" forIndexPath:indexPath];
-        ProjectTopic *topic =_dateSource[indexPath.row];
-        cell.curTopic = topic;
-        [tableView addLineforPlainCell:cell forRowAtIndexPath:indexPath withLeftSpace:kPaddingLeftWidth];
-        return cell;
+//    }else if(_curSearchType==eSearchType_Topic){
+//        TopicSearchCell *cell = [tableView dequeueReusableCellWithIdentifier:@"TopicSearchCell" forIndexPath:indexPath];
+//        ProjectTopic *topic =_dateSource[indexPath.row];
+//        cell.curTopic = topic;
+//        [tableView addLineforPlainCell:cell forRowAtIndexPath:indexPath withLeftSpace:kPaddingLeftWidth];
+//        return cell;
     }else if(_curSearchType==eSearchType_Merge){
         PRMRSearchCell *cell = [tableView dequeueReusableCellWithIdentifier:@"PRMRSearchCell" forIndexPath:indexPath];
         MRPR *curMRPR =_dateSource[indexPath.row];
         cell.curMRPR = curMRPR;
         [tableView addLineforPlainCell:cell forRowAtIndexPath:indexPath withLeftSpace:kPaddingLeftWidth];
         return cell;
-    }else if(_curSearchType==eSearchType_Pull){
-        PRMRSearchCell *cell = [tableView dequeueReusableCellWithIdentifier:@"PRMRSearchCell" forIndexPath:indexPath];
-        MRPR *curMRPR =_dateSource[indexPath.row];
-        cell.curMRPR = curMRPR;
-        [tableView addLineforPlainCell:cell forRowAtIndexPath:indexPath withLeftSpace:kPaddingLeftWidth];
-        return cell;
+//    }else if(_curSearchType==eSearchType_Pull){
+//        PRMRSearchCell *cell = [tableView dequeueReusableCellWithIdentifier:@"PRMRSearchCell" forIndexPath:indexPath];
+//        MRPR *curMRPR =_dateSource[indexPath.row];
+//        cell.curMRPR = curMRPR;
+//        [tableView addLineforPlainCell:cell forRowAtIndexPath:indexPath withLeftSpace:kPaddingLeftWidth];
+//        return cell;
     }else{
         return [[UITableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:@"cell"];
     }
@@ -586,12 +586,12 @@ - (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPa
     }else if(_curSearchType==eSearchType_Task){
         Task *task = _dateSource[indexPath.row];
         return [TaskSearchCell cellHeightWithObj:task];
-    }else if(_curSearchType==eSearchType_Topic){
-        ProjectTopic *topic = _dateSource[indexPath.row];
-        return [TopicSearchCell cellHeightWithObj:topic];
-    }else if (_curSearchType==eSearchType_Pull){
-        MRPR *mrpr = _dateSource[indexPath.row];
-        return [PRMRSearchCell cellHeightWithObj:mrpr];
+//    }else if(_curSearchType==eSearchType_Topic){
+//        ProjectTopic *topic = _dateSource[indexPath.row];
+//        return [TopicSearchCell cellHeightWithObj:topic];
+//    }else if (_curSearchType==eSearchType_Pull){
+//        MRPR *mrpr = _dateSource[indexPath.row];
+//        return [PRMRSearchCell cellHeightWithObj:mrpr];
     }else if (_curSearchType==eSearchType_Merge){
         MRPR *mrpr = _dateSource[indexPath.row];
         return [PRMRSearchCell cellHeightWithObj:mrpr];