0.5.7 版本添加企业端逻辑

daojian
1 parent c70f9371
Showing 9 changed files with 182 additions and 53 deletions
CNLiveNewIMAManagerKit.podspec
CNLiveNewIMAManagerKit/Classes/Playform/IMAConversationManager.m
CNLiveNewIMAManagerKit/Classes/Playform/IMAPlatform.h
CNLiveNewIMAManagerKit/Classes/TIMModel/Conversation/IMAConversation.h
CNLiveNewIMAManagerKit/Classes/TIMModel/Conversation/IMAConversation.m
CNLiveNewIMAManagerKit/Classes/TIMModel/MSG/IMAMsg.h
CNLiveNewIMAManagerKit/Classes/TIMModel/MSG/IMAMsg.m
Example/CNLiveNewIMAManagerKit.xcodeproj/project.pbxproj
LICENSE → Example/LICENSE
@@ -8,7 +8,7 @@
 Pod::Spec.new do |s|
   s.name             = 'CNLiveNewIMAManagerKit'
-  s.version          = '0.5.6'
+  s.version          = '0.5.7'
   s.summary          = 'A short description of CNLiveNewIMAManagerKit.'
 #s.description      = <<-DESC
@@ -697,6 +697,10 @@
             }
         }
+        case IMPlatformTypeA:
+        {
+            return _toIndex;
+        }
         default:
             break;
     }
@@ -1382,6 +1386,7 @@
                             if ([imaconv.receiver hasPrefix:@"sys_"]) {
                                 switch ([IMAPlatform sharedInstance].platformType) {
                                     case IMPlatformTypeB:
+                                    case IMPlatformTypeA:
                                     {
                                         if (![imaconv.receiver isEqualToString:CNWithSystemMessage])
                                         {
@@ -11,6 +11,7 @@
 typedef NS_ENUM(NSInteger, IMPlatformType){
     IMPlatformTypeC = 0, //用户端APP
     IMPlatformTypeB = 1, //商家端APP
+    IMPlatformTypeA = 2, //企业端APP
 };
 // Demo的业务逻辑入口，外部所的要使用IMSDK的地方，都间接能过IMAPlatform调用
@@ -99,11 +99,24 @@ typedef void (^RemoveMsgBlock)(NSArray *imamsgList, BOOL succ, CommonVoidBlock r
 - (void)releaseConversation;
 /// 切换到本会话前，先加载本地的最后count条聊天的的数据
+/// @param count 获取的历史消息数
+/// @param isShowTime 是否显示时间消息
+/// @param block 消息回调
 - (void)asyncLoadRecentMessage:(NSInteger)count isShowTime:(BOOL)isShowTime completion:(HandleMsgBlock)block;
+/// 企业端获取历史消息方法
+- (void)asyncBLiveLoadRecentMessage:(NSInteger)count completion:(HandleMsgBlock)block;
+
 /// 用于顶部下拉加载更多历史消息
+/// @param count 获取的历史消息数
+/// @param msg 从那个消息开始获取历史消息记录
+/// @param isShowTime 是否显示时间消息
+/// @param block 消息回调
 - (void)asyncLoadRecentMessage:(NSInteger)count from:(IMAMsg *)msg isShowTime:(BOOL)isShowTime completion:(HandleMsgBlock)block;
+/// 企业端获取历史消息方法
+- (void)asyncBLiveLoadRecentMessage:(NSInteger)count from:(IMAMsg *)msg completion:(HandleMsgBlock)block;
+
 /// 获取未读消息
 - (void)asynUnreadMessage:(HandleMsgBlock)block;
@@ -137,6 +137,7 @@
 {
     switch ([IMAPlatform sharedInstance].platformType) {
         case IMPlatformTypeB:
+        case IMPlatformTypeA:
         {
             [IMAPlatform sharedInstance].conversationMgr.unReadMessageCount -= [_conversation getUnReadMessageNum];
         }
@@ -391,57 +392,135 @@
     }
-//    [_conversation getMessage:(int)count last:msg.msg succ:^(NSArray *array) {
-//        
-//        NSArray *recentIMAMsg = [ws onLoadRecentMessageSucc:array];
-//        if (block)
-//        {
-//            block(recentIMAMsg, recentIMAMsg.count != 0);
-//        }
-//    } fail:^(int code, NSString *err) {
-//        DebugLog(@"未取到最后一条消息");
-//        if (block)
-//        {
-//            block(nil, NO);
-//        }
-//    }];
 }
-// 过滤未知消息
-//- (NSArray *)removeUnknownMsg:(NSArray *)msgs
-//{
-//    NSMutableArray *arrayMsg = [NSMutableArray new];
-//    for (TIMMessage *msg in msgs) {
-//        if ([[msg getElem:0] isKindOfClass:[TIMCustomElem class]]) {
-//            TIMCustomElem *customElem = (TIMCustomElem *)[msg getElem:0];
-//            NSError *err;
-//            NSDictionary *dic = [NSJSONSerialization JSONObjectWithData:customElem.data
-//                                                                options:NSJSONReadingMutableContainers
-//                                                                  error:&err];
-//            if([[dic objectForKey:@"type"] integerValue] == CustomMsgTypeConfirm
-//               || [[dic objectForKey:@"type"] integerValue] == CustomMsgTypeCnee
-//               || [[dic objectForKey:@"type"] integerValue] == CustomMsgTypeOrderStatus
-//               || [[dic objectForKey:@"type"] integerValue] == CustomMsgTypeFriendshipVerify
-//               || [[dic objectForKey:@"type"] integerValue] == CustomMsgTypeAddFriend
-//               || [[dic objectForKey:@"type"] integerValue] == CustomMsgTypeRefreshFriendCircle
-//               || [[dic objectForKey:@"type"] integerValue] == CustomMsgTypeAddFriendSucc
-//               || [[dic objectForKey:@"type"] integerValue] == CustomMsgTypeFriendSendSucc
-//               || [[dic objectForKey:@"type"] integerValue] == CustomMsgTypeAite
-//               || [[dic objectForKey:@"type"] integerValue] == CustomMsgTypeWithdrawMessage
-//               || [[dic objectForKey:@"type"] integerValue] == CustomMsgTypeDissolveGroup
-//               || [[dic objectForKey:@"type"] integerValue] == CustomMsgTypePayment
-//               || [[dic objectForKey:@"type"] integerValue] == CustomMsgTypeReceipt
-//               || [[dic objectForKey:@"type"] integerValue] == CustomMsgTypeGroupPaySuccess
-//               || [[dic objectForKey:@"type"] integerValue] == CustomMsgTypeShareLink)
-//            {
-//                [arrayMsg addObject:msg];
-//
-//            }
-//        }
-//        else
-//            [arrayMsg addObject:msg];
-//    }
-//    return arrayMsg;
-//}
+/// 企业端获取历史消息
+- (void)asyncBLiveLoadRecentMessage:(NSInteger)count completion:(HandleMsgBlock)block;
+{
+    IMAMsg *top = [_msgList.safeArray lastObject];
+    [self asyncBLiveLoadRecentMessage:count from:top completion:block];
+}
+// 企业端获取历史消息
+- (void)asyncBLiveLoadRecentMessage:(NSInteger)count from:(IMAMsg *)msg completion:(HandleMsgBlock)block;
+{
+    __weak IMAConversation *ws = self;
+    
+    //zl__如果是群聊获取漫游消息，单聊获取本地消息
+    if ([_conversation getType] == TIM_GROUP) {
+        
+        [_conversation getMessage:(int)count last:msg.msg succ:^(NSArray *msgs) {
+            
+            
+            NSArray *recentIMAMsg = [ws onBLiveLoadRecentMessageSucc:msgs];
+            if (block)
+            {
+                block(recentIMAMsg, recentIMAMsg.count != 0);
+            }
+            
+        } fail:^(int code, NSString *msg) {
+            
+            DebugLog(@"未取到最后一条消息");
+            if (block)
+            {
+                block(nil, NO);
+            }
+            
+        }];
+        
+        
+    } else {
+        if ([TIMTools connectedToNetwork]) {
+            //联网，拿漫游消息
+            [_conversation getMessage:(int)count last:msg.msg succ:^(NSArray *msgs) {
+                
+                NSArray *recentIMAMsg = [ws onBLiveLoadRecentMessageSucc:msgs];
+                if (block)
+                {
+                    block(recentIMAMsg, recentIMAMsg.count != 0);
+                }
+                
+            } fail:^(int code, NSString *msg) {
+                
+                DebugLog(@"未取到最后一条消息");
+                if (block)
+                {
+                    block(nil, NO);
+                }
+                
+            }];
+        }
+        else
+        {
+            //未联网，拿本地历史消息
+            [_conversation getLocalMessage:(int)count last:msg.msg succ:^(NSArray *msgs) {
+                
+                NSArray *recentIMAMsg = [ws onBLiveLoadRecentMessageSucc:msgs];
+                if (block)
+                {
+                    block(recentIMAMsg, recentIMAMsg.count != 0);
+                }
+                
+            } fail:^(int code, NSString *msg) {
+                
+                DebugLog(@"未取到最后一条消息");
+                if (block)
+                {
+                    block(nil, NO);
+                }
+                
+            }];
+        }
+        
+        
+    }
+}
+/// 根据 TIMMessage 生成 IMAMsg 消息
+- (NSArray *)onBLiveLoadRecentMessageSucc:(NSArray *)timmsgList
+{
+    if (timmsgList.count > 0)
+    {
+        NSMutableArray *array = [NSMutableArray array];
+        
+        for (TIMMessage *msg in timmsgList) {
+            if (msg.status == TIM_MSG_STATUS_HAS_DELETED)
+            {
+                continue;
+            }
+            if ([msg getElem:0] == nil) {
+                continue;
+            }
+            
+            if ([[msg getElem:0] isKindOfClass:[TIMCustomElem class]])
+            {
+                //过滤不需要展示的自定义消息
+                TIMCustomElem *customElem = (TIMCustomElem *)[msg getElem:0];
+                NSError *err;
+                NSDictionary *dic = [NSJSONSerialization JSONObjectWithData:customElem.data
+                                                                    options:NSJSONReadingMutableContainers
+                                                                      error:&err];
+                if ([[dic objectForKey:@"type"] integerValue] == CustomMsgTypeSenderInvitationReceiver) {
+                    continue;
+                }
+            }
+            
+            NSDate *date = [msg timestamp];
+            
+            
+            IMAMsg *timeMsg = [IMAMsg msgWithDate:date];
+            [array addObject:timeMsg];
+            //niu
+            IMAMsg *imamsg = [IMAMsg msgWith:msg];
+            if (imamsg)
+            {
+                [array addObject:imamsg];
+            }
+        }
+        
+        [_msgList addObjectsFromArray:array];
+        return array;
+    }
+    
+    return nil;
+}
 - (TIMConversationType)type
 {
     if (_convType) {
@@ -127,6 +127,12 @@ typedef NS_ENUM(NSInteger, IMAMSGType) {
     EIMAMSG_OrederReminder        ,    //推单
     EIMAMSG_NewOrderRemind        ,    //新订单提醒
+#pragma mark 网家家企业端消息相关
+    EIMAMSG_Illegal    ,               //违规
+    EIMAMSG_PersonageCerSuccess    ,   //个人认证成功
+    EIMAMSG_PersonageCerFail    ,      //个人认证失败
+    EIMAMSG_OrganizationCerSuccess  ,  //机构认证成功
+    EIMAMSG_OrganizationCerFail   ,    //机构认证失败
 };
@@ -257,7 +263,12 @@ typedef NS_ENUM(NSUInteger, CustomMsgType) {
     CustomMsgTypeApplyForRefund         = 3111,         //申请退款消息
     CustomMsgTypeReminder               = 3222,         //催单
     CustomMsgTypeNewOrderRemind         = 3333,         //新订单提醒
-
+#pragma mark 网家家企业端消息相关
+    CustomMsgTypeIllegal                    = 12001,   //违规
+    CustomMsgTypePersonageCerSuccess        = 12002,   //个人认证成功
+    CustomMsgTypePersonageCerFail           = 12003,   //个人认证失败
+    CustomMsgTypeOrganizationCerSuccess     = 12004,   //机构认证成功
+    CustomMsgTypeOrganizationCerFail        = 12005,   //机构认证失败
 };
 /**
@@ -651,6 +651,26 @@
             {
                 type = EIMAMSG_ShareCoupon;
             }
+            else if ([dic[@"type"] integerValue] == CustomMsgTypeIllegal)
+            {
+                type = EIMAMSG_Illegal;
+            }
+            else if ([dic[@"type"] integerValue] == CustomMsgTypePersonageCerSuccess)
+            {
+                type = EIMAMSG_PersonageCerSuccess;
+            }
+            else if ([dic[@"type"] integerValue] == CustomMsgTypePersonageCerFail)
+            {
+                type = EIMAMSG_PersonageCerFail;
+            }
+            else if ([dic[@"type"] integerValue] == CustomMsgTypeOrganizationCerSuccess)
+            {
+                type = EIMAMSG_OrganizationCerSuccess;
+            }
+            else if ([dic[@"type"] integerValue] == CustomMsgTypeOrganizationCerFail)
+            {
+                type = EIMAMSG_OrganizationCerFail;
+            }
             else {
                 type = EIMAMSG_Unknown;
             }
@@ -66,7 +66,7 @@
 		873B8AEA1B1F5CCA007FD442 /* Main.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = Main.storyboard; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
 		B1B0CD978751C2CCDC120169 /* CNLiveNewIMAManagerKit.podspec */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; name = CNLiveNewIMAManagerKit.podspec; path = ../CNLiveNewIMAManagerKit.podspec; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.ruby; };
 		D8838AF786E7DE0BB63DB209 /* Pods-CNLiveNewIMAManagerKit_Tests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-CNLiveNewIMAManagerKit_Tests.debug.xcconfig"; path = "Target Support Files/Pods-CNLiveNewIMAManagerKit_Tests/Pods-CNLiveNewIMAManagerKit_Tests.debug.xcconfig"; sourceTree = "<group>"; };
-		EC92F43F4F228E3A82D9B9C3 /* LICENSE */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; name = LICENSE; path = ../LICENSE; sourceTree = "<group>"; };
+		EC92F43F4F228E3A82D9B9C3 /* LICENSE */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; path = LICENSE; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 /* Begin PBXFrameworksBuildPhase section */