添加高斯模糊和红点提醒

porcellio · porcellio · commit dfb17e787599 · 2015-07-22T00:46:15.000+08:00
diff --git a/Coding_iOS/Controllers/RootControllers/Tweet_RootViewController.m b/Coding_iOS/Controllers/RootControllers/Tweet_RootViewController.m
@@ -142,6 +142,7 @@ - (void)viewDidLoad
 
 - (void)viewWillDisappear:(BOOL)animated{
     [super viewWillDisappear:animated];
+    
     if (_myMsgInputView) {
         [_myMsgInputView prepareToDismiss];
     }
@@ -150,6 +151,14 @@ - (void)viewWillDisappear:(BOOL)animated{
 - (void)viewDidAppear:(BOOL)animated{
     [super viewDidAppear:animated];
     
+    UIButton *leftItemView = (UIButton *)self.parentViewController.navigationItem.leftBarButtonItem.customView;
+    if(![CSSearchModel hasClickedNewFeatureWithType:CSSNewFeatureTypeSearch]) {
+    
+        [leftItemView addBadgePoint:3 withPointPosition:CGPointMake(35, 10)];
+    }
+    
+//    [leftItemView addBadgePoint:3 withPosition:BadgePositionTypeDefault];
+    
     [self refreshFirst];
 
     //    &#38190;&#30424;
@@ -256,6 +265,10 @@ - (void)deleteComment:(Comment *)comment ofTweet:(Tweet *)tweet{
 
 - (void)searchItemClicked:(id)sender{
     
+    UIButton *leftItemView = (UIButton *)self.parentViewController.navigationItem.leftBarButtonItem.customView;
+    [CSSearchModel clickNewFeatureWithType:CSSNewFeatureTypeSearch];
+    [leftItemView removeBadgePoint];
+    
     if(!_searchBar) {
         
         _searchBar = ({
diff --git a/Coding_iOS/Controllers/Search/CSSearchDisplayVC.m b/Coding_iOS/Controllers/Search/CSSearchDisplayVC.m
@@ -12,6 +12,7 @@
 #import "Coding_NetAPIManager.h"
 #import "ODRefreshControl.h"
 #import "SVPullToRefresh.h"
+#import "XHRealTimeBlur.h"
 
 #import "CSSearchModel.h"
 
@@ -24,6 +25,7 @@
 @interface CSSearchDisplayVC () <UISearchBarDelegate, UITableViewDelegate, UITableViewDataSource>
 
 @property (nonatomic, strong) UIView *contentView;
+@property (nonatomic, strong) XHRealTimeBlur *backgroundView;
 @property (nonatomic, strong) UIButton *btnMore;
 @property (nonatomic, strong) TopicHotkeyView *topicHotkeyView;
 
@@ -41,6 +43,7 @@ - (void)initSearchResultsTableView;
 - (void)initSearchHistoryView;
 - (void)didClickedMoreHotkey:(id)sender;
 - (void)didCLickedCleanSearchHistory:(id)sender;
+- (void)didClickedContentView:(UIGestureRecognizer *)sender;
 @end
 
 @implementation CSSearchDisplayVC
@@ -51,6 +54,7 @@ - (void)setActive:(BOOL)visible animated:(BOOL)animated {
     
         if(_contentView) {
         
+            [_backgroundView removeFromSuperview];
             [_contentView removeFromSuperview];
             [_searchTableView removeFromSuperview];
             [super setActive:visible animated:animated];
@@ -75,14 +79,31 @@ - (void)setActive:(BOOL)visible animated:(BOOL)animated {
         }
         
         if(!_contentView) {
+
+            _contentView = ({
+            
+                UIView *view = [[UIView alloc] init];
+                view.frame = CGRectMake(0.0f, 60.0f, kScreen_Width, kScreen_Height - 60.0f);
+                view.backgroundColor = [UIColor clearColor];
+                view.userInteractionEnabled = YES;
+                
+                UITapGestureRecognizer *tapGestureRecognizer = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(didClickedContentView:)];
+                [view addGestureRecognizer:tapGestureRecognizer];
+                
+                view;
+            });
+            
+            _backgroundView = ({
             
-            _contentView = [[UIView alloc] init];
-            _contentView.frame = CGRectMake(0.0f, 60.0f, kScreen_Width, kScreen_Height - 60.0f);
-            _contentView.backgroundColor = [UIColor whiteColor];
+                XHRealTimeBlur *blur = [[XHRealTimeBlur alloc] initWithFrame:_contentView.frame];
+                blur.blurStyle = XHBlurStyleTranslucentWhite;
+                blur;
+            });
             
             [self initSubViewsInContentView];
         }
         
+        [self.searchBar.superview addSubview:_backgroundView];
         [self.searchBar.superview addSubview:_contentView];
         [self.searchBar.superview bringSubviewToFront:_contentView];
         __weak typeof(self) weakSelf = self;
@@ -108,6 +129,8 @@ - (void)initSubViewsInContentView {
     [_btnMore addTarget:self action:@selector(didClickedMoreHotkey:) forControlEvents:UIControlEventTouchUpInside];
     [_contentView addSubview:_btnMore];
     
+//    [_btnMore addBadgePoint:2 withPosition:BadgePositionTypeMiddle];
+    
     _topicHotkeyView = [[TopicHotkeyView alloc] init];
     [_contentView addSubview:_topicHotkeyView];
     [_topicHotkeyView mas_makeConstraints:^(MASConstraintMaker *make) {
@@ -137,8 +160,6 @@ - (void)initSubViewsInContentView {
                 make.width.mas_equalTo(kScreen_Width);
                 make.height.mas_equalTo(weakSelf.topicHotkeyView.frame.size.height);
             }];
-//            [weakSelf.searchHistoryView setFrame:CGRectMake(weakSelf.searchHistoryView.frame.origin.x, weakSelf.topicHotkeyView.frame.origin.y + weakSelf.topicHotkeyView.frame.size.height,
-//                                                            weakSelf.searchHistoryView.frame.size.width, weakSelf.searchHistoryView.frame.size.height)];
         }
     }];
 }
@@ -256,6 +277,11 @@ - (void)didCLickedCleanSearchHistory:(id)sender {
     [self initSearchHistoryView];
 }
 
+- (void)didClickedContentView:(UIGestureRecognizer *)sender {
+
+    [self.searchBar resignFirstResponder];
+}
+
 #pragma mark -
 #pragma mark Search Data Request
 
diff --git a/Coding_iOS/Controllers/Search/CSSearchModel.h b/Coding_iOS/Controllers/Search/CSSearchModel.h
@@ -8,8 +8,17 @@
 
 #import <Foundation/Foundation.h>
 
+typedef NS_ENUM(NSInteger, CSSNewFeatureType) {
+    
+    CSSNewFeatureTypeTopic = 0,
+    CSSNewFeatureTypeSearch,
+    CSSNewFeatureTypeHotTopic
+};
+
 @interface CSSearchModel : NSObject
 
++ (BOOL)hasClickedNewFeatureWithType:(CSSNewFeatureType)type;
++ (void)clickNewFeatureWithType:(CSSNewFeatureType)type;
 
 + (BOOL)hasSearchBadgeShown;
 + (void)invalidSearchBadge;
diff --git a/Coding_iOS/Controllers/Search/CSSearchModel.m b/Coding_iOS/Controllers/Search/CSSearchModel.m
@@ -11,9 +11,30 @@
 
 #define kHasSearchBadgeShown @"com.cs.search.badge.hasShown"
 #define kSearchHistory @"com.cs.search.history"
+#define kNewFeature @"com.cs.NewFeature"
 
 @implementation CSSearchModel
 
++ (BOOL)hasClickedNewFeatureWithType:(CSSNewFeatureType)type {
+
+    NSString *key = [kNewFeature stringByAppendingString:[NSString stringWithFormat:@"_%ld", (long)type]];
+    id hasClicked = [[TMCache TemporaryCache] objectForKey:key];
+    if(!hasClicked) {
+    
+        [[TMCache TemporaryCache] setObject:@(NO) forKey:key];
+    }else {
+    
+        return [hasClicked boolValue];
+    }
+    return NO;
+}
+
++ (void)clickNewFeatureWithType:(CSSNewFeatureType)type {
+
+     NSString *key = [kNewFeature stringByAppendingString:[NSString stringWithFormat:@"_%ld", (long)type]];
+    [[TMCache TemporaryCache] setObject:@(YES) forKey:key];
+}
+
 + (BOOL)hasSearchBadgeShown {
     BOOL hasShown = [[[TMCache TemporaryCache] objectForKey:kHasSearchBadgeShown] boolValue];
     return hasShown;
diff --git a/Coding_iOS/Util/OC_Category/UIBarButtonItem+Common.m b/Coding_iOS/Util/OC_Category/UIBarButtonItem+Common.m
@@ -23,7 +23,6 @@ + (UIBarButtonItem *)itemWithIcon:(NSString*)iconName showBadge:(BOOL)showbadge
     CGSize imgSize = button.imageView.image.size;
     button.size = CGSizeMake(imgSize.width + 20, imgSize.height + 20);
     
-    
     if (showbadge) {
         [button addRoundingCorners:UIRectCornerBottomLeft | UIRectCornerBottomRight cornerRadii:CGSizeMake(2, 2)];
 //        CGFloat pointX = button.frame.size.width - 15;
diff --git a/Coding_iOS/Util/OC_Category/UIView+Common.h b/Coding_iOS/Util/OC_Category/UIView+Common.h
@@ -27,6 +27,12 @@ typedef NS_ENUM(NSInteger, EaseBlankPageType)
     EaseBlankPageTypePrivateMsg
 };
 
+typedef NS_ENUM(NSInteger, BadgePositionType) {
+
+    BadgePositionTypeDefault = 0,
+    BadgePositionTypeMiddle
+};
+
 @interface UIView (Common)
 - (void)doCircleFrame;
 - (void)doNotCircleFrame;
@@ -35,6 +41,9 @@ typedef NS_ENUM(NSInteger, EaseBlankPageType)
 - (UIViewController *)findViewController;
 - (void)addBadgeTip:(NSString *)badgeValue withCenterPosition:(CGPoint)center;
 - (void)addBadgeTip:(NSString *)badgeValue;
+- (void)addBadgePoint:(NSInteger)pointRadius withPosition:(BadgePositionType)type;
+- (void)addBadgePoint:(NSInteger)pointRadius withPointPosition:(CGPoint)point;
+- (void)removeBadgePoint;
 - (void)removeBadgeTips;
 - (void)setY:(CGFloat)y;
 - (void)setX:(CGFloat)x;
diff --git a/Coding_iOS/Util/OC_Category/UIView+Common.m b/Coding_iOS/Util/OC_Category/UIView+Common.m
@@ -8,6 +8,7 @@
 
 #import "UIView+Common.h"
 #define kTagBadgeView  1000
+#define kTagBadgePointView  1001
 #define kTagLineView 1007
 #import <objc/runtime.h>
 @implementation UIView (Common)
@@ -46,6 +47,57 @@ - (UIViewController *)findViewController
     return nil;
 }
 
+- (void)addBadgePoint:(NSInteger)pointRadius withPosition:(BadgePositionType)type {
+
+    if(pointRadius < 1)
+        return;
+    
+    [self removeBadgePoint];
+    
+    UIView *badgeView = [[UIView alloc]init];
+    badgeView.tag = kTagBadgePointView;
+    badgeView.layer.cornerRadius = pointRadius;
+    badgeView.backgroundColor = [UIColor redColor];
+    
+    switch (type) {
+            
+        case BadgePositionTypeMiddle:
+            badgeView.frame = CGRectMake(0, self.frame.size.height / 2 - pointRadius, 2 * pointRadius, 2 * pointRadius);
+            break;
+            
+        default:
+            badgeView.frame = CGRectMake(self.frame.size.width - 2 * pointRadius, 0, 2 * pointRadius, 2 * pointRadius);
+            break;
+    }
+    
+    [self addSubview:badgeView];
+}
+
+- (void)addBadgePoint:(NSInteger)pointRadius withPointPosition:(CGPoint)point {
+
+    if(pointRadius < 1)
+        return;
+    
+    [self removeBadgePoint];
+    
+    UIView *badgeView = [[UIView alloc]init];
+    badgeView.tag = kTagBadgePointView;
+    badgeView.layer.cornerRadius = pointRadius;
+    badgeView.backgroundColor = [UIColor redColor];
+    badgeView.frame = CGRectMake(0, 0, 2 * pointRadius, 2 * pointRadius);
+    badgeView.center = point;
+    [self addSubview:badgeView];
+}
+
+- (void)removeBadgePoint {
+
+    for (UIView *subView in self.subviews) {
+        
+        if(subView.tag == kTagBadgePointView)
+           [subView removeFromSuperview];
+    }
+}
+
 - (void)addBadgeTip:(NSString *)badgeValue withCenterPosition:(CGPoint)center{
     if (!badgeValue || !badgeValue.length) {
         [self removeBadgeTips];
diff --git a/Coding_iOS/Views/Cell/TweetSendTextCell.m b/Coding_iOS/Views/Cell/TweetSendTextCell.m
@@ -13,6 +13,7 @@
 #import "TweetSendTextCell.h"
 #import "UsersViewController.h"
 #import "CSTopicCreateVC.h"
+#import "CSSearchModel.h"
 
 @interface TweetSendTextCell () <AGEmojiKeyboardViewDelegate, AGEmojiKeyboardViewDataSource>
 @property (strong, nonatomic) AGEmojiKeyboardView *emojiKeyboardView;
@@ -125,6 +126,11 @@ - (UIView *)keyboardToolBar{
             
             UIButton *atButton = [self toolButtonWithToolBarFrame:keyboardToolBar.frame index:3 imageStr:@"keyboard_at" andSelecter:@selector(atButtonClicked:)];
             [keyboardToolBar addSubview:atButton];
+            
+            if(![CSSearchModel hasClickedNewFeatureWithType:CSSNewFeatureTypeTopic]) {
+                
+                [topicButton addBadgePoint:3 withPointPosition:CGPointMake(27, 7)];
+            }
         }
         
         [_footerToolBar addSubview:keyboardToolBar];
@@ -192,6 +198,11 @@ - (void)atButtonClicked:(id)sender{
 }
 
 - (void)topicButtonClicked:(id)sender{
+    
+    UIButton *btnTopic = (UIButton *)sender;
+    [btnTopic removeBadgePoint];
+    [CSSearchModel clickNewFeatureWithType:CSSNewFeatureTypeTopic];
+    
     @weakify(self);
     [CSTopicCreateVC showATSomeoneWithBlock:^(NSString *topicName) {
         @strongify(self);
