修改

王军波
1 parent 426f0dc6
Showing 6 changed files with 62 additions and 35 deletions
LiveVideoCloud/Classes/Sections/LiveSections/Controller/LVCLiveViewController.m
LiveVideoCloud/Classes/Sections/LiveSections/View/LVCUGCLiveEndView.m
LiveVideoCloud/Classes/Sections/LiveSections/View/LVCUGCLivePrepareView.m
LiveVideoCloud/Classes/Sections/homeSections/Controller/LVCUGCLiveListView.m
LiveVideoCloud/Classes/Sections/homeSections/View/LVCUGCBackgroundView.m
LiveVideoCloud/Classes/Sections/homeSections/View/LVCUGCLivePlayerCell.m
@@ -37,7 +37,7 @@
 @property (nonatomic, strong) UIButton *openFlashButton;
-@property (nonatomic ,strong) LiveBaseView * _Nullable             liveBaseView;
+@property (nonatomic ,strong) LiveBaseView * _Nullable liveBaseView;
 @property (nonatomic, strong) LVCUGCLiveEndView *endView;
@@ -50,18 +50,20 @@
     self.navigationController.delegate = self;
     self.view.backgroundColor = [UIColor whiteColor];
-    [self.view addSubview:self.quitButton];
     [self verifyLiveAuthority];
 }
 #pragma mark - 验证是否有主播权限
 - (void)verifyLiveAuthority {
+    [SVProgressHUD setDefaultMaskType:SVProgressHUDMaskTypeClear];
+    [SVProgressHUD showWithStatus:@"正在加载..."];
     [LVCVerifyLiveAuthService verifyLiveAuthWithHandler:^(id data, NSError *error) {
+        [SVProgressHUD dismiss];
         if (error) {
             NSLog(@"失败===>error:%@",error);
-            UIAlertView *alert = [[UIAlertView alloc] initWithTitle:nil message:[NSString stringWithFormat:@"抱歉, 鉴权失败~ "] delegate:nil cancelButtonTitle:@"好的" otherButtonTitles: nil];
+            UIAlertView *alert = [[UIAlertView alloc] initWithTitle:nil message:[NSString stringWithFormat:@"抱歉, 鉴权失败~ "] delegate:self cancelButtonTitle:@"好的" otherButtonTitles: nil];
             alert.tag = 1005;
             [alert show];
@@ -87,22 +89,28 @@
             //开始推流
             [self.view addSubview:self.captureView];
             [self.view addSubview:self.prepareView];
+            [self.view addSubview:self.quitButton];
             [self.view addSubview:self.changeCameraButton];
             [self.view addSubview:self.openFilterButton];
             [self.view addSubview:self.openFlashButton];
             [self.view addSubview:self.filterView];
             // 初始化推流
+            // 生成随机活动号
             NSInteger time = [[NSDate date] timeIntervalSince1970];
             NSString *timeString = [NSString stringWithFormat:@"%ld", (long)time];
             NSString *random = [NSString stringWithFormat:@"%d%d%d%d%d",arc4random()%9,arc4random()%9,arc4random()%9,arc4random()%9,arc4random()%9];
             NSString *activityId = [NSString stringWithFormat:@"%@%@",timeString,random];
-            _kitCN = [[CNLiveGPUStreamerKit alloc] initWithDefaultConfigWithActivityId:activityId channelId:@"iOStest" isHorizontalScreen:@"0"];
+            // 主播ID
+            NSString *channelId = data[@"channelId"];
+            NSString *channelName = data[@"channelName"];
+            NSString *coverImgUrl = data[@"coverImgUrl"];
+            _kitCN = [[CNLiveGPUStreamerKit alloc] initWithDefaultConfigWithActivityId:activityId channelId:channelId isHorizontalScreen:@"0"];
             // 封面图
-            _kitCN.coverImgUrl =  @"https://ss0.bdstatic.com/70cFvHSh_Q1YnxGkpoWK1HF6hhy/it/u=169300069,2234409601&fm=21&gp=0.jpg";
+            _kitCN.coverImgUrl =  coverImgUrl;
             // 昵称  头像
-            NSDictionary *userInfo = [NSDictionary dictionaryWithObjectsAndKeys:@"我的名字好长啊", @"name", @"http://www.qq745.com/uploads/allimg/150318/1-15031PGF8-51.jpg", @"iconUrl", nil];
+            NSDictionary *userInfo = [NSDictionary dictionaryWithObjectsAndKeys:channelName, @"name", [UserInformationModel manager].faceUrl, @"iconUrl", nil];
             _kitCN.extensions = [self dictionaryToJson:userInfo];
             // 设置推流配置
@@ -115,7 +123,7 @@
             [self.captureView addGestureRecognizer:singleRecognizer];
         } else {   //禁用
-            UIAlertView *alert = [[UIAlertView alloc] initWithTitle:nil message:@"抱歉, 您没有权限~" delegate:nil cancelButtonTitle:@"好的" otherButtonTitles: nil];
+            UIAlertView *alert = [[UIAlertView alloc] initWithTitle:nil message:@"抱歉, 您没有权限~" delegate:self cancelButtonTitle:@"好的" otherButtonTitles: nil];
             alert.tag = 1004;
             [alert show];
         }
@@ -335,22 +343,23 @@
     if ( _kitCN.captureState == CNLiveCaptureStateIdle){
         //初始化时状态为空闲
-        
+        NSLog(@"---------CNLiveCaptureStateIdle");
         return;
     }
     else if (_kitCN.captureState == CNLiveCaptureStateCapturing ) {
         //设备工作中
-        
+        NSLog(@"---------CNLiveCaptureStateCapturing");
         return;
     }
     else if (_kitCN.captureState == CNLiveCaptureStateClosingCapture ) {
         //关闭采集设备中
-        
+        NSLog(@"---------CNLiveCaptureStateClosingCapture");
         return;
     }
     else if (_kitCN.captureState == CNLiveCaptureStateDevAuthDenied ) {
         //设备授权被拒绝
         NSLog(@"---------CNLiveCaptureStateDevAuthDenied");
+        [self toast:@"设备未授权,请授权~"];
         return;
     }
@@ -374,24 +383,17 @@
         NSLog(@"---------CNLiveStreamStateIdle");
     }
-    if (_kitCN.streamState == CNLiveStreamStateConnected) {
-        
-        NSLog(@"---------CNLiveStreamStateConnected");
-    }
-    
     if (_kitCN.streamState == CNLiveStreamStateConnecting) {
         NSLog(@"---------CNLiveStreamStateConnecting");
     }
-    //推流出错
-    if (_kitCN.streamState == CNLiveStreamStateError) {
+    if (_kitCN.streamState == CNLiveStreamStateConnected) {
-        NSLog(@"---------CNLiveStreamStateError");
-        [self onStreamError];
+        NSLog(@"---------CNLiveStreamStateConnected");
     }
-    //断开推流
+    //断开推流中
     if ( _kitCN.streamState == CNLiveStreamStateDisconnecting) {
         NSLog(@"---------CNLiveStreamStateDisconnecting");
@@ -402,6 +404,20 @@
         NSLog(@"---------CNLiveStopStreamSuccess");
     }
+    
+    //结束推流失败
+    if ( _kitCN.streamState == CNLiveStopStreamFailure) {
+        
+        NSLog(@"---------CNLiveStopStreamFailure");
+    }
+    
+    //推流出错
+    if (_kitCN.streamState == CNLiveStreamStateError) {
+        
+        NSLog(@"---------CNLiveStreamStateError");
+        [self onStreamError];
+    }
+    
 }
 - (void)onStreamError {   // 推流失败
@@ -425,19 +441,15 @@
     else if ( CNLiveStreamErrorCode_ABNORMAL == err) {
         [self toast:@"推流异常中断~~"];
+        [self tryReconnect];
     } else if (err == CNLiveStreamErrorCode_CODEC_OPEN_FAILED) {
         NSLog(@"video codec open failed, try software codec");
         // 换个编码类型重新尝试
         _kitCN.streamerBase.videoCodec = CNLiveVideoCodec_VT264;
         [self tryReconnect];
-    }
-    else {
-    }
-    
-    // 断网重连
-    if (err == CNLiveStreamErrorCode_CONNECT_BREAK || err == CNLiveStreamErrorCode_AV_SYNC_ERROR) {
+    } else if (err == CNLiveStreamErrorCode_CONNECT_BREAK || err == CNLiveStreamErrorCode_AV_SYNC_ERROR) {
         [self tryReconnect];
     }
@@ -595,6 +607,7 @@
 }
 #pragma mark - Action !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
 - (void)addObservers {
     [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(captureStateChange) name:CNLiveCaptureStateDidChangeNotification object:nil];
@@ -39,8 +39,10 @@
 - (UIImageView *)iconView {
     if (!_iconView) {
-        NSString *path = [[NSBundle mainBundle] pathForResource:@"头像" ofType:@"jpg"];
-        UIImage *image = [UIImage imageWithContentsOfFile:path];
+//        NSString *path = [[NSBundle mainBundle] pathForResource:@"头像" ofType:@"jpg"];
+//        UIImage *image = [UIImage imageWithContentsOfFile:path];
+        UIImage *image = [UIImage imageWithData:[NSData
+                                                 dataWithContentsOfURL:[NSURL URLWithString:[UserInformationModel manager].faceUrl]]];
         _iconView = [[UIImageView alloc] initWithImage:image];
         _iconView.frame = CGRectMake((selfLength - 50) * 0.5, 20, 50, 50);
         _iconView.layer.cornerRadius = 25;
@@ -35,8 +35,11 @@
 - (UIImageView *)iconView {
     if (!_iconView) {
-        NSString *path = [[NSBundle mainBundle] pathForResource:@"头像" ofType:@"jpg"];
-        UIImage *image = [UIImage imageWithContentsOfFile:path];
+//        NSString *path = [[NSBundle mainBundle] pathForResource:@"头像" ofType:@"jpg"];
+//        UIImage *image = [UIImage imageWithContentsOfFile:path];
+    
+        UIImage *image = [UIImage imageWithData:[NSData
+                                                 dataWithContentsOfURL:[NSURL URLWithString:[UserInformationModel manager].faceUrl]]];
         _iconView = [[UIImageView alloc] initWithImage:image];
         _iconView.frame = CGRectMake(10, SCREEN_HEIGHT * 0.35, 90, 90);
         _iconView.layer.cornerRadius = 45;
@@ -62,7 +62,7 @@ static NSString *cellId = @&quot;cellId&quot;;
             }
             return ;
         }
-        NSLog(@"成功===>data%@",data);
+//        NSLog(@"成功===>data%@",data);
         LVCUGCLiveListModel *model = [LVCUGCLiveListModel modelWithDic:data];
         _arrayM = model.activityList.mutableCopy;
@@ -91,6 +91,9 @@ static NSString *cellId = @&quot;cellId&quot;;
     LVCUGCLivePlayerCell *cell = [collectionView dequeueReusableCellWithReuseIdentifier:cellId forIndexPath:indexPath];
     LVCUGCLivePlayerModel *model = _arrayM[indexPath.row];
+    if (indexPath.row == 0) {
+        NSLog(@"%@",model.extensionName);
+    }
     cell.model = model;
     return cell;
@@ -77,8 +77,10 @@
 - (UIImageView *)iconView {
     if (!_iconView) {
-        NSString *path = [[NSBundle mainBundle] pathForResource:@"头像" ofType:@"jpg"];
-        UIImage *image = [UIImage imageWithContentsOfFile:path];
+//        NSString *path = [[NSBundle mainBundle] pathForResource:@"头像" ofType:@"jpg"];
+//        UIImage *image = [UIImage imageWithContentsOfFile:path];
+        UIImage *image = [UIImage imageWithData:[NSData
+                                                     dataWithContentsOfURL:[NSURL URLWithString:[UserInformationModel manager].faceUrl]]];
         _iconView = [[UIImageView alloc] initWithImage:image];
         _iconView.frame = CGRectMake((SCREEN_WIDTH - 100) * 0.5, SCREEN_HEIGHT * 0.2, 100, 100);
         _iconView.layer.cornerRadius = 50;
@@ -63,9 +63,13 @@
     if (model.extensionName.length > 0) {
         _nameLabel.text = model.extensionName;
+    } else {
+        _nameLabel.text = @"我的昵称";
     }
-    NSString *iconPath = [[NSBundle mainBundle] pathForResource:@"头像" ofType:@"jpg"];
-    UIImage *iconImage = [UIImage imageWithContentsOfFile:iconPath];
+//    NSString *iconPath = [[NSBundle mainBundle] pathForResource:@"头像" ofType:@"jpg"];
+//    UIImage *iconImage = [UIImage imageWithContentsOfFile:iconPath];
+    UIImage *iconImage = [UIImage imageWithData:[NSData
+                                             dataWithContentsOfURL:[NSURL URLWithString:[UserInformationModel manager].faceUrl]]];
     [_iconView sd_setImageWithURL:[NSURL URLWithString:model.extensionIcon] placeholderImage:iconImage];
     switch ([model.activityStatus intValue]) {