提交

2026-01-14 20:36:58 +08:00
parent 705d891c51
commit 5548f5d6a5
64 changed files with 482 additions and 103 deletions
--- a/QXLive/Mine(音域)/Controller/帮助反馈/QXHelpViewController.m
+++ b/QXLive/Mine(音域)/Controller/帮助反馈/QXHelpViewController.m
@@ -111,10 +111,17 @@ static void *WKWebBrowserContext = &WKWebBrowserContext;
    if([message.name isEqualToString:@"nativeHandler"]){
        NSDictionary *dict = message.body;
        if ([dict[@"action"] isEqualToString:@"customerService"]) {
-            WXOpenCustomerServiceReq *req = [[WXOpenCustomerServiceReq alloc] init];
-            req.corpid = @"ww1de4300858c0b461";
-            req.url = @"https://work.weixin.qq.com/kfid/kfcb3d23a59c188a0e7";
-            [WXApi sendReq:req completion:nil];
+//            WXOpenCustomerServiceReq *req = [[WXOpenCustomerServiceReq alloc] init];
+//            req.corpid = @"ww1de4300858c0b461";
+//            req.url = @"https://work.weixin.qq.com/kfid/kfcb3d23a59c188a0e7";
+//            [WXApi sendReq:req completion:nil];
+            id object = dict[@"data"];
+            if ([object isKindOfClass:[NSDictionary class]]) {
+                NSDictionary *dataDic = object;
+                NSString *userId = dataDic[@"user_id"];
+                NSString *userName = dataDic[@"user_name"];
+                [[QXGlobal shareGlobal] chatWithServices:userId nickname:userName avatar:@"" navagationController:self.navigationController];
+            }
        }else if ([dict[@"action"] isEqualToString:@"closeWeb"]) {
            if (self.contentWebView.canGoBack) {
                [self.contentWebView goBack];
--- a/QXLive/Mine(音域)/Controller/我的房间/QXMyRoomViewController.m
+++ b/QXLive/Mine(音域)/Controller/我的房间/QXMyRoomViewController.m
@@ -72,10 +72,14 @@
    self.categoryView.titleFont = [UIFont systemFontOfSize:12];
    self.categoryView.titleSelectedFont = [UIFont boldSystemFontOfSize:16];
    self.categoryView.averageCellSpacingEnabled = NO;
-    JXCategoryIndicatorImageView *indicatorView = [[JXCategoryIndicatorImageView alloc] init];
-    indicatorView.indicatorImageView.image = [UIImage imageNamed:@"home_slider"];
-    indicatorView.indicatorImageViewSize = CGSizeMake(58, 8);
-    indicatorView.verticalMargin = 11;
+//    JXCategoryIndicatorImageView *indicatorView = [[JXCategoryIndicatorImageView alloc] init];
+//    indicatorView.indicatorImageView.image = [UIImage imageNamed:@"home_slider"];
+//    indicatorView.indicatorImageViewSize = CGSizeMake(70, 8);
+//    indicatorView.verticalMargin = 11;
+//    self.categoryView.indicators = @[indicatorView];
+    JXCategoryIndicatorLineView *indicatorView = [[JXCategoryIndicatorLineView alloc] init];
+    indicatorView.indicatorWidth = 50;
+    indicatorView.indicatorColor = QXConfig.themeColor;
    self.categoryView.indicators = @[indicatorView];
    self.containerView = [[JXCategoryListContainerView alloc] initWithType:(JXCategoryListContainerType_ScrollView) delegate:self];
    self.containerView.frame = CGRectMake(0, self.categoryView.bottom, SCREEN_WIDTH, SCREEN_HEIGHT-self.categoryView.bottom);
--- a/QXLive/Mine(音域)/Controller/设置/QXBindMobileViewController.m
+++ b/QXLive/Mine(音域)/Controller/设置/QXBindMobileViewController.m
@@ -97,6 +97,10 @@
    }
 }
 -(void)didClickSendCode:(UIButton *)sender{
+    GetSmscodeType type = GetSmscodeTypeFindBindMobile;
+    if (self.haveMobile) {
+        GetSmscodeType type = GetSmscodeTypeFindChangeMobile;
+    }
    if (sender == self.codeTextField.codeBtn) {
        sender.userInteractionEnabled = NO;
        if (self.accountTextField.textField.text.length < 11) {
@@ -107,7 +111,6 @@
            showToast(QXText(@"新手机号不能与旧手机号相同"));
            return;
        }
-        GetSmscodeType type = GetSmscodeTypeFindChangeMobile;
        MJWeakSelf
        self.isNetworking = YES;
        [QXLoginNetwork getSmscodeWithMobile:self.accountTextField.textField.text
@@ -121,7 +124,6 @@
            sender.userInteractionEnabled = YES;
        }];
    }else{
-        GetSmscodeType type = GetSmscodeTypeFindChangeMobile;
        NSString *oldMobile = [QXGlobal shareGlobal].loginModel.mobile;
        MJWeakSelf
        sender.userInteractionEnabled = NO;
--- a/QXLive/Mine(音域)/Services/QXMineNetwork.h
+++ b/QXLive/Mine(音域)/Services/QXMineNetwork.h
@@ -1587,6 +1587,7 @@ NS_ASSUME_NONNULL_BEGIN
                         successBlock:(void (^)(NSArray* list))successBlock
                            failBlock:(void (^)(NSError * error, NSString * msg))failBlock;

+
@end


--- a/QXLive/Mine(音域)/View/个人主页/QXUserHomeHeaderView.m
+++ b/QXLive/Mine(音域)/View/个人主页/QXUserHomeHeaderView.m
@@ -48,6 +48,7 @@

@property (nonatomic,strong) UIButton *followBtn;
@property (nonatomic,strong) UIButton *playBtn;
+@property (nonatomic,strong) UIButton *toRoomBtn;
@property (nonatomic,strong) QXUserCpDressView *cpDressView;
@property (nonatomic,strong) QXUserCpCardView *cpCardView;

@@ -247,9 +248,9 @@
    self.guildBgImageView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"user_home_guild_bg"]];
    [self.whiteBgView addSubview:self.guildBgImageView];
    [self.guildBgImageView mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.right.mas_equalTo(-8);
+        make.left.equalTo(self.headerView.mas_right);
        make.height.mas_equalTo(31);
-        make.top.mas_equalTo(6);
+        make.bottom.equalTo(self.headerView).offset(-10);
        make.width.mas_equalTo(94);
    }];
    
@@ -281,18 +282,35 @@
 //    [self.playBtn setTitle:QXText(@"私信") forState:(UIControlStateNormal)];
 //    [self.playBtn setTitleColor:UIColor.whiteColor forState:(UIControlStateNormal)];
 //    self.playBtn.backgroundColor = RGB16(0x333333);
-    self.playBtn.hidden = YES;
+    self.playBtn.hidden = NO;
+    [self.playBtn setBackgroundImage:[UIImage imageNamed:@"expansion_call"] forState:(UIControlStateNormal)];
    self.playBtn.titleLabel.font = [UIFont systemFontOfSize:14];
    [self.playBtn addRoundedCornersWithRadius:12];
    [self.playBtn addTarget:self action:@selector(playAction) forControlEvents:(UIControlEventTouchUpInside)];
    [self.whiteBgView addSubview:self.playBtn];
    [self.playBtn mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.right.equalTo(self.guildBgImageView.mas_left).offset(-6);
+        make.right.mas_equalTo(-8);
        make.width.mas_equalTo(59);
        make.height.mas_equalTo(24);
-        make.centerY.equalTo(self.guildBgImageView).offset(-2);
+        make.top.equalTo(self.whiteBgView).offset(6);
    }];
    
+    self.toRoomBtn = [[UIButton alloc] initWithFrame:CGRectMake(self.playBtn.left-6-91, self.whiteBgView.top+10, 91, 24)];
+//    [self.playBtn setTitle:QXText(@"私信") forState:(UIControlStateNormal)];
+//    [self.playBtn setTitleColor:UIColor.whiteColor forState:(UIControlStateNormal)];
+//    self.playBtn.backgroundColor = RGB16(0x333333);
+    self.toRoomBtn.hidden = YES;
+    [self.toRoomBtn setBackgroundImage:[UIImage imageNamed:@"room_user_follow"] forState:(UIControlStateNormal)];
+    self.toRoomBtn.titleLabel.font = [UIFont systemFontOfSize:14];
+    [self.toRoomBtn addRoundedCornersWithRadius:12];
+    [self.toRoomBtn addTarget:self action:@selector(roomAction) forControlEvents:(UIControlEventTouchUpInside)];
+    [self.whiteBgView addSubview:self.toRoomBtn];
+    [self.toRoomBtn mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.right.equalTo(self.playBtn.mas_left).offset(-6);
+        make.width.mas_equalTo(59);
+        make.height.mas_equalTo(24);
+        make.centerY.equalTo(self.playBtn);
+    }];
    
 //    self.nameLabel.text = @"张三";
 //    self.idLabel.text = @"313213213";
@@ -362,13 +380,15 @@
    }];
 }
 -(void)playAction{
+    [[QXGlobal shareGlobal] chatWithUserID:self.model.user_id nickname:self.model.nickname avatar:self.model.avatar navagationController:self.navigationController];
+}
+
+-(void)roomAction{
    if (self.model.room_id.intValue > 0) {
        // 去房间
        [[QXGlobal shareGlobal] joinRoomWithRoomId:self.model.room_id isRejoin:NO navagationController:self.navigationController];
-    }else{
-        // 去聊天
-        [[QXGlobal shareGlobal] chatWithUserID:self.model.user_id nickname:self.model.nickname avatar:self.model.avatar navagationController:self.navigationController];
    }
+    
 }
 -(void)didClickHeaderViewUserId:(NSString*)userId{
    if ([userId isEqualToString:self.userId]) {
@@ -478,16 +498,19 @@
    if ([model.user_id isEqualToString:[QXGlobal shareGlobal].loginModel.user_id]) {
        self.followBtn.hidden = YES;
        self.playBtn.hidden = YES;
+        self.toRoomBtn.hidden = YES;
    }else{
        self.followBtn.hidden = NO;
        self.playBtn.hidden = NO;
        self.followBtn.selected = model.is_follow==0?NO:YES;
        if (model.room_id.intValue > 0) {
 //            [self.playBtn setTitle:QXText(@"跟随") forState:(UIControlStateNormal)];
-            [self.playBtn setBackgroundImage:[UIImage imageNamed:@"room_user_follow"] forState:(UIControlStateNormal)];
+//            [self.playBtn setBackgroundImage:[UIImage imageNamed:@"room_user_follow"] forState:(UIControlStateNormal)];
+            self.toRoomBtn.hidden = NO;
        }else{
 //            [self.playBtn setTitle:QXText(@"私信") forState:(UIControlStateNormal)];
-            [self.playBtn setBackgroundImage:[UIImage imageNamed:@"expansion_call"] forState:(UIControlStateNormal)];
+//            [self.playBtn setBackgroundImage:[UIImage imageNamed:@"expansion_call"] forState:(UIControlStateNormal)];
+            self.toRoomBtn.hidden = YES;
        }
    }
    if ([model.guild_name isExist]) {
--- a/QXLive/Mine(音域)/View/充值/QXRechargeView.m
+++ b/QXLive/Mine(音域)/View/充值/QXRechargeView.m
@@ -26,6 +26,8 @@
@property (nonatomic,strong)UITapGestureRecognizer *tap;
@property (nonatomic,strong)NSMutableArray *rechargeDataArray;
@property (nonatomic,strong)NSMutableArray *payTypeArray;
+@property (nonatomic,strong)UIButton *selectedBtn;
+@property (nonatomic,strong)UIButton *agreementBtn;
@end

@implementation QXRechargeView
@@ -74,16 +76,54 @@
        make.bottom.mas_equalTo(-kSafeAreaBottom);
    }];
    
+    
+    self.agreementBtn = [[UIButton alloc] init];
+    [self.agreementBtn setTitleColor:RGB16(0x333333) forState:(UIControlStateNormal)];
+    self.agreementBtn.titleLabel.font = [UIFont systemFontOfSize:12];
+    NSString *s = @"我已阅读并同意《充值协议》";
+    NSMutableAttributedString *attr = [[NSMutableAttributedString alloc] initWithString:s];
+    [attr yy_setColor:QXConfig.themeColor range:[s rangeOfString:@"《充值协议》"]];
+    [self.agreementBtn addTarget:self action:@selector(agreementPreview) forControlEvents:(UIControlEventTouchUpInside)];
+    [self.agreementBtn setAttributedTitle:attr forState:(UIControlStateNormal)];
+    [self.bgView addSubview:self.agreementBtn];
+    [self.agreementBtn mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.centerX.equalTo(self.bgView).offset(15);
+        make.bottom.equalTo(self.rechargeBtn.mas_top).offset(-10);
+        make.height.mas_equalTo(20);
+    }];
+    
+    self.selectedBtn = [[UIButton alloc] init];
+    [self.selectedBtn setImage:[UIImage imageNamed:@"login_agreement_nor"] forState:(UIControlStateNormal)];
+    [self.selectedBtn setImage:[UIImage imageNamed:@"login_agreement_sel"] forState:(UIControlStateSelected)];
+    self.selectedBtn.selected = YES;
+    [self.selectedBtn addTarget:self action:@selector(agreeAction) forControlEvents:(UIControlEventTouchUpInside)];
+    [self.bgView addSubview:self.selectedBtn];
+    [self.selectedBtn mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.height.width.mas_equalTo(30);
+        make.right.equalTo(self.agreementBtn.mas_left).offset(-5);
+        make.centerY.equalTo(self.agreementBtn);
+    }];
+    
    [self.collectionView mas_makeConstraints:^(MASConstraintMaker *make) {
        make.right.mas_equalTo(0);
        make.left.mas_equalTo(0);
        make.top.equalTo(self.bgView);
-        make.bottom.equalTo(self.rechargeBtn.mas_top).offset(-10);
+        make.bottom.equalTo(self.selectedBtn.mas_top).offset(-10);
    }];
    [self getRechargeList];
    
 }

+-(void)agreeAction{
+    self.selectedBtn.selected = !self.selectedBtn.selected;
+}
+
+-(void)agreementPreview{
+    QXBaseWebViewController*vc = [[QXBaseWebViewController alloc] init];
+    vc.urlStr = [NSString stringWithFormat:@"%@api/Page/page_show?id=37",QXGlobal.shareGlobal.currentServer];
+    [KEYWINDOW.rootViewController presentViewController:vc animated:YES completion:nil];
+}
+
 -(void)getRechargeList{
  
    if (QXGlobal.shareGlobal.isAppStore) {
@@ -312,6 +352,10 @@


 -(void)rechargeAction:(UIButton*)sender{
+    if (self.selectedBtn.selected == NO) {
+        showToast(@"我已阅读并同意充值协议");
+        return;
+    }
    if (self.selectedModel == nil) {
        showToast(@"请选择充值金额");
        return;