红包UI

YuMi.xcodeproj/project.pbxproj

@@ -304,6 +304,7 @@
 		23D321DF2ADFCEB2006B259C /* PIRedPacketChooseTypeView.m in Sources */ = {isa = PBXBuildFile; fileRef = 23D321DE2ADFCEB2006B259C /* PIRedPacketChooseTypeView.m */; };
 		23D321E22ADFD0FB006B259C /* PIRedPacketChooseTypeCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 23D321E12ADFD0FB006B259C /* PIRedPacketChooseTypeCell.m */; };
 		23D321E52ADFE900006B259C /* PIRoomSendRedPacketVC.m in Sources */ = {isa = PBXBuildFile; fileRef = 23D321E42ADFE900006B259C /* PIRoomSendRedPacketVC.m */; };
+		23D321E82ADFED10006B259C /* PIRoomSendRedPacketItemVC.m in Sources */ = {isa = PBXBuildFile; fileRef = 23D321E72ADFED0F006B259C /* PIRoomSendRedPacketItemVC.m */; };
 		23D8DEF22AC5633300644637 /* PIIAPRegulate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 23D8DEF12AC5633300644637 /* PIIAPRegulate.swift */; };
 		23E45C052AC2B0A200D88BCA /* SessionDiscoverNewTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 23E45C042AC2B0A200D88BCA /* SessionDiscoverNewTableViewCell.m */; };
 		23E9E9972A80C3A100B792F2 /* XPMineGuildPersonalBillRecordVC.m in Sources */ = {isa = PBXBuildFile; fileRef = 23E9E9942A80C39F00B792F2 /* XPMineGuildPersonalBillRecordVC.m */; };
@@ -2031,6 +2032,8 @@
 		23D321E12ADFD0FB006B259C /* PIRedPacketChooseTypeCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PIRedPacketChooseTypeCell.m; sourceTree = "<group>"; };
 		23D321E32ADFE900006B259C /* PIRoomSendRedPacketVC.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PIRoomSendRedPacketVC.h; sourceTree = "<group>"; };
 		23D321E42ADFE900006B259C /* PIRoomSendRedPacketVC.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PIRoomSendRedPacketVC.m; sourceTree = "<group>"; };
+		23D321E62ADFED0F006B259C /* PIRoomSendRedPacketItemVC.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PIRoomSendRedPacketItemVC.h; sourceTree = "<group>"; };
+		23D321E72ADFED0F006B259C /* PIRoomSendRedPacketItemVC.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PIRoomSendRedPacketItemVC.m; sourceTree = "<group>"; };
 		23D8DEF12AC5633300644637 /* PIIAPRegulate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PIIAPRegulate.swift; sourceTree = "<group>"; };
 		23E45C032AC2B0A200D88BCA /* SessionDiscoverNewTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SessionDiscoverNewTableViewCell.h; sourceTree = "<group>"; };
 		23E45C042AC2B0A200D88BCA /* SessionDiscoverNewTableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SessionDiscoverNewTableViewCell.m; sourceTree = "<group>"; };
@@ -5973,6 +5976,8 @@
 				9BA812D528BF52E100783EA7 /* XPRoomSendRedPacketViewController.m */,
 				23D321E32ADFE900006B259C /* PIRoomSendRedPacketVC.h */,
 				23D321E42ADFE900006B259C /* PIRoomSendRedPacketVC.m */,
+				23D321E62ADFED0F006B259C /* PIRoomSendRedPacketItemVC.h */,
+				23D321E72ADFED0F006B259C /* PIRoomSendRedPacketItemVC.m */,
 				9BA812E228BF70A600783EA7 /* XPRoomRedPacketPwdView.h */,
 				9BA812E328BF70A600783EA7 /* XPRoomRedPacketPwdView.m */,
 				9B42868C28C1AE2D009034D2 /* XPReceiveRedPacketView.h */,
@@ -10598,6 +10603,7 @@
 				E8A3539128FE5F0F0014A784 /* WishGiftInfoModel.m in Sources */,
 				2305EEF62AD67E5500AD403C /* PIRoomPhotoAlbumItemCell.m in Sources */,
 				E85E7B3C2A4EB0D300B6D00A /* XPGuildSuperAdminRoomCollectionViewCell.m in Sources */,
+				23D321E82ADFED10006B259C /* PIRoomSendRedPacketItemVC.m in Sources */,
 				E85E7B2A2A4EB0D300B6D00A /* XPGuildTimeMonthPickerView.m in Sources */,
 				E87E62782A3F5907002F68C9 /* XPNewHomePartyTableViewCell.m in Sources */,
 				238B37B72AC55A2C00BFC9D5 /* XPTreasureFairySendRecordCell.m in Sources */,

YuMi/Assets.xcassets/yna/RedPacket/pi_red_packet_top_diamond_bg.imageset/Contents.json

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

YuMi/Assets.xcassets/yna/RedPacket/pi_red_packet_top_diamond_icon 1.imageset/Contents.json

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

YuMi/Assets.xcassets/yna/RedPacket/pi_red_packet_top_diamond_icon.imageset/Contents.json

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

YuMi/Assets.xcassets/yna/RedPacket/pi_red_packet_top_icon_logo.imageset/Contents.json

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

YuMi/Assets.xcassets/yna/RedPacket/pi_red_packet_top_tip_logo.imageset/Contents.json

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

YuMi/Modules/YMRoom/View/SendRedPacket/PIRoomSendRedPacketItemVC.h

@@ -0,0 +1,16 @@
+//
+//  PIRoomSendRedPacketItemVC.h
+//  YuMi
+//
+//  Created by duoban on 2023/10/18.
+//
+
+#import "MvpViewController.h"
+#import <JXCategoryView/JXCategoryListContainerView.h>
+NS_ASSUME_NONNULL_BEGIN
+
+@interface PIRoomSendRedPacketItemVC : MvpViewController<JXCategoryListContentViewDelegate>
+
+@end
+
+NS_ASSUME_NONNULL_END

YuMi/Modules/YMRoom/View/SendRedPacket/PIRoomSendRedPacketItemVC.m

@@ -0,0 +1,33 @@
+//
+//  PIRoomSendRedPacketItemVC.m
+//  YuMi
+//
+//  Created by duoban on 2023/10/18.
+//
+
+#import "PIRoomSendRedPacketItemVC.h"
+
+@interface PIRoomSendRedPacketItemVC ()
+
+@end
+
+@implementation PIRoomSendRedPacketItemVC
+
+- (void)viewDidLoad {
+    [super viewDidLoad];
+    [self installUI];
+    [self installConstraints];
+}
+-(void)installUI{
+    
+}
+-(void)installConstraints{
+    
+}
+#pragma mark - JXCategoryListContentViewDelegate
+- (UIView *)listView {
+    return self.view;
+}
+#pragma mark - 懒加载
+
+@end

YuMi/Modules/YMRoom/View/SendRedPacket/PIRoomSendRedPacketVC.m

@@ -6,11 +6,22 @@
 //
 
 #import "PIRoomSendRedPacketVC.h"
-
+#import <JXCategoryView/JXCategoryView.h>
-@interface PIRoomSendRedPacketVC ()
+#import <JXCategoryView/JXCategoryIndicatorBackgroundView.h>
+#import <JXCategoryView/JXCategoryListContainerView.h>
+#import "PIRoomSendRedPacketItemVC.h"
+@interface PIRoomSendRedPacketVC ()<JXCategoryViewDelegate, JXCategoryListContainerViewDelegate>
+///分页标题
+@property (nonatomic, strong) NSArray<NSString *> *titles;
+///分页控件
+@property (nonatomic, strong) JXCategoryTitleView *titleView;
+///分页lineView
+@property (nonatomic, strong) JXCategoryListContainerView *contentView;
 @property(nonatomic,strong) UIView *bgView;
 @property(nonatomic,strong) UIImageView *topImageView;
 @property(nonatomic,strong) UIButton *tipsBtn;
+@property(nonatomic,strong) UIImageView *diamondNumView;
+@property(nonatomic,strong) UILabel *diamondNumTextView;
 @end
 
 @implementation PIRoomSendRedPacketVC
@@ -24,20 +35,146 @@
     self.view.backgroundColor = [UIColor clearColor];
     self.navigationController.view.backgroundColor = [UIColor clearColor];
     [self.navigationController setNavigationBarHidden:YES];
+    
+    
+    [self.view addSubview:self.bgView];
+    [self.view addSubview:self.topImageView];
+    [self.view addSubview:self.titleView];
+    [self.view addSubview:self.contentView];
 }
 -(void)installConstraints{
+    [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.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));
+    }];
+    
+    [self.contentView mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.top.mas_equalTo(self.titleView.mas_bottom);
+        make.left.right.bottom.mas_equalTo(self.view);
+    }];
+}
+#pragma mark - JXCategoryViewDelegate
+- (NSInteger)numberOfListsInlistContainerView:(JXCategoryListContainerView *)listContainerView {
+    return self.titles.count;
+}
+
+- (id<JXCategoryListContentViewDelegate>)listContainerView:(JXCategoryListContainerView *)listContainerView initListForIndex:(NSInteger)index {
+    
+    UIViewController<JXCategoryListContentViewDelegate> * list = (UIViewController<JXCategoryListContentViewDelegate> *)[self.contentView.validListDict objectForKey:[NSNumber numberWithInteger:index]];
+    if (list) {
+        return list;
+    } else {
+        PIRoomSendRedPacketItemVC *vc = [[PIRoomSendRedPacketItemVC alloc]init];
+      
+        return vc;
+    }
+}
+-(void)tipsAction{
     
 }
 #pragma mark - 懒加载
-
+- (UIView *)bgView{
-/*
+    if(!_bgView){
-#pragma mark - Navigation
+        _bgView = [UIView new];
-
+        _bgView.backgroundColor = [UIColor whiteColor];
-// In a storyboard-based application, you will often want to do a little preparation before navigation
+    }
-- (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender {
+    return _bgView;
-    // Get the new view controller using [segue destinationViewController].
+}
-    // Pass the selected object to the new view controller.
+- (UIImageView *)topImageView{
+    if(!_topImageView){
+        _topImageView = [UIImageView new];
+        _topImageView.image = kImage(@"pi_red_packet_top_icon_logo");
+        _topImageView.userInteractionEnabled = YES;
+    }
+    return _topImageView;
+}
+- (UIButton *)tipsBtn{
+    if(!_tipsBtn){
+        _tipsBtn = [UIButton new];
+        [_tipsBtn setEnlargeEdgeWithTop:10 right:10 bottom:10 left:10];
+        [_tipsBtn addTarget:self action:@selector(tipsAction) forControlEvents:UIControlEventTouchUpInside];
+        [_tipsBtn setBackgroundImage:kImage(@"pi_red_packet_top_tip_logo") forState:UIControlStateNormal];
+    }
+    return _tipsBtn;
+}
+- (UIImageView *)diamondNumView{
+    if(!_diamondNumView){
+        _diamondNumView = [UIImageView new];
+        _diamondNumView.image = kImage(@"pi_red_packet_top_diamond_bg");
+    }
+    return _diamondNumView;
+}
+- (UILabel *)diamondNumTextView{
+    if(!_diamondNumTextView){
+        _diamondNumTextView = [UILabel new];
+        NSMutableAttributedString *numAtt = [[NSMutableAttributedString alloc]initWithString:@"9999" attributes:@{NSFontAttributeName:kFontMedium(13),NSForegroundColorAttributeName:[UIColor whiteColor]}];
+        NSTextAttachment * diamondAttachment = [[NSTextAttachment alloc] init];
+        UIImage *diamondIconImage = [UIImage imageNamed:@"pi_red_packet_top_diamond_icon"];;
+        diamondAttachment.bounds = CGRectMake(0, roundf(kFontMedium(13).capHeight - diamondIconImage.size.height)/2.f, diamondIconImage.size.width, diamondIconImage.size.height);
+
+        diamondAttachment.image = diamondIconImage;
+        NSAttributedString * diamondAtt = [NSMutableAttributedString attributedStringWithAttachment:(NSTextAttachment *)diamondAttachment];
+        [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);
+
+        addAttachment.image = addIconImage;
+        NSAttributedString * addAtt = [NSMutableAttributedString attributedStringWithAttachment:(NSTextAttachment *)addAttachment];
+        [numAtt insertAttributedString:addAtt atIndex:numAtt.length];
+        _diamondNumTextView.attributedText = numAtt;
+    }
+    return _diamondNumTextView;
+}
+- (JXCategoryTitleView *)titleView {
+    if (!_titleView) {
+        _titleView = [[JXCategoryTitleView alloc] init];
+        _titleView.delegate = self;
+        _titleView.titles = self.titles;
+        _titleView.backgroundColor = [UIColor clearColor];
+        _titleView.titleColor = UIColorFromRGB(0x767585);
+        _titleView.titleSelectedColor = UIColorFromRGB(0xFF285C);
+        _titleView.titleFont =kFontMedium(18);
+        _titleView.titleSelectedFont = kFontSemibold(18);
+        _titleView.titleLabelAnchorPointStyle = JXCategoryTitleLabelAnchorPointStyleCenter;
+        _titleView.contentScrollViewClickTransitionAnimationEnabled = NO;
+        _titleView.averageCellSpacingEnabled = NO;
+        _titleView.contentEdgeInsetLeft = kGetScaleWidth(78);
+        _titleView.contentEdgeInsetRight = kGetScaleWidth(78);
+        _titleView.cellWidth = kGetScaleWidth(72);
+        _titleView.cellSpacing = kGetScaleWidth(75);
+        
+        _titleView.defaultSelectedIndex = 0;
+        _titleView.listContainer = self.contentView;
+        
+        
+        JXCategoryIndicatorImageView *lineView = [[JXCategoryIndicatorImageView alloc] init];
+        lineView.indicatorImageViewSize = CGSizeMake(kGetScaleWidth(12), kGetScaleWidth(4));
+        lineView.verticalMargin = 7;
+        lineView.indicatorImageView.image = [UIImage imageWithColor:UIColorFromRGB(0xFF285C)];
+        _titleView.indicators = @[lineView];
+    }
+    return _titleView;
+}
+- (NSArray<NSString *> *)titles{
+    return @[YMLocalizedString(@"PIRoomSendRedPacketVC0"),YMLocalizedString(@"PIRoomSendRedPacketVC1")];
+}
+- (JXCategoryListContainerView *)contentView {
+    if (!_contentView) {
+        _contentView = [[JXCategoryListContainerView alloc] initWithType:JXCategoryListContainerType_ScrollView delegate:self];
+        _contentView.defaultSelectedIndex = 0;
+    }
+    return _contentView;
 }
-*/
 
 @end

YuMi/zh-Hans.lproj/Localizable.strings

@@ -3132,6 +3132,9 @@
 "PIRedPacketChooseTypeView6"="分享房间可参与";
 "PIRedPacketChooseTypeView7"="發指定彈幕內容";
 "PIRedPacketChooseTypeView8"="抢红包条件";
+///PIRoomSendRedPacketVC
+"PIRoomSendRedPacketVC0"="厅内红包";
+"PIRoomSendRedPacketVC1"="全服红包";
 ///不能脚本生成的
 "App_Common_And" = "和";
 "App_Common_Male" = "男";

YuMi/zh-Hant.lproj/Localizable.strings

@@ -3137,6 +3137,9 @@
 "PIRedPacketChooseTypeView6"="分享房間可參與";
 "PIRedPacketChooseTypeView7"="發指定彈幕內容";
 "PIRedPacketChooseTypeView8"="搶紅包條件";
+///PIRoomSendRedPacketVC
+"PIRoomSendRedPacketVC0"="廳內紅包";
+"PIRoomSendRedPacketVC1"="全服紅包";
 ///不能腳本生成的
 "App_Common_And" = "和";
 "App_Common_Male" = "男";