merge

panshiyu · panshiyu · commit b72bfd493bb8 · 2015-07-29T00:23:22.000+08:00
diff --git a/.DS_Store b/.DS_Store
diff --git a/Coding_iOS/.DS_Store b/Coding_iOS/.DS_Store
diff --git a/Coding_iOS/Controllers/RootControllers/Tweet_RootViewController.m b/Coding_iOS/Controllers/RootControllers/Tweet_RootViewController.m
@@ -152,7 +152,7 @@ - (void)viewDidAppear:(BOOL)animated{
     
     UIButton *leftItemView = (UIButton *)self.parentViewController.navigationItem.leftBarButtonItem.customView;
     if ([[FunctionTipsManager shareManager] needToTip:kFunctionTipStr_Search]) {
-        [leftItemView addBadgePoint:3 withPointPosition:CGPointMake(35, 10)];
+        [leftItemView addBadgePoint:3 withPointPosition:CGPointMake(25, 0)];
     }
     
     [self refreshFirst];
diff --git a/Coding_iOS/Controllers/Search/CSSearchDisplayVC.m b/Coding_iOS/Controllers/Search/CSSearchDisplayVC.m
@@ -241,7 +241,7 @@ - (void)initSearchHistoryView {
             make.top.mas_equalTo(_topicHotkeyView.mas_bottom);
             make.left.mas_equalTo(@0);
             make.width.mas_equalTo(kScreen_Width);
-            make.height.mas_equalTo(@280);
+            make.height.mas_equalTo(@350);
         }];
     }
     
diff --git a/Coding_iOS/Controllers/Search/CSSearchModel.m b/Coding_iOS/Controllers/Search/CSSearchModel.m
@@ -31,7 +31,7 @@ + (void)addSearchHistory:(NSString *)searchString {
     
     NSMutableArray *history = [NSMutableArray arrayWithArray:[CSSearchModel getSearchHistory]];
     if(![history containsObject:searchString]) {
-        if(history.count >= 3)
+        if(history.count >= 8)
             [history removeLastObject];
         [history insertObject:searchString atIndex:0];
         [[TMCache TemporaryCache] setObject:history forKey:kSearchHistory];
diff --git a/Coding_iOS/Controllers/Topic/CSTopicDetailVC.m b/Coding_iOS/Controllers/Topic/CSTopicDetailVC.m
@@ -28,7 +28,6 @@ @implementation CSTopicDetailVC
 - (void)viewDidLoad {
     [super viewDidLoad];
 
-    
     [self setupData];
     [self setupUI];
     
@@ -100,7 +99,7 @@ - (void) setupUI {
     
     _myTableView = ({
         UITableView *tableView = [[UITableView alloc] initWithFrame:self.view.bounds style:UITableViewStylePlain];
-        tableView.backgroundColor = [UIColor clearColor];
+        tableView.backgroundColor = [UIColor whiteColor];
         tableView.dataSource = self;
         tableView.delegate = self;
         tableView.separatorStyle = UITableViewCellSeparatorStyleNone;
diff --git a/Coding_iOS/Util/OC_Category/UIBarButtonItem+Common.m b/Coding_iOS/Util/OC_Category/UIBarButtonItem+Common.m
@@ -17,17 +17,17 @@ + (UIBarButtonItem *)itemWithBtnTitle:(NSString *)title target:(id)obj action:(S
 
 + (UIBarButtonItem *)itemWithIcon:(NSString*)iconName showBadge:(BOOL)showbadge target:(id)obj action:(SEL)selector {
     UIButton* button = [[UIButton alloc] init];
-    button.imageEdgeInsets = UIEdgeInsetsMake(10, 0, 10, 0);
+    button.imageEdgeInsets = UIEdgeInsetsMake(-2, 0, 0, 0);
     [button setImage:[UIImage imageNamed:iconName] forState:UIControlStateNormal];
     [button setImage:[UIImage imageNamed:iconName] forState:UIControlStateHighlighted];
     CGSize imgSize = button.imageView.image.size;
-    button.size = CGSizeMake(imgSize.width + 20, imgSize.height + 20);
+    button.size = CGSizeMake(imgSize.width, imgSize.height);
     
-    if (showbadge) {
-        [button addRoundingCorners:UIRectCornerBottomLeft | UIRectCornerBottomRight cornerRadii:CGSizeMake(2, 2)];
+//    if (showbadge) {
+//        [button addRoundingCorners:UIRectCornerBottomLeft | UIRectCornerBottomRight cornerRadii:CGSizeMake(2, 2)];
 //        CGFloat pointX = button.frame.size.width - 15;
 //        [button addBadgeTip:@"1" withCenterPosition:CGPointMake(pointX, 5)];
-    }
+//    }
 
     [button addTarget:obj action:selector forControlEvents:UIControlEventTouchUpInside];
     return [[UIBarButtonItem alloc] initWithCustomView:button];;

Original file line number	Diff line number	Diff line change
`@@ -152,7 +152,7 @@ - (void)viewDidAppear:(BOOL)animated{`
`152`	`152`
`153`	`153`	`UIButton leftItemView = (UIButton )self.parentViewController.navigationItem.leftBarButtonItem.customView;`
`154`	`154`	`if ([[FunctionTipsManager shareManager] needToTip:kFunctionTipStr_Search]) {`
`155`		`- [leftItemView addBadgePoint:3 withPointPosition:CGPointMake(35, 10)];`
	`155`	`+ [leftItemView addBadgePoint:3 withPointPosition:CGPointMake(25, 0)];`
`156`	`156`	`}`
`157`	`157`
`158`	`158`	`[self refreshFirst];`
Original file line number	Diff line number	Diff line change
`@@ -241,7 +241,7 @@ - (void)initSearchHistoryView {`
`241`	`241`	`make.top.mas_equalTo(_topicHotkeyView.mas_bottom);`
`242`	`242`	`make.left.mas_equalTo(@0);`
`243`	`243`	`make.width.mas_equalTo(kScreen_Width);`
`244`		`- make.height.mas_equalTo(@280);`
	`244`	`+ make.height.mas_equalTo(@350);`
`245`	`245`	`}];`
`246`	`246`	`}`
`247`	`247`