冒泡搜索 - 移动到「热门话题」页面

Author: wanghengheng

Coding_iOS/Controllers/AllSearchDisplayVC.m

@@ -52,7 +52,6 @@ @interface AllSearchDisplayVC () <UISearchBarDelegate, UITableViewDelegate, UITa
 @property (nonatomic, strong) PublicSearchModel *searchPros;
 @property (nonatomic, strong) UIScrollView  *searchHistoryView;
 @property (nonatomic, assign) double historyHeight;
-- (void)initSubViewsInContentView;
 - (void)initSearchResultsTableView;
 - (void)initSearchHistoryView;
 - (void)didClickedMoreHotkey:(UIGestureRecognizer *)sender;

Coding_iOS/Controllers/RootControllers/Tweet_RootViewController.m

@@ -25,12 +25,10 @@
 #import "TweetSendLocationDetailViewController.h"
 #import "CodingBannersView.h"
 
-#import "CSSearchVC.h"
-#import "CSSearchDisplayVC.h"
 #import "FunctionTipsManager.h"
 #import "CSHotTopicPagesVC.h"
 
-@interface Tweet_RootViewController () <UISearchBarDelegate, UISearchDisplayDelegate>
+@interface Tweet_RootViewController ()
 {
     CGFloat _oldPanOffsetY;
 }
@@ -50,9 +48,6 @@ @interface Tweet_RootViewController () <UISearchBarDelegate, UISearchDisplayDele
 @property (strong, nonatomic) Tweet *deleteTweet;
 @property (nonatomic, assign) NSInteger deleteTweetsIndex;
 
-//搜索
-@property (nonatomic, strong) UISearchBar       *searchBar;
-@property (strong, nonatomic) CSSearchDisplayVC *searchDisplayVC;
 //Banner
 @property (strong, nonatomic) CodingBannersView *myBannersView;
 @end
@@ -104,7 +99,6 @@ - (void)viewDidLoad
 //                              [self refreshFirst];
 //                          }];
 
-//    UIBarButtonItem *leftBarItem =[UIBarButtonItem itemWithIcon:@"search_Nav" showBadge:NO target:self action:@selector(searchItemClicked:)];
     UIBarButtonItem *leftBarItem =[UIBarButtonItem itemWithIcon:@"hot_topic_Nav" showBadge:NO target:self action:@selector(hotTopicBtnClicked:)];
 
     [self.parentViewController.navigationItem setLeftBarButtonItem:leftBarItem animated:NO];
@@ -297,48 +291,6 @@ - (void)hotTopicBtnClicked:(id)sender{
     [self.navigationController pushViewController:vc animated:YES];
 }
 
-- (void)searchItemClicked:(id)sender{
-    if ([[FunctionTipsManager shareManager] needToTip:kFunctionTipStr_Search]) {
-        [[FunctionTipsManager shareManager] markTiped:kFunctionTipStr_Search];
-        UIButton *leftItemView = (UIButton *)self.parentViewController.navigationItem.leftBarButtonItem.customView;
-        [leftItemView removeBadgePoint];
-    }
-    
-    if(!_searchBar) {
-        
-        _searchBar = ({
-            
-            UISearchBar *searchBar = [[UISearchBar alloc] init];
-            searchBar.delegate = self;
-            [searchBar sizeToFit];
-            [searchBar setPlaceholder:@"搜索冒泡、用户名、话题"];
-            [searchBar setTintColor:[UIColor whiteColor]];
-            [searchBar setTranslucent:NO];
-            [searchBar insertBGColor:[UIColor colorWithHexString:@"0x28303b"]];
-            searchBar;
-        });
-        [self.parentViewController.navigationController.view addSubview:_searchBar];
-        [_searchBar setY:20];
-    }
-    
-    if (!_searchDisplayVC) {
-        _searchDisplayVC = ({
-            
-            CSSearchDisplayVC *searchVC = [[CSSearchDisplayVC alloc] initWithSearchBar:_searchBar contentsController:self.parentViewController];
-            searchVC.parentVC = self;
-//            searchVC.delegate = self;
-//            if (kHigher_iOS_6_1) {
-//                
-//                searchVC.displaysSearchBarInNavigationBar = NO;
-//            }
-            searchVC;
-        });
-    }
-
-    [self hideToolBar:YES];
-    [_searchBar becomeFirstResponder];
-}
-
 #pragma mark Refresh M
 
 - (void)refreshFirst{
@@ -610,36 +562,4 @@ - (void)dealloc
     _myTableView.dataSource = nil;
 }
 
-#pragma mark -
-#pragma mark UISearchBarDelegate Support
-
-- (BOOL)searchBarShouldBeginEditing:(UISearchBar *)searchBar {
-
-    return YES;
-}
-
-- (void)searchBar:(UISearchBar *)searchBar textDidChange:(NSString *)searchText {
-    
-}
-
-- (void)searchBarSearchButtonClicked:(UISearchBar *)searchBar {
-    
-}
-
-- (void)searchBarCancelButtonClicked:(UISearchBar *)searchBar {
-
-    [self hideToolBar:NO];
-}
-
-#pragma mark -
-#pragma mark UISearchDisplayDelegate Support
-
-- (void)searchDisplayController:(UISearchDisplayController *)controller didHideSearchResultsTableView:(UITableView *)tableView {
-    
-}
-
-- (void)searchDisplayControllerDidBeginSearch:(UISearchDisplayController *)controller {
-    
-}
-
 @end

Coding_iOS/Controllers/Search/CSSearchDisplayVC.m

@@ -49,7 +49,6 @@ @interface CSSearchDisplayVC () <UISearchBarDelegate, UITableViewDelegate, UITab
 - (void)initSubViewsInContentView;
 - (void)initSearchResultsTableView;
 - (void)initSearchHistoryView;
-- (void)didClickedMoreHotkey:(UIGestureRecognizer *)sender;
 - (void)didCLickedCleanSearchHistory:(id)sender;
 - (void)didClickedContentView:(UIGestureRecognizer *)sender;
 - (void)didClickedHistory:(UIGestureRecognizer *)sender;
@@ -125,9 +124,9 @@ - (void)setActive:(BOOL)visible animated:(BOOL)animated {
 //        [self.searchBar.superview addSubview:_backgroundView];
 //        [self.searchBar.superview addSubview:_contentView];
 //        [self.searchBar.superview bringSubviewToFront:_contentView];
-        [self.parentVC.parentViewController.view addSubview:_backgroundView];
-        [self.parentVC.parentViewController.view addSubview:_contentView];
-        [self.parentVC.parentViewController.view bringSubviewToFront:_contentView];
+        [self.parentVC.view addSubview:_backgroundView];
+        [self.parentVC.view addSubview:_contentView];
+        [self.parentVC.view bringSubviewToFront:_contentView];
         __weak typeof(self) weakSelf = self;
         self.searchBar.delegate = weakSelf;
     }
@@ -137,26 +136,9 @@ - (void)setActive:(BOOL)visible animated:(BOOL)animated {
 #pragma mark Private Method
 
 - (void)initSubViewsInContentView {
-
-    UILabel *lblHotKey = [[UILabel alloc] initWithFrame:CGRectMake(12.0f, 4.0f, kScreen_Width, 39.0f)];
-    [lblHotKey setUserInteractionEnabled:YES];
-    [lblHotKey setText:@"热门话题"];
-    [lblHotKey setFont:[UIFont systemFontOfSize:12.0f]];
-    [lblHotKey setTextColor:[UIColor colorWithHexString:@"0x999999"]];
-    [_contentView addSubview:lblHotKey];
-    
-    UITapGestureRecognizer *tapGestureRecognizer = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(didClickedMoreHotkey:)];
-    [lblHotKey addGestureRecognizer:tapGestureRecognizer];
-    
-    UIImageView *moreIconView = [[UIImageView alloc] initWithFrame:CGRectMake(0, 10.0f, 20.0f, 20.0f)];
-    moreIconView.image = [UIImage imageNamed:@"me_info_arrow_left"];
-    moreIconView.right = kScreen_Width - 12;
-    moreIconView.centerY = lblHotKey.centerY;
-    [_contentView addSubview:moreIconView];
-    
     __weak typeof(self) weakSelf = self;
 
-    _topicHotkeyView = [[TopicHotkeyView alloc] initWithFrame:CGRectMake(0, 44, kScreen_Width, 0)];
+    _topicHotkeyView = [[TopicHotkeyView alloc] initWithFrame:CGRectMake(0, 0, kScreen_Width, 0)];
     _topicHotkeyView.block = ^(NSDictionary *dict){
         [weakSelf.searchBar resignFirstResponder];
 
@@ -168,7 +150,7 @@ - (void)initSubViewsInContentView {
     [_contentView addSubview:_topicHotkeyView];
     [_topicHotkeyView mas_makeConstraints:^(MASConstraintMaker *make) {
         make.left.mas_equalTo(@0);
-        make.top.mas_equalTo(@44);
+        make.top.mas_equalTo(@0);
         make.width.mas_equalTo(kScreen_Width);
         make.height.mas_equalTo(@0);
     }];
@@ -188,9 +170,6 @@ - (void)initSubViewsInContentView {
 
             [weakSelf.topicHotkeyView setHotkeys:hotkeyArray];
             [weakSelf.topicHotkeyView mas_updateConstraints:^(MASConstraintMaker *make) {
-                make.left.mas_equalTo(@0);
-                make.top.mas_equalTo(@44);
-                make.width.mas_equalTo(kScreen_Width);
                 make.height.mas_equalTo(weakSelf.topicHotkeyView.frame.size.height);
             }];
         }
@@ -220,7 +199,7 @@ - (void)initSearchResultsTableView {
                 }];
             }
 
-            [self.parentVC.parentViewController.view addSubview:tableView];
+            [self.parentVC.view addSubview:tableView];
 
             self.headerLabel = ({
                 UILabel *label = [[UILabel alloc] initWithFrame:CGRectMake(0, 2, kScreen_Width, 44)];
@@ -244,10 +223,6 @@ - (void)initSearchResultsTableView {
         });
     }
     [_searchTableView.superview bringSubviewToFront:_searchTableView];
-//    [self.searchBar.superview bringSubviewToFront:_searchTableView];
-    
-    //    _refreshControl = [[ODRefreshControl alloc] initInScrollView:self.searchTableView];
-    //    [_refreshControl addTarget:self action:@selector(refresh) forControlEvents:UIControlEventValueChanged];
 
     [_searchTableView reloadData];
     [self refresh];
@@ -331,14 +306,6 @@ - (void)initSearchHistoryView {
 
 }
 
-- (void)didClickedMoreHotkey:(UIGestureRecognizer *)sender {
-    [self.searchBar resignFirstResponder];
-    
-    CSHotTopicPagesVC *vc = [CSHotTopicPagesVC new];
-    [self.parentVC.navigationController pushViewController:vc animated:YES];
-    
-}
-
 - (void)didCLickedCleanSearchHistory:(id)sender {
 
     [CSSearchModel cleanAllSearchHistory];
@@ -419,11 +386,11 @@ - (void)analyseLinkStr:(NSString *)linkStr{
     }
     UIViewController *vc = [BaseViewController analyseVCFromLinkStr:linkStr];
     if (vc) {
-        [self.parentVC.parentViewController.navigationController pushViewController:vc animated:YES];
+        [self.parentVC.navigationController pushViewController:vc animated:YES];
     }else{
         //网页
         WebViewController *webVc = [WebViewController webVCWithUrlStr:linkStr];
-        [self.parentVC.parentViewController.navigationController pushViewController:webVc animated:YES];
+        [self.parentVC.navigationController pushViewController:webVc animated:YES];
     }
 }
 
@@ -462,7 +429,7 @@ - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(N
     cell.userBtnClickedBlock = ^(User *curUser){
         UserInfoViewController *vc = [[UserInfoViewController alloc] init];
         vc.curUser = curUser;
-        [self.parentVC.parentViewController.navigationController pushViewController:vc animated:YES];
+        [self.parentVC.navigationController pushViewController:vc animated:YES];
     };
     cell.mediaItemClickedBlock = ^(HtmlMediaItem *curItem){
         [weakSelf analyseLinkStr:curItem.href];
@@ -485,7 +452,7 @@ - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath
     vc.curTweet = tweet;
     vc.deleteTweetBlock = ^(Tweet *toDeleteTweet){
     };
-    [self.parentVC.parentViewController.navigationController pushViewController:vc animated:YES];
+    [self.parentVC.navigationController pushViewController:vc animated:YES];
 
 }
 

Coding_iOS/Controllers/Topic/CSHotTopicPagesVC.m

@@ -11,13 +11,18 @@
 #import "CSHotTopicView.h"
 #import "CSMyTopicVC.h"
 #import "SMPageControl.h"
+#import "CSSearchVC.h"
+#import "CSSearchDisplayVC.h"
 
-@interface CSHotTopicPagesVC ()<UIScrollViewDelegate>
+@interface CSHotTopicPagesVC ()<UIScrollViewDelegate, UISearchBarDelegate, UISearchDisplayDelegate>
 @property (nonatomic,strong) UIScrollView *scrollView;
 @property (nonatomic,strong) SMPageControl *pageControl;
 @property (nonatomic,strong) UIView *navigationBarView;
 
 @property (nonatomic,strong)NSArray *navTitles;
+//搜索
+@property (nonatomic, strong) UISearchBar       *searchBar;
+@property (strong, nonatomic) CSSearchDisplayVC *searchDisplayVC;
 @end
 
 @implementation CSHotTopicPagesVC
@@ -26,7 +31,9 @@ @implementation CSHotTopicPagesVC
 - (void)viewDidLoad {
     [super viewDidLoad];
 
-    
+    UIBarButtonItem *rightBarItem =[UIBarButtonItem itemWithIcon:@"search_Nav" showBadge:NO target:self action:@selector(searchItemClicked:)];
+    [self.navigationItem setRightBarButtonItem:rightBarItem animated:NO];
+
     [self setupUI];
 }
 
@@ -46,6 +53,46 @@ -(void)viewWillDisappear:(BOOL)animated{
     [self.navigationBarView removeFromSuperview];
 }
 
+#pragma mark -
+- (void)searchItemClicked:(id)sender{
+    
+    if(!_searchBar) {
+        
+        _searchBar = ({
+            
+            UISearchBar *searchBar = [[UISearchBar alloc] init];
+            searchBar.delegate = self;
+            [searchBar sizeToFit];
+            [searchBar setPlaceholder:@"搜索冒泡、用户名、话题"];
+            [searchBar setTintColor:[UIColor whiteColor]];
+            [searchBar setTranslucent:NO];
+            [searchBar insertBGColor:[UIColor colorWithHexString:@"0x28303b"]];
+            searchBar;
+        });
+        [self.navigationController.view addSubview:_searchBar];
+        [_searchBar setY:20];
+    }
+    
+    if (!_searchDisplayVC) {
+        _searchDisplayVC = ({
+            CSSearchDisplayVC *searchVC = [[CSSearchDisplayVC alloc] initWithSearchBar:_searchBar contentsController:self];
+            searchVC.parentVC = self;
+            searchVC.delegate = self;
+            searchVC.displaysSearchBarInNavigationBar = NO;
+            searchVC;
+        });
+    }
+    
+    [_searchBar becomeFirstResponder];
+}
+
+#pragma mark -
+#pragma mark UISearchBarDelegate Support
+
+- (BOOL)searchBarShouldBeginEditing:(UISearchBar *)searchBar {
+    
+    return YES;
+}
 
 #pragma mark -
 

Coding_iOS/Views/Search/TopicHotkeyView.m

@@ -43,7 +43,7 @@ - (void)setHotkeys:(NSArray *)hotkeys {
     if(hotkeys.count) {
 
         CGFloat currentWidth = 10.0f;
-        CGFloat currentHeight = 0.0f;
+        CGFloat currentHeight = 15.0f;
         CGSize currentSize = CGSizeZero;
         CGFloat maxWidth = kScreen_Width - 20.0f;
         UIFont *hotkeyFont = [UIFont systemFontOfSize:12.0f];
@@ -99,7 +99,7 @@ - (void)setHotkeys:(NSArray *)hotkeys {
 
             if(i == hotkeys.count - 1) {
 
-                currentHeight += currentSize.height + 14.0f;
+                currentHeight += currentSize.height + 15.0f;
             }
 
             [self addSubview:btnHotkey];