提交

QXLive.xcodeproj/project.pbxproj

@@ -770,7 +770,7 @@
 				);
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = QXLive/Info.plist;
-				INFOPLIST_KEY_CFBundleDisplayName = "秘地";
+				INFOPLIST_KEY_CFBundleDisplayName = "MY语聊";
 				INFOPLIST_KEY_NSCameraUsageDescription = "访问您的相机，允许可以开启直播和录制视频";
 				INFOPLIST_KEY_NSLocationWhenInUseUsageDescription = "访问您的位置，系统将获取您附近的用户进行推荐展示";
 				INFOPLIST_KEY_NSMicrophoneUsageDescription = "访问您的麦克风，允许可以录制声音以便在聊天室进行语音聊天";
@@ -832,7 +832,7 @@
 				);
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = QXLive/Info.plist;
-				INFOPLIST_KEY_CFBundleDisplayName = "秘地";
+				INFOPLIST_KEY_CFBundleDisplayName = "MY语聊";
 				INFOPLIST_KEY_NSCameraUsageDescription = "访问您的相机，允许可以开启直播和录制视频";
 				INFOPLIST_KEY_NSLocationWhenInUseUsageDescription = "访问您的位置，系统将获取您附近的用户进行推荐展示";
 				INFOPLIST_KEY_NSMicrophoneUsageDescription = "访问您的麦克风，允许可以录制声音以便在聊天室进行语音聊天";
@@ -1058,7 +1058,7 @@
 				DEVELOPMENT_TEAM = 8798G5VMH9;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = QXLiveScreen/Info.plist;
-				INFOPLIST_KEY_CFBundleDisplayName = "秘地";
+				INFOPLIST_KEY_CFBundleDisplayName = "MY语聊";
 				INFOPLIST_KEY_NSHumanReadableCopyright = "";
 				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 				LD_RUNPATH_SEARCH_PATHS = (
@@ -1084,7 +1084,7 @@
 				DEVELOPMENT_TEAM = 8798G5VMH9;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = QXLiveScreen/Info.plist;
-				INFOPLIST_KEY_CFBundleDisplayName = "秘地";
+				INFOPLIST_KEY_CFBundleDisplayName = "MY语聊";
 				INFOPLIST_KEY_NSHumanReadableCopyright = "";
 				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 				LD_RUNPATH_SEARCH_PATHS = (
@@ -1110,7 +1110,7 @@
 				DEVELOPMENT_TEAM = 8798G5VMH9;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = "QXLiveScreen copy-Info.plist";
-				INFOPLIST_KEY_CFBundleDisplayName = "秘地";
+				INFOPLIST_KEY_CFBundleDisplayName = "MY语聊";
 				INFOPLIST_KEY_NSHumanReadableCopyright = "";
 				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 				LD_RUNPATH_SEARCH_PATHS = (
@@ -1136,7 +1136,7 @@
 				DEVELOPMENT_TEAM = 8798G5VMH9;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = "QXLiveScreen copy-Info.plist";
-				INFOPLIST_KEY_CFBundleDisplayName = "秘地";
+				INFOPLIST_KEY_CFBundleDisplayName = "MY语聊";
 				INFOPLIST_KEY_NSHumanReadableCopyright = "";
 				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 				LD_RUNPATH_SEARCH_PATHS = (
@@ -1182,7 +1182,7 @@
 				);
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = QXLive/QXLiveDev.plist;
-				INFOPLIST_KEY_CFBundleDisplayName = "秘地测试";
+				INFOPLIST_KEY_CFBundleDisplayName = "MY语聊测试";
 				INFOPLIST_KEY_NSCameraUsageDescription = "访问您的相机，允许可以开启直播和录制视频";
 				INFOPLIST_KEY_NSLocationWhenInUseUsageDescription = "访问您的位置，系统将获取您附近的用户进行推荐展示";
 				INFOPLIST_KEY_NSMicrophoneUsageDescription = "访问您的麦克风，允许可以录制声音以便在聊天室进行语音聊天";
@@ -1246,7 +1246,7 @@
 				);
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = QXLive/QXLiveDev.plist;
-				INFOPLIST_KEY_CFBundleDisplayName = "秘地测试";
+				INFOPLIST_KEY_CFBundleDisplayName = "MY语聊测试";
 				INFOPLIST_KEY_NSCameraUsageDescription = "访问您的相机，允许可以开启直播和录制视频";
 				INFOPLIST_KEY_NSLocationWhenInUseUsageDescription = "访问您的位置，系统将获取您附近的用户进行推荐展示";
 				INFOPLIST_KEY_NSMicrophoneUsageDescription = "访问您的麦克风，允许可以录制声音以便在聊天室进行语音聊天";

QXLive.xcworkspace/xcuserdata/qixing.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -240,69 +240,5 @@
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            uuid = "1884A8C2-7B10-4AB0-B818-07A1622F2E86"
-            shouldBeEnabled = "Yes"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "QXLive/Login(&#x767b;&#x5f55;)/Controlller/QXLoginViewController.m"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "503"
-            endingLineNumber = "503"
-            landmarkName = "-accountLoginWithUser_login:"
-            landmarkType = "7">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            uuid = "632D2182-073F-483E-8D91-60468E8FFABB"
-            shouldBeEnabled = "Yes"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "QXLive/Mine(&#x97f3;&#x57df;)/Controller/&#x4e2a;&#x6027;&#x88c5;&#x626e;/QXDressSubViewController.m"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "92"
-            endingLineNumber = "92"
-            landmarkName = "-collectionView:didSelectItemAtIndexPath:"
-            landmarkType = "7">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            uuid = "E5F3FD59-09F0-47AB-B9AC-F17A091A9653"
-            shouldBeEnabled = "Yes"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "QXLive/Login(&#x767b;&#x5f55;)/Controlller/QXLoginViewController.m"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "185"
-            endingLineNumber = "185"
-            landmarkName = "-startLoginWithModel:complete:"
-            landmarkType = "7">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            uuid = "C9A8DE33-DA4D-41ED-AF3F-94C04D8D962B"
-            shouldBeEnabled = "Yes"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "QXLive/Login(&#x767b;&#x5f55;)/Controlller/QXLoginViewController.m"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "207"
-            endingLineNumber = "207"
-            landmarkName = "-startLoginWithModel:complete:"
-            landmarkType = "7">
-         </BreakpointContent>
-      </BreakpointProxy>
    </Breakpoints>
 </Bucket>

QXLive/Base/QXAppStartViewController.m

@@ -17,7 +17,7 @@
     [super viewDidLoad];
     // Do any additional setup after loading the view.
     self.bgImaegView = [[UIImageView alloc] initWithFrame:[UIScreen mainScreen].bounds];
-    self.bgImaegView.image = [UIImage imageNamed:@"app_start_myyuyin"];;
+    self.bgImaegView.image = [UIImage imageNamed:@"app_start_myyuyin1"];;
     self.bgImaegView.contentMode = UIViewContentModeScaleAspectFill;
     [self.view addSubview:self.bgImaegView];
 //    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(loginSuccess) name:noticeUserLogin object:nil];

QXLive/Config/QXConfig.m

@@ -69,7 +69,8 @@
 //    platform4.icon = @"share_wechat";
     
 //    config.sharePlatforms = @[platform1,platform2,platform3,platform4];
-    
+    [[NSUserDefaults standardUserDefaults] setBool:YES forKey:kIsOpenRecharge];
+    [[NSUserDefaults standardUserDefaults] synchronize];
     return config;
 }
 +(UIColor *)textColor{

QXLive/Dynamic(语圈)/View/QXDynamicListCell.m

@@ -30,7 +30,7 @@
 
 - (void)awakeFromNib {
     [super awakeFromNib];
-    
+    [self.giveBtn removeFromSuperview];
     self.imgViewsArray = [NSMutableArray arrayWithCapacity:6];
     self.zanBtn.needEventInterval = 0.5;
     [self createUI];

QXLive/Dynamic(语圈)/View/QXDynamicListCell.xib

@@ -112,7 +112,7 @@
                                             <action selector="onZan:" destination="KGk-i7-Jjw" eventType="touchUpInside" id="bEY-DV-IGu"/>
                                         </connections>
                                     </button>
-                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Jjl-ep-Ior">
+                                    <button hidden="YES" opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Jjl-ep-Ior">
                                         <rect key="frame" x="322" y="7" width="70" height="30"/>
                                         <constraints>
                                             <constraint firstAttribute="height" constant="30" id="6Uo-qy-hOs"/>
@@ -194,6 +194,7 @@
                                     <constraint firstItem="SkL-b5-rlj" firstAttribute="centerY" secondItem="rSB-IC-yLc" secondAttribute="centerY" id="9dX-bU-0tW"/>
                                     <constraint firstItem="mgq-EX-fSI" firstAttribute="top" secondItem="rSB-IC-yLc" secondAttribute="top" id="CGL-dM-rHg"/>
                                     <constraint firstItem="SkL-b5-rlj" firstAttribute="leading" secondItem="mgq-EX-fSI" secondAttribute="trailing" constant="3" id="JRF-TW-TOd"/>
+                                    <constraint firstAttribute="trailing" secondItem="S5y-fG-SnS" secondAttribute="trailing" priority="750" constant="12" id="MyF-9j-mn9"/>
                                     <constraint firstItem="S5y-fG-SnS" firstAttribute="centerY" secondItem="0i8-vW-sax" secondAttribute="centerY" constant="1" id="O7I-Td-ldi"/>
                                     <constraint firstItem="mgq-EX-fSI" firstAttribute="leading" secondItem="jZt-T7-Wn2" secondAttribute="trailing" constant="-5" id="P30-wH-iQV"/>
                                     <constraint firstItem="Avw-XH-qrb" firstAttribute="centerY" secondItem="rSB-IC-yLc" secondAttribute="centerY" id="PJy-0P-XVJ"/>

QXLive/Dynamic(语圈)/View/QXSendGiftView.m

@@ -119,7 +119,7 @@
             self.bgView.backgroundColor = [UIColor clearColor];
             self.bgImageView.frame = self.bounds;
             self.bgImageView.hidden = NO;
-            self.categoryView.titleSelectedColor = [UIColor colorWithHexString:@"#FFFFFF"];
+            self.categoryView.titleSelectedColor = [UIColor colorWithHexString:@"#FC7285"];
             self.categoryView.titleColor = [UIColor colorWithHexString:@"#E9E9E9"];
             [self.bgView addRoundedCornersWithRadius:16 byRoundingCorners:(UIRectCornerTopLeft|UIRectCornerTopRight)];
             [self initPitUserListView];
@@ -438,7 +438,8 @@
             return;
         }
         /// 2为背包
-        NSString *type = self.categoryView.selectedIndex==0?@"2":@"1";
+        //        NSString *type = self.categoryView.selectedIndex==0?@"2":@"1";
+        NSString *type = @"1";
         [QXDynamicNetwork dynamicGiveGiftWithId:self.dynamicId
                                         gift_id:self.giftModel.gift_id
                                             num:self.giftCount
@@ -517,19 +518,29 @@
     [QXMineNetwork giftLabelSuccessBlock:^(NSArray<QXGiftLabelModel *> * _Nonnull list) {
         [weakSelf.titles removeAllObjects];
         [weakSelf.titles addObjectsFromArray:list];
-        if (self.type != QXSendGiftViewTypeFind) {
-            QXGiftLabelModel *md = [[QXGiftLabelModel alloc] init];
-            md.name = @"背包";
-            md.id = @"-10";
-            [weakSelf.titles insertObject:md atIndex:0];
-        }
         NSMutableArray *arr = [NSMutableArray array];
-        for (QXGiftLabelModel*md in weakSelf.titles) {
+        
-            [arr addObject:md.name];
+        if (weakSelf.type != QXSendGiftViewTypeFind) {
+            QXGiftLabelModel *model = [[QXGiftLabelModel alloc] init];
+            model.name = @"背包";
+            model.id = @"-10";
+            [weakSelf.titles insertObject:model atIndex:0];
+            weakSelf.categoryView.titles = arr;
+            for (QXGiftLabelModel*md in weakSelf.titles) {
+                [arr addObject:md.name];
+            }
+            [weakSelf.categoryView setDefaultSelectedIndex:1];
+            [weakSelf.categoryView reloadData];
+        }else{
+            for (QXGiftLabelModel*md in weakSelf.titles) {
+                [arr addObject:md.name];
+            }
+            weakSelf.categoryView.titles = arr;
+            [weakSelf.categoryView setDefaultSelectedIndex:0];
+            [weakSelf.categoryView reloadData];
         }
-        weakSelf.categoryView.titles = arr;
+        
-        [weakSelf.categoryView setDefaultSelectedIndex:1];
+       
-        [weakSelf.categoryView reloadData];
     } failBlock:^(NSError * _Nonnull error, NSString * _Nonnull msg) {
         
     }];
@@ -563,6 +574,12 @@
 //    }else{
 //        self.funnyView.hidden = YES;
 //    }
+    if (self.type == QXSendGiftViewTypeFind) {
+        self.cornLabel.text = self.coin;
+        self.sendAllBtn.hidden = YES;
+        self.rechargeBtn.hidden = !QXGlobal.shareGlobal.isOpenRecharge;
+        return;
+    }
     if (index == 0) {
         self.sendAllBtn.hidden = NO;
         self.cornLabel.text = self.giftBagPrice;

QXLive/HomePage(声播)/Controlller/QXHomeViewController.m

@@ -63,7 +63,7 @@
 
 - (void)initSubViews{
 //    UILabel *tLabel = [[UILabel alloc] init];
-//    tLabel.text = QXText(@"秘地");
+//    tLabel.text = QXText(@"MY语聊");
 //    tLabel.font = [UIFont boldSystemFontOfSize:20];
 //    [self.view addSubview:tLabel];
 //    [tLabel mas_makeConstraints:^(MASConstraintMaker *make) {
@@ -407,8 +407,8 @@
         _categoryView = [[JXCategoryTitleView alloc] init];
         _categoryView.frame = CGRectMake(15, 0, SCREEN_WIDTH-30, 44);
         _categoryView.delegate = self;
-        _categoryView.titleSelectedColor = [UIColor colorWithHexString:@"#FFFFFF"];
+        _categoryView.titleSelectedColor = [UIColor colorWithHexString:@"#333333"];
-        _categoryView.titleColor = RGB16A(0xF1ECFF, 0.45);
+        _categoryView.titleColor = RGB16A(0x666666, 0.45);
         _categoryView.cellWidth = JXCategoryViewAutomaticDimension;
         _categoryView.contentEdgeInsetLeft = 3;
         _categoryView.cellSpacing = 16;

QXLive/HomePage(声播)/Controlller/QXRankHomeVC.m

@@ -30,7 +30,8 @@
 -(void)initSubViews{
     self.view.backgroundColor = [UIColor whiteColor];
 //    self.titles = @[@"房间榜", @"财富榜", @"魅力榜",@"公会榜",@"真爱榜"];
-    self.titles = @[@"房间榜", @"财富榜", @"魅力榜",@"真爱榜"];
+//    self.titles = @[@"房间榜", @"财富榜", @"魅力榜",@"真爱榜"];
+    self.titles = @[@"房间榜", @"财富榜", @"魅力榜"];
     self.listVCArray = [NSMutableArray array];
     self.categoryView = [[JXCategoryTitleView alloc] init];
     self.categoryView.frame = CGRectMake(0, 0, SCREEN_WIDTH-100, 44);

QXLive/HomePage(声播)/Controlller/房间/QXRoomViewController+Friend.m

@@ -105,9 +105,17 @@
     [self.skyView updateProgress:model];
     [self.ageView updateProgress:model];
     [self.timeView updateProgress:model];
+    if (model.status.intValue == 1) {
+        self.acTagView.end_time = model.end_time;
+        [self.view addSubview:self.acTagView];
+    }else{
+        [self.acTagView stopTimer];
+        [self.acTagView removeFromSuperview];
+    }
 }
 
 -(void)meetActivityGiftInfoIsUpdate:(QXRoomChatListModel *)giftInfo{
     [self.meetView updateUserAndGiftInfoWithModel:giftInfo];
+    self.acTagView.end_time = giftInfo.end_time.longLongValue;
 }
 @end

QXLive/HomePage(声播)/Controlller/房间/QXRoomViewController.h

@@ -19,6 +19,7 @@
 #import "QXAgePraizeView.h"/// 岁月之城
 #import "QXTimePraizeView.h"/// 时空之巅
 #import "QXMeetActivityView.h"
+#import "QXActivityTagView.h"
 NS_ASSUME_NONNULL_BEGIN
 
 @interface QXRoomViewController : QXBaseViewController<QXRoomMessageManagerDelegate,QXRoomSeatDelegate>
@@ -40,6 +41,7 @@ NS_ASSUME_NONNULL_BEGIN
 
 
 
+@property (nonatomic,strong)QXActivityTagView *acTagView;
 @property (nonatomic,strong)QXSkyPraizeView *skyView;
 @property (nonatomic,strong)QXAgePraizeView *ageView;
 @property (nonatomic,strong)QXTimePraizeView *timeView;

QXLive/HomePage(声播)/Controlller/房间/QXRoomViewController.m

@@ -1867,6 +1867,12 @@ QXRoomUserInfoViewDelegate
     }
     return _timeView;
 }
+-(QXActivityTagView *)acTagView{
+    if (!_acTagView) {
+        _acTagView = [[QXActivityTagView alloc] init];
+    }
+    return _acTagView;
+}
 -(QXMeetActivityView *)meetView{
     if (!_meetView) {
         _meetView = [[QXMeetActivityView alloc] init];

QXLive/HomePage(声播)/View/房间/QXActivityTagView.h

@@ -0,0 +1,17 @@
+//
+//  QXActivityTagView.h
+//  QXLive
+//
+//  Created by 启星 on 2025/9/24.
+//
+
+#import <UIKit/UIKit.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface QXActivityTagView : UIView
+@property (nonatomic,assign)long end_time;
+-(void)stopTimer;
+@end
+
+NS_ASSUME_NONNULL_END

QXLive/HomePage(声播)/View/房间/QXActivityTagView.m

@@ -0,0 +1,98 @@
+//
+//  QXActivityTagView.m
+//  QXLive
+//
+//  Created by 启星 on 2025/9/24.
+//
+
+#import "QXActivityTagView.h"
+#import "QXTimer.h"
+@interface QXActivityTagView()
+@property (nonatomic,strong)UIImageView *imageView;
+@property (nonatomic,strong)UILabel *timeLabel;
+@property (nonatomic,strong)QXTimer *timer;
+@property (nonatomic,assign)NSInteger startTime;
+@end
+@implementation QXActivityTagView
+
+- (instancetype)init
+{
+    self = [super init];
+    if (self) {
+        self.frame = CGRectMake(SCREEN_WIDTH-80, SCREEN_HEIGHT-250, 80, 100);
+        [self initSubviews];
+    }
+    return self;
+}
+
+-(void)initSubviews{
+    self.imageView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"ac_tag_icon"]];
+    self.imageView.frame = CGRectMake(0, 0, 80, 80);
+    [self addSubview:self.imageView];
+    
+    self.timeLabel = [[UILabel alloc] initWithFrame:CGRectMake(0, self.imageView.bottom, self.width, 20)];
+    self.timeLabel.textAlignment = NSTextAlignmentCenter;
+    self.timeLabel.font = [UIFont systemFontOfSize:12];
+    self.timeLabel.textColor = RGB16(0xFFEBBD);
+    [self addSubview:self.timeLabel];
+    
+    UIPanGestureRecognizer *panRecognizer = [[UIPanGestureRecognizer alloc] initWithTarget:self action:@selector(handlePan:)];
+    [self addGestureRecognizer:panRecognizer];
+}
+
+
+-(void)setEnd_time:(long)end_time{
+    _end_time = end_time;
+    if (end_time == 0) {
+        return;
+    }
+    NSTimeInterval timeInterval = [[NSDate date] timeIntervalSince1970];
+    // 将秒转换为毫秒
+    long long milliseconds = (long long)(timeInterval);
+    self.startTime = end_time - milliseconds;
+    
+    if (self.startTime <= 0) {
+        //时间错误不进行倒计时
+        self.timeLabel.text = @"倒计时 00:00";
+        [self removeFromSuperview];
+        return;
+    }
+    MJWeakSelf
+    [self stopTimer];
+    _timer = [QXTimer scheduledTimerWithTimeInterval:1 repeats:YES queue:dispatch_get_main_queue() block:^{
+        dispatch_async(dispatch_get_main_queue(), ^{
+            weakSelf.startTime--;
+            NSInteger min = (self.startTime % 3600) / 60;
+            NSInteger second = self.startTime % 60;
+            weakSelf.timeLabel.text = [NSString stringWithFormat:@"倒计时 %02ld:%02ld",min,second];
+            if (weakSelf.startTime<=0) {
+                [weakSelf stopTimer];
+                weakSelf.timeLabel.text = @"倒计时 00:00";
+                [weakSelf removeFromSuperview];
+            }
+        });
+    }];
+}
+-(void)stopTimer{
+    if (_timer) {
+        [self->_timer invalidate];
+        self->_timer= nil;
+    }
+}
+-(void)handlePan:(UIPanGestureRecognizer*)recognizer{
+    if (recognizer.state == UIGestureRecognizerStateEnded) {
+        NSLog(@"拖动结束");
+    }
+    CGPoint translation = [recognizer translationInView:self.viewController.view];
+    CGPoint panCenter = CGPointMake(recognizer.view.center.x + translation.x,
+                                    recognizer.view.center.y + translation.y);
+    if (panCenter.y < kSafeAreaTop || panCenter.y> SCREEN_HEIGHT-kSafeAreaBottom) {
+        return;
+    }
+    
+    
+    recognizer.view.center = CGPointMake(SCREEN_WIDTH-ScaleWidth(80)/2,
+                                         recognizer.view.center.y + translation.y);
+    [recognizer setTranslation:CGPointZero inView:self.viewController.view];
+}
+@end

QXLive/HomePage(声播)/View/房间/QXRoomChatListView.m

@@ -168,7 +168,7 @@ NSInteger maxMessageCount = 20;
 -(void)insertNoitce{
     QXRoomChatListModel *model = [QXRoomChatListModel new];
     model.messageType = QXRoomChatMessageTypeSystem;
-    model.text = @"秘地严禁未成年人进行直播或打赏，官方将24小时在线巡查。我们提倡绿色直播，直播间严禁出现涉政、涉恐、涉黄、涉赌等违法违规内容，严禁宣传封建迷信、宗教极端思想、出现低俗色情、吸烟酗酒等内容，严禁违反社会主义核心价值观、践踏社会道德底线、诱导打赏、低俗 PK 、买卖金币等行为，请大家共同遵守、监督并及时举报。请勿相信各类刷钻、购买礼包、游戏币及电商贩卖等非官方广告信息，谨防网络诈骗。";
+    model.text = @"MY语聊严禁未成年人进行直播或打赏，官方将24小时在线巡查。我们提倡绿色直播，直播间严禁出现涉政、涉恐、涉黄、涉赌等违法违规内容，严禁宣传封建迷信、宗教极端思想、出现低俗色情、吸烟酗酒等内容，严禁违反社会主义核心价值观、践踏社会道德底线、诱导打赏、低俗 PK 、买卖金币等行为，请大家共同遵守、监督并及时举报。请勿相信各类刷钻、购买礼包、游戏币及电商贩卖等非官方广告信息，谨防网络诈骗。";
     [self.dataArray addObject:model];
     [self.tableView reloadData];
     [self scrollToBottom];

QXLive/HomePage(声播)/View/房间/QXSoundListView.m

@@ -183,8 +183,8 @@
 -(void)initSubviews{
     self.selectedBgBtn = [[UIButton alloc] initWithFrame:CGRectMake(0, 0, self.width, self.height)];
     [self.selectedBgBtn setBackgroundImage:[UIImage imageNamed:@"room_sound_sel"] forState:(UIControlStateSelected)];
-    [self.selectedBgBtn setBackgroundImage:[UIImage imageWithColor:RGB16A(0xE9E9E9, 0.2)] forState:(UIControlStateNormal)];
+    [self.selectedBgBtn setBackgroundImage:[UIImage imageWithColor:RGB16A(0xE9E9E9, 0.4)] forState:(UIControlStateNormal)];
-    [self.selectedBgBtn addRoundedCornersWithRadius:12];
+    [self.selectedBgBtn addRoundedCornersWithRadius:5];
     self.selectedBgBtn.userInteractionEnabled = NO;
     [self.contentView addSubview:self.selectedBgBtn];
     

QXLive/HomePage(声播)/View/房间/用户信息/QXRoomUserInfoView.m

@@ -96,7 +96,7 @@
     UITapGestureRecognizer *tap = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(hide)];
     tap.delegate = self;
     [self addGestureRecognizer:tap];
-    self.bgView = [[UIView alloc] initWithFrame:CGRectMake(0, SCREEN_HEIGHT, SCREEN_WIDTH, kSafeAreaBottom+ScaleWidth(429+33))];
+    self.bgView = [[UIView alloc] initWithFrame:CGRectMake(0, SCREEN_HEIGHT, SCREEN_WIDTH, kSafeAreaBottom+ScaleWidth(429-141-50+33))];
 //    self.bgView.backgroundColor = [UIColor whiteColor];
     [self addSubview:self.bgView];
     
@@ -385,7 +385,9 @@
         make.left.mas_equalTo(16);
         make.right.mas_equalTo(-16);
 //        make.bottom.mas_equalTo(-(kSafeAreaBottom+10));
-        make.top.equalTo(self.relationTableView.mas_bottom).offset(20);
+//        make.top.equalTo(self.relationTableView.mas_bottom).offset(20);
+        make.top.equalTo(self.giftTitleLabel.mas_bottom).offset(12);
+        
         make.height.mas_equalTo(35);
     }];
     
@@ -410,6 +412,11 @@
         }];
     }
     
+    
+    self.relationMoreBtn.hidden = YES;
+    self.relationshipSeatBtn.hidden = YES;
+    self.relationshipCardBtn.hidden = YES;
+    self.relationTableView.hidden = YES;
 }
 -(BOOL)gestureRecognizer:(UIGestureRecognizer *)gestureRecognizer shouldReceiveTouch:(UITouch *)touch{
     return touch.view == self;
@@ -878,7 +885,7 @@
 -(void)showInView:(UIView *)view{
     [view addSubview:self];
     [UIView animateWithDuration:0.3 animations:^{
-        self.bgView.y = SCREEN_HEIGHT- ScaleWidth(429+33)-kSafeAreaBottom;
+        self.bgView.y = SCREEN_HEIGHT- ScaleWidth(429-141-50+33)-kSafeAreaBottom;
     }];
 }
 -(void)hide{

QXLive/HomePage(声播)/View/房间/设置/QXRoomSettingView.m

@@ -172,13 +172,13 @@
         case QXRoomRoleTypeCompere:{
             if ((self.roomModel.room_info.type_id.intValue == 1 || self.roomModel.room_info.type_id.intValue == 3 || self.roomModel.room_info.type_id.intValue == 4 || self.roomModel.room_info.type_id.intValue == 8) && self.roomModel.room_info.label_id.intValue == 2) {
                 toolsArr = @[self.roomSubsidy,self.roomMessage,self.roomOrderMic,self.roomBgImage];
-                roomTypeArr = @[self.roomTypeSing,self.roomTypeAuction,self.roomTypeFunny,self.roomTypeFriend];
+                roomTypeArr = @[self.roomTypeSing,self.roomTypeBoy,self.roomTypeGirl];
                 moreArr = @[self.roomLeave,self.roomVoiceSet,self.roomSetting,self.roomEffects,self.drifPop,self.roomReport];
 //                roomTypeArr = @[self.roomTypeSing,self.roomTypeAuction,self.roomTypeBoy,self.roomTypeGirl,self.roomTypeFriend];
 //                moreArr = @[self.roomLeave,self.roomShare,self.roomVoiceSet,self.roomSetting,self.roomWelcome,self.roomEffects,self.roomReport];
             }else{
                 toolsArr = @[self.roomSubsidy,self.roomMessage,self.roomOrderMic,self.roomBgMusic,self.roomBgImage];
-                roomTypeArr = @[self.roomTypeSing,self.roomTypeAuction,self.roomTypeFunny,self.roomTypeFriend];
+                roomTypeArr = @[self.roomTypeSing,self.roomTypeBoy,self.roomTypeGirl];
                 moreArr = @[self.roomLeave,self.roomVoiceSet,self.roomSetting,self.roomEffects,self.drifPop,self.roomReport];
 //                roomTypeArr = @[self.roomTypeSing,self.roomTypeAuction,self.roomTypeBoy,self.roomTypeGirl,self.roomTypeFriend];
 //                moreArr = @[self.roomLeave,self.roomShare,self.roomVoiceSet,self.roomSetting,self.roomWelcome,self.roomEffects,self.roomReport];
@@ -208,7 +208,7 @@
 //                toolsArr = @[self.roomSubsidy,self.roomCompere,self.roomMessage,self.roomOrderMic,self.roomBgMusic,self.roomBgImage];
                 toolsArr = @[self.roomSubsidy,self.roomCompere,self.roomMessage,self.roomOrderMic,self.roomBgImage];
             }
-            roomTypeArr = @[self.roomTypeSing,self.roomTypeAuction,self.roomTypeFunny,self.roomTypeFriend];
+            roomTypeArr = @[self.roomTypeSing,self.roomTypeBoy,self.roomTypeGirl];
             moreArr = @[self.roomLeave,self.roomVoiceSet,self.roomSetting,self.roomEffects,self.drifPop,self.roomReport];
 //            moreArr = @[self.roomLeave,self.roomShare,self.roomVoiceSet,self.roomSetting,self.roomWelcome,self.roomEffects,self.roomReport];
 //            roomTypeArr = @[self.roomTypeSing,self.roomTypeAuction,self.roomTypeBoy,self.roomTypeGirl,self.roomTypeFriend];
@@ -229,7 +229,7 @@
                 toolsArr = @[self.roomSubsidy,self.roomCompere,self.roomMessage,self.roomOrderMic,self.roomBgImage];
             }
 //            roomTypeArr = @[self.roomTypeSing,self.roomTypeAuction,self.roomTypeBoy,self.roomTypeGirl,self.roomTypeFriend];
-            roomTypeArr = @[self.roomTypeSing,self.roomTypeAuction,self.roomTypeFunny,self.roomTypeFriend];
+            roomTypeArr = @[self.roomTypeSing,self.roomTypeBoy,self.roomTypeGirl];
 //            moreArr = @[self.roomLeave,self.roomShare,self.roomVoiceSet,self.roomSetting,self.roomWelcome,self.roomEffects,self.roomReport];
             moreArr = @[self.roomLeave,self.roomVoiceSet,self.roomSetting,self.roomEffects,self.drifPop,self.roomReport];
             self.titles = @[QXText(@"房间类型"),QXText(@"常用工具"),QXText(@"更多操作")];
@@ -240,6 +240,7 @@
     }
     self.dataDict = @{
         QXText(@"房间类型"):roomTypeArr,
+        
         QXText(@"常用工具"):toolsArr,
         QXText(@"更多操作"):moreArr
     };

QXLive/HomePage(声播)/View/房间/麦位视图/QXRoomSeatTypeAuctionView.m

@@ -198,6 +198,7 @@
 //
     self.helpBtn = [[UIButton alloc] init];
     [self.helpBtn setImage:[UIImage imageNamed:@"room_auction_help"] forState:(UIControlStateNormal)];
+    [self.helpBtn addTarget:self action:@selector(helpAction) forControlEvents:(UIControlEventTouchUpInside)];
     [self.bgView addSubview:self.helpBtn];
     [self.helpBtn mas_makeConstraints:^(MASConstraintMaker *make) {
         make.top.mas_equalTo(5);
@@ -1047,6 +1048,20 @@
     [self.rankView showInView:self.viewController.view];
 }
 
+-(void)helpAction{
+    NSString *Id = @"";
+    if ([self.roomModel.room_info.label_id isEqualToString:@"1"]) {
+        /// 真爱
+        Id = @"23";
+    }else{
+        /// 亲密
+        Id = @"22";
+    }
+    NSString *urlString = [NSString stringWithFormat:@"%@api/Page/page_show?id=%@",ServerUrl,Id];
+    QXBaseWebViewController *vc = [[QXBaseWebViewController alloc] init];
+    vc.urlStr = urlString;
+    [self.viewController.navigationController pushViewController:vc animated:YES];
+}
 
 -(void)changeAuctionWithType:(UIButton*)sender{
     NSString *type = @"";
@@ -1075,6 +1090,7 @@
 }
 
 -(void)auctionTypeDidChanged:(NSString *)type{
+    self.roomModel.room_info.label_id = type;
     if ([type isEqualToString:@"2"]) {
         self.realLoveBtn.selected = NO;
         self.intimacyBtn.selected = YES;

QXLive/HomePage(声播)/View/礼物/QXGiftPlayerManager.h

@@ -44,7 +44,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic,assign) BOOL isOnece;
 @property (nonatomic,strong) VAPView *playerMp4View;
 @property (nonatomic, strong) dispatch_queue_t queue;
--(void)previewEffectWith:(NSString *)play_image;
+- (void)previewEffectWith:(NSString *)play_image;
 - (void)displayEffectView:(NSString *)play_image;
 - (void)displayEffectViewWithMorePlayImages:(NSArray *)playImages;
 - (void)openOrCloseEffectViewWith:(BOOL)isShow;

QXLive/HomePage(声播)/View/首页/QXGiftScrollView.m

@@ -58,11 +58,12 @@ static NSInteger maxCount = 5;
         }
     }else{
         for (QXGiftScrollModel*md in list) {
-            [self.dataArray removeLastObject];
-            [self.titles removeLastObject];
             [self.dataArray insertObject:md atIndex:0];
             [self.titles insertObject:md.fromUserName atIndex:0];
-            
+        }
+        if (self.dataArray.count > 5) {
+            [self.dataArray removeLastObject];
+            [self.titles removeLastObject];
         }
     }
     self.cycleScrollView.imageURLStringsGroup = self.titles;

QXLive/Info.plist

@@ -13,7 +13,7 @@
 			<string>Editor</string>
 			<key>CFBundleURLSchemes</key>
 			<array>
-				<string>midilive</string>
+				<string>myyuliaolive</string>
 			</array>
 		</dict>
 		<dict>
@@ -23,7 +23,7 @@
 			<string>weixin</string>
 			<key>CFBundleURLSchemes</key>
 			<array>
-				<string>wxef1289d8a89b41d4</string>
+				<string>wx7e232c2dae5f2ea5</string>
 			</array>
 		</dict>
 	</array>

QXLive/Login(登录)/Controlller/QXFillUserInfoViewController.m

@@ -82,7 +82,7 @@
 }
 
 -(void)configLanguage{
-    [self.comitUserInfoBtn setTitle:QXText(@"进入秘地") forState:(UIControlStateNormal)];
+    [self.comitUserInfoBtn setTitle:QXText(@"进入MY语聊") forState:(UIControlStateNormal)];
     [self.comitUserInfoBtn setTitleColor:QXConfig.btnTextColor forState:(UIControlStateNormal)];
     self.comitUserInfoBtn.backgroundColor = QXConfig.themeColor;
     self.nickTitleLabel.text = QXText(@"起个好听的名字");
@@ -104,7 +104,7 @@
     [attr1 yy_setColor:RGB16A(0x000000, 0.45) range:NSMakeRange(0, str1.length)];
     [attr1 yy_setColor:RGB16A(0x000000, 0.45) range:[noChangeText rangeOfString:str1]];
     self.invitTitleLabel.attributedText = attr1;
-    
+    [self.randomBtn setTitleColor:RGB16(0x0DFFB9) forState:(UIControlStateNormal)];
     [self.randomBtn setTitle:QXText(@"随机") forState:(UIControlStateNormal)];
 }
 -(void)getRandomUsername{

QXLive/Login(登录)/Controlller/QXLoginViewController.m

@@ -78,13 +78,13 @@
     self.isCodeLogin = YES;
 //    self.welcomeLabel = [[UILabel alloc] initWithFrame:CGRectMake(16, kSafeAreaTop+86, SCREEN_WIDTH-32, 36)];
 //    self.welcomeLabel.font = [UIFont boldSystemFontOfSize:24];
-////    self.welcomeLabel.text = QXText(@"欢迎来到秘地");
+////    self.welcomeLabel.text = QXText(@"欢迎来到MY语聊");
 ////    welcome_midi
 //    self.welcomeLabel.textColor = QXConfig.textColor;
 //    [self.view addSubview:self.welcomeLabel];
     
     self.logoImageView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"welcome_midi"]];
-    self.logoImageView.frame = CGRectMake(16, NavContentHeight+19, 170, 120);
+    self.logoImageView.frame = CGRectMake(16, NavContentHeight+19, 206, 120);
     [self.view addSubview:self.logoImageView];
     
     self.subTitleLabel = [[UILabel alloc] initWithFrame:CGRectMake(16, self.logoImageView.bottom+15, SCREEN_WIDTH-32, 27)];
@@ -144,7 +144,7 @@
         @{@"type":@(2),@"icon":@"third_login_alipay"},
         @{@"type":@(3),@"icon":@"third_login_apple"},
     ];
-    self.thirdLoginView.thirdArray = thirdArray;
+    self.thirdLoginView.thirdArray = @[];
     self.thirdLoginView.delegate = self;
     self.thirdLoginView.isDefaultAgree = YES;
     self.isAgree = YES;
@@ -360,7 +360,7 @@
         [AlipaySDK startLogWithBlock:^(NSString *log) {
             QXLOG(@"alilog-----%@",log);
         }];
-        [[AlipaySDK defaultService] auth_V2WithInfo:authStr fromScheme:@"QXLive" callback:^(NSDictionary *resultDic) {
+        [[AlipaySDK defaultService] auth_V2WithInfo:authStr fromScheme:@"myyuliaolive" callback:^(NSDictionary *resultDic) {
             NSString *result = resultDic[@"result"];
             NSString *authCode = nil;
             if (result.length>0) {

QXLive/Login(登录)/View/QXLoginBottomView.m

@@ -40,6 +40,9 @@
     CGFloat startX = 0;
     CGFloat btnWidth = 30;
     CGFloat btnMargin = 16;
+    self.agreeView = [[QXLoginAgreementView alloc] initWithFrame:CGRectMake(0, self.titleLabel.bottom+103, SCREEN_WIDTH, 30)];
+    self.agreeView.delegate = self;
+    [self addSubview:self.agreeView];
     if (thirdArray.count == 0) {
         self.titleLabel.hidden = YES;
         return;
@@ -64,9 +67,7 @@
         [btn addTarget:self action:@selector(thirdLoginAction:) forControlEvents:(UIControlEventTouchUpInside)];
         [self addSubview:btn];
     }
-    self.agreeView = [[QXLoginAgreementView alloc] initWithFrame:CGRectMake(0, self.titleLabel.bottom+103, SCREEN_WIDTH, 30)];
+   
-    self.agreeView.delegate = self;
-    [self addSubview:self.agreeView];
 }
 
 -(void)thirdLoginAction:(UIButton*)sender{

QXLive/Mine(音域)/Controller/设置/QXAboutViewController.m

@@ -41,7 +41,8 @@ static void *WKWebBrowserContext = &WKWebBrowserContext;
 }
 - (void)loadData {
 //    H5ServerUrl
-    NSString *urlStr =  [NSString stringWithFormat:@"%@web/index.html#/pages/other/aboutUs",H5ServerUrl];
+    NSInteger safeTop = kSafeAreaTop;
+    NSString *urlStr =  [NSString stringWithFormat:@"%@web/index.html#/pages/other/aboutUs?h=%ld",H5ServerUrl,safeTop];
     NSURL* url=[NSURL URLWithString:urlStr];
     NSURLRequest *request =[NSURLRequest requestWithURL:url];
     [self.contentWebView loadRequest:request];

QXLive/Mine(音域)/Controller/设置/QXRealNameViewController.m

@@ -256,9 +256,10 @@
     MJWeakSelf
     showLoadingInView(self.view);
     [QXMineNetwork postRealNameInfoWithRealName:realName card_number:idNumber successBlock:^(NSDictionary * _Nonnull dict) {
-        hideLoadingInView(self.view);
+        hideLoadingInView(weakSelf.view);
         weakSelf.realNamedict = dict;
-        [weakSelf startFace];
+//        [weakSelf startFace];
+        [weakSelf authSuccess];
     } failBlock:^(NSError * _Nonnull error, NSString * _Nonnull msg) {
         hideLoadingInView(self.view);
         showToast(msg);
@@ -308,16 +309,16 @@
     if (faceVerifyResult.isSuccess) {
         QXLOG(@"人脸核验通过");
         MJWeakSelf
-        QXAlertView *al = [[QXAlertView alloc] initWithFrame:CGRectMake(0, 0, ScaleWidth(300), ScaleWidth(175))];
+//        QXAlertView *al = [[QXAlertView alloc] initWithFrame:CGRectMake(0, 0, ScaleWidth(300), ScaleWidth(175))];
-        al.type = QXAlertViewTypeNoCancel;
+//        al.type = QXAlertViewTypeNoCancel;
-        al.title = @"温馨提示";
+//        al.title = @"温馨提示";
-        al.message = @"恭喜您获得内测资格，将获得10万金币";
+//        al.message = @"恭喜您获得内测资格，将获得10万金币";
-        al.commitBlock = ^{
+//        al.commitBlock = ^{
-            [weakSelf authSuccess];
+            [self authSuccess];
-        };
+//        };
-        [[QXGlobal shareGlobal] showView:al popType:(PopViewTypeTopToCenter) tapDismiss:NO finishBlock:^{
+//        [[QXGlobal shareGlobal] showView:al popType:(PopViewTypeTopToCenter) tapDismiss:NO finishBlock:^{
-            
+//            
-        }];
+//        }];
         
         /// 通知服务端实名验证结果
         [QXMineNetwork postRealNameResultWithOrderNo:faceVerifyResult.orderNo successBlock:^(NSDictionary * _Nonnull dict) {

QXLive/Mine(音域)/Model/QXPayTypeModel.h

@@ -27,7 +27,7 @@ NS_ASSUME_NONNULL_BEGIN
 @end
 
 @interface QXPayTypeStatusModel : NSObject
-
+/// 6-西来喜微信，7-西来喜支付宝，8-西来喜QQ钱包，9-西来喜云闪付  1 原生微信  2原生支付宝  4
 @property (nonatomic,strong)QXPayTypeModel *ali;
 
 @property (nonatomic,strong)QXPayTypeModel *wx;
@@ -38,6 +38,12 @@ NS_ASSUME_NONNULL_BEGIN
 
 @property (nonatomic,strong)QXPayTypeModel *ali_tl;
 
+@property (nonatomic,strong)QXPayTypeModel *xlx_wx;
+
+@property (nonatomic,strong)QXPayTypeModel *xlx_ali;
+
+@property (nonatomic,strong)QXPayTypeModel *xlx_bank;
+
 @end
 
 NS_ASSUME_NONNULL_END

QXLive/Mine(音域)/View/充值/QXRechargeView.m

@@ -88,10 +88,10 @@
     [QXMineNetwork getRechargeListSuccessBlock:^(NSArray<QXRechargeListModel *> * _Nonnull list) {
         [weakSelf.rechargeDataArray removeAllObjects];
         [weakSelf.rechargeDataArray addObjectsFromArray:list];
-        QXRechargeListModel *model = [[QXRechargeListModel alloc] init];
+//        QXRechargeListModel *model = [[QXRechargeListModel alloc] init];
-        model.money = @"0";
+//        model.money = @"0";
-        model.coins = @"0";
+//        model.coins = @"0";
-        [weakSelf.rechargeDataArray addObject:model];
+//        [weakSelf.rechargeDataArray addObject:model];
         [weakSelf.collectionView reloadSections:[NSIndexSet indexSetWithIndex:0]];
     } failBlock:^(NSError * _Nonnull error, NSString * _Nonnull msg) {
         
@@ -111,7 +111,22 @@
         if (model.ali_tl.is_pay_open.intValue == 1) {
             [weakSelf.payTypeArray addObject:model.ali_tl];
         }
-        if (!self.isOnlyDisplayPayType) {
+        if (model.xlx_wx.is_pay_open.intValue == 1) {
+            [weakSelf.payTypeArray addObject:model.xlx_wx];
+        }
+        if (model.xlx_ali.is_pay_open.intValue == 1) {
+            [weakSelf.payTypeArray addObject:model.xlx_ali];
+        }
+        if (model.xlx_bank.is_pay_open.intValue == 1) {
+            [weakSelf.payTypeArray addObject:model.xlx_bank];
+        }
+//#if DEBUG
+//        QXPayTypeModel *md = [QXPayTypeModel new];
+//        md.type = @"6";
+//        model.xlx_wx = md;
+//        [weakSelf.payTypeArray addObject:model.xlx_wx];
+//#endif
+        if (!weakSelf.isOnlyDisplayPayType) {
             [weakSelf.collectionView reloadSections:[NSIndexSet indexSetWithIndex:1]];
         }
         
@@ -264,19 +279,18 @@
         showToast(@"请选择充值金额");
         return;
     }
-    if (self.isPop) {
+    
-        [self hide];
+    @weakify(self)
-    }
-    MJWeakSelf
     [QXMineNetwork rechargePayWithMoney:self.selectedModel.money coin:self.selectedModel.coins type:self.selectedPayTypeModel.type userId:QXGlobal.shareGlobal.loginModel.user_id successBlock:^(NSDictionary * _Nonnull dict) {
-        if (weakSelf.selectedPayTypeModel.type.intValue == 2) {
+        @strongify(self)
+        if (self.selectedPayTypeModel.type.intValue == 2) {
             NSDictionary *resultDict = dict[@"data"];
             NSString *order = [NSString stringWithFormat:@"%@",resultDict[@"ali"]];
-            [[AlipaySDK defaultService] payOrder:order fromScheme:@"midilive" callback:^(NSDictionary *resultDic) {
+            [[AlipaySDK defaultService] payOrder:order fromScheme:@"myyuliaolive" callback:^(NSDictionary *resultDic) {
                 NSLog(@"支付宝H5支付回调 - %@", resultDic);
                
             }];
-        }else if (weakSelf.selectedPayTypeModel.type.intValue == 1) {
+        }else if (self.selectedPayTypeModel.type.intValue == 1) {
             NSDictionary *resultDict = dict[@"data"][@"wx"];
             NSString *appid = resultDict[@"appid"];
             NSString *partnerId = resultDict[@"partnerid"];
@@ -297,11 +311,11 @@
 
             }];
         }
-        else if (weakSelf.selectedPayTypeModel.type.intValue == 4) {
+        else if (self.selectedPayTypeModel.type.intValue == 4) {
             NSMutableDictionary*dic = [NSMutableDictionary dictionaryWithDictionary:dict[@"data"][@"tl"]];
             [dic removeObjectForKey:@"json_data"];
             NSString *json = [dic jsonStringEncoded];
-            NSString *thirdPartSchema = @"thirdPartSchema=qxlive://";
+            NSString *thirdPartSchema = @"thirdPartSchema=myyuliaolive://";
             NSString *json1 = [json stringByReplacingOccurrencesOfString:@"\\" withString:@""];
             NSCharacterSet *customSet1 = [[NSCharacterSet characterSetWithCharactersInString:@"!*'();:@&=+$,/?%#[]{}\""] invertedSet];
 //                NSCharacterSet *customSet2 = [[NSCharacterSet characterSetWithCharactersInString:@"!*'();:@&=+$,/?%#[]{}\""] invertedSet];
@@ -312,7 +326,7 @@
             NSString *doubleEncodedQuery = [queryString stringByAddingPercentEncodingWithAllowedCharacters:customSet3];
             NSString *jumpStr = [NSString stringWithFormat:@"alipays://platformapi/startapp?appId=2021001104615521&page=pages/orderDetail/orderDetail&%@&query=%@",encodedString,doubleEncodedQuery];
             [[UIApplication sharedApplication] openURL:[NSURL URLWithString:jumpStr] options:@{} completionHandler:nil];
-        }else if (weakSelf.selectedPayTypeModel.type.intValue == 5) {
+        }else if (self.selectedPayTypeModel.type.intValue == 5) {
             WXLaunchMiniProgramReq *launchMiniProgramReq = [WXLaunchMiniProgramReq object];
             launchMiniProgramReq.userName = @"gh_e64a1a89a0ad";
             NSDictionary *dic = dict[@"data"][@"tl"];
@@ -327,8 +341,28 @@
             launchMiniProgramReq.path = [NSString stringWithFormat:@"pages/orderDetail/orderDetail?%@",param];
             launchMiniProgramReq.miniProgramType = WXMiniProgramTypeRelease;
             [WXApi sendReq:launchMiniProgramReq completion:nil];
-        }
+        }else if (self.selectedPayTypeModel.type.intValue == 6) {
+            NSString *json = dict[@"data"][@"xlx"];
+            if ([json isKindOfClass:[NSNull class]]) {
+                showToast(@"请求异常");
+                return;
+            }
             
+            [[UIApplication sharedApplication] openURL:[NSURL URLWithString:json] options:@{} completionHandler:nil];
+        }else if (self.selectedPayTypeModel.type.intValue == 7) {
+//            NSDictionary *dic = dict[@"data"][@"xlx"];
+//            NSString *json = [dic jsonStringEncoded];
+//            [[UIApplication sharedApplication] openURL:[NSURL URLWithString:json] options:@{} completionHandler:nil];
+            NSString *json = dict[@"data"][@"xlx"];
+            if ([json isKindOfClass:[NSNull class]]) {
+                showToast(@"请求异常");
+                return;
+            }
+            [[UIApplication sharedApplication] openURL:[NSURL URLWithString:json] options:@{} completionHandler:nil];
+        }
+        if (self.isPop) {
+            [self hide];
+        }
     } failBlock:^(NSError * _Nonnull error, NSString * _Nonnull msg) {
         showToast(msg)
     }];

QXLive/Other/AppDelegate.m

@@ -4,6 +4,39 @@
 //
 //  Created by 启星 on 2025/4/24.
 //
+/**
+ APP准备启动
+ *
+ *               _oo0oo_
+ *              o8888888o
+ *              88" . "88
+ *              (| -_- |)
+ *              0\  =  /0
+ *            ___/`---'\___
+ *          .' \\|     |// '.
+ *         / \\|||  :  |||// \
+ *        / _||||| -卍-|||||- \
+ *       |   | \\\  -  /// |   |
+ *       | \_|  ''\---/''  |_/ |
+ *       \  .-\__  '-'  ___/-. /
+ *     ___'. .'  /--.--\  `. .'___
+ *  ."" '<  `.___\_<|>_/___.' >' "".
+ * | | :  `- \`.;`\ _ /`;.`/ - ` : | |
+ * \  \ `_.   \_ __\ /__ _/   .-` /  /
+ *=====`-.____`.___ \_____/___.-`___.-'=====
+ *               `=---='
+ *
+ * 佛祖保佑        永无BUG
+ * 佛曰:
+ *    写字楼里写字间，写字间里程序员；
+ *    程序人员写程序，又拿程序换酒钱。
+ *    酒醒只在网上坐，酒醉还来网下眠；
+ *    酒醉酒醒日复日，网上网下年复年。
+ *    但愿老死电脑间，不愿鞠躬老板前；
+ *    奔驰宝马贵者趣，公交自行程序员。
+ *    别人笑我忒疯癫，我笑自己命太贱；
+ *    不见满街漂亮妹，哪个归得程序员？
+ */
 
 #import "AppDelegate.h"
 #import "AppDelegate+Login.h"
@@ -18,6 +51,7 @@
 #import "QXGiftPlayerManager.h"
 #import "IQKeyboardManager.h"
 #import "QXChirldViewController.h"
+#import "QXMineNetwork.h"
 #if DEBUG
 #import <LLDebugTool.h>
 #endif
@@ -104,6 +138,11 @@
             if (resultStatus.intValue == 9000) {
                 showToast(@"支付成功");
                 [[NSNotificationCenter defaultCenter] postNotificationName:noticeAlipayResult object:nil];
+                [QXMineNetwork getMineInfoSuccessBlock:^(QXUserModel * _Nonnull userModel) {
+                    
+                } failBlock:^(NSError * _Nonnull error, NSString * _Nonnull msg) {
+                    
+                }];
             }else{
                 showToast(result);
             }
@@ -194,6 +233,11 @@
                  NSLog(@"支付成功");
                  showToast(QXText(@"支付成功"));
                  [[NSNotificationCenter defaultCenter] postNotificationName:noticeAlipayResult object:nil];
+                 [QXMineNetwork getMineInfoSuccessBlock:^(QXUserModel * _Nonnull userModel) {
+                     
+                 } failBlock:^(NSError * _Nonnull error, NSString * _Nonnull msg) {
+                     
+                 }];
                  break;
              case WXErrCodeUserCancel:
                  //服务器端查询支付通知或查询API返回的结果再提示成功

QXLive/Other/Assets.xcassets/activity/Contents.json

@@ -0,0 +1,6 @@
+{
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

QXLive/Other/Assets.xcassets/activity/ac_tag_icon.imageset/Contents.json

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

QXLive/Other/Assets.xcassets/home/home_gift_bg.imageset/Contents.json

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

QXLive/Other/Assets.xcassets/home/room/room_seat_lock.imageset/Contents.json

@@ -5,12 +5,12 @@
       "scale" : "1x"
     },
     {
-      "filename" : "Frame 1321316152@2x.png",
+      "filename" : "Group 7520@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "Frame 1321316152@3x.png",
+      "filename" : "Group 7520@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

QXLive/Other/Assets.xcassets/home/room/room_sound_bg.imageset/Contents.json

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

QXLive/Other/Assets.xcassets/home/room/room_sound_sel.imageset/Contents.json

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

QXLive/Other/Assets.xcassets/home/room_hot_icon.imageset/Contents.json

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

QXLive/Other/Assets.xcassets/login/forgot_pwd.imageset/Contents.json

@@ -5,12 +5,12 @@
       "scale" : "1x"
     },
     {
-      "filename" : "forgot_pwd@2x.png",
+      "filename" : "找回密码@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "forgot_pwd@3x.png",
+      "filename" : "找回密码@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

QXLive/Other/Assets.xcassets/login/login_sex_boy_nor.imageset/Contents.json

@@ -5,12 +5,12 @@
       "scale" : "1x"
     },
     {
-      "filename" : "男生未选中@2x.png",
+      "filename" : "Group 7442@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "男生未选中@3x.png",
+      "filename" : "Group 7442@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

QXLive/Other/Assets.xcassets/login/login_sex_boy_sel.imageset/Contents.json

@@ -5,12 +5,12 @@
       "scale" : "1x"
     },
     {
-      "filename" : "男生选中@2x.png",
+      "filename" : "Group 6869@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "男生选中@3x.png",
+      "filename" : "Group 6869@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

QXLive/Other/Assets.xcassets/login/login_sex_girl_nor.imageset/Contents.json

@@ -5,12 +5,12 @@
       "scale" : "1x"
     },
     {
-      "filename" : "女生未选中@2x.png",
+      "filename" : "Group 6868@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "女生未选中@3x.png",
+      "filename" : "Group 6868@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

QXLive/Other/Assets.xcassets/login/login_sex_girl_sel.imageset/Contents.json

@@ -5,12 +5,12 @@
       "scale" : "1x"
     },
     {
-      "filename" : "女生已选中@2x.png",
+      "filename" : "Group 7441@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "女生已选中@3x.png",
+      "filename" : "Group 7441@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

QXLive/Other/Assets.xcassets/login/welcome_midi.imageset/Contents.json

@@ -5,12 +5,12 @@
       "scale" : "1x"
     },
     {
-      "filename" : "welcome_midi@2x.png",
+      "filename" : "欢迎来到梵音@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "welcome_midi@3x.png",
+      "filename" : "欢迎来到梵音@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

QXLive/Other/Assets.xcassets/mine/Customer Support.imageset/Contents.json

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

QXLive/Other/Assets.xcassets/mine/User, People(1).imageset/Contents.json

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

QXLive/Other/Assets.xcassets/mine/User, People.imageset/Contents.json

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