项目内冒泡 - 显示

wanghengheng · wanghengheng · commit f77b8921d70e · 2016-07-19T15:59:04.000+08:00
diff --git a/Coding_iOS.xcodeproj/project.pbxproj b/Coding_iOS.xcodeproj/project.pbxproj
@@ -261,6 +261,8 @@
 		4E53EB591AFB090E0034FE1C /* nav_page_selected@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4E53EB571AFB090E0034FE1C /* nav_page_selected@2x.png */; };
 		4E53EB5A1AFB090E0034FE1C /* nav_page_unselected@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4E53EB581AFB090E0034FE1C /* nav_page_unselected@2x.png */; };
 		4E554D6E1C9804F40008686A /* Close2FAViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 4E554D6D1C9804F40008686A /* Close2FAViewController.m */; };
+		4E59D32B1D3E106D008C914B /* tweetsBtn_Nav@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4E59D3291D3E106D008C914B /* tweetsBtn_Nav@2x.png */; };
+		4E59D32C1D3E106D008C914B /* tweetsBtn_Nav@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4E59D32A1D3E106D008C914B /* tweetsBtn_Nav@3x.png */; };
 		4E59E1D31A5E6B34004DAEEC /* TaskDescriptionViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 4E59E1D21A5E6B34004DAEEC /* TaskDescriptionViewController.m */; };
 		4E5A66951B268D160007A0AD /* UIView+PressMenu.m in Sources */ = {isa = PBXBuildFile; fileRef = 4E5A66941B268D160007A0AD /* UIView+PressMenu.m */; };
 		4E5C06E81AC2B34800F427C5 /* tipIcon_BranchMember@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4E5C06E71AC2B34800F427C5 /* tipIcon_BranchMember@2x.png */; };
@@ -875,7 +877,7 @@
 		8EA6D14519E240C40076D59C /* TweetDetailViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 8EA6CF5219E240C40076D59C /* TweetDetailViewController.m */; };
 		8EA6D14619E240C40076D59C /* TweetSendViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 8EA6CF5419E240C40076D59C /* TweetSendViewController.m */; };
 		8EA6D14819E240C40076D59C /* UsersViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 8EA6CF5819E240C40076D59C /* UsersViewController.m */; };
-		8EA6D14919E240C40076D59C /* UserTweetsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 8EA6CF5A19E240C40076D59C /* UserTweetsViewController.m */; };
+		8EA6D14919E240C40076D59C /* UserOrProjectTweetsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 8EA6CF5A19E240C40076D59C /* UserOrProjectTweetsViewController.m */; };
 		8EA6D14A19E240C40076D59C /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 8EA6CF5B19E240C40076D59C /* InfoPlist.strings */; };
 		8EA6D14C19E240C40076D59C /* btn_delete_tweetimage@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 8EA6CF5F19E240C40076D59C /* btn_delete_tweetimage@2x.png */; };
 		8EA6D15019E240C40076D59C /* commentOrLikeBeginImg@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 8EA6CF6319E240C40076D59C /* commentOrLikeBeginImg@2x.png */; };
@@ -1518,6 +1520,8 @@
 		4E53EB581AFB090E0034FE1C /* nav_page_unselected@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "nav_page_unselected@2x.png"; sourceTree = "<group>"; };
 		4E554D6C1C9804F40008686A /* Close2FAViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Close2FAViewController.h; sourceTree = "<group>"; };
 		4E554D6D1C9804F40008686A /* Close2FAViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Close2FAViewController.m; sourceTree = "<group>"; };
+		4E59D3291D3E106D008C914B /* tweetsBtn_Nav@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "tweetsBtn_Nav@2x.png"; sourceTree = "<group>"; };
+		4E59D32A1D3E106D008C914B /* tweetsBtn_Nav@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "tweetsBtn_Nav@3x.png"; sourceTree = "<group>"; };
 		4E59E1D11A5E6B34004DAEEC /* TaskDescriptionViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TaskDescriptionViewController.h; sourceTree = "<group>"; };
 		4E59E1D21A5E6B34004DAEEC /* TaskDescriptionViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TaskDescriptionViewController.m; sourceTree = "<group>"; };
 		4E5A66931B268D160007A0AD /* UIView+PressMenu.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UIView+PressMenu.h"; sourceTree = "<group>"; };
@@ -2431,8 +2435,8 @@
 		8EA6CF5419E240C40076D59C /* TweetSendViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TweetSendViewController.m; sourceTree = "<group>"; };
 		8EA6CF5719E240C40076D59C /* UsersViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UsersViewController.h; sourceTree = "<group>"; };
 		8EA6CF5819E240C40076D59C /* UsersViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UsersViewController.m; sourceTree = "<group>"; };
-		8EA6CF5919E240C40076D59C /* UserTweetsViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UserTweetsViewController.h; sourceTree = "<group>"; };
-		8EA6CF5A19E240C40076D59C /* UserTweetsViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UserTweetsViewController.m; sourceTree = "<group>"; };
+		8EA6CF5919E240C40076D59C /* UserOrProjectTweetsViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UserOrProjectTweetsViewController.h; sourceTree = "<group>"; };
+		8EA6CF5A19E240C40076D59C /* UserOrProjectTweetsViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UserOrProjectTweetsViewController.m; sourceTree = "<group>"; };
 		8EA6CF5C19E240C40076D59C /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = "<group>"; };
 		8EA6CF5F19E240C40076D59C /* btn_delete_tweetimage@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "btn_delete_tweetimage@2x.png"; sourceTree = "<group>"; };
 		8EA6CF6319E240C40076D59C /* commentOrLikeBeginImg@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "commentOrLikeBeginImg@2x.png"; sourceTree = "<group>"; };
@@ -4408,6 +4412,8 @@
 		8E97CE4B1A0A3410006F9AD7 /* nav_button */ = {
 			isa = PBXGroup;
 			children = (
+				4E59D3291D3E106D008C914B /* tweetsBtn_Nav@2x.png */,
+				4E59D32A1D3E106D008C914B /* tweetsBtn_Nav@3x.png */,
 				4ECEF9F81D1D0B3D002A27D3 /* tip_normal_Nav@2x.png */,
 				4ECEF9F91D1D0B3D002A27D3 /* tip_normal_Nav@3x.png */,
 				4ECEF9FA1D1D0B3D002A27D3 /* tip_selected_Nav@2x.png */,
@@ -4605,8 +4611,8 @@
 				0AB591AB1AB6D2F60076C454 /* TweetSendLocaitonMapViewController.m */,
 				8EA6CF5719E240C40076D59C /* UsersViewController.h */,
 				8EA6CF5819E240C40076D59C /* UsersViewController.m */,
-				8EA6CF5919E240C40076D59C /* UserTweetsViewController.h */,
-				8EA6CF5A19E240C40076D59C /* UserTweetsViewController.m */,
+				8EA6CF5919E240C40076D59C /* UserOrProjectTweetsViewController.h */,
+				8EA6CF5A19E240C40076D59C /* UserOrProjectTweetsViewController.m */,
 				8EABB1FF19EE7A85009EB53A /* AddUserViewController.h */,
 				8EABB20019EE7A85009EB53A /* AddUserViewController.m */,
 				8E59F1081A021053009A905F /* CodeListViewController.h */,
@@ -5762,6 +5768,7 @@
 				7E335D9D1B6F5E94003D0F3D /* keyboard_arrow_down@2x.png in Resources */,
 				4EB52F3C1C7C45E700B5EBEA /* taskResourceReference@3x.png in Resources */,
 				4EB52F1D1C76BA3B00B5EBEA /* tag_button_add@2x.png in Resources */,
+				4E59D32C1D3E106D008C914B /* tweetsBtn_Nav@3x.png in Resources */,
 				4EF17ED71B3C3112003CDD2D /* intro_icon_4@2x.png in Resources */,
 				4E6384031B33C8E900D98648 /* task_activity_icon_create@2x.png in Resources */,
 				4EACB4401A2C448F0097ABB3 /* button_file_download_unable@2x.png in Resources */,
@@ -5990,6 +5997,7 @@
 				D0C447FB1C02DCA200DC1C4B /* settingBtn_Nav@2x.png in Resources */,
 				4E63840B1B33F9B400D98648 /* comment_bg@2x.png in Resources */,
 				4EB52F2E1C77138A00B5EBEA /* button_scan@2x.png in Resources */,
+				4E59D32B1D3E106D008C914B /* tweetsBtn_Nav@2x.png in Resources */,
 				8E97CEA31A0C7E26006F9AD7 /* coding_emoji_12@2x.png in Resources */,
 				4EF17EE81B3C3112003CDD2D /* intro_icon_6@2x.png in Resources */,
 				D0C447F71C02DCA200DC1C4B /* filtertBtn_normal_Nav@2x.png in Resources */,
@@ -6623,7 +6631,7 @@
 				4E4D6A611B1C65C100FD2E49 /* MRPRCommitsViewController.m in Sources */,
 				8E64ED7D19ED0CE3006E99DA /* QBAssetsCollectionOverlayView.m in Sources */,
 				4E0BD86B1B6C7E3D0061CAA6 /* CSLikesVC.m in Sources */,
-				8EA6D14919E240C40076D59C /* UserTweetsViewController.m in Sources */,
+				8EA6D14919E240C40076D59C /* UserOrProjectTweetsViewController.m in Sources */,
 				4E4D6AA01B1D89D400FD2E49 /* CommitDetail.m in Sources */,
 				4ECE8AD71A3943E80021E29C /* DownMenuCell.m in Sources */,
 				4E6C41201A846AC30098DC17 /* RFToolbarButton.m in Sources */,
diff --git a/Coding_iOS/Controllers/NProjectViewController/NProjectViewController.m b/Coding_iOS/Controllers/NProjectViewController/NProjectViewController.m
@@ -30,7 +30,7 @@
 #import "PRListViewController.h"
 #import "MRListViewController.h"
 #import "EaseGitButtonsView.h"
-
+#import "UserOrProjectTweetsViewController.h"
 #import "FunctionTipsManager.h"
 
 @interface NProjectViewController ()<UITableViewDataSource, UITableViewDelegate>
@@ -71,6 +71,7 @@ - (void)viewDidLoad{
         tableView;
     });
     
+    self.navigationItem.rightBarButtonItem = [[UIBarButtonItem alloc] initWithImage:[UIImage imageNamed:@"tweetsBtn_Nav"] style:UIBarButtonItemStylePlain target:self action:@selector(tweetsBtnClicked)];
     __weak typeof(self) weakSelf = self;
     _gitButtonsView = [EaseGitButtonsView new];
     _gitButtonsView.gitButtonClickedBlock = ^(NSInteger index, EaseGitButtonPosition position){
@@ -108,6 +109,12 @@ - (void)refresh{
     }];
 }
 
+- (void)tweetsBtnClicked{
+    UserOrProjectTweetsViewController *vc = [UserOrProjectTweetsViewController new];
+    vc.curTweets = [Tweets tweetsWithProject:self.myProject];
+    [self.navigationController pushViewController:vc animated:YES];
+}
+
 #pragma mark Table M
 - (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView{
     return 3;
diff --git a/Coding_iOS/Controllers/RootControllers/BaseViewController.m b/Coding_iOS/Controllers/RootControllers/BaseViewController.m
@@ -18,7 +18,7 @@
 #import "EditTaskViewController.h"
 #import "ProjectViewController.h"
 #import "NProjectViewController.h"
-#import "UserTweetsViewController.h"
+#import "UserOrProjectTweetsViewController.h"
 #import "Coding_NetAPIManager.h"
 #import "AppDelegate.h"
 #import "WebViewController.h"
@@ -322,7 +322,7 @@ + (UIViewController *)analyseVCFromLinkStr:(NSString *)linkStr analyseMethod:(An
             analyseVC = vc;
         }else if ((matchedCaptures = [linkStr captureComponentsMatchedByRegex:userTweetRegexStr]).count > 0){
             //&#26576;&#20154;&#30340;&#20882;&#27873;
-            UserTweetsViewController *vc = [[UserTweetsViewController alloc] init];
+            UserOrProjectTweetsViewController *vc = [[UserOrProjectTweetsViewController alloc] init];
             NSString *user_global_key = matchedCaptures[1];
             vc.curTweets = [Tweets tweetsWithUser:[User userWithGlobalKey:user_global_key]];
             analyseVC = vc;
diff --git a/Coding_iOS/Controllers/UserInfoViewController.m b/Coding_iOS/Controllers/UserInfoViewController.m
@@ -12,7 +12,7 @@
 #import "MJPhotoBrowser.h"
 #import "UsersViewController.h"
 #import "ConversationViewController.h"
-#import "UserTweetsViewController.h"
+#import "UserOrProjectTweetsViewController.h"
 #import "AddUserViewController.h"
 #import "SettingViewController.h"
 #import "SettingMineInfoViewController.h"
@@ -298,7 +298,7 @@ - (void)followBtnClicked{
 }
 
 - (void)goToTweets{
-    UserTweetsViewController *vc = [[UserTweetsViewController alloc] init];
+    UserOrProjectTweetsViewController *vc = [[UserOrProjectTweetsViewController alloc] init];
     vc.curTweets = [Tweets tweetsWithUser:_curUser];
     [self.navigationController pushViewController:vc animated:YES];
 }
diff --git a/Coding_iOS/Controllers/UserOrProjectTweetsViewController.h b/Coding_iOS/Controllers/UserOrProjectTweetsViewController.h
@@ -10,7 +10,7 @@
 #import "Tweets.h"
 #import "UIMessageInputView.h"
 
-@interface UserTweetsViewController : BaseViewController<UITableViewDataSource, UITableViewDelegate, UIScrollViewDelegate, UIMessageInputViewDelegate>
+@interface UserOrProjectTweetsViewController : BaseViewController<UITableViewDataSource, UITableViewDelegate, UIScrollViewDelegate, UIMessageInputViewDelegate>
 @property (strong, nonatomic) Tweets *curTweets;
 
 @end
diff --git a/Coding_iOS/Controllers/UserOrProjectTweetsViewController.m b/Coding_iOS/Controllers/UserOrProjectTweetsViewController.m
@@ -8,7 +8,7 @@
 
 #define kCommentIndexNotFound -1
 
-#import "UserTweetsViewController.h"
+#import "UserOrProjectTweetsViewController.h"
 #import "TweetCell.h"
 #import "ODRefreshControl.h"
 #import "Coding_NetAPIManager.h"
@@ -18,7 +18,7 @@
 #import "SVPullToRefresh.h"
 #import "WebViewController.h"
 
-@interface UserTweetsViewController ()
+@interface UserOrProjectTweetsViewController ()
 @property (nonatomic, strong) UITableView *myTableView;
 @property (nonatomic, strong) ODRefreshControl *refreshControl;
 
@@ -34,7 +34,7 @@ @interface UserTweetsViewController ()
 @property (nonatomic, assign) NSInteger deleteTweetsIndex;
 @end
 
-@implementation UserTweetsViewController
+@implementation UserOrProjectTweetsViewController
 
 - (id)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil
 {
@@ -49,7 +49,13 @@ - (void)viewDidLoad
 {
     [super viewDidLoad];
     // Do any additional setup after loading the view.
-    self.title = _curTweets.curUser.name;
+    if (_curTweets.tweetType == TweetTypeUserSingle) {
+        self.title = _curTweets.curUser.name;
+    }else if (_curTweets.tweetType == TweetTypeProject){
+        self.title = _curTweets.curPro.name;
+    }else{
+        self.title = @"&#20882;&#27873;&#21015;&#34920;";
+    }
     
     //    &#28155;&#21152;myTableView
     _myTableView = ({
@@ -174,12 +180,12 @@ - (void)sendRequest{
     if (_curTweets.list.count <= 0) {
         [self.view beginLoading];
     }
-    __weak typeof(self) weakSelf = self;
-    if (_curTweets.curUser.name.length <= 0) {
+    if (_curTweets.tweetType == TweetTypeUserSingle && _curTweets.curUser.name.length <= 0) {
         [self refreshCurUser];
         return;
     }
     
+    __weak typeof(self) weakSelf = self;
     [[Coding_NetAPIManager sharedManager] request_Tweets_WithObj:_curTweets andBlock:^(id data, NSError *error) {
         [weakSelf.refreshControl endRefreshing];
         [weakSelf.view endLoading];
diff --git a/Coding_iOS/Images/nav_button/tweetsBtn_Nav@2x.png b/Coding_iOS/Images/nav_button/tweetsBtn_Nav@2x.png
diff --git a/Coding_iOS/Images/nav_button/tweetsBtn_Nav@3x.png b/Coding_iOS/Images/nav_button/tweetsBtn_Nav@3x.png
diff --git a/Coding_iOS/Models/Tweet.h b/Coding_iOS/Models/Tweet.h
@@ -37,6 +37,8 @@
 @property (strong, nonatomic) Project *project;
 @property (strong, nonatomic) NSNumber *project_id;
 
+- (BOOL)isProjectTweet;
+
 - (void)addASelectedAssetURL:(NSURL *)assetURL;
 - (void)deleteASelectedAssetURL:(NSURL *)assetURL;
 - (void)deleteATweetImage:(TweetImage *)tweetImage;
diff --git a/Coding_iOS/Models/Tweet.m b/Coding_iOS/Models/Tweet.m
@@ -332,6 +332,9 @@ - (void)setSelectedAssetURLs:(NSMutableArray *)selectedAssetURLs{
     }];
 }
 
+- (BOOL)isProjectTweet{
+    return self.project_id != nil;
+}
 - (void)addASelectedAssetURL:(NSURL *)assetURL{
     if (!_selectedAssetURLs) {
         _selectedAssetURLs = [NSMutableArray new];
diff --git a/Coding_iOS/Models/Tweets.h b/Coding_iOS/Models/Tweets.h
@@ -22,7 +22,7 @@ typedef NS_ENUM(NSInteger, TweetType)
     TweetTypeUserFriends,
     TweetTypePublicHot,
     TweetTypeUserSingle,
-    TweetTypeUserProject
+    TweetTypeProject
 };
 
 
diff --git a/Coding_iOS/Models/Tweets.m b/Coding_iOS/Models/Tweets.m
@@ -37,7 +37,7 @@ + (Tweets *)tweetsWithUser:(User *)curUser{
     return tweets;
 }
 + (Tweets *)tweetsWithProject:(Project *)curPro{
-    Tweets *tweets = [Tweets tweetsWithType:TweetTypeUserProject];
+    Tweets *tweets = [Tweets tweetsWithType:TweetTypeProject];
     tweets.curPro = curPro;
     return tweets;
 }
@@ -55,7 +55,7 @@ - (NSString *)toPath{
         case TweetTypeUserSingle:
             requstPath = @"api/tweet/user_public";
             break;
-            case TweetTypeUserProject:
+            case TweetTypeProject:
             requstPath = [NSString stringWithFormat:@"api/project/%@/tweet", _curPro.id.stringValue];
         default:
             break;
diff --git a/Coding_iOS/Util/OC_Category/UIView+Common.m b/Coding_iOS/Util/OC_Category/UIView+Common.m
@@ -607,10 +607,10 @@ - (void)configWithType:(EaseBlankPageType)blankPageType hasData:(BOOL)hasData ha
                 tipStr = @"&#26469;&#65292;&#20882;&#20010;&#27873;&#21543;&#65374;";
             }
                 break;
-            case EaseBlankPageTypeTweetOther://&#20882;&#27873;&#21015;&#34920;&#65288;&#21035;&#20154;&#30340;&#65289;
+            case EaseBlankPageTypeTweetOther://&#20882;&#27873;&#21015;&#34920;&#65288;&#21035;&#20154;&#30340;&#12289;&#39033;&#30446;&#20869;&#30340;&#65289;
             {
                 imageName = @"blankpage_image_Sleep";
-                tipStr = @"&#36825;&#20010;&#20154;&#24456;&#25042;\n&#19968;&#20010;&#20882;&#27873;&#37117;&#26408;&#26377;&#65374;";
+                tipStr = @"&#36825;&#37324;&#24456;&#31354;\n&#19968;&#20010;&#20882;&#27873;&#37117;&#26408;&#26377;&#65374;";
             }
                 break;
             case EaseBlankPageTypeProject://&#39033;&#30446;&#21015;&#34920;&#65288;&#33258;&#24049;&#30340;&#65289;
diff --git a/Coding_iOS/Views/Cell/TweetCell.m b/Coding_iOS/Views/Cell/TweetCell.m
@@ -218,6 +218,8 @@ - (void)setTweet:(Tweet *)tweet needTopView:(BOOL)needTopView{
         return;
     }
     
+    self.likeBtn.hidden = self.rewardBtn.hidden = [_tweet isProjectTweet];
+    
     _like_reward_users = [_tweet like_reward_users];
     BOOL isMineTweet = [_tweet.owner.global_key isEqualToString:[Login curLoginUser].global_key];
 
diff --git a/Coding_iOS/Views/Cell/TweetDetailCell.m b/Coding_iOS/Views/Cell/TweetDetailCell.m
@@ -175,9 +175,7 @@ - (void)setTweet:(Tweet *)tweet{
         return;
     }
     
-    BOOL isProjectTweet = _tweet.project_id != nil;
-    self.likeBtn.hidden = isProjectTweet;
-    self.rewardBtn.hidden = isProjectTweet;
+    self.likeBtn.hidden = self.rewardBtn.hidden = [_tweet isProjectTweet];
     
     //owner&#22836;&#20687;
     __weak __typeof(self)weakSelf = self;

Original file line number	Diff line number	Diff line change
`@@ -332,6 +332,9 @@ - (void)setSelectedAssetURLs:(NSMutableArray *)selectedAssetURLs{`
`332`	`332`	`}];`
`333`	`333`	`}`
`334`	`334`
	`335`	`+- (BOOL)isProjectTweet{`
	`336`	`+ return self.project_id != nil;`
	`337`	`+}`
`335`	`338`	`- (void)addASelectedAssetURL:(NSURL *)assetURL{`
`336`	`339`	`if (!_selectedAssetURLs) {`
`337`	`340`	`_selectedAssetURLs = [NSMutableArray new];`
Original file line number	Diff line number	Diff line change
`@@ -607,10 +607,10 @@ - (void)configWithType:(EaseBlankPageType)blankPageType hasData:(BOOL)hasData ha`
`607`	`607`	`tipStr = @"来，冒个泡吧～";`
`608`	`608`	`}`
`609`	`609`	`break;`
`610`		`- case EaseBlankPageTypeTweetOther://冒泡列表（别人的）`
	`610`	`+ case EaseBlankPageTypeTweetOther://冒泡列表（别人的、项目内的）`
`611`	`611`	`{`
`612`	`612`	`imageName = @"blankpage_image_Sleep";`
`613`		`- tipStr = @"这个人很懒\n一个冒泡都木有～";`
	`613`	`+ tipStr = @"这里很空\n一个冒泡都木有～";`
`614`	`614`	`}`
`615`	`615`	`break;`
`616`	`616`	`case EaseBlankPageTypeProject://项目列表（自己的）`
Original file line number	Diff line number	Diff line change
`@@ -218,6 +218,8 @@ - (void)setTweet:(Tweet *)tweet needTopView:(BOOL)needTopView{`
`218`	`218`	`return;`
`219`	`219`	`}`
`220`	`220`
	`221`	`+ self.likeBtn.hidden = self.rewardBtn.hidden = [_tweet isProjectTweet];`
	`222`	`+`
`221`	`223`	`_like_reward_users = [_tweet like_reward_users];`
`222`	`224`	`BOOL isMineTweet = [_tweet.owner.global_key isEqualToString:[Login curLoginUser].global_key];`
`223`	`225`
Original file line number	Diff line number	Diff line change
`@@ -175,9 +175,7 @@ - (void)setTweet:(Tweet *)tweet{`
`175`	`175`	`return;`
`176`	`176`	`}`
`177`	`177`
`178`		`- BOOL isProjectTweet = _tweet.project_id != nil;`
`179`		`- self.likeBtn.hidden = isProjectTweet;`
`180`		`- self.rewardBtn.hidden = isProjectTweet;`
	`178`	`+ self.likeBtn.hidden = self.rewardBtn.hidden = [_tweet isProjectTweet];`
`181`	`179`
`182`	`180`	`//owner头像`
`183`	`181`	`__weak __typeof(self)weakSelf = self;`