YUSHENG/featherVoice
8
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

上线提交

Browse Source
This commit is contained in:
启星
2026-01-31 09:19:05 +08:00
parent 362df44bb3
commit 6fcb5759ca
4 changed files with 33 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
QXLive/Mine(音域)/Controller/我的背包/QXBackpackSubViewController.m
View File

@@ -174,18 +174,35 @@
MJWeakSelf
_collectionView.mj_header = [MJRefreshNormalHeader headerWithRefreshingBlock:^{
weakSelf.page = 1;
weakSelf.page++;
BOOL isIn = NO;
if (weakSelf.type == 2) {
isIn = YES;
}else if(weakSelf.type == 3){
isIn = NO;
}
if (weakSelf.type == 0) {
[weakSelf getBagList];
}else if (weakSelf.type == 1){
[weakSelf getHotCardList];
}else{
[weakSelf getGiftRecordListIsIncome:self.type == 1];
[weakSelf getGiftRecordListIsIncome:isIn];
}
}];
_collectionView.mj_footer = [MJRefreshBackNormalFooter footerWithRefreshingBlock:^{
weakSelf.page++;
BOOL isIn = NO;
if (weakSelf.type == 2) {
isIn = YES;
}else if(weakSelf.type == 3){
isIn = NO;
}
if (weakSelf.type == 0) {
[weakSelf getBagList];
}else if (weakSelf.type == 1){
[weakSelf getHotCardList];
}else{
[weakSelf getGiftRecordListIsIncome:self.type == 1];
[weakSelf getGiftRecordListIsIncome:isIn];
}
}];
}

12
QXLive/Other/AppDelegate+Login.m
View File

@@ -161,12 +161,12 @@
}
-(void)locationSuccessWithCity:(NSString *)city province:(NSString *)province area:(NSString *)area address:(NSString *)address{
[[QXLocationManager shareManager] stopLoction];
NSString *ip = [NSString stringWithFormat:@"%@,%@,%@",province,city,area];
[QXLoginNetwork updateUserIp:ip successBlock:^(id _Nonnull responseObject) {
} failBlock:^(NSError * _Nonnull error, NSString * _Nonnull msg) {
}];
// NSString *ip = [NSString stringWithFormat:@"%@,%@,%@",province,city,area];
// [QXLoginNetwork updateUserIp:ip successBlock:^(id _Nonnull responseObject) {
//
// } failBlock:^(NSError * _Nonnull error, NSString * _Nonnull msg) {
//
// }];
}
- (void)onTotalUnreadMessageCountChanged:(UInt64)totalUnreadCount {
self.tabbarVC.messageUnReadNumber = totalUnreadCount;

4
QXLive/Room(房间)/View/设置/QXRoomSettingView.m
View File

@@ -825,7 +825,7 @@
if (!_planAc) {
_planAc = [[QXRoomSettingModel alloc] init];
_planAc.icon = @"room_set_room_plan_ac";
_planAc.name = @"爱豆计划";
_planAc.name = @"潘多拉魔盒";
_planAc.type = QXRoomSettingTypePlanAc;
}
return _planAc;
@@ -930,7 +930,7 @@
}
-(void)initSubviews{
UICollectionViewFlowLayout *layout = [[UICollectionViewFlowLayout alloc] init];
layout.itemSize = CGSizeMake(ScaleWidth(50), ScaleWidth(54)+5);
layout.itemSize = CGSizeMake(ScaleWidth(60), ScaleWidth(54)+5);
layout.minimumLineSpacing = 6;
layout.sectionInset = UIEdgeInsetsMake(0, 16, 0, 16);
layout.scrollDirection = UICollectionViewScrollDirectionHorizontal;

12
QXLive/活动/炼仙传说/WLStakeAlertView.m
View File

@@ -165,22 +165,22 @@
_type = type;
if ([_type isEqualToString:@"1"]) {
_iconImageView.image = ImageNamed(@"stake_name_1");
_nameLabel.text = @"天魔城";
_nameLabel.text = @"马不停蹄";
} else if ([_type isEqualToString:@"2"]) {
_iconImageView.image = ImageNamed(@"stake_name_2");
_nameLabel.text = @"天悲谷";
_nameLabel.text = @"万马奔腾";
} else if ([_type isEqualToString:@"3"]) {
_iconImageView.image = ImageNamed(@"stake_name_3");
_nameLabel.text = @"九煞山";
_nameLabel.text = @"龙马精神";
} else if ([_type isEqualToString:@"4"]) {
_iconImageView.image = ImageNamed(@"stake_name_4");
_nameLabel.text = @"昊天府";
_nameLabel.text = @"马年大吉";
} else if ([_type isEqualToString:@"5"]) {
_iconImageView.image = ImageNamed(@"stake_name_5");
_nameLabel.text = @"凌云殿";
_nameLabel.text = @"一马当先";
} else if ([_type isEqualToString:@"6"]) {
_iconImageView.image = ImageNamed(@"stake_name_6");
_nameLabel.text = @"半月宫";
_nameLabel.text = @"马到成功";
}
}