优化demo

朱林
1 parent b6b29b34
Showing 11 changed files with 140 additions and 181 deletions
CNLiveUserSystemDemo.xcodeproj/project.pbxproj
CNLiveUserSystemDemo.xcodeproj/project.xcworkspace/xcuserdata/iOS.xcuserdatad/UserInterfaceState.xcuserstate
CNLiveUserSystemDemo.xcodeproj/xcuserdata/iOS.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
CNLiveUserSystemDemo/Conreollers/LoginViewController.m
CNLiveUserSystemDemo/Conreollers/ModifyUserInfoViewController.m
CNLiveUserSystemDemo/Conreollers/RegisterViewController.m
CNLiveUserSystemDemo/Conreollers/UserInfoViewController.m
CNLiveUserSystemDemo/Conreollers/ViewController.m
CNLiveUserSystemDemo/Views/ThirdPartyView.m
CNLiveUserSystemDemo/touxiang.png
CNLiveUserSystemSDK.xcodeproj/project.xcworkspace/xcuserdata/iOS.xcuserdatad/UserInterfaceState.xcuserstate
@@ -24,6 +24,7 @@
 		810D9B7F1D8FCD1900B7A776 /* libsqlite3.0.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 810D9B7E1D8FCD1900B7A776 /* libsqlite3.0.tbd */; };
 		810D9B811D8FCD3200B7A776 /* libc++.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 810D9B801D8FCD3200B7A776 /* libc++.tbd */; };
 		810D9B841D8FD2DF00B7A776 /* CNLiveThirdLoginManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 810D9B831D8FD2DF00B7A776 /* CNLiveThirdLoginManager.m */; };
+		810EB6361E54398300C33D18 /* touxiang.png in Resources */ = {isa = PBXBuildFile; fileRef = 810EB6351E54398300C33D18 /* touxiang.png */; };
 		811600EE1D927E7E003CAE7D /* MKAnnotationView+WebCache.m in Sources */ = {isa = PBXBuildFile; fileRef = 811600CD1D927E7E003CAE7D /* MKAnnotationView+WebCache.m */; };
 		811600EF1D927E7E003CAE7D /* NSData+ImageContentType.m in Sources */ = {isa = PBXBuildFile; fileRef = 811600CF1D927E7E003CAE7D /* NSData+ImageContentType.m */; };
 		811600F01D927E7E003CAE7D /* SDImageCache.m in Sources */ = {isa = PBXBuildFile; fileRef = 811600D11D927E7E003CAE7D /* SDImageCache.m */; };
@@ -132,6 +133,7 @@
 		810D9B801D8FCD3200B7A776 /* libc++.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = "libc++.tbd"; path = "usr/lib/libc++.tbd"; sourceTree = SDKROOT; };
 		810D9B821D8FD2DF00B7A776 /* CNLiveThirdLoginManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CNLiveThirdLoginManager.h; sourceTree = "<group>"; };
 		810D9B831D8FD2DF00B7A776 /* CNLiveThirdLoginManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CNLiveThirdLoginManager.m; sourceTree = "<group>"; };
+		810EB6351E54398300C33D18 /* touxiang.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = touxiang.png; sourceTree = "<group>"; };
 		811600CC1D927E7E003CAE7D /* MKAnnotationView+WebCache.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "MKAnnotationView+WebCache.h"; sourceTree = "<group>"; };
 		811600CD1D927E7E003CAE7D /* MKAnnotationView+WebCache.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "MKAnnotationView+WebCache.m"; sourceTree = "<group>"; };
 		811600CE1D927E7E003CAE7D /* NSData+ImageContentType.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSData+ImageContentType.h"; sourceTree = "<group>"; };
@@ -450,6 +452,7 @@
 		812642C31D86A7A800B402CA /* CNLiveUserSystemDemo */ = {
 			isa = PBXGroup;
 			children = (
+				810EB6351E54398300C33D18 /* touxiang.png */,
 				81661FCB1DDED9DD00E3C65A /* cancel.png */,
 				812642C71D86A7A800B402CA /* AppDelegate.h */,
 				812642C81D86A7A800B402CA /* AppDelegate.m */,
@@ -694,6 +697,7 @@
 				812642D11D86A7A800B402CA /* Assets.xcassets in Resources */,
 				812642CF1D86A7A800B402CA /* Main.storyboard in Resources */,
 				81661FCC1DDED9DD00E3C65A /* cancel.png in Resources */,
+				810EB6361E54398300C33D18 /* touxiang.png in Resources */,
 				810D9B661D8FB70600B7A776 /* TencentOpenApi_IOS_Bundle.bundle in Resources */,
 				8187A90D1D8E9A7B007FAFB6 /* SVProgressHUD.bundle in Resources */,
 				810D9B681D8FB70600B7A776 /* WeiboSDK.bundle in Resources */,
@@ -13,133 +13,5 @@
             stopOnStyle = "0">
          </BreakpointContent>
       </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            shouldBeEnabled = "Yes"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "CNLiveUserSystemDemo/Conreollers/RegisterViewController.m"
-            timestampString = "501061773.344801"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "60"
-            endingLineNumber = "60"
-            landmarkName = "-verificationBtnAction"
-            landmarkType = "7">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            shouldBeEnabled = "Yes"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "CNLiveUserSystemDemo/Conreollers/RegisterViewController.m"
-            timestampString = "501061776.857064"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "63"
-            endingLineNumber = "63"
-            landmarkName = "-verificationBtnAction"
-            landmarkType = "7">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            shouldBeEnabled = "Yes"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "CNLiveUserSystemDemo/Conreollers/ViewController.m"
-            timestampString = "501142248.547315"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "73"
-            endingLineNumber = "73"
-            landmarkName = "-tapGesturedDetected:"
-            landmarkType = "7">
-            <Locations>
-               <Location
-                  shouldBeEnabled = "Yes"
-                  ignoreCount = "0"
-                  continueAfterRunningActions = "No"
-                  symbolName = "-[ViewController tapGesturedDetected:]"
-                  moduleName = "CNLiveUserSystemDemo"
-                  usesParentBreakpointCondition = "Yes"
-                  urlString = "file:///Users/android/Git/CNLiveUserSystemSDK/CNLiveUserSystemDemo/Conreollers/ViewController.m"
-                  timestampString = "502620330.058707"
-                  startingColumnNumber = "9223372036854775807"
-                  endingColumnNumber = "9223372036854775807"
-                  startingLineNumber = "73"
-                  endingLineNumber = "73"
-                  offsetFromSymbolStart = "84">
-               </Location>
-               <Location
-                  shouldBeEnabled = "Yes"
-                  ignoreCount = "0"
-                  continueAfterRunningActions = "No"
-                  symbolName = "__38-[ViewController tapGesturedDetected:]_block_invoke"
-                  moduleName = "CNLiveUserSystemDemo"
-                  usesParentBreakpointCondition = "Yes"
-                  urlString = "file:///Users/android/Git/CNLiveUserSystemSDK/CNLiveUserSystemDemo/Conreollers/ViewController.m"
-                  timestampString = "502620330.062799"
-                  startingColumnNumber = "9223372036854775807"
-                  endingColumnNumber = "9223372036854775807"
-                  startingLineNumber = "74"
-                  endingLineNumber = "74"
-                  offsetFromSymbolStart = "28">
-               </Location>
-            </Locations>
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            shouldBeEnabled = "Yes"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "CNLiveUserSystemDemo/Conreollers/RegisterViewController.m"
-            timestampString = "501385209.643505"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "89"
-            endingLineNumber = "89"
-            landmarkName = "-loginBtnAction"
-            landmarkType = "7">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            shouldBeEnabled = "Yes"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "CNLiveUserSystemDemo/Conreollers/RegisterViewController.m"
-            timestampString = "501385209.643505"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "95"
-            endingLineNumber = "95"
-            landmarkName = "-loginBtnAction"
-            landmarkType = "7">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            shouldBeEnabled = "Yes"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "CNLiveUserSystemDemo/CNLiveUserSystemSDK/CNLiveUploadIcon.m"
-            timestampString = "501665186.686912"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "36"
-            endingLineNumber = "36"
-            landmarkName = "-getAccessTokenRequestWithAppId:uid:icon:token:secret:success:failure:"
-            landmarkType = "7">
-         </BreakpointContent>
-      </BreakpointProxy>
    </Breakpoints>
 </Bucket>
@@ -32,6 +32,11 @@
     [super viewDidLoad];
     self.title = @"登录";
     self.view.backgroundColor = [UIColor whiteColor];
+    
+    UIBarButtonItem *backItem = [[UIBarButtonItem alloc] init];
+    backItem.title = @"back";
+    self.navigationItem.backBarButtonItem = backItem;
+    
     [self.view addSubview:self.idAndPwdView];
     [self.view addSubview:self.loginBtn];
     [self.view addSubview:self.messageLoginBtn];
@@ -133,12 +138,15 @@
 {
     if (!_loginBtn) {
         _loginBtn = [UIButton buttonWithType:UIButtonTypeCustom];
-        _loginBtn.backgroundColor = [UIColor orangeColor];
         [_loginBtn setFrame:CGRectMake(10, 250, KScreenWidth - 20, 40)];
-        _loginBtn.layer.cornerRadius = 20;
-        _loginBtn.layer.masksToBounds = YES;
         [_loginBtn setTitle:@"登  录" forState:UIControlStateNormal];
         [_loginBtn addTarget:self action:@selector(loginBtnAction) forControlEvents:UIControlEventTouchUpInside];
+        _loginBtn.titleLabel.font = [UIFont systemFontOfSize:18];
+        [_loginBtn setTitleColor:[UIColor colorWithRed:23/255.0 green:110/255.0 blue:254/255.0 alpha:1] forState:UIControlStateNormal];
+        _loginBtn.layer.cornerRadius = 20;
+        _loginBtn.layer.masksToBounds = YES;
+        _loginBtn.layer.borderColor = [UIColor blackColor].CGColor;
+        _loginBtn.layer.borderWidth = 1;
     }
     return _loginBtn;
 }
@@ -152,6 +160,8 @@
         _messageLoginBtn.titleLabel.font = [UIFont systemFontOfSize:15];
         [_messageLoginBtn setTitleColor:[UIColor redColor] forState:UIControlStateNormal];
         [_messageLoginBtn addTarget:self action:@selector(messageLoginBtnAction) forControlEvents:UIControlEventTouchUpInside];
+        [_messageLoginBtn setTitleColor:[UIColor colorWithRed:23/255.0 green:110/255.0 blue:254/255.0 alpha:1] forState:UIControlStateNormal];
+
     }
     return _messageLoginBtn;
 }
@@ -165,6 +175,8 @@
         _registBtn.titleLabel.font = [UIFont systemFontOfSize:15];
         [_registBtn setTitleColor:[UIColor redColor] forState:UIControlStateNormal];
         [_registBtn addTarget:self action:@selector(registBtnAction) forControlEvents:UIControlEventTouchUpInside];
+        [_registBtn setTitleColor:[UIColor colorWithRed:23/255.0 green:110/255.0 blue:254/255.0 alpha:1] forState:UIControlStateNormal];
+
     }
     return _registBtn;
 }
@@ -174,7 +186,7 @@
     if (!_thirdpartyLoginLbl) {
         _thirdpartyLoginLbl = [[UILabel alloc] initWithFrame:CGRectMake(0, KScreenHeight - 200, KScreenWidth, 15)];
         _thirdpartyLoginLbl.textAlignment = NSTextAlignmentCenter;
-        _thirdpartyLoginLbl.textColor = [UIColor orangeColor];
+        _thirdpartyLoginLbl.textColor = [UIColor blackColor];
         _thirdpartyLoginLbl.text = @"第三方账号登录";
         _thirdpartyLoginLbl.font = [UIFont systemFontOfSize:15];
     }
@@ -185,12 +197,15 @@
 {
     if (!_weChatBtn) {
         _weChatBtn = [UIButton buttonWithType:UIButtonTypeCustom];
-        _weChatBtn.backgroundColor = [UIColor orangeColor];
         [_weChatBtn setFrame:CGRectMake(SpaceWidth, KScreenHeight-150, 80, 40)];
-        _weChatBtn.layer.cornerRadius = 20;
-        _weChatBtn.layer.masksToBounds = YES;
         [_weChatBtn setTitle:@"微信" forState:UIControlStateNormal];
         [_weChatBtn addTarget:self action:@selector(weChatBtnAction) forControlEvents:UIControlEventTouchUpInside];
+        _weChatBtn.titleLabel.font = [UIFont systemFontOfSize:18];
+        [_weChatBtn setTitleColor:[UIColor colorWithRed:23/255.0 green:110/255.0 blue:254/255.0 alpha:1] forState:UIControlStateNormal];
+        _weChatBtn.layer.cornerRadius = 20;
+        _weChatBtn.layer.masksToBounds = YES;
+        _weChatBtn.layer.borderColor = [UIColor blackColor].CGColor;
+        _weChatBtn.layer.borderWidth = 1;
     }
     return _weChatBtn;
 }
@@ -199,12 +214,15 @@
 {
     if (!_sinaBtn) {
         _sinaBtn = [UIButton buttonWithType:UIButtonTypeCustom];
-        _sinaBtn.backgroundColor = [UIColor orangeColor];
         [_sinaBtn setFrame:CGRectMake(SpaceWidth*2+80, KScreenHeight-150, 80, 40)];
-        _sinaBtn.layer.cornerRadius = 20;
-        _sinaBtn.layer.masksToBounds = YES;
         [_sinaBtn setTitle:@"微博" forState:UIControlStateNormal];
         [_sinaBtn addTarget:self action:@selector(sinaBtnAction) forControlEvents:UIControlEventTouchUpInside];
+        _sinaBtn.titleLabel.font = [UIFont systemFontOfSize:18];
+        [_sinaBtn setTitleColor:[UIColor colorWithRed:23/255.0 green:110/255.0 blue:254/255.0 alpha:1] forState:UIControlStateNormal];
+        _sinaBtn.layer.cornerRadius = 20;
+        _sinaBtn.layer.masksToBounds = YES;
+        _sinaBtn.layer.borderColor = [UIColor blackColor].CGColor;
+        _sinaBtn.layer.borderWidth = 1;
     }
     return _sinaBtn;
 }
@@ -213,12 +231,15 @@
 {
     if (!_qqBtn) {
         _qqBtn = [UIButton buttonWithType:UIButtonTypeCustom];
-        _qqBtn.backgroundColor = [UIColor orangeColor];
         [_qqBtn setFrame:CGRectMake(SpaceWidth*3+80*2, KScreenHeight-150, 80, 40)];
-        _qqBtn.layer.cornerRadius = 20;
-        _qqBtn.layer.masksToBounds = YES;
         [_qqBtn setTitle:@"QQ" forState:UIControlStateNormal];
         [_qqBtn addTarget:self action:@selector(qqBtnAction) forControlEvents:UIControlEventTouchUpInside];
+        _qqBtn.titleLabel.font = [UIFont systemFontOfSize:18];
+        [_qqBtn setTitleColor:[UIColor colorWithRed:23/255.0 green:110/255.0 blue:254/255.0 alpha:1] forState:UIControlStateNormal];
+        _qqBtn.layer.cornerRadius = 20;
+        _qqBtn.layer.masksToBounds = YES;
+        _qqBtn.layer.borderColor = [UIColor blackColor].CGColor;
+        _qqBtn.layer.borderWidth = 1;
     }
     return _qqBtn;
 }
@@ -24,6 +24,10 @@
     [super viewDidLoad];
     self.view.backgroundColor = [UIColor whiteColor];
+    UIBarButtonItem *backItem = [[UIBarButtonItem alloc] init];
+    backItem.title = @"back";
+    self.navigationItem.backBarButtonItem = backItem;
+    
     if ([self.title isEqualToString:@"更新手机号"]) {
         [self.view addSubview:self.registBasicInformationView];
         [self.view addSubview:self.verificationBtn];
@@ -80,6 +84,7 @@
     } failure:^(NSDictionary *errorDic) {
         [Tools toast:[NSString stringWithFormat:@"errorCode : %@ \n errorMessage : %@", errorDic[@"errorCode"],errorDic[@"errorMessage"]]];
+        
     }];
 }
@@ -155,12 +160,15 @@
 {
     if (!_saveBtn) {
         _saveBtn = [UIButton buttonWithType:UIButtonTypeCustom];
-        _saveBtn.backgroundColor = [UIColor orangeColor];
         [_saveBtn setFrame:CGRectMake(10, 250, KScreenWidth - 20, 40)];
-        _saveBtn.layer.cornerRadius = 20;
-        _saveBtn.layer.masksToBounds = YES;
         [_saveBtn setTitle:@"保  存" forState:UIControlStateNormal];
         [_saveBtn addTarget:self action:@selector(saveBtnAction) forControlEvents:UIControlEventTouchUpInside];
+        _saveBtn.titleLabel.font = [UIFont systemFontOfSize:18];
+        [_saveBtn setTitleColor:[UIColor colorWithRed:23/255.0 green:110/255.0 blue:254/255.0 alpha:1] forState:UIControlStateNormal];
+        _saveBtn.layer.cornerRadius = 20;
+        _saveBtn.layer.masksToBounds = YES;
+        _saveBtn.layer.borderColor = [UIColor blackColor].CGColor;
+        _saveBtn.layer.borderWidth = 1;
     }
     return _saveBtn;
 }
@@ -178,11 +186,15 @@
     if (!_verificationBtn) {
         _verificationBtn = [UIButton buttonWithType:UIButtonTypeCustom];
         [_verificationBtn setFrame:CGRectMake(KScreenWidth - 105, 80, 95, 37)];
-        _verificationBtn.backgroundColor = [UIColor orangeColor];
-        _verificationBtn.titleLabel.font = [UIFont systemFontOfSize:15];
         [_verificationBtn setTitle:@"获取验证码" forState:UIControlStateNormal];
         [_verificationBtn setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal];
         [_verificationBtn addTarget:self action:@selector(verificationBtnAction) forControlEvents:UIControlEventTouchUpInside];
+        _verificationBtn.titleLabel.font = [UIFont systemFontOfSize:15];
+        [_verificationBtn setTitleColor:[UIColor colorWithRed:23/255.0 green:110/255.0 blue:254/255.0 alpha:1] forState:UIControlStateNormal];
+        _verificationBtn.layer.cornerRadius = 10;
+        _verificationBtn.layer.masksToBounds = YES;
+        _verificationBtn.layer.borderColor = [UIColor blackColor].CGColor;
+        _verificationBtn.layer.borderWidth = 1;
     }
     return _verificationBtn;
 }
@@ -11,10 +11,10 @@
 @interface RegisterViewController ()
-@property (nonatomic, strong)RegistBasicInformationView *registBasicInformationView;
-@property (nonatomic, strong)UIButton *verificationBtn;
-@property (nonatomic, strong)UIButton *loginBtn;
-
+@property (nonatomic, strong) RegistBasicInformationView *registBasicInformationView;
+@property (nonatomic, strong) UIButton *verificationBtn;
+@property (nonatomic, strong) UIButton *loginBtn;
+@property (nonatomic, strong) dispatch_source_t timer;
 @end
@@ -22,6 +22,11 @@
 - (void)viewDidLoad {
     [super viewDidLoad];
+    self.view.backgroundColor = [UIColor whiteColor];
+    
+    UIBarButtonItem *backItem = [[UIBarButtonItem alloc] init];
+    backItem.title = @"back";
+    self.navigationItem.backBarButtonItem = backItem;
     if ([_type isEqualToString:@"register"]) {
         self.title = @"注册";
@@ -31,7 +36,6 @@
         self.title = @"修改密码";
     }
-    self.view.backgroundColor = [UIColor whiteColor];
     [self.view addSubview:self.registBasicInformationView];
     [self.view addSubview:self.verificationBtn];
     [self.view addSubview:self.loginBtn];
@@ -51,6 +55,9 @@
         } failure:^(NSDictionary *errorDic) {
             [Tools toast:[NSString stringWithFormat:@"errorCode : %@ \n errorMessage : %@", errorDic[@"errorCode"],errorDic[@"errorMessage"]]];
+            
+            [self stopTimer];
+           
         }];
     } else if ([_type isEqualToString:@"quicklyLogin"]) {
@@ -61,6 +68,9 @@
         } failure:^(NSDictionary *errorDic) {
             [Tools toast:[NSString stringWithFormat:@"errorCode : %@ \n errorMessage : %@", errorDic[@"errorCode"],errorDic[@"errorMessage"]]];
+
+            [self stopTimer];
+
         }];
     } else {
@@ -71,10 +81,20 @@
         } failure:^(NSDictionary *errorDic) {
             [Tools toast:[NSString stringWithFormat:@"errorCode : %@ \n errorMessage : %@", errorDic[@"errorCode"],errorDic[@"errorMessage"]]];
+            
+            [self stopTimer];
         }];
     }
 }
+- (void)stopTimer
+{
+    [self.verificationBtn setTitle:@"发送验证码" forState:UIControlStateNormal];
+    self.verificationBtn.userInteractionEnabled = YES;
+    dispatch_cancel(self.timer);
+    self.timer = nil;
+}
+
 - (void)loginBtnAction
 {
@@ -130,7 +150,7 @@
     dispatch_queue_t queue = dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0);
-    dispatch_source_t _timer = dispatch_source_create(DISPATCH_SOURCE_TYPE_TIMER, 0, 0,queue);
+    self.timer = dispatch_source_create(DISPATCH_SOURCE_TYPE_TIMER, 0, 0,queue);
     dispatch_source_set_timer(_timer,dispatch_walltime(NULL, 0),1.0*NSEC_PER_SEC, 0); //每秒执行
@@ -145,15 +165,12 @@
                 //设置界面的按钮显示 根据自己需求设置
                 [self.verificationBtn setTitle:@"发送验证码" forState:UIControlStateNormal];
-                
                 self.verificationBtn.userInteractionEnabled = YES;
             });
         }else{
-            //            int minutes = timeout / 60;
-            
             int seconds = timeout % 60;
             NSString *strTime = [NSString stringWithFormat:@"%.2d", seconds];
@@ -201,11 +218,15 @@
     if (!_verificationBtn) {
         _verificationBtn = [UIButton buttonWithType:UIButtonTypeCustom];
         [_verificationBtn setFrame:CGRectMake(KScreenWidth - 105, 80, 95, 37)];
-        _verificationBtn.backgroundColor = [UIColor orangeColor];
-        _verificationBtn.titleLabel.font = [UIFont systemFontOfSize:15];
         [_verificationBtn setTitle:@"获取验证码" forState:UIControlStateNormal];
         [_verificationBtn setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal];
         [_verificationBtn addTarget:self action:@selector(verificationBtnAction) forControlEvents:UIControlEventTouchUpInside];
+        _verificationBtn.titleLabel.font = [UIFont systemFontOfSize:15];
+        [_verificationBtn setTitleColor:[UIColor colorWithRed:23/255.0 green:110/255.0 blue:254/255.0 alpha:1] forState:UIControlStateNormal];
+        _verificationBtn.layer.cornerRadius = 10;
+        _verificationBtn.layer.masksToBounds = YES;
+        _verificationBtn.layer.borderColor = [UIColor blackColor].CGColor;
+        _verificationBtn.layer.borderWidth = 1;
     }
     return _verificationBtn;
 }
@@ -214,10 +235,7 @@
 {
     if (!_loginBtn) {
         _loginBtn = [UIButton buttonWithType:UIButtonTypeCustom];
-        _loginBtn.backgroundColor = [UIColor orangeColor];
         [_loginBtn setFrame:CGRectMake(10, 280, KScreenWidth - 20, 40)];
-        _loginBtn.layer.cornerRadius = 20;
-        _loginBtn.layer.masksToBounds = YES;
         if ([_type isEqualToString:@"register"]) {
             [_loginBtn setTitle:@"注  册" forState:UIControlStateNormal];
         } else if ([_type isEqualToString:@"quicklyLogin"]) {
@@ -226,6 +244,12 @@
             [_loginBtn setTitle:@"确  认" forState:UIControlStateNormal];
         }
         [_loginBtn addTarget:self action:@selector(loginBtnAction) forControlEvents:UIControlEventTouchUpInside];
+        _loginBtn.titleLabel.font = [UIFont systemFontOfSize:18];
+        [_loginBtn setTitleColor:[UIColor colorWithRed:23/255.0 green:110/255.0 blue:254/255.0 alpha:1] forState:UIControlStateNormal];
+        _loginBtn.layer.cornerRadius = 20;
+        _loginBtn.layer.masksToBounds = YES;
+        _loginBtn.layer.borderColor = [UIColor blackColor].CGColor;
+        _loginBtn.layer.borderWidth = 1;
     }
     return _loginBtn;
 }
@@ -27,6 +27,11 @@
 - (void)viewDidLoad {
     [super viewDidLoad];
     self.view.backgroundColor = [UIColor whiteColor];
+    
+    UIBarButtonItem *backItem = [[UIBarButtonItem alloc] init];
+    backItem.title = @"back";
+    self.navigationItem.backBarButtonItem = backItem;
+    
     self.title = @"个人资料";
     _titlesArray = @[@"头像", @"更新手机号", @"昵称修改", @"性别修改", @"邮箱修改",@"地址修改"];
@@ -29,18 +29,26 @@
 - (void)viewDidLoad {
     [super viewDidLoad];
-    self.title = @"用户云";
+    self.title = @"用户云 SDK Demo";
     self.view.backgroundColor = [UIColor whiteColor];
+    UIBarButtonItem *backItem = [[UIBarButtonItem alloc] init];
+    backItem.title = @"back";
+    self.navigationItem.backBarButtonItem = backItem;
+    
+    UILabel *label = [[UILabel alloc] initWithFrame:CGRectMake(0, CGRectGetHeight([UIScreen mainScreen].bounds)-40, CGRectGetWidth(self.view.frame), 30)];
+    label.text = @"北京中投视讯文化传媒股份有限公司";
+    [self.view addSubview:label];
+    label.font = [UIFont systemFontOfSize:12];
+    label.textAlignment = NSTextAlignmentCenter;
+    
+    [self.view addSubview:label];
     [self.view addSubview:self.tableView];
     [self.view addSubview:self.loginBtn];
     [self.view addSubview:self.thirPartydView];
-//    UITapGestureRecognizer *tapGesture = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(tapGesturedDetected:)]; // 手势类型随你喜欢。
-//    tapGesture.delegate = self;
-//    [self.view addGestureRecognizer:tapGesture];
-    
     _dataArr = @[@"通过手机号修改密码",@"更新附加信息",@"修改用户信息",@"查询用户信息",@"反馈",@"绑定第三方账号"];
+    
 }
 - (void)viewWillAppear:(BOOL)animated
@@ -117,11 +125,12 @@
         UITableViewCell *loginCell = [[UITableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:@"cellID"];
         UIImageView *iconImg = [[UIImageView alloc] initWithFrame:CGRectMake(20, 20, 80, 80)];
-        iconImg.backgroundColor = [UIColor orangeColor];
+        iconImg.layer.cornerRadius = 40;
+        iconImg.layer.masksToBounds = YES;
         [loginCell.contentView addSubview:iconImg];
         UserInfoModel *model = [UserInfoModel modelWithKeyValues:[Tools getLocalUserInfo]];
-        [iconImg sd_setImageWithURL:[NSURL URLWithString:model.faceUrl] placeholderImage:[UIImage imageNamed:@""]];
+        [iconImg sd_setImageWithURL:[NSURL URLWithString:model.faceUrl] placeholderImage:[UIImage imageNamed:@"touxiang"]];
         UILabel *name = [[UILabel alloc] initWithFrame:CGRectMake(120, 0, KScreenWidth- 160, 120)];
         if ([Tools isLogin]) {
@@ -231,7 +240,7 @@
 - (UITableView *)tableView
 {
     if (!_tableView) {
-        _tableView = [[UITableView alloc] initWithFrame:CGRectMake(0, 0, KScreenWidth, KScreenHeight -80) style:UITableViewStylePlain];
+        _tableView = [[UITableView alloc] initWithFrame:CGRectMake(0, 64, KScreenWidth, KScreenHeight - 120 - 64) style:UITableViewStylePlain];
         _tableView.backgroundColor = [UIColor whiteColor];
         _tableView.tableFooterView = [[UIView alloc] init];
         _tableView.delegate = self;
@@ -252,13 +261,16 @@
 {
     if (!_loginBtn) {
         _loginBtn = [UIButton buttonWithType:UIButtonTypeCustom];
-        _loginBtn.frame = CGRectMake(20, KScreenHeight-60, KScreenWidth-40, 40);
+        _loginBtn.frame = CGRectMake(20, KScreenHeight-100, KScreenWidth-40, 40);
         [_loginBtn setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal];
-        [_loginBtn setBackgroundColor:[UIColor orangeColor]];
         _loginBtn.titleLabel.font = [UIFont systemFontOfSize:17];
         [_loginBtn addTarget:self action:@selector(logoutBtnAction) forControlEvents:UIControlEventTouchUpInside];
+        _loginBtn.titleLabel.font = [UIFont systemFontOfSize:18];
+        [_loginBtn setTitleColor:[UIColor colorWithRed:23/255.0 green:110/255.0 blue:254/255.0 alpha:1] forState:UIControlStateNormal];
         _loginBtn.layer.cornerRadius = 20;
         _loginBtn.layer.masksToBounds = YES;
+        _loginBtn.layer.borderColor = [UIColor blackColor].CGColor;
+        _loginBtn.layer.borderWidth = 1;
     }
     return _loginBtn;
 }
@@ -25,7 +25,7 @@
 {
     self = [super initWithFrame:frame];
     if (self) {
-        self.backgroundColor = [UIColor blackColor];
+        self.backgroundColor = [UIColor whiteColor];
         [self addSubview:self.sinaBtn];
         [self addSubview:self.qqBtn];
         [self addSubview:self.weChatBtn];
@@ -60,7 +60,7 @@
     if (!_thirdpartyLoginLbl) {
         _thirdpartyLoginLbl = [[UILabel alloc] initWithFrame:CGRectMake(0, 20, KScreenWidth, 15)];
         _thirdpartyLoginLbl.textAlignment = NSTextAlignmentCenter;
-        _thirdpartyLoginLbl.textColor = [UIColor orangeColor];
+        _thirdpartyLoginLbl.textColor = [UIColor blackColor];
         _thirdpartyLoginLbl.text = @"第三方平台";
         _thirdpartyLoginLbl.font = [UIFont systemFontOfSize:15];
     }
@@ -71,12 +71,15 @@
 {
     if (!_weChatBtn) {
         _weChatBtn = [UIButton buttonWithType:UIButtonTypeCustom];
-        _weChatBtn.backgroundColor = [UIColor orangeColor];
         [_weChatBtn setFrame:CGRectMake(SpaceWidth, 70, 80, 40)];
-        _weChatBtn.layer.cornerRadius = 20;
-        _weChatBtn.layer.masksToBounds = YES;
         [_weChatBtn setTitle:@"微信" forState:UIControlStateNormal];
         [_weChatBtn addTarget:self action:@selector(thirdPartyBtnAction:) forControlEvents:UIControlEventTouchUpInside];
+        _weChatBtn.titleLabel.font = [UIFont systemFontOfSize:18];
+        [_weChatBtn setTitleColor:[UIColor colorWithRed:23/255.0 green:110/255.0 blue:254/255.0 alpha:1] forState:UIControlStateNormal];
+        _weChatBtn.layer.cornerRadius = 20;
+        _weChatBtn.layer.masksToBounds = YES;
+        _weChatBtn.layer.borderColor = [UIColor blackColor].CGColor;
+        _weChatBtn.layer.borderWidth = 1;
     }
     return _weChatBtn;
 }
@@ -85,12 +88,15 @@
 {
     if (!_sinaBtn) {
         _sinaBtn = [UIButton buttonWithType:UIButtonTypeCustom];
-        _sinaBtn.backgroundColor = [UIColor orangeColor];
         [_sinaBtn setFrame:CGRectMake(SpaceWidth*2+80, 70, 80, 40)];
-        _sinaBtn.layer.cornerRadius = 20;
-        _sinaBtn.layer.masksToBounds = YES;
         [_sinaBtn setTitle:@"微博" forState:UIControlStateNormal];
         [_sinaBtn addTarget:self action:@selector(thirdPartyBtnAction:) forControlEvents:UIControlEventTouchUpInside];
+        _sinaBtn.titleLabel.font = [UIFont systemFontOfSize:18];
+        [_sinaBtn setTitleColor:[UIColor colorWithRed:23/255.0 green:110/255.0 blue:254/255.0 alpha:1] forState:UIControlStateNormal];
+        _sinaBtn.layer.cornerRadius = 20;
+        _sinaBtn.layer.masksToBounds = YES;
+        _sinaBtn.layer.borderColor = [UIColor blackColor].CGColor;
+        _sinaBtn.layer.borderWidth = 1;
     }
     return _sinaBtn;
 }
@@ -99,12 +105,15 @@
 {
     if (!_qqBtn) {
         _qqBtn = [UIButton buttonWithType:UIButtonTypeCustom];
-        _qqBtn.backgroundColor = [UIColor orangeColor];
         [_qqBtn setFrame:CGRectMake(SpaceWidth*3+80*2, 70, 80, 40)];
-        _qqBtn.layer.cornerRadius = 20;
-        _qqBtn.layer.masksToBounds = YES;
         [_qqBtn setTitle:@"QQ" forState:UIControlStateNormal];
         [_qqBtn addTarget:self action:@selector(thirdPartyBtnAction:) forControlEvents:UIControlEventTouchUpInside];
+        _qqBtn.titleLabel.font = [UIFont systemFontOfSize:18];
+        [_qqBtn setTitleColor:[UIColor colorWithRed:23/255.0 green:110/255.0 blue:254/255.0 alpha:1] forState:UIControlStateNormal];
+        _qqBtn.layer.cornerRadius = 20;
+        _qqBtn.layer.masksToBounds = YES;
+        _qqBtn.layer.borderColor = [UIColor blackColor].CGColor;
+        _qqBtn.layer.borderWidth = 1;
     }
     return _qqBtn;
 }