提交

2025-11-21 16:17:05 +08:00
parent 7ac937ddbf
commit 8913ea6f48
283 changed files with 8474 additions and 800 deletions
--- a/QXLive/Tabbar/弹窗/QXCustomAlertView.m
+++ b/QXLive/Tabbar/弹窗/QXCustomAlertView.m
@@ -44,20 +44,6 @@
        make.height.mas_equalTo(24);
    }];
    
-    self.messageLabel = [[UILabel alloc] init];
-    self.messageLabel.font = [UIFont boldSystemFontOfSize:16];
-//    self.messageLabel.text = QXText(@"您确定要清空背包吗？");
-    self.messageLabel.textColor = RGB16(0x000000);
-    self.messageLabel.textAlignment = NSTextAlignmentCenter;
-    self.messageLabel.numberOfLines = 0;
-    [self.bgView addSubview:self.messageLabel];
-    [self.messageLabel mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.left.equalTo(self.bgView).offset(16);
-        make.right.equalTo(self.bgView).offset(-16);
-        make.centerY.equalTo(self.bgView);
-    }];
-    
-    
    self.commitBtn = [[UIButton alloc] init];
    [self.commitBtn addRoundedCornersWithRadius:21];
    self.commitBtn.backgroundColor = QXConfig.themeColor;
@@ -88,6 +74,23 @@
        make.width.mas_equalTo(ScaleWidth(110));
        make.left.mas_equalTo(20);
    }];
+    
+    self.messageLabel = [[UILabel alloc] init];
+    self.messageLabel.font = [UIFont systemFontOfSize:13];
+//    self.messageLabel.text = QXText(@"您确定要清空背包吗？");
+    self.messageLabel.textColor = RGB16(0x000000);
+    self.messageLabel.textAlignment = NSTextAlignmentCenter;
+    self.messageLabel.numberOfLines = 0;
+    [self.bgView addSubview:self.messageLabel];
+    [self.messageLabel mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.left.equalTo(self.bgView).offset(16);
+        make.right.equalTo(self.bgView).offset(-16);
+        make.top.equalTo(self.titleLabel.mas_bottom).offset(13);
+        make.bottom.equalTo(self.commitBtn.mas_top).offset(-14);
+    }];
+    
+    
+    
 }

 -(void)cancelAction{
@@ -113,11 +116,17 @@
        [self.cancelBtn setTitle:cancleTitle forState:(UIControlStateNormal)];
    }
    if (commitTitle) {
-        [self.commitBtn setTitle:cancleTitle forState:(UIControlStateNormal)];
+        [self.commitBtn setTitle:commitTitle forState:(UIControlStateNormal)];
    }
+    CGFloat messageHeight = [message heightForFont:[UIFont systemFontOfSize:13] width:ScaleWidth(275)-1];
+    CGFloat contentHeight = 16+24+13+42+12+14+messageHeight;
+    if (contentHeight < 180) {
+        contentHeight = 180;
+    }
+    self.bgView.height = contentHeight;
    [view addSubview:self];
    [UIView animateWithDuration:0.3 delay:0 usingSpringWithDamping:0.5 initialSpringVelocity:1.0 options:UIViewAnimationOptionCurveEaseInOut animations:^{
-        self.bgView.y = (SCREEN_HEIGHT-ScaleWidth(362))/2.0;
+        self.bgView.y = (SCREEN_HEIGHT-self.bgView.height)/2.0;
    } completion:^(BOOL finished) {
        
    }];
--- a/QXLive/Tabbar/弹窗/QXGiftCell.h
+++ b/QXLive/Tabbar/弹窗/QXGiftCell.h
@@ -36,6 +36,7 @@ NS_ASSUME_NONNULL_BEGIN
@property (weak, nonatomic) IBOutlet UIImageView *giftNumBgImageView;
@property (weak, nonatomic) IBOutlet UIImageView *activityImageView;
@property (weak, nonatomic) IBOutlet UIView *nobilityLockView;
+@property (weak, nonatomic) IBOutlet UIImageView *cpImageView;

@property (strong, nonatomic) QXGiftModel *roomGiftModel;

--- a/QXLive/Tabbar/弹窗/QXGiftCell.m
+++ b/QXLive/Tabbar/弹窗/QXGiftCell.m
@@ -119,6 +119,11 @@
        [self.cornBtn setTitleColor:RGB16(0xffffff) forState:(UIControlStateNormal)];
        self.giftNameLabel.textColor = RGB16(0xffffff);
    }
+    if ([roomGiftModel.is_cp isEqualToString:@"1"]) {
+        self.cpImageView.hidden = NO;
+    }else{
+        self.cpImageView.hidden = YES;
+    }
    
    if ([roomGiftModel.activities_id isEqualToString:@"5"]) {
        self.activityImageView.hidden = NO;
--- a/QXLive/Tabbar/弹窗/QXGiftCell.xib
+++ b/QXLive/Tabbar/弹窗/QXGiftCell.xib
@@ -89,6 +89,13 @@
                                    </userDefinedRuntimeAttribute>
                                </userDefinedRuntimeAttributes>
                            </imageView>
+                            <imageView hidden="YES" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="room_gift_heart_boom_tag_icon" translatesAutoresizingMaskIntoConstraints="NO" id="ieN-Kb-uEe">
+                                <rect key="frame" x="0.0" y="0.0" width="36" height="19"/>
+                                <constraints>
+                                    <constraint firstAttribute="width" constant="36" id="6qR-aa-IVV"/>
+                                    <constraint firstAttribute="height" constant="19" id="zM5-GG-X5F"/>
+                                </constraints>
+                            </imageView>
                            <imageView hidden="YES" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="R17-3r-nZl">
                                <rect key="frame" x="0.0" y="255.66666666666663" width="253" height="21"/>
                                <constraints>
@@ -119,6 +126,7 @@
                            <constraint firstAttribute="trailing" secondItem="niZ-Xc-95T" secondAttribute="trailing" id="88r-oD-p4E"/>
                            <constraint firstItem="3d1-U7-04n" firstAttribute="leading" secondItem="1oa-XB-z2H" secondAttribute="leading" id="8De-gE-33I"/>
                            <constraint firstItem="rHb-Od-M4a" firstAttribute="top" secondItem="1oa-XB-z2H" secondAttribute="bottom" id="8dO-90-EcR"/>
+                            <constraint firstItem="ieN-Kb-uEe" firstAttribute="leading" secondItem="QMu-c3-HcP" secondAttribute="leading" id="8uU-PU-Q2R"/>
                            <constraint firstItem="fxQ-G1-4U5" firstAttribute="top" secondItem="QMu-c3-HcP" secondAttribute="top" constant="4" id="AaP-Bh-HJO"/>
                            <constraint firstAttribute="trailing" secondItem="R17-3r-nZl" secondAttribute="trailing" id="CD1-15-DjJ"/>
                            <constraint firstItem="flP-sD-Bkm" firstAttribute="trailing" secondItem="YN0-v8-SAo" secondAttribute="trailing" id="DEt-Ow-1QC"/>
@@ -135,6 +143,7 @@
                            <constraint firstItem="R17-3r-nZl" firstAttribute="centerY" secondItem="rHb-Od-M4a" secondAttribute="centerY" id="Ytt-7W-SM4"/>
                            <constraint firstItem="R17-3r-nZl" firstAttribute="leading" secondItem="QMu-c3-HcP" secondAttribute="leading" id="aSk-9n-6Ln"/>
                            <constraint firstAttribute="trailing" secondItem="anN-iX-rGm" secondAttribute="trailing" id="gMa-Ee-Va2"/>
+                            <constraint firstItem="ieN-Kb-uEe" firstAttribute="top" secondItem="QMu-c3-HcP" secondAttribute="top" id="gvh-S9-Chr"/>
                            <constraint firstItem="YN0-v8-SAo" firstAttribute="leading" secondItem="QMu-c3-HcP" secondAttribute="leading" id="gwM-TL-16q"/>
                            <constraint firstItem="rHb-Od-M4a" firstAttribute="trailing" secondItem="1oa-XB-z2H" secondAttribute="trailing" id="j58-9C-4jp"/>
                            <constraint firstItem="rHb-Od-M4a" firstAttribute="leading" secondItem="1oa-XB-z2H" secondAttribute="leading" id="lZC-mt-8rI"/>
@@ -147,7 +156,7 @@
                        <userDefinedRuntimeAttributes>
                            <userDefinedRuntimeAttribute type="boolean" keyPath="layer.masksToBounds" value="YES"/>
                            <userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius">
-                                <integer key="value" value="5"/>
+                                <integer key="value" value="8"/>
                            </userDefinedRuntimeAttribute>
                        </userDefinedRuntimeAttributes>
                    </view>
@@ -165,6 +174,7 @@
                <outlet property="activityImageView" destination="R17-3r-nZl" id="bjL-Xi-hJI"/>
                <outlet property="cornBtn" destination="3d1-U7-04n" id="PLQ-JR-U9b"/>
                <outlet property="cornHeight" destination="svX-z8-2v4" id="ocG-gq-4Wo"/>
+                <outlet property="cpImageView" destination="ieN-Kb-uEe" id="8ar-f3-wGc"/>
                <outlet property="giftNameLabel" destination="rHb-Od-M4a" id="nik-Bp-Ce4"/>
                <outlet property="giftNumBgImageView" destination="Yu7-xk-6PI" id="cPo-JU-rPA"/>
                <outlet property="gitfImageView" destination="1oa-XB-z2H" id="1bo-km-q0H"/>
@@ -185,6 +195,7 @@
        <image name="gift_corn" width="6" height="6"/>
        <image name="gift_number_bg" width="35" height="13"/>
        <image name="nobility_gift_lock" width="52" height="41"/>
+        <image name="room_gift_heart_boom_tag_icon" width="36" height="19"/>
        <image name="user_header_placehoulder" width="100" height="100"/>
    </resources>
 </document>
--- a/QXLive/Tabbar/飘屏/QXDrifNobilityJoinRoomView.h
+++ b/QXLive/Tabbar/飘屏/QXDrifNobilityJoinRoomView.h
@@ -15,9 +15,12 @@ NS_ASSUME_NONNULL_BEGIN
@property (nonatomic,strong)UILabel *titleLabel;
@property (nonatomic,strong)QXRoomChatListModel *model;
@property (nonatomic,strong)NSMutableArray *dataArray;
+- (void)setupDisplayViewInContainer:(UIView *)container;
 -(void)addNobilityUserModel:(QXRoomChatListModel*)model;
 +(instancetype)shareView;
 -(void)drifPopIsClose:(BOOL)isClose;
+-(void)dirfViewDidToBackground;
+-(void)dirfViewBecomeToFront;
@end

 NS_ASSUME_NONNULL_END
--- a/QXLive/Tabbar/飘屏/QXDrifNobilityJoinRoomView.m
+++ b/QXLive/Tabbar/飘屏/QXDrifNobilityJoinRoomView.m
@@ -8,6 +8,7 @@
 #import "QXDrifNobilityJoinRoomView.h"
 //nobility_drif_join_room_bg
@interface QXDrifNobilityJoinRoomView()
+@property (nonatomic,weak)UIView* containerView;
@property (nonatomic,assign)BOOL isPlaying;
@property (nonatomic,assign)BOOL isClose;
@end
@@ -32,7 +33,9 @@
    });
    return manager;
 }
-
+- (void)setupDisplayViewInContainer:(UIView *)container {
+    self.containerView = container;
+}
 -(void)initSubviews{
    self.bgImageView = [[UIImageView alloc] init];
    self.bgImageView.contentMode = UIViewContentModeScaleToFill;
@@ -75,7 +78,8 @@
    MJWeakSelf
    [QXDrifNobilityJoinRoomView shareView].isPlaying = YES;
    [QXDrifNobilityJoinRoomView shareView].model = [QXDrifNobilityJoinRoomView shareView].dataArray.firstObject;
-    [KEYWINDOW addSubview:[QXDrifNobilityJoinRoomView shareView]];
+//    [KEYWINDOW addSubview:[QXDrifNobilityJoinRoomView shareView]];
+    [self.containerView addSubview:[QXDrifNobilityJoinRoomView shareView]];
 //    [UIView animateWithDuration:0.5 delay:0 options:UIViewAnimationOptionCurveEaseOut animations:^{
 //        [QXDrifNobilityJoinRoomView shareView].x = (SCREEN_WIDTH-ScaleWidth(358))/2;
 //    } completion:^(BOOL finished) {
@@ -83,7 +87,7 @@
 //    }];
    [QXDrifNobilityJoinRoomView shareView].alpha = 0;
    // 第一阶段：快速进入（0.3秒）
-    [UIView animateWithDuration:0.8
+    [UIView animateWithDuration:0.3
                          delay:0
                        options:UIViewAnimationOptionCurveEaseOut
                     animations:^{
@@ -92,7 +96,7 @@
    } completion:^(BOOL finished) {
        if (finished) {
            // 第二阶段：非常慢速停留
-            [UIView animateWithDuration:3.0
+            [UIView animateWithDuration:1.8
                                  delay:0
                                options:UIViewAnimationOptionCurveLinear
                             animations:^{
@@ -137,6 +141,21 @@
        [QXDrifNobilityJoinRoomView shareView].isPlaying = NO;
    }
 }
+-(void)dirfViewDidToBackground{
+    dispatch_async(dispatch_get_main_queue(), ^{
+        [QXDrifNobilityJoinRoomView shareView].x = SCREEN_WIDTH;
+        [[QXDrifNobilityJoinRoomView shareView] removeFromSuperview];
+        [[QXDrifNobilityJoinRoomView shareView].dataArray removeAllObjects];
+        [QXDrifNobilityJoinRoomView shareView].isPlaying = NO;
+    });
+}
+
+-(void)dirfViewBecomeToFront{
+    if ([QXDrifNobilityJoinRoomView shareView].isPlaying == NO) {
+        [QXDrifNobilityJoinRoomView shareView].x = SCREEN_WIDTH;
+        [[QXDrifNobilityJoinRoomView shareView] removeFromSuperview];
+    }
+}

 -(NSMutableArray *)dataArray{
    if (!_dataArray) {
--- a/QXLive/Tabbar/飘屏/QXDrifRoomHourRankView.h
+++ b/QXLive/Tabbar/飘屏/QXDrifRoomHourRankView.h
@@ -24,6 +24,8 @@ NS_ASSUME_NONNULL_BEGIN
 -(void)addActivityModel:(QXRoomHourDriftModel*)model;
 -(void)addActivityModelList:(NSArray<QXRoomHourDriftModel*>*)list;
 -(void)drifPopIsClose:(BOOL)isClose;
+-(void)dirfViewDidToBackground;
+-(void)dirfViewBecomeToFront;
 +(instancetype)shareView;
@end

--- a/QXLive/Tabbar/飘屏/QXDrifRoomHourRankView.m
+++ b/QXLive/Tabbar/飘屏/QXDrifRoomHourRankView.m
@@ -153,6 +153,16 @@
        [QXDrifRoomHourRankView shareView].isPlaying = NO;
    }
 }
+-(void)dirfViewDidToBackground{
+    [QXDrifRoomHourRankView shareView].x = SCREEN_WIDTH;
+    [[QXDrifRoomHourRankView shareView] removeFromSuperview];
+    [[QXDrifRoomHourRankView shareView].dataArray removeAllObjects];
+    [QXDrifRoomHourRankView shareView].isPlaying = NO;
+}
+
+-(void)dirfViewBecomeToFront{
+    
+}

 -(NSMutableArray *)dataArray{
    if (!_dataArray) {
--- a/QXLive/Tabbar/飘屏/QXGiftDriftView.h
+++ b/QXLive/Tabbar/飘屏/QXGiftDriftView.h
@@ -16,6 +16,8 @@ NS_ASSUME_NONNULL_BEGIN
 -(void)addGiftModel:(QXGiftScrollModel*)model;
 -(void)addGiftModelList:(NSArray<QXGiftScrollModel*>*)list;
 -(void)drifPopIsClose:(BOOL)isClose;
+-(void)dirfViewDidToBackground;
+-(void)dirfViewBecomeToFront;
 +(instancetype)shareView;
@end

--- a/QXLive/Tabbar/飘屏/QXGiftDriftView.m
+++ b/QXLive/Tabbar/飘屏/QXGiftDriftView.m
@@ -126,6 +126,16 @@
        [[QXGiftDriftView shareView].dataArray removeAllObjects];
        [QXGiftDriftView shareView].isPlaying = NO;
    }
+}
+-(void)dirfViewDidToBackground{
+    [QXGiftDriftView shareView].x = SCREEN_WIDTH;
+    [[QXGiftDriftView shareView] removeFromSuperview];
+    [[QXGiftDriftView shareView].dataArray removeAllObjects];
+    [QXGiftDriftView shareView].isPlaying = NO;
+}
+
+-(void)dirfViewBecomeToFront{
+    
 }
 -(NSMutableArray *)dataArray{
    if (!_dataArray) {
--- a/QXLive/Tabbar/飘屏/QXMeetActivityDriftView.h
+++ b/QXLive/Tabbar/飘屏/QXMeetActivityDriftView.h
@@ -31,6 +31,8 @@ NS_ASSUME_NONNULL_BEGIN
@property (nonatomic,strong)QXMeetActivityDriftModel *model;
 -(void)addActivityModel:(QXMeetActivityDriftModel*)model;
 -(void)drifPopIsClose:(BOOL)isClose;
+-(void)dirfViewDidToBackground;
+-(void)dirfViewBecomeToFront;
 +(instancetype)shareView;
@end

--- a/QXLive/Tabbar/飘屏/QXMeetActivityDriftView.m
+++ b/QXLive/Tabbar/飘屏/QXMeetActivityDriftView.m
@@ -134,7 +134,16 @@
        [QXMeetActivityDriftView shareView].isPlaying = NO;
    }
 }
+-(void)dirfViewDidToBackground{
+    [QXMeetActivityDriftView shareView].x = SCREEN_WIDTH;
+    [[QXMeetActivityDriftView shareView] removeFromSuperview];
+    [[QXMeetActivityDriftView shareView].dataArray removeAllObjects];
+    [QXMeetActivityDriftView shareView].isPlaying = NO;
+}

+-(void)dirfViewBecomeToFront{
+    
+}
 -(NSMutableArray *)dataArray{
    if (!_dataArray) {
        _dataArray = [NSMutableArray array];
--- a/QXLive/Tabbar/飘屏/QXRedPacketDriftView.h
+++ b/QXLive/Tabbar/飘屏/QXRedPacketDriftView.h
@@ -16,6 +16,8 @@ NS_ASSUME_NONNULL_BEGIN
@property (nonatomic,strong)NSMutableArray *dataArray;
 -(void)addRedpacketModel:(QXRedPacketDriftModel*)model;
 -(void)drifPopIsClose:(BOOL)isClose;
+-(void)dirfViewDidToBackground;
+-(void)dirfViewBecomeToFront;
 +(instancetype)shareView;
@end

--- a/QXLive/Tabbar/飘屏/QXRedPacketDriftView.m
+++ b/QXLive/Tabbar/飘屏/QXRedPacketDriftView.m
@@ -121,7 +121,16 @@
        [QXRedPacketDriftView shareView].isPlaying = NO;
    }
 }
+-(void)dirfViewDidToBackground{
+    [QXRedPacketDriftView shareView].x = SCREEN_WIDTH;
+    [[QXRedPacketDriftView shareView] removeFromSuperview];
+    [[QXRedPacketDriftView shareView].dataArray removeAllObjects];
+    [QXRedPacketDriftView shareView].isPlaying = NO;
+}

+-(void)dirfViewBecomeToFront{
+    
+}
 -(NSMutableArray *)dataArray{
    if (!_dataArray) {
        _dataArray = [NSMutableArray array];