0.4.3 版本添加维修订单消息状态缓存，添加家园礼包通知

daojian
1 parent 0bd18b30
Showing 30 changed files with 239 additions and 3 deletions
CNLiveNewIMAManagerKit.podspec
CNLiveNewIMAManagerKit/Classes/Playform/IMAConversationManager.m
CNLiveNewIMAManagerKit/Classes/PublicHeader/IMANotification.h
CNLiveNewIMAManagerKit/Classes/TIMFMDBManager/CNAdiminFMDBManager.h → CNLiveNewIMAManagerKit/Classes/TIMManager/CNAdiminFMDBManager.h
CNLiveNewIMAManagerKit/Classes/TIMFMDBManager/CNAdiminFMDBManager.m → CNLiveNewIMAManagerKit/Classes/TIMManager/CNAdiminFMDBManager.m
CNLiveNewIMAManagerKit/Classes/TIMFMDBManager/CNAdiminObject.h → CNLiveNewIMAManagerKit/Classes/TIMManager/CNAdiminObject.h
CNLiveNewIMAManagerKit/Classes/TIMFMDBManager/CNAdiminObject.m → CNLiveNewIMAManagerKit/Classes/TIMManager/CNAdiminObject.m
CNLiveNewIMAManagerKit/Classes/TIMFMDBManager/CNChatGroupMemberInfoCacheManager.h → CNLiveNewIMAManagerKit/Classes/TIMManager/CNChatGroupMemberInfoCacheManager.h
CNLiveNewIMAManagerKit/Classes/TIMFMDBManager/CNChatGroupMemberInfoCacheManager.m → CNLiveNewIMAManagerKit/Classes/TIMManager/CNChatGroupMemberInfoCacheManager.m
CNLiveNewIMAManagerKit/Classes/TIMManager/CNCommuntyOrderStatusCacheManager.h
CNLiveNewIMAManagerKit/Classes/TIMManager/CNCommuntyOrderStatusCacheManager.m
CNLiveNewIMAManagerKit/Classes/TIMFMDBManager/CNGroupIDFMDBManager.h → CNLiveNewIMAManagerKit/Classes/TIMManager/CNGroupIDFMDBManager.h
CNLiveNewIMAManagerKit/Classes/TIMFMDBManager/CNGroupIDFMDBManager.m → CNLiveNewIMAManagerKit/Classes/TIMManager/CNGroupIDFMDBManager.m
CNLiveNewIMAManagerKit/Classes/TIMFMDBManager/CNGroupInfoExtendFMDBManager.h → CNLiveNewIMAManagerKit/Classes/TIMManager/CNGroupInfoExtendFMDBManager.h
CNLiveNewIMAManagerKit/Classes/TIMFMDBManager/CNGroupInfoExtendFMDBManager.m → CNLiveNewIMAManagerKit/Classes/TIMManager/CNGroupInfoExtendFMDBManager.m
CNLiveNewIMAManagerKit/Classes/TIMFMDBManager/CNGroupListAvaterUtil.h → CNLiveNewIMAManagerKit/Classes/TIMManager/CNGroupListAvaterUtil.h
CNLiveNewIMAManagerKit/Classes/TIMFMDBManager/CNGroupListAvaterUtil.m → CNLiveNewIMAManagerKit/Classes/TIMManager/CNGroupListAvaterUtil.m
CNLiveNewIMAManagerKit/Classes/TIMFMDBManager/CNGroupListInfoModel.h → CNLiveNewIMAManagerKit/Classes/TIMManager/CNGroupListInfoModel.h
CNLiveNewIMAManagerKit/Classes/TIMFMDBManager/CNGroupListInfoModel.m → CNLiveNewIMAManagerKit/Classes/TIMManager/CNGroupListInfoModel.m
CNLiveNewIMAManagerKit/Classes/TIMFMDBManager/CNLiveGroupAvatorManager.h → CNLiveNewIMAManagerKit/Classes/TIMManager/CNLiveGroupAvatorManager.h
@@ -8,7 +8,7 @@
 Pod::Spec.new do |s|
   s.name             = 'CNLiveNewIMAManagerKit'
-  s.version          = '0.4.2'
+  s.version          = '0.4.3'
   s.summary          = 'A short description of CNLiveNewIMAManagerKit.'
 #s.description      = <<-DESC
@@ -10,6 +10,7 @@
 #import "CNGroupListInfoModel.h"
 #import "CNGroupListAvaterUtil.h"
 #import "CNUserProfileFMDBManager.h"
+#import "CNCommuntyOrderStatusCacheManager.h"
 @implementation IMAConversationChangedNotifyItem
@@ -1094,6 +1095,54 @@
         [[NSNotificationCenter defaultCenter] postNotificationName:kIMAMSG_ScanPaySuccessNotification object:nil userInfo:dic];
         isBreak = YES;
     }
+    else if ([dic[@"type"] integerValue] == CustomMsgTypeFamilyGift)
+    {
+        //我的家园群收到礼包消息
+        NSString *familyId = dic[@"familyGiftData"][@"familyId"];
+        [[NSNotificationCenter defaultCenter] postNotificationName:kIMAMSG_FamilyGiftNotification object:nil userInfo:@{@"familyId" : familyId ? familyId : @""}];
+
+    }
+    else if ([dic[@"type"] integerValue] == CustomMsgTypCommuntyOrder)
+    {
+    
+        //社区报修订单消息数据
+        NSDictionary *repairOrder = dic[@"repairOrder"];
+        //订单id
+        NSString *orderId = repairOrder[@"id"];
+        //社区报修订单状态  0：未接单 1：已接单，2：已取消 3:已完成
+        NSInteger status = [repairOrder[@"status"] integerValue];
+        
+       NSDictionary *cacheData = [[CNCommuntyOrderStatusCacheManager shareCacheManager] objectForKey:conv.getReceiver];
+        
+        if (cacheData) {
+            //本地有存
+            NSMutableDictionary *mutableCacheData = [[NSMutableDictionary alloc] initWithDictionary:cacheData];
+            
+            ///本地是否存有该订单的状态
+           __block  BOOL cacheHasOrder = NO;
+            
+            [mutableCacheData enumerateKeysAndObjectsUsingBlock:^(NSString *key, NSNumber *obj, BOOL * _Nonnull stop) {
+                if ([key isEqualToString:@"123"]) {
+                    //有.更新状态
+                    [mutableCacheData setValue:@(status) forKey:key];
+                    cacheHasOrder = YES;
+                    *stop = YES;
+                }
+            }];
+            
+            if (!cacheHasOrder) {
+                //没有,保存该订单的状态
+                [mutableCacheData setObject:@(status) forKey:orderId];
+            }
+            
+            [[CNCommuntyOrderStatusCacheManager shareCacheManager] updateObject:mutableCacheData.copy forKey:conv.getReceiver];
+        }
+        else
+        {
+            //本地没有
+            [[CNCommuntyOrderStatusCacheManager shareCacheManager] setObject:@{orderId : @(status)} forKey:conv.getReceiver];
+        }
+    }
     return isBreak;
 }
@@ -174,4 +174,7 @@ static NSString *const kIMAMSG_ScanPaySuccessNotification = @&quot;kIMAMSG_ScanPaySuc
 #pragma mark 收到家园群消息
 static NSString *const kIMAMSG_FamilyNewMessageNotification = @"kIMAMSG_FamilyNewMessageNotification";
+///家园收到礼包消息推送
+static NSString *const kIMAMSG_FamilyGiftNotification = @"kIMAMSG_FamilyGiftNotification";
+
 #endif /* IMANotification_h */
@@ -9,7 +9,7 @@
 #import <Foundation/Foundation.h>
 #import "CNAdiminObject.h"
 NS_ASSUME_NONNULL_BEGIN
-
+/// 群管理员本地数据库管理
 @interface CNAdiminFMDBManager : NSObject
 /**
  创建群管理员 数据库
+//
+//  CNCommuntyOrderStatusCacheManager.h
+//  CNLiveNewIMAManagerKit
+//
+//  Created by daojian on 2022/3/2.
+//
+
+#import <Foundation/Foundation.h>
+
+NS_ASSUME_NONNULL_BEGIN
+/// 社区订单状态缓存管理
+@interface CNCommuntyOrderStatusCacheManager : NSObject
+/// 获取管理类
++ (instancetype)shareCacheManager;
+
+/// 添加
+/// @param object
+/// @{
+/// orderId : orderStatus,
+/// orderId : orderStatus,
+/// orderId : orderStatus,
+/// orderId : orderStatus,
+///}
+/// @param key 社区群id
+- (void)setObject:(NSDictionary *)object forKey:(NSString *)key;
+
+
+/// 获取数据
+/// @param key 社区群id
+- (NSDictionary *)objectForKey:(NSString *)key;
+
+/// 删除
+/// @param key 社区群id
+- (void)deleteForKey:(NSString *)key;
+
+
+/// 更新
+/// @param object
+/// @{
+/// orderId : orderStatus,
+/// orderId : orderStatus,
+/// orderId : orderStatus,
+/// orderId : orderStatus,
+///}
+/// @param key 社区群id
+- (void)updateObject:(NSDictionary *)object forKey:(NSString *)key;
+
+
+/// 查询 社区群 里是否有新订单
+/// @param key 社区id
+- (BOOL)hasNewOrderForKey:(NSString *)key;
+
+@end
+
+NS_ASSUME_NONNULL_END
+//
+//  CNCommuntyOrderStatusCacheManager.m
+//  CNLiveNewIMAManagerKit
+//
+//  Created by daojian on 2022/3/2.
+//
+
+#import "CNCommuntyOrderStatusCacheManager.h"
+
+#import <YYCache/YYCache.h>
+
+@interface CNCommuntyOrderStatusCacheManager()
+
+@property (nonatomic, strong)YYCache *cache;
+
+@end
+
+static NSString *CNCommuntyOrderStatusCacheName = @"CNCommuntyOrderStatusCacheName";
+
+@implementation CNCommuntyOrderStatusCacheManager
+
+/// 获取管理类
++ (instancetype)shareCacheManager
+{
+    static CNCommuntyOrderStatusCacheManager *manager = nil;
+    static dispatch_once_t onceToken;
+    dispatch_once(&onceToken, ^{
+        manager = [[CNCommuntyOrderStatusCacheManager alloc] init];
+    });
+    return manager;
+}
+- (instancetype)init
+{
+    self = [super init];
+    if (self) {
+        NSString *documentFolder = [NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES) firstObject];
+        /**文件名拼接上用户id*/
+        NSString *name = [NSString stringWithFormat:@"%@_%@",CNCommuntyOrderStatusCacheName,CNUserShareModelUid];
+        NSString *path = [documentFolder stringByAppendingPathComponent:name];
+        _cache = [YYCache cacheWithPath:path];
+    }
+    return self;
+}
+/// 添加
+/// @param object
+/// @{
+/// orderId : orderStatus,
+/// orderId : orderStatus,
+/// orderId : orderStatus,
+/// orderId : orderStatus,
+///}
+/// @param key 社区群id
+- (void)setObject:(NSDictionary *)object forKey:(NSString *)key
+{
+    [_cache setObject:object forKey:key];
+}
+
+/// 获取数据
+/// @param key 社区群id
+- (NSDictionary *)objectForKey:(NSString *)key
+{
+    return  (NSDictionary *)[_cache objectForKey:key];
+}
+
+/// 删除
+/// @param key 社区群id
+- (void)deleteForKey:(NSString *)key
+{
+    [_cache removeObjectForKey:key];
+}
+
+
+/// 更新
+/// @param object
+/// @{
+/// orderId : orderStatus,
+/// orderId : orderStatus,
+/// orderId : orderStatus,
+/// orderId : orderStatus,
+///}
+/// @param key 社区群id
+- (void)updateObject:(NSDictionary *)object forKey:(NSString *)key
+{
+    [_cache setObject:object forKey:key];
+}
+
+
+/// 查询 社区群 里是否有新订单
+/// @param key 社区id
+- (BOOL)hasNewOrderForKey:(NSString *)key
+{
+    NSDictionary *data = (NSDictionary *)[_cache objectForKey:key];
+    __block BOOL hasNewOrder = NO;
+    [data enumerateKeysAndObjectsUsingBlock:^(id  _Nonnull key, NSNumber *obj, BOOL * _Nonnull stop) {
+        if ([obj integerValue] == 0) {
+            hasNewOrder = YES;
+            *stop = YES;
+        }
+    }];
+    return hasNewOrder;
+}
+@end
@@ -9,7 +9,7 @@
 #import <Foundation/Foundation.h>
 NS_ASSUME_NONNULL_BEGIN
-
+/// 群id 本地缓存管理
 @interface CNGroupIDFMDBManager : NSObject
 + (instancetype)manager;
@@ -10,6 +10,7 @@
 #import <FMDB/FMDB.h>
 NS_ASSUME_NONNULL_BEGIN
+/// 群扩展信息管理
 @interface CNGroupInfoExtendModel : NSObject
 @property (nonatomic, assign) NSInteger closeNameCard;// 1.不显示群成员昵称 ， 0.默认显示群成员昵称
@@ -9,6 +9,7 @@
 #import "IMAMsg.h"
 #import "CustomElemCmd.h"
+#import "CNCommuntyOrderStatusCacheManager.h"
 @interface IMAMsg ()
@@ -863,6 +864,9 @@
 - (NSAttributedString *)attributeMsgTip {
+    if (self.type == EIMAMSG_Unknown) {
+        return   [[NSMutableAttributedString alloc] initWithString:@"未知消息"];
+    }
     NSMutableAttributedString *muAtt = [[NSMutableAttributedString alloc] initWithAttributedString:[self senderName]];
     [muAtt appendAttributedString:[self lastMsgContent]];
@@ -1165,6 +1169,11 @@
                     nameAtt = [[NSMutableAttributedString alloc] initWithString:@"" attributes:@{NSFontAttributeName : UIFontCNMake(14), NSForegroundColorAttributeName : KGray101Color}];
                 }
+                if (self.type == EIMAMSG_CommuntyOrder) {
+                    nameAtt = [[NSMutableAttributedString alloc] initWithString:@"" attributes:@{NSFontAttributeName : UIFontCNMake(14), NSForegroundColorAttributeName : KGray101Color}];
+
+                }
+                
             }
         }
     }
@@ -1267,6 +1276,18 @@
             [tipAtt addAttribute:NSForegroundColorAttributeName value:[UIColor qmui_colorWithHexString:@"#FC1541"] range:NSMakeRange(0, redTipStr.length)];
         }
     }
+    else if (type == TIM_GROUP)
+    {
+        
+        BOOL isHave = [[CNCommuntyOrderStatusCacheManager shareCacheManager] hasNewOrderForKey:[conv getReceiver]];
+        if (isHave) {
+            //有未处理的社区报修订单
+            NSString *redTipStr = @"[新报修订单]";
+            [tipAtt yy_appendString:redTipStr];
+            [tipAtt addAttribute:NSForegroundColorAttributeName value:[UIColor qmui_colorWithHexString:@"#FC1541"] range:NSMakeRange(0, redTipStr.length)];
+        }
+        
+    }
     return tipAtt;
 }
 - (void)remove
@@ -847,6 +847,11 @@ static NSString *const kGroupTypeKey = @&quot;kGroupTypeKey&quot;;
             }
         }
     }
+    else if (msg.type == EIMAMSG_CommuntyOrder)
+    {
+        NSString *des = @"报修订单";
+        return des;
+    }
     else {
         NSString *des = [NSString stringWithFormat:@"%@", self.desc];
         return des;