diff --git a/xplan-ios/Assets.xcassets/SessionMessage/SessionListHead/session_list_head_activity.imageset/session_list_head_activity@2x.png b/xplan-ios/Assets.xcassets/SessionMessage/SessionListHead/session_list_head_activity.imageset/session_list_head_activity@2x.png index 78d88635..94c6ee84 100644 Binary files a/xplan-ios/Assets.xcassets/SessionMessage/SessionListHead/session_list_head_activity.imageset/session_list_head_activity@2x.png and b/xplan-ios/Assets.xcassets/SessionMessage/SessionListHead/session_list_head_activity.imageset/session_list_head_activity@2x.png differ diff --git a/xplan-ios/Assets.xcassets/SessionMessage/SessionListHead/session_list_head_activity.imageset/session_list_head_activity@3x.png b/xplan-ios/Assets.xcassets/SessionMessage/SessionListHead/session_list_head_activity.imageset/session_list_head_activity@3x.png index 603ab373..ea897951 100644 Binary files a/xplan-ios/Assets.xcassets/SessionMessage/SessionListHead/session_list_head_activity.imageset/session_list_head_activity@3x.png and b/xplan-ios/Assets.xcassets/SessionMessage/SessionListHead/session_list_head_activity.imageset/session_list_head_activity@3x.png differ diff --git a/xplan-ios/Assets.xcassets/SessionMessage/SessionListHead/session_list_head_friend.imageset/session_list_head_friend@2x.png b/xplan-ios/Assets.xcassets/SessionMessage/SessionListHead/session_list_head_friend.imageset/session_list_head_friend@2x.png index 1905ac4f..507d418a 100644 Binary files a/xplan-ios/Assets.xcassets/SessionMessage/SessionListHead/session_list_head_friend.imageset/session_list_head_friend@2x.png and b/xplan-ios/Assets.xcassets/SessionMessage/SessionListHead/session_list_head_friend.imageset/session_list_head_friend@2x.png differ diff --git a/xplan-ios/Assets.xcassets/SessionMessage/SessionListHead/session_list_head_friend.imageset/session_list_head_friend@3x.png b/xplan-ios/Assets.xcassets/SessionMessage/SessionListHead/session_list_head_friend.imageset/session_list_head_friend@3x.png index f4241ed3..a847e88a 100644 Binary files a/xplan-ios/Assets.xcassets/SessionMessage/SessionListHead/session_list_head_friend.imageset/session_list_head_friend@3x.png and b/xplan-ios/Assets.xcassets/SessionMessage/SessionListHead/session_list_head_friend.imageset/session_list_head_friend@3x.png differ diff --git a/xplan-ios/Assets.xcassets/SessionMessage/SessionListHead/session_list_head_mengxin.imageset/session_list_head_mengxin@2x.png b/xplan-ios/Assets.xcassets/SessionMessage/SessionListHead/session_list_head_mengxin.imageset/session_list_head_mengxin@2x.png index c783e956..733f925b 100644 Binary files a/xplan-ios/Assets.xcassets/SessionMessage/SessionListHead/session_list_head_mengxin.imageset/session_list_head_mengxin@2x.png and b/xplan-ios/Assets.xcassets/SessionMessage/SessionListHead/session_list_head_mengxin.imageset/session_list_head_mengxin@2x.png differ diff --git a/xplan-ios/Assets.xcassets/SessionMessage/SessionListHead/session_list_head_mengxin.imageset/session_list_head_mengxin@3x.png b/xplan-ios/Assets.xcassets/SessionMessage/SessionListHead/session_list_head_mengxin.imageset/session_list_head_mengxin@3x.png index af9d141b..5eedede6 100644 Binary files a/xplan-ios/Assets.xcassets/SessionMessage/SessionListHead/session_list_head_mengxin.imageset/session_list_head_mengxin@3x.png and b/xplan-ios/Assets.xcassets/SessionMessage/SessionListHead/session_list_head_mengxin.imageset/session_list_head_mengxin@3x.png differ diff --git a/xplan-ios/Assets.xcassets/SessionMessage/SessionListHead/session_list_head_office.imageset/session_list_head_office@2x.png b/xplan-ios/Assets.xcassets/SessionMessage/SessionListHead/session_list_head_office.imageset/session_list_head_office@2x.png index 8737c242..730124aa 100644 Binary files a/xplan-ios/Assets.xcassets/SessionMessage/SessionListHead/session_list_head_office.imageset/session_list_head_office@2x.png and b/xplan-ios/Assets.xcassets/SessionMessage/SessionListHead/session_list_head_office.imageset/session_list_head_office@2x.png differ diff --git a/xplan-ios/Assets.xcassets/SessionMessage/SessionListHead/session_list_head_office.imageset/session_list_head_office@3x.png b/xplan-ios/Assets.xcassets/SessionMessage/SessionListHead/session_list_head_office.imageset/session_list_head_office@3x.png index 0a1e349c..358123bd 100644 Binary files a/xplan-ios/Assets.xcassets/SessionMessage/SessionListHead/session_list_head_office.imageset/session_list_head_office@3x.png and b/xplan-ios/Assets.xcassets/SessionMessage/SessionListHead/session_list_head_office.imageset/session_list_head_office@3x.png differ diff --git a/xplan-ios/Assets.xcassets/SessionMessage/SessionListHead/session_list_head_subscribe.imageset/session_list_head_subscribe@2x.png b/xplan-ios/Assets.xcassets/SessionMessage/SessionListHead/session_list_head_subscribe.imageset/session_list_head_subscribe@2x.png index 286bd4a2..72e391c7 100644 Binary files a/xplan-ios/Assets.xcassets/SessionMessage/SessionListHead/session_list_head_subscribe.imageset/session_list_head_subscribe@2x.png and b/xplan-ios/Assets.xcassets/SessionMessage/SessionListHead/session_list_head_subscribe.imageset/session_list_head_subscribe@2x.png differ diff --git a/xplan-ios/Assets.xcassets/SessionMessage/SessionListHead/session_list_head_subscribe.imageset/session_list_head_subscribe@3x.png b/xplan-ios/Assets.xcassets/SessionMessage/SessionListHead/session_list_head_subscribe.imageset/session_list_head_subscribe@3x.png index d5658bc2..1070398f 100644 Binary files a/xplan-ios/Assets.xcassets/SessionMessage/SessionListHead/session_list_head_subscribe.imageset/session_list_head_subscribe@3x.png and b/xplan-ios/Assets.xcassets/SessionMessage/SessionListHead/session_list_head_subscribe.imageset/session_list_head_subscribe@3x.png differ diff --git a/xplan-ios/Main/Message/View/SessionListHeadView/XPSessionListHeadView.m b/xplan-ios/Main/Message/View/SessionListHeadView/XPSessionListHeadView.m index d36457d7..ad70cb48 100644 --- a/xplan-ios/Main/Message/View/SessionListHeadView/XPSessionListHeadView.m +++ b/xplan-ios/Main/Message/View/SessionListHeadView/XPSessionListHeadView.m @@ -29,7 +29,9 @@ NSString * const kMengXinShowReadDotKey = @"kMengXinShowReadDotKey"; ///好友容器 @property (nonatomic, strong) UIView *friendContentView; ///好友派对view -@property (nonatomic, strong) UIImageView *partyView; +@property (nonatomic, strong) UILabel *partyView; +///显示烟花 +@property (nonatomic,strong) UIImageView *fireImageView; ///好友列表 @property (nonatomic, strong) UICollectionView *collectionView; @@ -86,6 +88,7 @@ NSString * const kMengXinShowReadDotKey = @"kMengXinShowReadDotKey"; } [self.friendContentView addSubview:self.collectionView]; [self.friendContentView addSubview:self.partyView]; + [self.friendContentView addSubview:self.fireImageView]; } @@ -96,8 +99,14 @@ NSString * const kMengXinShowReadDotKey = @"kMengXinShowReadDotKey"; [self.partyView mas_makeConstraints:^(MASConstraintMaker *make) { make.left.mas_equalTo(21); make.top.mas_equalTo(12); - make.size.mas_equalTo(CGSizeMake(104, 29)); }]; + + [self.fireImageView mas_makeConstraints:^(MASConstraintMaker *make) { + make.size.mas_equalTo(CGSizeMake(15, 17)); + make.centerY.mas_equalTo(self.partyView); + make.left.mas_equalTo(self.partyView.mas_right).offset(5); + }]; + [self.collectionView mas_makeConstraints:^(MASConstraintMaker *make) { make.left.mas_equalTo(16); make.right.mas_equalTo(-16); @@ -251,7 +260,7 @@ NSString * const kMengXinShowReadDotKey = @"kMengXinShowReadDotKey"; [_collectionView registerClass:[XPSessionListHeadFriendCell class] forCellWithReuseIdentifier:NSStringFromClass([XPSessionListHeadFriendCell class])]; _collectionView.delegate = self; _collectionView.dataSource = self; - _collectionView.backgroundColor = UIColorRGBAlpha(0x5FCCE4, 0.12); + _collectionView.backgroundColor = [UIColor clearColor]; _collectionView.layer.cornerRadius = 8; _collectionView.layer.masksToBounds = YES; _collectionView.showsHorizontalScrollIndicator = NO; @@ -259,12 +268,22 @@ NSString * const kMengXinShowReadDotKey = @"kMengXinShowReadDotKey"; return _collectionView; } -- (UIImageView *)partyView { +- (UILabel *)partyView { if (!_partyView) { - _partyView = [[UIImageView alloc] init]; - _partyView.image = [UIImage imageNamed:@"session_list_head_friend"]; + _partyView = [[UILabel alloc] init]; + _partyView.text = @"好友派对中"; + _partyView.font = [UIFont systemFontOfSize:12]; + _partyView.textColor = [ThemeColor mainTextColor]; } return _partyView; } +- (UIImageView *)fireImageView { + if (!_fireImageView) { + _fireImageView = [[UIImageView alloc] init]; + _fireImageView.userInteractionEnabled = YES; + _fireImageView.image = [UIImage imageNamed:@"session_list_head_friend"]; + } + return _fireImageView; +} @end