体验优化

wanghengheng · wanghengheng · commit 3100a646eb24 · 2015-01-20T18:43:01.000+08:00
diff --git a/Coding_iOS/Controllers/Login/RegisterViewController.m b/Coding_iOS/Controllers/Login/RegisterViewController.m
@@ -194,6 +194,16 @@ - (UIView *)customFooterView{
 //    activateBtn.frame = frame;
 //    [activateBtn addTarget:self action:@selector(reActivate) forControlEvents:UIControlEventTouchUpInside];
 //    [footerV addSubview:activateBtn];
+    
+    
+    RAC(self, registerBtn.enabled) = [RACSignal combineLatest:@[RACObserve(self, myRegister.email), RACObserve(self, myRegister.global_key), RACObserve(self, myRegister.j_captcha), RACObserve(self, captchaNeeded)] reduce:^id(NSString *email, NSString *global_key, NSString *j_captcha, NSNumber *captchaNeeded){
+        if ((captchaNeeded && captchaNeeded.boolValue) && (!j_captcha || j_captcha.length <= 0)) {
+            return @(NO);
+        }else{
+            return @((email && email.length > 0) && (global_key && global_key.length > 0));
+        }
+    }];
+    
     return footerV;
 }
 
diff --git a/Coding_iOS/Models/Login.m b/Coding_iOS/Models/Login.m
diff --git a/Coding_iOS/Util/OC_Category/UIButton+Bootstrap.m b/Coding_iOS/Util/OC_Category/UIButton+Bootstrap.m
@@ -37,8 +37,9 @@ -(void)primaryStyle{
 -(void)successStyle{
     [self bootstrapStyle];
     self.layer.borderColor = [[UIColor colorWithHexString:@"0x3bbc79"] CGColor];
+    self.layer.borderColor = [[UIColor clearColor] CGColor];
     [self setBackgroundImage:[self buttonImageFromColor:[UIColor colorWithHexString:@"0x3bbc79"]] forState:UIControlStateNormal];
-    [self setBackgroundImage:[self buttonImageFromColor:[UIColor colorWithHexString:@"0x3bbc79"]] forState:UIControlStateDisabled];
+    [self setBackgroundImage:[self buttonImageFromColor:[UIColor colorWithHexString:@"0x3bbc79" andAlpha:0.5]] forState:UIControlStateDisabled];
     [self setBackgroundImage:[self buttonImageFromColor:[UIColor colorWithHexString:@"0x32a067"]] forState:UIControlStateHighlighted];
     [self setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal];
     [self setTitleColor:[UIColor colorWithWhite:1.0 alpha:0.5] forState:UIControlStateDisabled];
