简单处理&警告处理

wanghengheng · wanghengheng · commit 94a4b14efeec · 2015-08-07T15:27:49.000+08:00
diff --git a/.DS_Store b/.DS_Store
diff --git a/Coding_iOS.xcodeproj/project.pbxproj b/Coding_iOS.xcodeproj/project.pbxproj
@@ -507,9 +507,7 @@
 		8B888E421B72618200806CEE /* CSHotTopicPagesVC.m in Sources */ = {isa = PBXBuildFile; fileRef = 8B888E411B72618200806CEE /* CSHotTopicPagesVC.m */; };
 		8BDF9AA61B7456060093BF2C /* HotTopicBannerView.m in Sources */ = {isa = PBXBuildFile; fileRef = 8BDF9AA51B7456060093BF2C /* HotTopicBannerView.m */; };
 		8BDF9AB51B7474990093BF2C /* keyboard_topic@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 8BDF9AB01B7474990093BF2C /* keyboard_topic@2x.png */; };
-		8BDF9AB61B7474990093BF2C /* keyboard_topic@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 8BDF9AB11B7474990093BF2C /* keyboard_topic@2x.png */; };
 		8BDF9AB71B7474990093BF2C /* liziyundong.jpg in Resources */ = {isa = PBXBuildFile; fileRef = 8BDF9AB21B7474990093BF2C /* liziyundong.jpg */; };
-		8BDF9AB81B7474990093BF2C /* user_info_topic@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 8BDF9AB31B7474990093BF2C /* user_info_topic@2x.png */; };
 		8BDF9AB91B7474990093BF2C /* user_info_topic@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 8BDF9AB41B7474990093BF2C /* user_info_topic@2x.png */; };
 		8E03D4A219F695FE0092F8C8 /* libMobClickLibrary.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 8E03D49F19F695FE0092F8C8 /* libMobClickLibrary.a */; };
 		8E03D4A419F696970092F8C8 /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 8E03D4A319F696970092F8C8 /* libz.dylib */; };
@@ -1601,9 +1599,7 @@
 		8BDF9AA41B7456060093BF2C /* HotTopicBannerView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HotTopicBannerView.h; sourceTree = "<group>"; };
 		8BDF9AA51B7456060093BF2C /* HotTopicBannerView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HotTopicBannerView.m; sourceTree = "<group>"; };
 		8BDF9AB01B7474990093BF2C /* keyboard_topic@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "keyboard_topic@2x.png"; path = "keyboard/keyboard_topic@2x.png"; sourceTree = "<group>"; };
-		8BDF9AB11B7474990093BF2C /* keyboard_topic@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "keyboard_topic@2x.png"; sourceTree = "<group>"; };
 		8BDF9AB21B7474990093BF2C /* liziyundong.jpg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; path = liziyundong.jpg; sourceTree = "<group>"; };
-		8BDF9AB31B7474990093BF2C /* user_info_topic@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "user_info_topic@2x.png"; sourceTree = "<group>"; };
 		8BDF9AB41B7474990093BF2C /* user_info_topic@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "user_info_topic@2x.png"; path = "userInfo/user_info_topic@2x.png"; sourceTree = "<group>"; };
 		8E03D49F19F695FE0092F8C8 /* libMobClickLibrary.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libMobClickLibrary.a; sourceTree = "<group>"; };
 		8E03D4A019F695FE0092F8C8 /* MobClick.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MobClick.h; sourceTree = "<group>"; };
@@ -3490,9 +3486,7 @@
 			isa = PBXGroup;
 			children = (
 				8BDF9AB01B7474990093BF2C /* keyboard_topic@2x.png */,
-				8BDF9AB11B7474990093BF2C /* keyboard_topic@2x.png */,
 				8BDF9AB21B7474990093BF2C /* liziyundong.jpg */,
-				8BDF9AB31B7474990093BF2C /* user_info_topic@2x.png */,
 				8BDF9AB41B7474990093BF2C /* user_info_topic@2x.png */,
 				4E0022A11B7362EF005308DE /* intro_pages */,
 				4E095A751B6B1E40008DC439 /* deadline_calendar */,
@@ -4493,7 +4487,6 @@
 				4E6383D41B32665700D98648 /* project_item_member@2x.png in Resources */,
 				8EA6D19E19E240C40076D59C /* tipIcon_Tweet@2x.png in Resources */,
 				8E97CE9B1A0C7E26006F9AD7 /* coding_emoji_04@2x.png in Resources */,
-				8BDF9AB61B7474990093BF2C /* keyboard_topic@2x.png in Resources */,
 				8EA6D16D19E240C40076D59C /* nav_tweet_hot@2x.png in Resources */,
 				4E6383D81B32665700D98648 /* project_item_topic@2x.png in Resources */,
 				4E96E7DC1A1B537E0037C098 /* icon_file_md@2x.png in Resources */,
@@ -4568,7 +4561,6 @@
 				4E66EE281A28226000DA1B3E /* button_file_denete_unable@2x.png in Resources */,
 				8E97CE4A1A0A2E11006F9AD7 /* EmojisList.plist in Resources */,
 				8BDF9AB51B7474990093BF2C /* keyboard_topic@2x.png in Resources */,
-				8BDF9AB81B7474990093BF2C /* user_info_topic@2x.png in Resources */,
 				4EBFBD181AA85B8500E4B10E /* add_user_icon@2x.png in Resources */,
 				8E97CEA21A0C7E26006F9AD7 /* coding_emoji_11@2x.png in Resources */,
 				4E996C061ABBF56A00C704F1 /* n_sex_woman_icon@2x.png in Resources */,
diff --git a/Coding_iOS/.DS_Store b/Coding_iOS/.DS_Store
diff --git a/Coding_iOS/Coding_iOS-Info.plist b/Coding_iOS/Coding_iOS-Info.plist
@@ -9,7 +9,7 @@
 	<key>CFBundleExecutable</key>
 	<string>${EXECUTABLE_NAME}</string>
 	<key>CFBundleIdentifier</key>
-	<string>$(PRODUCT_BUNDLE_IDENTIFIER).code</string>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>
diff --git a/Coding_iOS/Controllers/Search/CSSearchDisplayVC.m b/Coding_iOS/Controllers/Search/CSSearchDisplayVC.m
@@ -409,7 +409,7 @@ - (void)requestDataWithPage:(NSInteger)page {
         }
         
         weakSelf.isLoading = NO;
-        weakSelf.headerLabel.text = [NSString stringWithFormat:@"共搜索到 %d 个与\"%@\"相关的冒泡", weakSelf.totalCount, weakSelf.searchBar.text, nil];
+        weakSelf.headerLabel.text = [NSString stringWithFormat:@"共搜索到 %ld 个与\"%@\"相关的冒泡", (long)weakSelf.totalCount, weakSelf.searchBar.text, nil];
     }];
 }
 
@@ -483,14 +483,7 @@ - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath
     
     TweetDetailViewController *vc = [[TweetDetailViewController alloc] init];
     vc.curTweet = tweet;
-    __weak typeof(self) weakSelf = self;
     vc.deleteTweetBlock = ^(Tweet *toDeleteTweet){
-//        Tweets *curTweets = [weakSelf.tweetsDict objectForKey:[NSNumber numberWithInteger:weakSelf.curIndex]];
-//        [curTweets.list removeObject:toDeleteTweet];
-//        [weakSelf.myTableView reloadData];
-//        [weakSelf.view configBlankPage:EaseBlankPageTypeTweet hasData:(curTweets.list.count > 0) hasError:NO reloadButtonBlock:^(id sender) {
-//            [weakSelf sendRequest];
-//        }];
     };
     [self.parentVC.parentViewController.navigationController pushViewController:vc animated:YES];
     
diff --git a/Coding_iOS/Controllers/Topic/CSTopicDetailVC.h b/Coding_iOS/Controllers/Topic/CSTopicDetailVC.h
@@ -11,7 +11,7 @@
 
 @interface CSTopicDetailVC : UIViewController
 //@property (nonatomic,strong)NSDictionary *topic;
-@property (nonatomic,assign)NSInteger topicID;
+@property (nonatomic,assign) NSInteger topicID;
 @end
 
 @interface CSTopTweetDescCell : UITableViewCell
diff --git a/Coding_iOS/Controllers/Topic/CSTopicDetailVC.m b/Coding_iOS/Controllers/Topic/CSTopicDetailVC.m
@@ -234,14 +234,7 @@ - (void)deleteComment:(Comment *)comment ofTweet:(Tweet *)tweet{
 - (void)goToDetailWithTweet:(Tweet *)curTweet{
     TweetDetailViewController *vc = [[TweetDetailViewController alloc] init];
     vc.curTweet = curTweet;
-    __weak typeof(self) weakSelf = self;
     vc.deleteTweetBlock = ^(Tweet *toDeleteTweet){
-//        Tweets *curTweets = [weakSelf.tweetsDict objectForKey:[NSNumber numberWithInteger:weakSelf.curIndex]];
-//        [curTweets.list removeObject:toDeleteTweet];
-//        [weakSelf.myTableView reloadData];
-//        [weakSelf.view configBlankPage:EaseBlankPageTypeTweet hasData:(curTweets.list.count > 0) hasError:NO reloadButtonBlock:^(id sender) {
-//            [weakSelf sendRequest];
-//        }];
     };
     [self.navigationController pushViewController:vc animated:YES];
 }
diff --git a/Coding_iOS/Controllers/Topic/CSTopiclistView.h b/Coding_iOS/Controllers/Topic/CSTopiclistView.h
@@ -20,7 +20,6 @@ typedef enum {
 @property (nonatomic,assign)BOOL isMe;
 - (id)initWithFrame:(CGRect)frame globalKey:(NSString *)key type:(CSMyTopicsType )type block:(TopicListViewBlock)block;
 - (void)setTopics:(id )topics;
-- (void)refreshUI;
 - (void)refreshToQueryData;
 
 @end
diff --git a/Coding_iOS/Controllers/Topic/CSTopiclistView.m b/Coding_iOS/Controllers/Topic/CSTopiclistView.m
@@ -89,7 +89,6 @@ - (void)setTopics:(id )topics{
     
     self.myTopic = topics;
     [self setupDataList];
-    [self refreshUI];
 }
 
 - (void)setupDataList{
diff --git a/Coding_iOS/Images/.DS_Store b/Coding_iOS/Images/.DS_Store
diff --git a/Coding_iOS/Images/keyboard_topic@2x.png b/Coding_iOS/Images/keyboard_topic@2x.png
diff --git a/Coding_iOS/Images/user_info_topic@2x.png b/Coding_iOS/Images/user_info_topic@2x.png
diff --git a/Coding_iOS/Util/Manager/Coding_NetAPIManager.h b/Coding_iOS/Util/Manager/Coding_NetAPIManager.h
@@ -155,7 +155,7 @@ typedef NS_ENUM(NSUInteger, VerifyType){
 - (void)request_Tweet_Delete_WithObj:(Tweet *)tweet andBlock:(void (^)(id data, NSError *error))block;
 - (void)request_TweetComment_Delete_WithTweet:(Tweet *)tweet andComment:(Comment *)comment andBlock:(void (^)(id data, NSError *error))block;
 - (void)request_Tweet_Detail_WithObj:(Tweet *)tweet andBlock:(void (^)(id data, NSError *error))block;
-- (void)request_PublicTweetsWithTopic:(int)topicID andBlock:(void (^)(id data, NSError *error))block;
+- (void)request_PublicTweetsWithTopic:(NSInteger)topicID andBlock:(void (^)(id data, NSError *error))block;
 
 
 //User
@@ -206,8 +206,8 @@ typedef NS_ENUM(NSUInteger, VerifyType){
 - (void)request_MDHtmlStr_WithMDStr:(NSString *)mdStr inProject:(Project *)project andBlock:(void (^)(id data, NSError *error))block;
 - (void)request_VerifyTypeWithBlock:(void (^)(VerifyType type, NSError *error))block;
 
-- (void)request_Users_WithTopicID:(int )topicID andBlock:(void (^)(id data, NSError *error))block;
-- (void)request_JoinedUsers_WithTopicID:(int )topicID page:(NSInteger)page andBlock:(void (^)(id data, NSError *error))block;
+- (void)request_Users_WithTopicID:(NSInteger)topicID andBlock:(void (^)(id data, NSError *error))block;
+- (void)request_JoinedUsers_WithTopicID:(NSInteger)topicID page:(NSInteger)page andBlock:(void (^)(id data, NSError *error))block;
 
 
 //Topic HotKey
@@ -218,8 +218,8 @@ typedef NS_ENUM(NSUInteger, VerifyType){
 
 - (void)request_Tweet_WithSearchString:(NSString *)strSearch andPage:(NSInteger)page andBlock:(void (^)(id data, NSError *error))block;
 
-- (void)request_TopicDetailsWithTopicID:(int)topicID block:(void (^)(id data, NSError *error))block;
-- (void)request_TopTweetWithTopicID:(int)topicID block:(void (^)(id data, NSError *error))block;
+- (void)request_TopicDetailsWithTopicID:(NSInteger)topicID block:(void (^)(id data, NSError *error))block;
+- (void)request_TopTweetWithTopicID:(NSInteger)topicID block:(void (^)(id data, NSError *error))block;
 
 - (void)request_JoinedTopicsWithUserGK:(NSString *)userGK page:(NSInteger)page block:(void (^)(id data, BOOL hasMoreData, NSError *error))block;
 - (void)request_WatchedTopicsWithUserGK:(NSString *)userGK page:(NSInteger)page block:(void (^)(id data, BOOL hasMoreData, NSError *error))block;
diff --git a/Coding_iOS/Util/Manager/Coding_NetAPIManager.m b/Coding_iOS/Util/Manager/Coding_NetAPIManager.m
@@ -1440,9 +1440,9 @@ - (void)request_Tweet_Detail_WithObj:(Tweet *)tweet andBlock:(void (^)(id data,
     }];
 }
 
-- (void)request_PublicTweetsWithTopic:(int)topicID andBlock:(void (^)(id data, NSError *error))block {
+- (void)request_PublicTweetsWithTopic:(NSInteger)topicID andBlock:(void (^)(id data, NSError *error))block {
     //TODO psy lastid，是否要做分页
-    NSString *path = [NSString stringWithFormat:@"api/public_tweets/topic/%d",topicID];
+    NSString *path = [NSString stringWithFormat:@"api/public_tweets/topic/%ld",(long)topicID];
     NSDictionary *params = @{
                              @"type" : @"topic",
                              @"sort" : @"new"
@@ -1920,8 +1920,8 @@ - (void)request_Users_WithSearchString:(NSString *)searchStr andBlock:(void (^)(
     }];
 }
 
-- (void)request_Users_WithTopicID:(int )topicID andBlock:(void (^)(id data, NSError *error))block {
-    NSString *path = [NSString stringWithFormat:@"api/tweet_topic/%d/hot_joined",topicID];
+- (void)request_Users_WithTopicID:(NSInteger)topicID andBlock:(void (^)(id data, NSError *error))block {
+    NSString *path = [NSString stringWithFormat:@"api/tweet_topic/%ld/hot_joined",(long)topicID];
     [[CodingNetAPIClient sharedJsonClient] requestJsonDataWithPath:path withParams:nil withMethodType:Get andBlock:^(id data, NSError *error) {
         if (data) {
             id resultData = [data valueForKeyPath:@"data"];
@@ -1933,8 +1933,8 @@ - (void)request_Users_WithTopicID:(int )topicID andBlock:(void (^)(id data, NSEr
     }];
 }
 
-- (void)request_JoinedUsers_WithTopicID:(int )topicID page:(NSInteger)page andBlock:(void (^)(id data, NSError *error))block {
-    NSString *path = [NSString stringWithFormat:@"api/tweet_topic/%d/joined",topicID];
+- (void)request_JoinedUsers_WithTopicID:(NSInteger)topicID page:(NSInteger)page andBlock:(void (^)(id data, NSError *error))block {
+    NSString *path = [NSString stringWithFormat:@"api/tweet_topic/%ld/joined",(long)topicID];
     NSDictionary *params = @{
                              @"page":@(page),
                              @"pageSize":@(100)
@@ -2052,8 +2052,8 @@ - (void)request_Tweet_WithSearchString:(NSString *)strSearch andPage:(NSInteger)
 
 }
 
-- (void)request_TopicDetailsWithTopicID:(int)topicID block:(void (^)(id data, NSError *error))block {
-    NSString *path = [NSString stringWithFormat:@"/api/tweet_topic/%d",topicID];
+- (void)request_TopicDetailsWithTopicID:(NSInteger)topicID block:(void (^)(id data, NSError *error))block {
+    NSString *path = [NSString stringWithFormat:@"/api/tweet_topic/%ld",(long)topicID];
     [[CodingNetAPIClient sharedJsonClient] requestJsonDataWithPath:path withParams:nil withMethodType:Get andBlock:^(id data, NSError *error) {
         if(data) {
             id resultData = data[@"data"];
@@ -2065,8 +2065,8 @@ - (void)request_TopicDetailsWithTopicID:(int)topicID block:(void (^)(id data, NS
     }];
 }
 
-- (void)request_TopTweetWithTopicID:(int)topicID block:(void (^)(id data, NSError *error))block {
-    NSString *path = [NSString stringWithFormat:@"api/public_tweets/topic/%d/top",topicID];
+- (void)request_TopTweetWithTopicID:(NSInteger)topicID block:(void (^)(id data, NSError *error))block {
+    NSString *path = [NSString stringWithFormat:@"api/public_tweets/topic/%ld/top",(long)topicID];
     [[CodingNetAPIClient sharedJsonClient] requestJsonDataWithPath:path withParams:nil withMethodType:Get andBlock:^(id data, NSError *error) {
         if(data) {
             id resultData = data[@"data"];
diff --git a/Podfile b/Podfile
@@ -17,7 +17,7 @@ pod 'PPiAwesomeButton'
 pod 'APParallaxHeader'
 pod 'SDCAlertView', '2.5.2'
 pod 'MarqueeLabel'
-pod 'TMCache', '~> 2.1.0'
+pod 'TMCache', '2.1.0'
 pod 'iVersion', '1.11.4'
 pod 'JazzHands', '2.0.0'
 pod 'SSKeychain', '1.2.3'

Original file line number	Diff line number	Diff line change
`@@ -89,7 +89,6 @@ - (void)setTopics:(id )topics{`
`89`	`89`
`90`	`90`	`self.myTopic = topics;`
`91`	`91`	`[self setupDataList];`
`92`		`- [self refreshUI];`
`93`	`92`	`}`
`94`	`93`
`95`	`94`	`- (void)setupDataList{`