添加项目内冒泡

wanghengheng · Ease · commit dab3cac7519a · 2015-10-07T17:58:49.000+08:00
diff --git a/Coding_iOS/Controllers/RootControllers/BaseViewController.m b/Coding_iOS/Controllers/RootControllers/BaseViewController.m
@@ -148,6 +148,7 @@ + (UIViewController *)analyseVCFromLinkStr:(NSString *)linkStr analyseMethod:(An
     NSString *userRegexStr = @"/u/([^/]+)$";
     NSString *userTweetRegexStr = @"/u/([^/]+)/bubble$";
     NSString *ppRegexStr = @"/u/([^/]+)/pp/([0-9]+)$";
+    NSString *pp_projectRegexStr = @"/u/([^/]+)/p/([^\?]+)[\?]pp=([0-9]+)$";
     NSString *topicRegexStr = @"/u/([^/]+)/p/([^/]+)/topic/(\\d+)";
     NSString *taskRegexStr = @"/u/([^/]+)/p/([^/]+)/task/(\\d+)";
     NSString *fileRegexStr = @"/u/([^/]+)/p/([^/]+)/attachment/([^/]+)/preview/(\\d+)";
@@ -175,6 +176,16 @@ + (UIViewController *)analyseVCFromLinkStr:(NSString *)linkStr analyseMethod:(An
             vc.curTweet = [Tweet tweetWithGlobalKey:user_global_key andPPID:pp_id];
             analyseVC = vc;
         }
+    }else if ((matchedCaptures = [linkStr captureComponentsMatchedByRegex:pp_projectRegexStr]).count > 0){
+        NSString *owner_user_global_key = matchedCaptures[1];
+        NSString *project_name = matchedCaptures[2];
+        NSString *pp_id = matchedCaptures[3];
+        Project *curPro = [Project new];
+        curPro.owner_user_name = owner_user_global_key;
+        curPro.name = project_name;
+        TweetDetailViewController *vc = [[TweetDetailViewController alloc] init];
+        vc.curTweet = [Tweet tweetInProject:curPro andPPID:pp_id];
+        analyseVC = vc;
     }else if ((matchedCaptures = [linkStr captureComponentsMatchedByRegex:gitMRPRCommitRegexStr]).count > 0){
         //MR
         NSString *path = [matchedCaptures[0] stringByReplacingOccurrencesOfString:@"https://coding.net" withString:@""];
diff --git a/Coding_iOS/Controllers/TweetDetailViewController.m b/Coding_iOS/Controllers/TweetDetailViewController.m
@@ -163,20 +163,35 @@ - (void)messageInputView:(UIMessageInputView *)inputView heightToBottomChenged:(
 #pragma mark refresh
 - (void)refreshTweet{
     __weak typeof(self) weakSelf = self;
-    [[Coding_NetAPIManager sharedManager] request_Tweet_Detail_WithObj:_curTweet andBlock:^(id data, NSError *error) {
-        if (data) {
-            if (weakSelf.curTweet.contentHeight > 1) {
-                ((Tweet *)data).contentHeight = weakSelf.curTweet.contentHeight;
+    if (_curTweet.project && !_curTweet.project_id) {
+        [[Coding_NetAPIManager sharedManager] request_ProjectDetail_WithObj:_curTweet.project andBlock:^(id data, NSError *error) {
+            if (data) {
+                weakSelf.curTweet.project = data;
+                weakSelf.curTweet.project_id = [(Project *)data id];
+                [weakSelf refreshTweet];
+            }else{
+                [weakSelf.refreshControl endRefreshing];
             }
-            weakSelf.curTweet = data;
-            weakSelf.myMsgInputView.commentOfId = weakSelf.curTweet.id;
-            weakSelf.myMsgInputView.toUser = nil;
-            [weakSelf.myTableView reloadData];
-            [weakSelf refreshComments];
-        }else{
-            [weakSelf.refreshControl endRefreshing];
-        }
-    }];
+        }];
+    }else{
+        [[Coding_NetAPIManager sharedManager] request_Tweet_Detail_WithObj:_curTweet andBlock:^(id data, NSError *error) {
+            if (data) {
+                if (weakSelf.curTweet.contentHeight > 1) {
+                    ((Tweet *)data).contentHeight = weakSelf.curTweet.contentHeight;
+                }
+                if (weakSelf.curTweet.project) {
+                    [(Tweet *)data setProject:weakSelf.curTweet.project];
+                }
+                weakSelf.curTweet = data;
+                weakSelf.myMsgInputView.commentOfId = weakSelf.curTweet.id;
+                weakSelf.myMsgInputView.toUser = nil;
+                [weakSelf.myTableView reloadData];
+                [weakSelf refreshComments];
+            }else{
+                [weakSelf.refreshControl endRefreshing];
+            }
+        }];
+    }
 }
 
 - (void)refreshComments{
diff --git a/Coding_iOS/Models/Tweet.h b/Coding_iOS/Models/Tweet.h
@@ -11,6 +11,7 @@
 #import "User.h"
 #import "HtmlMedia.h"
 #import "TweetSendLocation.h"
+#import "Project.h"
 
 @class TweetImage;
 
@@ -31,7 +32,9 @@
 @property (readwrite, nonatomic, strong) NSString *nextCommentStr;
 @property (assign, nonatomic) CGFloat contentHeight;
 
-@property (strong, nonatomic) NSString *user_global_key, *pp_id;
+@property (strong, nonatomic) NSString *user_global_key;
+@property (strong, nonatomic) Project *project;
+@property (strong, nonatomic) NSNumber *project_id;
 
 - (void)addASelectedAssetURL:(NSURL *)assetURL;
 - (void)deleteASelectedAssetURL:(NSURL *)assetURL;
@@ -65,6 +68,8 @@
 + (void)deleteSendData;
 
 +(Tweet *)tweetWithGlobalKey:(NSString *)user_global_key andPPID:(NSString *)pp_id;
++(Tweet *)tweetInProject:(Project *)project andPPID:(NSString *)pp_id;
+
 - (NSDictionary *)toDoTweetParams;
 - (BOOL)isAllImagesHaveDone;
 - (void)addNewComment:(Comment *)comment;
diff --git a/Coding_iOS/Models/Tweet.m b/Coding_iOS/Models/Tweet.m
@@ -109,9 +109,11 @@ - (NSString *)toDoLikePath{
 }
 
 - (NSString *)toDoCommentPath{
-    NSString *doCommentPath;
-    doCommentPath = [NSString stringWithFormat:@"api/tweet/%d/comment", self.id.intValue];
-    return doCommentPath;
+    if (self.project_id) {
+        return [NSString stringWithFormat:@"api/project/%@/tweet/%@/comment", self.project_id.stringValue, self.id.stringValue];
+    }else{
+        return [NSString stringWithFormat:@"api/tweet/%d/comment", self.id.intValue];
+    }
 }
 - (NSDictionary *)toDoCommentParams{
     return @{@"content" : [self.nextCommentStr aliasedString]};
@@ -124,21 +126,37 @@ - (NSDictionary *)toLikersParams{
              @"pageSize" : [NSNumber numberWithInteger:500]};
 }
 - (NSString *)toCommentsPath{
-    return [NSString stringWithFormat:@"api/tweet/%d/comments", _id.intValue];
+    NSString *path;
+    if (self.project_id) {
+        path = [NSString stringWithFormat:@"api/project/%@/tweet/%@/comments", self.project_id.stringValue, self.id.stringValue];
+    }else{
+        path = [NSString stringWithFormat:@"api/tweet/%d/comments", _id.intValue];
+    }
+    return path;
 }
 - (NSDictionary *)toCommentsParams{
     return @{@"page" : [NSNumber numberWithInteger:1],
              @"pageSize" : [NSNumber numberWithInteger:500]};
 }
 - (NSString *)toDeletePath{
-    return [NSString stringWithFormat:@"api/tweet/%d", self.id.intValue];
+    if (self.project_id) {
+        return [NSString stringWithFormat:@"api/project/%@/tweet/%@", self.project_id.stringValue, self.id.stringValue];
+    }else{
+        return [NSString stringWithFormat:@"api/tweet/%d", self.id.intValue];
+    }
 }
 - (NSString *)toDetailPath{
-    if (self.user_global_key && self.pp_id) {
-        return [NSString stringWithFormat:@"api/tweet/%@/%@", self.user_global_key, self.pp_id];
+    NSString *path;
+    if (self.project_id) {
+        path = [NSString stringWithFormat:@"api/project/%@/tweet/%@", self.project_id.stringValue, self.id.stringValue];
+    }else if (self.project){
+        //&#38656;&#35201;&#20808;&#21435;&#33719;&#21462;project_id
+    }else if (self.user_global_key) {
+        path = [NSString stringWithFormat:@"api/tweet/%@/%@", self.user_global_key, self.id.stringValue];
     }else{
-        return [NSString stringWithFormat:@"api/tweet/%@/%@", self.owner.global_key, self.id.stringValue];
+        path = [NSString stringWithFormat:@"api/tweet/%@/%@", self.owner.global_key, self.id.stringValue];
     }
+    return path;
 }
 
 +(Tweet *)tweetForSend{
@@ -198,8 +216,14 @@ + (void)deleteSendData{
 
 +(Tweet *)tweetWithGlobalKey:(NSString *)user_global_key andPPID:(NSString *)pp_id{
     Tweet *tweet = [[Tweet alloc] init];
+    tweet.id = [NSNumber numberWithInteger:pp_id.integerValue];
     tweet.user_global_key = user_global_key;
-    tweet.pp_id = pp_id;
+    return tweet;
+}
++(Tweet *)tweetInProject:(Project *)project andPPID:(NSString *)pp_id{
+    Tweet *tweet = [[Tweet alloc] init];
+    tweet.id = [NSNumber numberWithInteger:pp_id.integerValue];
+    tweet.project = project;
     return tweet;
 }
 
@@ -251,7 +275,13 @@ - (void)deleteComment:(Comment *)comment{
 }
 
 - (NSString *)toShareLinkStr{
-    return [NSString stringWithFormat:@"%@u/%@/pp/%@", kBaseUrlStr_Phone, _owner.global_key, _id];
+    NSString *shareLinkStr;
+    if (_project) {
+        shareLinkStr = [NSString stringWithFormat:@"%@u/%@/p/%@?pp=%@", [NSObject baseURLStr], _project.owner_user_name, _project.name, _id.stringValue];
+    }else{
+        shareLinkStr = [NSString stringWithFormat:@"%@u/%@/pp/%@", kBaseUrlStr_Phone, _owner.global_key, _id];
+    }
+    return shareLinkStr;
 }
 
 #pragma mark ALAsset
diff --git a/Coding_iOS/Util/Manager/Coding_NetAPIManager.m b/Coding_iOS/Util/Manager/Coding_NetAPIManager.m
@@ -1518,7 +1518,9 @@ - (void)request_Tweet_Comments_WithObj:(Tweet *)tweet andBlock:(void (^)(id data
             [MobClick event:kUmeng_Event_Request_Get label:@"&#20882;&#27873;_&#35780;&#35770;_&#21015;&#34920;"];
 
             id resultData = [data valueForKeyPath:@"data"];
-            resultData = [resultData valueForKeyPath:@"list"];
+            if ([resultData isKindOfClass:[NSDictionary class]]) {
+                resultData = [resultData valueForKeyPath:@"list"];
+            }
             NSArray *resultA = [NSObject arrayFromJSON:resultData ofObjects:@"Comment"];
             block(resultA, nil);
         }else{
diff --git a/Coding_iOS/Views/Cell/TweetDetailCell.m b/Coding_iOS/Views/Cell/TweetDetailCell.m
@@ -175,6 +175,9 @@ - (void)setTweet:(Tweet *)tweet{
     if (tweet) {
         _tweet = tweet;
     }
+    BOOL isProjectTweet = _tweet.project_id != nil;
+    self.likeBtn.hidden = isProjectTweet;
+    self.shareBtn.hidden = isProjectTweet;
     
     //owner&#22836;&#20687;
     __weak __typeof(self)weakSelf = self;

Original file line number	Diff line number	Diff line change
`@@ -175,6 +175,9 @@ - (void)setTweet:(Tweet *)tweet{`
`175`	`175`	`if (tweet) {`
`176`	`176`	`_tweet = tweet;`
`177`	`177`	`}`
	`178`	`+ BOOL isProjectTweet = _tweet.project_id != nil;`
	`179`	`+ self.likeBtn.hidden = isProjectTweet;`
	`180`	`+ self.shareBtn.hidden = isProjectTweet;`
`178`	`181`
`179`	`182`	`//owner头像`
`180`	`183`	`__weak __typeof(self)weakSelf = self;`