Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit af29d64

Browse filesBrowse files
wanghenghengwanghengheng
committed
创建项目、项目设置-修改
1 parent e0c0657 commit af29d64
Copy full SHA for af29d64

File tree

Expand file treeCollapse file tree

5 files changed

+43
-14
lines changed
Open diff view settings
Filter options
Expand file treeCollapse file tree

5 files changed

+43
-14
lines changed
Open diff view settings
Collapse file

‎Coding_iOS/Controllers/NewProject/NewProjectViewController.m‎

Copy file name to clipboardExpand all lines: Coding_iOS/Controllers/NewProject/NewProjectViewController.m
+33-7Lines changed: 33 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,9 @@
1010
#import "NewProjectTypeViewController.h"
1111
#import "Coding_NetAPIManager.h"
1212
#import "UIImageView+WebCache.h"
13+
#import "NProjectViewController.h"
14+
#import <RegexKitLite/RegexKitLite.h>
15+
#import "RDVTabBarController.h"
1316

1417
@interface NewProjectViewController ()<NewProjectTypeDelegate,UITextFieldDelegate,UINavigationControllerDelegate,UIImagePickerControllerDelegate>
1518

@@ -23,6 +26,7 @@ @implementation NewProjectViewController
2326

2427
-(void)viewWillAppear:(BOOL)animated{
2528
[[UIApplication sharedApplication] setStatusBarStyle:UIStatusBarStyleLightContent];
29+
[self.rdv_tabBarController setTabBarHidden:YES animated:YES];
2630
}
2731

2832
- (void)viewDidLoad {
@@ -42,7 +46,7 @@ - (void)viewDidLoad {
4246

4347
//
4448
self.projectImageView.layer.cornerRadius = 2;
45-
self.projectImageView.image = [UIImage imageNamed:@"AppIcon120x120"];
49+
self.projectImageView.image = kPlaceholderCodingSquareWidth(55.0);
4650
UITapGestureRecognizer *tapProjectImageViewGR = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(selectProjectImage)];
4751
[self.projectImageView addGestureRecognizer:tapProjectImageViewGR];
4852

@@ -57,7 +61,7 @@ - (void)viewDidLoad {
5761
static NSString *projectIconURLString = @"https://coding.net/static/project_icon/scenery-%d.png";
5862
int x = arc4random() % 24 + 1;
5963
NSString *randomIconURLString = [NSString stringWithFormat:projectIconURLString,x];
60-
[self.projectImageView sd_setImageWithURL:[NSURL URLWithString:randomIconURLString] placeholderImage:[UIImage imageNamed:@"AppIcon120x120"] completed:^(UIImage *image, NSError *error, SDImageCacheType cacheType, NSURL *imageURL) {
64+
[self.projectImageView sd_setImageWithURL:[NSURL URLWithString:randomIconURLString] placeholderImage:kPlaceholderCodingSquareWidth(55.0) completed:^(UIImage *image, NSError *error, SDImageCacheType cacheType, NSURL *imageURL) {
6165
if (image) {
6266
self.projectIconImage = image;
6367
}
@@ -103,7 +107,7 @@ -(void)submit{
103107
NSString *projectName = [self.projectNameTextField.text stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceAndNewlineCharacterSet]];
104108

105109
if ([projectName length] < 2 || [projectName length] > 31) {
106-
[[[UIAlertView alloc] initWithTitle:@"提示" message:@"请输入2 ~ 31位以内的项目名称" delegate:nil cancelButtonTitle:@"取消" otherButtonTitles: nil] show];
110+
[[[UIAlertView alloc] initWithTitle:@"提示" message:@"请输入2 ~ 31位以内的项目名称" delegate:nil cancelButtonTitle:@"知道了" otherButtonTitles: nil] show];
107111
}else{
108112
if ([self projectNameVerification:projectName]) {
109113

@@ -121,14 +125,15 @@ -(void)submit{
121125
self.submitButtonItem.enabled = NO;
122126

123127
// 效验完成，开始发送请求创建项目
124-
[[Coding_NetAPIManager sharedManager] request_NewProject_WithObj:project image:self.projectIconImage andBlock:^(Project *data, NSError *error) {
125-
if (!error) {
126-
[self.navigationController popToRootViewControllerAnimated:YES];
128+
__weak typeof(self) weakSelf = self;
129+
[[Coding_NetAPIManager sharedManager] request_NewProject_WithObj:project image:self.projectIconImage andBlock:^(NSString *data, NSError *error) {
130+
if (data.length > 0) {
131+
[weakSelf gotoProWithStr:data];
127132
}
128133
self.submitButtonItem.enabled = YES;
129134
}];
130135
}else{
131-
[[[UIAlertView alloc] initWithTitle:@"提示" message:@"项目名只允许字母、数字或者下划线(_)、中划线(-)，必须以字母或者数字开头,且不能以.git结尾" delegate:nil cancelButtonTitle:@"取消" otherButtonTitles: nil] show];
136+
[[[UIAlertView alloc] initWithTitle:@"提示" message:@"项目名只允许字母、数字或者下划线(_)、中划线(-)，必须以字母或者数字开头,且不能以.git结尾" delegate:nil cancelButtonTitle:@"知道了" otherButtonTitles: nil] show];
132137
}
133138
}
134139

@@ -158,6 +163,27 @@ -(BOOL)textField:(UITextField *)textField shouldChangeCharactersInRange:(NSRange
158163
return YES;
159164
}
160165

166+
#pragma mark gotoVC
167+
- (void)gotoProWithStr:(NSString *)data{
168+
NSString *projectRegexStr = @"/u/([^/]+)/p/([^/]+)";
169+
NSArray *matchedCaptures = [data captureComponentsMatchedByRegex:projectRegexStr];
170+
if (matchedCaptures.count >= 3) {
171+
NSString *user_global_key = matchedCaptures[1];
172+
NSString *project_name = matchedCaptures[2];
173+
Project *curPro = [[Project alloc] init];
174+
curPro.owner_user_name = user_global_key;
175+
curPro.name = project_name;
176+
NProjectViewController *vc = [[NProjectViewController alloc] init];
177+
vc.myProject = curPro;
178+
179+
NSMutableArray *curViewControllers = [NSMutableArray arrayWithArray:[self.navigationController viewControllers]];
180+
if (curViewControllers.count >= 2) {
181+
[curViewControllers replaceObjectAtIndex:curViewControllers.count - 1 withObject:vc];
182+
[self.navigationController setViewControllers:curViewControllers animated:YES];
183+
}
184+
}
185+
}
186+
161187
#pragma mark UITableView
162188

163189
-(UIView *)tableView:(UITableView *)tableView viewForHeaderInSection:(NSInteger)section{
Collapse file

‎Coding_iOS/Controllers/ProjectSetting/ProjectSettingViewController.m‎

Copy file name to clipboardExpand all lines: Coding_iOS/Controllers/ProjectSetting/ProjectSettingViewController.m
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ - (void)viewDidLoad {
5050

5151
//
5252
self.projectImageView.layer.cornerRadius = 2;
53-
[self.projectImageView sd_setImageWithURL:[self.project.icon urlImageWithCodePathResizeToView:self.projectImageView]];
53+
[self.projectImageView sd_setImageWithURL:[self.project.icon urlImageWithCodePathResizeToView:self.projectImageView] placeholderImage:kPlaceholderCodingSquareWidth(55.0)];
5454
UITapGestureRecognizer *tapProjectImageViewGR = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(selectProjectImage)];
5555
[self.projectImageView addGestureRecognizer:tapProjectImageViewGR];
5656

Collapse file

‎Coding_iOS/Models/Projects.m‎

Copy file name to clipboardExpand all lines: Coding_iOS/Models/Projects.m
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -137,8 +137,8 @@ -(NSDictionary *)toCreateParams{
137137
return @{@"name":self.name,
138138
@"description":self.description_mine,
139139
@"type":type,
140-
@"gitEnabled":@"false",
141-
@"gitReadmeEnabled":@"false",
140+
@"gitEnabled":@"true",
141+
@"gitReadmeEnabled":@"true",
142142
@"gitIgnore":@"no",
143143
@"gitLicense":@"no",
144144
// @"importFrom":@"no",
Collapse file

‎Coding_iOS/Util/Manager/Coding_NetAPIManager.h‎

Copy file name to clipboardExpand all lines: Coding_iOS/Util/Manager/Coding_NetAPIManager.h
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
- (void)request_ProjectMembersHaveTasks_WithObj:(Project *)project andBlock:(void (^)(NSArray *data, NSError *error))block;
5050
- (void)request_ProjectMember_Quit:(ProjectMember *)curMember andBlock:(void (^)(id data, NSError *error))block;
5151

52-
- (void)request_NewProject_WithObj:(Project *)project image:(UIImage *)image andBlock:(void (^)(Project *data, NSError *error))block;
52+
- (void)request_NewProject_WithObj:(Project *)project image:(UIImage *)image andBlock:(void (^)(NSString *data, NSError *error))block;
5353
- (void)request_UpdateProject_WithObj:(Project *)project andBlock:(void (^)(Project *data, NSError *error))block;
5454
- (void)request_UpdateProject_WithObj:(Project *)project icon:(UIImage *)icon andBlock:(void (^)(id data, NSError *error))block progerssBlock:(void (^)(CGFloat progressValue))progress;;
5555
- (void)request_DeleteProject_WithObj:(Project *)project password:(NSString *)password andBlock:(void (^)(Project *data, NSError *error))block;
Collapse file

‎Coding_iOS/Util/Manager/Coding_NetAPIManager.m‎

Copy file name to clipboardExpand all lines: Coding_iOS/Util/Manager/Coding_NetAPIManager.m
+6-3Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,7 @@ - (void)request_ProjectMember_Quit:(ProjectMember *)curMember andBlock:(void (^)
244244
}
245245
}
246246

247-
-(void)request_NewProject_WithObj:(Project *)project image:(UIImage *)image andBlock:(void (^)(Project *, NSError *))block{
247+
-(void)request_NewProject_WithObj:(Project *)project image:(UIImage *)image andBlock:(void (^)(NSString *, NSError *))block{
248248
[MobClick event:kUmeng_Event_Request label:@"创建项目"];
249249
[self showStatusBarQueryStr:@"正在创建项目"];
250250

@@ -256,7 +256,8 @@ -(void)request_NewProject_WithObj:(Project *)project image:(UIImage *)image andB
256256
[[CodingNetAPIClient sharedJsonClient] requestJsonDataWithPath:[project toProjectPath] file:fileDic withParams:[project toCreateParams] withMethodType:Post andBlock:^(id data, NSError *error) {
257257
if (data) {
258258
[self showStatusBarSuccessStr:@"创建项目成功"];
259-
block(data, nil);
259+
id resultData = [data valueForKeyPath:@"data"];
260+
block(resultData, nil);
260261
}else{
261262
[self showStatusBarError:error];
262263
block(nil, error);
@@ -270,7 +271,9 @@ -(void)request_UpdateProject_WithObj:(Project *)project andBlock:(void (^)(Proje
270271
[[CodingNetAPIClient sharedJsonClient] requestJsonDataWithPath:[project toUpdatePath] withParams:[project toUpdateParams] withMethodType:Put andBlock:^(id data, NSError *error) {
271272
if (data) {
272273
[self showStatusBarSuccessStr:@"更新项目成功"];
273-
block(data, nil);
274+
id resultData = [data valueForKeyPath:@"data"];
275+
Project *resultA = [NSObject objectOfClass:@"Project" fromJSON:resultData];
276+
block(resultA, nil);
274277
}else{
275278
[self showStatusBarError:error];
276279
block(nil, error);

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.