添加优惠券消息

daojian
1 parent 8be7a8f5
Showing 6 changed files with 34 additions and 14 deletions
CNLiveNewIMAManagerKit.podspec
CNLiveNewIMAManagerKit/Classes/Playform/IMAConversationManager.m
CNLiveNewIMAManagerKit/Classes/PublicHeader/IMANotification.h
CNLiveNewIMAManagerKit/Classes/TIMCategory/TIMElem+ShowAPIs.m
CNLiveNewIMAManagerKit/Classes/TIMModel/MSG/IMAMsg.h
CNLiveNewIMAManagerKit/Classes/TIMModel/MSG/IMAMsg.m
@@ -8,7 +8,7 @@
  
 Pod::Spec.new do |s|
   s.name             = 'CNLiveNewIMAManagerKit'
-  s.version          = '0.4.9'
+  s.version          = '0.5.0'
   s.summary          = 'A short description of CNLiveNewIMAManagerKit.'
  
 #s.description      = <<-DESC
@@ -1095,7 +1095,7 @@
     }
     else if ([dic[@"type"] integerValue] == CustomMsgTypeScanPaySuccess)
     {
-        //扫码支付成功
+        //扫码支付成功/普通支付成功
         [[NSNotificationCenter defaultCenter] postNotificationName:kIMAMSG_ScanPaySuccessNotification object:nil userInfo:dic];
         isBreak = YES;
     }
@@ -169,7 +169,7 @@ static NSString *const kIMAMSG_OnNewMessageNotification = @&quot;kIMAMSG_OnNewMessage
  
 #pragma mark 社区支付成功
 static NSString *const kIMAMSG_CommunityPaySuccessNotification = @"kIMAMSG_CommunityPaySuccessNotification";
-#pragma mark 扫码支付成功
+#pragma mark 扫码支付成功/普通支付成功
 static NSString *const kIMAMSG_ScanPaySuccessNotification = @"kIMAMSG_ScanPaySuccessNotification";
  
 #pragma mark 收到家园群消息
@@ -572,6 +572,10 @@
     {
         return [NSClassFromString(@"CNFamilyGiftMessageCell") class];
     }
+    else if (msg.type == EIMAMSG_ShareCoupon)
+    {
+        return [NSClassFromString(@"CNMessageBaseCell") class];
+    }
     else
     {
         return [NSClassFromString(@"CNUnknownMsgCell") class];
@@ -873,6 +877,11 @@
         {
             return CGSizeMake(width, (36 +10)*RATIO);
         }
+            break;
+        case EIMAMSG_ShareCoupon:
+        {
+            return CGSizeMake(width, 160);
+        }
         default:
             break;
     }
@@ -111,6 +111,10 @@ typedef NS_ENUM(NSInteger, IMAMSGType) {
     ///家园礼物未领取
     EIMAMSG_FamilyGift            ,
  
+#pragma mark 领取商家优惠券
+    ///领取商家优惠券
+    EIMAMSG_ShareCoupon           ,
+    
 #pragma mark 电商原生商品详情,电商原生订单详情
     EIMAMSG_ShopGoodsInfo         ,    //电商原生商品详情
     EIMAMSG_ShopOrderDetail       ,    //电商原生订单详情
@@ -123,6 +127,7 @@ typedef NS_ENUM(NSInteger, IMAMSGType) {
     EIMAMSG_OrederReminder        ,    //推单
     EIMAMSG_NewOrderRemind        ,    //新订单提醒
  
+    
 };
  
  
@@ -201,17 +206,23 @@ typedef NS_ENUM(NSUInteger, CustomMsgType) {
     CustomMsgTypeUGCLivePlayShare       = 4005,         //UGC直播分享
     CustomMsgTypeUGCLivePlayEnd         = 4006,         //UGC直播结束
     CustomMsgTypeUGCLiveGoodsListUpate  = 4007,         //UGC直播间商品列表发生更新
-    CustomMsgTypeScanCodePay            = 5001,         //扫码支付消息
+
     CustomMsgTypeShareLink              = 6001,        //分享链接
  
     CustomMsgTypeCustomFace             = 7000,        //自定义表情
  
     CustomMsgTypeBlackTip               = 6002,        //被拉黑后，发送消息进行提示
  
-    CustomMsgTypeBlackStatusChange      = 5003,        //添加或者移除黑名单，系统通知
  
-    ///扫码支付成功
+    ///扫码支付消息
+    CustomMsgTypeScanCodePay            = 5001,
+
+    ///扫码支付成功/普通支付成功
     CustomMsgTypeScanPaySuccess         = 5002,
+    
+    ///添加或者移除黑名单，系统通知
+    CustomMsgTypeBlackStatusChange      = 5003,
+
     ///社区支付成功
     CustomMsgTypeCommunityPaySuccess    = 5004,
  
@@ -219,17 +230,13 @@ typedef NS_ENUM(NSUInteger, CustomMsgType) {
     CustomMsgTypePhotoAlbumDynamic      = 5005,
     ///家园礼物未领取
     CustomMsgTypeFamilyGift             = 5006,
-    
     ///家园信息变更消息
     CustomMsgTypeFamilyInfoChange       = 5007,
+    ///领取商家优惠券消息
+    CustomMsgTypeShareCoupon            = 5008,
  
-    CustomMsgTypeSendCurrentLocation    = 8000,         // 发送当前位置
-    
-//    CustomMsgTypeInitiatingSharedLocation      = 8001,        //发起位置共享
-//    CustomMsgTypeCurrentSharedLocation      = 8002,        //共享位置：发送当前位置
-//    CustomMsgTypeSharedLocationEndTip   = 8003,//共享位置结束后发送消息进行提示
-
-
+    /// 发送当前位置
+    CustomMsgTypeSendCurrentLocation    = 8000,
  
 #pragma mark - 音视频
     CustomMsgTypeSenderInvitationReceiver   = 9001,      //发送方向接收方发起音视频邀请
@@ -647,6 +647,10 @@
             {
                 type = EIMAMSG_FamilyGift;
             }
+            else if ([dic[@"type"] integerValue] == CustomMsgTypeShareCoupon)
+            {
+                type = EIMAMSG_ShareCoupon;
+            }
             else {
                 type = EIMAMSG_Unknown;
             }