0.1.3 版本处理会话列表转余额显示逻辑

daojian
1 parent 63303376
Showing 9 changed files with 282 additions and 6 deletions
CNLiveNewIMAManagerKit.podspec
CNLiveNewIMAManagerKit/Classes/Playform/IMAConversationManager.m
CNLiveNewIMAManagerKit/Classes/TIMFMDBManager/CNTransferBalanceUnreceivedCache.h
CNLiveNewIMAManagerKit/Classes/TIMFMDBManager/CNTransferBalanceUnreceivedCache.m
CNLiveNewIMAManagerKit/Classes/TIMFMDBManager/TIMFMDBManager.h
CNLiveNewIMAManagerKit/Classes/TIMModel/MSG/IMAMsg.h
CNLiveNewIMAManagerKit/Classes/TIMModel/MSG/IMAMsg.m
CNLiveNewIMAManagerKit/Classes/TIMShow/TIMElem+ShowDescription.m
Example/CNLiveNewIMAManagerKit/CNLIVEViewController.m
@@ -8,7 +8,7 @@
 Pod::Spec.new do |s|
   s.name             = 'CNLiveNewIMAManagerKit'
-  s.version          = '0.1.2'
+  s.version          = '0.1.3'
   s.summary          = 'A short description of CNLiveNewIMAManagerKit.'
 # This description is used to generate tags and improve search results.
@@ -1002,6 +1002,15 @@
             [[NSNotificationCenter defaultCenter] postNotificationName:kIMAMSG_ReceivingGiftsNotification object:nil userInfo:dic];
         }
     }
+    else if ([dic[@"type"] integerValue] == CustomMsgTypeTransferExpired)
+    {
+        NSDictionary *transferBalanceExpiredData = [dic objectForKey:@"transferBalanceExpiredData"];
+       
+        [[NSNotificationCenter defaultCenter] postNotificationName:@"CNTransferBalanceExpiredSuccessNotification" object:nil userInfo:transferBalanceExpiredData];
+        [[CNTransferBalanceUnreceivedCache cache] removeOneElement:@{@"sourceId" : transferBalanceExpiredData[@"sourceId"]} forKey:[NSString stringWithFormat:@"key_%@_%@",CNUserShareModel.uid,[conv getReceiver]]];
+        isBreak = YES;
+
+    }
     return isBreak;
 }
+//
+//  CNTransferBalanceUnreceivedCache.h
+//  CNLiveNewIMAManagerKit
+//
+//  Created by daojian on 2021/6/11.
+//
+
+#import <Foundation/Foundation.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+/// 缓存未领取的转账数据
+@interface CNTransferBalanceUnreceivedCache : NSObject
+
+/// 获取缓存对象
++ (CNTransferBalanceUnreceivedCache *)cache;
+
+/// 往key对应的数组中添加一个未领取的转账消息数据
+/// @param element 转账消息数据
+/// @param key key 由会话id和用户id拼接而成，例如：key_userId_conversationId
+- (void)addOneElement:(NSDictionary *)element forKey:(NSString *)key;
+
+/// 取出key对应的数据，数据是个数组，数组里存放了具体待领取的转账数据
+/// @param key key 由会话id和用户id拼接而成，例如：key_userId_conversationId
+- (NSArray <NSDictionary *> *)objectForKey:(NSString *)key;
+
+/// 从key对应的数据中移除一个元素，key保存的数据是个数组，数组里放每个具体元素
+/// @param element 需要删除的某个元素
+/// @param key key 由会话id和用户id拼接而成，例如：key_userId_conversationId
+- (void)removeOneElement:(NSDictionary *)element forKey:(NSString *)key;
+
+/// 移除key对应的数据
+/// @param key key 由会话id和用户id拼接而成，例如：key_userId_conversationId
+- (void)removeObject:(NSString *)key;
+
+/// 是否存在 Key对应的数据
+/// @param key key 由会话id和用户id拼接而成，例如：key_userId_conversationId
+- (BOOL)isExistKey:(NSString *)key;
+
+@end
+
+NS_ASSUME_NONNULL_END
+//
+//  CNTransferBalanceUnreceivedCache.m
+//  CNLiveNewIMAManagerKit
+//
+//  Created by daojian on 2021/6/11.
+//
+
+#import "CNTransferBalanceUnreceivedCache.h"
+
+@interface CNTransferBalanceUnreceivedCache()
+
+@property (nonatomic, strong)YYCache *cache;
+
+@end
+
+@implementation CNTransferBalanceUnreceivedCache
+
+static CNTransferBalanceUnreceivedCache *cache = nil;
+
+/// 获取缓存对象
++ (CNTransferBalanceUnreceivedCache *)cache
+{
+    static dispatch_once_t onceToken;
+    dispatch_once(&onceToken, ^{
+        cache = [[CNTransferBalanceUnreceivedCache alloc] init];
+        NSString *filePath = [NSHomeDirectory() stringByAppendingPathComponent:[NSString stringWithFormat:@"Documents/%@/TransferBalanceUnreceivedData", CNUserShareModel.uid]];
+        cache.cache = [YYCache cacheWithPath:filePath];
+    });
+    return cache;
+}
+
+/// 往key对应的数组中添加一个未领取的转账消息数据
+/// @param element 转账消息数据
+/// @param key key 由会话id和用户id拼接而成，例如：key_userId_conversationId
+- (void)addOneElement:(NSDictionary *)element forKey:(NSString *)key
+{
+    if (element == nil) {
+        return;
+    }
+    /**先取出Key对应的数据*/
+    NSArray *allArray = [self objectForKey:key];
+    if (allArray) {
+        for (NSDictionary *dic in allArray) {
+            if ([dic[@"sourceId"] isEqualToString:element[@"sourceId"]])
+            {
+                //存在直接返回
+                return;
+            }
+        }
+      
+    }
+    NSMutableArray *newArry = [NSMutableArray arrayWithArray:allArray];
+    [newArry addObject:element];
+    [self.cache setObject:newArry.copy forKey:key];
+    
+}
+
+/// 取出key对应的数据，数据是个数组，数组里存放了具体待领取的转账数据
+/// @param key key 由会话id和用户id拼接而成，例如：key_userId_conversationId
+- (NSArray <NSDictionary *> *)objectForKey:(NSString *)key
+{
+    return [self.cache objectForKey:key];
+}
+
+/// 从key对应的数据中移除一个元素，key保存的数据是个数组，数组里放每个具体元素
+/// @param element 需要删除的某个元素
+/// @param key key 由会话id和用户id拼接而成，例如：key_userId_conversationId
+- (void)removeOneElement:(NSDictionary *)element forKey:(NSString *)key
+{
+    if (element == nil) {
+        return;
+    }
+    /**先取出Key对应的数据*/
+    NSArray *allArray = [self objectForKey:key];
+    if (!allArray || allArray.count == 0) {
+        return;
+    }
+    NSMutableArray *newArry = [[NSMutableArray alloc] init];
+    for (NSDictionary *dic in allArray) {
+        if (![dic[@"sourceId"] isEqualToString:element[@"sourceId"]]) {
+            [newArry addObject:dic];
+        }
+    }
+    if (newArry.count == 0) {
+        /**数组元素为空，直接把key对应的缓存数据清空*/
+        [self removeObject:key];
+    }
+    else
+    {
+        /**重新缓存key对应的新数据*/
+        [self.cache setObject:newArry.copy forKey:key];
+    }
+    
+}
+
+/// 移除key对应的数据
+/// @param key key 由会话id和用户id拼接而成，例如：key_userId_conversationId
+- (void)removeObject:(NSString *)key
+{
+    [self.cache removeObjectForKey:key];
+}
+
+/// 是否存在 Key对应的数据
+/// @param key key 由会话id和用户id拼接而成，例如：key_userId_conversationId
+- (BOOL)isExistKey:(NSString *)key
+{
+    return [self.cache containsObjectForKey:key];
+}
+
+@end
@@ -15,5 +15,6 @@
 #import "CNGroupIDFMDBManager.h"
 #import "CNGroupListInfoModel.h"
 #import "CNLiveGroupAvatorManager.h"
+#import "CNTransferBalanceUnreceivedCache.h"
 #endif /* TIMFMDBManager_h */
@@ -132,11 +132,12 @@ typedef NS_ENUM(NSUInteger, CustomMsgType) {
     CustomMsgTypeWithdrawMessage        = 1009,         //撤回消息
-    CustomMsgTypeSendCard               = 1011,         //发送名片
+    CustomMsgTypeSendCard               = 1011,         //发送普通好友名片
     CustomMsgTypeTransferBalance        = 1013,         //转余额
     CustomMsgTypeTransferExpired        = 1014,         //转余额过期，无人领取
-    
+    CustomMsgTypeSendDarenCard          = 1015,         //发送达人名片
+
     CustomMsgTypeReceiveE_BusinessOrder = 1021,         //接收到电商订单消息（弃用）
     CustomMsgTypeE_BusinessOrderPaySuceess = 1022,      //电商订单支付成功消息提醒
@@ -531,7 +531,7 @@
 //            {
 //                type = EIMAMSG_SharelocationEndTip;
 //            }
-            else if ([dic[@"type"] integerValue] == CustomMsgTypeSendCard)
+            else if ([dic[@"type"] integerValue] == CustomMsgTypeSendCard || [dic[@"type"] integerValue] == CustomMsgTypeSendDarenCard)
             {
                 type = EIMAMSG_SendCard;
@@ -1140,6 +1140,7 @@
             }
         }
     }
+    
     return unReadMsgNumAtt;
 }
@@ -1204,6 +1205,18 @@
         [tipAtt addAttribute:NSForegroundColorAttributeName value:[UIColor qmui_colorWithHexString:@"#FC1541"] range:NSMakeRange(0, redTipStr.length)];
     }
+    
+    TIMConversation *conv = [_msg getConversation];
+    TIMConversationType type = [conv getType];
+    if (type == TIM_C2C) {
+        /**未领取的转账数据*/
+        NSArray *unreceivedTransferBalanceArray = [[CNTransferBalanceUnreceivedCache cache] objectForKey:[NSString stringWithFormat:@"key_%@_%@",CNUserShareModel.uid,[conv getReceiver]]];
+        if (unreceivedTransferBalanceArray && unreceivedTransferBalanceArray.count > 0) {
+            NSString *redTipStr = @"[转余额]";
+            [tipAtt appendString:redTipStr];
+            [tipAtt addAttribute:NSForegroundColorAttributeName value:[UIColor qmui_colorWithHexString:@"#FC1541"] range:NSMakeRange(0, redTipStr.length)];
+        }
+    }
     return tipAtt;
 }
 - (void)remove
@@ -773,6 +773,80 @@ static NSString *const kGroupTypeKey = @&quot;kGroupTypeKey&quot;;
         }
         return des;
     }
+    else if(msg.type == EIMAMSG_TransferBalance)
+    {
+        NSDictionary *dic = [NSJSONSerialization JSONObjectWithData:self.data options:NSJSONReadingMutableContainers | NSJSONReadingMutableLeaves error:nil];
+        NSDictionary *transferBalanceData = dic[@"transferBalanceData"];
+        NSString *type = [NSString stringWithFormat:@"%@",transferBalanceData[@"type"]];
+        NSString *fromId = transferBalanceData[@"fromId"];
+        if ([fromId isEqualToString:CNUserShareModel.uid]) {
+            //是打款方
+            switch ([type intValue]) {
+                case 1:
+                {
+                    //可能是未领取或者已过期
+                    if ([msg.msg customInt] == 44) {
+                        //已过期
+                        return  @"[转余额]已过期";
+                    }
+                    else
+                    {
+                        //未领取
+                        return @"[转余额]你发起了一笔转余额";
+                    }
+                }
+                    break;
+                case 2:
+                {
+                    //已收款
+                    return  @"[转余额]对方已收款";
+                }
+                    break;
+                case 3:
+                {
+                    //已退还
+                    return  @"[转余额]对方已退还";
+                }
+                    break;
+                default:
+                    break;
+            }
+        }
+        else
+        {
+            //是收款方
+            switch ([type intValue]) {
+                case 1:
+                {
+                    //可能是未领取或者已过期
+                    if ([msg.msg customInt] == 44) {
+                        //已过期
+                        return @"[转余额]已过期";
+                    }
+                    else
+                    {
+                        //未领取
+                        return @"[转余额]待你领取";
+                    }
+                }
+                    break;
+                case 2:
+                {
+                    //已收款
+                    return @"[转余额]已收款";
+                }
+                    break;
+                case 3:
+                {
+                    //已退还
+                    return @"[转余额]已退还";
+                }
+                    break;
+                default:
+                    break;
+            }
+        }
+    }
     else {
         NSString *des = [NSString stringWithFormat:@"%@", self.desc];
         return des;
@@ -7,7 +7,7 @@
 //
 #import "CNLIVEViewController.h"
-
+#import <CNLiveNewIMAManagerKit/CNLiveNewIMAManagerKit.h>
 @interface CNLIVEViewController ()
 @end
@@ -18,6 +18,21 @@
 {
     [super viewDidLoad];
 	// Do any additional setup after loading the view, typically from a nib.
+    
+    UIButton *btn = [UIButton buttonWithType:UIButtonTypeCustom];
+    btn.frame = CGRectMake(0, 50, 100, 50);
+    [btn setTitle:@"存数据" forState:UIControlStateNormal];
+    btn.backgroundColor = [UIColor redColor];
+    [self.view addSubview:btn];
+    [btn addTarget:self action:@selector(setAction) forControlEvents:UIControlEventTouchUpInside];
+
+    
+    UIButton *btn1 = [UIButton buttonWithType:UIButtonTypeCustom];
+    btn1.frame = CGRectMake(0, 150, 100, 50);
+    [btn1 setTitle:@"取数据" forState:UIControlStateNormal];
+    btn1.backgroundColor = [UIColor redColor];
+    [self.view addSubview:btn1];
+    [btn1 addTarget:self action:@selector(getAction) forControlEvents:UIControlEventTouchUpInside];
 }
 - (void)didReceiveMemoryWarning
@@ -25,5 +40,16 @@
     [super didReceiveMemoryWarning];
     // Dispose of any resources that can be recreated.
 }
-
+- (void)setAction
+{
+    [[CNTransferBalanceUnreceivedCache cache] addOneElement:@{@"sourceId": @"1222",
+                                                              @"fromId" : @"1111",
+                                                              @"type"   : @"1",
+    } forKey:@"key1"];
+}
+- (void)getAction
+{
+    NSArray *array = [[CNTransferBalanceUnreceivedCache cache] objectForKey:@"key1"];
+    NSLog(@"array = %@",array);
+}
 @end