Commit 30648ca

committed

扫码 - 注册 - 设置账号

1 parent 843792b commit 30648caCopy full SHA for 30648ca

File tree

+16

-1

lines changed

+16

-1

lines changed

Lines changed: 4 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -332,6 +332,10 @@ - (void)phoneCodeBtnClicked:(PhoneCodeButton *)sender{`
`332`	`332`	`}`
`333`	`333`
`334`	`334`	`- (void)sendRegister{`
	`335`	`+ if (![_myRegister.global_key isGK]) {`
	`336`	`+ [NSObject showHudTipStr:@"个性后缀仅支持英文字母、数字、横线(-)以及下划线(_)"];`
	`337`	`+ return;`
	`338`	`+ }`
`335`	`339`	`__weak typeof(self) weakSelf = self;`
`336`	`340`	`NSMutableDictionary *params = @{@"channel": [Register channel],`
`337`	`341`	`@"global_key": _myRegister.global_key,`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -83,7 +83,7 @@ - (UITableViewCell )tableView:(UITableView )tableView cellForRowAtIndexPath:(N`
`83`	`83`	`return cell;`
`84`	`84`	`}else{`
`85`	`85`	`TitleValueMoreCell *cell = [tableView dequeueReusableCellWithIdentifier:kCellIdentifier_TitleValueMore forIndexPath:indexPath];`
`86`		`- [cell setTitleStr:@"邮箱" valueStr:[NSString stringWithFormat:@"%@ - 未验证",self.myUser.email]];`
	`86`	`+ [cell setTitleStr:@"邮箱" valueStr:[NSString stringWithFormat:@"%@ 未验证",self.myUser.email]];`
`87`	`87`	`[tableView addLineforPlainCell:cell forRowAtIndexPath:indexPath withLeftSpace:kPaddingLeftWidth];`
`88`	`88`	`return cell;`
`89`	`89`	`}`

Lines changed: 4 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -630,6 +630,10 @@ - (void)dealWithScanResult:(NSString *)resultStr ofVC:(ZXScanCodeViewController`
`630`	`630`	`NSURL *URL = [NSURL URLWithString:resultStr];`
`631`	`631`	`if (nextVC) {`
`632`	`632`	`[self.navigationController pushViewController:nextVC animated:YES];`
	`633`	`+ }else if ([[URL host] hasSuffix:@"coding.net"]){`
	`634`	`+ //网页`
	`635`	`+ WebViewController *webVc = [WebViewController webVCWithUrlStr:resultStr];`
	`636`	`+ [self.navigationController pushViewController:webVc animated:YES];`
`633`	`637`	`}else if ([[UIApplication sharedApplication] canOpenURL:URL]){`
`634`	`638`	`UIAlertView *alertV = [UIAlertView bk_alertViewWithTitle:@"提示" message:[NSString stringWithFormat:@"可能存在风险,是否打开此链接?\n「%@」", resultStr]];`
`635`	`639`	`[alertV bk_setCancelButtonWithTitle:@"取消" handler:nil];`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -46,6 +46,7 @@`
`46`	`46`	`//判断是否是手机号码或者邮箱`
`47`	`47`	`- (BOOL)isPhoneNo;`
`48`	`48`	`- (BOOL)isEmail;`
	`49`	`+- (BOOL)isGK;`
`49`	`50`
`50`	`51`	`- (NSRange)rangeByTrimmingLeftCharactersInSet:(NSCharacterSet *)characterSet;`
`51`	`52`	`- (NSRange)rangeByTrimmingRightCharactersInSet:(NSCharacterSet *)characterSet;`

Lines changed: 6 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -341,6 +341,12 @@ - (BOOL)isEmail{`
`341`	`341`	`NSPredicate *emailTest = [NSPredicate predicateWithFormat:@"SELF MATCHES %@", emailRegex];`
`342`	`342`	`return [emailTest evaluateWithObject:self];`
`343`	`343`	`}`
	`344`	`+- (BOOL)isGK{`
	`345`	`+ NSString *gkRegex = @"[A-Z0-9a-z-_]{3,32}";`
	`346`	`+ NSPredicate *gkTest = [NSPredicate predicateWithFormat:@"SELF MATCHES %@", gkRegex];`
	`347`	`+ return [gkTest evaluateWithObject:self];`
	`348`	`+}`
	`349`	`+`
`344`	`350`
`345`	`351`	`- (NSRange)rangeByTrimmingLeftCharactersInSet:(NSCharacterSet *)characterSet{`
`346`	`352`	`NSUInteger location = 0;`

Comments

(0)