修改小红点统计方式

panshiyu · panshiyu · commit db866f90fa6c · 2015-07-24T04:23:42.000+08:00
diff --git a/Coding_iOS/Controllers/RootControllers/Tweet_RootViewController.m b/Coding_iOS/Controllers/RootControllers/Tweet_RootViewController.m
@@ -26,6 +26,7 @@
 
 #import "CSSearchVC.h"
 #import "CSSearchDisplayVC.h"
+#import "FunctionTipsManager.h"
 
 @interface Tweet_RootViewController () <UISearchBarDelegate, UISearchDisplayDelegate>
 {
@@ -99,9 +100,7 @@ - (void)viewDidLoad
 //                              [self refreshFirst];
 //                          }];
     
-    BOOL isBadgeValid = ![CSSearchModel hasSearchBadgeShown];
-    isBadgeValid = YES;
-    UIBarButtonItem *leftBarItem =[UIBarButtonItem itemWithIcon:@"search_Nav" showBadge:isBadgeValid target:self action:@selector(searchItemClicked:)];
+    UIBarButtonItem *leftBarItem =[UIBarButtonItem itemWithIcon:@"search_Nav" showBadge:NO target:self action:@selector(searchItemClicked:)];
     [self.parentViewController.navigationItem setLeftBarButtonItem:leftBarItem animated:NO];
     
     _tweetsDict = [[NSMutableDictionary alloc] initWithCapacity:4];
@@ -152,13 +151,10 @@ - (void)viewDidAppear:(BOOL)animated{
     [super viewDidAppear:animated];
     
     UIButton *leftItemView = (UIButton *)self.parentViewController.navigationItem.leftBarButtonItem.customView;
-    if(![CSSearchModel hasClickedNewFeatureWithType:CSSNewFeatureTypeSearch]) {
-    
+    if ([[FunctionTipsManager shareManager] needToTip:kFunctionTipStr_Search]) {
         [leftItemView addBadgePoint:3 withPointPosition:CGPointMake(35, 10)];
     }
     
-//    [leftItemView addBadgePoint:3 withPosition:BadgePositionTypeDefault];
-    
     [self refreshFirst];
 
     //    &#38190;&#30424;
@@ -264,10 +260,11 @@ - (void)deleteComment:(Comment *)comment ofTweet:(Tweet *)tweet{
 #pragma mark - search 
 
 - (void)searchItemClicked:(id)sender{
-    
-    UIButton *leftItemView = (UIButton *)self.parentViewController.navigationItem.leftBarButtonItem.customView;
-    [CSSearchModel clickNewFeatureWithType:CSSNewFeatureTypeSearch];
-    [leftItemView removeBadgePoint];
+    if ([[FunctionTipsManager shareManager] needToTip:kFunctionTipStr_Search]) {
+        [[FunctionTipsManager shareManager] markTiped:kFunctionTipStr_Search];
+        UIButton *leftItemView = (UIButton *)self.parentViewController.navigationItem.leftBarButtonItem.customView;
+        [leftItemView removeBadgePoint];
+    }
     
     if(!_searchBar) {
         
@@ -303,13 +300,6 @@ - (void)searchItemClicked:(id)sender{
     [self hideToolBar:YES];
     [_searchBar becomeFirstResponder];
     
-//    BOOL isBadgeValid = ![CSSearchModel hasSearchBadgeShown];
-//    if (isBadgeValid) {
-//        //&#23384;&#19968;&#19979;
-//        [CSSearchModel invalidSearchBadge];
-//        UIBarButtonItem *leftBarItem =[UIBarButtonItem itemWithIcon:@"search_Nav" showBadge:NO target:self action:@selector(searchItemClicked:)];
-//        [self.navigationItem setLeftBarButtonItem:leftBarItem animated:NO];
-//    }
 }
 
 #pragma mark Refresh M
diff --git a/Coding_iOS/Controllers/Search/CSSearchModel.h b/Coding_iOS/Controllers/Search/CSSearchModel.h
@@ -8,21 +8,9 @@
 
 #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;
-
 + (NSArray *)getSearchHistory;
 + (void)addSearchHistory:(NSString *)searchString;
 + (void)cleanAllSearchHistory;
diff --git a/Coding_iOS/Controllers/Search/CSSearchModel.m b/Coding_iOS/Controllers/Search/CSSearchModel.m
@@ -15,34 +15,6 @@
 
 @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;
-}
-
-+ (void)invalidSearchBadge{
-    [[TMCache TemporaryCache] setObject:@(YES) forKey:kHasSearchBadgeShown];
-}
 
 + (NSArray *)getSearchHistory {
 
diff --git a/Coding_iOS/Util/Manager/FunctionTipsManager.h b/Coding_iOS/Util/Manager/FunctionTipsManager.h
@@ -11,7 +11,13 @@ static NSString *kFunctionTipStr_MR = @"MergeRequest";
 static NSString *kFunctionTipStr_PR = @"PullRequest";
 static NSString *kFunctionTipStr_ReadMe = @"ReadMe";
 static NSString *kFunctionTipStr_CommitList = @"Code_CommitList";
+static NSString *kFunctionTipStr_Search = @"hasSearch";
+static NSString *kFunctionTipStr_HotTopic = @"HotTopic";
+static NSString *kFunctionTipStr_TweetTopic = @"TweetTopic";
 
+//CSSNewFeatureTypeTopic = 0,
+//CSSNewFeatureTypeSearch,
+//CSSNewFeatureTypeHotTopic
 
 #import <Foundation/Foundation.h>
 
diff --git a/Coding_iOS/Util/Manager/FunctionTipsManager.m b/Coding_iOS/Util/Manager/FunctionTipsManager.m
@@ -36,6 +36,9 @@ - (instancetype)init
 //                           kFunctionTipStr_PR: @(YES),
 //                           kFunctionTipStr_ReadMe: @(YES),
 //                           kFunctionTipStr_CommitList: @(YES),
+                           kFunctionTipStr_Search: @(YES),
+                           kFunctionTipStr_HotTopic: @(YES),
+                           kFunctionTipStr_TweetTopic: @(YES),
                            } mutableCopy];
             [_tipsDict writeToFile:[self p_cacheFilePath] atomically:YES];
         }
diff --git a/Coding_iOS/Views/Cell/TweetSendTextCell.m b/Coding_iOS/Views/Cell/TweetSendTextCell.m
@@ -13,7 +13,7 @@
 #import "TweetSendTextCell.h"
 #import "UsersViewController.h"
 #import "CSTopicCreateVC.h"
-#import "CSSearchModel.h"
+#import "FunctionTipsManager.h"
 
 @interface TweetSendTextCell () <AGEmojiKeyboardViewDelegate, AGEmojiKeyboardViewDataSource>
 @property (strong, nonatomic) AGEmojiKeyboardView *emojiKeyboardView;
@@ -127,8 +127,8 @@ - (UIView *)keyboardToolBar{
             UIButton *atButton = [self toolButtonWithToolBarFrame:keyboardToolBar.frame index:3 imageStr:@"keyboard_at" andSelecter:@selector(atButtonClicked:)];
             [keyboardToolBar addSubview:atButton];
             
-            if(![CSSearchModel hasClickedNewFeatureWithType:CSSNewFeatureTypeTopic]) {
-                
+            
+            if ([[FunctionTipsManager shareManager] needToTip:kFunctionTipStr_TweetTopic]) {
                 [topicButton addBadgePoint:3 withPointPosition:CGPointMake(27, 7)];
             }
         }
@@ -198,10 +198,11 @@ - (void)atButtonClicked:(id)sender{
 }
 
 - (void)topicButtonClicked:(id)sender{
-    
-    UIButton *btnTopic = (UIButton *)sender;
-    [btnTopic removeBadgePoint];
-    [CSSearchModel clickNewFeatureWithType:CSSNewFeatureTypeTopic];
+    if ([[FunctionTipsManager shareManager] needToTip:kFunctionTipStr_TweetTopic]) {
+        [[FunctionTipsManager shareManager] markTiped:kFunctionTipStr_TweetTopic];
+        UIButton *btnTopic = (UIButton *)sender;
+        [btnTopic removeBadgePoint];
+    }
     
     @weakify(self);
     [CSTopicCreateVC showATSomeoneWithBlock:^(NSString *topicName) {
