1、变更推送为阿里云推,清除云信IM以及推送内容;

2、消息页面全新改版;
3、部分微小Bug修复
This commit is contained in:
wbzhan
2019-05-24 19:21:31 +08:00
parent c586949438
commit 25c051d5f1
1544 changed files with 17136 additions and 78376 deletions
@@ -20,7 +20,6 @@
#define CELLTAGATINDEX 9990111
#import "ChinaPlckerView.h"
#import "KebordExternAddTextInputView.h"
#import "IfishSessionViewController.h"
@interface MemberDetailViewController ()<UITableViewDelegate,UITableViewDataSource,MBProgressHUDDelegate,ChinaPlckerViewDelegate,UIActionSheetDelegate>
@property (nonatomic,strong) UITableView *tableView;
@property (nonatomic,strong) ShopUserDatailData *userInfo;
@@ -319,34 +318,6 @@
#pragma mark - chatBtnClick和会员聊天
-(void)chatBtnClick{
UserModel*model=[dataContorl getUserInfo];
NSString *myAcount = [NSString stringWithFormat:@"%@",model.userId];
NSString *tarGetAcount = [NSString stringWithFormat:@"%@",self.userInfo.userId];
if ([myAcount isEqualToString:tarGetAcount]) {
[self.view makeToast:@"不能和自己聊天哦"];
return;
}
[[NIMSDK sharedSDK].loginManager login:myAcount token:model.neteaseToken completion:^(NSError *error) {
if (!error) {
NSLog(@"登录成功");
//创建session
NIMSession *session = [NIMSession session:tarGetAcount type:NIMSessionTypeP2P];
//创建聊天页,这个页面继承自 NIMKit 中的组件 NIMSessionViewController
IfishSessionViewController *vc = [[IfishSessionViewController alloc] initWithSession:session];
//导航颜色
vc.navState = 1;
[self.navigationController pushViewController:vc animated:YES];
}else{
NSLog(@"登录失败");
}
}];
}
@@ -7,7 +7,6 @@
//
#import "WhiteNavBaseViewController.h"
//同老版看护工作台 WorkbechViewController
#import "CertificationShopModel.h"
@interface IfishKanHuGuanLiViewController : WhiteNavBaseViewController
@property(nonatomic,strong) CertificationShopModel *shopsInfo;
@@ -9,8 +9,6 @@
#import "IfishKanHuGuanLiViewController.h"
#import "JHRefresh.h"
#import "ShopKanHuP2PViewController.h"
#import "NIMKit.h"
#import "IfishSessionViewController.h"
#import "KanHuGuanLi1ViewCell.h"
#import "KanHuGuanLiPictureViewCell.h"
@@ -331,32 +329,6 @@
-(void)chatBtnAction:(UIButton *)btn{
KanHuListModel *listmodel = self.kanHuListArr[btn.tag];
UserModel*model=[dataContorl getUserInfo];
NSString *myAcount = [NSString stringWithFormat:@"%@",model.userId];
NSString *tarGetAcount = [NSString stringWithFormat:@"%@",listmodel.userId];
[[NIMSDK sharedSDK].loginManager login:myAcount token:model.neteaseToken completion:^(NSError *error) {
if (!error) {
NSLog(@"登录成功");
//创建session
NIMSession *session = [NIMSession session:tarGetAcount type:NIMSessionTypeP2P];
//创建聊天页,这个页面继承自 NIMKit 中的组件 NIMSessionViewController
self.hidesBottomBarWhenPushed = YES;
IfishSessionViewController *vc = [[IfishSessionViewController alloc] initWithSession:session];
//vc.targetChatname = listmodel.nickName;
vc.navState = 1;
[self.navigationController pushViewController:vc animated:YES];
}else{
NSLog(@"登录失败");
}
}];
}
@@ -6,7 +6,7 @@
// Copyright © 2017年 lianlian. All rights reserved.
//
#import "BaseVIewContorller.h"
#import "BaseViewController.h"
#import "ShopCertifyStausModel.h"
typedef NS_ENUM(NSInteger, ShopCerProgressType){
ShopCerProgressTypeStart = 0,
@@ -14,7 +14,7 @@ typedef NS_ENUM(NSInteger, ShopCerProgressType){
ShopCerProgressTypeDone = 2
};
@interface IfishShopCerNewViewController : BaseVIewContorller
@interface IfishShopCerNewViewController : BaseViewController
@property(nonatomic) ShopCerProgressType cerProgressType;
@property (nonatomic,strong) ShopCertifyStausModel *statusM;
@@ -17,7 +17,6 @@
#import "IfishShopDetailViewController.h"
#import "ShopEditViewController.h"
#import "IfishShopEditeNewViewController.h"
#import "WorkbechViewController.h"
#import "IfishKanHuGuanLiViewController.h"
#import "ShopCertificationIntroduceController.h"
#import "MemberManageViewController.h"
@@ -279,7 +278,6 @@
[self.view makeToast:@"此商户已被禁用"];
return;
}
// WorkbechViewController *workVC=[[WorkbechViewController alloc] init];
IfishKanHuGuanLiViewController *workVC = [[IfishKanHuGuanLiViewController alloc] init];
workVC.shopsInfo = self.ShopsInfo;
self.hidesBottomBarWhenPushed = YES;