公会流水统计增加送礼人数

xplan-ios/Assets.xcassets/Room/room_background.imageset/Contents.json

@@ -5,7 +5,7 @@
       "scale" : "1x"
     },
     {
-      "filename" : "room_background.png",
+      "filename" : "room_background@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },

xplan-ios/Main/Mine/View/Guild/Model/Income/GuildIncomeRecordModel.h

@@ -28,6 +28,10 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic,copy) NSString * normalGiftIncome;
 ///房间流水
 @property (nonatomic,copy) NSString * bagIncome;
+///新用户送礼人数
+@property (nonatomic, copy) NSString *userSendGiftNum;
+///送礼人数
+@property (nonatomic, copy) NSString *giftUv;
 @end
 
 NS_ASSUME_NONNULL_END

xplan-ios/Main/Mine/View/Guild/Model/Income/GuildIncomeRecordModel.m

@@ -16,5 +16,9 @@
 
 @implementation GuildIncomeRecordUserInfoModel
 
++ (NSDictionary *)replacedKeyFromPropertyName {
+    return @{@"userSendGiftNum": @"newUserSendGiftNum"
+    };
+}
 
 @end

xplan-ios/Main/Mine/View/Guild/View/Cell/Income/XPGuildIncomeRecordTableViewCell.m

@@ -19,8 +19,12 @@
 @interface XPGuildIncomeRecordTableViewCell ()
 ///总的容器
 @property (nonatomic,strong) UIStackView *stackView;
+///右边收入容器
+@property (nonatomic, strong) UIStackView *incomeContentStackView;
 ///收入的容器
 @property (nonatomic,strong) UIStackView *incomStackView;
+///收礼容器
+@property (nonatomic, strong) UIStackView *giftStackView;
 ///排名
 @property (nonatomic,strong) UILabel *rankLabel;
 ///头像的容器
@@ -47,6 +51,18 @@
 @property (nonatomic,strong) UILabel *packGiftLabel;
 ///背包礼物金币
 @property (nonatomic,strong) UILabel *packGiftCoinLabel;
+///送礼人数容器
+@property (nonatomic, strong) UIStackView *sendGiftCountStackView;
+///送礼人数金币
+@property (nonatomic, strong) UILabel *sendGiftCountCoinLabel;
+///送礼人数
+@property (nonatomic, strong) UILabel *sendGiftCountLabel;
+///新用户送礼人数容器
+@property (nonatomic, strong) UIStackView *NewUserGiftCountStackView;
+///新送礼人数金币
+@property (nonatomic, strong) UILabel *NewUserGiftCountCoinLabel;
+///新送礼人数
+@property (nonatomic, strong) UILabel *NewUserGiftCountLabel;
 
 @end
 
@@ -68,11 +84,14 @@
 	
 	[self.stackView addArrangedSubview:self.rankLabel];
 	[self.stackView addArrangedSubview:self.avatarView];
-	[self.stackView addArrangedSubview:self.incomStackView];
+	[self.stackView addArrangedSubview:self.incomeContentStackView];
-
+    
 	[self.avatarView addArrangedSubview:self.avatarImageView];
 	[self.avatarView addArrangedSubview:self.idLabel];
-	
+    
+    [self.incomeContentStackView addArrangedSubview:self.incomStackView];
+    [self.incomeContentStackView addArrangedSubview:self.giftStackView];
+    
 	[self.incomStackView addArrangedSubview:self.roomIncomeStackView];
 	[self.incomStackView addArrangedSubview:self.normalGiftStackView];
 	[self.incomStackView addArrangedSubview:self.packGiftStackView];
@@ -85,6 +104,14 @@
 	
 	[self.packGiftStackView addArrangedSubview:self.packGiftCoinLabel];
 	[self.packGiftStackView addArrangedSubview:self.packGiftLabel];
+    
+    [self.giftStackView addArrangedSubview:self.sendGiftCountStackView];
+    [self.giftStackView addArrangedSubview:self.NewUserGiftCountStackView];
+    
+    [self.sendGiftCountStackView addArrangedSubview:self.sendGiftCountCoinLabel];
+    [self.sendGiftCountStackView addArrangedSubview:self.sendGiftCountLabel];
+    [self.NewUserGiftCountStackView addArrangedSubview:self.NewUserGiftCountCoinLabel];
+    [self.NewUserGiftCountStackView addArrangedSubview:self.NewUserGiftCountLabel];
 }
 
 - (void)initSubViewConstraints {
@@ -101,11 +128,17 @@
 		make.width.mas_equalTo(50);
 		make.height.mas_equalTo(65);
 	}];
-	
+	    
-	[self.incomStackView mas_makeConstraints:^(MASConstraintMaker *make) {
+    [self.incomeContentStackView mas_makeConstraints:^(MASConstraintMaker *make) {
-		make.height.mas_equalTo(50);
+        make.height.mas_equalTo(self.stackView);
-	}];
+    }];
-	
+    
+    [self.incomStackView mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.width.mas_equalTo(self.incomeContentStackView);
+    }];
+    [self.giftStackView mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.width.mas_equalTo(self.incomeContentStackView);
+    }];
 	[self.avatarImageView mas_makeConstraints:^(MASConstraintMaker *make) {
 		make.height.mas_equalTo(50);
 	}];
@@ -125,6 +158,8 @@
 		self.roomIncomeCoinLabel.text = [NSString stringWithFormat:@"+%@", [NSString getDealNumwithstring:_userInfo.roomIncome]];
 		self.normalGiftcoinLabel.text = [NSString stringWithFormat:@"+%@", [NSString getDealNumwithstring:_userInfo.normalGiftIncome]];
 		self.packGiftCoinLabel.text = [NSString stringWithFormat:@"+%@", [NSString getDealNumwithstring:_userInfo.bagIncome]];
+        self.sendGiftCountCoinLabel.text = [NSString stringWithFormat:@"+%@", [NSString getDealNumwithstring:_userInfo.giftUv]];
+        self.NewUserGiftCountCoinLabel.text = [NSString stringWithFormat:@"+%@", [NSString getDealNumwithstring:_userInfo.userSendGiftNum]];
 	}
 }
 
@@ -183,6 +218,30 @@
 	return _idLabel;
 }
 
+- (UIStackView *)incomeContentStackView {
+    if (!_incomeContentStackView) {
+        _incomeContentStackView = [[UIStackView alloc] init];
+        _incomeContentStackView.axis = UILayoutConstraintAxisVertical;
+        _incomeContentStackView.distribution = UIStackViewDistributionFillEqually;
+        _incomeContentStackView.alignment = UIStackViewAlignmentCenter;
+        _incomeContentStackView.spacing = 0;
+    }
+    return _incomeContentStackView;
+}
+
+
+- (UIStackView *)giftStackView {
+    if (!_giftStackView) {
+        _giftStackView = [[UIStackView alloc] init];
+        _giftStackView.axis = UILayoutConstraintAxisHorizontal;
+        _giftStackView.distribution = UIStackViewDistributionFillEqually;
+        _giftStackView.alignment = UIStackViewAlignmentCenter;
+        _giftStackView.spacing = 10;
+    }
+    return _giftStackView;
+}
+
+
 - (UIStackView *)incomStackView {
 	if (!_incomStackView) {
 		_incomStackView = [[UIStackView alloc] init];
@@ -292,4 +351,68 @@
 	return _packGiftCoinLabel;
 }
 
+- (UIStackView *)sendGiftCountStackView {
+    if (!_sendGiftCountStackView) {
+        _sendGiftCountStackView = [[UIStackView alloc] init];
+        _sendGiftCountStackView.axis = UILayoutConstraintAxisVertical;
+        _sendGiftCountStackView.distribution = UIStackViewDistributionFill;
+        _sendGiftCountStackView.alignment = UIStackViewAlignmentFill;
+        _sendGiftCountStackView.spacing = 3;
+    }
+    return _sendGiftCountStackView;
+}
+
+- (UILabel *)sendGiftCountLabel {
+    if (!_sendGiftCountLabel) {
+        _sendGiftCountLabel = [[UILabel alloc] init];
+        _sendGiftCountLabel.text = @"送礼人数";
+        _sendGiftCountLabel.font = [UIFont systemFontOfSize:12];
+        _sendGiftCountLabel.textColor = [ThemeColor mainTextColor];
+        _sendGiftCountLabel.textAlignment = NSTextAlignmentCenter;
+    }
+    return _sendGiftCountLabel;
+}
+
+- (UILabel *)sendGiftCountCoinLabel {
+    if (!_sendGiftCountCoinLabel) {
+        _sendGiftCountCoinLabel = [[UILabel alloc] init];
+        _sendGiftCountCoinLabel.font = [UIFont boldSystemFontOfSize:12];
+        _sendGiftCountCoinLabel.textColor = [ThemeColor secondTextColor];
+        _sendGiftCountCoinLabel.textAlignment = NSTextAlignmentCenter;
+    }
+    return _sendGiftCountCoinLabel;
+}
+
+- (UIStackView *)NewUserGiftCountStackView {
+    if (!_NewUserGiftCountStackView) {
+        _NewUserGiftCountStackView = [[UIStackView alloc] init];
+        _NewUserGiftCountStackView.axis = UILayoutConstraintAxisVertical;
+        _NewUserGiftCountStackView.distribution = UIStackViewDistributionFill;
+        _NewUserGiftCountStackView.alignment = UIStackViewAlignmentFill;
+        _NewUserGiftCountStackView.spacing = 3;
+    }
+    return _NewUserGiftCountStackView;
+}
+
+- (UILabel *)NewUserGiftCountLabel {
+    if (!_NewUserGiftCountLabel) {
+        _NewUserGiftCountLabel = [[UILabel alloc] init];
+        _NewUserGiftCountLabel.text = @"新用户送礼人数";
+        _NewUserGiftCountLabel.font = [UIFont systemFontOfSize:12];
+        _NewUserGiftCountLabel.textColor = [ThemeColor mainTextColor];
+        _NewUserGiftCountLabel.textAlignment = NSTextAlignmentCenter;
+    }
+    return _NewUserGiftCountLabel;
+}
+
+- (UILabel *)NewUserGiftCountCoinLabel {
+    if (!_NewUserGiftCountCoinLabel) {
+        _NewUserGiftCountCoinLabel = [[UILabel alloc] init];
+        _NewUserGiftCountCoinLabel.font = [UIFont boldSystemFontOfSize:12];
+        _NewUserGiftCountCoinLabel.textColor = [ThemeColor secondTextColor];
+        _NewUserGiftCountCoinLabel.textAlignment = NSTextAlignmentCenter;
+    }
+    return _NewUserGiftCountCoinLabel;
+}
+
 @end