提交

QXLive/Tabbar/QXTabbarController.m

@@ -25,6 +25,7 @@
 //#import "QXFirstRechargePopView.h"  // 首充
 #import "QXInvitePopView.h"  // 邀请
 #import "QXGiftDriftView.h" // 礼物飘屏
+#import "QXRedPacketDriftView.h" // 红包飘屏
 #import <ImSDK_Plus/ImSDK_Plus.h>
 #import "QXMessageServices.h"
 
@@ -267,34 +268,32 @@
 
 -(void)socketManager:(NSString *)socketManager receivedMessage:(NSDictionary *)message topic:(NSString *)topic{
     if ([topic isEqualToString:qx_room_topic]) {
-//        NSDictionary*dict = message[@"msg"];
-//        BOOL isList = YES;
-//        for (NSString *key in dict.allKeys) {
-//            if ([key isEqualToString:@"list"]) {
-//                isList = NO;
-//                break;
-//            }
-//        }
-//        if (isList) {
-            NSArray *array = [NSArray yy_modelArrayWithClass:[QXGiftScrollModel class] json:message[@"msg"][@"list"]];
-            if (array.count == 0) {
-                return;
-            }
-            [self.homeVC giftScrollViewShowWithModelList:array];
-            [[QXGiftDriftView shareView] addGiftModelList:array];
-//        }else{
-//            QXGiftScrollModel *model = [QXGiftScrollModel yy_modelWithJSON:message[@"msg"][@"list"]];
-//            [self.homeVC giftScrollViewShowWithModel:model];
-//            [[QXGiftDriftView shareView] addGiftModel:model];
-//        }
+        NSArray *array = [NSArray yy_modelArrayWithClass:[QXGiftScrollModel class] json:message[@"msg"][@"list"]];
+        if (array.count == 0) {
+            return;
+        }
+        [self.homeVC giftScrollViewShowWithModelList:array];
+        [[QXGiftDriftView shareView] addGiftModelList:array];
     }else if([topic isEqualToString:qx_ac_topic]){
+//        QXManagerMqttType
         QXMeetActivityDriftModel *model = [QXMeetActivityDriftModel yy_modelWithJSON:message[@"msg"]];
+        if (model.from_type == QXMeetActivityTypeAcProgress) {
+            [[NSNotificationCenter defaultCenter] postNotificationName:noticeXLHNotice object:model];
+            return;
+        }
+        if (model.from_type == QXMeetActivityTypeAcLock) {
+            [[NSNotificationCenter defaultCenter] postNotificationName:noticeXLHNotice object:model];
+        }
         [[QXMeetActivityDriftView shareView] addActivityModel:model];
     }else if ([topic isEqualToString:qx_hour_ranking]){
         NSArray *arr = [NSArray yy_modelArrayWithClass:[QXRoomHourDriftModel class] json:message[@"msg"]];
         [[QXDrifRoomHourRankView shareView] addActivityModelList:arr];
+    }else if ([topic isEqualToString:qx_red_redpacket]){
+        QXRedPacketDriftModel *model = [QXRedPacketDriftModel yy_modelWithJSON:message[@"msg"]];
+        [[QXRedPacketDriftView shareView] addRedpacketModel:model];
     }
     
+    
 }
 
 -(QXAppVersionView *)appUpdateView{

QXLive/Tabbar/弹窗/QXNewPeoplePopView.m

@@ -122,7 +122,7 @@
     UIImage *thirdDisImage = [UIImage imageWithColor:RGB16(0xE9E9E9)];
     [self.thirdBtn setBackgroundImage:thirdNorImage forState:(UIControlStateNormal)];
     [self.thirdBtn setBackgroundImage:thirdSelImage forState:(UIControlStateSelected)];
-    [self.thirdBtn setBackgroundImage:thirdDisImage forState:(UIControlStateSelected)];
+    [self.thirdBtn setBackgroundImage:thirdDisImage forState:(UIControlStateDisabled)];
 //    [self.thirdBtn setTitle:@"60元" forState:(UIControlStateNormal)];
     [self.thirdBtn setTitleColor:RGB16(0x333333) forState:(UIControlStateNormal)];
     [self.thirdBtn addRoundedCornersWithRadius:ScaleWidth(13)];

QXLive/Tabbar/飘屏/QXMeetActivityDriftView.h

@@ -6,14 +6,22 @@
 //
 
 #import <UIKit/UIKit.h>
+#import "QXGiftActivityModel.h"
 typedef NS_ENUM(NSInteger) {
-    /// 即将开始
-    QXMeetActivityDriftTypeWillStart = 1,
-    /// 已经开始
-    QXMeetActivityDriftTypeStart = 2,
-    /// 落入背包
-    QXMeetActivityDriftTypeFinished = 3,
-}QXMeetActivityDriftType;
+    /// 巡乐会进度更新
+    QXMeetActivityTypeAcProgress = 100,
+    /// 巡乐会即将开始
+    QXMeetActivityTypeAcWill = 101,
+    /// 巡乐会已经开始
+    QXMeetActivityTypeAcStart = 102,
+    /// 有人锁定了礼物
+    QXMeetActivityTypeAcLock = 103,
+    /// 巡乐会结束落包
+    QXMeetActivityTypeAcEnd = 104,
+   
+    
+}QXMeetActivityType;
+
 NS_ASSUME_NONNULL_BEGIN
 @class QXMeetActivityDriftModel;
 @interface QXMeetActivityDriftView : UIView
@@ -29,6 +37,14 @@ NS_ASSUME_NONNULL_BEGIN
 @interface QXMeetActivityDriftModel : NSObject
 @property (nonatomic,strong)NSString *room_id;
 @property (nonatomic,strong)NSString *text;
+@property (nonatomic,strong)NSString *gift_num;
+@property (nonatomic,strong)NSString *end_time;
+@property (nonatomic,strong)QXXLHModel *xlh_data;
+@property (nonatomic,strong)QXUserModel *room_user;
+@property (nonatomic,strong)QXUserModel *FromUserInfo;
 @property (nonatomic,assign)NSInteger from_type;
+
 @end
+
+
 NS_ASSUME_NONNULL_END

QXLive/Tabbar/飘屏/QXMeetActivityDriftView.m

@@ -101,15 +101,20 @@
     _model = model;
     self.titleLabel.text = model.text;
     switch (model.from_type) {
-        case QXMeetActivityDriftTypeWillStart:{
+        case QXMeetActivityTypeAcWill:{
             self.bgImageView.image = [UIImage imageNamed:@"ac_meet_will_pop_bg"];
         }
             break;
-        case QXMeetActivityDriftTypeStart:{
+        case QXMeetActivityTypeAcStart:{
             self.bgImageView.image = [UIImage imageNamed:@"ac_meet_start_pop_bg"];
         }
             break;
-        case QXMeetActivityDriftTypeFinished:{
+        case QXMeetActivityTypeAcEnd:{
+            self.bgImageView.image = [UIImage imageNamed:@"ac_meet_finished_pop_bg"];
+        }
+            break;
+        case QXMeetActivityTypeAcLock:{
+//            self.bgImageView.image = [UIImage imageNamed:@"ac_meet_update_pop_bg"];
             self.bgImageView.image = [UIImage imageNamed:@"ac_meet_finished_pop_bg"];
         }
             break;
@@ -144,7 +149,12 @@
 
 
 @implementation QXMeetActivityDriftModel
-
-
++(NSDictionary<NSString *,id> *)modelContainerPropertyGenericClass{
+    return @{
+        @"xlh_data" : @"QXXLHModel",
+        @"room_user":@"QXUserModel",
+        @"FromUserInfo":@"QXUserModel",
+    };
+}
 
 @end

QXLive/Tabbar/飘屏/QXRedPacketDriftView.h

@@ -0,0 +1,29 @@
+//
+//  QXRedPacketDriftView.h
+//  QXLive
+//
+//  Created by 启星 on 2025/10/15.
+//
+
+#import <UIKit/UIKit.h>
+
+NS_ASSUME_NONNULL_BEGIN
+@class QXRedPacketDriftModel;
+@interface QXRedPacketDriftView : UIView
+@property (nonatomic,strong)UIImageView *bgImageView;
+@property (nonatomic,strong)UILabel *titleLabel;
+@property (nonatomic,strong)QXRedPacketDriftModel *model;
+@property (nonatomic,strong)NSMutableArray *dataArray;
+-(void)addRedpacketModel:(QXRedPacketDriftModel*)model;
+-(void)drifPopIsClose:(BOOL)isClose;
++(instancetype)shareView;
+@end
+
+@interface QXRedPacketDriftModel : NSObject
+@property (nonatomic,strong)NSString *room_id;
+@property (nonatomic,strong)NSString *nickname;
+@property (nonatomic,strong)NSString *room_name;
+@property (nonatomic,strong)NSString *text;
+@end
+
+NS_ASSUME_NONNULL_END

QXLive/Tabbar/飘屏/QXRedPacketDriftView.m

@@ -0,0 +1,148 @@
+//
+//  QXRedPacketDriftView.m
+//  QXLive
+//
+//  Created by 启星 on 2025/8/29.
+//
+
+#import "QXRedPacketDriftView.h"
+#import <AVFoundation/AVFoundation.h>
+@interface QXRedPacketDriftView()
+@property (nonatomic,assign)BOOL isPlaying;
+@property (nonatomic,assign)BOOL isClose;
+@property (nonatomic,strong)AVPlayer* player;
+@end
+
+@implementation QXRedPacketDriftView
+
+- (instancetype)init
+{
+    self = [super init];
+    if (self) {
+        self.frame = CGRectMake(SCREEN_WIDTH, ScaleWidth(290), ScaleWidth(334), ScaleWidth(102));
+        BOOL isClose = [[NSUserDefaults standardUserDefaults] boolForKey:kIsCloseDrifPop];
+        self.isClose = isClose;
+        [self initSubviews];
+    }
+    return self;
+}
++(instancetype)shareView{
+    static QXRedPacketDriftView *manager = nil;
+    static dispatch_once_t predicate;
+    dispatch_once(&predicate, ^{
+        manager = [[QXRedPacketDriftView alloc] init];
+    });
+    return manager;
+}
+
+-(void)initSubviews{
+    self.bgImageView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"red_packet_pop_bg"]];
+    self.bgImageView.contentMode = UIViewContentModeScaleToFill;
+    [self addSubview:self.bgImageView];
+    [self.bgImageView mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.width.mas_equalTo(ScaleWidth(334));
+        make.height.mas_equalTo(ScaleWidth(102));
+        make.centerX.equalTo(self);
+        make.top.equalTo(self);
+    }];
+    
+    self.titleLabel = [[UILabel alloc] init];
+    self.titleLabel.font = [UIFont systemFontOfSize:12];
+    self.titleLabel.textColor = RGB16(0xFFFFFF);
+    [self addSubview:self.titleLabel];;
+    [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.left.equalTo(self.bgImageView).offset(ScaleWidth(58));
+        make.bottom.equalTo(self.bgImageView).offset(ScaleWidth(-37));
+        make.height.mas_equalTo(14);
+    }];
+    self.userInteractionEnabled = YES;
+    MJWeakSelf
+    [self addTapBlock:^(id  _Nonnull obj) {
+        if ([weakSelf.model.room_id isExist]) {
+            [[QXGlobal shareGlobal] joinRoomWithRoomId:weakSelf.model.room_id isRejoin:NO navagationController:weakSelf.viewController.navigationController];
+        }
+    }];
+}
+-(void)addRedpacketModel:(QXRedPacketModel *)model{
+    if (self.isClose) {
+        return;
+    }
+    [self.dataArray addObject:model];
+    [self giftAction];
+}
+
+
+-(void)giftAction{
+    if (self.isPlaying) {
+        return;
+    }
+    MJWeakSelf
+    [QXRedPacketDriftView shareView].isPlaying = YES;
+    [QXRedPacketDriftView shareView].model = [QXRedPacketDriftView shareView].dataArray.firstObject;
+    [self.player seekToTime:CMTimeMake(0, 1)];
+    [self.player play];
+    [KEYWINDOW addSubview:[QXRedPacketDriftView shareView]];
+    [UIView animateWithDuration:1.5 delay:0 options:UIViewAnimationOptionCurveEaseOut animations:^{
+        [QXRedPacketDriftView shareView].x = (SCREEN_WIDTH-ScaleWidth(334))/2;
+    } completion:^(BOOL finished) {
+        [weakSelf performSelector:@selector(dissmissAnimate) afterDelay:5];
+    }];
+}
+-(void)dissmissAnimate{
+    [UIView animateWithDuration:2 delay:0 options:UIViewAnimationOptionCurveEaseIn animations:^{
+        [QXRedPacketDriftView shareView].x = -SCREEN_WIDTH;
+    } completion:^(BOOL finished) {
+        [QXRedPacketDriftView shareView].x = SCREEN_WIDTH;
+        [[QXRedPacketDriftView shareView] removeFromSuperview];
+        [[QXRedPacketDriftView shareView].dataArray removeFirstObject];
+        [QXRedPacketDriftView shareView].isPlaying = NO;
+        if ([QXRedPacketDriftView shareView].dataArray.count>0) {
+            [[QXRedPacketDriftView shareView] giftAction];
+        }
+    }];
+}
+
+-(void)setModel:(QXRedPacketDriftModel *)model{
+    _model = model;
+    NSMutableAttributedString*attr = [[NSMutableAttributedString alloc] initWithString:model.text];
+    [attr yy_setColor:RGB16(0x6C49E4) range:[model.text rangeOfString:model.nickname]];
+    [attr yy_setColor:RGB16(0x6C49E4) range:[model.text rangeOfString:model.room_name]];
+    self.titleLabel.attributedText = attr;
+}
+-(void)drifPopIsClose:(BOOL)isClose{
+    _isClose = isClose;
+    self.hidden = self.isClose;
+    [[NSUserDefaults standardUserDefaults] setBool:isClose forKey:kIsCloseDrifPop];
+    [[NSUserDefaults standardUserDefaults] synchronize];
+    if (isClose) {
+        [QXRedPacketDriftView shareView].x = SCREEN_WIDTH;
+        [[QXRedPacketDriftView shareView] removeFromSuperview];
+        [[QXRedPacketDriftView shareView].dataArray removeAllObjects];
+        [QXRedPacketDriftView shareView].isPlaying = NO;
+    }
+}
+
+-(NSMutableArray *)dataArray{
+    if (!_dataArray) {
+        _dataArray = [NSMutableArray array];
+    }
+    return _dataArray;
+}
+-(AVPlayer *)player{
+    if (!_player) {
+        NSString *path = [[NSBundle mainBundle] pathForResource:@"red_packet_come" ofType:@"mp3"];
+        _player = [[AVPlayer alloc] initWithURL:[NSURL fileURLWithPath:path]];
+    }
+    return _player;
+}
+
+
+@end
+
+
+@implementation QXRedPacketDriftModel
+
+
+
+
+@end