This commit is contained in:
启星
2025-12-30 19:08:34 +08:00
parent 1a9d6650f5
commit b724fe2a67
111 changed files with 1078 additions and 162 deletions

View File

@@ -38,6 +38,7 @@
#import "QXIntimateViewController.h"
#import "QXBodyPriceRuleView.h"
#import "QXFamilyViewController.h"
#import "QXNobilityDetailViewController.h"
#import <WXApi.h>
@interface QXMineViewController ()<UITableViewDelegate,UITableViewDataSource,QXMineServiceCellDelegate,QXMainHeaderViewDelegate>
@@ -68,7 +69,11 @@
}
- (void)initSubViews{
[self updateBgImage:@"app_home_bg"];
if (QXConfig.shared.model) {
[self updateBgImage:QXConfig.shared.model.app_home_bg];
}else{
[self updateBgImage:@"app_home_bg"];
}
self.tableView.tableHeaderView = self.tableHeaderView;
[self.view addSubview:self.tableView];
// [self.view addSubview:self.settingBtn];
@@ -223,7 +228,9 @@
break;
case QXMainHeaderOptionTypeNobility:{
QXLOG(@"跳转贵族");
QXNobilityViewController *vc = [[QXNobilityViewController alloc] init];
// QXNobilityViewController *vc = [[QXNobilityViewController alloc] init];
// [self.navigationController pushViewController:vc animated:YES];
QXNobilityDetailViewController *vc = [[QXNobilityDetailViewController alloc] init];
[self.navigationController pushViewController:vc animated:YES];
}
break;

View File

@@ -418,6 +418,7 @@
_textView.font = [UIFont systemFontOfSize:12];
_textView.textColor = QXConfig.textColor;
_textView.placehoulder = QXText(@"本房间严禁刷屏,禁止非法广告宣传,禁止引战地域黑,语言攻击等");
_textView.maxLength = 500;
_textView.backgroundColor = [UIColor clearColor];
}
return _textView;

View File

@@ -88,7 +88,7 @@
[self updateBgImage:@"nobility_detail_bg"];
[self.view addSubview:self.headerView];
[self.view addSubview:self.cycleScrollView];
[self.view addSubview:self.bottomView];
// [self.view addSubview:self.bottomView];
UICollectionViewFlowLayout *layout = [[UICollectionViewFlowLayout alloc] init];
int itemWidth = (SCREEN_WIDTH-16*2-8*2)/3;

View File

@@ -32,6 +32,7 @@
#import "QXRoomBestFriendModel.h"
#import "QXFamilyModel.h"
#import "QXRoomActivityStatusModel.h"
#import "QXConfig.h"
NS_ASSUME_NONNULL_BEGIN
@@ -1462,6 +1463,14 @@ NS_ASSUME_NONNULL_BEGIN
*/
+(void)getRoomActivityStatusSuccessBlock:(void (^)(NSArray<QXRoomActivityStatusModel*>* list))successBlock
failBlock:(void (^)(NSError * error, NSString * msg))failBlock;
/**
app配置接口
*/
+(void)getAppConfigSuccessBlock:(void (^)(QXConfigModel* config))successBlock
failBlock:(void (^)(NSError * error, NSString * msg))failBlock;
@end

View File

@@ -2960,5 +2960,19 @@
failBlock(error,msg);
}];
}
/**
app
*/
+(void)getAppConfigSuccessBlock:(void (^)(QXConfigModel* config))successBlock
failBlock:(void (^)(NSError * error, NSString * msg))failBlock{
[[QXRequset shareInstance] getWithUrl:QXRedpacketConfig parameters:@{} needCache:YES success:^(id responseObject) {
if (successBlock) {
QXConfigModel *model= [QXConfigModel yy_modelWithJSON:responseObject[@"data"]];
successBlock(model);
}
} fail:^(NSError *error, NSString *msg, NSURLSessionDataTask *task) {
failBlock(error,msg);
}];
}
@end

View File

@@ -181,25 +181,32 @@
if (!_serviceArray) {
QXServiceModel *md1 = [[QXServiceModel alloc] init];
md1.title = @"等级";
md1.icon = @"service_level";
md1.type = QXMineServiceTypeLevel;
QXServiceModel *md2 = [[QXServiceModel alloc] init];
md2.title = @"个性装扮";
md2.icon = @"service_dress";
md2.type = QXMineServiceTypeDress;
QXServiceModel *md3 = [[QXServiceModel alloc] init];
md3.title = @"我的背包";
md3.icon = @"service_bag";
md3.type = QXMineServiceTypeBackpack;
QXServiceModel *md4 = [[QXServiceModel alloc] init];
md4.title = @"我的家族";
md4.icon = @"service_my_family";
md4.type = QXMineServiceTypeFamily;
if (QXConfig.shared.model) {
md1.icon = @"icon_dj";
md2.icon = @"icon_gxzb";
md3.icon = @"icon_wdbb";
md4.icon = @"icon_wdjz";
}else{
md1.icon = @"service_level";
md2.icon = @"service_dress";
md3.icon = @"service_bag";
md4.icon = @"service_my_family";
}
_serviceArray = [NSMutableArray arrayWithArray:@[
md4,
md1,
@@ -232,21 +239,20 @@
md4.icon = @"service_customer_service";
md4.type = QXMineServiceTypeCustomerService;
// QXServiceModel *md5 = [[QXServiceModel alloc] init];
// md5.title = @"歌手认证";
// md5.icon = @"service_singer_auth";
// md5.type = QXMineServiceTypeSingerAuth;
//
// QXServiceModel *md6 = [[QXServiceModel alloc] init];
// md6.title = @"我的歌单";
// md6.icon = @"service_songlist";
// md6.type = QXMineServiceTypeSongList;
QXServiceModel *md7 = [[QXServiceModel alloc] init];
md7.title = @"设置";
md7.icon = @"service_setting";
md7.type = QXMineServiceTypeSetting;
if (QXConfig.shared.model) {
md1.icon = @"icon_bzzx";
md2.icon = @"icon_rw";
md7.icon = @"icon_sz";
}else{
md1.icon = @"service_help";
md2.icon = @"service_task";
md7.icon = @"service_setting";
}
_moreArray = [NSMutableArray arrayWithArray:@[
md1,
md2,
@@ -264,7 +270,11 @@
if (!_inviteModel) {
_inviteModel = [[QXServiceModel alloc] init];
_inviteModel.title = @"邀请";
_inviteModel.icon = @"service_invite";
if (QXConfig.shared.model) {
_inviteModel.icon = @"icon_yq";
}else{
_inviteModel.icon = @"service_invite";
}
_inviteModel.type = QXMineServiceTypeInvite;
}
return _inviteModel;
@@ -273,7 +283,11 @@
if (!_singerAuthModel) {
_singerAuthModel = [[QXServiceModel alloc] init];
_singerAuthModel.title = @"歌手认证";
_singerAuthModel.icon = @"service_singer_auth";
if (QXConfig.shared.model) {
_singerAuthModel.icon = @"icon_gsrz";
}else{
_singerAuthModel.icon = @"service_singer_auth";
}
_singerAuthModel.type = QXMineServiceTypeSingerAuth;
}
return _singerAuthModel;
@@ -283,7 +297,11 @@
if (!_songListModel) {
_songListModel = [[QXServiceModel alloc] init];
_songListModel.title = @"我的歌单";
_songListModel.icon = @"service_songlist";
if (QXConfig.shared.model) {
_songListModel.icon = @"icon_wdgd";
}else{
_songListModel.icon = @"service_songlist";
}
_songListModel.type = QXMineServiceTypeSongList;
}
return _songListModel;