@@ -411,7 +411,7 @@ + (UIViewController *)analyseVCFromLinkStr:(NSString *)linkStr analyseMethod:(An
411411 NSString *codeRegexStr = @" /[ut]/([^/]+)/p/([^/]+)/git/blob/([^/]+)[/]?([^?]*)" // 代码(含团队项目)
412412 NSString *twoFARegexStr = @" /app_intercept/show_2fa" // 两步验证
413413 NSString *projectRegexStr = @" /[ut]/([^/]+)/p/([^/]+)" // 项目(含团队项目)
414- NSString *noticeRegexStr = @" /[ut]/([^/]+)/p/([^/]+)/setting/notice" // 项目公告
414+ NSString *noticeRegexStr = @" /[ut]/([^/]+)/p/([^/]+)/setting/notice/( \\ d+) " // 项目公告
415415 NSString *wikiRegexStr = @" /[ut]/([^/]+)/p/([^/]+)/wiki/(\\ d+)" // Wiki
416416 NSString *releaseRegexStr = @" /[ut]/([^/]+)/p/([^/]+)/git/releases/([^/]+)[/]?([^?]*)" // Release
417417 NSArray *matchedCaptures = nil ;
@@ -429,11 +429,15 @@ + (UIViewController *)analyseVCFromLinkStr:(NSString *)linkStr analyseMethod:(An
429429 vc.curTeam = [Team teamWithGK: team_global_key];
430430 analyseVC = vc;
431431 }else if ((matchedCaptures = [linkStr captureComponentsMatchedByRegex: noticeRegexStr]).count > 0 ){
432- UserOrProjectTweetsViewController *vc = [UserOrProjectTweetsViewController new ];
432+ // 项目公告
433+ NSString *owner_user_global_key = matchedCaptures[1 ];
434+ NSString *project_name = matchedCaptures[2 ];
435+ NSString *pp_id = matchedCaptures[3 ];
433436 Project *curPro = [Project new ];
434- curPro.owner_user_name = matchedCaptures[1 ];
435- curPro.name = matchedCaptures[2 ];
436- vc.curTweets = [Tweets tweetsWithProject: curPro];
437+ curPro.owner_user_name = owner_user_global_key;
438+ curPro.name = project_name;
439+ TweetDetailViewController *vc = [[TweetDetailViewController alloc ] init ];
440+ vc.curTweet = [Tweet tweetInProject: curPro andPPID: pp_id];
437441 analyseVC = vc;
438442 }else if ((matchedCaptures = [linkStr captureComponentsMatchedByRegex: wikiRegexStr]).count > 0 ){
439443 WikiViewController *vc = [WikiViewController new ];
@@ -819,6 +823,7 @@ + (UIViewController *)analyseVCFromLinkStr:(NSString *)linkStr analyseMethod:(An
819823 NSString *codeRegexStr = @" /[ut]/([^/]+)/p/([^/]+)/git/blob/([^/]+)[/]?([^?]*)" // 代码(含团队项目)
820824 NSString *twoFARegexStr = @" /app_intercept/show_2fa" // 两步验证
821825 NSString *projectRegexStr = @" /[ut]/([^/]+)/p/([^/]+)" // 项目(含团队项目)
826+ NSString *noticeRegexStr = @" /[ut]/([^/]+)/p/([^/]+)/setting/notice/(\\ d+)" // 项目公告
822827 NSString *wikiRegexStr = @" /[ut]/([^/]+)/p/([^/]+)/wiki/(\\ d+)" // Wiki
823828 NSString *releaseRegexStr = @" /[ut]/([^/]+)/p/([^/]+)/git/releases/([^/]+)[/]?([^?]*)" // Release
824829 NSArray *matchedCaptures = nil ;
@@ -840,6 +845,17 @@ + (UIViewController *)analyseVCFromLinkStr:(NSString *)linkStr analyseMethod:(An
840845 vc.curTweet = [Tweet tweetWithGlobalKey: user_global_key andPPID: pp_id];
841846 analyseVC = vc;
842847 }
848+ }else if ((matchedCaptures = [linkStr captureComponentsMatchedByRegex: noticeRegexStr]).count > 0 ){
849+ // 项目公告
850+ NSString *owner_user_global_key = matchedCaptures[1 ];
851+ NSString *project_name = matchedCaptures[2 ];
852+ NSString *pp_id = matchedCaptures[3 ];
853+ Project *curPro = [Project new ];
854+ curPro.owner_user_name = owner_user_global_key;
855+ curPro.name = project_name;
856+ TweetDetailViewController *vc = [[TweetDetailViewController alloc ] init ];
857+ vc.curTweet = [Tweet tweetInProject: curPro andPPID: pp_id];
858+ analyseVC = vc;
843859 }else if ((matchedCaptures = [linkStr captureComponentsMatchedByRegex: wikiRegexStr]).count > 0 ){
844860 WikiViewController *vc = [WikiViewController new ];
845861 Project *curPro = [Project new ];
0 commit comments