0.3.1 版本

1.YYkit 依赖修改 2.发送新消息通知 3.收到新消息判断是否携带时间消息

0.3.1 版本
1.YYkit 依赖修改 2.发送新消息通知 3.收到新消息判断是否携带时间消息
daojian
1 parent 18c84b08
Showing 11 changed files with 48 additions and 25 deletions
CNLiveNewIMAManagerKit.podspec
CNLiveNewIMAManagerKit/Classes/Playform/IMAConversationManager.m
CNLiveNewIMAManagerKit/Classes/PublicHeader/IMANotification.h
CNLiveNewIMAManagerKit/Classes/TIMCategory/IMAMsg+UITableViewCell.m
CNLiveNewIMAManagerKit/Classes/TIMCategory/TIMElem+ShowAPIs.m
CNLiveNewIMAManagerKit/Classes/TIMFMDBManager/CNGroupListAvaterUtil.h
CNLiveNewIMAManagerKit/Classes/TIMModel/Conversation/IMAConversation.h
CNLiveNewIMAManagerKit/Classes/TIMModel/Conversation/IMAConversation.m
CNLiveNewIMAManagerKit/Classes/TIMModel/MSG/IMAMsg.m
CNLiveNewIMAManagerKit/PCH/CNLiveNewIMAManagerPCH.h
Example/CNLiveNewIMAManagerKit.xcodeproj/project.pbxproj
@@ -8,7 +8,7 @@
 Pod::Spec.new do |s|
   s.name             = 'CNLiveNewIMAManagerKit'
-  s.version          = '0.3.0'
+  s.version          = '0.3.1'
   s.summary          = 'A short description of CNLiveNewIMAManagerKit.'
 #s.description      = <<-DESC
@@ -707,6 +707,8 @@
 {
     NSLog(@"onNewMessage:%@",msgs);
+    [[NSNotificationCenter defaultCenter] postNotificationName:@"kIMAMSG_OnNewMessageNotification" object:msgs];
+
     for (TIMMessage *msg in msgs)
     {
         IMAMsg *imamsg = [IMAMsg msgWith:msg];
@@ -164,5 +164,7 @@ static NSString *const kIMAMSG_PhotoFixSuccessNotification = @&quot;kIMAMSG_PhotoFixS
 #pragma mark 收到商家版申请退款消息通知
 static NSString *const kIMAMSG_ApplyForRefundNotification = @"kIMAMSG_ApplyForRefundNotification";
+#pragma mark 收到IM新消息
+static NSString *const kIMAMSG_OnNewMessageNotification = @"kIMAMSG_OnNewMessageNotification";
 #endif /* IMANotification_h */
@@ -225,7 +225,7 @@ static NSString *const kIMAMsgShowChatAttributedText = @&quot;kIMAMsgShowChatAttribut
 - (NSMutableAttributedString *)attributedStringWithText:(NSString *)text font:(CGFloat)font {
     NSMutableAttributedString *ats = [[NSMutableAttributedString alloc] initWithString:text];
-    ats.font = UIFontCNMake(font);
+    ats.yy_font = UIFontCNMake(font);
     NSMutableParagraphStyle *paragraphStyle = [[NSMutableParagraphStyle alloc] init];
     paragraphStyle.lineBreakMode = NSLineBreakByCharWrapping;
     [ats addAttribute:NSParagraphStyleAttributeName value:paragraphStyle range:NSMakeRange(0, ats.length)];
@@ -310,7 +310,7 @@ static NSString *const kIMAMsgShowChatAttributedText = @&quot;kIMAMsgShowChatAttribut
 - (NSAttributedString *)loadShowChatAttributedText
 {
     NSMutableAttributedString *ats = [[NSMutableAttributedString alloc] init];
-    ats.font = UIFontCNMake(15);//[UIFont systemFontOfSize:15];
+    ats.yy_font = UIFontCNMake(15);//[UIFont systemFontOfSize:15];
     NSInteger loc = 0;
     for (int i = 0; i < self.msg.elemCount; i++)
     {
@@ -943,7 +943,7 @@
 - (NSMutableAttributedString *)attributedStringWithText:(NSString *)text font:(CGFloat)font {
     NSMutableAttributedString *ats = [[NSMutableAttributedString alloc] initWithString:text];
-    ats.font = UIFontCNMake(font);
+    ats.yy_font = UIFontCNMake(font);
     NSMutableParagraphStyle *paragraphStyle = [[NSMutableParagraphStyle alloc] init];
     paragraphStyle.lineBreakMode = NSLineBreakByCharWrapping;
     [ats addAttribute:NSParagraphStyleAttributeName value:paragraphStyle range:NSMakeRange(0, ats.length)];
@@ -8,7 +8,7 @@
 #import <Foundation/Foundation.h>
 #import <CNLiveBaseKit/CNLiveBaseKit.h>
-#import <YYKit/YYKit.h>
+#import <YYCache/YYCache.h>
 typedef enum : NSUInteger {
     CNListAvaterOperationMemberChange,//人数变化
@@ -74,7 +74,10 @@ typedef void (^RemoveMsgBlock)(NSArray *imamsgList, BOOL succ, CommonVoidBlock r
 @property (nonatomic, copy) NSString *strangerIcon;
 ///群头像
-@property (nonatomic, strong)UIImage *groupAvator;
+@property (nonatomic, strong) UIImage *groupAvator;
+
+/// 是否需要创建时间消息，默认为YES
+@property (nonatomic, assign) BOOL isCreateTimeMsg;
 /// 根据腾讯IM的TIMConversation对象进行初始化
 /// @param conv IM 原始会话
@@ -24,7 +24,7 @@
     {
         _conversation = conv;
         _msgList = [[CLSafeMutableArray alloc] init];
-        
+        _isCreateTimeMsg = YES;
     }
     return self;
 }
@@ -949,11 +949,9 @@
 {
     NSMutableArray *array = [NSMutableArray array];
-    IMAMsg *timeTip = [self timeTipOnNewMessage:msg];
-    
-    if (timeTip)
-    {
-        [array addObject:timeTip];
+    if (self.isCreateTimeMsg) {
+        IMAMsg *timeTip = [self timeTipOnNewMessage:msg];
+        if (timeTip)[array addObject:timeTip];
     }
     [array addObject:msg];
@@ -1135,9 +1135,9 @@
             if (![self isWithdrawMsg]) {
                 IMAUser *sender = [self getSender];
                 if (sender) {
-                    [nameAtt appendString:[NSString stringWithFormat:@"%@: ",[sender showTitle]]];
+                    [nameAtt yy_appendString:[NSString stringWithFormat:@"%@: ",[sender showTitle]]];
                 } else {
-                    [nameAtt appendString:[NSString stringWithFormat:@"%@: ",[_msg sender]]];
+                    [nameAtt yy_appendString:[NSString stringWithFormat:@"%@: ",[_msg sender]]];
                 }
                 if ([nameAtt.string hasPrefix:@"admin"]) {
                     //处理 是APP管理员发送的消息
@@ -1174,7 +1174,7 @@
         {
             if ([conv getUnReadMessageNum] > 1)
             {
-                [unReadMsgNumAtt appendString:[NSString stringWithFormat:@"[%d条]",[conv getUnReadMessageNum]]];
+                [unReadMsgNumAtt yy_appendString:[NSString stringWithFormat:@"[%d条]",[conv getUnReadMessageNum]]];
             }
         }
     }
@@ -1189,13 +1189,13 @@
     if (self.type == EIMAMSG_SendGiftSuccess) {
         //送礼填写地址成功 送礼者 红字提醒
         NSString *redTipStr = @"Ta填写礼包地址 ";
-        [tipAtt appendString:redTipStr];
+        [tipAtt yy_appendString:redTipStr];
         [tipAtt addAttribute:NSForegroundColorAttributeName value:[UIColor qmui_colorWithHexString:@"#FC1541"] range:NSMakeRange(0, redTipStr.length)];
     }
     else if (self.type == EIMAMSG_ReceviedGiftSuccess) {
         //送礼填写地址成功 收礼者 红字提醒
         NSString *redTipStr = @"已填写礼包地址 ";
-        [tipAtt appendString:redTipStr];
+        [tipAtt yy_appendString:redTipStr];
         [tipAtt addAttribute:NSForegroundColorAttributeName value:[UIColor qmui_colorWithHexString:@"#FC1541"] range:NSMakeRange(0, redTipStr.length)];
     }
@@ -1228,14 +1228,14 @@
                 redTipStr = @"已收礼 ";
             }
         }
-        [tipAtt appendString:redTipStr];
+        [tipAtt yy_appendString:redTipStr];
         [tipAtt addAttribute:NSForegroundColorAttributeName value:[UIColor qmui_colorWithHexString:@"#FC1541"] range:NSMakeRange(0, redTipStr.length)];
     }
     else if (self.type == EIMAMSG_HaveCoupon && ![_msg isReaded])
     {
         //有未领取的优惠券
         NSString *redTipStr = @"[有红包]";
-        [tipAtt appendString:redTipStr];
+        [tipAtt yy_appendString:redTipStr];
         [tipAtt addAttribute:NSForegroundColorAttributeName value:[UIColor qmui_colorWithHexString:@"#FC1541"] range:NSMakeRange(0, redTipStr.length)];
     }
@@ -1247,7 +1247,7 @@
         NSArray *unreceivedTransferBalanceArray = [[CNTransferBalanceUnreceivedCache cache] objectForKey:[NSString stringWithFormat:@"key_%@_%@",CNUserShareModel.uid,[conv getReceiver]]];
         if (unreceivedTransferBalanceArray && unreceivedTransferBalanceArray.count > 0) {
             NSString *redTipStr = @"[转余额]";
-            [tipAtt appendString:redTipStr];
+            [tipAtt yy_appendString:redTipStr];
             [tipAtt addAttribute:NSForegroundColorAttributeName value:[UIColor qmui_colorWithHexString:@"#FC1541"] range:NSMakeRange(0, redTipStr.length)];
         }
     }
@@ -21,7 +21,9 @@
 #import <CNLiveBusinessTools/CNLiveBusinessTools.h>
 #import <SDWebImage/SDWebImage.h>
 #import <CNLivePhotoBrowser/CNLivePhotoBrowserCache.h>
-#import <YYKit/YYKit.h>
+#import <YYCache/YYCache.h>
+#import <YYCategories/YYCategories.h>
+#import <YYText/YYText.h>
 #import <CNLiveBeeHive/CNLiveBeeHive.h>
 #import <QMUIKit/QMUIKit.h>
 #import <CNLiveRequestBastKit/CNLiveNetworking.h>
@@ -383,8 +383,16 @@
 				"${BUILT_PRODUCTS_DIR}/QMUIKit/QMUIKit.framework",
 				"${BUILT_PRODUCTS_DIR}/SDWebImage/SDWebImage.framework",
 				"${PODS_ROOT}/TXIMSDK_iOS/ImSDK.framework",
-				"${BUILT_PRODUCTS_DIR}/YBImageBrowser_DSCnliveShop/YBImageBrowser_DSCnliveShop.framework",
-				"${BUILT_PRODUCTS_DIR}/YYKit/YYKit.framework",
+				"${BUILT_PRODUCTS_DIR}/YBImageBrowser/YBImageBrowser.framework",
+				"${BUILT_PRODUCTS_DIR}/YYAsyncLayer/YYAsyncLayer.framework",
+				"${BUILT_PRODUCTS_DIR}/YYCache/YYCache.framework",
+				"${BUILT_PRODUCTS_DIR}/YYCategories/YYCategories.framework",
+				"${BUILT_PRODUCTS_DIR}/YYDispatchQueuePool/YYDispatchQueuePool.framework",
+				"${BUILT_PRODUCTS_DIR}/YYImage/YYImage.framework",
+				"${BUILT_PRODUCTS_DIR}/YYKeyboardManager/YYKeyboardManager.framework",
+				"${BUILT_PRODUCTS_DIR}/YYModel/YYModel.framework",
+				"${BUILT_PRODUCTS_DIR}/YYText/YYText.framework",
+				"${BUILT_PRODUCTS_DIR}/YYWebImage/YYWebImage.framework",
 			);
 			name = "[CP] Embed Pods Frameworks";
 			outputPaths = (
@@ -403,8 +411,16 @@
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/QMUIKit.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SDWebImage.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/ImSDK.framework",
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/YBImageBrowser_DSCnliveShop.framework",
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/YYKit.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/YBImageBrowser.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/YYAsyncLayer.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/YYCache.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/YYCategories.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/YYDispatchQueuePool.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/YYImage.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/YYKeyboardManager.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/YYModel.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/YYText.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/YYWebImage.framework",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;