Skip to content

Commit e9fd351

Browse files
committed
项目设置入口修改
1 parent 7640dfd commit e9fd351

File tree

7 files changed

+245
-103
lines changed

7 files changed

+245
-103
lines changed

Coding_iOS.xcodeproj/project.pbxproj

+6
Original file line numberDiff line numberDiff line change
@@ -1222,6 +1222,7 @@
12221222
B14689C11EE100B200B01371 /* vip_4_45@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = B14689B11EE100B200B01371 /* vip_4_45@3x.png */; };
12231223
B14689C21EE100B200B01371 /* vip_4_75@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = B14689B21EE100B200B01371 /* vip_4_75@2x.png */; };
12241224
B14689C31EE100B200B01371 /* vip_4_75@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = B14689B31EE100B200B01371 /* vip_4_75@3x.png */; };
1225+
B152ED4E2090B223004A6E8A /* ProjectSettingEntranceController.m in Sources */ = {isa = PBXBuildFile; fileRef = B152ED4D2090B223004A6E8A /* ProjectSettingEntranceController.m */; };
12251226
B16EEF08208DDBB6005ABFD5 /* timeline_icon_read@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = B16EEF06208DDBB5005ABFD5 /* timeline_icon_read@3x.png */; };
12261227
B16EEF09208DDBB6005ABFD5 /* timeline_icon_unread@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = B16EEF07208DDBB6005ABFD5 /* timeline_icon_unread@3x.png */; };
12271228
B16EEF13209080D7005ABFD5 /* TaskBoardsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = B16EEF12209080D7005ABFD5 /* TaskBoardsViewController.m */; };
@@ -3330,6 +3331,8 @@
33303331
B14689B11EE100B200B01371 /* vip_4_45@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "vip_4_45@3x.png"; sourceTree = "<group>"; };
33313332
B14689B21EE100B200B01371 /* vip_4_75@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "vip_4_75@2x.png"; sourceTree = "<group>"; };
33323333
B14689B31EE100B200B01371 /* vip_4_75@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "vip_4_75@3x.png"; sourceTree = "<group>"; };
3334+
B152ED4C2090B223004A6E8A /* ProjectSettingEntranceController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ProjectSettingEntranceController.h; sourceTree = "<group>"; };
3335+
B152ED4D2090B223004A6E8A /* ProjectSettingEntranceController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ProjectSettingEntranceController.m; sourceTree = "<group>"; };
33333336
B16EEF06208DDBB5005ABFD5 /* timeline_icon_read@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "timeline_icon_read@3x.png"; sourceTree = "<group>"; };
33343337
B16EEF07208DDBB6005ABFD5 /* timeline_icon_unread@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "timeline_icon_unread@3x.png"; sourceTree = "<group>"; };
33353338
B16EEF11209080D7005ABFD5 /* TaskBoardsViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TaskBoardsViewController.h; sourceTree = "<group>"; };
@@ -7032,6 +7035,8 @@
70327035
isa = PBXGroup;
70337036
children = (
70347037
B9A00D7E1ACA3A05008BA008 /* ProjectSetting.storyboard */,
7038+
B152ED4C2090B223004A6E8A /* ProjectSettingEntranceController.h */,
7039+
B152ED4D2090B223004A6E8A /* ProjectSettingEntranceController.m */,
70357040
B9A00D801ACA3A17008BA008 /* ProjectSettingViewController.h */,
70367041
B9A00D811ACA3A17008BA008 /* ProjectSettingViewController.m */,
70377042
B9A00D831ACA3A55008BA008 /* ProjectAdvancedSettingViewController.h */,
@@ -8232,6 +8237,7 @@
82328237
09A058891E0AA9AE00C1CA3F /* ActivityMonScrollView.m in Sources */,
82338238
8E1C3DEF19E7D58A00EF3032 /* ActionSheetStringPicker.m in Sources */,
82348239
8EF643B919FF7E2900F7EEB0 /* LeftImage_LRTextCell.m in Sources */,
8240+
B152ED4E2090B223004A6E8A /* ProjectSettingEntranceController.m in Sources */,
82358241
B1890C4D2019B29900F52ABA /* UINavigationBar+Common.m in Sources */,
82368242
926C043E1C01A212004937D8 /* ShopOrderListView.m in Sources */,
82378243
8E1C3DF119E7D58A00EF3032 /* SWActionSheet.m in Sources */,

Coding_iOS/Controllers/NProjectViewController/NProjectViewController.m

+4-27
Original file line numberDiff line numberDiff line change
@@ -272,13 +272,10 @@ - (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPa
272272
- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath{
273273
[tableView deselectRowAtIndexPath:indexPath animated:YES];
274274
if (indexPath.section == 0 && indexPath.row == 0) {
275-
// 如果是自己的项目才能进入设置
276-
if ([self.myProject.owner_id isEqual:[Login curLoginUser].id]) {
277-
UIStoryboard *storyboard = [UIStoryboard storyboardWithName:@"ProjectSetting" bundle:nil];
278-
UIViewController *vc = [storyboard instantiateViewControllerWithIdentifier:@"ProjectSettingVC"];
279-
[vc setValue:self.myProject forKey:@"project"];
280-
[self.navigationController pushViewController:vc animated:YES];
281-
}
275+
UIStoryboard *storyboard = [UIStoryboard storyboardWithName:@"ProjectSetting" bundle:nil];
276+
UIViewController *vc = [storyboard instantiateViewControllerWithIdentifier:@"Entrance"];
277+
[vc setValue:self.myProject forKey:@"project"];
278+
[self.navigationController pushViewController:vc animated:YES];
282279
}else if (_myProject.is_public.boolValue){
283280
if (indexPath.section == 1) {
284281
if (indexPath.row == 0) {
@@ -381,26 +378,6 @@ - (void)goToReleaseList{
381378
[self.navigationController pushViewController:vc animated:YES];
382379
}
383380

384-
- (void)goToIndex:(NSInteger)index{
385-
// if (index == 0) {
386-
// __weak typeof(self) weakSelf = self;
387-
// [[Coding_NetAPIManager sharedManager] request_Project_UpdateVisit_WithObj:_myProject andBlock:^(id data, NSError *error) {
388-
// if (data) {
389-
// weakSelf.myProject.un_read_activities_count = [NSNumber numberWithInteger:0];
390-
// }
391-
// }];
392-
// }
393-
//// if (index == 3 && _myProject.is_public && !_myProject.is_public.boolValue) {
394-
//// WikiViewController *vc = [WikiViewController new];
395-
//// vc.myProject = self.myProject;
396-
//// [self.navigationController pushViewController:vc animated:YES];
397-
//// }else{
398-
// ProjectViewController *vc = [[ProjectViewController alloc] init];
399-
// vc.myProject = self.myProject;
400-
// vc.curIndex = index;
401-
// [self.navigationController pushViewController:vc animated:YES];
402-
//// }
403-
}
404381
- (void)gotoPro:(Project *)project{
405382
NProjectViewController *vc = [[NProjectViewController alloc] init];
406383
vc.myProject = project;

0 commit comments

Comments
 (0)