MIDI/midi_ios
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复盲盒连送

Browse Source
This commit is contained in:
党凯
2025-10-04 18:31:00 +08:00
parent 367c5f3cea
commit b0bab1f1be
10 changed files with 54 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
QXLive.xcodeproj/project.pbxproj
View File

@@ -785,7 +785,7 @@
"$(inherited)", "$(inherited)",
"@executable_path/Frameworks", "@executable_path/Frameworks",
); );
MARKETING_VERSION = 1.0.5; MARKETING_VERSION = 1.0.6;
PRODUCT_BUNDLE_IDENTIFIER = com.xscm.midi; PRODUCT_BUNDLE_IDENTIFIER = com.xscm.midi;
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = ""; PROVISIONING_PROFILE_SPECIFIER = "";
@@ -847,7 +847,7 @@
"$(inherited)", "$(inherited)",
"@executable_path/Frameworks", "@executable_path/Frameworks",
); );
MARKETING_VERSION = 1.0.5; MARKETING_VERSION = 1.0.6;
PRODUCT_BUNDLE_IDENTIFIER = com.xscm.midi; PRODUCT_BUNDLE_IDENTIFIER = com.xscm.midi;
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = ""; PROVISIONING_PROFILE_SPECIFIER = "";

1
QXLive.xcodeproj/xcshareddata/xcschemes/QXLiveScreen.xcscheme
View File

@@ -87,7 +87,6 @@
savedToolIdentifier = "" savedToolIdentifier = ""
useCustomWorkingDirectory = "NO" useCustomWorkingDirectory = "NO"
debugDocumentVersioning = "YES" debugDocumentVersioning = "YES"
askForAppToLaunch = "Yes"
launchAutomaticallySubstyle = "2"> launchAutomaticallySubstyle = "2">
<BuildableProductRunnable <BuildableProductRunnable
runnableDebuggingMode = "0"> runnableDebuggingMode = "0">

1
QXLive.xcodeproj/xcshareddata/xcschemes/QXLiveScreenDev.xcscheme
View File

@@ -49,7 +49,6 @@
savedToolIdentifier = "" savedToolIdentifier = ""
useCustomWorkingDirectory = "NO" useCustomWorkingDirectory = "NO"
debugDocumentVersioning = "YES" debugDocumentVersioning = "YES"
askForAppToLaunch = "Yes"
launchAutomaticallySubstyle = "2"> launchAutomaticallySubstyle = "2">
<MacroExpansion> <MacroExpansion>
<BuildableReference <BuildableReference

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

@@ -379,15 +379,16 @@
self.auctionId = @""; self.auctionId = @"";
/// 2为背包 /// 2为背包
NSString *userId = [self.pitUserListView.selectedArray componentsJoinedByString:@","]; NSString *userId = [self.pitUserListView.selectedArray componentsJoinedByString:@","];
@weakify(self)
[QXMineNetwork roomSendGiftWithRoomId:self.roomId gift_id:self.giftModel.gift_id gift_num:self.giftCount to_uid:userId heart_id:self.heartId type:type pit_number:@"" successBlock:^(NSDictionary * _Nonnull dict) { [QXMineNetwork roomSendGiftWithRoomId:self.roomId gift_id:self.giftModel.gift_id gift_num:self.giftCount to_uid:userId heart_id:self.heartId type:type pit_number:@"" successBlock:^(NSDictionary * _Nonnull dict) {
@strongify(self)
if (type.intValue == 1) { if (type.intValue == 1) {
if (weakSelf.roomSendSuccessBlock) { if (self.roomSendSuccessBlock) {
weakSelf.roomSendSuccessBlock(self.type,weakSelf.giftModel,weakSelf.giftCount,userId,@""); self.roomSendSuccessBlock(self.type,self.giftModel,self.giftCount,userId,@"");
} }
[weakSelf hide]; [self hide];
}else{ }else{
[weakSelf.bagGiftView reloadData]; [self.bagGiftView reloadData];
} }
} failBlock:^(NSError * _Nonnull error, NSString * _Nonnull msg) { } failBlock:^(NSError * _Nonnull error, NSString * _Nonnull msg) {
showToast(msg) showToast(msg)
@@ -398,15 +399,17 @@
return; return;
} }
self.heartId = @""; self.heartId = @"";
@weakify(self)
/// 2为背包 /// 2为背包
[QXMineNetwork roomAuctionJoinWithAuctionId:self.auctionId user_id:[QXGlobal shareGlobal].loginModel.user_id gift_id:self.giftModel.gift_id num:self.giftCount type:type successBlock:^(NSDictionary * _Nonnull dict) { [QXMineNetwork roomAuctionJoinWithAuctionId:self.auctionId user_id:[QXGlobal shareGlobal].loginModel.user_id gift_id:self.giftModel.gift_id num:self.giftCount type:type successBlock:^(NSDictionary * _Nonnull dict) {
@strongify(self)
if (type.intValue == 1) { if (type.intValue == 1) {
[weakSelf hide]; if (self.roomSendSuccessBlock) {
if (weakSelf.roomSendSuccessBlock) { self.roomSendSuccessBlock(self.type,self.giftModel,self.giftCount,[QXGlobal shareGlobal].loginModel.user_id,self.auctionId);
weakSelf.roomSendSuccessBlock(weakSelf.type,weakSelf.giftModel,weakSelf.giftCount,[QXGlobal shareGlobal].loginModel.user_id,weakSelf.auctionId);
} }
[self hide];
}else{ }else{
[weakSelf.bagGiftView reloadData]; [self.bagGiftView reloadData];
} }
} failBlock:^(NSError * _Nonnull error, NSString * _Nonnull msg) { } failBlock:^(NSError * _Nonnull error, NSString * _Nonnull msg) {
showToast(msg); showToast(msg);
@@ -419,15 +422,18 @@
self.auctionId = @""; self.auctionId = @"";
/// 2为背包 /// 2为背包
NSString *userId = [self.pitUserListView.selectedArray componentsJoinedByString:@","]; NSString *userId = [self.pitUserListView.selectedArray componentsJoinedByString:@","];
NSString *type = self.categoryView.selectedIndex==0?@"2":@"1"; // NSString *type = self.categoryView.selectedIndex==0?@"2":@"1";
@weakify(self)
[QXMineNetwork roomSendGiftWithRoomId:self.roomId gift_id:self.giftModel.gift_id gift_num:self.giftCount to_uid:userId heart_id:self.heartId type:type pit_number:@"" successBlock:^(NSDictionary * _Nonnull dict) { [QXMineNetwork roomSendGiftWithRoomId:self.roomId gift_id:self.giftModel.gift_id gift_num:self.giftCount to_uid:userId heart_id:self.heartId type:type pit_number:@"" successBlock:^(NSDictionary * _Nonnull dict) {
@strongify(self)
if (type.intValue == 1) { if (type.intValue == 1) {
[weakSelf hide];
if (weakSelf.roomSendSuccessBlock) { if (self.roomSendSuccessBlock) {
weakSelf.roomSendSuccessBlock(self.type,weakSelf.giftModel,weakSelf.giftCount,userId,weakSelf.heartId); self.roomSendSuccessBlock(self.type,self.giftModel,self.giftCount,userId,self.heartId);
} }
[self hide];
}else{ }else{
[weakSelf.bagGiftView reloadData]; [self.bagGiftView reloadData];
} }
} failBlock:^(NSError * _Nonnull error, NSString * _Nonnull msg) { } failBlock:^(NSError * _Nonnull error, NSString * _Nonnull msg) {
showToast(msg) showToast(msg)

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

@@ -1709,6 +1709,10 @@ QXRoomUserInfoViewDelegate
weakSelf.skyView.roomId = weakSelf.roomId; weakSelf.skyView.roomId = weakSelf.roomId;
weakSelf.skyView.userIds = userIds; weakSelf.skyView.userIds = userIds;
weakSelf.skyView.heartId = weakSelf.sendGiftView.heartId; weakSelf.skyView.heartId = weakSelf.sendGiftView.heartId;
if (weakSelf.sendGiftView.type == QXSendGiftViewTypeAuction) {
weakSelf.skyView.heartId = @"";
weakSelf.skyView.auctionId = weakSelf.sendGiftView.auctionId;
}
[weakSelf.sendGiftView hide]; [weakSelf.sendGiftView hide];
[weakSelf.skyView showInView:weakSelf.view]; [weakSelf.skyView showInView:weakSelf.view];
}else if(gift.gift_bag.intValue == 11) { }else if(gift.gift_bag.intValue == 11) {
@@ -1716,6 +1720,10 @@ QXRoomUserInfoViewDelegate
weakSelf.ageView.roomId = weakSelf.roomId; weakSelf.ageView.roomId = weakSelf.roomId;
weakSelf.ageView.userIds = userIds; weakSelf.ageView.userIds = userIds;
weakSelf.ageView.heartId = weakSelf.sendGiftView.heartId; weakSelf.ageView.heartId = weakSelf.sendGiftView.heartId;
if (weakSelf.sendGiftView.type == QXSendGiftViewTypeAuction) {
weakSelf.skyView.heartId = @"";
weakSelf.skyView.auctionId = weakSelf.sendGiftView.auctionId;
}
[weakSelf.sendGiftView hide]; [weakSelf.sendGiftView hide];
[weakSelf.ageView showInView:weakSelf.view]; [weakSelf.ageView showInView:weakSelf.view];
}else if(gift.gift_bag.intValue == 12) { }else if(gift.gift_bag.intValue == 12) {
@@ -1723,6 +1731,10 @@ QXRoomUserInfoViewDelegate
weakSelf.timeView.roomId = weakSelf.roomId; weakSelf.timeView.roomId = weakSelf.roomId;
weakSelf.timeView.userIds = userIds; weakSelf.timeView.userIds = userIds;
weakSelf.timeView.heartId = weakSelf.sendGiftView.heartId; weakSelf.timeView.heartId = weakSelf.sendGiftView.heartId;
if (weakSelf.sendGiftView.type == QXSendGiftViewTypeAuction) {
weakSelf.skyView.heartId = @"";
weakSelf.skyView.auctionId = weakSelf.sendGiftView.auctionId;
}
[weakSelf.sendGiftView hide]; [weakSelf.sendGiftView hide];
[weakSelf.timeView showInView:weakSelf.view]; [weakSelf.timeView showInView:weakSelf.view];
} }

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

@@ -293,6 +293,21 @@ NSInteger maxMessageCount = 20;
return height; return height;
} }
-(void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath{
QXRoomChatListModel *model;
if (self.selectedBtn == self.chatBtn) {
model = self.chatArray[indexPath.row];
}else if (self.selectedBtn == self.giftBtn) {
model = self.giftArray[indexPath.row];
}else{
model = self.dataArray[indexPath.row];
}
if (model.FromUserInfo.user_id.longValue > 0 && model.messageType == QXRoomChatMessageTypeSystem) {
if (self.delegate && [self.delegate respondsToSelector:@selector(previewUserInfoWithUserId:)]) {
[self.delegate previewUserInfoWithUserId:model.FromUserInfo.user_id];
}
}
}
-(void)scrollViewDidScroll:(UIScrollView *)scrollView{ -(void)scrollViewDidScroll:(UIScrollView *)scrollView{
CGFloat height = scrollView.frame.size.height; CGFloat height = scrollView.frame.size.height;

1
QXLive/活动/天空之境/QXSkyPraizeView.h
View File

@@ -23,6 +23,7 @@ NS_ASSUME_NONNULL_BEGIN
@property (nonatomic,strong)QXGiftActivityModel *model; @property (nonatomic,strong)QXGiftActivityModel *model;
@property (nonatomic,strong)NSString* userIds; @property (nonatomic,strong)NSString* userIds;
@property (nonatomic,strong)NSString* heartId; @property (nonatomic,strong)NSString* heartId;
@property (nonatomic,strong)NSString* auctionId;
@property (nonatomic,copy)void(^startBlock)(void); @property (nonatomic,copy)void(^startBlock)(void);
-(void)showInView:(UIView *)view; -(void)showInView:(UIView *)view;
-(void)hide; -(void)hide;

1
QXLive/活动/岁月之城/QXAgePraizeView.h
View File

@@ -23,6 +23,7 @@ NS_ASSUME_NONNULL_BEGIN
@property (nonatomic,strong)QXGiftActivityModel *model; @property (nonatomic,strong)QXGiftActivityModel *model;
@property (nonatomic,strong)NSString* userIds; @property (nonatomic,strong)NSString* userIds;
@property (nonatomic,strong)NSString* heartId; @property (nonatomic,strong)NSString* heartId;
@property (nonatomic,strong)NSString* auctionId;
@property (nonatomic,copy)void(^startBlock)(void); @property (nonatomic,copy)void(^startBlock)(void);
-(void)showInView:(UIView *)view; -(void)showInView:(UIView *)view;
-(void)hide; -(void)hide;

4
QXLive/活动/巡乐会/QXMeetActivityView.m
View File

@@ -191,11 +191,11 @@
self.roomLuckUserView.centerX = self.roomOwenrView.centerX; self.roomLuckUserView.centerX = self.roomOwenrView.centerX;
[self.bgView addSubview:self.roomLuckUserView]; [self.bgView addSubview:self.roomLuckUserView];
self.bottomGiftBgView = [[UIView alloc] initWithFrame:CGRectMake(self.topGiftView.left-20, self.roomLuckUserView.bottom-14-ScaleWidth(118), ScaleWidth(118), 14+ScaleWidth(118))]; self.bottomGiftBgView = [[UIView alloc] initWithFrame:CGRectMake(self.topGiftView.left-20, self.roomLuckUserView.bottom-14-ScaleWidth(118)-15, ScaleWidth(118), 14+ScaleWidth(118))];
self.bottomGiftBgView.bottom = self.roomLuckUserView.bottom; self.bottomGiftBgView.bottom = self.roomLuckUserView.bottom;
[self.bgView addSubview:self.bottomGiftBgView]; [self.bgView addSubview:self.bottomGiftBgView];
self.bottomGiftView = [[QXMeetGiftView alloc] initWithFrame:CGRectMake(0, 10, ScaleWidth(118), ScaleWidth(118)+14)]; self.bottomGiftView = [[QXMeetGiftView alloc] initWithFrame:CGRectMake(0, 0, ScaleWidth(118), ScaleWidth(118)+14)];
self.bottomGiftView.isLockGift = YES; self.bottomGiftView.isLockGift = YES;
[self.bottomGiftBgView addSubview:self.bottomGiftView]; [self.bottomGiftBgView addSubview:self.bottomGiftView];

1
QXLive/活动/时空之巅/QXTimePraizeView.h
View File

@@ -23,6 +23,7 @@ NS_ASSUME_NONNULL_BEGIN
@property (nonatomic,strong)QXGiftActivityModel *model; @property (nonatomic,strong)QXGiftActivityModel *model;
@property (nonatomic,strong)NSString* userIds; @property (nonatomic,strong)NSString* userIds;
@property (nonatomic,strong)NSString* heartId; @property (nonatomic,strong)NSString* heartId;
@property (nonatomic,strong)NSString* auctionId;
@property (nonatomic,copy)void(^startBlock)(void); @property (nonatomic,copy)void(^startBlock)(void);
-(void)showInView:(UIView *)view; -(void)showInView:(UIView *)view;
-(void)hide; -(void)hide;