Skip to content

Commit 157ed48

Browse files
useropenuseropen
committed
实现了PR和MR的分离
1 parent fc04788 commit 157ed48

6 files changed

Lines changed: 872 additions & 416 deletions

File tree

‎Coding_iOS.xcodeproj/project.pbxproj‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@
3636
134E1BA61CA41671002A3E0D /* DemoModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 134E1BA51CA41671002A3E0D /* DemoModel.m */; };
3737
136526891CAABA2E00C0341D /* AddReviewerViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 136526881CAABA2E00C0341D /* AddReviewerViewController.xib */; };
3838
136A6DBC1CAF52F2004AA983 /* MRPRPreInfo.m in Sources */ = {isa = PBXBuildFile; fileRef = 136A6DBB1CAF52F2004AA983 /* MRPRPreInfo.m */; };
39+
136A6DBF1CAF6BAC004AA983 /* MRDetailViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 136A6DBE1CAF6BAC004AA983 /* MRDetailViewController.m */; };
3940
13972E291CA6157C00489EBA /* ReviewerListController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 13972E281CA6157C00489EBA /* ReviewerListController.xib */; };
4041
13972E2C1CA616AC00489EBA /* ReviewerListController.m in Sources */ = {isa = PBXBuildFile; fileRef = 13972E2B1CA616AC00489EBA /* ReviewerListController.m */; };
4142
13972E2F1CA6D5C600489EBA /* MActivityInfo.m in Sources */ = {isa = PBXBuildFile; fileRef = 13972E2E1CA6D5C600489EBA /* MActivityInfo.m */; };
@@ -279,7 +280,6 @@
279280
4E5F39071ACBFDCD0010515D /* [email protected] in Resources */ = {isa = PBXBuildFile; fileRef = 4E5F39061ACBFDCD0010515D /* [email protected] */; };
280281
4E62410B1B74D65400E1533C /* [email protected] in Resources */ = {isa = PBXBuildFile; fileRef = 4E62410A1B74D65400E1533C /* [email protected] */; };
281282
4E63189C1BDA198000EFED97 /* MRListViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 4E63189B1BDA198000EFED97 /* MRListViewController.m */; };
282-
4E63189F1BDA199600EFED97 /* MRDetailViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 4E63189E1BDA199600EFED97 /* MRDetailViewController.m */; };
283283
4E6318A21BDA261100EFED97 /* MRListView.m in Sources */ = {isa = PBXBuildFile; fileRef = 4E6318A11BDA261100EFED97 /* MRListView.m */; };
284284
4E6383A61B3262D300D98648 /* [email protected] in Resources */ = {isa = PBXBuildFile; fileRef = 4E63839B1B3262D300D98648 /* [email protected] */; };
285285
4E6383A71B3262D300D98648 /* [email protected] in Resources */ = {isa = PBXBuildFile; fileRef = 4E63839C1B3262D300D98648 /* [email protected] */; };
@@ -1175,6 +1175,8 @@
11751175
1365268A1CAAE1C400C0341D /* PRDetailViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PRDetailViewController.h; sourceTree = "<group>"; };
11761176
136A6DBA1CAF52F2004AA983 /* MRPRPreInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MRPRPreInfo.h; sourceTree = "<group>"; };
11771177
136A6DBB1CAF52F2004AA983 /* MRPRPreInfo.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MRPRPreInfo.m; sourceTree = "<group>"; };
1178+
136A6DBD1CAF6BAC004AA983 /* MRDetailViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MRDetailViewController.h; sourceTree = "<group>"; };
1179+
136A6DBE1CAF6BAC004AA983 /* MRDetailViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MRDetailViewController.m; sourceTree = "<group>"; };
11781180
13972E281CA6157C00489EBA /* ReviewerListController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = ReviewerListController.xib; sourceTree = "<group>"; };
11791181
13972E2A1CA616AC00489EBA /* ReviewerListController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ReviewerListController.h; sourceTree = "<group>"; };
11801182
13972E2B1CA616AC00489EBA /* ReviewerListController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ReviewerListController.m; sourceTree = "<group>"; };
@@ -1184,7 +1186,6 @@
11841186
13C793381CA4B23800A6A876 /* ReviewerListView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ReviewerListView.m; sourceTree = "<group>"; };
11851187
13C8FE6D1CA75816001E30FA /* DynamicCommentCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DynamicCommentCell.m; sourceTree = "<group>"; };
11861188
13C8FE781CA7854E001E30FA /* PRDetailViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PRDetailViewController.m; sourceTree = "<group>"; };
1187-
13C8FE7A1CA78591001E30FA /* MRDetailViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MRDetailViewController.h; sourceTree = "<group>"; };
11881189
13C8FE7C1CA78B16001E30FA /* DynamicCommentCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DynamicCommentCell.h; sourceTree = "<group>"; };
11891190
13C8FE7D1CA79B90001E30FA /* DynamicActivityCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DynamicActivityCell.h; sourceTree = "<group>"; };
11901191
13C8FE7E1CA79B90001E30FA /* DynamicActivityCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DynamicActivityCell.m; sourceTree = "<group>"; };
@@ -2838,7 +2839,6 @@
28382839
children = (
28392840
1365268A1CAAE1C400C0341D /* PRDetailViewController.h */,
28402841
13C8FE7C1CA78B16001E30FA /* DynamicCommentCell.h */,
2841-
13C8FE7A1CA78591001E30FA /* MRDetailViewController.h */,
28422842
13C8FE781CA7854E001E30FA /* PRDetailViewController.m */,
28432843
13972E2A1CA616AC00489EBA /* ReviewerListController.h */,
28442844
13972E2B1CA616AC00489EBA /* ReviewerListController.m */,
@@ -2854,6 +2854,8 @@
28542854
13972E281CA6157C00489EBA /* ReviewerListController.xib */,
28552855
13C8FE6D1CA75816001E30FA /* DynamicCommentCell.m */,
28562856
136526881CAABA2E00C0341D /* AddReviewerViewController.xib */,
2857+
136A6DBD1CAF6BAC004AA983 /* MRDetailViewController.h */,
2858+
136A6DBE1CAF6BAC004AA983 /* MRDetailViewController.m */,
28572859
);
28582860
name = MergeRequest;
28592861
sourceTree = "<group>";
@@ -6331,7 +6333,6 @@
63316333
4E0BD8701B6C7E3D0061CAA6 /* CSTopicHeaderView.m in Sources */,
63326334
4EBB624D1A6F526C0045DAEF /* NJKWebViewProgressView.m in Sources */,
63336335
4E6383F21B32CC7600D98648 /* TaskActivityCell.m in Sources */,
6334-
4E63189F1BDA199600EFED97 /* MRDetailViewController.m in Sources */,
63356336
4E554D6E1C9804F40008686A /* Close2FAViewController.m in Sources */,
63366337
4ECE8ADA1A3943E80021E29C /* NSDate+Common.m in Sources */,
63376338
8EA6D20A19E240C40076D59C /* RDVTabBar.m in Sources */,
@@ -6427,6 +6428,7 @@
64276428
4EF374191BB1255E00DDA662 /* LocalFilesViewController.m in Sources */,
64286429
8EF643BF19FF7E2900F7EEB0 /* SettingTextCell.m in Sources */,
64296430
8E64ED8419ED0CE3006E99DA /* QBImagePickerGroupCell.m in Sources */,
6431+
136A6DBF1CAF6BAC004AA983 /* MRDetailViewController.m in Sources */,
64306432
4ECE8AE71A3943E80021E29C /* UITableView+Common.m in Sources */,
64316433
4E996BC81ABA754600C704F1 /* JDStatusBarNotification.m in Sources */,
64326434
4E6C411F1A846AC30098DC17 /* RFKeyboardToolbar.m in Sources */,

‎Coding_iOS/Controllers/MRDetailViewController.h‎

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,19 @@
66
// Copyright © 2015年 Coding. All rights reserved.
77
//
88

9-
#import "PRDetailViewController.h"
109

11-
@interface MRDetailViewController : PRDetailViewController
10+
#import "BaseViewController.h"
11+
#import "MRPRBaseInfo.h"
12+
#import "ReviewersInfo.h"
13+
#import "Reviewer.h"
14+
#import "user.h"
15+
#import "Project.h"
1216

17+
@interface MRDetailViewController : BaseViewController
18+
@property (strong, nonatomic) MRPR *curMRPR;
19+
@property (strong, nonatomic) Project *curProject;//非必需
20+
+ (MRDetailViewController *)vcWithPath:(NSString *)path;
21+
- (Reviewer*)checkUserisReviewer;
22+
- (BOOL)CurrentUserIsOwer;
23+
- (void)refresh;
1324
@end

0 commit comments

Comments
 (0)