扫码 - 注册 - 设置账号

Author: wanghengheng

Coding_iOS/Controllers/Login/RegisterViewController.m

@@ -332,6 +332,10 @@ - (void)phoneCodeBtnClicked:(PhoneCodeButton *)sender{
 }
 
 - (void)sendRegister{
+    if (![_myRegister.global_key isGK]) {
+        [NSObject showHudTipStr:@"个性后缀仅支持英文字母、数字、横线(-)以及下划线(_)"];
+        return;
+    }
     __weak typeof(self) weakSelf = self;
     NSMutableDictionary *params = @{@"channel": [Register channel],
                                     @"global_key": _myRegister.global_key,

Coding_iOS/Controllers/MeSetting/SettingAccountViewController.m

@@ -83,7 +83,7 @@ - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(N
                 return cell;
             }else{
                 TitleValueMoreCell *cell = [tableView dequeueReusableCellWithIdentifier:kCellIdentifier_TitleValueMore forIndexPath:indexPath];
-                [cell setTitleStr:@"邮箱" valueStr:[NSString stringWithFormat:@"%@ - 未验证",self.myUser.email]];
+                [cell setTitleStr:@"邮箱" valueStr:[NSString stringWithFormat:@"%@ 未验证",self.myUser.email]];
                 [tableView addLineforPlainCell:cell forRowAtIndexPath:indexPath withLeftSpace:kPaddingLeftWidth];
                 return cell;
             }

Coding_iOS/Controllers/RootControllers/Project_RootViewController.m

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

Coding_iOS/Util/OC_Category/NSString+Common.h

@@ -46,6 +46,7 @@
 //判断是否是手机号码或者邮箱
 - (BOOL)isPhoneNo;
 - (BOOL)isEmail;
+- (BOOL)isGK;
 
 - (NSRange)rangeByTrimmingLeftCharactersInSet:(NSCharacterSet *)characterSet;
 - (NSRange)rangeByTrimmingRightCharactersInSet:(NSCharacterSet *)characterSet;

Coding_iOS/Util/OC_Category/NSString+Common.m

@@ -341,6 +341,12 @@ - (BOOL)isEmail{
     NSPredicate *emailTest = [NSPredicate predicateWithFormat:@"SELF MATCHES %@", emailRegex];
     return [emailTest evaluateWithObject:self];
 }
+- (BOOL)isGK{
+    NSString *gkRegex = @"[A-Z0-9a-z-_]{3,32}";
+    NSPredicate *gkTest = [NSPredicate predicateWithFormat:@"SELF MATCHES %@", gkRegex];
+    return [gkTest evaluateWithObject:self];
+}
+
 
 - (NSRange)rangeByTrimmingLeftCharactersInSet:(NSCharacterSet *)characterSet{
     NSUInteger location = 0;