0.3.0 版本自定义消息数据解析后进行缓存处理

daojian
1 parent 8b9cd574
Showing 5 changed files with 60 additions and 79 deletions
CNLiveNewIMAManagerKit.podspec
CNLiveNewIMAManagerKit/Classes/TIMCategory/TIMElem+ShowAPIs.m
CNLiveNewIMAManagerKit/Classes/TIMModel/MSG/IMAMsg.h
CNLiveNewIMAManagerKit/Classes/TIMModel/MSG/IMAMsg.m
CNLiveNewIMAManagerKit/Classes/TIMShow/TIMElem+ShowDescription.m
@@ -8,7 +8,7 @@
 Pod::Spec.new do |s|
   s.name             = 'CNLiveNewIMAManagerKit'
-  s.version          = '0.2.9'
+  s.version          = '0.3.0'
   s.summary          = 'A short description of CNLiveNewIMAManagerKit.'
 #s.description      = <<-DESC
@@ -648,9 +648,8 @@
             break;
         case EIMAMSG_ShareLink:
         {
-            TIMCustomElem *elem = (TIMCustomElem *)[packMsg.msg getElem:0];
-            NSDictionary *dic = [NSJSONSerialization JSONObjectWithData:elem.data options:NSJSONReadingMutableContainers error:nil];
-            NSDictionary *shareFriendData = [dic objectForKey:@"shareFriendData"];
+            
+            NSDictionary *shareFriendData = [packMsg.customMsgData objectForKey:@"shareFriendData"];
             NSString *titleStr = shareFriendData[@"title"];
             CGSize titleSize = [titleStr boundingRectWithSize:CGSizeMake(241-18-17, MAXFLOAT) options:NSStringDrawingUsesLineFragmentOrigin | NSStringDrawingUsesFontLeading attributes:@{NSFontAttributeName : UIFontCNMake(15)} context:nil].size;
             if (titleSize.height > 36) {
@@ -767,9 +766,8 @@
             break;
         case EIMAMSG_FamilyHealthyStep:
         {
-            TIMCustomElem *customElem = (TIMCustomElem *)[packMsg.msg getElem:0];
-            NSDictionary *dic = [NSJSONSerialization JSONObjectWithData:customElem.data options:NSJSONReadingMutableContainers | NSJSONReadingMutableLeaves error:nil];
-            NSDictionary *familyHealthyStepTotalData = [dic objectForKey:@"familyHealthyStepTotalData"];
+            
+            NSDictionary *familyHealthyStepTotalData = [packMsg.customMsgData objectForKey:@"familyHealthyStepTotalData"];
             NSString *totalStep = [NSString stringWithFormat:@"%@",familyHealthyStepTotalData[@"totalStep"]];
             if ([totalStep integerValue] == 0) {
                 return CGSizeMake(width, 110*RATIO);
@@ -834,10 +832,8 @@
 /// @param packMsg 消息
 - (CGSize)aitMsgInWith:(CGFloat)width atMsg:(IMAMsg *)packMsg
 {
-    TIMCustomElem *customElem = (TIMCustomElem *)[packMsg.msg getElem:0];
-    NSData *data = [customElem data];
-    NSDictionary *dic = [NSJSONSerialization JSONObjectWithData:data options:NSJSONReadingMutableContainers | NSJSONReadingMutableLeaves error:nil];
-    NSDictionary *groupAitDic = [dic objectForKey:@"groupAit"];
+
+    NSDictionary *groupAitDic = [packMsg.customMsgData objectForKey:@"groupAit"];
     //    NSString* content = customElem.desc;
     NSString *content = groupAitDic[@"aitDesc"];
@@ -879,12 +875,8 @@
 /// @param packMsg 消息
 - (CGFloat)orderConfirmMsgHeight:(IMAMsg *)packMsg {
-    TIMCustomElem *elem = (TIMCustomElem *)[packMsg.msg getElem:0];
-    NSError *err;
-    NSDictionary *dic = [NSJSONSerialization JSONObjectWithData:elem.data
-                                                        options:NSJSONReadingMutableContainers
-                                                          error:&err];
-    NSDictionary *orderCheckData = dic[@"orderCheckData"];
+
+    NSDictionary *orderCheckData = packMsg.customMsgData[@"orderCheckData"];
     NSArray *goodsInfo = orderCheckData[@"goodsInfo"];
     CGFloat validWidth = KScreenWidth-28;
@@ -905,12 +897,8 @@
 /// @param packMsg 消息
 - (CGFloat)e_businessOrderPaySuccess:(IMAMsg *)packMsg
 {
-    TIMCustomElem *elem = (TIMCustomElem *)[packMsg.msg getElem:0];
-    NSError *err;
-    NSDictionary *dic = [NSJSONSerialization JSONObjectWithData:elem.data
-                                                        options:NSJSONReadingMutableContainers
-                                                          error:&err];
-    NSDictionary *dataDic = [dic objectForKey:@"payData"];
+   
+    NSDictionary *dataDic = [packMsg.customMsgData objectForKey:@"payData"];
     NSDictionary *orderInfoDic = [dataDic objectForKey:@"orderInfo"];
     if (orderInfoDic) {
         NSArray *goodsInfo = orderInfoDic[@"goodsInfo"];
@@ -933,8 +921,7 @@
         width = max;
     }
-    TIMCustomElem *elem = (TIMCustomElem *)[packMsg.msg getElem:0];
-    NSDictionary *dic  = [NSJSONSerialization JSONObjectWithData:elem.data options:NSJSONReadingMutableContainers    error:nil];;
+    NSDictionary *dic  = packMsg.customMsgData;
     NSString *str1 = [NSString stringWithFormat:@"收货地址: %@",dic[@"orderReceiverInfoData"][@"contactAddress"]];
     NSString *str2 = [NSString stringWithFormat:@"收货人: %@",dic[@"orderReceiverInfoData"][@"contactName"]];
@@ -966,12 +953,7 @@
 /// @param packMsg 消息
 - (CGFloat)orderStatusMsgHeight:(IMAMsg *)packMsg {
-    TIMCustomElem *elem = (TIMCustomElem *)[packMsg.msg getElem:0];
-    NSError *err;
-    NSDictionary *dic = [NSJSONSerialization JSONObjectWithData:elem.data
-                                                        options:NSJSONReadingMutableContainers
-                                                          error:&err];
-    NSString *text = dic[@"alertMsg"];
+    NSString *text = packMsg.customMsgData[@"alertMsg"];
     if ([packMsg isMineMsg] && [text containsString:@"开启了全员禁言"]) {
         text = @"你开启了全员禁言";
     }
@@ -990,12 +972,8 @@
 /// @param packMsg 消息
 - (CGSize)spGroupNewLiveMsgHeight:(IMAMsg *)packMsg
 {
-    TIMCustomElem *elem = (TIMCustomElem *)[packMsg.msg getElem:0];
-    NSError *err;
-    NSDictionary *dic = [NSJSONSerialization JSONObjectWithData:elem.data
-                                                        options:NSJSONReadingMutableContainers
-                                                          error:&err];
-    NSString *text = dic[@"alertMsg"];
+    
+    NSString *text = packMsg.customMsgData[@"alertMsg"];
     CGSize size = [text textSizeIn:CGSizeMake(KScreenWidth-20, HUGE_VAL) font:UIFontCNMake(14)];
     packMsg.showContentSizeInChat = size;
     size.height += 10;
@@ -270,6 +270,9 @@ typedef NS_ENUM(NSInteger, CNVoiceToWordsStatus){
 /// 消息状态
 @property (nonatomic, readonly) NSInteger status;
+/// 自定义消息 json数据解析后的数据
+@property (nonatomic, readonly, strong) NSDictionary *customMsgData;
+
 /// 是否正在播放语音
 @property (nonatomic, assign)   BOOL isPlayingSuond;
@@ -287,11 +290,16 @@ typedef NS_ENUM(NSInteger, CNVoiceToWordsStatus){
 /** -------语音转文字时用的的一些属性--------*/
-@property (nonatomic, assign) BOOL isVoiceToWords;                     //是语音转文字
-@property (nonatomic, strong) IMAMsg *voiceMsg;                        //被转成文字的语音消息
-@property (nonatomic, copy) NSString *voiceText;                       // 语音文字
-@property (nonatomic, assign) CNVoiceToWordsStatus vioceToWordStatus;  //语音转文字状态
-@property (nonatomic, copy) NSString *vioceToWordErrorMsg;             // 语音文字
+/// 是语音转文字
+@property (nonatomic, assign) BOOL isVoiceToWords;
+/// 被转成文字的语音消息
+@property (nonatomic, strong) IMAMsg *voiceMsg;
+/// 语音文字
+@property (nonatomic, copy) NSString *voiceText;
+///语音转文字状态
+@property (nonatomic, assign) CNVoiceToWordsStatus vioceToWordStatus;
+/// 语音文字
+@property (nonatomic, copy) NSString *vioceToWordErrorMsg;
 /// 根据 TIMMessage 生成 IMAMsg 对象
@@ -26,6 +26,21 @@
         _msg = msg;
         _type = type;
         _status = EIMAMsg_Init;
+        
+        TIMElem *elem = [msg getElem:0];
+        
+        /**判断是否是自定义消息*/
+        if ([elem isKindOfClass:[TIMCustomElem class]]) {
+            
+            //解析自定义消息,并把解析后的数据赋值给 _customMsgData
+            TIMCustomElem *cusElem = (TIMCustomElem *)elem;
+            NSError *err;
+            NSDictionary *dic = [NSJSONSerialization JSONObjectWithData:cusElem.data
+                                                                options:NSJSONReadingMutableContainers | NSJSONReadingMutableLeaves
+                                                                  error:&err];
+            
+            _customMsgData = dic;
+        }
     }
     return self;
 }
@@ -520,17 +535,6 @@
             {
                 type = EIMAMSG_SendCurrentlocation;
             }
-//            else if([dic[@"type"] integerValue] == CustomMsgTypeInitiatingSharedLocation)
-//            {
-//                type = EIMAMSG_Sharelocation;
-//            }else if([dic[@"type"] integerValue] == CustomMsgTypeCurrentSharedLocation)
-//            {
-//                type = EIMAMSG_Currentlocation;
-//            }
-//            else if([dic[@"type"] integerValue] == CustomMsgTypeSharedLocationEndTip)
-//            {
-//                type = EIMAMSG_SharelocationEndTip;
-//            }
             else if ([dic[@"type"] integerValue] == CustomMsgTypeSendCard || [dic[@"type"] integerValue] == CustomMsgTypeSendDarenCard)
             {
                 type = EIMAMSG_SendCard;
@@ -955,9 +959,7 @@
                 //对转余额消息进行特殊处理
                 attStr = [[NSMutableAttributedString alloc] initWithString:[elem showDescriptionOf:self] attributes:@{NSFontAttributeName : UIFontCNMake(14), NSForegroundColorAttributeName : KGray101Color}];
                 /**对打款方收到对方已收款或者已退还消息，会话列表对“【转余额】” 文字颜色改为红色*/
-                TIMCustomElem *customElem = (TIMCustomElem *)elem;
-                NSDictionary *dic = [NSJSONSerialization JSONObjectWithData:customElem.data options:NSJSONReadingMutableContainers | NSJSONReadingMutableLeaves error:nil];
-                NSDictionary *transferBalanceData = dic[@"transferBalanceData"];
+                NSDictionary *transferBalanceData = self.customMsgData[@"transferBalanceData"];
                 /**type  1:待收款， 2：已收款， 3：被退还*/
                 NSString *type = [NSString stringWithFormat:@"%@",transferBalanceData[@"type"]];
                 NSString *fromId = transferBalanceData[@"fromId"];
@@ -1046,11 +1048,8 @@
         } else {
             if (self.type == EIMAMSG_AiteStatus && ![_msg isReaded]) {
-                TIMCustomElem *elem = (TIMCustomElem *)[self.msg getElem:0];
-                NSError *err;
-                NSDictionary *dic = [NSJSONSerialization JSONObjectWithData:elem.data
-                                                                    options:NSJSONReadingMutableContainers
-                                                                      error:&err];
+                
+                NSDictionary *dic = self.customMsgData;
                 NSDictionary *groupAitDic = dic[@"groupAit"];
@@ -1203,12 +1202,8 @@
     else if (self.type == EIMAMSG_ShareGift)
     {
         NSString *redTipStr = @"";
-        TIMCustomElem *elem = (TIMCustomElem *)[self.msg getElem:0];
-        NSError *err;
-        NSDictionary *dic = [NSJSONSerialization JSONObjectWithData:elem.data
-                                                            options:NSJSONReadingMutableContainers
-                                                              error:&err];
-        NSDictionary *giftInfoData = dic[@"giftInfoData"];
+
+        NSDictionary *giftInfoData = self.customMsgData[@"giftInfoData"];
         if ([giftInfoData[@"toType"] integerValue] == 1) {
             if (![self isWithdrawMsg]) {
                 //发送礼物
@@ -711,8 +711,8 @@ static NSString *const kGroupTypeKey = @&quot;kGroupTypeKey&quot;;
         if ([NSString isEmpty:self.desc]) {
             //对desc 为空做处理
-            NSDictionary *customDic = [NSJSONSerialization JSONObjectWithData:self.data options:NSJSONReadingMutableContainers | NSJSONReadingMutableLeaves error:nil];
-            NSDictionary *groupAit = customDic[@"groupAit"];
+            
+            NSDictionary *groupAit = msg.customMsgData[@"groupAit"];
             NSString *des = [NSString stringWithFormat:@"%@", groupAit[@"aitDesc"]];
             return des;
         }
@@ -733,8 +733,8 @@ static NSString *const kGroupTypeKey = @&quot;kGroupTypeKey&quot;;
     else if (msg.type == EIMAMSG_SendCard)
     {
         NSString *des = @"";
-        NSDictionary *customDic = [NSJSONSerialization JSONObjectWithData:self.data options:NSJSONReadingMutableContainers | NSJSONReadingMutableLeaves error:nil];
-        NSDictionary *businessCardDataDic = [customDic objectForKey:@"businessCardData"];
+        
+        NSDictionary *businessCardDataDic = [msg.customMsgData objectForKey:@"businessCardData"];
         if ([msg isMineMsg]) {
             des = [NSString stringWithFormat:@"你推荐了%@",businessCardDataDic[@"name"]];
         }
@@ -744,21 +744,21 @@ static NSString *const kGroupTypeKey = @&quot;kGroupTypeKey&quot;;
     }
     else if (msg.type == EIMAMSG_ShareGift)
     {
-        NSDictionary *dic = [NSJSONSerialization JSONObjectWithData:self.data options:NSJSONReadingMutableContainers | NSJSONReadingMutableLeaves error:nil];
-        NSDictionary *giftInfoData =  dic[@"giftInfoData"];
+       
+        NSDictionary *giftInfoData =  msg.customMsgData[@"giftInfoData"];
         NSString *des = giftInfoData[@"goodsTitle"];
         return des;
     }
     else if (msg.type == EIMAMSG_SendGiftSuccess)
     {
-        NSDictionary *dic = [NSJSONSerialization JSONObjectWithData:self.data options:NSJSONReadingMutableContainers | NSJSONReadingMutableLeaves error:nil];
-        NSString *des = dic[@"alertMsg"];
+        
+        NSString *des = msg.customMsgData[@"alertMsg"];
         return des;
     }
     else if (msg.type == EIMAMSG_ReceviedGiftSuccess)
     {
-        NSDictionary *dic = [NSJSONSerialization JSONObjectWithData:self.data options:NSJSONReadingMutableContainers | NSJSONReadingMutableLeaves error:nil];
-        NSString *des = dic[@"alertMsg"];
+        
+        NSString *des = msg.customMsgData[@"alertMsg"];
         return des;
     }
     else if (msg.type == EIMAMSG_OrderStatus)
@@ -775,8 +775,8 @@ static NSString *const kGroupTypeKey = @&quot;kGroupTypeKey&quot;;
     }
     else if(msg.type == EIMAMSG_TransferBalance)
     {
-        NSDictionary *dic = [NSJSONSerialization JSONObjectWithData:self.data options:NSJSONReadingMutableContainers | NSJSONReadingMutableLeaves error:nil];
-        NSDictionary *transferBalanceData = dic[@"transferBalanceData"];
+       
+        NSDictionary *transferBalanceData = msg.customMsgData[@"transferBalanceData"];
         NSString *type = [NSString stringWithFormat:@"%@",transferBalanceData[@"type"]];
         NSString *fromId = transferBalanceData[@"fromId"];
         if ([fromId isEqualToString:CNUserShareModel.uid]) {