特友卡改造
This commit is contained in:
2
Podfile
2
Podfile
@@ -18,6 +18,8 @@ target 'xplan-ios' do
|
|||||||
pod 'MJExtension'
|
pod 'MJExtension'
|
||||||
#图片加载
|
#图片加载
|
||||||
pod 'SDWebImage'
|
pod 'SDWebImage'
|
||||||
|
pod 'FLAnimatedImage'
|
||||||
|
pod 'SDWebImageFLPlugin' # 对FLAnimatedImage和SDWebImage的桥接
|
||||||
#输入
|
#输入
|
||||||
pod 'SZTextView'
|
pod 'SZTextView'
|
||||||
#轮播图
|
#轮播图
|
||||||
|
@@ -123,7 +123,7 @@
|
|||||||
[self.userInfoView addSubview:self.nickStackView];
|
[self.userInfoView addSubview:self.nickStackView];
|
||||||
[self.userInfoView addSubview:self.idStackView];
|
[self.userInfoView addSubview:self.idStackView];
|
||||||
[self.userInfoView addSubview:self.tagStackView];
|
[self.userInfoView addSubview:self.tagStackView];
|
||||||
[self.userInfoView addSubview:self.clanBtn];
|
|
||||||
|
|
||||||
[self.onlineView addSubview:self.noteView];
|
[self.onlineView addSubview:self.noteView];
|
||||||
|
|
||||||
@@ -137,6 +137,7 @@
|
|||||||
[self.idStackView addArrangedSubview:self.copysIdImageView];
|
[self.idStackView addArrangedSubview:self.copysIdImageView];
|
||||||
|
|
||||||
///用户信息中的标签
|
///用户信息中的标签
|
||||||
|
[self.tagStackView addArrangedSubview:self.clanBtn];
|
||||||
[self.tagStackView addArrangedSubview:self.newUserImageView];
|
[self.tagStackView addArrangedSubview:self.newUserImageView];
|
||||||
[self.tagStackView addArrangedSubview:self.officalImageView];
|
[self.tagStackView addArrangedSubview:self.officalImageView];
|
||||||
[self.tagStackView addArrangedSubview:self.experImageView];
|
[self.tagStackView addArrangedSubview:self.experImageView];
|
||||||
@@ -253,10 +254,8 @@
|
|||||||
}];
|
}];
|
||||||
|
|
||||||
[self.clanBtn mas_makeConstraints:^(MASConstraintMaker *make) {
|
[self.clanBtn mas_makeConstraints:^(MASConstraintMaker *make) {
|
||||||
make.left.mas_equalTo(self.tagStackView.mas_right).offset(8);
|
|
||||||
make.centerY.mas_equalTo(self.tagStackView);
|
|
||||||
make.height.mas_equalTo(22);
|
make.height.mas_equalTo(22);
|
||||||
make.right.mas_lessThanOrEqualTo(-8);
|
|
||||||
}];
|
}];
|
||||||
|
|
||||||
[self.experImageView mas_makeConstraints:^(MASConstraintMaker *make) {
|
[self.experImageView mas_makeConstraints:^(MASConstraintMaker *make) {
|
||||||
@@ -506,7 +505,7 @@
|
|||||||
- (void)setClanDetailInfo:(ClanDetailInfoModel *)clanDetailInfo {
|
- (void)setClanDetailInfo:(ClanDetailInfoModel *)clanDetailInfo {
|
||||||
_clanDetailInfo = clanDetailInfo;
|
_clanDetailInfo = clanDetailInfo;
|
||||||
if (_clanDetailInfo.clan.elderUid) {
|
if (_clanDetailInfo.clan.elderUid) {
|
||||||
[self.clanBtn setTitle:[NSString stringWithFormat:@"%@公会成员",_clanDetailInfo.clan.name] forState:UIControlStateNormal];
|
|
||||||
self.clanBtn.hidden = NO;
|
self.clanBtn.hidden = NO;
|
||||||
}else{
|
}else{
|
||||||
self.clanBtn.hidden = YES;
|
self.clanBtn.hidden = YES;
|
||||||
@@ -832,6 +831,7 @@
|
|||||||
[_clanBtn addTarget:self action:@selector(clanBtnAction) forControlEvents:UIControlEventTouchUpInside];
|
[_clanBtn addTarget:self action:@selector(clanBtnAction) forControlEvents:UIControlEventTouchUpInside];
|
||||||
_clanBtn.imageTitleSpace = 4;
|
_clanBtn.imageTitleSpace = 4;
|
||||||
_clanBtn.hidden = YES;
|
_clanBtn.hidden = YES;
|
||||||
|
[_clanBtn setEnlargeEdgeWithTop:10 right:10 bottom:10 left:10];
|
||||||
}
|
}
|
||||||
return _clanBtn;
|
return _clanBtn;
|
||||||
}
|
}
|
||||||
|
@@ -26,6 +26,8 @@ NS_ASSUME_NONNULL_BEGIN
|
|||||||
@property (nonatomic,assign) NSInteger drawGiftCount;
|
@property (nonatomic,assign) NSInteger drawGiftCount;
|
||||||
///特权卡次数
|
///特权卡次数
|
||||||
@property(nonatomic,copy) NSString *privilegeCount;
|
@property(nonatomic,copy) NSString *privilegeCount;
|
||||||
|
///特权卡
|
||||||
|
@property(nonatomic,copy) NSArray<XPPrivilegeCardItemModel *>* privilegeArray;
|
||||||
///代理
|
///代理
|
||||||
@property (nonatomic,weak) id<XPGiftBarViewDelegate> delegate;
|
@property (nonatomic,weak) id<XPGiftBarViewDelegate> delegate;
|
||||||
///不同的tabbar
|
///不同的tabbar
|
||||||
|
@@ -18,6 +18,7 @@
|
|||||||
///View
|
///View
|
||||||
#import "XPGiftCountCollectionViewCell.h"
|
#import "XPGiftCountCollectionViewCell.h"
|
||||||
#import "XPGiftCountView.h"
|
#import "XPGiftCountView.h"
|
||||||
|
#import "XPPrivilegeCardConfirmView.h"
|
||||||
@interface XPGiftBarView ()<UITextFieldDelegate, XPGiftCountViewDelegate>
|
@interface XPGiftBarView ()<UITextFieldDelegate, XPGiftCountViewDelegate>
|
||||||
|
|
||||||
///充值的背景
|
///充值的背景
|
||||||
@@ -76,6 +77,12 @@
|
|||||||
if (self.type == GiftSegmentType_Graffiti && self.drawGiftCount < 10) {
|
if (self.type == GiftSegmentType_Graffiti && self.drawGiftCount < 10) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
if(self.type == GiftSegmentType_Privilege && self.privilegeArray.count == 0){
|
||||||
|
XPPrivilegeCardConfirmView *confirmView = [[XPPrivilegeCardConfirmView alloc]initInstructionsWithFrame:CGRectMake(0, 0, KScreenWidth, KScreenHeight)];
|
||||||
|
|
||||||
|
[TTPopup popupView:confirmView style:TTPopupStyleAlert];
|
||||||
|
return;
|
||||||
|
}
|
||||||
if (self.delegate && [self.delegate respondsToSelector:@selector(xPGiftBarView:didClickSendGift:)]) {
|
if (self.delegate && [self.delegate respondsToSelector:@selector(xPGiftBarView:didClickSendGift:)]) {
|
||||||
[self.delegate xPGiftBarView:self didClickSendGift:self.giftCountModel];
|
[self.delegate xPGiftBarView:self didClickSendGift:self.giftCountModel];
|
||||||
}
|
}
|
||||||
@@ -343,6 +350,17 @@
|
|||||||
self.privilegeSend.enabled = self.sendPrivileButtonIsEnable;
|
self.privilegeSend.enabled = self.sendPrivileButtonIsEnable;
|
||||||
}];
|
}];
|
||||||
}
|
}
|
||||||
|
-(void)setPrivilegeArray:(NSArray<XPPrivilegeCardItemModel *> *)privilegeArray{
|
||||||
|
_privilegeArray = privilegeArray;
|
||||||
|
if(_privilegeArray.count == 0){
|
||||||
|
[_privilegeSend setTitle:@"说明" forState:UIControlStateNormal];
|
||||||
|
[_privilegeSend setTitle:@"说明" forState:UIControlStateDisabled];
|
||||||
|
self.privilegeSend.enabled = YES;
|
||||||
|
}else{
|
||||||
|
[_privilegeSend setTitle:@"赠送" forState:UIControlStateNormal];
|
||||||
|
[_privilegeSend setTitle:@"赠送中..." forState:UIControlStateDisabled];
|
||||||
|
}
|
||||||
|
}
|
||||||
- (void)setIsShowFirstRecharge:(BOOL)isShowFirstRecharge {
|
- (void)setIsShowFirstRecharge:(BOOL)isShowFirstRecharge {
|
||||||
|
|
||||||
}
|
}
|
||||||
@@ -506,8 +524,8 @@
|
|||||||
- (UIButton *)privilegeSend{
|
- (UIButton *)privilegeSend{
|
||||||
if(!_privilegeSend){
|
if(!_privilegeSend){
|
||||||
_privilegeSend = [UIButton buttonWithType:UIButtonTypeCustom];
|
_privilegeSend = [UIButton buttonWithType:UIButtonTypeCustom];
|
||||||
[_privilegeSend setTitle:@"赠送" forState:UIControlStateNormal];
|
[_privilegeSend setTitle:@"说明" forState:UIControlStateNormal];
|
||||||
[_privilegeSend setTitle:@"赠送中..." forState:UIControlStateDisabled];
|
[_privilegeSend setTitle:@"说明" forState:UIControlStateDisabled];
|
||||||
[_privilegeSend setTitleColor:[ThemeColor disableButtonTextColor] forState:UIControlStateDisabled];
|
[_privilegeSend setTitleColor:[ThemeColor disableButtonTextColor] forState:UIControlStateDisabled];
|
||||||
[_privilegeSend setBackgroundImage:[UIImage gradientColorImageFromColors:@[[ThemeColor confirmButtonGradientStartColor], [ThemeColor confirmButtonGradientEndColor]] gradientType:GradientTypeLeftToRight imgSize:CGSizeMake(10, 10)] forState:UIControlStateNormal];
|
[_privilegeSend setBackgroundImage:[UIImage gradientColorImageFromColors:@[[ThemeColor confirmButtonGradientStartColor], [ThemeColor confirmButtonGradientEndColor]] gradientType:GradientTypeLeftToRight imgSize:CGSizeMake(10, 10)] forState:UIControlStateNormal];
|
||||||
[_privilegeSend setBackgroundImage:[UIImage gradientColorImageFromColors:@[[ThemeColor disableButtonColor], [ThemeColor disableButtonColor]] gradientType:GradientTypeLeftToRight imgSize:CGSizeMake(10, 10)] forState:UIControlStateDisabled];
|
[_privilegeSend setBackgroundImage:[UIImage gradientColorImageFromColors:@[[ThemeColor disableButtonColor], [ThemeColor disableButtonColor]] gradientType:GradientTypeLeftToRight imgSize:CGSizeMake(10, 10)] forState:UIControlStateDisabled];
|
||||||
|
@@ -142,7 +142,7 @@ static NSString *kSendGiftViewHidePunishNewIcon = @"kSendGiftViewHidePunishNewIc
|
|||||||
[self.segmentStackView addArrangedSubview:self.luckyGiftButton];
|
[self.segmentStackView addArrangedSubview:self.luckyGiftButton];
|
||||||
[self.segmentStackView addArrangedSubview:self.weekStarButton];
|
[self.segmentStackView addArrangedSubview:self.weekStarButton];
|
||||||
if(self.roomInfo){
|
if(self.roomInfo){
|
||||||
if(self.roomInfo.hasRoomPrivilegeCard == YES && self.privilegeArray.count > 0){
|
if(self.roomInfo.hasRoomPrivilegeCard == YES){
|
||||||
[self.segmentStackView addArrangedSubview:self.privilegeBtton];
|
[self.segmentStackView addArrangedSubview:self.privilegeBtton];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -160,11 +160,6 @@ static NSString *kSendGiftViewHidePunishNewIcon = @"kSendGiftViewHidePunishNewIc
|
|||||||
[self.nobleGiftButton removeFromSuperview];
|
[self.nobleGiftButton removeFromSuperview];
|
||||||
[self.weekStarButton removeFromSuperview];
|
[self.weekStarButton removeFromSuperview];
|
||||||
[self.anchorButton removeFromSuperview];
|
[self.anchorButton removeFromSuperview];
|
||||||
if(self.roomInfo){
|
|
||||||
if(self.roomInfo.hasRoomPrivilegeCard == YES){
|
|
||||||
[self.privilegeBtton removeFromSuperview];
|
|
||||||
}
|
|
||||||
}
|
|
||||||
[self.segmentStackView addArrangedSubview:self.graffitiButton];
|
[self.segmentStackView addArrangedSubview:self.graffitiButton];
|
||||||
[self.segmentStackView addArrangedSubview:self.punishButton];
|
[self.segmentStackView addArrangedSubview:self.punishButton];
|
||||||
BOOL hiden = [[NSUserDefaults standardUserDefaults] boolForKey:kSendGiftViewHidePunishNewIcon];
|
BOOL hiden = [[NSUserDefaults standardUserDefaults] boolForKey:kSendGiftViewHidePunishNewIcon];
|
||||||
@@ -324,6 +319,9 @@ static NSString *kSendGiftViewHidePunishNewIcon = @"kSendGiftViewHidePunishNewIc
|
|||||||
return CGSizeMake(KScreenWidth, 105 * 2 + 10);
|
return CGSizeMake(KScreenWidth, 105 * 2 + 10);
|
||||||
}
|
}
|
||||||
if (self.segmentType == GiftSegmentType_Privilege) {
|
if (self.segmentType == GiftSegmentType_Privilege) {
|
||||||
|
if(self.datasource.count == 0){
|
||||||
|
return CGSizeMake(KScreenWidth, 105 * 2 + 10);
|
||||||
|
}
|
||||||
return CGSizeMake((KScreenWidth-55)/2,kGetScaleWidth(110));
|
return CGSizeMake((KScreenWidth-55)/2,kGetScaleWidth(110));
|
||||||
}
|
}
|
||||||
CGFloat itemWidth = (CGFloat)(KScreenWidth - 15 * 2 - 5 * 3) / (CGFloat)4;
|
CGFloat itemWidth = (CGFloat)(KScreenWidth - 15 * 2 - 5 * 3) / (CGFloat)4;
|
||||||
@@ -331,29 +329,29 @@ static NSString *kSendGiftViewHidePunishNewIcon = @"kSendGiftViewHidePunishNewIc
|
|||||||
}
|
}
|
||||||
- (UIEdgeInsets)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout*)collectionViewLayout insetForSectionAtIndex:(NSInteger)section{
|
- (UIEdgeInsets)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout*)collectionViewLayout insetForSectionAtIndex:(NSInteger)section{
|
||||||
if (self.segmentType == GiftSegmentType_Privilege) {
|
if (self.segmentType == GiftSegmentType_Privilege) {
|
||||||
return UIEdgeInsetsMake(kGetScaleWidth(0), kGetScaleWidth(18), 0, kGetScaleWidth(18));
|
return self.datasource.count == 0 ? UIEdgeInsetsMake(0, 15, 0, 15): UIEdgeInsetsMake(kGetScaleWidth(0), kGetScaleWidth(18), 0, kGetScaleWidth(18));
|
||||||
}
|
}
|
||||||
|
|
||||||
return UIEdgeInsetsMake(0, 15, 0, 15);
|
return UIEdgeInsetsMake(0, 15, 0, 15);
|
||||||
}
|
}
|
||||||
- (CGFloat)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout*)collectionViewLayout minimumLineSpacingForSectionAtIndex:(NSInteger)section{
|
- (CGFloat)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout*)collectionViewLayout minimumLineSpacingForSectionAtIndex:(NSInteger)section{
|
||||||
if (self.segmentType == GiftSegmentType_Privilege) {
|
if (self.segmentType == GiftSegmentType_Privilege) {
|
||||||
return kGetScaleWidth(10);
|
return self.datasource.count == 0 ? kGetScaleWidth(5): kGetScaleWidth(10);
|
||||||
}
|
}
|
||||||
return 5;
|
return 5;
|
||||||
}
|
}
|
||||||
- (CGFloat)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout*)collectionViewLayout minimumInteritemSpacingForSectionAtIndex:(NSInteger)section{
|
- (CGFloat)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout*)collectionViewLayout minimumInteritemSpacingForSectionAtIndex:(NSInteger)section{
|
||||||
if (self.segmentType == GiftSegmentType_Privilege) {
|
if (self.segmentType == GiftSegmentType_Privilege) {
|
||||||
return kGetScaleWidth(10);
|
return self.datasource.count == 0 ? kGetScaleWidth(5): kGetScaleWidth(10);
|
||||||
}
|
}
|
||||||
return 5;
|
return 5;
|
||||||
}
|
}
|
||||||
- (NSInteger)collectionView:(UICollectionView *)collectionView numberOfItemsInSection:(NSInteger)section {
|
- (NSInteger)collectionView:(UICollectionView *)collectionView numberOfItemsInSection:(NSInteger)section {
|
||||||
if (self.segmentType == GiftSegmentType_Pack && self.datasource.count == 0) {
|
if (self.segmentType == GiftSegmentType_Pack && self.datasource.count == 0) {
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
if (self.segmentType == GiftSegmentType_Privilege) {
|
if (self.segmentType == GiftSegmentType_Privilege) {
|
||||||
return self.privilegeArray.count;
|
return self.datasource.count == 0 ? 1 : self.privilegeArray.count;
|
||||||
}
|
}
|
||||||
if (self.segmentType == GiftSegmentType_WeekStar ) {
|
if (self.segmentType == GiftSegmentType_WeekStar ) {
|
||||||
return 1;
|
return 1;
|
||||||
@@ -369,7 +367,11 @@ static NSString *kSendGiftViewHidePunishNewIcon = @"kSendGiftViewHidePunishNewIc
|
|||||||
return cell;
|
return cell;
|
||||||
}
|
}
|
||||||
if (self.segmentType == GiftSegmentType_Privilege) {
|
if (self.segmentType == GiftSegmentType_Privilege) {
|
||||||
|
if(self.datasource.count == 0){
|
||||||
|
XPGiftEmptyCollectionViewCell * cell = [collectionView dequeueReusableCellWithReuseIdentifier:NSStringFromClass([XPGiftEmptyCollectionViewCell class]) forIndexPath:indexPath];
|
||||||
|
cell.emptyTitle = @"暂时木有特权卡~";
|
||||||
|
return cell;
|
||||||
|
}
|
||||||
XPPrivilegeCardGiftCell * cell = [collectionView dequeueReusableCellWithReuseIdentifier:NSStringFromClass([XPPrivilegeCardGiftCell class]) forIndexPath:indexPath];
|
XPPrivilegeCardGiftCell * cell = [collectionView dequeueReusableCellWithReuseIdentifier:NSStringFromClass([XPPrivilegeCardGiftCell class]) forIndexPath:indexPath];
|
||||||
cell.cardModel = self.privilegeArray[indexPath.row];
|
cell.cardModel = self.privilegeArray[indexPath.row];
|
||||||
return cell;
|
return cell;
|
||||||
@@ -433,12 +435,6 @@ static NSString *kSendGiftViewHidePunishNewIcon = @"kSendGiftViewHidePunishNewIc
|
|||||||
if(_privilegeArray.count > 0){
|
if(_privilegeArray.count > 0){
|
||||||
XPPrivilegeCardItemModel *cardModel = _privilegeArray.firstObject;
|
XPPrivilegeCardItemModel *cardModel = _privilegeArray.firstObject;
|
||||||
cardModel.isSelected = YES;
|
cardModel.isSelected = YES;
|
||||||
}else{
|
|
||||||
if(self.roomInfo){
|
|
||||||
if(self.roomInfo.hasRoomPrivilegeCard == YES){
|
|
||||||
[self.privilegeBtton removeFromSuperview];
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
- (void)setRoomInfo:(RoomInfoModel *)roomInfo{
|
- (void)setRoomInfo:(RoomInfoModel *)roomInfo{
|
||||||
@@ -608,8 +604,47 @@ static NSString *kSendGiftViewHidePunishNewIcon = @"kSendGiftViewHidePunishNewIc
|
|||||||
self.giftGraffitiArray = graffiti;
|
self.giftGraffitiArray = graffiti;
|
||||||
self.anchorArray = anchor;
|
self.anchorArray = anchor;
|
||||||
self.punishArray = punishArray;
|
self.punishArray = punishArray;
|
||||||
|
|
||||||
|
if(_segmentType == GiftSegmentType_Normal){
|
||||||
|
self.lastSelectGift = self.giftArray.count > 0 ? self.giftArray.firstObject : nil;
|
||||||
|
}else if (_segmentType == GiftSegmentType_Lucky) {
|
||||||
|
self.lastSelectGift = self.giftLuckyArray.count > 0 ? self.giftLuckyArray.firstObject : nil;
|
||||||
|
}else if (_segmentType == GiftSegmentType_WeekStar) {
|
||||||
|
self.lastSelectGift = self.giftWeekStarArray.count > 0 ? self.giftWeekStarArray.firstObject : nil;
|
||||||
|
}else if (_segmentType == GiftSegmentType_Noble) {
|
||||||
|
self.lastSelectGift = self.giftNobleArray.count > 0 ? self.giftNobleArray.firstObject : nil;
|
||||||
|
}else if (_segmentType == GiftSegmentType_Graffiti) {
|
||||||
|
self.lastSelectGift = self.giftGraffitiArray.count > 0 ? self.giftGraffitiArray.firstObject : nil;
|
||||||
|
}else if (_segmentType == GiftSegmentType_Anchor) {
|
||||||
|
self.lastSelectGift = self.anchorArray.count > 0 ? self.anchorArray.firstObject : nil;
|
||||||
|
}else if (_segmentType == GiftSegmentType_Punish) {
|
||||||
|
self.lastSelectGift = self.punishArray.count > 0 ? self.punishArray.firstObject : nil;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
if(self.lastSelectGift){
|
if(self.lastSelectGift){
|
||||||
self.defaultSelectGiftId = self.defaultSelectGiftId == nil ? @(self.lastSelectGift.giftId).stringValue : self.defaultSelectGiftId;
|
self.defaultSelectGiftId = self.defaultSelectGiftId == nil ? @(self.lastSelectGift.giftId).stringValue : self.defaultSelectGiftId;
|
||||||
|
}else{
|
||||||
|
|
||||||
|
if(_segmentType == GiftSegmentType_Normal){
|
||||||
|
self.segmentType = GiftSegmentType_Normal;
|
||||||
|
}else if (_segmentType == GiftSegmentType_Lucky) {
|
||||||
|
self.segmentType = GiftSegmentType_Lucky;
|
||||||
|
}else if (_segmentType == GiftSegmentType_WeekStar) {
|
||||||
|
self.segmentType = GiftSegmentType_WeekStar;
|
||||||
|
}else if (_segmentType == GiftSegmentType_Noble) {
|
||||||
|
self.segmentType = GiftSegmentType_Noble;
|
||||||
|
}else if (_segmentType == GiftSegmentType_Graffiti) {
|
||||||
|
self.segmentType = GiftSegmentType_Graffiti;
|
||||||
|
}else if (_segmentType == GiftSegmentType_Anchor) {
|
||||||
|
self.segmentType = GiftSegmentType_Anchor;
|
||||||
|
}else if (_segmentType == GiftSegmentType_Punish) {
|
||||||
|
self.segmentType = GiftSegmentType_Punish;
|
||||||
|
}else{
|
||||||
|
self.segmentType = GiftSegmentType_Normal;
|
||||||
|
}
|
||||||
|
return;
|
||||||
}
|
}
|
||||||
if(_segmentType == GiftSegmentType_Privilege){
|
if(_segmentType == GiftSegmentType_Privilege){
|
||||||
return;
|
return;
|
||||||
|
@@ -565,6 +565,7 @@
|
|||||||
}
|
}
|
||||||
- (void)xPGiftInfoView:(XPGiftInfoView *)view didClickPrivilegeItem:(XPPrivilegeCardItemModel *)cardModel type:(GiftSegmentType)type{
|
- (void)xPGiftInfoView:(XPGiftInfoView *)view didClickPrivilegeItem:(XPPrivilegeCardItemModel *)cardModel type:(GiftSegmentType)type{
|
||||||
self.giftBarView.privilegeCount = cardModel.dailyNum;
|
self.giftBarView.privilegeCount = cardModel.dailyNum;
|
||||||
|
self.giftBarView.privilegeArray = self.giftInfoView.privilegeArray;
|
||||||
self.isHiddenUserView = self.userView.hidden;
|
self.isHiddenUserView = self.userView.hidden;
|
||||||
self.userView.hidden = YES;
|
self.userView.hidden = YES;
|
||||||
}
|
}
|
||||||
|
@@ -16,6 +16,7 @@ NS_ASSUME_NONNULL_BEGIN
|
|||||||
@property(nonatomic,copy) NSString *text;
|
@property(nonatomic,copy) NSString *text;
|
||||||
@property(nonatomic,strong) NSMutableAttributedString *textAtt;
|
@property(nonatomic,strong) NSMutableAttributedString *textAtt;
|
||||||
-(instancetype)initWithFrame:(CGRect)frame WithTitle:(BOOL)is;
|
-(instancetype)initWithFrame:(CGRect)frame WithTitle:(BOOL)is;
|
||||||
|
-(instancetype)initInstructionsWithFrame:(CGRect)frame;
|
||||||
@end
|
@end
|
||||||
|
|
||||||
NS_ASSUME_NONNULL_END
|
NS_ASSUME_NONNULL_END
|
||||||
|
@@ -17,12 +17,22 @@
|
|||||||
@property(nonatomic,assign) BOOL isHaveTitle;
|
@property(nonatomic,assign) BOOL isHaveTitle;
|
||||||
@end
|
@end
|
||||||
@implementation XPPrivilegeCardConfirmView
|
@implementation XPPrivilegeCardConfirmView
|
||||||
|
|
||||||
|
-(instancetype)initInstructionsWithFrame:(CGRect)frame{
|
||||||
|
self = [super initWithFrame:frame];
|
||||||
|
if(self){
|
||||||
|
[self installUIWithTitle];
|
||||||
|
[self installConstraintsWithTitle];
|
||||||
|
}
|
||||||
|
return self;
|
||||||
|
}
|
||||||
|
|
||||||
-(instancetype)initWithFrame:(CGRect)frame WithTitle:(BOOL)is{
|
-(instancetype)initWithFrame:(CGRect)frame WithTitle:(BOOL)is{
|
||||||
self = [super initWithFrame:frame];
|
self = [super initWithFrame:frame];
|
||||||
if(self){
|
if(self){
|
||||||
self.isHaveTitle = is;
|
self.isHaveTitle = is;
|
||||||
[self installUIWithTitle];
|
[self installUIWithInstructions];
|
||||||
[self installConstraintsWithTitle];
|
[self installConstraintsWithInstructions];
|
||||||
}
|
}
|
||||||
return self;
|
return self;
|
||||||
}
|
}
|
||||||
@@ -35,6 +45,43 @@
|
|||||||
}
|
}
|
||||||
return self;
|
return self;
|
||||||
}
|
}
|
||||||
|
-(void)installUIWithInstructions{
|
||||||
|
self.backgroundColor = [UIColor colorWithWhite:0 alpha:0.6];
|
||||||
|
[self addSubview:self.bgView];
|
||||||
|
[self.bgView addSubview:self.titleView];
|
||||||
|
[self.bgView addSubview:self.contentView];
|
||||||
|
|
||||||
|
[self.bgView addSubview:self.verifyBtn];
|
||||||
|
self.titleView.text = @"关于特权卡";
|
||||||
|
self.titleView.font = kFontMedium(16);
|
||||||
|
self.contentView.font = kFontRegular(14);
|
||||||
|
self.contentView.text = @"1. 特权卡是用户在房间内身份的象征,送出特权卡可增加用户之间互动。\n2. 特权卡由房主和房间管理员发放";
|
||||||
|
[self.verifyBtn setTitle:@"知道了" forState:UIControlStateNormal];
|
||||||
|
}
|
||||||
|
-(void)installConstraintsWithInstructions{
|
||||||
|
[self.bgView mas_makeConstraints:^(MASConstraintMaker *make) {
|
||||||
|
make.width.mas_equalTo(kGetScaleWidth(307));
|
||||||
|
make.height.mas_greaterThanOrEqualTo(kGetScaleWidth(223));
|
||||||
|
make.center.equalTo(self);
|
||||||
|
}];
|
||||||
|
[self.titleView mas_makeConstraints:^(MASConstraintMaker *make) {
|
||||||
|
make.top.mas_equalTo(kGetScaleWidth(28));
|
||||||
|
make.centerX.equalTo(self.bgView);
|
||||||
|
}];
|
||||||
|
[self.contentView mas_makeConstraints:^(MASConstraintMaker *make) {
|
||||||
|
make.top.mas_equalTo(kGetScaleWidth(68));
|
||||||
|
make.leading.trailing.equalTo(self.bgView).inset(kGetScaleWidth(10));
|
||||||
|
make.centerX.equalTo(self.bgView);
|
||||||
|
make.bottom.mas_equalTo(-kGetScaleWidth(84));
|
||||||
|
}];
|
||||||
|
|
||||||
|
[self.verifyBtn mas_makeConstraints:^(MASConstraintMaker *make) {
|
||||||
|
make.bottom.mas_equalTo(-kGetScaleWidth(24));
|
||||||
|
make.width.mas_equalTo(kGetScaleWidth(244));
|
||||||
|
make.centerX.equalTo(self.bgView);
|
||||||
|
make.height.mas_equalTo(kGetScaleWidth(40));
|
||||||
|
}];
|
||||||
|
}
|
||||||
-(void)installUIWithTitle{
|
-(void)installUIWithTitle{
|
||||||
self.backgroundColor = [UIColor colorWithWhite:0 alpha:0.6];
|
self.backgroundColor = [UIColor colorWithWhite:0 alpha:0.6];
|
||||||
[self addSubview:self.bgView];
|
[self addSubview:self.bgView];
|
||||||
@@ -75,14 +122,7 @@
|
|||||||
[self.bgView addSubview:self.cancelBtn];
|
[self.bgView addSubview:self.cancelBtn];
|
||||||
[self.bgView addSubview:self.verifyBtn];
|
[self.bgView addSubview:self.verifyBtn];
|
||||||
}
|
}
|
||||||
-(void)setText:(NSString *)text{
|
|
||||||
_text = text;
|
|
||||||
_contentView.text = text;
|
|
||||||
}
|
|
||||||
-(void)setTextAtt:(NSMutableAttributedString *)textAtt{
|
|
||||||
_textAtt = textAtt;
|
|
||||||
_contentView.attributedText = _textAtt;
|
|
||||||
}
|
|
||||||
-(void)installConstraints{
|
-(void)installConstraints{
|
||||||
[self.bgView mas_makeConstraints:^(MASConstraintMaker *make) {
|
[self.bgView mas_makeConstraints:^(MASConstraintMaker *make) {
|
||||||
make.width.mas_equalTo(kGetScaleWidth(307));
|
make.width.mas_equalTo(kGetScaleWidth(307));
|
||||||
@@ -107,6 +147,14 @@
|
|||||||
make.trailing.mas_equalTo(-kGetScaleWidth(24));
|
make.trailing.mas_equalTo(-kGetScaleWidth(24));
|
||||||
}];
|
}];
|
||||||
}
|
}
|
||||||
|
-(void)setText:(NSString *)text{
|
||||||
|
_text = text;
|
||||||
|
_contentView.text = text;
|
||||||
|
}
|
||||||
|
-(void)setTextAtt:(NSMutableAttributedString *)textAtt{
|
||||||
|
_textAtt = textAtt;
|
||||||
|
_contentView.attributedText = _textAtt;
|
||||||
|
}
|
||||||
-(void)cancelAction{
|
-(void)cancelAction{
|
||||||
[TTPopup dismiss];
|
[TTPopup dismiss];
|
||||||
}
|
}
|
||||||
|
@@ -6,12 +6,16 @@
|
|||||||
//
|
//
|
||||||
|
|
||||||
#import "XPPrivilegeCardItemCell.h"
|
#import "XPPrivilegeCardItemCell.h"
|
||||||
|
#import <SDWebImageFLPlugin/SDWebImageFLPlugin.h>
|
||||||
|
|
||||||
@interface XPPrivilegeCardItemCell()
|
@interface XPPrivilegeCardItemCell()
|
||||||
///背景
|
///背景
|
||||||
@property(nonatomic,strong) UIView *bgView;
|
@property(nonatomic,strong) UIView *bgView;
|
||||||
///背景图片
|
///背景图片
|
||||||
@property(nonatomic,strong) NetImageView *bgImageView;
|
@property(nonatomic,strong) NetImageView *bgImageView;
|
||||||
|
|
||||||
|
@property(nonatomic,strong) FLAnimatedImageView *bgGifView;
|
||||||
|
|
||||||
///审核状态背景
|
///审核状态背景
|
||||||
@property(nonatomic,strong) UIImageView *examineView;
|
@property(nonatomic,strong) UIImageView *examineView;
|
||||||
///审核状态
|
///审核状态
|
||||||
@@ -272,6 +276,20 @@
|
|||||||
}
|
}
|
||||||
return _bgImageView;
|
return _bgImageView;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
- (FLAnimatedImageView *)bgGifView{
|
||||||
|
if(!_bgGifView){
|
||||||
|
_bgGifView = [FLAnimatedImageView new];
|
||||||
|
_bgGifView.contentMode = UIViewContentModeScaleAspectFit;
|
||||||
|
_bgGifView.backgroundColor = UIColorFromRGB(0xF8F8FA);
|
||||||
|
_bgGifView.userInteractionEnabled = YES;
|
||||||
|
_bgGifView.layer.cornerRadius = kGetScaleWidth(12);
|
||||||
|
_bgGifView.layer.masksToBounds = YES;
|
||||||
|
_bgGifView.hidden = YES;
|
||||||
|
}
|
||||||
|
return _bgGifView;
|
||||||
|
}
|
||||||
|
|
||||||
- (UIImageView *)examineView{
|
- (UIImageView *)examineView{
|
||||||
if(!_examineView){
|
if(!_examineView){
|
||||||
_examineView = [UIImageView new];
|
_examineView = [UIImageView new];
|
||||||
|
@@ -6,12 +6,14 @@
|
|||||||
//
|
//
|
||||||
|
|
||||||
#import "XPPrivilegeCardProduceFooterView.h"
|
#import "XPPrivilegeCardProduceFooterView.h"
|
||||||
|
#import <SDWebImageFLPlugin/SDWebImageFLPlugin.h>
|
||||||
@interface XPPrivilegeCardProduceFooterView()
|
@interface XPPrivilegeCardProduceFooterView()
|
||||||
|
|
||||||
///标题
|
///标题
|
||||||
@property(nonatomic,strong) UILabel *titleView;
|
@property(nonatomic,strong) UILabel *titleView;
|
||||||
///背景
|
///背景
|
||||||
@property(nonatomic,strong) NetImageView *bgimageVeiw;
|
@property(nonatomic,strong) NetImageView *bgimageVeiw;
|
||||||
|
@property(nonatomic,strong) FLAnimatedImageView *bgGifView;
|
||||||
///取消
|
///取消
|
||||||
@property(nonatomic,strong) UIButton *cancelBtn;
|
@property(nonatomic,strong) UIButton *cancelBtn;
|
||||||
///确认
|
///确认
|
||||||
@@ -35,6 +37,7 @@
|
|||||||
-(void)installUI{
|
-(void)installUI{
|
||||||
[self addSubview:self.titleView];
|
[self addSubview:self.titleView];
|
||||||
[self addSubview:self.bgimageVeiw];
|
[self addSubview:self.bgimageVeiw];
|
||||||
|
[self addSubview:self.bgGifView];
|
||||||
[self.bgimageVeiw addSubview:self.iconView];
|
[self.bgimageVeiw addSubview:self.iconView];
|
||||||
[self.bgimageVeiw addSubview:self.phoneTitleView];
|
[self.bgimageVeiw addSubview:self.phoneTitleView];
|
||||||
[self.bgimageVeiw addSubview:self.delBtn];
|
[self.bgimageVeiw addSubview:self.delBtn];
|
||||||
@@ -52,6 +55,9 @@
|
|||||||
make.height.mas_equalTo(kGetScaleWidth(144));
|
make.height.mas_equalTo(kGetScaleWidth(144));
|
||||||
make.centerX.equalTo(self);
|
make.centerX.equalTo(self);
|
||||||
}];
|
}];
|
||||||
|
[self.bgGifView mas_makeConstraints:^(MASConstraintMaker *make) {
|
||||||
|
make.edges.equalTo(self.bgimageVeiw);
|
||||||
|
}];
|
||||||
[self.delBtn mas_makeConstraints:^(MASConstraintMaker *make) {
|
[self.delBtn mas_makeConstraints:^(MASConstraintMaker *make) {
|
||||||
make.width.height.mas_equalTo(kGetScaleWidth(16));
|
make.width.height.mas_equalTo(kGetScaleWidth(16));
|
||||||
make.top.mas_equalTo(kGetScaleWidth(8));
|
make.top.mas_equalTo(kGetScaleWidth(8));
|
||||||
@@ -135,6 +141,18 @@
|
|||||||
}
|
}
|
||||||
return _bgimageVeiw;
|
return _bgimageVeiw;
|
||||||
}
|
}
|
||||||
|
- (FLAnimatedImageView *)bgGifView{
|
||||||
|
if(!_bgGifView){
|
||||||
|
_bgGifView = [FLAnimatedImageView new];
|
||||||
|
_bgGifView.contentMode = UIViewContentModeScaleAspectFit;
|
||||||
|
_bgGifView.backgroundColor = UIColorFromRGB(0xF8F8FA);
|
||||||
|
_bgGifView.userInteractionEnabled = YES;
|
||||||
|
_bgGifView.layer.cornerRadius = kGetScaleWidth(12);
|
||||||
|
_bgGifView.layer.masksToBounds = YES;
|
||||||
|
_bgGifView.hidden = YES;
|
||||||
|
}
|
||||||
|
return _bgGifView;
|
||||||
|
}
|
||||||
- (UIImageView *)iconView{
|
- (UIImageView *)iconView{
|
||||||
if(!_iconView){
|
if(!_iconView){
|
||||||
_iconView = [UIImageView new];
|
_iconView = [UIImageView new];
|
||||||
|
@@ -18,7 +18,7 @@
|
|||||||
#import <TZImagePickerController/TZImagePickerController.h>
|
#import <TZImagePickerController/TZImagePickerController.h>
|
||||||
#import "XPPrivilegeCardConfirmView.h"
|
#import "XPPrivilegeCardConfirmView.h"
|
||||||
#import "XPPrivilegeCardProtocol.h"
|
#import "XPPrivilegeCardProtocol.h"
|
||||||
|
#import <SDWebImageFLPlugin/SDWebImageFLPlugin.h>
|
||||||
@interface XPPrivilegeCardVC ()<JXCategoryViewDelegate, JXCategoryListContainerViewDelegate,XPPrivilegeCardProduceViewDelegate,TZImagePickerControllerDelegate,XPPrivilegeCardItemVCDelegate>
|
@interface XPPrivilegeCardVC ()<JXCategoryViewDelegate, JXCategoryListContainerViewDelegate,XPPrivilegeCardProduceViewDelegate,TZImagePickerControllerDelegate,XPPrivilegeCardItemVCDelegate>
|
||||||
///分页标题
|
///分页标题
|
||||||
@property (nonatomic, strong) NSArray<NSString *> *titles;
|
@property (nonatomic, strong) NSArray<NSString *> *titles;
|
||||||
@@ -145,6 +145,7 @@
|
|||||||
imagePickerVc.modalPresentationStyle = UIModalPresentationOverFullScreen;
|
imagePickerVc.modalPresentationStyle = UIModalPresentationOverFullScreen;
|
||||||
imagePickerVc.allowPickingVideo = NO;
|
imagePickerVc.allowPickingVideo = NO;
|
||||||
imagePickerVc.allowTakeVideo = NO;
|
imagePickerVc.allowTakeVideo = NO;
|
||||||
|
imagePickerVc.allowPickingGif = YES;
|
||||||
imagePickerVc.maxImagesCount = 1;
|
imagePickerVc.maxImagesCount = 1;
|
||||||
imagePickerVc.naviBgColor = [ThemeColor appCellBackgroundColor];
|
imagePickerVc.naviBgColor = [ThemeColor appCellBackgroundColor];
|
||||||
imagePickerVc.naviTitleColor = [ThemeColor mainTextColor];
|
imagePickerVc.naviTitleColor = [ThemeColor mainTextColor];
|
||||||
|
Reference in New Issue
Block a user