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

朱林
2 parents 392d034e d234bcca
Showing 8 changed files with 102 additions and 32 deletions
LiveVideoCloud/AppCustoms/Main/View/LVCTabBar.m
LiveVideoCloud/AppDelegate/AppDelegate.m
LiveVideoCloud/Classes/Sections/InteractionSections/Gift/GiftViews/GiftListView.m
LiveVideoCloud/Classes/Sections/LiveSections/Controller/LVCVerifyViewController.m
LiveVideoCloud/Classes/Sections/Mine/Login/Controller/LoginViewController.m
LiveVideoCloud/Classes/Sections/homeSections/Controller/LVCVodPlayerController.m
LiveVideoCloud/animation.xcassets/tabBar/ic_camera.imageset/Contents.json
LiveVideoCloud/animation.xcassets/tabBar/ic_camera_sel.imageset/Contents.json
@@ -43,13 +43,15 @@
 {
     [super layoutSubviews];
-    self.liveBtn.top = self.height - 96 / 2;
-    _liveBtn.left = SCREEN_WIDTH * 0.5 - 96 / 4;
-    _liveBtn.width = 96 / 2;
-    _liveBtn.height = 96 / 2;
+    CGFloat liveW = 96 / 2;
+    CGFloat liveH = 96 / 2;
+    self.liveBtn.top = self.height - liveH;
+    _liveBtn.left = SCREEN_WIDTH * 0.5 - liveW / 2;
+    _liveBtn.width = liveW;
+    _liveBtn.height = liveH;
     CGFloat buttonY = 19 - 3;//19 - 3.5;
-    CGFloat buttonW = (self.width - 96 / 2)/ 4;
+    CGFloat buttonW = (self.width - liveW)/ 4;
     CGFloat buttonH = 30;
     NSInteger index = 0;
@@ -59,7 +61,7 @@
         CGFloat buttonX = index * buttonW;
         if (index >= 2)
         {
-            buttonX += 96 / 2;
+            buttonX += liveW;
         }
         subView.frame = CGRectMake(buttonX, buttonY, buttonW, buttonH);
@@ -51,16 +51,23 @@
     // 20170327 20170328
-
-    CNLiveChatUserInfo *userInfo = [[CNLiveChatUserInfo alloc] initWithUserId:@"2017063339" name:@"设计的" portrait:@"http://b.hiphotos.baidu.com/zhidao/wh%3D450%2C600/sign=f0c5c08030d3d539c16807c70fb7c566/8ad4b31c8701a18bbef9f231982f07082838feba.jpg"];
-
-
-    [[CNLiveChatManager sharedCNLiveChatManager] loginServer:userInfo success:^(NSString *userId) {
-        NSLog(@"连接服务器-----success");
+    if ([UserTools isLogin]) {
+        
+        CNLiveChatUserInfo *userInfo = [[CNLiveChatUserInfo alloc] initWithUserId:[UserInformationModel manager].uid name:[UserInformationModel manager].nickname portrait:[UserInformationModel manager].faceUrl];
+        
+        [[CNLiveChatManager sharedCNLiveChatManager] loginServer:userInfo success:^(NSString *userId) {
+            NSLog(@"连接服务器-----success");
+        } error:^(CNLiveChatConnectErrorCode errors) {
+            NSLog(@"连接服务器失败-----%ld", errors);
+        }];
+    } else {
-    } error:^(CNLiveChatConnectErrorCode errors) {
-        NSLog(@"连接服务器失败-----%ld", errors);
-    }];
+        [[CNLiveChatManager sharedCNLiveChatManager] connectServerSuccess:^{
+            NSLog(@"连接服务器-----success");
+        } error:^(CNLiveChatConnectErrorCode errors) {
+            NSLog(@"连接服务器失败-----%ld", errors);
+        }];
+    }
     [self.window makeKeyAndVisible];
@@ -26,6 +26,7 @@
 @property (nonatomic ,weak  ) LiveBaseView *         _Nullable  liveBaseView;
 @property (nonatomic, strong) AnimQueueManager *                animQueueManager;
 @property (nonatomic ,strong) GiftModel *            _Nullable  model;
+@property (nonatomic ,strong) UIScrollView * _Nullable             scrollView;
 @property (nonatomic ,assign) BOOL                          isSelectedGift;
 @property (nonatomic ,assign) NSInteger curruntSelectIdx;
@@ -53,6 +54,7 @@
         scrollView.showsVerticalScrollIndicator = NO;
         scrollView.showsHorizontalScrollIndicator = NO;
         [self addSubview:scrollView];
+        self.scrollView = scrollView;
         int line = 0;
         int row = 0;
@@ -155,17 +157,40 @@
 #pragma mark - 选择礼物点击
 - (void)gestureClick:(UITapGestureRecognizer *)gesture
 {
-    _isSelectedGift = YES;
     NSInteger tag = gesture.view.tag - 10;
     NSLog(@"%zd",tag);
-//    if (_curruntSelectIdx == tag && _isSelectedGift) {
-//        _isSelectedGift = NO;
-//        _curruntSelectIdx = -1;
-//    }
-//    _curruntSelectIdx = tag;
-
-    //右上角添加✔️,再次点击去掉✔️
+    if (_curruntSelectIdx == 0 && _isSelectedGift == NO) {//没选过
+        UIView *giftView = gesture.view;
+        
+        UIImageView *bgView = [[UIImageView alloc] initWithFrame:giftView.bounds];
+        bgView.backgroundColor = [UIColor blackColor];
+        bgView.tag = giftView.tag + 100;
+        bgView.alpha = 0.2;
+        [giftView addSubview:bgView];
+    }
+    
+    if (_curruntSelectIdx != 0 && _isSelectedGift == YES) {//选过
+        UIView *gView = gesture.view;
+        for (UIView *view in self.scrollView.subviews) {//移除上一个bgView
+            if (view.tag == _curruntSelectIdx) {
+                for (UIView *bg in view.subviews) {
+                    if (bg.tag == view.tag + 100) {
+                        [bg removeFromSuperview];
+                        break;
+                    }
+                }
+            }
+        }
+        //增加当前bgView
+        UIImageView *bgView = [[UIImageView alloc] initWithFrame:gView.bounds];
+        bgView.backgroundColor = [UIColor blackColor];
+        bgView.tag = gView.tag + 100;
+        bgView.alpha = 0.2;
+        [gView addSubview:bgView];
+    }
+    _isSelectedGift = YES;
+    _curruntSelectIdx = gesture.view.tag;
     GiftModel *model = self.giftArray[tag];
     model.sender = [CNLiveChatManager sharedCNLiveChatManager].currentUserInfo.name;
@@ -16,6 +16,24 @@
 @implementation LVCVerifyViewController
+- (void)viewDidAppear:(BOOL)animated
+{
+    [super viewDidAppear:animated];
+    // 禁用返回手势
+    if ([self.navigationController respondsToSelector:@selector(interactivePopGestureRecognizer)]) {
+        self.navigationController.interactivePopGestureRecognizer.enabled = NO;
+    }
+}
+
+- (void)viewWillDisappear:(BOOL)animated
+{
+    [super viewWillDisappear:animated];
+    // 开启返回手势
+    if ([self.navigationController respondsToSelector:@selector(interactivePopGestureRecognizer)]) {
+        self.navigationController.interactivePopGestureRecognizer.enabled = YES;
+    }
+}
+
 - (void)viewDidLoad {
     [super viewDidLoad];
@@ -89,14 +89,25 @@
                 [UserTools saveUserinfoDic:result[@"data"]];
                 [SVProgressHUD dismiss];
-
+                
+                NSString *uId = result[@"data"][@"uid"];
+                NSString *name = result[@"data"][@"nickName"];
+                NSString *protrait = result[@"data"][@"faceUrl"];
+                //断开聊天SDK连接,以用户信息登录
+                [[CNLiveChatManager sharedCNLiveChatManager] logoutServer];
+                CNLiveChatUserInfo *userInfo = [[CNLiveChatUserInfo alloc] initWithUserId:uId name:name portrait:protrait];
+                [[CNLiveChatManager sharedCNLiveChatManager] loginServer:userInfo success:^(NSString *userId) {
+                    NSLog(@"login CNLiveChat Success");
+                } error:^(CNLiveChatConnectErrorCode errors) {
+                    NSLog(@"login error %zd",errors);
+                }];
+                
                 if(self.isModalButton) {
                     [self dismissViewControllerAnimated:YES completion:NULL];
                 } else {
                     [self.navigationController popViewControllerAnimated:YES];
                 }
-                
- 
+
             } else {
                 [SVProgressHUD dismiss];
                 [SVProgressHUD setMinimumDismissTimeInterval:1.0];
@@ -61,6 +61,16 @@ typedef enum {
 - (void)viewWillDisappear:(BOOL)animated
 {
     [super viewWillDisappear:animated];
+    
+    [[UIApplication sharedApplication] setStatusBarStyle:UIStatusBarStyleDefault];
+    [[UIApplication sharedApplication] setStatusBarHidden: NO withAnimation:UIStatusBarAnimationNone];
+    
+    self.navigationController.navigationBar.hidden = NO;
+}
+
+- (void)viewDidDisappear:(BOOL)animated {
+    [super viewDidDisappear:animated];
+    
     [_player stop];
     [_autoHideTimer invalidate];
     _autoHideTimer = nil;
@@ -68,10 +78,7 @@ typedef enum {
     _currentTimer = nil;
     [[NSNotificationCenter defaultCenter]removeObserver:self name:MPMoviePlayerPlaybackStateDidChangeNotification object:nil];
     [_playerSuperView removeFromSuperview];
-    
-    [[UIApplication sharedApplication] setStatusBarStyle:UIStatusBarStyleDefault];
-    [[UIApplication sharedApplication] setStatusBarHidden: NO withAnimation:UIStatusBarAnimationNone];
-    self.navigationController.navigationBar.hidden = NO;
+
 }
 - (void)viewDidLoad {
@@ -2,6 +2,7 @@
   "images" : [
     {
       "idiom" : "universal",
+      "filename" : "ic_camera.png",
       "scale" : "1x"
     },
     {
@@ -10,7 +11,6 @@
     },
     {
       "idiom" : "universal",
-      "filename" : "ic_camera.png",
       "scale" : "3x"
     }
   ],
@@ -2,6 +2,7 @@
   "images" : [
     {
       "idiom" : "universal",
+      "filename" : "ic_camera_sel.png",
       "scale" : "1x"
     },
     {
@@ -10,7 +11,6 @@
     },
     {
       "idiom" : "universal",
-      "filename" : "ic_camera_sel.png",
       "scale" : "3x"
     }
   ],