Commit 27b1c58222d70bb80e162ae821f8de41d9842346
1 parent
d1b76bda
0.3.9 版本 添加 相册动态 和 家园礼物未领取消息
Showing
5 changed files
with
38 additions
and
3 deletions
CNLiveNewIMAManagerKit.podspec
| @@ -8,7 +8,7 @@ | @@ -8,7 +8,7 @@ | ||
| 8 | 8 | ||
| 9 | Pod::Spec.new do |s| | 9 | Pod::Spec.new do |s| |
| 10 | s.name = 'CNLiveNewIMAManagerKit' | 10 | s.name = 'CNLiveNewIMAManagerKit' |
| 11 | - s.version = '0.3.8' | 11 | + s.version = '0.3.9' |
| 12 | s.summary = 'A short description of CNLiveNewIMAManagerKit.' | 12 | s.summary = 'A short description of CNLiveNewIMAManagerKit.' |
| 13 | 13 | ||
| 14 | #s.description = <<-DESC | 14 | #s.description = <<-DESC |
CNLiveNewIMAManagerKit/Classes/TIMCategory/TIMElem+ShowAPIs.m
| @@ -564,6 +564,14 @@ | @@ -564,6 +564,14 @@ | ||
| 564 | { | 564 | { |
| 565 | return [NSClassFromString(@"CNCommuntyMessageCell") class]; | 565 | return [NSClassFromString(@"CNCommuntyMessageCell") class]; |
| 566 | } | 566 | } |
| 567 | + else if (msg.type == EIMAMSG_PhotoAlbumDynamic) | ||
| 568 | + { | ||
| 569 | + return [NSClassFromString(@"CNPhotoAlbumDynamicMessageCell") class]; | ||
| 570 | + } | ||
| 571 | + else if (msg.type == EIMAMSG_FamilyGift) | ||
| 572 | + { | ||
| 573 | + return [NSClassFromString(@"CNFamilyGiftMessageCell") class]; | ||
| 574 | + } | ||
| 567 | else | 575 | else |
| 568 | { | 576 | { |
| 569 | return [NSClassFromString(@"CNUnknownMsgCell") class]; | 577 | return [NSClassFromString(@"CNUnknownMsgCell") class]; |
| @@ -838,6 +846,16 @@ | @@ -838,6 +846,16 @@ | ||
| 838 | { | 846 | { |
| 839 | return CGSizeMake(width, (260+10)*RATIO); | 847 | return CGSizeMake(width, (260+10)*RATIO); |
| 840 | } | 848 | } |
| 849 | + break; | ||
| 850 | + case EIMAMSG_PhotoAlbumDynamic: | ||
| 851 | + { | ||
| 852 | + return CGSizeMake(width, (220 + 10)*RATIO); | ||
| 853 | + } | ||
| 854 | + break; | ||
| 855 | + case EIMAMSG_FamilyGift: | ||
| 856 | + { | ||
| 857 | + return CGSizeMake(width, (36 +10)*RATIO); | ||
| 858 | + } | ||
| 841 | default: | 859 | default: |
| 842 | break; | 860 | break; |
| 843 | } | 861 | } |
CNLiveNewIMAManagerKit/Classes/TIMModel/MSG/IMAMsg.h
| @@ -105,6 +105,11 @@ typedef NS_ENUM(NSInteger, IMAMSGType) { | @@ -105,6 +105,11 @@ typedef NS_ENUM(NSInteger, IMAMSGType) { | ||
| 105 | #pragma mark 社区 | 105 | #pragma mark 社区 |
| 106 | EIMAMSG_CommunityPaySuccess , //社区支付成功 | 106 | EIMAMSG_CommunityPaySuccess , //社区支付成功 |
| 107 | EIMAMSG_CommuntyOrder , //社区订单消息 | 107 | EIMAMSG_CommuntyOrder , //社区订单消息 |
| 108 | +#pragma mark 我的家园 | ||
| 109 | + ///家园相册动态提醒 | ||
| 110 | + EIMAMSG_PhotoAlbumDynamic , | ||
| 111 | + ///家园礼物未领取 | ||
| 112 | + EIMAMSG_FamilyGift , | ||
| 108 | 113 | ||
| 109 | #pragma mark 电商原生商品详情,电商原生订单详情 | 114 | #pragma mark 电商原生商品详情,电商原生订单详情 |
| 110 | EIMAMSG_ShopGoodsInfo , //电商原生商品详情 | 115 | EIMAMSG_ShopGoodsInfo , //电商原生商品详情 |
| @@ -210,6 +215,11 @@ typedef NS_ENUM(NSUInteger, CustomMsgType) { | @@ -210,6 +215,11 @@ typedef NS_ENUM(NSUInteger, CustomMsgType) { | ||
| 210 | ///社区支付成功 | 215 | ///社区支付成功 |
| 211 | CustomMsgTypeCommunityPaySuccess = 5004, | 216 | CustomMsgTypeCommunityPaySuccess = 5004, |
| 212 | 217 | ||
| 218 | + ///家园相册动态提醒 | ||
| 219 | + CustomMsgTypePhotoAlbumDynamic = 5005, | ||
| 220 | + ///家园礼物未领取 | ||
| 221 | + CustomMsgTypeFamilyGift = 5006, | ||
| 222 | + | ||
| 213 | CustomMsgTypeSendCurrentLocation = 8000, // 发送当前位置 | 223 | CustomMsgTypeSendCurrentLocation = 8000, // 发送当前位置 |
| 214 | 224 | ||
| 215 | // CustomMsgTypeInitiatingSharedLocation = 8001, //发起位置共享 | 225 | // CustomMsgTypeInitiatingSharedLocation = 8001, //发起位置共享 |
CNLiveNewIMAManagerKit/Classes/TIMModel/MSG/IMAMsg.m
| @@ -638,6 +638,14 @@ | @@ -638,6 +638,14 @@ | ||
| 638 | { | 638 | { |
| 639 | type = EIMAMSG_CommuntyOrder; | 639 | type = EIMAMSG_CommuntyOrder; |
| 640 | } | 640 | } |
| 641 | + else if ([dic[@"type"] integerValue] == CustomMsgTypePhotoAlbumDynamic) | ||
| 642 | + { | ||
| 643 | + type = EIMAMSG_PhotoAlbumDynamic; | ||
| 644 | + } | ||
| 645 | + else if ([dic[@"type"] integerValue] == CustomMsgTypeFamilyGift) | ||
| 646 | + { | ||
| 647 | + type = EIMAMSG_FamilyGift; | ||
| 648 | + } | ||
| 641 | else { | 649 | else { |
| 642 | type = EIMAMSG_Unknown; | 650 | type = EIMAMSG_Unknown; |
| 643 | } | 651 | } |
README.md
| @@ -8,6 +8,5 @@ pod lib lint --allow-warnings --no-clean --use-libraries --skip-import-validatio | @@ -8,6 +8,5 @@ pod lib lint --allow-warnings --no-clean --use-libraries --skip-import-validatio | ||
| 8 | pod spec lint --allow-warnings --no-clean --use-libraries --skip-import-validation --sources=http://bj.gitlab.cnlive.com/ios-team/CNLiveRepos.git,https://github.com/CocoaPods/Specs.git,http://bj.gitlab.cnlive.com/DSIOSTeam/DSSpecRepos.git --verbose | 8 | pod spec lint --allow-warnings --no-clean --use-libraries --skip-import-validation --sources=http://bj.gitlab.cnlive.com/ios-team/CNLiveRepos.git,https://github.com/CocoaPods/Specs.git,http://bj.gitlab.cnlive.com/DSIOSTeam/DSSpecRepos.git --verbose |
| 9 | 9 | ||
| 10 | 推送 | 10 | 推送 |
| 11 | -pod repo push CNLiveRepos CNLiveNewIMAManagerKit.podspec --allow-warnings --use-libraries --skip-import-validation --sources=http://bj.gitlab.cnlive.com/ios-team/CNLiveRepos.git,https://github.com/CocoaPods/Specs.git,http://bj.gitlab.cnlive.com/DSIOSTeam/DSSpecRepos.git --verbose | ||
| 12 | - | 11 | +pod repo push CNLiveRepos CNLiveNewIMAManagerKit.podspec --allow-warnings --use-libraries --skip-import-validation --verbose |
| 13 | 12 |