no message

张旭
1 parent 6968ecd5
Showing 7 changed files with 41 additions and 48 deletions
LiveVideoCloud.xcodeproj/project.pbxproj
LiveVideoCloud/AppCustoms/Main/ZXTabBarController.m
LiveVideoCloud/AppDelegate/AppDelegate.m
LiveVideoCloud/Classes/Sections/Mine/Controllers/LVCMineViewController.m
LiveVideoCloud/UtilKits/Macro/Macros/UserDefaultKeyMacro.h
LiveVideoCloud/UtilKits/webView/CNLiveMacro.h
LiveVideoCloud/animation.xcassets/AppIcon.appiconset/Contents.json
@@ -2129,13 +2129,6 @@
 			path = GiftResource;
 			sourceTree = "<group>";
 		};
-		D25BF8741E7B8A59007FB138 /* Model */ = {
-			isa = PBXGroup;
-			children = (
-			);
-			path = Model;
-			sourceTree = "<group>";
-		};
 		D25BF8751E7B8A59007FB138 /* View */ = {
 			isa = PBXGroup;
 			children = (
@@ -2224,7 +2217,7 @@
 			isa = PBXGroup;
 			children = (
 				D2888D991E6EBF1B003A77C8 /* Controller */,
-				D25BF8741E7B8A59007FB138 /* Model */,
+				D2D4CD901F3094EF00A064CC /* Model */,
 				D25BF8751E7B8A59007FB138 /* View */,
 			);
 			path = LiveSections;
@@ -2294,6 +2287,13 @@
 			path = ChatBarrageManager;
 			sourceTree = "<group>";
 		};
+		D2D4CD901F3094EF00A064CC /* Model */ = {
+			isa = PBXGroup;
+			children = (
+			);
+			path = Model;
+			sourceTree = "<group>";
+		};
 		D2EBC85E1F020D3D00F198FB /* UGCSections */ = {
 			isa = PBXGroup;
 			children = (
@@ -83,7 +83,6 @@
  
 -(void)liveBtnClick:(LVCTabBar *)tabBar
 {
-    
     // 判断用户是否登录
     if ([UserTools isLogin]) {
  
@@ -38,30 +38,13 @@
  
     //初始化聊天SDK并连接服务器
     [[CNLiveChatManager sharedCNLiveChatManager] initWithAppKey:UserAppKey appId:UserAppId isTestEnvironment:self.isTestEnvironment];
+    [self CNLiveChatConnect];
  
     //初始化统计SDK
     [CNLiveStat registerApp:UserAppId appKey:UserAppKey isTestEnvironment:self.isTestEnvironment];
  
     //启动事件数量统计
     [CNLiveStat event:@"iOS AppStartTest"];
-
-    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 {
-        
-        [[CNLiveChatManager sharedCNLiveChatManager] connectServerSuccess:^{
-            NSLog(@"连接服务器-----success");
-        } error:^(CNLiveChatConnectErrorCode errors) {
-            NSLog(@"连接服务器失败-----%ld", errors);
-        }];
-    }
  
     [self.window makeKeyAndVisible];
  
@@ -95,5 +78,25 @@
     // Called when the application is about to terminate. Save data if appropriate. See also applicationDidEnterBackground:.
 }
  
+- (void)CNLiveChatConnect
+{
+    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 {
+        
+        [[CNLiveChatManager sharedCNLiveChatManager] connectServerSuccess:^{
+            NSLog(@"连接服务器-----success");
+        } error:^(CNLiveChatConnectErrorCode errors) {
+            NSLog(@"连接服务器失败-----%ld", errors);
+        }];
+    }
+}
  
 @end
@@ -200,14 +200,10 @@
 }
 -(void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath
 {
-    
     if (indexPath.row == 0) {
         [self pushVC:[MineSettingViewController new]];
     } else if (indexPath.row == 1) {
-        dispatch_async(dispatch_get_main_queue(), ^{
-            LVCShortVideoListViewController *shortVideoVC = [[LVCShortVideoListViewController alloc] init];
-            [self.navigationController pushViewController:shortVideoVC animated:YES];
-        });
+        [self pushVC:[LVCShortVideoListViewController new]];
     }
  
 //    if(indexPath.row == 0)
@@ -256,17 +252,6 @@
     }
 }
  
--(CGFloat)tableView:(UITableView *)tableView heightForFooterInSection:(NSInteger)section
-{
-    return  0;
-}
-- (UIView *)tableView:(UITableView *)tableView viewForHeaderInSection:(NSInteger)section
-{
-    UIView *view= [UIView new];
-    view.backgroundColor = CommonBgColor;
-    return view;
-}
-
 - (void)anchorCheck {
     [SVProgressHUD showWithStatus:@"正在请求..."];
     [UserTools getAnchor:nil success:^(AFHTTPRequestOperation * _Nonnull operation, id  _Nonnull responseObject) {
@@ -13,10 +13,13 @@
 #ifndef UserDefaultKeyMacro_h
 #define UserDefaultKeyMacro_h
  
-/** 用户搜索信息key */
-static NSString *const UserInfoAllKeys                    = @"UserInfoAllKeys";
+///** 用户搜索信息key */
+//static NSString *const UserInfoAllKeys                    = @"UserInfoAllKeys";
  
-/** 当前键盘监听者 */
+#define UserInfoAllKeys            @"AllKeys"
+#define UserInfoKey                @"UserInfoKey"
+
+/** 键盘监听者 */
 static NSString *const keyboard                    = @"keyboard";
  
 #endif /* UserDefaultKeyMacro_h */
@@ -9,8 +9,6 @@
 #ifndef CNLivePersonalCenter_CNLiveMacro_h
 #define CNLivePersonalCenter_CNLiveMacro_h
  
-#define UserInfoAllKeys            @"AllKeys"
-#define UserInfoKey                @"UserInfoKey"
 #define LocalUserInfoEncryptKey    @"*&^%$#@"
  
 #define RegistKey                  @"wang!@#$%"
@@ -67,6 +67,11 @@
       "scale" : "3x"
     },
     {
+      "idiom" : "ios-marketing",
+      "size" : "1024x1024",
+      "scale" : "1x"
+    },
+    {
       "idiom" : "car",
       "size" : "60x60",
       "scale" : "2x"