Merge branch 'master' of bj.gitlab.cnlive.com:ios-team/LiveVideoCloud

# Conflicts: # LiveVideoCloud/AppDelegate/AppDelegate.m

Merge branch 'master' of bj.gitlab.cnlive.com:ios-team/LiveVideoCloud
# Conflicts: # LiveVideoCloud/AppDelegate/AppDelegate.m
王军波
2 parents 95e8023c 7d4c4b5f
Showing 28 changed files with 279 additions and 147 deletions
LiveVideoCloud.xcodeproj/project.pbxproj
LiveVideoCloud.xcodeproj/xcuserdata/cnlive.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
LiveVideoCloud/AppCustoms/Main/ZXTabBarController.m
LiveVideoCloud/AppDelegate/AppDelegate.m
LiveVideoCloud/Classes/Sections/Mine/Controllers/MinePersonalDataController.m
LiveVideoCloud/Classes/Sections/Mine/Login/Controller/RegisterCommonController.m
LiveVideoCloud/Classes/Sections/Mine/Views/LVCLoginShowView.m
LiveVideoCloud/Classes/Sections/Mine/Views/LVCMineShowCell.m
LiveVideoCloud/Classes/Sections/Mine/Views/LVCPersonCommonCell.h
LiveVideoCloud/Classes/Sections/Mine/Views/LVCPersonalImageCell.h
LiveVideoCloud/Classes/Sections/Mine/Views/LVCPersonalImageCell.m
LiveVideoCloud/Classes/Sections/PGCSections/Controller/LVCLivePlayerController.m
LiveVideoCloud/Classes/Sections/PGCSections/Controller/LVCTelevisioController.m
LiveVideoCloud/Classes/Sections/PGCSections/View/LVCPlayer.h
LiveVideoCloud/Classes/Sections/PGCSections/View/LVCPlayer.m
LiveVideoCloud/Info.plist
LiveVideoCloud/animation.xcassets/tabBar/ic_camera.imageset/Contents.json
LiveVideoCloud/animation.xcassets/tabBar/ic_camera_sel.imageset/Contents.json
LiveVideoCloud/animation.xcassets/tabBar/ic_home.imageset/Contents.json
LiveVideoCloud/animation.xcassets/tabBar/ic_home_sel.imageset/Contents.json
@@ -28,7 +28,6 @@
 		4B45CE861EB86A590079AFB7 /* LVCLoginShowView.m in Sources */ = {isa = PBXBuildFile; fileRef = 4B45CE6B1EB86A590079AFB7 /* LVCLoginShowView.m */; };
 		4B45CE871EB86A590079AFB7 /* LVCMineCommonCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 4B45CE6D1EB86A590079AFB7 /* LVCMineCommonCell.m */; };
 		4B45CE881EB86A590079AFB7 /* LVCMineShowCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 4B45CE6F1EB86A590079AFB7 /* LVCMineShowCell.m */; };
-		4B45CE891EB86A590079AFB7 /* LVCPersonalImageCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 4B45CE711EB86A590079AFB7 /* LVCPersonalImageCell.m */; };
 		4B45CE8A1EB86A590079AFB7 /* LVCPersonCommonCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 4B45CE731EB86A590079AFB7 /* LVCPersonCommonCell.m */; };
 		4B45CE8B1EB86A590079AFB7 /* LVCTextField.m in Sources */ = {isa = PBXBuildFile; fileRef = 4B45CE751EB86A590079AFB7 /* LVCTextField.m */; };
 		4B45CE971EB86A760079AFB7 /* UIButton+createButton.m in Sources */ = {isa = PBXBuildFile; fileRef = 4B45CE8E1EB86A760079AFB7 /* UIButton+createButton.m */; };
@@ -344,8 +343,6 @@
 		4B45CE6D1EB86A590079AFB7 /* LVCMineCommonCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LVCMineCommonCell.m; sourceTree = "<group>"; };
 		4B45CE6E1EB86A590079AFB7 /* LVCMineShowCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LVCMineShowCell.h; sourceTree = "<group>"; };
 		4B45CE6F1EB86A590079AFB7 /* LVCMineShowCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LVCMineShowCell.m; sourceTree = "<group>"; };
-		4B45CE701EB86A590079AFB7 /* LVCPersonalImageCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LVCPersonalImageCell.h; sourceTree = "<group>"; };
-		4B45CE711EB86A590079AFB7 /* LVCPersonalImageCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LVCPersonalImageCell.m; sourceTree = "<group>"; };
 		4B45CE721EB86A590079AFB7 /* LVCPersonCommonCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LVCPersonCommonCell.h; sourceTree = "<group>"; };
 		4B45CE731EB86A590079AFB7 /* LVCPersonCommonCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LVCPersonCommonCell.m; sourceTree = "<group>"; };
 		4B45CE741EB86A590079AFB7 /* LVCTextField.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LVCTextField.h; sourceTree = "<group>"; };
@@ -967,8 +964,6 @@
 				4B45CE6D1EB86A590079AFB7 /* LVCMineCommonCell.m */,
 				4B45CE6E1EB86A590079AFB7 /* LVCMineShowCell.h */,
 				4B45CE6F1EB86A590079AFB7 /* LVCMineShowCell.m */,
-				4B45CE701EB86A590079AFB7 /* LVCPersonalImageCell.h */,
-				4B45CE711EB86A590079AFB7 /* LVCPersonalImageCell.m */,
 				4B45CE721EB86A590079AFB7 /* LVCPersonCommonCell.h */,
 				4B45CE731EB86A590079AFB7 /* LVCPersonCommonCell.m */,
 				4B45CE741EB86A590079AFB7 /* LVCTextField.h */,
@@ -2436,7 +2431,6 @@
 				81A483081E88B6140097A80A /* UIView+ViewController.m in Sources */,
 				D2EBC8721F02108000F198FB /* LVCLiveActivityInfoService.m in Sources */,
 				D2029CC81E6EADE10027CD92 /* SVProgressAnimatedView.m in Sources */,
-				4B45CE891EB86A590079AFB7 /* LVCPersonalImageCell.m in Sources */,
 				D2029C961E6EADE10027CD92 /* MBProgressHUD.m in Sources */,
 				810B65071E779B1F00133E15 /* ViewController+MASAdditions.m in Sources */,
 				D2EBC88E1F023AA400F198FB /* LVCVodPlayerController.m in Sources */,
@@ -2721,7 +2715,6 @@
 					"$(PROJECT_DIR)/LiveVideoCloud/Classes/SDK/WeChatSDK",
 					"$(PROJECT_DIR)/LiveVideoCloud/Classes/SDK/SinaSDK",
 				);
-				OTHER_LDFLAGS = "";
 				PRODUCT_BUNDLE_IDENTIFIER = com.cnlive.shipinzhongguo;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 			};
@@ -2751,7 +2744,6 @@
 					"$(PROJECT_DIR)/LiveVideoCloud/Classes/SDK/WeChatSDK",
 					"$(PROJECT_DIR)/LiveVideoCloud/Classes/SDK/SinaSDK",
 				);
-				OTHER_LDFLAGS = "";
 				PRODUCT_BUNDLE_IDENTIFIER = com.cnlive.shipinzhongguo;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 			};
@@ -10,11 +10,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "LiveVideoCloud/Classes/Sections/homeSections/Controller/LVCVodPlayerController.m"
-            timestampString = "520277942.714492"
+            timestampString = "520320963.334972"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "287"
-            endingLineNumber = "287"
+            startingLineNumber = "298"
+            endingLineNumber = "298"
             landmarkName = "-deviceOrientationChanged:"
             landmarkType = "7">
          </BreakpointContent>
@@ -26,7 +26,7 @@
     [super viewDidLoad];
     // Do any additional setup after loading the view.
-    [[UITabBar appearance] setBarTintColor:[UIColor blackColorZX]];
+    [[UITabBar appearance] setBarTintColor:[UIColor backgroundColor]];
     //取消tabBar的透明效果
     [UITabBar appearance].translucent = NO;
@@ -22,7 +22,7 @@
     self.window = [[UIWindow alloc] initWithFrame:[UIScreen mainScreen].bounds];
     self.window.rootViewController = [[ZXTabBarController alloc] init];
-    //初始化直播SDK
+    //APP 启动是初始化直播SDK
     [[CNLiveWebcastManager manager] initWithAppId:UserAppId appKey:UserAppKey isTestEnvironment:YES];
     //初始化聊天SDK并连接服务器
@@ -45,7 +45,9 @@
     // 20170327 20170328
-    CNLiveChatUserInfo *userInfo = [[CNLiveChatUserInfo alloc] initWithUserId:@"20170328" name:@"20170627" portrait:@""];
+
+    CNLiveChatUserInfo *userInfo = [[CNLiveChatUserInfo alloc] initWithUserId:@"20170328ll" name:@"20170328" portrait:@""];
+
     [[CNLiveChatManager sharedCNLiveChatManager] loginServer:userInfo success:^(NSString *userId) {
         NSLog(@"连接服务器-----success");
 //
 //  MinePersonalDataController.m
-//  LiveVideoCloud
+//  WonderfulLive
 //
-//  Created by cnlive on 17/4/11.
-//  Copyright © 2017年 CNLive. All rights reserved.
+//  Created by cnlive on 2016/10/24.
+//  Copyright © 2016年 CNLive. All rights reserved.
 //
 #import "MinePersonalDataController.h"
 #import "LVCPersonCommonCell.h"
 #import "LVCMineModel.h"
 #import "ModifyInfomationController.h"
-#import "IDViewController.h"
 #import "MineLiveController.h"
 @interface MinePersonalDataController ()<UITableViewDelegate,UITableViewDataSource,UIImagePickerControllerDelegate, UINavigationControllerDelegate,UIAlertViewDelegate,UIActionSheetDelegate>
 {
-//    BOOL isLogin;
+    //    BOOL isLogin;
 }
-@property (nonatomic, strong) UITableView * tbv;//调用的登录sdk
+@property (nonatomic, strong) UITableView * tbv;
 @property (nonatomic, strong) NSMutableArray * dataarray;
 @property (nonatomic, strong) NSMutableArray * localTitleArr;
@@ -29,7 +28,7 @@
     [super viewDidLoad];
     self.title = @"个人资料";
-//    self.view.backgroundColor = CommonBgColor;
+    //    self.view.backgroundColor = CommonBgColor;
 }
@@ -47,8 +46,27 @@
 }
 -(void)bindModel
 {
-    [self.dataarray removeAllObjects];}
+    [self.dataarray removeAllObjects];
+    //    isLogin = NO;
+    //
+    //    if ([UserTools isLogin])
+    //    {
+    //        isLogin = YES;
+    //    }else
+    //    {
+    //        isLogin = NO;
+    //    }
+}
+//- (UIButton *)quitBtn
+//{
+//    if (!_quitBtn) {
+//        _quitBtn = [UIButton buttonWithType:UIButtonTypeCustom];
+//        [_quitBtn setImage:[UIImage imageNamed:@" edit"] forState:UIControlStateNormal];
+//        [_quitBtn addTarget:self action:@selector(quitBtnClick) forControlEvents:UIControlEventTouchUpInside];
+//    }
+//    return _quitBtn;
+//}
 - (NSMutableArray *)dataarray
 {
     if (!_dataarray) {
@@ -59,17 +77,19 @@
 - (NSMutableArray *)localTitleArr
 {
     if (!_localTitleArr) {
-        _localTitleArr = [[NSMutableArray alloc] initWithObjects:@[@"头像",@"昵称",@"性别",@"手机号",@"邮箱",@"所在地"],@[@"视讯号id"], nil];
+        //        _localTitleArr = [[NSMutableArray alloc] initWithObjects:@[@"头像",@"精灵ID",@"昵称",@"性别",@"手机号",@"邮箱",],@[@"个性签名",@"年龄",@"状态",@"职业"],@[@"收货地址"], nil];
+        //        _localTitleArr = [[NSMutableArray alloc] initWithObjects:@[@"头像",@"精灵ID",@"昵称",@"性别",@"手机号",@"邮箱",],@[@"收货地址"], nil];
+        _localTitleArr = [[NSMutableArray alloc] initWithObjects:@[@"头像",@"昵称",@"性别",@"手机号",@"邮箱",],@[@"收货地址"], nil];
     }
     return _localTitleArr;
 }
-- (void)logoutBtnAction//注销登出button
+- (void)logoutBtnAction
 {
-    UIAlertView *alert = [[UIAlertView alloc] initWithTitle:@"确定要离开吗？" message:nil delegate:self cancelButtonTitle:@"我手滑了" otherButtonTitles:@"忍痛离开", nil];
+    UIAlertView *alert = [[UIAlertView alloc] initWithTitle:@"你真的要注销吗？" message:nil delegate:self cancelButtonTitle:@"我骗你的" otherButtonTitles:@"注销", nil];
     alert.tag = 1002;
     [alert show];
-
+    
 }
 #pragma mark - UIAlertViewDelegate
 - (void)alertView:(UIAlertView *)alertView clickedButtonAtIndex:(NSInteger)buttonIndex
@@ -84,7 +104,16 @@
         [[UserInformationModel manager] cleanUserInfo];
         [UserTools clearLocalUserInfo];
-
+        //清除个人信息
+        //        [CNLiveShare logoutWithAPPType:WeChatType result:NULL];
+        //        [CNLiveShare logoutWithAPPType:QQType result:NULL];
+        //        [CNLiveShare logoutWithAPPType:SinaType result:NULL];
+        //        [CNlivePersonalCenter clearLocalUserInfoForLogout];
+        //        [UserTools setUserLogin:NO];
+        
+        //清除个人信息邀请码
+        //        [[NSUserDefaults standardUserDefaults] setObject:@"" forKey:@"kinvitecode"];
+        
         [self.navigationController popViewControllerAnimated:YES];
     }
 }
@@ -159,11 +188,10 @@
         MBProgressHUD *hud = [Tools showActivityHudInView:self.view withString:@"修改中"];
         [CNLiveUserSystemCenter uploadIconWithUid:[UserInformationModel manager].uid icon:image success:^(id result) {
             [hud hide:NO];
-
+            
             [Tools showHUDInView:CURRENT_WINDOW withString:@"修改头像成功" autoHide:YES];
             [UserTools saveUserinfoDic:result[@"data"]];
             [_tbv reloadRowsAtIndexPaths:@[[NSIndexPath indexPathForRow:0 inSection:0]] withRowAnimation:UITableViewRowAnimationFade];
-
         } failure:^(NSDictionary *errorDic) {
             [Tools showHUDInView:self.view withString:@"修改失败，请稍后再试" autoHide:YES];
         }];
@@ -181,7 +209,7 @@
         [UserTools setLocalUserInfo:string withKey:@"gender"];
         [_tbv reloadRowsAtIndexPaths:@[[NSIndexPath indexPathForRow:2 inSection:0]] withRowAnimation:UITableViewRowAnimationFade];
     } failure:^(NSDictionary *errorDic) {
-         [Tools showHUDInView:self.view withString:@"修改失败，请稍后再试" autoHide:YES];
+        [Tools showHUDInView:self.view withString:@"修改失败，请稍后再试" autoHide:YES];
     }];
 }
@@ -195,7 +223,6 @@
         tableView.showsHorizontalScrollIndicator = NO;
         tableView.separatorStyle = UITableViewCellSeparatorStyleNone;
         tableView.backgroundColor = CommonBgColor;
-        
         [tableView registerClass:[LVCPersonCommonCell class] forCellReuseIdentifier:NSStringFromClass([LVCPersonCommonCell class])];
         _tbv = tableView;
     }
@@ -205,7 +232,7 @@
 {
     LVCPersonCommonCell * cell = [tableView dequeueReusableCellWithIdentifier:NSStringFromClass([LVCPersonCommonCell class]) forIndexPath:indexPath];
     cell.userInteractionEnabled = YES;
-
+    
     if (indexPath.section == 0 && indexPath.row == 0) {
         cell.type = PersonalCellTypeIcon;
     }
@@ -217,6 +244,19 @@
     {
         cell.type = PersonalCellTypedetailWithIndicator;
     }
+    //    else if (indexPath.section == 0 && indexPath.row == 1 )
+    //    {
+    //        cell.type = PersonalCellTypedetailID;
+    //        cell.userInteractionEnabled = NO;
+    //    }else if (indexPath.section == 0 && indexPath.row == 2)
+    //    {
+    //        cell.type = PersonalCellTypedetailNick;
+    //    }
+    //    else
+    //    {
+    //        cell.type = PersonalCellTypedetailWithIndicator;
+    //    }
+    
     if([UserTools isLogin]){//填入有值选项
         UserInformationModel *personalModel = [UserInformationModel manager];
         cell.personalModel = personalModel;
@@ -257,37 +297,61 @@
                     cell.detailLabel.text = personalModel.email;
                 }
                     break;
-                case 5:
-                {
-                    if (personalModel.location.length > 0)//收货地址
-                    {
-                        cell.detailLabel.text = personalModel.location;
-                    }
-                    else
-                    {
-                       cell.detailTextLabel.text = @"未设置";
-                    }
-                }
                 default:
                 {
                 }
                     break;
             }
+            //        }else if (indexPath.section == 1) {
+            //            switch (indexPath.row) {
+            //                case 0:
+            //                {
+            //                    cell.detailLabel.text = personalModel.personalitySignature;
+            //                }
+            //                    break;
+            //                case 1:
+            //                {
+            //                    cell.detailLabel.text = personalModel.age;
+            //                }
+            //                    break;
+            //                case 2:
+            //                {
+            //                    cell.detailLabel.text = personalModel.state;
+            //                }
+            //                    break;
+            //                case 3:
+            //                {
+            //                    cell.detailLabel.text = personalModel.professional;
+            //                }
+            //                    break;
+            //                default:
+            //                    break;
+            //            }
+        }
+        else//收货地址
+        {
+            if(personalModel.location.length > 0)
+            {
+                cell.detailLabel.text = personalModel.location;
+            }else
+            {
+                cell.detailLabel.text = @"未设置";
+            }
+        }
+    }
+    else
+    {//未登录 默认为空
+        //       if(indexPath.section == 2){
+        if(indexPath.section == 1){
+            cell.detailLabel.text = @"未设置";
+        }else
+        {
+            cell.detailLabel.text = @"";
         }
-
     }
-   else
-   {//未登录 默认为空
-       if(indexPath.section == 1){
-           cell.detailLabel.text = @"未设置";
-       }else
-       {
-           cell.detailLabel.text = @"";
-       }
-   }
     [cell loadUIWithModel:self.localTitleArr[indexPath.section][indexPath.row]];//设置本地名
-   return cell;
+    return cell;
 }
 - (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView
@@ -303,6 +367,8 @@
     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
@@ -326,10 +392,10 @@
                 break;
             case 2:
             {
-                UIActionSheet *action = [[UIActionSheet alloc] initWithTitle:nil delegate:self cancelButtonTitle:@"取消" destructiveButtonTitle:@"男" otherButtonTitles:@"女", nil];//修改性别时的弹窗，男or女
+                UIActionSheet *action = [[UIActionSheet alloc] initWithTitle:nil delegate:self cancelButtonTitle:@"取消" destructiveButtonTitle:@"男" otherButtonTitles:@"女", nil];
                 action.tag = 102;
                 [action showInView:self.view];
-
+                
             }
                 break;
             case 3:
@@ -346,26 +412,24 @@
                 [self.navigationController pushViewController:modify animated:YES];
             }
                 break;
-            case 5://
-            {
-                ModifyInfomationController *modify = [[ModifyInfomationController alloc] init];
-                modify.type = ModifyInfoTypeAddress;//@"所在地";
-                [self.navigationController pushViewController:modify animated:YES];
-            }
-                
-            
             default:
                 break;
         }
-       
+        
         return;
     }else if(indexPath.section == 1)
     {
-
+        ModifyInfomationController *modify = [[ModifyInfomationController alloc] init];
+        modify.type = ModifyInfoTypeAddress;//@"设置地址";
+        [self.navigationController pushViewController:modify animated:YES];
     }else
     {
     }
+    
+    //    MineLiveController * vc = [MineLiveController new];
+    //    vc.title = self.localTitleArr[indexPath.section][indexPath.row];
+    //    [self.navigationController pushViewController:vc animated:YES];
 }
 -(CGFloat)tableView:(UITableView *)tableView heightForHeaderInSection:(NSInteger)section
 {
@@ -380,8 +444,16 @@
 - (UIView *)tableView:(UITableView *)tableView viewForFooterInSection:(NSInteger)section
 {
     UIView* footerView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, SCREEN_W, 200)];
+    //    UIButton *logoutBtn = [UIButton buttonWithType:UIButtonTypeCustom];
+    //    [logoutBtn setBackgroundImage:[Tools getImageFromColor:[UIColor colorWithHexString:@"969797"]] forState:UIControlStateNormal];
+    //    [logoutBtn setBackgroundImage:[Tools getImageFromColor:[UIColor colorWithHexString:@"6e6e6e"]] forState:UIControlStateHighlighted];
+    //    [logoutBtn setTitle:@"注销" forState:UIControlStateNormal];
+    //    [logoutBtn setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal];
+    //    logoutBtn.titleLabel.font = [UIFont systemFontOfSize:17];
+    //    logoutBtn.layer.cornerRadius = 20;
+    //    logoutBtn.layer.masksToBounds = YES;
-    UIButton *logoutBtn = [UIButton buttonWithTitle:@"注销" titleColor:[UIColor whiteColor] labelFontSize:17 cornerRadius:20 backgroundImageNormal:[Tools getImageFromColor:[UIColor colorWithHexString:@"969797"]] backgroundImageHighlight:[Tools getImageFromColor:[UIColor colorWithHexString:@"6e6e6e"]]];//#fff100
+    UIButton *logoutBtn = [UIButton buttonWithTitle:@"注销" titleColor:[UIColor whiteColor] labelFontSize:17 cornerRadius:20 backgroundImageNormal:[Tools getImageFromColor:[UIColor colorWithHexString:@"969797"]] backgroundImageHighlight:[Tools getImageFromColor:[UIColor colorWithHexString:@"6e6e6e"]]];
     logoutBtn.frame = CGRectMake(20, 80, KScreenWidth-40, 40);
     [logoutBtn addTarget:self action:@selector(logoutBtnAction) forControlEvents:UIControlEventTouchUpInside];
     [footerView addSubview:logoutBtn];
@@ -395,8 +467,53 @@
     return 0;
 }
+//-(void)scrollViewDidScroll:(UIScrollView *)scrollView {
+//
+//    if (scrollView == self.tbv)
+//    {
+//
+//        UITableView *tableview = (UITableView *)scrollView;
+//
+//        CGFloat sectionHeaderHeight = 6;
+//
+//        CGFloat sectionFooterHeight = 200;
+//
+//        CGFloat offsetY = tableview.contentOffset.y;
+//
+//        if (offsetY >= 0 && offsetY <= sectionHeaderHeight)
+//
+//        {
+//
+//            tableview.contentInset = UIEdgeInsetsMake(-offsetY, 0, -sectionFooterHeight, 0);
+//
+//        }else if (offsetY >= sectionHeaderHeight && offsetY <= tableview.contentSize.height - tableview.frame.size.height - sectionFooterHeight)
+//
+//        {
+//
+//            tableview.contentInset = UIEdgeInsetsMake(-sectionHeaderHeight, 0, -sectionFooterHeight, 0);
+//
+//        }else if (offsetY >= tableview.contentSize.height - tableview.frame.size.height - sectionFooterHeight && offsetY <= tableview.contentSize.height - tableview.frame.size.height)         {
+//            
+//            tableview.contentInset = UIEdgeInsetsMake(-offsetY, 0, -(tableview.contentSize.height - tableview.frame.size.height - sectionFooterHeight), 0);
+//            
+//        }
+//        
+//    }
+//    
+//}
 - (void)didReceiveMemoryWarning {
     [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
@@ -8,6 +8,7 @@
 #import "RegisterCommonController.h"
 #import "RegistBasicInformationView.h"
+#import "LVCWebViewController.h"
 @interface RegisterCommonController ()
 {
@@ -153,6 +154,14 @@
     button.selected = !button.selected;
 }
+- (void)userServiceTermsBtnAction:(UIButton *)button
+{
+    LVCWebViewController *VC = [[LVCWebViewController alloc] init];
+    VC.url = uploadServiceProtocol;
+    VC.title = @"视讯中国充值协议";
+    [self.navigationController pushViewController:VC animated:YES];
+}
+
 - (void)loginBtnAction
 {
@@ -31,7 +31,6 @@
         self.userInteractionEnabled = YES;
         self.autoresizingMask = UIViewAutoresizingFlexibleTopMargin;
         self.contentMode = UIViewContentModeScaleToFill;
-        //self.autoresizesSubviews = YES;//让子类自动布局
         self.autoresizesSubviews = YES;//让子类自动布局
         [self bindView];
         [self bindAction];
@@ -108,6 +108,8 @@
 }
 - (void)setNotification
 {
+    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(loginSuccess) name:ThirdLoginSuccess object:nil];
+    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(loginFailure) name:ThirdLoginFailure object:nil];
 }
 - (void)loginSuccess
@@ -7,7 +7,7 @@
 //
 #import "BaseTableViewCell.h"
-//@class UserInfoModel;
+
 @class UserInformationModel;
 typedef enum {
     PersonalCellTypeIcon                    = 10,
@@ -22,5 +22,4 @@ typedef enum {
 @property (nonatomic ,strong) UIImageView *iconImageView;
 @property (nonatomic) PersonalCellType type;
-//- (void)loadUIWithModel:(id)model;
 @end
-//
-//  LVCPersonalImageCell.h
-//  LiveVideoCloud
-//
-//  Created by cnlive on 17/4/11.
-//  Copyright © 2017年 CNLive. All rights reserved.
-//
-
-#import "BaseTableViewCell.h"
-
-@interface LVCPersonalImageCell : BaseTableViewCell
-
-@end
-//
-//  LVCPersonalImageCell.m
-//  LiveVideoCloud
-//
-//  Created by cnlive on 17/4/11.
-//  Copyright © 2017年 CNLive. All rights reserved.
-//
-
-#import "LVCPersonalImageCell.h"
-
-@implementation LVCPersonalImageCell
-
-@end
@@ -41,11 +41,18 @@
 - (void)viewWillAppear:(BOOL)animated
 {
     [super viewWillAppear:animated];
+    self.navigationController.navigationBar.hidden = YES;
     [[UIApplication sharedApplication] setStatusBarStyle:UIStatusBarStyleLightContent];
     [[UIApplication sharedApplication] setStatusBarHidden:NO withAnimation:UIStatusBarAnimationFade];
 }
+- (void)viewDidDisappear:(BOOL)animated
+{
+    [super viewDidDisappear:animated];
+    self.navigationController.navigationBar.hidden = NO;
+}
+
 - (void)viewWillDisappear:(BOOL)animated
 {
     [super viewWillDisappear:animated];
@@ -99,6 +106,7 @@
 - (void)addObservers
 {
+    //设备旋转
     [[NSNotificationCenter defaultCenter] addObserver:self
                                              selector:@selector(onDeviceOrientationChange:)
                                                  name:UIDeviceOrientationDidChangeNotification
@@ -263,7 +271,6 @@
         [_chatView quitChatroom];
         [self removeViews];
-        self.navigationController.navigationBar.hidden = NO;
         [self.navigationController popViewControllerAnimated:YES];
     }
 }
@@ -13,7 +13,7 @@
 @interface LVCTelevisioController ()<UITableViewDelegate, UITableViewDataSource>
 {
-    NSMutableArray *_channelsModelArray;
+    NSMutableArray *_channelsModelArray;        //数据源
 }
 @property (nonatomic, strong) UITableView *tableView;
@@ -21,13 +21,18 @@
 @end
 @implementation LVCTelevisioController
+- (void)viewWillAppear:(BOOL)animated {
+    [super viewWillAppear:animated];
+     self.edgesForExtendedLayout = UIRectEdgeNone;
+    self.navigationController.navigationBar.hidden = NO;
+}
 - (void)viewDidLoad {
     [super viewDidLoad];
     // Do any additional setup after loading the view.
     self.view.backgroundColor = [UIColor whiteColor];
     self.navigationItem.title = @"直播";
-    
+
     _channelsModelArray = [[NSMutableArray alloc] init];
     [self.view addSubview:self.tableView];
@@ -37,6 +42,7 @@
 - (void)loadData {
+    //demo使用的是本地数据
     NSString *path = [[NSBundle mainBundle] pathForResource:@"TelevisionData" ofType:@"json"];
     NSData *data=[NSData dataWithContentsOfFile:path];
     NSError *error;
@@ -93,7 +99,7 @@
 - (UITableView *)tableView
 {
     if (!_tableView) {
-        _tableView = [[UITableView alloc] initWithFrame:CGRectMake(0, 0, SCREEN_WIDTH, SCREEN_HEIGHT-49) style:UITableViewStylePlain];
+        _tableView = [[UITableView alloc] initWithFrame:CGRectMake(0, 0, SCREEN_WIDTH, SCREEN_HEIGHT-49-64) style:UITableViewStylePlain];
         _tableView.delegate = self;
         _tableView.dataSource = self;
     }
@@ -31,7 +31,7 @@ typedef void(^HideInputViewBlock)(BOOL hide);
 @property (nonatomic, strong) UIImageView *contentView;             //所有空间统一管理在这个view中
 @property (nonatomic, strong) LVCTelevisionModel *model;             //所有空间统一管理在这个view中
 @property (nonatomic, readwrite, assign) BOOL isFullScreen;         //是否是全屏
-@property (nonatomic, copy) HideInputViewBlock  hideBlock;               //全屏模式下是否隐藏输入框
+@property (nonatomic, copy) HideInputViewBlock  hideBlock;            //全屏模式下是否隐藏输入框
 @property (nonatomic, assign, readonly) BOOL displayBarrage;          //是否显示弹幕
 @property (nonatomic, assign) id<LVCPlayerDelegate> delegate;
@@ -39,6 +39,6 @@ typedef void(^HideInputViewBlock)(BOOL hide);
 - (void)autoHideControlView;        //自动隐藏上下功能条
-- (void)stopPlaying;        //停止播放
+- (void)stopPlaying;                //停止播放
 @end
@@ -33,6 +33,7 @@
 - (void)dealloc
 {
+    [self exitPlayer];
     NSLog(@"LVCPlayer dealloc");
 }
@@ -72,9 +73,9 @@
     NSString *channelId = [NSString stringWithFormat:@"82_%@",model.mediaId];
     _player = [[CNLiveMoviePlayerController alloc] initLivePlayWithChannelId:channelId anchorStatus:NO authSuccess:^{
         [self addObservers];
-        _player.videoDecoderMode = CNLiveMovieVideoDecoderMode_AUTO;
-        _player.shouldAutoplay = YES;
-        [_player prepareToPlay];
+        _player.videoDecoderMode = CNLiveMovieVideoDecoderMode_AUTO;    //自动解码
+        _player.shouldAutoplay = YES;                                   //自动播放
+        [_player prepareToPlay];                                        //准备播放
         [self.contentView addSubview:_player.view];
         [self.contentView sendSubviewToBack:_player.view];
@@ -86,31 +87,12 @@
         [_loadingView stopLoading];
     } getAnchorStatusResult:NULL];
-    
-    /*
-     //点播播放
-     _player = [[CNLiveMoviePlayerController alloc] initVodPlayWithVId:@"aaa123"
-     authSuccess:^{
-     
-     [self addObservers];
-     _player.videoDecoderMode = CNLiveMovieVideoDecoderMode_AUTO;
-     _player.shouldAutoplay = YES;
-     [_player prepareToPlay];
-     [self.contentView addSubview:_player.view];
-     [self.contentView sendSubviewToBack:_player.view];
-     
-     [self makePlayerConstraint];
-     
-     
-     } authFailed:^(NSDictionary *errorInfo) {
-     NSLog(@"初始化点播播放器失败%@", errorInfo);
-     
-     }];
-     */
+
 }
 #pragma mark -
 #pragma mark - action
+//播放/暂停
 - (void)playOrPauseBtnAction:(UIButton *)btn
 {
     if (btn.selected) {
@@ -123,6 +105,7 @@
 }
+//返回
 - (void)backBtnAction:(UIButton *)btn
 {
     if (self.delegate && [self.delegate respondsToSelector:@selector(lvcPlayer:clickedBackBtn:)]) {
@@ -130,14 +113,15 @@
     }
 }
+//全屏
 - (void)fullScreenBtnAction:(UIButton *)btn
 {
     if (self.delegate && [self.delegate respondsToSelector:@selector(lvcPlayer:clickedFullScreenBtn:)]) {
         [self.delegate lvcPlayer:self clickedFullScreenBtn:btn];
     }
-   
 }
+//弹幕
 - (void)barrageSwitchAction
 {
     self.editBtn.hidden =! self.barrageSwitch.on;
@@ -148,6 +132,7 @@
 }
+//编辑弹幕
 - (void)editBtnAction:(UIButton *)btn
 {
     if (self.hideBlock) {
@@ -161,7 +146,7 @@
     }
 }
-
+//单击显示和隐藏工具条
 - (void)singleTapView
 {
     [UIView animateWithDuration:0.25 animations:^{
@@ -181,6 +166,7 @@
 }
+//自动隐藏工具条
 - (void)autoHideControlView
 {
     if (!_timer) {
@@ -192,6 +178,7 @@
     }
 }
+//手动隐藏工具条
 - (void)hideControlView
 {
@@ -211,8 +198,7 @@
     }
 }
-#pragma mark -
-#pragma mark - LVCPlayerLoadingViewDelegate
+//播放异常，重试
 - (void)retryBtnClick
 {
     [_loadingView setLVCPlayerStatus:LVCPlayerStatusStartLoading];
@@ -272,6 +258,7 @@
                                                object:nil];
 }
+//加载状态通知
 - (void)loadStateDidChange:(NSNotification *)notification
 {
     if (_player) {
@@ -291,6 +278,7 @@
     }
 }
+//播放完成通知，当状态为MPMovieFinishReasonPlaybackError时为异常结束，应显示重试页面
 - (void)moviePlayBackDidFinish:(NSNotification *)notification
 {
     if (_player) {
@@ -314,6 +302,7 @@
     }
 }
+//播放状态改变通知
 - (void)moviePlayBackStateDidChange:(NSNotification *)notification
 {
     if (_player) {
@@ -361,6 +350,7 @@
     return netString;
 }
+//退到后台将播放器暂停
 - (void)appResignActive:(NSNotification *)noti
 {
     if (_player.playbackState == MPMoviePlaybackStatePlaying) {
@@ -368,6 +358,7 @@
     }
 }
+//回到前台继续播放
 - (void)appBecomeActive:(NSNotification *)noti
 {
     if (_player.playbackState == MPMoviePlaybackStatePaused) {
@@ -377,9 +368,14 @@
 #pragma mark -
 #pragma mark - public
+//停止播放
 - (void)stopPlaying
 {
-    [_player stop];
+    if (_player) {
+        [_player stop];     //注* stop调用多次是会导致崩溃
+    }
+    
+    [_player destroyPlayer];
     _player = nil;
     if (_timer) {
@@ -392,18 +388,7 @@
 - (void)removeMovieNotificationObservers
 {
-    [[NSNotificationCenter defaultCenter]removeObserver:self
-                                                   name:MPMoviePlayerLoadStateDidChangeNotification
-                                                 object:nil];
-    [[NSNotificationCenter defaultCenter]removeObserver:self
-                                                   name:MPMoviePlayerPlaybackDidFinishNotification
-                                                 object:nil];
-    [[NSNotificationCenter defaultCenter]removeObserver:self
-                                                   name:MPMediaPlaybackIsPreparedToPlayDidChangeNotification
-                                                 object:nil];
-    [[NSNotificationCenter defaultCenter]removeObserver:self
-                                                   name:MPMoviePlayerPlaybackStateDidChangeNotification
-                                                 object:nil];
+    [[NSNotificationCenter defaultCenter] removeObserver:self];
 }
 #pragma mark -
@@ -511,18 +496,20 @@
 }
 - (void)exitPlayer {
-    if (_player.isPlaying) {
+    
+    if (_player) {
         [_player stop];
     }
     [_player destroyPlayer];
     _player = nil;
-    [self removeMovieNotificationObservers];
     if (_timer) {
         [_timer invalidate];
         _timer = nil;
     }
+    
+    [self removeMovieNotificationObservers];
 }
 #pragma mark -
@@ -26,9 +26,11 @@
 		<true/>
 	</dict>
 	<key>NSCameraUsageDescription</key>
-	<string></string>
+	<string>App需要您的同意,才能访问相机</string>
+	<key>NSPhotoLibraryUsageDescription</key>
+	<string>App 需要您的同意,才能读取媒体资料库</string>
 	<key>NSMicrophoneUsageDescription</key>
-	<string></string>
+	<string>App需要您的同意,才能访问麦克风</string>
 	<key>UILaunchStoryboardName</key>
 	<string>LaunchScreen</string>
 	<key>UIRequiredDeviceCapabilities</key>
@@ -17,5 +17,8 @@
   "info" : {
     "version" : 1,
     "author" : "xcode"
+  },
+  "properties" : {
+    "template-rendering-intent" : "original"
   }
 }
 \ No newline at end of file
@@ -17,5 +17,8 @@
   "info" : {
     "version" : 1,
     "author" : "xcode"
+  },
+  "properties" : {
+    "template-rendering-intent" : "original"
   }
 }
 \ No newline at end of file
@@ -17,5 +17,8 @@
   "info" : {
     "version" : 1,
     "author" : "xcode"
+  },
+  "properties" : {
+    "template-rendering-intent" : "original"
   }
 }
 \ No newline at end of file
@@ -17,5 +17,8 @@
   "info" : {
     "version" : 1,
     "author" : "xcode"
+  },
+  "properties" : {
+    "template-rendering-intent" : "original"
   }
 }
 \ No newline at end of file
@@ -17,5 +17,8 @@
   "info" : {
     "version" : 1,
     "author" : "xcode"
+  },
+  "properties" : {
+    "template-rendering-intent" : "original"
   }
 }
 \ No newline at end of file
@@ -17,5 +17,8 @@
   "info" : {
     "version" : 1,
     "author" : "xcode"
+  },
+  "properties" : {
+    "template-rendering-intent" : "original"
   }
 }
 \ No newline at end of file
@@ -17,5 +17,8 @@
   "info" : {
     "version" : 1,
     "author" : "xcode"
+  },
+  "properties" : {
+    "template-rendering-intent" : "original"
   }
 }
 \ No newline at end of file
@@ -17,5 +17,8 @@
   "info" : {
     "version" : 1,
     "author" : "xcode"
+  },
+  "properties" : {
+    "template-rendering-intent" : "original"
   }
 }
 \ No newline at end of file
@@ -17,5 +17,8 @@
   "info" : {
     "version" : 1,
     "author" : "xcode"
+  },
+  "properties" : {
+    "template-rendering-intent" : "original"
   }
 }
 \ No newline at end of file
@@ -17,5 +17,8 @@
   "info" : {
     "version" : 1,
     "author" : "xcode"
+  },
+  "properties" : {
+    "template-rendering-intent" : "original"
   }
 }
 \ No newline at end of file
@@ -17,5 +17,8 @@
   "info" : {
     "version" : 1,
     "author" : "xcode"
+  },
+  "properties" : {
+    "template-rendering-intent" : "original"
   }
 }
 \ No newline at end of file
@@ -17,5 +17,8 @@
   "info" : {
     "version" : 1,
     "author" : "xcode"
+  },
+  "properties" : {
+    "template-rendering-intent" : "original"
   }
 }
 \ No newline at end of file