Commit cb10fed865d2b88b75e653d4f9285e3ba3644a7d
1 parent
6968ecd5
no message
Showing
7 changed files
with
41 additions
and
48 deletions
LiveVideoCloud.xcodeproj/project.pbxproj
... | ... | @@ -2129,13 +2129,6 @@ |
2129 | 2129 | path = GiftResource; |
2130 | 2130 | sourceTree = "<group>"; |
2131 | 2131 | }; |
2132 | - D25BF8741E7B8A59007FB138 /* Model */ = { | |
2133 | - isa = PBXGroup; | |
2134 | - children = ( | |
2135 | - ); | |
2136 | - path = Model; | |
2137 | - sourceTree = "<group>"; | |
2138 | - }; | |
2139 | 2132 | D25BF8751E7B8A59007FB138 /* View */ = { |
2140 | 2133 | isa = PBXGroup; |
2141 | 2134 | children = ( |
... | ... | @@ -2224,7 +2217,7 @@ |
2224 | 2217 | isa = PBXGroup; |
2225 | 2218 | children = ( |
2226 | 2219 | D2888D991E6EBF1B003A77C8 /* Controller */, |
2227 | - D25BF8741E7B8A59007FB138 /* Model */, | |
2220 | + D2D4CD901F3094EF00A064CC /* Model */, | |
2228 | 2221 | D25BF8751E7B8A59007FB138 /* View */, |
2229 | 2222 | ); |
2230 | 2223 | path = LiveSections; |
... | ... | @@ -2294,6 +2287,13 @@ |
2294 | 2287 | path = ChatBarrageManager; |
2295 | 2288 | sourceTree = "<group>"; |
2296 | 2289 | }; |
2290 | + D2D4CD901F3094EF00A064CC /* Model */ = { | |
2291 | + isa = PBXGroup; | |
2292 | + children = ( | |
2293 | + ); | |
2294 | + path = Model; | |
2295 | + sourceTree = "<group>"; | |
2296 | + }; | |
2297 | 2297 | D2EBC85E1F020D3D00F198FB /* UGCSections */ = { |
2298 | 2298 | isa = PBXGroup; |
2299 | 2299 | children = ( | ... | ... |
LiveVideoCloud/AppCustoms/Main/ZXTabBarController.m
LiveVideoCloud/AppDelegate/AppDelegate.m
... | ... | @@ -38,30 +38,13 @@ |
38 | 38 | |
39 | 39 | //初始化聊天SDK并连接服务器 |
40 | 40 | [[CNLiveChatManager sharedCNLiveChatManager] initWithAppKey:UserAppKey appId:UserAppId isTestEnvironment:self.isTestEnvironment]; |
41 | + [self CNLiveChatConnect]; | |
41 | 42 | |
42 | 43 | //初始化统计SDK |
43 | 44 | [CNLiveStat registerApp:UserAppId appKey:UserAppKey isTestEnvironment:self.isTestEnvironment]; |
44 | 45 | |
45 | 46 | //启动事件数量统计 |
46 | 47 | [CNLiveStat event:@"iOS AppStartTest"]; |
47 | - | |
48 | - if ([UserTools isLogin]) { | |
49 | - | |
50 | - CNLiveChatUserInfo *userInfo = [[CNLiveChatUserInfo alloc] initWithUserId:[UserInformationModel manager].uid name:[UserInformationModel manager].nickname portrait:[UserInformationModel manager].faceUrl]; | |
51 | - | |
52 | - [[CNLiveChatManager sharedCNLiveChatManager] loginServer:userInfo success:^(NSString *userId) { | |
53 | - NSLog(@"连接服务器-----success"); | |
54 | - } error:^(CNLiveChatConnectErrorCode errors) { | |
55 | - NSLog(@"连接服务器失败-----%ld", errors); | |
56 | - }]; | |
57 | - } else { | |
58 | - | |
59 | - [[CNLiveChatManager sharedCNLiveChatManager] connectServerSuccess:^{ | |
60 | - NSLog(@"连接服务器-----success"); | |
61 | - } error:^(CNLiveChatConnectErrorCode errors) { | |
62 | - NSLog(@"连接服务器失败-----%ld", errors); | |
63 | - }]; | |
64 | - } | |
65 | 48 | |
66 | 49 | [self.window makeKeyAndVisible]; |
67 | 50 | |
... | ... | @@ -95,5 +78,25 @@ |
95 | 78 | // Called when the application is about to terminate. Save data if appropriate. See also applicationDidEnterBackground:. |
96 | 79 | } |
97 | 80 | |
81 | +- (void)CNLiveChatConnect | |
82 | +{ | |
83 | + if ([UserTools isLogin]) { | |
84 | + | |
85 | + CNLiveChatUserInfo *userInfo = [[CNLiveChatUserInfo alloc] initWithUserId:[UserInformationModel manager].uid name:[UserInformationModel manager].nickname portrait:[UserInformationModel manager].faceUrl]; | |
86 | + | |
87 | + [[CNLiveChatManager sharedCNLiveChatManager] loginServer:userInfo success:^(NSString *userId) { | |
88 | + NSLog(@"连接服务器-----success"); | |
89 | + } error:^(CNLiveChatConnectErrorCode errors) { | |
90 | + NSLog(@"连接服务器失败-----%ld", errors); | |
91 | + }]; | |
92 | + } else { | |
93 | + | |
94 | + [[CNLiveChatManager sharedCNLiveChatManager] connectServerSuccess:^{ | |
95 | + NSLog(@"连接服务器-----success"); | |
96 | + } error:^(CNLiveChatConnectErrorCode errors) { | |
97 | + NSLog(@"连接服务器失败-----%ld", errors); | |
98 | + }]; | |
99 | + } | |
100 | +} | |
98 | 101 | |
99 | 102 | @end | ... | ... |
LiveVideoCloud/Classes/Sections/Mine/Controllers/LVCMineViewController.m
... | ... | @@ -200,14 +200,10 @@ |
200 | 200 | } |
201 | 201 | -(void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath |
202 | 202 | { |
203 | - | |
204 | 203 | if (indexPath.row == 0) { |
205 | 204 | [self pushVC:[MineSettingViewController new]]; |
206 | 205 | } else if (indexPath.row == 1) { |
207 | - dispatch_async(dispatch_get_main_queue(), ^{ | |
208 | - LVCShortVideoListViewController *shortVideoVC = [[LVCShortVideoListViewController alloc] init]; | |
209 | - [self.navigationController pushViewController:shortVideoVC animated:YES]; | |
210 | - }); | |
206 | + [self pushVC:[LVCShortVideoListViewController new]]; | |
211 | 207 | } |
212 | 208 | |
213 | 209 | // if(indexPath.row == 0) |
... | ... | @@ -256,17 +252,6 @@ |
256 | 252 | } |
257 | 253 | } |
258 | 254 | |
259 | --(CGFloat)tableView:(UITableView *)tableView heightForFooterInSection:(NSInteger)section | |
260 | -{ | |
261 | - return 0; | |
262 | -} | |
263 | -- (UIView *)tableView:(UITableView *)tableView viewForHeaderInSection:(NSInteger)section | |
264 | -{ | |
265 | - UIView *view= [UIView new]; | |
266 | - view.backgroundColor = CommonBgColor; | |
267 | - return view; | |
268 | -} | |
269 | - | |
270 | 255 | - (void)anchorCheck { |
271 | 256 | [SVProgressHUD showWithStatus:@"正在请求..."]; |
272 | 257 | [UserTools getAnchor:nil success:^(AFHTTPRequestOperation * _Nonnull operation, id _Nonnull responseObject) { | ... | ... |
LiveVideoCloud/UtilKits/Macro/Macros/UserDefaultKeyMacro.h
... | ... | @@ -13,10 +13,13 @@ |
13 | 13 | #ifndef UserDefaultKeyMacro_h |
14 | 14 | #define UserDefaultKeyMacro_h |
15 | 15 | |
16 | -/** 用户搜索信息key */ | |
17 | -static NSString *const UserInfoAllKeys = @"UserInfoAllKeys"; | |
16 | +///** 用户搜索信息key */ | |
17 | +//static NSString *const UserInfoAllKeys = @"UserInfoAllKeys"; | |
18 | 18 | |
19 | -/** 当前键盘监听者 */ | |
19 | +#define UserInfoAllKeys @"AllKeys" | |
20 | +#define UserInfoKey @"UserInfoKey" | |
21 | + | |
22 | +/** 键盘监听者 */ | |
20 | 23 | static NSString *const keyboard = @"keyboard"; |
21 | 24 | |
22 | 25 | #endif /* UserDefaultKeyMacro_h */ | ... | ... |
LiveVideoCloud/UtilKits/webView/CNLiveMacro.h
... | ... | @@ -9,8 +9,6 @@ |
9 | 9 | #ifndef CNLivePersonalCenter_CNLiveMacro_h |
10 | 10 | #define CNLivePersonalCenter_CNLiveMacro_h |
11 | 11 | |
12 | -#define UserInfoAllKeys @"AllKeys" | |
13 | -#define UserInfoKey @"UserInfoKey" | |
14 | 12 | #define LocalUserInfoEncryptKey @"*&^%$#@" |
15 | 13 | |
16 | 14 | #define RegistKey @"wang!@#$%" | ... | ... |
LiveVideoCloud/animation.xcassets/AppIcon.appiconset/Contents.json