This commit is contained in:
liyuhua
2023-10-20 17:06:15 +08:00
parent 6a12a669cb
commit eb3021e72d
48 changed files with 1232 additions and 310 deletions

View File

@@ -290,6 +290,9 @@
238B37DC2AC55A2C00BFC9D5 /* XPTreasureFairyBallView.m in Sources */ = {isa = PBXBuildFile; fileRef = 238B37942AC55A2C00BFC9D5 /* XPTreasureFairyBallView.m */; };
238B37DD2AC55A2C00BFC9D5 /* XPTreasureFairyStoreView.m in Sources */ = {isa = PBXBuildFile; fileRef = 238B379A2AC55A2C00BFC9D5 /* XPTreasureFairyStoreView.m */; };
238B37DE2AC55A2C00BFC9D5 /* Api+TreasureFairy.m in Sources */ = {isa = PBXBuildFile; fileRef = 238B37A12AC55A2C00BFC9D5 /* Api+TreasureFairy.m */; };
239141C62AE129F700322CA9 /* PIInputScrollingView.m in Sources */ = {isa = PBXBuildFile; fileRef = 239141C52AE129F700322CA9 /* PIInputScrollingView.m */; };
239141C92AE1358F00322CA9 /* PIInputEntireServerScrollingView.m in Sources */ = {isa = PBXBuildFile; fileRef = 239141C82AE1358F00322CA9 /* PIInputEntireServerScrollingView.m */; };
239141CC2AE267EF00322CA9 /* PIReceiveRedPacketSuccessView.m in Sources */ = {isa = PBXBuildFile; fileRef = 239141CB2AE267EF00322CA9 /* PIReceiveRedPacketSuccessView.m */; };
23942E912A86424500D0ECC2 /* XPLoginAuthCodeVC.m in Sources */ = {isa = PBXBuildFile; fileRef = 23942E902A86424500D0ECC2 /* XPLoginAuthCodeVC.m */; };
239BEEDB2AA1E058005CDA94 /* PIHoemCategoryTitleView.m in Sources */ = {isa = PBXBuildFile; fileRef = 239BEEDA2AA1E058005CDA94 /* PIHoemCategoryTitleView.m */; };
23A439742AA1CF7C002E6039 /* XPNewHomeHeadView.m in Sources */ = {isa = PBXBuildFile; fileRef = 23A439732AA1CF7C002E6039 /* XPNewHomeHeadView.m */; };
@@ -2003,6 +2006,12 @@
238B379F2AC55A2C00BFC9D5 /* XPTreasureFairyViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPTreasureFairyViewController.h; sourceTree = "<group>"; };
238B37A12AC55A2C00BFC9D5 /* Api+TreasureFairy.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "Api+TreasureFairy.m"; sourceTree = "<group>"; };
238B37A22AC55A2C00BFC9D5 /* Api+TreasureFairy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "Api+TreasureFairy.h"; sourceTree = "<group>"; };
239141C42AE129F700322CA9 /* PIInputScrollingView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PIInputScrollingView.h; sourceTree = "<group>"; };
239141C52AE129F700322CA9 /* PIInputScrollingView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PIInputScrollingView.m; sourceTree = "<group>"; };
239141C72AE1358F00322CA9 /* PIInputEntireServerScrollingView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PIInputEntireServerScrollingView.h; sourceTree = "<group>"; };
239141C82AE1358F00322CA9 /* PIInputEntireServerScrollingView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PIInputEntireServerScrollingView.m; sourceTree = "<group>"; };
239141CA2AE267EF00322CA9 /* PIReceiveRedPacketSuccessView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PIReceiveRedPacketSuccessView.h; sourceTree = "<group>"; };
239141CB2AE267EF00322CA9 /* PIReceiveRedPacketSuccessView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PIReceiveRedPacketSuccessView.m; sourceTree = "<group>"; };
23942E8F2A86424500D0ECC2 /* XPLoginAuthCodeVC.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPLoginAuthCodeVC.h; sourceTree = "<group>"; };
23942E902A86424500D0ECC2 /* XPLoginAuthCodeVC.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPLoginAuthCodeVC.m; sourceTree = "<group>"; };
239BEED92AA1E058005CDA94 /* PIHoemCategoryTitleView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PIHoemCategoryTitleView.h; sourceTree = "<group>"; };
@@ -5825,6 +5834,10 @@
9B42869B28C1FD3D009034D2 /* XPOpenRedPacketCell.m */,
23D321DA2ADFBFF6006B259C /* PIInputRedPacketView.h */,
23D321DB2ADFBFF6006B259C /* PIInputRedPacketView.m */,
239141C42AE129F700322CA9 /* PIInputScrollingView.h */,
239141C52AE129F700322CA9 /* PIInputScrollingView.m */,
239141C72AE1358F00322CA9 /* PIInputEntireServerScrollingView.h */,
239141C82AE1358F00322CA9 /* PIInputEntireServerScrollingView.m */,
23D321DD2ADFCEB2006B259C /* PIRedPacketChooseTypeView.h */,
23D321DE2ADFCEB2006B259C /* PIRedPacketChooseTypeView.m */,
23D321E02ADFD0FB006B259C /* PIRedPacketChooseTypeCell.h */,
@@ -5982,6 +5995,8 @@
9BA812E328BF70A600783EA7 /* XPRoomRedPacketPwdView.m */,
9B42868C28C1AE2D009034D2 /* XPReceiveRedPacketView.h */,
9B42868D28C1AE2D009034D2 /* XPReceiveRedPacketView.m */,
239141CA2AE267EF00322CA9 /* PIReceiveRedPacketSuccessView.h */,
239141CB2AE267EF00322CA9 /* PIReceiveRedPacketSuccessView.m */,
);
path = SendRedPacket;
sourceTree = "<group>";
@@ -10842,6 +10857,7 @@
238B37DB2AC55A2C00BFC9D5 /* PITreasureFairyBuyElfShardSuccessView.m in Sources */,
9B734F73288A787000CBDAA9 /* XPMineAccountView.m in Sources */,
14B880E1299A1799005FCA1B /* XPLoginViewController.m in Sources */,
239141C92AE1358F00322CA9 /* PIInputEntireServerScrollingView.m in Sources */,
E8AA6EF227DF1E97009B4C2B /* XPRoomTopicPresenter.m in Sources */,
9BF4BEBC28D4182E009CF6C2 /* XPOpenRedPacketModel.m in Sources */,
E89DCF5D2900E5EE001647EC /* WishGiftHistoryModel.m in Sources */,
@@ -10874,6 +10890,7 @@
E85E7B062A4EB0D200B6D00A /* XPGuildSearchPresenter.m in Sources */,
E8788945273A55C200BF1D57 /* XPGiftInfoView.m in Sources */,
9BF5192628801D4700B6BE92 /* XPAcrossRoomPKCountDownView.m in Sources */,
239141CC2AE267EF00322CA9 /* PIReceiveRedPacketSuccessView.m in Sources */,
23D321DC2ADFBFF6006B259C /* PIInputRedPacketView.m in Sources */,
23E9E99E2A80C7AF00B792F2 /* XPMineGuildPersonalBillRecordItemView.m in Sources */,
E87DF4F52A42CC49009C1185 /* HomeMenuInfoModel.m in Sources */,
@@ -11290,6 +11307,7 @@
E880B3AF278BE1D800A83B0D /* Api+AcrossRoomPK.m in Sources */,
238B37DC2AC55A2C00BFC9D5 /* XPTreasureFairyBallView.m in Sources */,
E8B9842D28AB77F10022D026 /* XPMonentsPublishTopicView.m in Sources */,
239141C62AE129F700322CA9 /* PIInputScrollingView.m in Sources */,
E88C72992828F3620047FB2B /* XPRoomMusicLibraryTableViewCell.m in Sources */,
9BD798B129262434003E03E6 /* XPSessionListHeadView.m in Sources */,
E8D34D4728080295009C4835 /* XPMineUserDataViewController.m in Sources */,

View File

@@ -31,7 +31,7 @@
</Testables>
</TestAction>
<LaunchAction
buildConfiguration = "Release"
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
launchStyle = "0"

View File

@@ -5,12 +5,12 @@
"scale" : "1x"
},
{
"filename" : "pi_red_packet_top_diamond_icon@2x.png",
"filename" : "pi_red_packet_entrance@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "pi_red_packet_top_diamond_icon@3x.png",
"filename" : "pi_red_packet_entrance@3x.png",
"idiom" : "universal",
"scale" : "3x"
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.4 KiB

View File

@@ -0,0 +1,22 @@
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "pi_red_packet_receive_bg@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "pi_red_packet_receive_bg@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 82 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 180 KiB

View File

@@ -0,0 +1,22 @@
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "pi_red_packet_receive_colse@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "pi_red_packet_receive_colse@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 750 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 KiB

View File

@@ -0,0 +1,22 @@
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "pi_red_packet_receive_open@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "pi_red_packet_receive_open@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 12 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 24 KiB

View File

@@ -0,0 +1,22 @@
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "pi_red_packet_receive_rob@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "pi_red_packet_receive_rob@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 767 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 KiB

View File

@@ -0,0 +1,22 @@
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "pi_red_packet_receive_success_bg@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "pi_red_packet_receive_success_bg@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 74 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 161 KiB

View File

@@ -0,0 +1,22 @@
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "pi_red_packet_send@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "pi_red_packet_send@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 13 KiB

View File

@@ -0,0 +1,22 @@
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "pi_red_packet_top_diamond_add@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "pi_red_packet_top_diamond_add@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}

View File

@@ -119,7 +119,7 @@
XPRoomMoreItemModel * redPacket = [[XPRoomMoreItemModel alloc] init];
redPacket.title = YMLocalizedString(@"XPMoreMenuPresenter24");
redPacket.imageName = @"redPacket_entrance";
redPacket.imageName = @"pi_red_packet_entrance";
redPacket.type = RoomMoreMenuType_Room_redPacket;
redPacket.titleColor = [DJDKMIMOMColor roomMoreMenuTextColor];
@@ -188,9 +188,7 @@
[array addObject:trumpet];
[array addObject:giftEffect];
}
if ([ClientConfig shareConfig].configInfo.redEnvelopeConfig.open && roomInfo.redEnvelopeOpen) {
[array addObject:redPacket];
}
} else {
[array addObject:giftEffect];
}
@@ -205,6 +203,9 @@
[array addObject:report];
if(roomInfo.hasRoomAlbum == YES){
[array insertObject:roomPhotoAlbum atIndex:1];
}
if ([ClientConfig shareConfig].configInfo.redEnvelopeConfig.open && roomInfo.redEnvelopeOpen) {
[array insertObject:redPacket atIndex:1];
}
[[self getView] getMoreMenuDataSuccess:array];
}];

View File

@@ -39,6 +39,7 @@
#import "XPRoomTrumpetViewController.h"
#import "XPWebViewController.h"
#import "PIRoomPhotoAlbumVC.h"
#import "PIRoomSendRedPacketVC.h"
///P
#import "XPMoreMenuPresenter.h"
#import "XPMoreMenuProtocol.h"
@@ -466,7 +467,7 @@ UIKIT_EXTERN NSString * const kRoomGiftEffectUpdateNotificationKey;
{
[StatisticsServiceHelper trackEventWithKey:StatisticsServiceEventroom_more_tool_click eventAttributes:@{@"roomMoreMenuType" : @"redPacket"}];
[self dismissViewControllerAnimated:YES completion:nil];
XPRoomSendRedPacketViewController *sendRedPacketVC = [[XPRoomSendRedPacketViewController alloc] initWithDelegate:self.hostDelegate];
PIRoomSendRedPacketVC *sendRedPacketVC = [[PIRoomSendRedPacketVC alloc] initWithDelegate:self.hostDelegate];
sendRedPacketVC.roomUid = roomUid;
sendRedPacketVC.modalPresentationStyle = UIModalPresentationOverFullScreen;
BaseNavigationController *nav = [[BaseNavigationController alloc] initWithRootViewController:sendRedPacketVC];

View File

@@ -0,0 +1,16 @@
//
// PIInputEntireServerScrollingView.h
// YuMi
//
// Created by duoban on 2023/10/19.
//
#import <UIKit/UIKit.h>
NS_ASSUME_NONNULL_BEGIN
@interface PIInputEntireServerScrollingView : UIView
@end
NS_ASSUME_NONNULL_END

View File

@@ -0,0 +1,60 @@
//
// PIInputEntireServerScrollingView.m
// YuMi
//
// Created by duoban on 2023/10/19.
//
#import "PIInputEntireServerScrollingView.h"
@interface PIInputEntireServerScrollingView()
@property(nonatomic,strong) UITextField *pi_textField;
@property(nonatomic,strong) UILabel *pi_numView;
@end
@implementation PIInputEntireServerScrollingView
-(instancetype)initWithFrame:(CGRect)frame{
self = [super initWithFrame:frame];
if(self){
[self installUI];
[self installConstraints];
}
return self;
}
-(void)installUI{
self.backgroundColor = UIColorFromRGB(0xF8F8FA);
[self setCornerWithLeftTopCorner:kGetScaleWidth(8) rightTopCorner:kGetScaleWidth(8) bottomLeftCorner:kGetScaleWidth(8) bottomRightCorner:kGetScaleWidth(8) size:CGSizeMake(kGetScaleWidth(327), kGetScaleWidth(76))];
[self addSubview:self.pi_textField];
[self addSubview:self.pi_numView];
}
-(void)installConstraints{
[self.pi_numView mas_makeConstraints:^(MASConstraintMaker *make) {
make.trailing.mas_equalTo(-kGetScaleWidth(10));
make.height.mas_equalTo(kGetScaleWidth(17));
make.bottom.mas_equalTo(-kGetScaleWidth(8));
}];
[self.pi_textField mas_makeConstraints:^(MASConstraintMaker *make) {
make.height.mas_equalTo(kGetScaleWidth(22));
make.leading.trailing.equalTo(self).inset(kGetScaleWidth(10));
make.top.mas_equalTo(kGetScaleWidth(24));
}];
}
#pragma mark -
- (UITextField *)pi_textField{
if(!_pi_textField){
_pi_textField = [[UITextField alloc]init];
_pi_textField.text = YMLocalizedString(@"PIInputEntireServerScrollingView0");
_pi_textField.textColor = UIColorFromRGB(0x322F4D);
_pi_textField.font = kFontRegular(16);
_pi_textField.textAlignment = NSTextAlignmentCenter;
}
return _pi_textField;
}
- (UILabel *)pi_numView{
if(!_pi_numView){
_pi_numView = [UILabel labelInitWithText:@"0/20" font:kFontRegular(12) textColor:UIColorFromRGB(0x94959C)];
}
return _pi_numView;
}
@end

View File

@@ -40,19 +40,20 @@
[self.pi_stackView addArrangedSubview:self.pi_iconView];
[self.pi_stackView addArrangedSubview:self.pi_titleView];
}
-(void)installConstraints{
[self.pi_stackView mas_makeConstraints:^(MASConstraintMaker *make) {
make.leading.mas_equalTo(kGetScaleWidth(12));
make.height.mas_equalTo(kGetScaleWidth(24));
make.height.mas_equalTo(kGetScaleWidth(32));
make.centerY.equalTo(self);
make.width.mas_equalTo(kGetScaleWidth(94));
}];
[self.pi_iconView mas_makeConstraints:^(MASConstraintMaker *make) {
make.width.height.mas_equalTo(kGetScaleWidth(24));
make.width.mas_equalTo(kGetScaleWidth(30));
make.height.mas_equalTo(kGetScaleWidth(32));
}];
[self.pi_titleView mas_makeConstraints:^(MASConstraintMaker *make) {
make.width.mas_equalTo(kGetScaleWidth(66));
make.height.mas_equalTo(kGetScaleWidth(22));
}];
[self.pi_unitView mas_makeConstraints:^(MASConstraintMaker *make) {
@@ -83,13 +84,13 @@
}
-(void)setUnitTitle:(NSString *)unitTitle{
_unitTitle = unitTitle;
_pi_unitView = _unitTitle;
_pi_unitView.text = _unitTitle;
}
#pragma mark -
- (UIStackView *)pi_stackView {
if (!_pi_stackView) {
_pi_stackView = [[UIStackView alloc] init];
_pi_stackView.distribution = UIStackViewDistributionFillEqually;
_pi_stackView.distribution = UIStackViewDistributionFill;
_pi_stackView.alignment = UIStackViewAlignmentCenter;
_pi_stackView.spacing = kGetScaleWidth(4);
}
@@ -111,7 +112,8 @@
- (UITextField *)pi_textField{
if(!_pi_textField){
_pi_textField = [[UITextField alloc]init];
_pi_textField.placeholder = @"0";
NSMutableAttributedString *placeholder = [[NSMutableAttributedString alloc]initWithString:@"0" attributes:@{NSFontAttributeName:kFontRegular(16),NSForegroundColorAttributeName:UIColorFromRGB(0xB3B3C3)}];
_pi_textField.attributedPlaceholder = placeholder;
_pi_textField.textColor = UIColorFromRGB(0x322F4D);
_pi_textField.font = kFontMedium(16);
_pi_textField.keyboardType = UIKeyboardTypeNumberPad;

View File

@@ -0,0 +1,16 @@
//
// PIInputScrollingView.h
// YuMi
//
// Created by duoban on 2023/10/19.
//
#import <UIKit/UIKit.h>
NS_ASSUME_NONNULL_BEGIN
@interface PIInputScrollingView : UIView
@end
NS_ASSUME_NONNULL_END

View File

@@ -0,0 +1,45 @@
//
// PIInputScrollingView.m
// YuMi
//
// Created by duoban on 2023/10/19.
//
#import "PIInputScrollingView.h"
@interface PIInputScrollingView()
@property(nonatomic,strong) UITextField *pi_textField;
@end
@implementation PIInputScrollingView
-(instancetype)initWithFrame:(CGRect)frame{
self = [super initWithFrame:frame];
if(self){
[self installUI];
[self installConstraints];
}
return self;
}
-(void)installUI{
self.backgroundColor = UIColorFromRGB(0xF8F8FA);
[self setCornerWithLeftTopCorner:kGetScaleWidth(8) rightTopCorner:kGetScaleWidth(8) bottomLeftCorner:kGetScaleWidth(8) bottomRightCorner:kGetScaleWidth(8) size:CGSizeMake(kGetScaleWidth(327), kGetScaleWidth(52))];
[self addSubview:self.pi_textField];
}
-(void)installConstraints{
[self.pi_textField mas_makeConstraints:^(MASConstraintMaker *make) {
make.leading.trailing.equalTo(self).inset(kGetScaleWidth(10));
make.bottom.top.equalTo(self);
}];
}
#pragma mark -
- (UITextField *)pi_textField{
if(!_pi_textField){
_pi_textField = [[UITextField alloc]init];
NSMutableAttributedString *placeholder = [[NSMutableAttributedString alloc]initWithString:YMLocalizedString(@"PIInputScrollingView0") attributes:@{NSFontAttributeName:kFontRegular(16),NSForegroundColorAttributeName:UIColorFromRGB(0xB3B3C3)}];
_pi_textField.attributedPlaceholder = placeholder;
_pi_textField.textColor = UIColorFromRGB(0x322F4D);
_pi_textField.font = kFontRegular(16);
_pi_textField.textAlignment = NSTextAlignmentCenter;
}
return _pi_textField;
}
@end

View File

@@ -7,10 +7,24 @@
#import <UIKit/UIKit.h>
NS_ASSUME_NONNULL_BEGIN
typedef enum : NSUInteger {
Red_Packet_Choose_type_Normal = 0,
Red_Packet_Choose_type_Follow,
Red_Packet_Choose_type_Share,
Red_Packet_Choose_type_Scrolling,
} PIRedPacketChooseTypeViewType;
@interface PIRedPacketChooseTypeView : UIView
@protocol PIRedPacketChooseTypeViewDelegate <NSObject>
-(void)chooseRedPacketType:(PIRedPacketChooseTypeViewType)type;
@end
NS_ASSUME_NONNULL_BEGIN
@interface PIRedPacketChooseTypeView : UIView
@property(nonatomic,weak) id<PIRedPacketChooseTypeViewDelegate>delegate;
@property(nonatomic,strong) UICollectionView *collectionView;
@end
NS_ASSUME_NONNULL_END

View File

@@ -9,7 +9,7 @@
#import "PIRedPacketChooseTypeCell.h"
@interface PIRedPacketChooseTypeView()<UICollectionViewDelegate,UICollectionViewDataSource>
@property(nonatomic,strong) UILabel *pi_titleView;
@property(nonatomic,strong) UICollectionView *collectionView;
@property(nonatomic,copy) NSArray *titleList;
@property(nonatomic,copy) NSArray *subTitleList;
@property(nonatomic,assign) NSInteger chooseRow;
@@ -54,6 +54,9 @@
}
- (void)collectionView:(UICollectionView *)collectionView didSelectItemAtIndexPath:(NSIndexPath *)indexPath{
self.chooseRow = indexPath.row;
if(self.delegate && [self.delegate respondsToSelector:@selector(chooseRedPacketType:)]){
[self.delegate chooseRedPacketType:self.chooseRow];
}
[self.collectionView reloadData];
}
#pragma mark -
@@ -71,14 +74,14 @@
layout.scrollDirection = UICollectionViewScrollDirectionHorizontal;
layout.minimumLineSpacing = kGetScaleWidth(6);
layout.minimumInteritemSpacing = kGetScaleWidth(6);
layout.sectionInset = UIEdgeInsetsMake(0, kGetScaleWidth(24), kGetScaleWidth(0), kGetScaleWidth(0));
layout.sectionInset = UIEdgeInsetsMake(0, kGetScaleWidth(24), kGetScaleWidth(0), kGetScaleWidth(24));
_collectionView.dataSource = self;
_collectionView.delegate = self;
_collectionView.showsHorizontalScrollIndicator = NO;
if (@available(iOS 11.0, *)) {
_collectionView.contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentNever;
}
_collectionView.tag = 3000000001;
_collectionView.showsVerticalScrollIndicator = NO;
_collectionView.showsHorizontalScrollIndicator = NO;
_collectionView.backgroundColor = [UIColor clearColor];

View File

@@ -74,6 +74,9 @@
#pragma mark - UI
- (void)initViews {
self.contentView.backgroundColor = [UIColor clearColor];
self.backgroundColor = [UIColor clearColor];
self.selectionStyle = UITableViewCellSelectionStyleNone;
[self.contentView addSubview:self.avatarView];
[self.contentView addSubview:self.userNameLabel];
[self.contentView addSubview:self.timeLabel];
@@ -82,47 +85,47 @@
[self.contentView addSubview:self.lineView];
[self.avatarView mas_makeConstraints:^(MASConstraintMaker *make){
make.height.width.mas_equalTo(30);
make.height.width.mas_equalTo(kGetScaleWidth(28));
make.centerY.mas_equalTo(self.mas_centerY);
make.left.mas_equalTo(self.contentView.mas_left).offset(22);
make.left.mas_equalTo(self.contentView.mas_left).offset(kGetScaleWidth(16));
}];
[self.userNameLabel mas_makeConstraints:^(MASConstraintMaker *make){
make.left.mas_equalTo(self.avatarView.mas_right).offset(6.5);
make.top.mas_equalTo(self.avatarView.mas_top).offset(2.5);
make.height.mas_equalTo(14);
make.top.mas_equalTo(kGetScaleWidth(11));
make.height.mas_equalTo(kGetScaleWidth(17));
make.leading.mas_equalTo(kGetScaleWidth(50));
}];
[self.timeLabel mas_makeConstraints:^(MASConstraintMaker *make){
make.left.mas_equalTo(self.avatarView.mas_right).offset(6.5);
make.bottom.mas_equalTo(self.avatarView.mas_bottom);
make.leading.mas_equalTo(kGetScaleWidth(50));
make.top.mas_equalTo(kGetScaleWidth(28));
make.height.mas_equalTo(kGetScaleWidth(13));
}];
[self.coinImageView mas_makeConstraints:^(MASConstraintMaker *make){
make.width.mas_equalTo(22);
make.height.mas_equalTo(22);
make.centerY.mas_equalTo(self.mas_centerY);
make.right.mas_equalTo(self.contentView.mas_right).offset(-22);
}];
[self.amountLabel mas_makeConstraints:^(MASConstraintMaker *make){
make.centerY.mas_equalTo(self.mas_centerY);
make.right.mas_equalTo(self.coinImageView.mas_left).offset(-5);
make.trailing.mas_equalTo(-kGetScaleWidth(16));
}];
[self.coinImageView mas_makeConstraints:^(MASConstraintMaker *make){
make.width.mas_equalTo(kGetScaleWidth(19));
make.height.mas_equalTo(kGetScaleWidth(19));
make.centerY.mas_equalTo(self.mas_centerY);
make.trailing.equalTo(self.amountLabel.mas_leading).mas_offset(-kGetScaleWidth(1));
}];
[self.lineView mas_makeConstraints:^(MASConstraintMaker *make){
make.left.mas_equalTo(self.avatarView.mas_left);
make.right.mas_equalTo(self.coinImageView.mas_right);
make.leading.trailing.equalTo(self.contentView).inset(kGetScaleWidth(14));
make.height.mas_equalTo(0.5);
make.bottom.mas_equalTo(-kGetScaleWidth(0));
}];
}
#pragma mark - Lazy Load
- (NetImageView *)avatarView {
if (!_avatarView) {
_avatarView = [[NetImageView alloc] init];
NetImageConfig *config = [[NetImageConfig alloc]init];
config.placeHolder = [UIImageConstant defaultAvatarPlaceholder];
_avatarView = [[NetImageView alloc] initWithConfig:config];
_avatarView.layer.masksToBounds = YES;
_avatarView.layer.cornerRadius = 15;
_avatarView.layer.cornerRadius = kGetScaleWidth(28)/2;
_avatarView.layer.borderWidth = 1;
_avatarView.layer.borderColor = UIColorFromRGB(0xFFFFFF).CGColor;
}
@@ -134,7 +137,8 @@
_userNameLabel = [[UILabel alloc] init];
_userNameLabel.text = YMLocalizedString(@"XPOpenRedPacketCell1");
_userNameLabel.numberOfLines = 1;
_userNameLabel.font = [UIFont systemFontOfSize:15];
_userNameLabel.font = kFontMedium(12);
_userNameLabel.textColor = [UIColor whiteColor];
}
return _userNameLabel;
}
@@ -143,9 +147,9 @@
if (!_timeLabel) {
_timeLabel = [[UILabel alloc] init];
_timeLabel.text = @"00/00/00 00:00";
_timeLabel.font = [UIFont systemFontOfSize:10];
_timeLabel.textColor = UIColorRGBAlpha(0xffffff, 0.5);
_timeLabel.alpha = 0.5;
_timeLabel.font = kFontRegular(9);
_timeLabel.textColor = UIColorRGBAlpha(0xffffff, 0.8);
}
return _timeLabel;
}
@@ -153,9 +157,9 @@
- (UILabel *)amountLabel {
if (!_amountLabel) {
_amountLabel = [[UILabel alloc] init];
_amountLabel.text = YMLocalizedString(@"XPOpenRedPacketCell2");
_amountLabel.text = @"0";
_amountLabel.textAlignment = NSTextAlignmentRight;
_amountLabel.font = [UIFont systemFontOfSize:20 weight:UIFontWeightMedium];
_amountLabel.font = kFontMedium(16);
_amountLabel.textColor = [UIColor whiteColor];
}
return _amountLabel;
@@ -164,7 +168,7 @@
- (UIImageView *)coinImageView {
if (!_coinImageView) {
_coinImageView = [[UIImageView alloc] init];
[_coinImageView setImage:[UIImage imageNamed:@"common_diamond"]];
[_coinImageView setImage:[UIImage imageNamed:@"mine_noble_center__diamond"]];
}
return _coinImageView;
}
@@ -172,7 +176,7 @@
- (UIView *)lineView{
if (!_lineView) {
_lineView = [[UIView alloc] init];
_lineView.backgroundColor = UIColorFromRGB(0xE2314D);
_lineView.backgroundColor = [UIColor colorWithWhite:1 alpha:0.3];
}
return _lineView;
}

View File

@@ -0,0 +1,16 @@
//
// PIReceiveRedPacketSuccessView.h
// YuMi
//
// Created by duoban on 2023/10/20.
//
#import <UIKit/UIKit.h>
NS_ASSUME_NONNULL_BEGIN
@interface PIReceiveRedPacketSuccessView : UIView
@end
NS_ASSUME_NONNULL_END

View File

@@ -0,0 +1,200 @@
//
// PIReceiveRedPacketSuccessView.m
// YuMi
//
// Created by duoban on 2023/10/20.
//
#import "PIReceiveRedPacketSuccessView.h"
#import "XPOpenRedPacketCell.h"
@interface PIReceiveRedPacketSuccessView()<UITableViewDelegate, UITableViewDataSource>
///
@property (nonatomic, strong) UIButton *closeBtn;
///
@property (nonatomic, strong) UIImageView *bgImageView;
///
@property(nonatomic,strong) UILabel *getDiamondView;
///
@property(nonatomic,strong) UILabel *pi_tipsView;
///
@property (nonatomic, strong) NetImageView *sendAvatar;
///
@property (nonatomic, strong) UILabel *sendNickLabel;
///
@property (nonatomic, strong) UILabel *sendWishLabel;
@property (nonatomic, strong) UITableView *tableView;
@end
@implementation PIReceiveRedPacketSuccessView
-(instancetype)initWithFrame:(CGRect)frame{
self = [super initWithFrame:frame];
if(self){
[self installUI];
[self installConstraints];
}
return self;
}
-(void)installUI{
self.backgroundColor = [UIColor colorWithWhite:0 alpha:0.4];
[self addSubview:self.bgImageView];
[self addSubview:self.closeBtn];
[self.bgImageView addSubview:self.getDiamondView];
[self.bgImageView addSubview:self.pi_tipsView];
[self.bgImageView addSubview:self.sendAvatar];
[self.bgImageView addSubview:self.sendNickLabel];
[self.bgImageView addSubview:self.sendWishLabel];
[self.bgImageView addSubview:self.tableView];
self.sendNickLabel.text = @"Piko的紅包";
self.sendWishLabel.text = @"恭喜發財,大吉大利!";
self.pi_tipsView.text = @"已存入錢包,請到我的收益確認";
NSMutableAttributedString *numText = [[NSMutableAttributedString alloc]initWithString:@"100" attributes:@{NSFontAttributeName:kFontMedium(32),NSForegroundColorAttributeName:UIColorFromRGB(0xFF285C)}];
NSTextAttachment * attachment = [[NSTextAttachment alloc] init];
UIImage *iconImage = [UIImage imageNamed:@"mine_noble_center__diamond"];;
attachment.bounds = CGRectMake(0, roundf(kFontMedium(32).capHeight - iconImage.size.height)/2.f, iconImage.size.width, iconImage.size.height);
attachment.image =iconImage;
NSAttributedString * starAttribute = [NSMutableAttributedString attributedStringWithAttachment:(NSTextAttachment *)attachment];
[numText insertAttributedString:starAttribute atIndex:0];
self.getDiamondView.attributedText = numText;
}
-(void)installConstraints{
[self.bgImageView mas_makeConstraints:^(MASConstraintMaker *make) {
make.width.mas_equalTo(kGetScaleWidth(327));
make.height.mas_equalTo(kGetScaleWidth(464));
make.center.equalTo(self);
}];
[self.closeBtn mas_makeConstraints:^(MASConstraintMaker *make) {
make.width.height.mas_equalTo(kGetScaleWidth(28));
make.trailing.equalTo(self.bgImageView.mas_trailing).mas_offset(-kGetScaleWidth(8));
make.top.equalTo(self.bgImageView.mas_top).mas_offset(kGetScaleWidth(39));
}];
[self.getDiamondView mas_makeConstraints:^(MASConstraintMaker *make) {
make.height.mas_equalTo(kGetScaleWidth(34));
make.centerX.equalTo(self.bgImageView);
make.top.mas_equalTo(kGetScaleWidth(89));
}];
[self.pi_tipsView mas_makeConstraints:^(MASConstraintMaker *make) {
make.top.mas_equalTo(kGetScaleWidth(129));
make.centerX.equalTo(self.bgImageView);
make.height.mas_equalTo(kGetScaleWidth(17));
}];
[self.sendNickLabel mas_makeConstraints:^(MASConstraintMaker *make) {
make.centerX.equalTo(self.bgImageView.mas_centerX).mas_offset(kGetScaleWidth(14));
make.centerY.equalTo(self.sendAvatar);
make.height.mas_equalTo(kGetScaleWidth(20));
}];
[self.sendAvatar mas_makeConstraints:^(MASConstraintMaker *make) {
make.width.height.mas_equalTo(kGetScaleWidth(24));
make.top.equalTo(self.pi_tipsView.mas_bottom).mas_offset(kGetScaleWidth(31));
make.trailing.equalTo(self.sendNickLabel.mas_leading).mas_offset(-kGetScaleWidth(4));
}];
[self.sendWishLabel mas_makeConstraints:^(MASConstraintMaker *make) {
make.top.equalTo(self.sendAvatar.mas_bottom).mas_offset(kGetScaleWidth(4));
make.height.mas_equalTo(kGetScaleWidth(20));
make.centerX.equalTo(self.bgImageView);
make.width.mas_equalTo(kGetScaleWidth(223));
}];
[self.tableView mas_makeConstraints:^(MASConstraintMaker *make) {
make.top.equalTo(self.sendWishLabel.mas_bottom).mas_offset(kGetScaleWidth(8));
make.width.mas_equalTo(kGetScaleWidth(223));
make.height.mas_equalTo(kGetScaleWidth(180));
make.centerX.equalTo(self.bgImageView);
}];
}
#pragma mark - tableviewDatasource
- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section {
return 3;
}
- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath{
XPOpenRedPacketCell *cell = [tableView dequeueReusableCellWithIdentifier:NSStringFromClass([XPOpenRedPacketCell class]) forIndexPath:indexPath];
return cell;
}
#pragma mark - action
- (void)onCloseButtonClick:(UIButton *)sender {
[self removeFromSuperview];
}
#pragma mark -
- (UIImageView *)bgImageView {
if (!_bgImageView) {
_bgImageView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"pi_red_packet_receive_success_bg"]];
_bgImageView.userInteractionEnabled = YES;
}
return _bgImageView;
}
- (UIButton *)closeBtn {
if (!_closeBtn) {
_closeBtn = [[UIButton alloc] init];
[_closeBtn setImage:[UIImage imageNamed:@"pi_red_packet_receive_colse"] forState:UIControlStateNormal];
[_closeBtn addTarget:self action:@selector(onCloseButtonClick:) forControlEvents:UIControlEventTouchUpInside];
}
return _closeBtn;
}
- (NetImageView *)sendAvatar {
if (!_sendAvatar) {
NetImageConfig *config = [[NetImageConfig alloc]init];
config.placeHolder = [UIImageConstant defaultAvatarPlaceholder];
_sendAvatar = [[NetImageView alloc] initWithConfig:config];
_sendAvatar.layer.masksToBounds = YES;
_sendAvatar.layer.cornerRadius = kGetScaleWidth(24)/2;
_sendAvatar.layer.borderWidth = 1;
_sendAvatar.layer.borderColor = [UIColor whiteColor].CGColor;
}
return _sendAvatar;
}
- (UIView *)sendNickLabel {
if (!_sendNickLabel) {
UILabel *label = [[UILabel alloc] init];
label.font = kFontMedium(14);
label.textColor = [UIColor whiteColor];
_sendNickLabel = label;
}
return _sendNickLabel;
}
- (UILabel *)sendWishLabel {
if (!_sendWishLabel) {
UILabel *label = [[UILabel alloc] init];
label.textAlignment = NSTextAlignmentCenter;
_sendWishLabel = label;
_sendWishLabel.font = kFontRegular(11);
_sendWishLabel.textColor = [UIColor colorWithWhite:1 alpha:0.9];
}
return _sendWishLabel;
}
- (UILabel *)pi_tipsView{
if(!_pi_tipsView){
_pi_tipsView = [UILabel labelInitWithText:@"" font:kFontRegular(12) textColor:UIColorFromRGB(0x767585)];
}
return _pi_tipsView;
}
- (UITableView *)tableView {
if (!_tableView) {
_tableView = [[UITableView alloc] init];
[_tableView registerClass:[XPOpenRedPacketCell class] forCellReuseIdentifier:NSStringFromClass([XPOpenRedPacketCell class])];
_tableView.delegate = self;
_tableView.dataSource = self;
_tableView.separatorStyle = UITableViewCellSeparatorStyleNone;
_tableView.rowHeight = kGetScaleWidth(48);
_tableView.layer.cornerRadius = kGetScaleWidth(20);
_tableView.layer.masksToBounds = YES;
_tableView.backgroundColor = UIColorFromRGB(0xE03654);
}
return _tableView;
}
- (UILabel *)getDiamondView{
if(!_getDiamondView){
_getDiamondView = [UILabel new];
}
return _getDiamondView;
}
@end

View File

@@ -6,11 +6,18 @@
//
#import "MvpViewController.h"
#import <JXCategoryView/JXCategoryListContainerView.h>
#import <JXPagingView/JXPagerView.h>
typedef enum : NSUInteger {
Room_Send_Red_Packet_Type_Lobby = 0,///大厅红包
Room_Send_Red_Packet_Type_Entire_Server,///全服红包
} PIRoomSendRedPacketItemVCType;
NS_ASSUME_NONNULL_BEGIN
@interface PIRoomSendRedPacketItemVC : MvpViewController<JXCategoryListContentViewDelegate>
@interface PIRoomSendRedPacketItemVC : MvpViewController<JXPagerViewListViewDelegate>
@property (nonatomic, copy) void(^scrollCallback)(UIScrollView *scrollView);
-(instancetype)initWithType:(PIRoomSendRedPacketItemVCType)type;
@end
NS_ASSUME_NONNULL_END

View File

@@ -6,28 +6,242 @@
//
#import "PIRoomSendRedPacketItemVC.h"
@interface PIRoomSendRedPacketItemVC ()
#import "PIInputRedPacketView.h"
#import "PIRedPacketChooseTypeView.h"
#import "PIInputScrollingView.h"
#import "PIInputEntireServerScrollingView.h"
@interface PIRoomSendRedPacketItemVC ()<PIRedPacketChooseTypeViewDelegate>
///
@property(nonatomic,strong) PIInputRedPacketView *pi_priceView;
///
@property(nonatomic,strong) PIInputRedPacketView *pi_numView;
///
@property(nonatomic,strong) PIRedPacketChooseTypeView *chooseTypeView;
///
@property(nonatomic,strong) UIButton *promptlyBtn;
////
@property(nonatomic,strong) UIButton *limitBtn;
///
@property(nonatomic,strong) UIButton *sendBtn;
///
@property(nonatomic,strong) UILabel *tipsView;
///
@property(nonatomic,strong) PIInputScrollingView *scrollingView;
///
@property(nonatomic,strong) PIInputEntireServerScrollingView *serverInputView;
@property(nonatomic,assign) PIRoomSendRedPacketItemVCType type;
@end
@implementation PIRoomSendRedPacketItemVC
- (BOOL)isHiddenNavBar {
return YES;
}
-(instancetype)initWithType:(PIRoomSendRedPacketItemVCType)type{
self = [super init];
if(self){
self.type = type;
}
return self;
}
- (void)viewDidLoad {
[super viewDidLoad];
[self installUI];
[self installConstraints];
}
-(void)installUI{
self.view.backgroundColor = [UIColor whiteColor];
[self.view addSubview:self.pi_priceView];
[self.view addSubview:self.pi_numView];
if(self.type == Room_Send_Red_Packet_Type_Lobby){
[self.view addSubview:self.chooseTypeView];
[self.view addSubview:self.promptlyBtn];
[self.view addSubview:self.limitBtn];
[self.view addSubview:self.scrollingView];
}else{
[self.view addSubview:self.serverInputView];
}
[self.view addSubview:self.sendBtn];
[self.view addSubview:self.tipsView];
}
-(void)installConstraints{
[self.pi_priceView mas_makeConstraints:^(MASConstraintMaker *make) {
make.top.mas_equalTo(kGetScaleWidth(10));
make.width.mas_equalTo(kGetScaleWidth(327));
make.height.mas_equalTo(kGetScaleWidth(48));
make.centerX.equalTo(self.view);
}];
[self.pi_numView mas_makeConstraints:^(MASConstraintMaker *make) {
make.width.mas_equalTo(kGetScaleWidth(327));
make.height.mas_equalTo(kGetScaleWidth(48));
make.centerX.equalTo(self.view);
make.top.equalTo(self.pi_priceView.mas_bottom).mas_offset(kGetScaleWidth(12));
}];
if(self.type == Room_Send_Red_Packet_Type_Lobby){
[self.chooseTypeView mas_makeConstraints:^(MASConstraintMaker *make) {
make.top.equalTo(self.pi_numView.mas_bottom).mas_offset(kGetScaleWidth(16));
make.leading.trailing.equalTo(self.view).inset(kGetScaleWidth(0));
make.height.mas_equalTo(kGetScaleWidth(92));
}];
[self.promptlyBtn mas_makeConstraints:^(MASConstraintMaker *make) {
make.top.equalTo(self.chooseTypeView.mas_bottom).mas_offset(kGetScaleWidth(12));
make.leading.mas_equalTo(kGetScaleWidth(24));
make.width.mas_equalTo(kGetScaleWidth(154));
make.height.mas_equalTo(kGetScaleWidth(52));
}];
[self.limitBtn mas_makeConstraints:^(MASConstraintMaker *make) {
make.top.equalTo(self.chooseTypeView.mas_bottom).mas_offset(kGetScaleWidth(12));
make.trailing.mas_equalTo(-kGetScaleWidth(24));
make.width.mas_equalTo(kGetScaleWidth(154));
make.height.mas_equalTo(kGetScaleWidth(52));
}];
[self.scrollingView mas_makeConstraints:^(MASConstraintMaker *make) {
make.top.equalTo(self.chooseTypeView.mas_bottom).mas_offset(kGetScaleWidth(12));
make.width.mas_equalTo(kGetScaleWidth(327));
make.height.mas_equalTo(kGetScaleWidth(52));
make.centerX.equalTo(self.view);
}];
[self.sendBtn mas_makeConstraints:^(MASConstraintMaker *make) {
make.top.equalTo(self.pi_numView.mas_bottom).mas_offset(kGetScaleWidth(200));
make.width.mas_equalTo(kGetScaleWidth(295));
make.height.mas_equalTo(kGetScaleWidth(52));
make.centerX.equalTo(self.view);
}];
}else{
[self.serverInputView mas_makeConstraints:^(MASConstraintMaker *make) {
make.top.equalTo(self.pi_numView.mas_bottom).mas_offset(kGetScaleWidth(24));
make.width.mas_equalTo(kGetScaleWidth(327));
make.height.mas_equalTo(kGetScaleWidth(76));
make.centerX.equalTo(self.view);
}];
[self.sendBtn mas_makeConstraints:^(MASConstraintMaker *make) {
make.top.equalTo(self.pi_numView.mas_bottom).mas_offset(kGetScaleWidth(128));
make.width.mas_equalTo(kGetScaleWidth(295));
make.height.mas_equalTo(kGetScaleWidth(52));
make.centerX.equalTo(self.view);
}];
}
[self.tipsView mas_makeConstraints:^(MASConstraintMaker *make) {
make.top.equalTo(self.sendBtn.mas_bottom).mas_offset(kGetScaleWidth(10));
make.centerX.equalTo(self.view);
}];
}
#pragma mark - JXCategoryListContentViewDelegate
#pragma mark - JXPagingViewListViewDelegate
- (UIScrollView *)listScrollView {
return self.chooseTypeView.collectionView;
}
- (void)listViewDidScrollCallback:(void (^)(UIScrollView *))callback {
self.scrollCallback = callback;
}
- (UIView *)listView {
return self.view;
}
#pragma mark- PIRedPacketChooseTypeViewDelegate
- (void)chooseRedPacketType:(PIRedPacketChooseTypeViewType)type{
switch (type) {
case Red_Packet_Choose_type_Normal:
{
self.scrollingView.hidden = YES;
self.promptlyBtn.hidden = NO;
self.limitBtn.hidden = NO;
}
break;
case Red_Packet_Choose_type_Scrolling:
{
self.scrollingView.hidden = NO;
self.promptlyBtn.hidden = YES;
self.limitBtn.hidden = YES;
}
break;
default:
break;
}
}
#pragma mark -
- (PIInputRedPacketView *)pi_priceView{
if(!_pi_priceView){
_pi_priceView = [[PIInputRedPacketView alloc]initWithFrame:CGRectZero];
_pi_priceView.isHiddenIcon = NO;
_pi_priceView.pi_title = YMLocalizedString(@"PIRoomSendRedPacketItemVC0");
_pi_priceView.unitTitle = YMLocalizedString(@"PIRoomSendRedPacketItemVC2");
}
return _pi_priceView;
}
- (PIInputRedPacketView *)pi_numView{
if(!_pi_numView){
_pi_numView = [[PIInputRedPacketView alloc]initWithFrame:CGRectZero];
_pi_numView.isHiddenIcon = YES;
_pi_numView.pi_title = YMLocalizedString(@"PIRoomSendRedPacketItemVC1");
_pi_numView.unitTitle = YMLocalizedString(@"PIRoomSendRedPacketItemVC3");
}
return _pi_numView;
}
- (PIRedPacketChooseTypeView *)chooseTypeView{
if(!_chooseTypeView){
_chooseTypeView = [[PIRedPacketChooseTypeView alloc]initWithFrame:CGRectZero];
_chooseTypeView.delegate = self;
}
return _chooseTypeView;
}
- (UIButton *)promptlyBtn{
if(!_promptlyBtn){
_promptlyBtn = [UIButton new];
[_promptlyBtn setTitleColor:UIColorFromRGB(0xFF285C) forState:UIControlStateSelected];
[_promptlyBtn setTitleColor:UIColorFromRGB(0x767585) forState:UIControlStateNormal];
_promptlyBtn.titleLabel.font = kFontMedium(16);
_promptlyBtn.backgroundColor = UIColorRGBAlpha(0xFF285C, 0.06);
_promptlyBtn.layer.cornerRadius = kGetScaleWidth(8);
_promptlyBtn.selected = YES;
[_promptlyBtn setTitle:YMLocalizedString(@"PIRoomSendRedPacketItemVC4") forState:UIControlStateNormal];
_promptlyBtn.layer.masksToBounds = YES;
_promptlyBtn.layer.borderColor = UIColorFromRGB(0xFF285C).CGColor;
_promptlyBtn.layer.borderWidth = 1;
}
return _promptlyBtn;
}
- (UIButton *)limitBtn{
if(!_limitBtn){
_limitBtn = [UIButton new];
[_limitBtn setTitleColor:UIColorFromRGB(0xFF285C) forState:UIControlStateSelected];
[_limitBtn setTitleColor:UIColorFromRGB(0x767585) forState:UIControlStateNormal];
_limitBtn.titleLabel.font = kFontRegular(16);
_limitBtn.backgroundColor = UIColorFromRGB(0xF8F8FA);
_limitBtn.layer.cornerRadius = kGetScaleWidth(8);
[_limitBtn setTitle:YMLocalizedString(@"PIRoomSendRedPacketItemVC5") forState:UIControlStateNormal];
_limitBtn.layer.masksToBounds = YES;
_limitBtn.layer.borderColor = UIColorFromRGB(0xFF285C).CGColor;
_limitBtn.layer.borderWidth = 0;
}
return _limitBtn;
}
- (UIButton *)sendBtn{
if(!_sendBtn){
_sendBtn = [UIButton new];
[_sendBtn setBackgroundImage:kImage(@"pi_red_packet_send") forState:UIControlStateNormal];
}
return _sendBtn;
}
- (UILabel *)tipsView{
if(!_tipsView){
_tipsView = [UILabel labelInitWithText:YMLocalizedString(@"PIRoomSendRedPacketItemVC6") font:kFontRegular(12) textColor:UIColorFromRGB(0x94959C)];
}
return _tipsView;
}
- (PIInputScrollingView *)scrollingView{
if(!_scrollingView){
_scrollingView = [[PIInputScrollingView alloc]initWithFrame:CGRectZero];
_scrollingView.hidden = YES;
}
return _scrollingView;
}
- (PIInputEntireServerScrollingView *)serverInputView{
if(!_serverInputView){
_serverInputView = [[PIInputEntireServerScrollingView alloc]initWithFrame:CGRectZero];
}
return _serverInputView;
}
@end

View File

@@ -6,10 +6,13 @@
//
#import "MvpViewController.h"
#import "RoomHostDelegate.h"
NS_ASSUME_NONNULL_BEGIN
@interface PIRoomSendRedPacketVC : MvpViewController
@property (nonatomic, copy) NSString *roomUid;
- (instancetype)initWithDelegate:(id<RoomHostDelegate>)delegate;
@end

View File

@@ -1,3 +1,4 @@
//
// PIRoomSendRedPacketVC.m
// YuMi
@@ -6,17 +7,20 @@
//
#import "PIRoomSendRedPacketVC.h"
#import <JXPagingView/JXPagerView.h>
#import <JXPagingView/JXPagerListRefreshView.h>
#import <JXCategoryView/JXCategoryView.h>
#import <JXCategoryView/JXCategoryIndicatorBackgroundView.h>
#import <JXCategoryView/JXCategoryListContainerView.h>
#import "PIRoomSendRedPacketItemVC.h"
@interface PIRoomSendRedPacketVC ()<JXCategoryViewDelegate, JXCategoryListContainerViewDelegate>
@interface PIRoomSendRedPacketVC ()<JXPagerViewDelegate,JXPagerMainTableViewGestureDelegate,JXCategoryViewDelegate,JXPagerMainTableViewGestureDelegate>
///host
@property (nonatomic,weak) id<RoomHostDelegate>hostDelegate;
///
@property (nonatomic, strong) NSArray<NSString *> *titles;
///
@property (nonatomic, strong) JXCategoryTitleView *titleView;
///lineView
@property (nonatomic, strong) JXCategoryListContainerView *contentView;
@property (nonatomic, strong) JXPagerView *contentView;
@property(nonatomic,strong) UIButton *pi_backBtn;
@property(nonatomic,strong) UIView *bgView;
@property(nonatomic,strong) UIImageView *topImageView;
@property(nonatomic,strong) UIButton *tipsBtn;
@@ -25,61 +29,121 @@
@end
@implementation PIRoomSendRedPacketVC
- (instancetype)initWithDelegate:(id<RoomHostDelegate>)delegate {
if (self = [super init]) {
self.hostDelegate = delegate;
}
return self;
}
- (BOOL)isHiddenNavBar {
return YES;
}
- (void)viewDidLoad {
[super viewDidLoad];
self.view.backgroundColor = [UIColor clearColor];
self.navigationController.view.backgroundColor = [UIColor clearColor];
[self.navigationController setNavigationBarHidden:YES];
[self installUI];
[self installConstraints];
}
-(void)installUI{
self.view.backgroundColor = [UIColor clearColor];
self.navigationController.view.backgroundColor = [UIColor clearColor];
[self.navigationController setNavigationBarHidden:YES];
[self.view addSubview:self.pi_backBtn];
[self.view addSubview:self.bgView];
[self.view addSubview:self.topImageView];
[self.view addSubview:self.titleView];
[self.view addSubview:self.tipsBtn];
[self.view addSubview:self.diamondNumView];
[self.diamondNumView addSubview:self.diamondNumTextView];
[self.view addSubview:self.contentView];
}
-(void)installConstraints{
[self.pi_backBtn mas_makeConstraints:^(MASConstraintMaker *make) {
make.edges.equalTo(self.view);
}];
[self.bgView mas_makeConstraints:^(MASConstraintMaker *make) {
make.leading.trailing.bottom.equalTo(self.view);
make.height.mas_equalTo(kGetScaleWidth(543));
}];
[self.topImageView mas_makeConstraints:^(MASConstraintMaker *make) {
make.top.equalTo(self.bgView.mas_bottom).mas_offset(-kGetScaleWidth(120));
make.top.equalTo(self.bgView.mas_top).mas_offset(-kGetScaleWidth(120));
make.leading.trailing.equalTo(self.view);
}];
[self.titleView mas_makeConstraints:^(MASConstraintMaker *make) {
make.top.mas_equalTo(self.view);
make.left.right.mas_equalTo(self.view);
make.height.mas_equalTo(kGetScaleWidth(44));
make.height.mas_equalTo(kGetScaleWidth(243));
}];
[self.diamondNumView mas_makeConstraints:^(MASConstraintMaker *make) {
make.top.equalTo(self.bgView.mas_top).mas_offset(kGetScaleWidth(13));
make.trailing.mas_equalTo(-kGetScaleWidth(0));
make.width.mas_equalTo(kGetScaleWidth(81));
make.height.mas_equalTo(kGetScaleWidth(30));
}];
[self.tipsBtn mas_makeConstraints:^(MASConstraintMaker *make) {
make.width.height.mas_equalTo(kGetScaleWidth(24));
make.trailing.mas_equalTo(-kGetScaleWidth(12));
make.top.equalTo(self.topImageView.mas_top).mas_offset(kGetScaleWidth(71));
}];
[self.diamondNumTextView mas_makeConstraints:^(MASConstraintMaker *make) {
make.centerY.equalTo(self.diamondNumView);
make.leading.mas_equalTo(kGetScaleWidth(6));
make.trailing.mas_equalTo(-kGetScaleWidth(5));
}];
[self.contentView mas_makeConstraints:^(MASConstraintMaker *make) {
make.top.mas_equalTo(self.titleView.mas_bottom);
make.top.equalTo(self.bgView.mas_top).mas_offset(kGetScaleWidth(52));
make.left.right.bottom.mas_equalTo(self.view);
}];
}
#pragma mark - JXCategoryViewDelegate
- (NSInteger)numberOfListsInlistContainerView:(JXCategoryListContainerView *)listContainerView {
- (NSUInteger)tableHeaderViewHeightInPagerView:(JXPagerView *)pagerView {
return 0;
}
- (UIView *)tableHeaderViewInPagerView:(JXPagerView *)pagerView {
return [UIView new];
}
- (NSUInteger)heightForPinSectionHeaderInPagerView:(JXPagerView *)pagerView {
return kGetScaleWidth(44);
}
- (UIView *)viewForPinSectionHeaderInPagerView:(JXPagerView *)pagerView {
return self.titleView;
}
- (NSInteger)numberOfListsInPagerView:(JXPagerView *)pagerView {
return self.titles.count;
}
- (id<JXCategoryListContentViewDelegate>)listContainerView:(JXCategoryListContainerView *)listContainerView initListForIndex:(NSInteger)index {
- (id<JXPagerViewListViewDelegate>)pagerView:(JXPagerView *)pagerView initListAtIndex:(NSInteger)index {
UIViewController<JXCategoryListContentViewDelegate> * list = (UIViewController<JXCategoryListContentViewDelegate> *)[self.contentView.validListDict objectForKey:[NSNumber numberWithInteger:index]];
UIViewController<JXPagerViewListViewDelegate> * list = (UIViewController<JXPagerViewListViewDelegate> *)[self.contentView.validListDict objectForKey:[NSNumber numberWithInteger:index]];
if (list) {
return list;
} else {
PIRoomSendRedPacketItemVC *vc = [[PIRoomSendRedPacketItemVC alloc]init];
PIRoomSendRedPacketItemVC *vc = [[PIRoomSendRedPacketItemVC alloc]initWithType:index];
return vc;
}
}
#pragma mark - JXPagerMainTableViewGestureDelegate
- (BOOL)mainTableViewGestureRecognizer:(UIGestureRecognizer *)gestureRecognizer shouldRecognizeSimultaneouslyWithGestureRecognizer:(UIGestureRecognizer *)otherGestureRecognizer {
//categoryView
if (otherGestureRecognizer.view == self.contentView.listContainerView) {
return NO;
}
if(otherGestureRecognizer.view.tag == 3000000001){
return YES;
}
return [gestureRecognizer isKindOfClass:[UIPanGestureRecognizer class]] && [otherGestureRecognizer isKindOfClass:[UIPanGestureRecognizer class]];
}
-(void)tipsAction{
}
-(void)hiddenViewAction{
[self dismissViewControllerAnimated:YES completion:nil];
}
#pragma mark -
- (UIView *)bgView{
@@ -89,11 +153,17 @@
}
return _bgView;
}
- (UIButton *)pi_backBtn{
if(!_pi_backBtn){
_pi_backBtn = [UIButton new];
[_pi_backBtn addTarget:self action:@selector(hiddenViewAction) forControlEvents:UIControlEventTouchUpInside];
}
return _pi_backBtn;
}
- (UIImageView *)topImageView{
if(!_topImageView){
_topImageView = [UIImageView new];
_topImageView.image = kImage(@"pi_red_packet_top_icon_logo");
_topImageView.userInteractionEnabled = YES;
}
return _topImageView;
}
@@ -126,8 +196,8 @@
[numAtt insertAttributedString:diamondAtt atIndex:0];
NSTextAttachment * addAttachment = [[NSTextAttachment alloc] init];
UIImage *addIconImage = [UIImage imageNamed:@"pi_red_packet_top_diamond_icon"];;
diamondAttachment.bounds = CGRectMake(0, roundf(kFontMedium(13).capHeight - addIconImage.size.height)/2.f, addIconImage.size.width, addIconImage.size.height);
UIImage *addIconImage = [UIImage imageNamed:@"pi_red_packet_top_diamond_add"];;
addAttachment.bounds = CGRectMake(0, roundf(kFontMedium(13).capHeight - addIconImage.size.height)/2.f, addIconImage.size.width, addIconImage.size.height);
addAttachment.image = addIconImage;
NSAttributedString * addAtt = [NSMutableAttributedString attributedStringWithAttachment:(NSTextAttachment *)addAttachment];
@@ -141,7 +211,7 @@
_titleView = [[JXCategoryTitleView alloc] init];
_titleView.delegate = self;
_titleView.titles = self.titles;
_titleView.backgroundColor = [UIColor clearColor];
_titleView.backgroundColor = [UIColor whiteColor];
_titleView.titleColor = UIColorFromRGB(0x767585);
_titleView.titleSelectedColor = UIColorFromRGB(0xFF285C);
_titleView.titleFont =kFontMedium(18);
@@ -155,13 +225,15 @@
_titleView.cellSpacing = kGetScaleWidth(75);
_titleView.defaultSelectedIndex = 0;
_titleView.listContainer = self.contentView;
_titleView.listContainer = (id<JXCategoryViewListContainer>)self.contentView.listContainerView;
JXCategoryIndicatorImageView *lineView = [[JXCategoryIndicatorImageView alloc] init];
lineView.indicatorImageViewSize = CGSizeMake(kGetScaleWidth(12), kGetScaleWidth(4));
lineView.verticalMargin = 7;
lineView.indicatorImageView.image = [UIImage imageWithColor:UIColorFromRGB(0xFF285C)];
lineView.verticalMargin = kGetScaleWidth(5);
lineView.backgroundColor = UIColorFromRGB(0xFF285C);
lineView.layer.cornerRadius = kGetScaleWidth(4)/2;
lineView.layer.masksToBounds = YES;
_titleView.indicators = @[lineView];
}
return _titleView;
@@ -169,12 +241,16 @@
- (NSArray<NSString *> *)titles{
return @[YMLocalizedString(@"PIRoomSendRedPacketVC0"),YMLocalizedString(@"PIRoomSendRedPacketVC1")];
}
- (JXCategoryListContainerView *)contentView {
- (JXPagerView *)contentView {
if (!_contentView) {
_contentView = [[JXCategoryListContainerView alloc] initWithType:JXCategoryListContainerType_ScrollView delegate:self];
_contentView.defaultSelectedIndex = 0;
_contentView = [[JXPagerView alloc] initWithDelegate:self listContainerType:0];
_contentView.mainTableView.gestureDelegate = self;
_contentView.backgroundColor = [UIColor whiteColor];
_contentView.listContainerView.backgroundColor = [UIColor whiteColor];
_contentView.listContainerView.listCellBackgroundColor = [UIColor whiteColor];
_contentView.mainTableView.backgroundColor = [UIColor whiteColor];
}
return _contentView;
}
@end

View File

@@ -24,8 +24,9 @@
#import "XPRedPacketModel.h"
#import "YUMIConstant.h"
#import "NSArray+Safe.h"
#import "CountDownHelper.h"
@interface XPReceiveRedPacketView()<UITableViewDelegate, UITableViewDataSource>
@interface XPReceiveRedPacketView()<CountDownHelperDelegate>
@property (nonatomic, strong) XPRedPacketResultModel *resultData;
@@ -37,25 +38,29 @@
@property (nonatomic, strong) UILabel *sendNickLabel;
///
@property (nonatomic, strong) UILabel *sendWishLabel;
///
///
@property(nonatomic,strong) UIView *sendWishView;
///
@property (nonatomic, strong) UIButton *openButton;
///icon
@property(nonatomic,strong) UIImageView *robIcon;
///
@property(nonatomic,strong) UILabel *robView;
///
@property(nonatomic,strong) UILabel *countDownView;
///
@property(nonatomic,strong) UILabel *countDownTitleView;
///
@property (nonatomic, strong) UIButton *closeBtn;
///
@property (nonatomic, strong) UIView *diamondContentView;
@property (nonatomic, strong) UIImageView *diamondImage;
@property (nonatomic, strong) UILabel *diamondLabel;
///
@property (nonatomic, strong) UILabel *getLabel;
///
@property (nonatomic, strong) UILabel *openSituationLabel;
///
@property (nonatomic, strong) UITableView *tableView;
///
@property (nonatomic,strong) CountDownHelper *countDownHelper;
@end
@implementation XPReceiveRedPacketView
-(void)dealloc{
}
- (instancetype)initWithFrame:(CGRect)frame {
if (self = [super initWithFrame:frame]) {
[self initSubViews];
@@ -68,11 +73,21 @@
- (void)initSubViews {
[self addSubview:self.alphaView];
[self addSubview:self.bgImageView];
[self addSubview:self.sendAvatar];
[self addSubview:self.sendNickLabel];
[self addSubview:self.sendWishLabel];
[self addSubview:self.openButton];
[self addSubview:self.closeBtn];
[self.bgImageView addSubview:self.closeBtn];
[self.bgImageView addSubview:self.sendAvatar];
[self.bgImageView addSubview:self.sendNickLabel];
[self.bgImageView addSubview:self.sendWishView];
[self.sendWishView addSubview:self.sendWishLabel];
[self.bgImageView addSubview:self.openButton];
[self.bgImageView addSubview:self.robIcon];
[self.bgImageView addSubview:self.robView];
[self.bgImageView addSubview:self.countDownView];
[self.bgImageView addSubview:self.countDownTitleView];
self.robIcon.hidden = YES;
self.countDownView.hidden = YES;
self.countDownTitleView.hidden = YES;
[self.bgImageView addSubview:self.robView];
[self.countDownHelper openCountdownWithTime:60];
}
- (void)initSubViewConstraints {
@@ -80,36 +95,67 @@
make.edges.mas_equalTo(0);
}];
[self.bgImageView mas_makeConstraints:^(MASConstraintMaker *make) {
make.width.mas_equalTo(310);
make.height.mas_equalTo(450);
make.width.mas_equalTo(kGetScaleWidth(327));
make.height.mas_equalTo(kGetScaleWidth(466));
make.centerX.centerY.mas_equalTo(self);
}];
[self.closeBtn mas_makeConstraints:^(MASConstraintMaker *make) {
make.top.mas_equalTo(self.bgImageView.mas_bottom).mas_offset(25);
make.height.width.mas_equalTo(35);
make.centerX.mas_equalTo(self.bgImageView);
make.top.mas_equalTo(kGetScaleWidth(39));
make.height.width.mas_equalTo(kGetScaleWidth(28));
make.trailing.mas_equalTo(-kGetScaleWidth(8));
}];
[self.sendAvatar mas_makeConstraints:^(MASConstraintMaker *make) {
make.centerX.mas_equalTo(self.bgImageView);
make.top.mas_equalTo(self.bgImageView).mas_offset(71);
make.width.height.mas_equalTo(88);
make.top.mas_equalTo(self.bgImageView).mas_offset(kGetScaleWidth(94));
make.width.height.mas_equalTo(kGetScaleWidth(65));
}];
[self.sendNickLabel mas_makeConstraints:^(MASConstraintMaker *make) {
make.centerX.mas_equalTo(self.bgImageView);
make.top.mas_equalTo(self.sendAvatar.mas_bottom).mas_offset(9);
make.height.mas_equalTo(18);
make.left.mas_equalTo(self.bgImageView).mas_offset(16);
make.top.mas_equalTo(self.sendAvatar.mas_bottom).mas_offset(kGetScaleWidth(4));
make.height.mas_equalTo(kGetScaleWidth(22));
make.width.mas_equalTo(kGetScaleWidth(200));
}];
[self.sendWishLabel mas_makeConstraints:^(MASConstraintMaker *make) {
[self.sendWishView mas_makeConstraints:^(MASConstraintMaker *make) {
make.width.mas_lessThanOrEqualTo(kGetScaleWidth(235));
make.top.equalTo(self.sendNickLabel.mas_bottom).mas_offset(kGetScaleWidth(10));
make.height.mas_equalTo(kGetScaleWidth(35));
make.centerX.mas_equalTo(self.bgImageView);
make.left.mas_equalTo(self.bgImageView).mas_offset(30);
make.top.mas_equalTo(self.sendNickLabel.mas_bottom).mas_offset(30);
}];
[self.sendWishLabel mas_makeConstraints:^(MASConstraintMaker *make) {
make.center.mas_equalTo(self.sendWishView);
make.leading.trailing.equalTo(self.sendWishView).inset(kGetScaleWidth(10));
}];
[self.openButton mas_makeConstraints:^(MASConstraintMaker *make) {
make.centerX.mas_equalTo(self.bgImageView);
make.width.height.mas_equalTo(107);
make.bottom.mas_equalTo(self.bgImageView).mas_offset(-75);
make.top.equalTo(self.sendWishView.mas_bottom).mas_offset(kGetScaleWidth(14));
make.width.mas_equalTo(kGetScaleWidth(143));
make.height.mas_equalTo(kGetScaleWidth(124));
}];
[self.robIcon mas_makeConstraints:^(MASConstraintMaker *make) {
make.height.mas_equalTo(kGetScaleWidth(34));
make.width.mas_equalTo(kGetScaleWidth(38));
make.centerX.mas_equalTo(self.bgImageView);
make.top.equalTo(self.sendWishView.mas_bottom).mas_offset(kGetScaleWidth(59));
}];
[self.robView mas_makeConstraints:^(MASConstraintMaker *make) {
make.top.equalTo(self.sendWishView.mas_bottom).mas_offset(kGetScaleWidth(56));
make.centerX.mas_equalTo(self.bgImageView);
make.height.mas_equalTo(kGetScaleWidth(40));
}];
[self.countDownView mas_makeConstraints:^(MASConstraintMaker *make) {
make.top.equalTo(self.sendWishView.mas_bottom).mas_offset(kGetScaleWidth(51));
make.centerX.mas_equalTo(self.bgImageView);
make.height.mas_equalTo(kGetScaleWidth(28));
}];
[self.countDownTitleView mas_makeConstraints:^(MASConstraintMaker *make) {
make.top.equalTo(self.sendWishView.mas_bottom).mas_offset(kGetScaleWidth(79));
make.centerX.mas_equalTo(self.bgImageView);
make.height.mas_equalTo(kGetScaleWidth(17));
}];
}
@@ -128,30 +174,22 @@
self.sendNickLabel.text = redPacketModel.sendUserNick;
} else {
NSString *nick = redPacketModel.sendUserNick;
if (redPacketModel.sendUserNick.length > 6) {
nick = [NSString stringWithFormat:@"%@...", [redPacketModel.sendUserNick substringToIndex:6]];
}
NSString *roomTitle = redPacketModel.roomTitle;
if (redPacketModel.roomTitle.length > 6) {
roomTitle = [NSString stringWithFormat:@"%@...", [redPacketModel.roomTitle substringToIndex:6]];
}
self.sendNickLabel.text = nick;
// NSMutableAttributedString *attribute = [[NSMutableAttributedString alloc] init];
// NSMutableAttributedString *roomAttr = [[NSMutableAttributedString alloc] initWithString:roomTitle attributes:@{NSForegroundColorAttributeName : UIColorFromRGB(0xFDCD00)}];
// NSMutableAttributedString *redPacketStr = [[NSMutableAttributedString alloc] initWithString:YMLocalizedString(@"XPReceiveRedPacketView0") attributes:@{NSForegroundColorAttributeName : [UIColor whiteColor]}];
// NSMutableAttributedString *nickAttr = [[NSMutableAttributedString alloc] initWithString:nick attributes:@{NSForegroundColorAttributeName : UIColorFromRGB(0xFDCD00)}];
// [attribute appendAttributedString:roomAttr];
// [attribute appendAttributedString:redPacketStr];
// [attribute appendAttributedString:nickAttr];
// self.sendNickLabel.attributedText = attribute;
NSMutableAttributedString *attribute = [[NSMutableAttributedString alloc] init];
NSMutableAttributedString *roomAttr = [[NSMutableAttributedString alloc] initWithString:roomTitle attributes:@{NSForegroundColorAttributeName : UIColorFromRGB(0xFDCD00)}];
NSMutableAttributedString *redPacketStr = [[NSMutableAttributedString alloc] initWithString:YMLocalizedString(@"XPReceiveRedPacketView0") attributes:@{NSForegroundColorAttributeName : [UIColor whiteColor]}];
NSMutableAttributedString *nickAttr = [[NSMutableAttributedString alloc] initWithString:nick attributes:@{NSForegroundColorAttributeName : UIColorFromRGB(0xFDCD00)}];
[attribute appendAttributedString:roomAttr];
[attribute appendAttributedString:redPacketStr];
[attribute appendAttributedString:nickAttr];
self.sendNickLabel.attributedText = attribute;
[self.openButton setImage:[UIImage imageNamed:@"redPacket_openRoom"] forState:UIControlStateNormal];
[self.openButton mas_remakeConstraints:^(MASConstraintMaker *make) {
make.centerX.mas_equalTo(self.bgImageView);
make.width.mas_equalTo(147);
make.height.mas_equalTo(67);
make.bottom.mas_equalTo(self.bgImageView).mas_offset(-97);
}];
}
}
}
@@ -239,135 +277,149 @@
///
- (void)showRedPacketResultViewWithResultData:(XPRedPacketResultModel *)resultData {
self.openButton.hidden = YES;
[self addSubview:self.getLabel];
[self addSubview:self.openSituationLabel];
[self addSubview:self.tableView];
if (resultData.redEnvelopeState == RedPacketState_Success) {//
[self addSubview:self.diamondContentView];
[self.diamondContentView addSubview:self.diamondImage];
[self.diamondContentView addSubview:self.diamondLabel];
[self.diamondContentView mas_makeConstraints:^(MASConstraintMaker *make) {
make.top.mas_equalTo(self.bgImageView).mas_offset(30);
make.centerX.mas_equalTo(self);
make.height.mas_equalTo(27);
}];
[self.diamondImage mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.mas_equalTo(self.diamondContentView);
make.centerY.mas_equalTo(self.diamondContentView);
make.width.height.mas_equalTo(24);
}];
[self.diamondLabel mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.mas_equalTo(self.diamondImage.mas_right).mas_offset(6);
make.centerY.mas_equalTo(self.diamondContentView);
make.right.top.mas_equalTo(self.diamondContentView);
}];
[self.getLabel mas_makeConstraints:^(MASConstraintMaker *make) {
make.centerX.mas_equalTo(self);
make.top.mas_equalTo(self.diamondContentView.mas_bottom).mas_offset(10);
make.height.mas_equalTo(12);
}];
self.diamondLabel.text = resultData.currentUserAmount;
self.getLabel.text = YMLocalizedString(@"XPReceiveRedPacketView1");
} else if (resultData.redEnvelopeState == RedPacketState_Remain_Zero) {//
self.getLabel.text = YMLocalizedString(@"XPReceiveRedPacketView2");
[self.getLabel mas_makeConstraints:^(MASConstraintMaker *make) {
make.centerX.mas_equalTo(self);
make.top.mas_equalTo(self.bgImageView).mas_offset(59);
make.height.mas_equalTo(12);
}];
}
[self.sendAvatar mas_remakeConstraints:^(MASConstraintMaker *make) {
make.left.mas_equalTo(self.bgImageView).mas_offset(65);
make.top.mas_equalTo(self.bgImageView).mas_offset(128);
make.width.height.mas_equalTo(30);
}];
self.sendAvatar.layer.borderWidth = 1;
self.sendAvatar.layer.cornerRadius = 15;
[self.sendNickLabel mas_remakeConstraints:^(MASConstraintMaker *make) {
make.centerY.mas_equalTo(self.sendAvatar);
make.height.mas_equalTo(18);
make.left.mas_equalTo(self.sendAvatar.mas_right).mas_offset(7);
}];
[self.sendWishLabel mas_remakeConstraints:^(MASConstraintMaker *make) {
make.centerX.mas_equalTo(self.bgImageView);
make.left.mas_equalTo(self.bgImageView).mas_offset(30);
make.top.mas_equalTo(self.sendNickLabel.mas_bottom).mas_offset(15);
}];
[self.openSituationLabel mas_makeConstraints:^(MASConstraintMaker *make) {
make.top.mas_equalTo(self.sendWishLabel.mas_bottom).mas_offset(19);
make.height.mas_equalTo(10);
make.right.mas_equalTo(self.bgImageView).mas_offset(-38);
}];
[self.tableView mas_makeConstraints:^(MASConstraintMaker *make) {
make.top.mas_equalTo(self.openSituationLabel.mas_bottom).mas_offset(5);
make.left.right.mas_equalTo(self.bgImageView).inset(20);
make.height.mas_equalTo(205);
}];
self.bgImageView.image = [UIImage imageNamed:@"redPacket_result_bg"];
self.sendAvatar.imageUrl = resultData.redEnvelopeVO.userVO.avatar;
NSString *nick = resultData.redEnvelopeVO.userVO.nick;
if (resultData.redEnvelopeVO.userVO.nick.length > 6) {
nick = [NSString stringWithFormat:@"%@...", [resultData.redEnvelopeVO.userVO.nick substringToIndex:6]];
}
NSMutableAttributedString *attribute = [[NSMutableAttributedString alloc] init];
NSMutableAttributedString *nickAttr = [[NSMutableAttributedString alloc] initWithString:nick attributes:@{NSForegroundColorAttributeName : UIColorFromRGB(0xFDCD00)}];
NSMutableAttributedString *redPacketStr = [[NSMutableAttributedString alloc] initWithString:YMLocalizedString(@"XPReceiveRedPacketView3") attributes:@{NSForegroundColorAttributeName : [UIColor whiteColor]}];
[attribute appendAttributedString:nickAttr];
[attribute appendAttributedString:redPacketStr];
self.sendNickLabel.attributedText = attribute;
self.sendWishLabel.text = resultData.redEnvelopeVO.message;
self.openSituationLabel.text = [NSString stringWithFormat:YMLocalizedString(@"XPReceiveRedPacketView4"), resultData.redEnvelopeVO.pickNum, resultData.redEnvelopeVO.totalNum];
[self.tableView reloadData];
// [self addSubview:self.getLabel];
// [self addSubview:self.openSituationLabel];
// [self addSubview:self.tableView];
// if (resultData.redEnvelopeState == RedPacketState_Success) {//
// [self addSubview:self.diamondContentView];
// [self.diamondContentView addSubview:self.diamondImage];
// [self.diamondContentView addSubview:self.diamondLabel];
// [self.diamondContentView mas_makeConstraints:^(MASConstraintMaker *make) {
// make.top.mas_equalTo(self.bgImageView).mas_offset(30);
// make.centerX.mas_equalTo(self);
// make.height.mas_equalTo(27);
// }];
// [self.diamondImage mas_makeConstraints:^(MASConstraintMaker *make) {
// make.left.mas_equalTo(self.diamondContentView);
// make.centerY.mas_equalTo(self.diamondContentView);
// make.width.height.mas_equalTo(24);
// }];
// [self.diamondLabel mas_makeConstraints:^(MASConstraintMaker *make) {
// make.left.mas_equalTo(self.diamondImage.mas_right).mas_offset(6);
// make.centerY.mas_equalTo(self.diamondContentView);
// make.right.top.mas_equalTo(self.diamondContentView);
// }];
// [self.getLabel mas_makeConstraints:^(MASConstraintMaker *make) {
// make.centerX.mas_equalTo(self);
// make.top.mas_equalTo(self.diamondContentView.mas_bottom).mas_offset(10);
// make.height.mas_equalTo(12);
// }];
// self.diamondLabel.text = resultData.currentUserAmount;
// self.getLabel.text = YMLocalizedString(@"XPReceiveRedPacketView1");
// } else if (resultData.redEnvelopeState == RedPacketState_Remain_Zero) {//
// self.getLabel.text = YMLocalizedString(@"XPReceiveRedPacketView2");
// [self.getLabel mas_makeConstraints:^(MASConstraintMaker *make) {
// make.centerX.mas_equalTo(self);
// make.top.mas_equalTo(self.bgImageView).mas_offset(59);
// make.height.mas_equalTo(12);
// }];
// }
//
// [self.sendAvatar mas_remakeConstraints:^(MASConstraintMaker *make) {
// make.left.mas_equalTo(self.bgImageView).mas_offset(65);
// make.top.mas_equalTo(self.bgImageView).mas_offset(128);
// make.width.height.mas_equalTo(30);
// }];
// self.sendAvatar.layer.borderWidth = 1;
// self.sendAvatar.layer.cornerRadius = 15;
//
// [self.sendNickLabel mas_remakeConstraints:^(MASConstraintMaker *make) {
// make.centerY.mas_equalTo(self.sendAvatar);
// make.height.mas_equalTo(18);
// make.left.mas_equalTo(self.sendAvatar.mas_right).mas_offset(7);
// }];
// [self.sendWishLabel mas_remakeConstraints:^(MASConstraintMaker *make) {
// make.centerX.mas_equalTo(self.bgImageView);
// make.left.mas_equalTo(self.bgImageView).mas_offset(30);
// make.top.mas_equalTo(self.sendNickLabel.mas_bottom).mas_offset(15);
// }];
// [self.openSituationLabel mas_makeConstraints:^(MASConstraintMaker *make) {
// make.top.mas_equalTo(self.sendWishLabel.mas_bottom).mas_offset(19);
// make.height.mas_equalTo(10);
// make.right.mas_equalTo(self.bgImageView).mas_offset(-38);
// }];
// [self.tableView mas_makeConstraints:^(MASConstraintMaker *make) {
// make.top.mas_equalTo(self.openSituationLabel.mas_bottom).mas_offset(5);
// make.left.right.mas_equalTo(self.bgImageView).inset(20);
// make.height.mas_equalTo(205);
// }];
// self.bgImageView.image = [UIImage imageNamed:@"redPacket_result_bg"];
// self.sendAvatar.imageUrl = resultData.redEnvelopeVO.userVO.avatar;
// NSString *nick = resultData.redEnvelopeVO.userVO.nick;
// if (resultData.redEnvelopeVO.userVO.nick.length > 6) {
// nick = [NSString stringWithFormat:@"%@...", [resultData.redEnvelopeVO.userVO.nick substringToIndex:6]];
// }
// NSMutableAttributedString *attribute = [[NSMutableAttributedString alloc] init];
// NSMutableAttributedString *nickAttr = [[NSMutableAttributedString alloc] initWithString:nick attributes:@{NSForegroundColorAttributeName : UIColorFromRGB(0xFDCD00)}];
// NSMutableAttributedString *redPacketStr = [[NSMutableAttributedString alloc] initWithString:YMLocalizedString(@"XPReceiveRedPacketView3") attributes:@{NSForegroundColorAttributeName : [UIColor whiteColor]}];
// [attribute appendAttributedString:nickAttr];
// [attribute appendAttributedString:redPacketStr];
// self.sendNickLabel.attributedText = attribute;
// self.sendWishLabel.text = resultData.redEnvelopeVO.message;
// self.openSituationLabel.text = [NSString stringWithFormat:YMLocalizedString(@"XPReceiveRedPacketView4"), resultData.redEnvelopeVO.pickNum, resultData.redEnvelopeVO.totalNum];
// [self.tableView reloadData];
}
#pragma mark - tableviewDatasource
- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section {
return self.resultData.redEnvelopeItemVOs.count;
//- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section {
// return self.resultData.redEnvelopeItemVOs.count;
//}
//
//- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath{
// XPOpenRedPacketCell *cell = [tableView dequeueReusableCellWithIdentifier:NSStringFromClass([XPOpenRedPacketCell class]) forIndexPath:indexPath];
// cell.selectionStyle = UITableViewCellSelectionStyleNone;
// XPRedPacketPersonReceiveModel *model = [self.resultData.redEnvelopeItemVOs safeObjectAtIndex1:indexPath.row];
// cell.model = model;
// cell.backgroundColor = [UIColor clearColor];
// return cell;
//}
//
//- (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath {
// return 50;
//}
#pragma mark- CountDownHelperDelegate
///
- (void)onCountdownFinish{
}
- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath{
XPOpenRedPacketCell *cell = [tableView dequeueReusableCellWithIdentifier:NSStringFromClass([XPOpenRedPacketCell class]) forIndexPath:indexPath];
cell.selectionStyle = UITableViewCellSelectionStyleNone;
XPRedPacketPersonReceiveModel *model = [self.resultData.redEnvelopeItemVOs safeObjectAtIndex1:indexPath.row];
cell.model = model;
cell.backgroundColor = [UIColor clearColor];
return cell;
///
- (void)onCountdownOpen:(int)time{
NSInteger seconds = time;
int minutes = (seconds)%3600/60;
int second = (seconds)%60;
self.countDownView.text = [NSString stringWithFormat:@"%02d:%02d",minutes,second];
}
- (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath {
return 50;
}
#pragma mark - action
- (void)onCloseButtonClick:(UIButton *)sender {
[self removeFromSuperview];
}
#pragma mark - getter
- (UIView *)alphaView {
if (!_alphaView) {
_alphaView = [[UIView alloc] init];
_alphaView.backgroundColor = UIColorRGBAlpha(0x171213, 0.5);
_alphaView.backgroundColor = [UIColor colorWithWhite:0 alpha:0.4];
}
return _alphaView;
}
- (UIImageView *)bgImageView {
if (!_bgImageView) {
_bgImageView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"redPacket_receive_bg"]];
_bgImageView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"pi_red_packet_receive_bg"]];
_bgImageView.userInteractionEnabled = YES;
}
return _bgImageView;
}
- (NetImageView *)sendAvatar {
if (!_sendAvatar) {
_sendAvatar = [[NetImageView alloc] init];
NetImageConfig *config = [[NetImageConfig alloc]init];
config.placeHolder = [UIImageConstant defaultAvatarPlaceholder];
_sendAvatar = [[NetImageView alloc] initWithConfig:config];
_sendAvatar.layer.masksToBounds = YES;
_sendAvatar.layer.cornerRadius = 44;
_sendAvatar.layer.borderWidth = 2;
_sendAvatar.layer.borderColor = [UIColor whiteColor].CGColor;
_sendAvatar.layer.cornerRadius = kGetScaleWidth(65)/2;
}
return _sendAvatar;
}
@@ -375,22 +427,31 @@
- (UIView *)sendNickLabel {
if (!_sendNickLabel) {
UILabel *label = [[UILabel alloc] init];
label.font = [UIFont systemFontOfSize:18];
label.textColor = UIColorFromRGB(0xF6E36F);
label.font = kFontMedium(16);
label.textColor = [UIColor whiteColor];
label.textAlignment = NSTextAlignmentCenter;
_sendNickLabel = label;
}
return _sendNickLabel;
}
-(UIView *)sendWishView{
if(!_sendWishView){
_sendWishView = [UIView new];
_sendWishView.backgroundColor = UIColorRGBAlpha(0xF52727, 0.4);
_sendWishView.layer.cornerRadius = kGetScaleWidth(8);
_sendWishView.layer.masksToBounds = YES;
_sendWishView.layer.borderWidth = 1;
_sendWishView.layer.borderColor = [UIColor whiteColor].CGColor;
}
return _sendWishView;
}
- (UILabel *)sendWishLabel {
if (!_sendWishLabel) {
UILabel *label = [[UILabel alloc] init];
label.font = [UIFont systemFontOfSize:16 weight:UIFontWeightMedium];
label.textColor = [UIColor whiteColor];
label.numberOfLines = 0;
label.textAlignment = NSTextAlignmentCenter;
_sendWishLabel = label;
_sendWishLabel.font = kFontRegular(11);
}
return _sendWishLabel;
}
@@ -398,7 +459,7 @@
- (UIButton *)openButton {
if (!_openButton) {
_openButton = [[UIButton alloc] init];
[_openButton setImage:[UIImage imageNamed:@"redPacket_open"] forState:UIControlStateNormal];
[_openButton setImage:[UIImage imageNamed:@"pi_red_packet_receive_open"] forState:UIControlStateNormal];
[_openButton addTarget:self action:@selector(onOpenButtonClick:) forControlEvents:UIControlEventTouchUpInside];
}
return _openButton;
@@ -407,70 +468,47 @@
- (UIButton *)closeBtn {
if (!_closeBtn) {
_closeBtn = [[UIButton alloc] init];
[_closeBtn setImage:[UIImage imageNamed:@"common_close_white"] forState:UIControlStateNormal];
[_closeBtn setImage:[UIImage imageNamed:@"pi_red_packet_receive_colse"] forState:UIControlStateNormal];
[_closeBtn addTarget:self action:@selector(onCloseButtonClick:) forControlEvents:UIControlEventTouchUpInside];
}
return _closeBtn;
}
- (UIView *)diamondContentView {
if (!_diamondContentView) {
_diamondContentView = [[UIView alloc] init];
- (UIImageView *)robIcon{
if(!_robIcon){
_robIcon = [UIImageView new];
_robIcon.image = kImage(@"pi_red_packet_receive_rob");
}
return _diamondContentView;
return _robIcon;
}
-(UILabel *)robView{
if(!_robView){
_robView = [UILabel labelInitWithText:YMLocalizedString(@"XPReceiveRedPacketView7") font:kFontMedium(14) textColor:UIColorFromRGB(0xBF461F)];
_robView.textAlignment = NSTextAlignmentCenter;
_robView.numberOfLines = 2;
}
return _robView;
}
- (UIImageView *)diamondImage {
if (!_diamondImage) {
_diamondImage = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"common_diamond"]];
- (CountDownHelper *)countDownHelper{
if (!_countDownHelper){
_countDownHelper = [[CountDownHelper alloc]init];
_countDownHelper.delegate = self;
}
return _diamondImage;
return _countDownHelper;
}
- (UILabel *)diamondLabel {
if (!_diamondLabel) {
UILabel *label = [[UILabel alloc] init];
label.font = [UIFont systemFontOfSize:36 weight:UIFontWeightMedium];
label.textColor = UIColorFromRGB(0xE12D31);
_diamondLabel = label;
- (UILabel *)countDownTitleView{
if(!_countDownTitleView){
_countDownTitleView = [UILabel labelInitWithText:YMLocalizedString(@"XPReceiveRedPacketView6") font:kFontMedium(12) textColor:UIColorFromRGB(0xBF461F)];
_countDownTitleView.textAlignment = NSTextAlignmentCenter;
}
return _diamondLabel;
return _countDownTitleView;
}
- (UILabel *)getLabel {
if (!_getLabel) {
UILabel *label = [[UILabel alloc] init];
label.font = [UIFont systemFontOfSize:12];
label.textColor = UIColorFromRGB(0xCF9380);
label.textAlignment = NSTextAlignmentCenter;
label.text = YMLocalizedString(@"XPReceiveRedPacketView2");
_getLabel = label;
- (UILabel *)countDownView{
if(!_countDownView){
_countDownView = [UILabel labelInitWithText:@"00:00" font:kFontRegular(20) textColor:UIColorFromRGB(0xBF461F)];
_countDownView.textAlignment = NSTextAlignmentCenter;
}
return _getLabel;
return _countDownView;
}
- (UILabel *)openSituationLabel {
if (!_openSituationLabel) {
UILabel *label = [[UILabel alloc] init];
label.font = [UIFont systemFontOfSize:10 weight:UIFontWeightMedium];
label.textColor = UIColorRGBAlpha(0xffffff, 0.5);
_openSituationLabel = label;
}
return _openSituationLabel;
}
- (UITableView *)tableView {
if (!_tableView) {
_tableView = [[UITableView alloc] init];
[_tableView registerClass:[XPOpenRedPacketCell class] forCellReuseIdentifier:NSStringFromClass([XPOpenRedPacketCell class])];
_tableView.delegate = self;
_tableView.dataSource = self;
_tableView.separatorStyle = UITableViewCellSeparatorStyleNone;
_tableView.layer.cornerRadius = 20;
_tableView.layer.masksToBounds = YES;
_tableView.backgroundColor = UIColorFromRGB(0xCC2247);
}
return _tableView;
}
@end

View File

@@ -1229,7 +1229,6 @@
- (NetImageView *)experImageView {
if (!_experImageView) {
NetImageConfig * config = [[NetImageConfig alloc] init];
config.placeHolder = [UIImageConstant defaultAvatarPlaceholder];
config.imageType = ImageTypeUserCardLevel;
_experImageView = [[NetImageView alloc] initWithConfig:config];
_experImageView.userInteractionEnabled = YES;
@@ -1242,7 +1241,6 @@
- (NetImageView *)charmImageView {
if (!_charmImageView) {
NetImageConfig * config = [[NetImageConfig alloc] init];
config.placeHolder = [UIImageConstant defaultAvatarPlaceholder];
config.imageType = ImageTypeUserCardLevel;
_charmImageView = [[NetImageView alloc] initWithConfig:config];
_charmImageView.userInteractionEnabled = YES;
@@ -1255,7 +1253,6 @@
- (NetImageView *)nobleIconImageView {
if (!_nobleIconImageView) {
NetImageConfig * config = [[NetImageConfig alloc] init];
config.placeHolder = [UIImageConstant defaultAvatarPlaceholder];
config.imageType = ImageTypeUserCardLevel;
_nobleIconImageView = [[NetImageView alloc] initWithConfig:config];
_nobleIconImageView.contentMode = UIViewContentModeScaleAspectFit;
@@ -1275,7 +1272,6 @@
- (NetImageView *)nameplateImageView {
if (!_nameplateImageView) {
NetImageConfig * config = [[NetImageConfig alloc] init];
config.placeHolder = [UIImageConstant defaultAvatarPlaceholder];
config.imageType = ImageTypeUserCardLevel;
_nameplateImageView = [[NetImageView alloc] initWithConfig:config];
_nameplateImageView.userInteractionEnabled = YES;

View File

@@ -83,6 +83,7 @@
#import "PIFullScreenBannerAnimation.h"
#import <SVGA.h>
#import "Api+Gift.h"
#import "PIReceiveRedPacketSuccessView.h"
NSString * const kUserFirstLoginKey = @"kUserFirstLoginKey";
NSString * const kHadLaunchApp = @"kHadLaunchApp";
NSString * const kLastShowAnchorCardTime = @"kLastShowAnchorCardTime";
@@ -170,7 +171,13 @@ UIKIT_EXTERN NSString *kTabShowAnchorCardKey;
dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(3.0 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
PIReceiveRedPacketSuccessView *view = [[PIReceiveRedPacketSuccessView alloc] initWithFrame:CGRectMake(0, 0, KScreenWidth, KScreenHeight)];
[kWindow addSubview:view];
});
}

View File

@@ -13,6 +13,9 @@
@end
@implementation CountDownHelper
-(void)dealloc{
[self stopCountDown];
}
-(instancetype)init{
self = [super init];
if(self){

View File

@@ -1664,6 +1664,8 @@
"XPReceiveRedPacketView3" = "的红包";
"XPReceiveRedPacketView4" = "领取%@/%@个";
"XPReceiveRedPacketView5" = "抢完了,下次早点来哦";
"XPReceiveRedPacketView6" = "后开抢";
"XPReceiveRedPacketView7" = "发弹幕\n抢红包";
"XPRoomViewController0" = "抱歉,您暂时无法进入该房间";
"XPRoomViewController1" = "%@的房间";
@@ -3135,6 +3137,18 @@
///PIRoomSendRedPacketVC
"PIRoomSendRedPacketVC0"="厅内红包";
"PIRoomSendRedPacketVC1"="全服红包";
///PIRoomSendRedPacketItemVC
"PIRoomSendRedPacketItemVC0"="红包金额";
"PIRoomSendRedPacketItemVC1"="红包数量";
"PIRoomSendRedPacketItemVC2"="钻";
"PIRoomSendRedPacketItemVC3"="个";
"PIRoomSendRedPacketItemVC4"="立即生效";
"PIRoomSendRedPacketItemVC5"="限时生效";
"PIRoomSendRedPacketItemVC6"="未抢完的红包将在12小时后返还你的钱包";
///PIInputScrollingView
"PIInputScrollingView0"="输入指定弹幕内容最多10个字符";
///PIInputEntireServerScrollingView
"PIInputEntireServerScrollingView0"="恭喜发财,大吉大利!";
///不能脚本生成的
"App_Common_And" = "和";
"App_Common_Male" = "男";

View File

@@ -1665,6 +1665,8 @@
"XPReceiveRedPacketView3" = "的紅包";
"XPReceiveRedPacketView4" = "領取%@/%@個";
"XPReceiveRedPacketView5" = "搶完了,下次早點來哦";
"XPReceiveRedPacketView6" = "後開搶";
"XPReceiveRedPacketView7" = "發彈幕\n搶紅包";
"XPRoomViewController0" = "抱歉,您暫時無法進入該房間";
"XPRoomViewController1" = "%@的房間";
@@ -3140,6 +3142,18 @@
///PIRoomSendRedPacketVC
"PIRoomSendRedPacketVC0"="廳內紅包";
"PIRoomSendRedPacketVC1"="全服紅包";
///PIRoomSendRedPacketItemVC
"PIRoomSendRedPacketItemVC0"="紅包金額";
"PIRoomSendRedPacketItemVC1"="紅包數量";
"PIRoomSendRedPacketItemVC2"="鉆";
"PIRoomSendRedPacketItemVC3"="個";
"PIRoomSendRedPacketItemVC4"="立即生效";
"PIRoomSendRedPacketItemVC5"="限時生效";
"PIRoomSendRedPacketItemVC6"="未搶完的紅包將在12小時後返還你的錢包";
///PIInputScrollingView
"PIInputScrollingView0"="輸入指定彈幕內容最多10個字符";
///PIInputEntireServerScrollingView
"PIInputEntireServerScrollingView0"="恭喜發財,大吉大利!";
///不能腳本生成的
"App_Common_And" = "和";
"App_Common_Male" = "男";