共享商品消息添加时间

niudaojian
1 parent 1bce1bbf
Showing 2 changed files with 12 additions and 37 deletions
CNLiveNewIMAManagerKit.podspec
CNLiveNewIMAManagerKit/Classes/TIMModel/Conversation/IMAConversation.m
@@ -8,7 +8,7 @@
  
 Pod::Spec.new do |s|
   s.name             = 'CNLiveNewIMAManagerKit'
-  s.version          = '0.7.6'
+  s.version          = '0.7.7'
   s.summary          = 'A short description of CNLiveNewIMAManagerKit.'
  
 #s.description      = <<-DESC
@@ -241,6 +241,9 @@
                 continue;
             }
  
+            /**自定义消息类型*/
+            NSInteger customMsgType = 0;
+            
             if ([[msg getElem:0] isKindOfClass:[TIMCustomElem class]])
             {
                 //过滤不需要展示的自定义消息
@@ -249,7 +252,8 @@
                 NSDictionary *dic = [NSJSONSerialization JSONObjectWithData:customElem.data
                                                                     options:NSJSONReadingMutableContainers
                                                                       error:&err];
-                if ([[dic objectForKey:@"type"] integerValue] == CustomMsgTypeSenderInvitationReceiver) {
+                customMsgType = [[dic objectForKey:@"type"] integerValue];
+                if (customMsgType == CustomMsgTypeSenderInvitationReceiver) {
                     idx--;
                     continue;
                 }
@@ -272,7 +276,6 @@
  
                 }
  
-    //            IMAMsg *timeMsg = nil;
                 if (temp)
                 {
                     NSDate *lastDate = [temp timestamp];
@@ -281,7 +284,12 @@
                     if (timeinterval > 5 * 60)
                     {
                         // 大于五分钟
-    //                    timeMsg = [IMAMsg msgWithDate:date];
+                        IMAMsg *timeTip = [IMAMsg msgWithDate:date];
+                        [array addObject:timeTip];
+                    }
+                    else if (customMsgType == CustomMsgTypeShareGoodsToHome)
+                    {
+                        //共享商品消息
                         IMAMsg *timeTip = [IMAMsg msgWithDate:date];
                         [array addObject:timeTip];
                     }
@@ -291,40 +299,7 @@
 //            NSLog(@"lastDate  ====  %@",date);
  
             temp = msg;
-//            处理转发消息 出现一条消息转发多次的情况
-////            niu
-//            if (![msgIdArray containsObject:msg.msgId]) {
-//
-//                [msgIdArray addObject:msg.msgId];
-//
-//                IMAMsg *imamsg = [IMAMsg msgWith:msg];
-//                if (imamsg)
-//                {
-//                    if (timeMsg) {
-//                        [array addObject:timeMsg];
-//                    }
-//                    [array addObject:imamsg];
-//                }
-//            }
-//
-//            if ([msgIdArray containsObject:msg.msgId]) {
-//                if (msg.status == TIM_MSG_STATUS_SEND_SUCC) {
-//                    [array enumerateObjectsUsingBlock:^(IMAMsg * _Nonnull message, NSUInteger idx, BOOL * _Nonnull stop) {
-//                        if ([msg.msgId isEqualToString:message.msg.msgId]) {
-//                            [array removeObject:message];
-//                            IMAMsg *imamsg = [IMAMsg msgWith:msg];
-//                            if (imamsg)
-//                            {
-//                                [array insertObject:imamsg atIndex:idx];
-//                            }
-//                        }
-//                    }];
-//                }
-//            }
  
-
-            
-           
             //niu
             IMAMsg *imamsg = [IMAMsg msgWith:msg];
             if (imamsg)