1、变更推送为阿里云推,清除云信IM以及推送内容;
2、消息页面全新改版; 3、部分微小Bug修复
This commit is contained in:
@@ -7,9 +7,7 @@
|
||||
//
|
||||
|
||||
#import "IfishUserDataUnity.h"
|
||||
#import "NTESLoginManager.h"
|
||||
#import "SVProgressHUD.h"
|
||||
#import "NTESService.h"
|
||||
#import "IfishMianTabViewController.h"
|
||||
#import "IfishUserDefaultHelper.h"
|
||||
#import "NSObject+LBLaunchImage.h"
|
||||
@@ -57,51 +55,10 @@
|
||||
|
||||
NSLog(@"userDic:%@",userDic);
|
||||
NSLog(@"登录成功");
|
||||
//登陆云信
|
||||
NSString *acount = [NSString stringWithFormat:@"%@",model.userId];
|
||||
[self doLoginWithAccount:acount addToken:model.neteaseToken];
|
||||
[self setAppTabRoot];
|
||||
|
||||
}
|
||||
|
||||
#pragma mark -登陆云信服务器
|
||||
- (void)doLoginWithAccount:(NSString *)acount addToken:(NSString *)token
|
||||
{
|
||||
|
||||
NSString *loginAccount = acount;
|
||||
NSString *loginToken = token;
|
||||
|
||||
//NIM SDK 只提供消息通道,并不依赖用户业务逻辑,开发者需要为每个APP用户指定一个NIM帐号,NIM只负责验证NIM的帐号即可(在服务器端集成)
|
||||
//用户APP的帐号体系和 NIM SDK 并没有直接关系
|
||||
//DEMO中使用 username 作为 NIM 的account ,md5(password) 作为 token
|
||||
//开发者需要根据自己的实际情况配置自身用户系统和 NIM 用户系统的关系
|
||||
|
||||
|
||||
[[[NIMSDK sharedSDK] loginManager] login:loginAccount
|
||||
token:loginToken
|
||||
completion:^(NSError *error) {
|
||||
[SVProgressHUD dismiss];
|
||||
if (error == nil)
|
||||
{
|
||||
LoginData *sdkData = [[LoginData alloc] init];
|
||||
sdkData.account = loginAccount;
|
||||
sdkData.token = loginToken;
|
||||
[[NTESLoginManager sharedManager] setCurrentLoginData:sdkData];
|
||||
|
||||
[[NTESServiceManager sharedManager] start];
|
||||
//NSInteger count = [[[NIMSDK sharedSDK] conversationManager] allUnreadCount];
|
||||
// NSLog(@"count%d",count);
|
||||
[[NSNotificationCenter defaultCenter] postNotificationName:IFISHIMLOGINSUCSESS object:nil];
|
||||
}
|
||||
else
|
||||
{
|
||||
NSString *toast = [NSString stringWithFormat:@"登录失败 code: %zd",error.code];
|
||||
[[UIApplication sharedApplication].keyWindow makeToast:toast ];
|
||||
}
|
||||
}];
|
||||
|
||||
}
|
||||
|
||||
#pragma mark - 自动登录
|
||||
|
||||
-(void)userAutologinSuccsess:(NSDictionary *)dataDic
|
||||
@@ -122,38 +79,6 @@
|
||||
[[IfishUserObsever sharedInstance] showLevelUpWith:gradeNum];
|
||||
[IfishUserDefaultHelper chageLevlelGrad:gradeNum];
|
||||
}
|
||||
|
||||
|
||||
//登陆云信 走自动登录
|
||||
LoginData *data = [[NTESLoginManager sharedManager] currentLoginData];
|
||||
NSString *account = [data account];
|
||||
NSString *token = [data token];
|
||||
//如果有缓存用户名密码推荐使用自动登录
|
||||
if ([account length] && [token length])
|
||||
{
|
||||
//自动登录
|
||||
//非强制模式
|
||||
//[[[NIMSDK sharedSDK] loginManager] autoLogin:account
|
||||
// token:token];
|
||||
//这里我们使用强制模式 即不考虑安全登录 多设备同帐号登陆
|
||||
|
||||
NIMAutoLoginData * LoginData = [[NIMAutoLoginData alloc] init];
|
||||
LoginData.account = account;
|
||||
LoginData.token = token;
|
||||
//强制模式 强制模式下的自动登录,服务器将不检查当前登录设备是否为上一次登录设备,安全性较低。但相对的更加方便,适合 IM 仅作为辅助模块的 App
|
||||
|
||||
LoginData.forcedMode = YES;
|
||||
[[[NIMSDK sharedSDK] loginManager] autoLogin:LoginData];
|
||||
[[NTESServiceManager sharedManager] start];
|
||||
|
||||
}
|
||||
else
|
||||
{ //注册登录
|
||||
NSString *acount = [NSString stringWithFormat:@"%@",model.userId];
|
||||
[self doLoginWithAccount:acount addToken:model.neteaseToken];
|
||||
}
|
||||
|
||||
//[self startLounchImg];
|
||||
//完成登陆验证开始 广告页倒计时
|
||||
[self setAdViewVC];
|
||||
|
||||
|
||||
Reference in New Issue
Block a user