改bug，改ui

颜玄
1 parent 9ac51eb6
Showing 28 changed files with 154 additions and 193 deletions
LiveVideoCloud/AppCustoms/Main/ZXTabBarController.m
LiveVideoCloud/Classes/Sections/Mine/Controllers/LVCWebViewController.m
LiveVideoCloud/Classes/Sections/Mine/Controllers/MineAboutUsController.m
LiveVideoCloud/Classes/Sections/Mine/Controllers/MineMessageController.m
LiveVideoCloud/Classes/Sections/Mine/Controllers/MinePersonalDataController.m
LiveVideoCloud/Classes/Sections/Mine/Controllers/MineSettingViewController.m
LiveVideoCloud/Classes/Sections/Mine/Controllers/ModifyInfomationController.m
LiveVideoCloud/Classes/Sections/Mine/Login/Controller/LoginViewController.m
LiveVideoCloud/Classes/Sections/Mine/Login/Controller/RegisterCommonController.m
LiveVideoCloud/Classes/Sections/Mine/Views/LVCClearCachesCell.m
LiveVideoCloud/Classes/Sections/Mine/Views/LVCLoginShowView.m
LiveVideoCloud/Classes/Sections/Mine/Views/LVCMineShowCell.m
LiveVideoCloud/Classes/Sections/Mine/Views/PlayRecordCell.m
LiveVideoCloud/Classes/Sections/homeSections/Controller/LVCUGCLivePlayerController.m
LiveVideoCloud/HttpService/HttpService.m
LiveVideoCloud/UtilKits/Category/UIColor+HexString.m
LiveVideoCloud/UtilKits/UserInformationModel.h
LiveVideoCloud/UtilKits/UtilKits.h
LiveVideoCloud/animation.xcassets/mine/MoreAbout.imageset/Contents.json
LiveVideoCloud/animation.xcassets/mine/MoreAbout.imageset/MoreAbout@2x.png
@@ -13,7 +13,7 @@
 #import "LVCMineViewController.h"
 #import "LVCTabBar.h"
-#import "LVCMineViewController.h"
+#import "LVCMineViewController.h"//
 @interface ZXTabBarController ()<LVCTabBarDelegate>
@@ -46,9 +46,9 @@
 - (void)viewDidLoad {
     [super viewDidLoad];
-
+    
     self.webView.backgroundColor = CommonBgColor;
-
+    
     [self.webView loadRequest:[NSURLRequest requestWithURL:[NSURL URLWithString:self.url]]];
 }
@@ -7,6 +7,7 @@
 //
 #import "MineAboutUsController.h"
+#import "LVCWebViewController.h"
 @interface MineAboutUsController ()<UIActionSheetDelegate>
 @property (nonatomic ,strong) UIImageView *iconImageView;
 @property (nonatomic ,strong) UILabel *tVNameLabel;
@@ -41,7 +42,6 @@
         label.textColor = [UIColor grayColorCNLive];
         label.font = [UIFont systemFontOfSize:12.0f];
         label.textAlignment = NSTextAlignmentCenter;
-//        [label sizeToFit];
         _companyNameLabel = label;
         [self.view addSubview:_companyNameLabel];
     }
@@ -69,6 +69,7 @@
     }
     return _accessBtn;
 }
+
 - (UIButton *)callBtn
 {
     if (!_callBtn) {
@@ -94,6 +95,7 @@
     return _disclaimerBtn;
 }
+
 - (UIView *)lineView
 {
     if (!_lineView) {
@@ -103,6 +105,26 @@
     return _lineView;
 }
+- (void)buttonClick:(UIButton *)button
+{
+    LVCWebViewController *generalWebView = [[LVCWebViewController alloc] init];
+    if (button.tag == 1000) {
+        NSString *webUrl = @"http://www.cnlive.com";
+        generalWebView.title = @"视讯中国官网";
+        generalWebView.url = webUrl;
+        [self.navigationController pushViewController:generalWebView animated:YES];
+        
+    }else if (button.tag == 1001){
+        UIActionSheet *action = [[UIActionSheet alloc] initWithTitle:@"400-666-7792" delegate:self cancelButtonTitle:@"取消" destructiveButtonTitle:@"拨打电话" otherButtonTitles: nil];
+        [action showInView:self.view];
+    }else{
+        NSString *webUrl = @"http://www.cnlive.com/other/page/mzsm.html";
+        generalWebView.url = webUrl;
+        [self.navigationController pushViewController:generalWebView animated:YES];
+        
+    }
+}
+
 - (void)actionSheet:(UIActionSheet *)actionSheet clickedButtonAtIndex:(NSInteger)buttonIndex
 {
@@ -117,13 +139,12 @@
 - (void)viewDidLoad {
     [super viewDidLoad];
-
-
+    
+    
 }
 - (void)didReceiveMemoryWarning {
     [super didReceiveMemoryWarning];
-    // Dispose of any resources that can be recreated.
 }
 -(void)bindView
@@ -132,7 +153,7 @@
     [self.view addSubview:self.lineView];
     //270x270
     self.iconImageView.frame = CGRectMake(SCREEN_W * 0.5 - [@45 ScaH], 50, [@90 ScaH], [@90 ScaH]);
-    self.iconImageView.image = [UIImage imageNamed:@"精彩直播logo-5"];
+    self.iconImageView.image = [UIImage imageNamed:@"cnlive"];
     self.tVNameLabel.frame = CGRectMake(self.iconImageView.centerX - 100, self.iconImageView.bottom + 10, 200, 30);
     self.tVNameLabel.text = @"LiveVideoCloud";
     self.accessBtn.frame = CGRectMake(_iconImageView.centerX- [@150 ScaH]*0.5, _tVNameLabel.bottom + [@35 ScaH], [@150 ScaH], [@30 ScaH]);
@@ -25,14 +25,4 @@
     // Dispose of any resources that can be recreated.
 }
-/*
-#pragma mark - Navigation
-
-// In a storyboard-based application, you will often want to do a little preparation before navigation
-- (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender {
-    // Get the new view controller using [segue destinationViewController].
-    // Pass the selected object to the new view controller.
-}
-*/
-
 @end
@@ -59,7 +59,7 @@
 - (NSMutableArray *)localTitleArr
 {
     if (!_localTitleArr) {
-        _localTitleArr = [[NSMutableArray alloc] initWithObjects:@[@"头像",@"昵称",@"性别",@"手机号",@"邮箱",@"所在地"],@[@"唯一绑定的视讯号id"], nil];
+        _localTitleArr = [[NSMutableArray alloc] initWithObjects:@[@"头像",@"昵称",@"性别",@"手机号",@"邮箱",@"所在地"],@[@"视讯号id"], nil];
     }
     return _localTitleArr;
 }
@@ -279,7 +279,6 @@
     }
    else
    {//未登录 默认为空
-//       if(indexPath.section == 2){
        if(indexPath.section == 1){
            cell.detailLabel.text = @"未设置";
        }else
@@ -304,8 +303,6 @@
     if (indexPath.section == 0 && indexPath.row == 0) {
         return 63;
     }
-//    if(indexPath.section == 1 && indexPath.row == 1)
-//        return 200;
     return 53;
 }
 -(void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath
@@ -384,7 +381,7 @@
 {
     UIView* footerView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, SCREEN_W, 200)];
-    UIButton *logoutBtn = [UIButton buttonWithTitle:@"注销" titleColor:[UIColor whiteColor] labelFontSize:17 cornerRadius:20 backgroundImageNormal:[Tools getImageFromColor:[UIColor colorWithHexString:@"969797"]] backgroundImageHighlight:[Tools getImageFromColor:[UIColor colorWithHexString:@"6e6e6e"]]];
+    UIButton *logoutBtn = [UIButton buttonWithTitle:@"注销" titleColor:[UIColor whiteColor] labelFontSize:17 cornerRadius:20 backgroundImageNormal:[Tools getImageFromColor:[UIColor colorWithHexString:@"969797"]] backgroundImageHighlight:[Tools getImageFromColor:[UIColor colorWithHexString:@"6e6e6e"]]];//#fff100
     logoutBtn.frame = CGRectMake(20, 80, KScreenWidth-40, 40);
     [logoutBtn addTarget:self action:@selector(logoutBtnAction) forControlEvents:UIControlEventTouchUpInside];
     [footerView addSubview:logoutBtn];
@@ -400,7 +397,6 @@
 - (void)didReceiveMemoryWarning {
     [super didReceiveMemoryWarning];
-    // Dispose of any resources that can be recreated.
 }
 @end
@@ -20,6 +20,7 @@
 @property (nonatomic, strong) NSMutableArray * localTitleArr;
 @property (nonatomic ,strong) NSArray *localImageArr;
+@property (nonatomic , strong) NSString *clearCacheName;//定义清除缓存
 @end
@@ -27,8 +28,6 @@
 - (void)viewDidLoad {
     [super viewDidLoad];
-//    self.view.backgroundColor = CommonBgColor;
-
     self.title = @"设置";
 }
@@ -48,7 +47,6 @@
         model.title = [NSString stringWithFormat:@"%d",arc4random()%10000000];
         [self.dataarray addObject:model];
     }
-    //    [self.tbv reloadData];
 }
 - (NSMutableArray *)dataarray
 {
@@ -60,17 +58,17 @@
 - (NSMutableArray *)localTitleArr
 {
     if (!_localTitleArr) {
-       _localTitleArr = [[NSMutableArray alloc] initWithObjects:@[@"清除缓存"],@[@"帮助",@"关于我们"], nil];
-
+        _localTitleArr = [[NSMutableArray alloc] initWithObjects:@[@"清除缓存"],@[@"帮助",@"关于我们",@"反馈意见"], nil];
+        
     }
     return _localTitleArr;
 }
 - (NSArray *)localImageArr
 {
     if (!_localImageArr) {
-
-        _localImageArr = [[NSArray alloc] initWithObjects:@[@"Clear the cache_icon"],@[@"help_iocn",@"About us_icon"], nil];
-      
+        
+        _localImageArr = [[NSArray alloc] initWithObjects:@[@"handShake"],@[@"MoreHelp",@"MoreAbout",@"MorePush"], nil];
+        
     }
     return _localImageArr;
 }
@@ -83,7 +81,7 @@
         tableView.dataSource = self;
         tableView.separatorStyle = UITableViewCellSeparatorStyleNone;
         tableView.backgroundColor = CommonBgColor;
-
+        
         [tableView registerClass:[LVCClearCachesCell class] forCellReuseIdentifier:NSStringFromClass([LVCClearCachesCell class])];
         [tableView registerClass:[LVCMineCommonCell class] forCellReuseIdentifier:NSStringFromClass([LVCMineCommonCell class])];
         _tbv = tableView;
@@ -99,13 +97,13 @@
     }else
     {
         LVCMineCommonCell * cell = [tableView dequeueReusableCellWithIdentifier:NSStringFromClass([LVCMineCommonCell class]) forIndexPath:indexPath];
-
+        
         [cell loadLocalTitle:_localTitleArr[indexPath.section][indexPath.row] imageName:self.localImageArr[indexPath.section][indexPath.row]];
         return cell;
     }
     return nil;
-
+    
 }
 - (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView
@@ -128,7 +126,8 @@
         //清除缓存
         NSLog(@"清除缓存");
         return;
-    }else if ([_localTitleArr[indexPath.section][indexPath.row] isEqualToString:@"帮助"])
+    }
+    else if ([_localTitleArr[indexPath.section][indexPath.row] isEqualToString:@"帮助"])
     {
         LVCWebViewController *web = [[LVCWebViewController alloc] init];
         web.url = @"http://data.cnlive.com/term/hdtv/hd_zhongguobi.html";
@@ -140,17 +139,11 @@
         MineAboutUsController * vc = [MineAboutUsController new];
         vc.title = self.localTitleArr[indexPath.section][indexPath.row];
         [self.navigationController pushViewController:vc animated:YES];
-    }else
-    {
-        
     }
 }
-
 -(CGFloat)tableView:(UITableView *)tableView heightForHeaderInSection:(NSInteger)section
 {
     return 10;
 }
-
-
 @end
@@ -17,9 +17,6 @@
 - (void)viewDidLoad {
     [super viewDidLoad];
-    // Do any additional setup after loading the view.
-    
-//    self.view.backgroundColor = CommonBgColor;
 }
 - (void)bindView
@@ -93,8 +90,6 @@
             case ModifyInfoTypeAddress:
             {
                 _modifyView = [[ModifyCommonView alloc] initWithFrame:CGRectMake(0, 6, SCREEN_W, 55) withType:ModifyInfoTypeAddress];
-
-//                _modifyView = [[ModifyCommonView alloc] initWithFrame:CGRectMake(0, 6, SCREEN_W, 55 * 3 + 2) withType:ModifyInfoTypeAddress];
             }
                 break;
             case ModifyInfoTypePhoneNumber:
@@ -158,8 +153,6 @@
                 return;
             }
             [self upLoadDataWithValue:_modifyView.textFieldTwo.text type:UserInfoTypeLocation];
-
-//            [self upLoadDataWithValue:[NSString stringWithFormat:@"%@_%@_%@", _modifyView.textFieldOne.text, _modifyView.textFieldTwo.text, _modifyView.textFieldThree.text] type:UserInfoTypeLocation];
         }
             break;
         case ModifyInfoTypePhoneNumber:
@@ -267,15 +260,4 @@
     [super didReceiveMemoryWarning];
     // Dispose of any resources that can be recreated.
 }
-
-/*
-#pragma mark - Navigation
-
-// In a storyboard-based application, you will often want to do a little preparation before navigation
-- (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender {
-    // Get the new view controller using [segue destinationViewController].
-    // Pass the selected object to the new view controller.
-}
-*/
-
 @end
@@ -65,8 +65,6 @@
 - (void)setNotification
 {
-//    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(loginSuccess) name:ThirdLoginSuccess object:nil];
-//    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(loginFailure) name:ThirdLoginFailure object:nil];
 }
 #pragma mark - action
@@ -131,21 +129,6 @@
     [self.navigationController pushViewController:regVC animated:YES];
 }
-//- (void)weChatBtnAction
-//{
-//    [[CNLiveThirdLoginManager manager] weChatLogin];
-//}
-//
-//- (void)sinaBtnAction
-//{
-//    [[CNLiveThirdLoginManager manager] sinaLogin];
-//}
-//
-//- (void)qqBtnAction
-//{
-//    [[CNLiveThirdLoginManager manager] qqLogin];
-//}
-
 - (void)loginSuccess
 {
     [self.navigationController popViewControllerAnimated:YES];
@@ -185,14 +168,6 @@
 - (UIButton *)loginBtn
 {
     if (!_loginBtn) {
-//        _loginBtn = [UIButton buttonWithType:UIButtonTypeCustom];
-//        _loginBtn.backgroundColor = [UIColor yellowColorCNLive];
-//        _loginBtn.layer.cornerRadius = 20;
-//        _loginBtn.layer.masksToBounds = YES;
-//        [_loginBtn setTitle:@"登  录" forState:UIControlStateNormal];
-//        [_loginBtn setTitleColor:[UIColor blackColorCNLive] forState:UIControlStateNormal];
-//        _loginBtn.layer.borderWidth = 1.0f;//设置边框宽度
-//        _loginBtn.layer.borderColor = [UIColor blackColorCNLive].CGColor;//设置边框颜色
         _loginBtn = [UIButton buttonWithTitle:@"登  录" titleColor:[UIColor blackColorCNLive] cornerRadius:20 borderWidth:1.0f borderColor:[UIColor blackColorCNLive] backgroundColor:[UIColor yellowColorCNLive]];
         [_loginBtn setFrame:CGRectMake(10, self.idAndPwdView.bottom + 193 * 0.5, KScreenWidth - 20, 40)];
         [_loginBtn addTarget:self action:@selector(loginBtnAction) forControlEvents:UIControlEventTouchUpInside];
@@ -203,10 +178,6 @@
 - (UIButton *)forgetPwdBtn
 {
     if (!_forgetPwdBtn) {
-//        _forgetPwdBtn = [UIButton buttonWithType:UIButtonTypeCustom];
-//        _forgetPwdBtn.titleLabel.font = [UIFont systemFontOfSize:15];
-//        [_forgetPwdBtn setTitle:@"忘记密码?" forState:UIControlStateNormal];
-//        [_forgetPwdBtn setTitleColor:[UIColor grayColorCNLive] forState:UIControlStateNormal];
         _forgetPwdBtn = [UIButton buttonWithTitle:@"忘记密码?" titleColor:[UIColor grayColorCNLive] labelFontSize:15];
         CGSize forgetLabelSize = [_forgetPwdBtn.titleLabel labelSize];
         [_forgetPwdBtn setFrame:CGRectMake(10, self.idAndPwdView.bottom + 24, forgetLabelSize.width, forgetLabelSize.height)];
@@ -218,11 +189,6 @@
 - (UIButton *)messageBtn
 {
     if (!_messageBtn) {
-//        _messageBtn = [UIButton buttonWithType:UIButtonTypeCustom];
-//        [_messageBtn setTitle:@"短信验证登录" forState:UIControlStateNormal];
-//        _messageBtn.titleLabel.font = [UIFont systemFontOfSize:15];
-//        
-//        [_messageBtn setTitleColor:[UIColor blackColorCNLive] forState:UIControlStateNormal];
         _messageBtn = [UIButton buttonWithTitle:@"短信验证登录" titleColor:[UIColor blackColorCNLive] labelFontSize:15];
         CGSize size = [_messageBtn.titleLabel labelSize];
         [_messageBtn setFrame:CGRectMake(KScreenWidth - 10 - size.width, self.idAndPwdView.bottom + 24, size.width, size.height)];
@@ -235,10 +201,6 @@
 - (UIButton *)registerBtn
 {
     if (!_registerBtn) {
-//        _registerBtn = [UIButton buttonWithType:UIButtonTypeCustom];
-//        [_registerBtn setTitle:@"注册" forState:UIControlStateNormal];
-//        _registerBtn.titleLabel.font = [UIFont systemFontOfSize:15];
-//        [_registerBtn setTitleColor:[UIColor blackColorCNLive] forState:UIControlStateNormal];
         _registerBtn = [UIButton buttonWithTitle:@"注册" titleColor:[UIColor blackColorCNLive] labelFontSize:15];
         [_registerBtn setFrame:CGRectMake(0, 0, 40, 20)];
         [_registerBtn addTarget:self action:@selector(registBtnAction) forControlEvents:UIControlEventTouchUpInside];
@@ -249,10 +211,6 @@
 - (ZXLabel *)thirdPartyLoginLabel
 {
     if (!_thirdPartyLoginLabel) {
-//        _thirdPartyLoginLabel = [[UILabel alloc] init];
-//        _thirdPartyLoginLabel.textAlignment = NSTextAlignmentCenter;
-//        _thirdPartyLoginLabel.textColor = [UIColor grayColorCNLive];
-//        _thirdPartyLoginLabel.font = [UIFont systemFontOfSize:15];
         _thirdPartyLoginLabel = [ZXUIKit labelTypeThirdParty];
         _thirdPartyLoginLabel.text = @"第三方账号登录";
         CGSize size = [_thirdPartyLoginLabel labelSize];
@@ -263,10 +221,6 @@
 - (ZXLabel *)weChatLbl
 {
     if (!_weChatLbl) {
-//        _weChatLbl = [[UILabel alloc] init];
-//        _weChatLbl.font = [UIFont systemFontOfSize:10];
-//        _weChatLbl.textAlignment = NSTextAlignmentCenter;
-//        _weChatLbl.textColor = [UIColor grayColorCNLive];
         _weChatLbl = [ZXUIKit labelTypeThirdPartySmall];
         _weChatLbl.text = @"微信";
         _weChatLbl.width = 30;
@@ -280,17 +234,6 @@
 - (ZXLabel *)qqLbl
 {
     if (!_qqLbl) {
-//        _qqLbl = [[UILabel alloc] init];
-//        _qqLbl.font = [UIFont systemFontOfSize:10];
-//        _qqLbl.textAlignment = NSTextAlignmentCenter;
-//        _qqLbl.textColor = [UIColor grayColorCNLive];
-
-////        if ([CNLiveShare isInstalledWithAppType:WeChatType]) {
-////            [_qqLbl setCenter:CGPointMake(KScreenWidth / 2, KScreenHeight - 39 - 64)];
-////        }
-////        else {
-////            [_qqLbl setCenter:CGPointMake(KScreenWidth / 3, KScreenHeight - 39 - 64)];
-////        }
         _qqLbl = [ZXUIKit labelTypeThirdPartySmall];
         _qqLbl.width = 30;
         _qqLbl.height = 20;
@@ -304,17 +247,6 @@
 - (ZXLabel *)sinaLbl
 {
     if (!_sinaLbl) {
-//        _sinaLbl = [[UILabel alloc] init];
-//        _sinaLbl.font = [UIFont systemFontOfSize:10];
-//        _sinaLbl.textAlignment = NSTextAlignmentCenter;
-//        _sinaLbl.textColor = [UIColor grayColorCNLive];
-        
-////        if ([CNLiveShare isInstalledWithAppType:WeChatType]) {
-////            [_sinaLbl setCenter:CGPointMake(KScreenWidth - (53+45/2), KScreenHeight - 39 - 64)];
-////        }
-////        else {
-////            [_sinaLbl setCenter:CGPointMake(KScreenWidth / 3 * 2, KScreenHeight - 39 - 64)];
-////        }
         _sinaLbl = [ZXUIKit labelTypeThirdPartySmall];
         _sinaLbl.width = 30;
         _sinaLbl.height = 20;
@@ -327,10 +259,6 @@
 - (UIButton *)weChatBtn
 {
     if (!_weChatBtn) {
-//        _weChatBtn = [UIButton buttonWithType:UIButtonTypeCustom];
-//        _weChatBtn.layer.cornerRadius = 90 / 4;
-//        _weChatBtn.layer.masksToBounds = YES;
-//        [_weChatBtn setImage:[UIImage imageNamed:@"wechat"] forState:UIControlStateNormal];
         _weChatBtn = [UIButton buttonWithImageNormal:[UIImage imageNamed:@"wechat"] cornerRadius:90 / 4];
         [_weChatBtn setFrame:CGRectMake(SpaceWidth, self.thirdPartyLoginLabel.bottom + 15, 90 / 2, 90 / 2)];
         [_weChatBtn addTarget:self action:@selector(weChatBtnAction) forControlEvents:UIControlEventTouchUpInside];
@@ -341,10 +269,6 @@
 - (UIButton *)sinaBtn
 {
     if (!_sinaBtn) {
-//        _sinaBtn = [UIButton buttonWithType:UIButtonTypeCustom];
-//        _sinaBtn.layer.cornerRadius = 90 / 4;
-//        _sinaBtn.layer.masksToBounds = YES;
-//        [_sinaBtn setImage:[UIImage imageNamed:@"sina"] forState:UIControlStateNormal];
         _sinaBtn = [UIButton buttonWithImageNormal:[UIImage imageNamed:@"sina"] cornerRadius:90 / 4];
         [_sinaBtn setFrame:CGRectMake(SpaceWidth*2+90/3, self.thirdPartyLoginLabel.bottom+ 15, 90 /2, 90 /2)];
         [_sinaBtn addTarget:self action:@selector(sinaBtnAction) forControlEvents:UIControlEventTouchUpInside];
@@ -355,10 +279,6 @@
 - (UIButton *)qqBtn
 {
     if (!_qqBtn) {
-//        _qqBtn = [UIButton buttonWithType:UIButtonTypeCustom];
-//        [_qqBtn setImage:[UIImage imageNamed:@"qq"] forState:UIControlStateNormal];
-//        _qqBtn.layer.cornerRadius = 90 / 4;
-//        _qqBtn.layer.masksToBounds = YES;
         _qqBtn = [UIButton buttonWithImageNormal:[UIImage imageNamed:@"qq"] cornerRadius:90 / 4];
         [_qqBtn setFrame:CGRectMake(SpaceWidth*3+90 /3*2, self.thirdPartyLoginLabel.bottom + 15, 90 / 2, 90 / 2)];
         [_qqBtn addTarget:self action:@selector(qqBtnAction) forControlEvents:UIControlEventTouchUpInside];
@@ -364,14 +364,6 @@
 - (UIButton *)verificationBtn
 {
     if (!_verificationBtn) {
-//        _verificationBtn = [UIButton buttonWithType:UIButtonTypeCustom];
-//        _verificationBtn.titleLabel.font = [UIFont systemFontOfSize:12];
-//        [_verificationBtn setTitleColor:[UIColor blackColorCNLive] forState:UIControlStateNormal];
-//        _verificationBtn.layer.borderWidth = 1.0f;//设置边框宽度
-//        _verificationBtn.layer.borderColor = [UIColor blackColorCNLive].CGColor;//设置边框颜色
-//        _verificationBtn.layer.cornerRadius = 25.0 * 0.5;
-//        _verificationBtn.clipsToBounds = YES;
-//        [_verificationBtn setTitle:@"获取验证码" forState:UIControlStateNormal];
         _verificationBtn = [UIButton buttonWithTitle:@"获取验证码" titleColor:[UIColor blackColorCNLive] labelFontSize:12 cornerRadius:25.0 * 0.5 borderWidth:1.0f borderColor:[UIColor blackColorCNLive]];
         [_verificationBtn setFrame:CGRectMake(SCREEN_W - 166 / 2, 7+(57-25)*0.5 , 146 / 2, 25)];
         [_verificationBtn addTarget:self action:@selector(verificationBtnAction) forControlEvents:UIControlEventTouchUpInside];
@@ -445,14 +437,5 @@
 {
     [self.view endEditing:YES];
 }
-/*
-#pragma mark - Navigation
-
-// In a storyboard-based application, you will often want to do a little preparation before navigation
-- (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender {
-    // Get the new view controller using [segue destinationViewController].
-    // Pass the selected object to the new view controller.
-}
-*/
 @end
@@ -42,8 +42,6 @@
         //子线程计算大小
         dispatch_async(dispatch_get_global_queue(0, 0), ^{
             NSLog(@"aaaaa");
-            //获取缓存文件夹路径
-//        NSLog(@"%@",[NSSearchPathForDirectoriesInDomains(NSCachesDirectory, NSUserDomainMask, YES).lastObject stringByAppendingPathComponent:@"Custom"]);
             unsigned long long size = ZXCustomCacheFile.zx_fileSize;
             size += [SDImageCache sharedImageCache].getSize;
@@ -166,11 +164,6 @@
     CGContextSetFillColorWithColor(context, [UIColor clearColor].CGColor);
     CGContextFillRect(context, rect);
-    //上分割线，
-    //    CGContextSetStrokeColorWithColor(context, [UIColor colorWithHexString:@"ffffff"].CGColor);
-    //    CGContextStrokeRect(context, CGRectMake(5, -1, rect.size.width - 10, 1));
-    
-//    NSLog(@"cell h = %f,w = %f",rect.size.height,rect.size.width);
     //下分割线
     CGContextSetStrokeColorWithColor(context, [UIColor colorWithHexString:@"e3e1e1"].CGColor);
     CGContextStrokeRect(context, CGRectMake(10, rect.size.height, rect.size.width - 20, 1));
@@ -107,7 +107,7 @@
     self.leftBtn.frame = CGRectMake(20 / 2, - LoginViewHeight+ 20 + (44 - 66 / 3) / 2, 66 / 3, 66 /3);
     self.rightBtn.frame = CGRectMake(SCREEN_W -66 / 3 - 20 / 2,  - LoginViewHeight+20 + (44 - 66 / 3) / 2, 66 / 3, 66 / 3);
-    self.navTitleLabel.text = @"我  的";
+    self.navTitleLabel.text = @"  ";
     CGSize size = [self.navTitleLabel labelSize];
     self.navTitleLabel.center = CGPointMake(SCREEN_W * 0.5 - 0.5 *size.width, - LoginViewHeight + 20 + 0.5 *size.height);
     self.navTitleLabel.width = size.width;
@@ -130,7 +130,6 @@
 {
     self.nameLabel.text = @"您还没有登录哟~";
     CGSize nameSize = [self.nameLabel labelSize];
-//    self.nameLabel.center = CGPointMake(_iconImageView.center.x - nameSize.width * 0.5,  -LoginViewHeight - _iconImageView.bottom + 15 + nameSize.height * 0.5);
     self.nameLabel.centerX = _iconImageView.center.x - nameSize.width * 0.5;
     self.nameLabel.width = nameSize.width;
     self.nameLabel.height = nameSize.height;
@@ -31,13 +31,6 @@
 - (ZXLabel *)nameLabel {
     if (!_nameLabel) {
-//        UILabel* label = [[UILabel alloc]init];
-//        label.backgroundColor = [UIColor clearColor];
-//        label.textColor = [UIColor blackColor];
-//        label.font = [UIFont systemFontOfSize:15.0f];
-//        label.textAlignment = NSTextAlignmentCenter;
-//        
-//        _nameLabel = label;
         [ZXUIKit labelTypeNavSmall];
         [self addSubview:_nameLabel];
     }
@@ -46,12 +39,6 @@
 - (ZXLabel *)navTitleLabel {
     if (!_navTitleLabel) {
-//        UILabel* label = [[UILabel alloc]init];
-//        label.backgroundColor = [UIColor clearColor];
-//        label.textColor = [UIColor blackColor];
-//        label.font = [UIFont systemFontOfSize:22.0f];
-//        label.textAlignment = NSTextAlignmentCenter;
-//        _navTitleLabel = label;
         _navTitleLabel = [ZXUIKit labelTypeNavCenter];
         _navTitleLabel.text = @"我   的";
         [self addSubview:_navTitleLabel];
@@ -63,8 +50,6 @@
 {
     if (!_leftBtn) {
         _leftBtn = [UIButton buttonWithImageNormal:[UIImage imageNamed: @"search"]];
-//        _leftBtn = [UIButton buttonWithType:UIButtonTypeCustom];
-//        [_leftBtn setImage:[UIImage imageNamed:@"search"] forState:UIControlStateNormal];
         [_leftBtn addTarget:self action:@selector(searchBtnClick) forControlEvents:UIControlEventTouchUpInside];
         [self addSubview:_leftBtn];
     }
@@ -74,8 +59,6 @@
 {
     if (!_rightBtn) {
         _rightBtn = [UIButton buttonWithImageNormal:[UIImage imageNamed: @"edit"]];
-//        _rightBtn = [UIButton buttonWithType:UIButtonTypeCustom];
-//        [_rightBtn setImage:[UIImage imageNamed:@" edit"] forState:UIControlStateNormal];
         [_rightBtn addTarget:self action:@selector(editBtnClick) forControlEvents:UIControlEventTouchUpInside];
         [self addSubview:_rightBtn];
@@ -134,10 +134,6 @@
     CGContextSetFillColorWithColor(context, [UIColor clearColor].CGColor);
     CGContextFillRect(context, rect);
-    //上分割线，
-    //    CGContextSetStrokeColorWithColor(context, [UIColor colorWithHexString:@"ffffff"].CGColor);
-    //    CGContextStrokeRect(context, CGRectMake(5, -1, rect.size.width - 10, 1));
-    
     //下分割线
     CGContextSetStrokeColorWithColor(context, [UIColor colorWithHexString:@"e3e1e1"].CGColor);
     CGContextStrokeRect(context, CGRectMake(10, rect.size.height, rect.size.width - 20, 1));
@@ -109,7 +109,7 @@
 - (void)quitBtnClick {    // 退出
     [_player stop];
-    if (self.navigationController.viewControllers.count > 2) {
+    if (self.navigationController.viewControllers.count > 2) {//判断
         [self.navigationController popViewControllerAnimated:YES];
     }
@@ -52,7 +52,7 @@ static HttpService * __singleton__;
     NSString *methodStr = [self stringWithMethod:method];
     NSMutableURLRequest *request = [_dataSessionManager.requestSerializer requestWithMethod:methodStr URLString:urlStr parameters:parameters error:nil];
     __block NSURLSessionDataTask *task = nil;
-    task = [_dataSessionManager dataTaskWithRequest:request completionHandler:^(NSURLResponse *response, id responseObject, NSError *error) {
+    task = [_dataSessionManager dataTaskWithRequest:request completionHandler:^(NSURLResponse *response, id responseObject, NSError *error) {//
         [UIApplication sharedApplication].networkActivityIndicatorVisible = NO;
         NSError *err = nil;
         id data = nil;
@@ -92,9 +92,9 @@
 }
-+ (UIColor *)yellowColorCNLive//后期全部要修改
++ (UIColor *)yellowColorCNLive//
 {
-    return [self colorWithHexString:@"#BDFCC9"];//
+    return [self colorWithHexString:@"fff100"];//
 }
 + (UIColor *)redColorCNLive
@@ -18,7 +18,7 @@
 @property (nonatomic ,copy) NSString *state;//状态
 @property (nonatomic ,copy) NSString *chinaCoin;//中国币数量
 @property (nonatomic, copy) NSString *faceUrl;//头像url
-@property (nonatomic, copy) NSString *token;//唯一标识视讯号id
+@property (nonatomic, copy) NSString *token;//w标识视讯号id
 @property (nonatomic, copy) NSString *extInfo;//自定义信息
 @property (nonatomic, copy)NSString *mobile;//手机号
 @property (nonatomic, copy)NSString *email;//邮箱
@@ -36,7 +36,7 @@
 #define CURRENT_WINDOW [[UIApplication sharedApplication].windows lastObject]
-#define LoginViewHeight 209
+#define LoginViewHeight 235//209
 #define SMALL_MARGIN 5
 #define CURRENT_WINDOW [[UIApplication sharedApplication].windows lastObject]
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "MoreAbout@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
 \ No newline at end of file
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "MoreHelp@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
 \ No newline at end of file
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "MorePush@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
 \ No newline at end of file
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "cnlive.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
 \ No newline at end of file
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "handShake@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
 \ No newline at end of file