Skip to content

Commit a1968e3

Browse files
committed
添加对团队项目 url 的解析
1 parent c97cb11 commit a1968e3

File tree

3 files changed

+20
-13
lines changed

3 files changed

+20
-13
lines changed

Coding_iOS.xcodeproj/project.pbxproj

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -499,6 +499,7 @@
499499
4EB5A9421BF1DB4600C23AC3 /* libSocialSinaSSO.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4EB5A9341BF1DB4600C23AC3 /* libSocialSinaSSO.a */; };
500500
4EB5A9431BF1DB4600C23AC3 /* libWeiboSDK.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4EB5A9351BF1DB4600C23AC3 /* libWeiboSDK.a */; };
501501
4EB5A9441BF1DB4600C23AC3 /* WeiboSDK.bundle in Resources */ = {isa = PBXBuildFile; fileRef = 4EB5A93F1BF1DB4600C23AC3 /* WeiboSDK.bundle */; };
502+
4EB862AD1CABB21E008074D1 /* tipIcon_TeamMember@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4EB862AC1CABB21E008074D1 /* tipIcon_TeamMember@2x.png */; };
502503
4EBB624C1A6F526C0045DAEF /* NJKWebViewProgress.m in Sources */ = {isa = PBXBuildFile; fileRef = 4EBB62491A6F526C0045DAEF /* NJKWebViewProgress.m */; };
503504
4EBB624D1A6F526C0045DAEF /* NJKWebViewProgressView.m in Sources */ = {isa = PBXBuildFile; fileRef = 4EBB624B1A6F526C0045DAEF /* NJKWebViewProgressView.m */; };
504505
4EBD0C661A1F2011004B4284 /* nav_project_file@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4EBD0C651A1F2011004B4284 /* nav_project_file@2x.png */; };
@@ -1825,6 +1826,7 @@
18251826
4EB5A93F1BF1DB4600C23AC3 /* WeiboSDK.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; path = WeiboSDK.bundle; sourceTree = "<group>"; };
18261827
4EB5A9401BF1DB4600C23AC3 /* WeiboSDK.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WeiboSDK.h; sourceTree = "<group>"; };
18271828
4EB5A9411BF1DB4600C23AC3 /* WeiboUser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WeiboUser.h; sourceTree = "<group>"; };
1829+
4EB862AC1CABB21E008074D1 /* tipIcon_TeamMember@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "tipIcon_TeamMember@2x.png"; sourceTree = "<group>"; };
18281830
4EBB62481A6F526C0045DAEF /* NJKWebViewProgress.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NJKWebViewProgress.h; sourceTree = "<group>"; };
18291831
4EBB62491A6F526C0045DAEF /* NJKWebViewProgress.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NJKWebViewProgress.m; sourceTree = "<group>"; };
18301832
4EBB624A1A6F526C0045DAEF /* NJKWebViewProgressView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NJKWebViewProgressView.h; sourceTree = "<group>"; };
@@ -4679,6 +4681,7 @@
46794681
8EA6CFAF19E240C40076D59C /* tip_icons */ = {
46804682
isa = PBXGroup;
46814683
children = (
4684+
4EB862AC1CABB21E008074D1 /* tipIcon_TeamMember@2x.png */,
46824685
4E9F5D1F1C03051D007CCDCC /* tipIcon_tweetReward@2x.png */,
46834686
4E5C06E71AC2B34800F427C5 /* tipIcon_BranchMember@2x.png */,
46844687
8E62ADD919E28DA800963870 /* tipIcon_User@2x.png */,
@@ -5863,6 +5866,7 @@
58635866
8E97CEA21A0C7E26006F9AD7 /* coding_emoji_11@2x.png in Resources */,
58645867
4E2DB3471BA6AEB4002F27C4 /* coding_emoji_gif_02@2x.png in Resources */,
58655868
4E996C061ABBF56A00C704F1 /* n_sex_woman_icon@2x.png in Resources */,
5869+
4EB862AD1CABB21E008074D1 /* tipIcon_TeamMember@2x.png in Resources */,
58665870
8E97CE651A0A3424006F9AD7 /* keyboard_emotion_delete@2x.png in Resources */,
58675871
8EA6D16C19E240C40076D59C /* nav_tweet_friend@2x.png in Resources */,
58685872
8EA6D16E19E240C40076D59C /* nav_tweet_mine@2x.png in Resources */,

Coding_iOS/Controllers/RootControllers/BaseViewController.m

Lines changed: 16 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -164,19 +164,19 @@ + (UIViewController *)analyseVCFromLinkStr:(NSString *)linkStr analyseMethod:(An
164164
presentingVC = [BaseViewController presentingVC];
165165
}
166166

167-
NSString *userRegexStr = @"/u/([^/]+)$";
168-
NSString *userTweetRegexStr = @"/u/([^/]+)/bubble$";
169-
NSString *ppRegexStr = @"/u/([^/]+)/pp/([0-9]+)";
170-
NSString *pp_projectRegexStr = @"/u/([^/]+)/p/([^\?]+)[\?]pp=([0-9]+)$";
171-
NSString *topicRegexStr = @"/u/([^/]+)/p/([^/]+)/topic/(\\d+)";
172-
NSString *taskRegexStr = @"/u/([^/]+)/p/([^/]+)/task/(\\d+)";
173-
NSString *fileRegexStr = @"/u/([^/]+)/p/([^/]+)/attachment/([^/]+)/preview/(\\d+)";
174-
NSString *gitMRPRCommitRegexStr = @"/u/([^/]+)/p/([^/]+)/git/(merge|pull|commit)/([^/#]+)";
175-
NSString *conversionRegexStr = @"/user/messages/history/([^/]+)$";
176-
NSString *pp_topicRegexStr = @"/pp/topic/([0-9]+)$";
177-
NSString *codeRegexStr = @"/u/([^/]+)/p/([^/]+)/git/blob/([^/]+)[/]?([^?]*)";
178-
NSString *twoFARegexStr = @"/app_intercept/show_2fa";
179-
NSString *projectRegexStr = @"/u/([^/]+)/p/([^/]+)";
167+
NSString *userRegexStr = @"/u/([^/]+)$";//AT某人
168+
NSString *userTweetRegexStr = @"/u/([^/]+)/bubble$";//某人的冒泡
169+
NSString *ppRegexStr = @"/u/([^/]+)/pp/([0-9]+)";//冒泡
170+
NSString *pp_projectRegexStr = @"/[ut]/([^/]+)/p/([^\?]+)[\?]pp=([0-9]+)$";//项目内冒泡(含团队项目)
171+
NSString *topicRegexStr = @"/[ut]/([^/]+)/p/([^/]+)/topic/(\\d+)";//讨论(含团队项目)
172+
NSString *taskRegexStr = @"/[ut]/([^/]+)/p/([^/]+)/task/(\\d+)";//任务(含团队项目)
173+
NSString *fileRegexStr = @"/[ut]/([^/]+)/p/([^/]+)/attachment/([^/]+)/preview/(\\d+)";//文件(含团队项目)
174+
NSString *gitMRPRCommitRegexStr = @"/[ut]/([^/]+)/p/([^/]+)/git/(merge|pull|commit)/([^/#]+)";//MR(含团队项目)
175+
NSString *conversionRegexStr = @"/user/messages/history/([^/]+)$";//私信
176+
NSString *pp_topicRegexStr = @"/pp/topic/([0-9]+)$";//话题
177+
NSString *codeRegexStr = @"/[ut]/([^/]+)/p/([^/]+)/git/blob/([^/]+)[/]?([^?]*)";//代码(含团队项目)
178+
NSString *twoFARegexStr = @"/app_intercept/show_2fa";//两步验证
179+
NSString *projectRegexStr = @"/[ut]/([^/]+)/p/([^/]+)";//项目(含团队项目)
180180
NSArray *matchedCaptures = nil;
181181
if ((matchedCaptures = [linkStr captureComponentsMatchedByRegex:ppRegexStr]).count > 0){
182182
//冒泡
@@ -197,6 +197,7 @@ + (UIViewController *)analyseVCFromLinkStr:(NSString *)linkStr analyseMethod:(An
197197
analyseVC = vc;
198198
}
199199
}else if ((matchedCaptures = [linkStr captureComponentsMatchedByRegex:pp_projectRegexStr]).count > 0){
200+
//项目内冒泡
200201
NSString *owner_user_global_key = matchedCaptures[1];
201202
NSString *project_name = matchedCaptures[2];
202203
NSString *pp_id = matchedCaptures[3];
@@ -279,6 +280,7 @@ + (UIViewController *)analyseVCFromLinkStr:(NSString *)linkStr analyseMethod:(An
279280
analyseVC = vc;
280281
}
281282
}else if ((matchedCaptures = [linkStr captureComponentsMatchedByRegex:fileRegexStr]).count > 0){
283+
//文件
282284
NSString *user_global_key = matchedCaptures[1];
283285
NSString *project_name = matchedCaptures[2];
284286
NSString *fileId = matchedCaptures[4];
@@ -331,6 +333,7 @@ + (UIViewController *)analyseVCFromLinkStr:(NSString *)linkStr analyseMethod:(An
331333
vc.topicID = pp_topic_id.integerValue;
332334
analyseVC = vc;
333335
}else if ((matchedCaptures = [linkStr captureComponentsMatchedByRegex:codeRegexStr]).count > 0){
336+
//代码
334337
NSString *user_global_key = matchedCaptures[1];
335338
NSString *project_name = matchedCaptures[2];
336339
NSString *ref = matchedCaptures[3];
Loading

0 commit comments

Comments
 (0)