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

王军波
2 parents b97fb1a7 334e7ba6
Showing 4 changed files with 24 additions and 11 deletions
LiveVideoCloud/AppCustoms/Main/View/LVCTabBar.m
LiveVideoCloud/Classes/Sections/Mine/Login/Controller/LoginViewController.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);
@@ -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];
@@ -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"
     }
   ],