云测bug修改

daojian
1 parent 1b803f6b
Showing 4 changed files with 30 additions and 6 deletions
CNLiveNewIMAManagerKit.podspec
CNLiveNewIMAManagerKit/Classes/Playform/IMAContactManager.m
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.1.5'
+  s.version          = '0.1.6'
   s.summary          = 'A short description of CNLiveNewIMAManagerKit.'
  
 # This description is used to generate tags and improve search results.
@@ -248,7 +248,7 @@
         return YES;
     }
     NSInteger index = [self.friendsList indexOfObject:user];
-    if (index >= 0 && index < self.friendsList.count)
+    if (index >= 0 && index < self.friendsList.count && user.blackType == CNFriendsCheckResultTypeFriends)
     {
         return YES;
     }
@@ -950,6 +950,30 @@
                 // 语音消息单独处理xxxx
                 attStr = [[NSMutableAttributedString alloc] initWithString:[elem showDescriptionOf:self] attributes:@{NSFontAttributeName :UIFontCNMake(14), NSForegroundColorAttributeName : [self tipTextColor]}];
             }
+            else if(self.type == EIMAMSG_TransferBalance)
+            {
+                //对转余额消息进行特殊处理
+                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"];
+                /**type  1:待收款， 2：已收款， 3：被退还*/
+                NSString *type = [NSString stringWithFormat:@"%@",transferBalanceData[@"type"]];
+                NSString *fromId = transferBalanceData[@"fromId"];
+                if ([fromId isEqualToString:CNUserShareModel.uid] && ![self.msg isReaded]) {
+                    switch ([type intValue]) {
+                        case 2:
+                        case 3:
+                        {
+                            [attStr addAttribute:NSForegroundColorAttributeName value:[UIColor redColor] range:NSMakeRange(0, 5)];
+                        }
+                            break;
+                        default:
+                            break;
+                    }
+                }
+            }
             else
                 attStr = [[NSMutableAttributedString alloc] initWithString:[elem showDescriptionOf:self] attributes:@{NSFontAttributeName : UIFontCNMake(14), NSForegroundColorAttributeName : KGray101Color}];
  
@@ -799,13 +799,13 @@ static NSString *const kGroupTypeKey = @&quot;kGroupTypeKey&quot;;
                 case 2:
                 {
                     //已收款
-                    return  @"[转余额]对方已收款";
+                    return  @"[转余额]已收余额";
                 }
                     break;
                 case 3:
                 {
                     //已退还
-                    return  @"[转余额]对方已退还";
+                    return  @"[转余额]已退还";
                 }
                     break;
                 default:
@@ -826,14 +826,14 @@ static NSString *const kGroupTypeKey = @&quot;kGroupTypeKey&quot;;
                     else
                     {
                         //未领取
-                        return @"待你领取余额";
+                        return @"请收余额";
                     }
                 }
                     break;
                 case 2:
                 {
                     //已收款
-                    return @"[转余额]已收款";
+                    return @"[转余额]已收余额";
                 }
                     break;
                 case 3: