0.1.2 版本添加转余额消息，和转余额过期消息通知

daojian
1 parent 30498db1
Showing 5 changed files with 39 additions and 4 deletions
CNLiveNewIMAManagerKit.podspec
CNLiveNewIMAManagerKit/Classes/Playform/IMAContactManager.m
CNLiveNewIMAManagerKit/Classes/TIMCategory/TIMElem+ShowAPIs.m
CNLiveNewIMAManagerKit/Classes/TIMModel/MSG/IMAMsg.h
CNLiveNewIMAManagerKit/Classes/TIMModel/MSG/IMAMsg.m
@@ -8,7 +8,7 @@
  
 Pod::Spec.new do |s|
   s.name             = 'CNLiveNewIMAManagerKit'
-  s.version          = '0.1.1'
+  s.version          = '0.1.2'
   s.summary          = 'A short description of CNLiveNewIMAManagerKit.'
  
 # This description is used to generate tags and improve search results.
@@ -244,9 +244,15 @@
 - (BOOL)isMyFriend:(IMAUser *)user
 {
     // 检查通讯录中是否含有些人
-    IMAUser *u = [self isContainUser:user];
-    
-    return u != nil;
+    if ([user.userId isEqualToString:[IMAPlatform sharedInstance].host.userId]) {
+        return YES;
+    }
+    NSInteger index = [self.friendsList indexOfObject:user];
+    if (index >= 0 && index < self.friendsList.count)
+    {
+        return YES;
+    }
+    return NO;
 }
 - (void)addContactChangedObserver:(id)observer handler:(SEL)selector forEvent:(NSUInteger)eventID
 {
@@ -497,6 +497,10 @@
     {
         return [NSClassFromString(@"CNCardMessageTableViewCell") class];
     }
+    else if (msg.type == EIMAMSG_TransferBalance)
+    {
+        return [NSClassFromString(@"CNTransferBalanceCell") class];
+    }
     else if(msg.type == EIMAMSG_VoiceWords)
     {
         return [NSClassFromString(@"CNVoiceToWordsTableViewCell") class];
@@ -666,6 +670,14 @@
             return CGSizeMake(width, 90*RATIO);
         }
             break;
+        case EIMAMSG_TransferBalance:
+        {
+            if (packMsg.isGroupMsg && ![packMsg isMineMsg]) {
+                return CGSizeMake(width, 110*RATIO);
+            }
+            return CGSizeMake(width, 95*RATIO);
+        }
+            break;
         case EIMAMSG_ShareGoods:
         {
             if (packMsg.isGroupMsg && ![packMsg isMineMsg])
@@ -87,6 +87,10 @@ typedef NS_ENUM(NSInteger, IMAMSGType) {
     EIMAMSG_ShareGift ,                             //分享礼物
     EIMAMSG_SendGiftSuccess  ,                      //送礼成功
     EIMAMSG_ReceviedGiftSuccess ,                  //收礼成功
+#pragma mark 转余额相关消息
+    EIMAMSG_TransferBalance,                       //转余额
+    EIMAMSG_TransferExpired,                       //转余额过期无人领取消息
+    
 #pragma mark 话题新消息提醒
     EIMAMSG_TopicTip  ,                            //话题提醒
 #pragma mark 特群有新的直播
@@ -130,6 +134,9 @@ typedef NS_ENUM(NSUInteger, CustomMsgType) {
  
     CustomMsgTypeSendCard               = 1011,         //发送名片
  
+    CustomMsgTypeTransferBalance        = 1013,         //转余额
+    CustomMsgTypeTransferExpired        = 1014,         //转余额过期，无人领取
+    
     CustomMsgTypeReceiveE_BusinessOrder = 1021,         //接收到电商订单消息（弃用）
     CustomMsgTypeE_BusinessOrderPaySuceess = 1022,      //电商订单支付成功消息提醒
  
@@ -536,6 +536,16 @@
                 type = EIMAMSG_SendCard;
  
             }
+            else if ([dic[@"type"] integerValue] == CustomMsgTypeTransferBalance)
+            {
+                type = EIMAMSG_TransferBalance;
+
+            }
+            else if ([dic[@"type"] integerValue] == CustomMsgTypeTransferExpired)
+            {
+                type = EIMAMSG_TransferExpired;
+
+            }
             else if ([dic[@"type"] integerValue] == CustomMsgTypeShareGoods)
             {
                 type = EIMAMSG_ShareGoods;