提交
This commit is contained in:
@@ -28,6 +28,8 @@
|
||||
#import "QXNobilityModel.h"
|
||||
#import "QXNobilityListModel.h"
|
||||
#import "QXNobilityGetPriceModel.h"
|
||||
#import "QXUserSongListModel.h"
|
||||
#import "QXRoomBestFriendModel.h"
|
||||
|
||||
NS_ASSUME_NONNULL_BEGIN
|
||||
|
||||
@@ -1186,6 +1188,99 @@ NS_ASSUME_NONNULL_BEGIN
|
||||
successBlock:(void (^)(NSDictionary* dict))successBlock
|
||||
failBlock:(void (^)(NSError * error, NSString * msg))failBlock;
|
||||
|
||||
|
||||
/**
|
||||
歌手认证
|
||||
*/
|
||||
+(void)singerAuthWithSong:(NSString*)song
|
||||
successBlock:(void (^)(NSDictionary* dict))successBlock
|
||||
failBlock:(void (^)(NSError * error, NSString * msg))failBlock;
|
||||
|
||||
|
||||
/**
|
||||
用户歌单
|
||||
*/
|
||||
+(void)getUserSongListWithRoomId:(NSString*)room_id
|
||||
user_id:(NSString*)user_id
|
||||
page:(NSInteger)page
|
||||
SuccessBlock:(void (^)(NSArray<QXUserSongListModel*>* list,NSString*count))successBlock
|
||||
failBlock:(void (^)(NSError * error, NSString * msg))failBlock;
|
||||
|
||||
|
||||
/**
|
||||
用户添加/修改/删除歌曲
|
||||
type 0 添加 1 修改 2 删除
|
||||
*/
|
||||
+(void)mineUserAddAndDeleteAndEditWithType:(NSInteger)type
|
||||
Id:(NSString*)Id
|
||||
songName:(NSString*)songName
|
||||
giftId:(NSString*)giftId
|
||||
giftNum:(NSString*)giftNum
|
||||
successBlock:(void (^)(NSDictionary* dict))successBlock
|
||||
failBlock:(void (^)(NSError * error, NSString * msg))failBlock;
|
||||
|
||||
/**
|
||||
点歌
|
||||
*/
|
||||
+(void)requestSongWithSongId:(NSString*)songId
|
||||
roomId:(NSString*)roomId
|
||||
successBlock:(void (^)(NSDictionary* dict))successBlock
|
||||
failBlock:(void (^)(NSError * error, NSString * msg))failBlock;
|
||||
|
||||
|
||||
/**
|
||||
点歌列表
|
||||
*/
|
||||
+(void)requestSongWithRoomId:(NSString*)roomId
|
||||
type:(NSInteger)type
|
||||
page:(NSInteger)page
|
||||
successBlock:(void (^)(NSArray<QXUserSongListModel*>* list,NSString*count))successBlock
|
||||
failBlock:(void (^)(NSError * error, NSString * msg))failBlock;
|
||||
|
||||
/**
|
||||
歌曲置顶
|
||||
*/
|
||||
+(void)requestSongToTopWithId:(NSString*)Id
|
||||
successBlock:(void (^)(NSDictionary* dict))successBlock
|
||||
failBlock:(void (^)(NSError * error, NSString * msg))failBlock;
|
||||
|
||||
/**
|
||||
获取点歌房歌曲数量
|
||||
*/
|
||||
+(void)requestSongCountWithRoomId:(NSString*)roomId
|
||||
successBlock:(void (^)(QXUserSongListCount*model))successBlock
|
||||
failBlock:(void (^)(NSError * error, NSString * msg))failBlock;
|
||||
|
||||
/**
|
||||
点唱房切歌
|
||||
*/
|
||||
+(void)requsetSongNextActionWithId:(NSString*)Id
|
||||
successBlock:(void (^)(NSDictionary* dict))successBlock
|
||||
failBlock:(void (^)(NSError * error, NSString * msg))failBlock;
|
||||
/**
|
||||
cp礼物回赠
|
||||
*/
|
||||
+(void)userCpReSendWithGiftId:(NSString *)giftId
|
||||
userId:(NSString*)userId
|
||||
roomId:(NSString*)roomId
|
||||
successBlock:(void (^)(NSDictionary* dict))successBlock
|
||||
failBlock:(void (^)(NSError * error, NSString * msg))failBlock;
|
||||
/**
|
||||
获取挚友列表
|
||||
*/
|
||||
+(void)userBestFriendsListWithUserId:(NSString*)userId
|
||||
page:(NSInteger)page
|
||||
successBlock:(void (^)(QXRoomBestFriendModel* model))successBlock
|
||||
failBlock:(void (^)(NSError * error, NSString * msg))failBlock;
|
||||
|
||||
/**
|
||||
更多挚友列表
|
||||
*/
|
||||
+(void)userBestFriendsMoreListWithUserId:(NSString*)userId
|
||||
relation_id:(NSString*)relation_id
|
||||
successBlock:(void (^)(NSArray< QXRelationshipListModel*>* model))successBlock
|
||||
failBlock:(void (^)(NSError * error, NSString * msg))failBlock;
|
||||
|
||||
@end
|
||||
|
||||
|
||||
|
||||
@@ -22,6 +22,7 @@
|
||||
[QXGlobal shareGlobal].loginModel.nickname_color = userModel.nickname_color;
|
||||
[QXGlobal shareGlobal].loginModel.is_hide = userModel.is_hide;
|
||||
[QXGlobal shareGlobal].loginModel.hide_status = userModel.hide_status;
|
||||
[QXGlobal shareGlobal].loginModel.singer_status = userModel.singer_status;
|
||||
[[QXGlobal shareGlobal] updateUserInfoWithMolde:[QXGlobal shareGlobal].loginModel];
|
||||
BOOL api_version = [responseObject[@"api_version"] boolValue];
|
||||
[QXGlobal shareGlobal].isAppStore = api_version;
|
||||
@@ -687,10 +688,30 @@
|
||||
@"pit_number":pit_number?pit_number:@"",
|
||||
@"heart_id":heart_id?heart_id:@""
|
||||
};
|
||||
__block NSString *userId = to_uid;
|
||||
[[QXRequset shareInstance] postWithUrl:QXSendGift parameters:parameters needCache:NO success:^(id responseObject) {
|
||||
if (successBlock) {
|
||||
successBlock(responseObject[@"data"]);
|
||||
}
|
||||
// NSDictionary *cp_type = [NSDictionary stringWithFormat:@"%@",responseObject[@"data"][@"cp_type"]];
|
||||
id object = responseObject[@"data"][@"cp_type"];
|
||||
if ([object isKindOfClass:[NSDictionary class]]) {
|
||||
NSDictionary *cpDict = (NSDictionary *)object;
|
||||
NSString *cp_type = [NSString stringWithFormat:@"%@",cpDict[@"cp_type"]];
|
||||
if (cp_type.intValue == 1) {
|
||||
/// 单向送cp礼物
|
||||
NSString *jsonStr = [cpDict jsonStringEncoded];
|
||||
[[QXRoomMessageManager shared] sendC2CMessage:jsonStr messageType:(QXRoomMessageTypeSendAndRecieveCpHeartSignal) userId:userId];
|
||||
}else if (cp_type.intValue == 2){
|
||||
/// cp礼物已达成双向绑定
|
||||
NSString *jsonStr = [cpDict jsonStringEncoded];
|
||||
[[QXRoomMessageManager shared] sendC2CMessage:jsonStr messageType:(QXRoomMessageTypeCpHeartFinished) userId:userId];
|
||||
[[QXRoomMessageManager shared] showCpFinishedAlertViewWithText:[NSString stringWithFormat:@"%@",cpDict[@"text"]]];
|
||||
}else{
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
} fail:^(NSError *error, NSString *msg, NSURLSessionDataTask *task) {
|
||||
failBlock(error,msg);
|
||||
}];
|
||||
@@ -2314,4 +2335,213 @@
|
||||
}];
|
||||
}
|
||||
|
||||
+(void)singerAuthWithSong:(NSString*)song
|
||||
successBlock:(void (^)(NSDictionary* dict))successBlock
|
||||
failBlock:(void (^)(NSError * error, NSString * msg))failBlock{
|
||||
NSDictionary *parameters =@{
|
||||
@"song":song?song:@"",
|
||||
};
|
||||
[[QXRequset shareInstance] postWithUrl:QXMineSingerAuth parameters:parameters needCache:NO success:^(id responseObject) {
|
||||
if (successBlock) {
|
||||
successBlock(responseObject[@"data"]);
|
||||
}
|
||||
} fail:^(NSError *error, NSString *msg, NSURLSessionDataTask *task) {
|
||||
failBlock(error,msg);
|
||||
}];
|
||||
}
|
||||
|
||||
+(void)getUserSongListWithRoomId:(NSString *)room_id
|
||||
user_id:(NSString *)user_id
|
||||
page:(NSInteger)page
|
||||
SuccessBlock:(void (^)(NSArray<QXUserSongListModel*>* list,NSString*count))successBlock
|
||||
failBlock:(void (^)(NSError * _Nonnull, NSString * _Nonnull))failBlock{
|
||||
NSDictionary *parameters =@{
|
||||
@"room_id":room_id?room_id:@"",
|
||||
@"user_id":user_id?user_id:@"",
|
||||
@"page":[NSNumber numberWithInteger:page]
|
||||
};
|
||||
[[QXRequset shareInstance] postWithUrl:QXMineGetSingerSongList parameters:parameters needCache:NO success:^(id responseObject) {
|
||||
if (successBlock) {
|
||||
NSArray*list = [NSArray yy_modelArrayWithClass:[QXUserSongListModel class] json:responseObject[@"data"][@"lists"]];
|
||||
NSString*count = [NSString stringWithFormat:@"%@",responseObject[@"data"][@"count"]];
|
||||
successBlock(list,count);
|
||||
}
|
||||
} fail:^(NSError *error, NSString *msg, NSURLSessionDataTask *task) {
|
||||
failBlock(error,msg);
|
||||
}];
|
||||
}
|
||||
|
||||
+(void)mineUserAddAndDeleteAndEditWithType:(NSInteger)type
|
||||
Id:(NSString*)Id
|
||||
songName:(NSString*)songName
|
||||
giftId:(NSString*)giftId
|
||||
giftNum:(NSString*)giftNum
|
||||
successBlock:(void (^)(NSDictionary* dict))successBlock
|
||||
failBlock:(void (^)(NSError * error, NSString * msg))failBlock{
|
||||
NSString *url = QXMineSingerAddSong;
|
||||
if (type == 0) {
|
||||
url = QXMineSingerAddSong;
|
||||
}else if(type == 1){
|
||||
url = QXMineSingerEidtSong;
|
||||
}else{
|
||||
url = QXMineSingerDeleteSong;
|
||||
}
|
||||
|
||||
NSDictionary *parameters =@{
|
||||
@"id":Id?:@"",
|
||||
@"song_name":songName?:@"",
|
||||
@"gift_id":giftId?:@"",
|
||||
@"gift_num":giftNum?:@"",
|
||||
};
|
||||
[[QXRequset shareInstance] postWithUrl:url parameters:parameters needCache:NO success:^(id responseObject) {
|
||||
if (successBlock) {
|
||||
successBlock(responseObject[@"data"]);
|
||||
}
|
||||
} fail:^(NSError *error, NSString *msg, NSURLSessionDataTask *task) {
|
||||
failBlock(error,msg);
|
||||
}];
|
||||
}
|
||||
/**
|
||||
点歌
|
||||
*/
|
||||
+(void)requestSongWithSongId:(NSString*)songId
|
||||
roomId:(NSString*)roomId
|
||||
successBlock:(void (^)(NSDictionary* dict))successBlock
|
||||
failBlock:(void (^)(NSError * error, NSString * msg))failBlock{
|
||||
NSDictionary *parameters =@{
|
||||
@"song_id":songId?:@"",
|
||||
@"room_id":roomId?:@"",
|
||||
};
|
||||
[[QXRequset shareInstance] postWithUrl:QXRoomRequestSong parameters:parameters needCache:NO success:^(id responseObject) {
|
||||
if (successBlock) {
|
||||
successBlock(responseObject[@"data"]);
|
||||
}
|
||||
} fail:^(NSError *error, NSString *msg, NSURLSessionDataTask *task) {
|
||||
failBlock(error,msg);
|
||||
}];
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
点歌列表
|
||||
*/
|
||||
+(void)requestSongWithRoomId:(NSString*)roomId
|
||||
type:(NSInteger)type
|
||||
page:(NSInteger)page
|
||||
successBlock:(void (^)(NSArray<QXUserSongListModel*>* list,NSString*count))successBlock
|
||||
failBlock:(void (^)(NSError * error, NSString * msg))failBlock{
|
||||
NSDictionary *parameters =@{
|
||||
@"type":[NSNumber numberWithInteger:type],
|
||||
@"room_id":roomId?:@"",
|
||||
@"page":[NSNumber numberWithInteger:page]
|
||||
};
|
||||
[[QXRequset shareInstance] postWithUrl:QXRoomAllSongList parameters:parameters needCache:NO success:^(id responseObject) {
|
||||
if (successBlock) {
|
||||
NSArray*list = [NSArray yy_modelArrayWithClass:[QXUserSongListModel class] json:responseObject[@"data"][@"lists"]];
|
||||
NSString*count = [NSString stringWithFormat:@"%@",responseObject[@"data"][@"count"]];
|
||||
successBlock(list,count);
|
||||
}
|
||||
} fail:^(NSError *error, NSString *msg, NSURLSessionDataTask *task) {
|
||||
failBlock(error,msg);
|
||||
}];
|
||||
}
|
||||
|
||||
/**
|
||||
歌曲置顶
|
||||
*/
|
||||
+(void)requestSongToTopWithId:(NSString*)Id
|
||||
successBlock:(void (^)(NSDictionary* dict))successBlock
|
||||
failBlock:(void (^)(NSError * error, NSString * msg))failBlock{
|
||||
NSDictionary *parameters =@{
|
||||
@"id":Id?:@"",
|
||||
};
|
||||
[[QXRequset shareInstance] postWithUrl:QXRoomRequestSongTop parameters:parameters needCache:NO success:^(id responseObject) {
|
||||
if (successBlock) {
|
||||
successBlock(responseObject[@"data"]);
|
||||
}
|
||||
} fail:^(NSError *error, NSString *msg, NSURLSessionDataTask *task) {
|
||||
failBlock(error,msg);
|
||||
}];
|
||||
}
|
||||
|
||||
+(void)requestSongCountWithRoomId:(NSString*)roomId
|
||||
successBlock:(void (^)(QXUserSongListCount*model))successBlock
|
||||
failBlock:(void (^)(NSError * error, NSString * msg))failBlock{
|
||||
NSDictionary *parameters =@{
|
||||
@"room_id":roomId?:@"",
|
||||
};
|
||||
[[QXRequset shareInstance] postWithUrl:QXRoomRequestSongCount parameters:parameters needCache:NO success:^(id responseObject) {
|
||||
if (successBlock) {
|
||||
QXUserSongListCount *countModel = [QXUserSongListCount yy_modelWithJSON:responseObject[@"data"]];
|
||||
successBlock(countModel);
|
||||
}
|
||||
} fail:^(NSError *error, NSString *msg, NSURLSessionDataTask *task) {
|
||||
failBlock(error,msg);
|
||||
}];
|
||||
}
|
||||
|
||||
|
||||
+(void)requsetSongNextActionWithId:(NSString *)Id successBlock:(void (^)(NSDictionary * _Nonnull))successBlock failBlock:(void (^)(NSError * _Nonnull, NSString * _Nonnull))failBlock{
|
||||
NSDictionary *parameters =@{
|
||||
@"id":Id?:@"",
|
||||
};
|
||||
[[QXRequset shareInstance] postWithUrl:QXRoomRequestSongNext parameters:parameters needCache:NO success:^(id responseObject) {
|
||||
if (successBlock) {
|
||||
successBlock(responseObject[@"data"]);
|
||||
}
|
||||
} fail:^(NSError *error, NSString *msg, NSURLSessionDataTask *task) {
|
||||
failBlock(error,msg);
|
||||
}];
|
||||
}
|
||||
|
||||
|
||||
+(void)userCpReSendWithGiftId:(NSString *)giftId userId:(NSString*)userId roomId:(NSString*)roomId successBlock:(void (^)(NSDictionary * _Nonnull))successBlock failBlock:(void (^)(NSError * _Nonnull, NSString * _Nonnull))failBlock{
|
||||
NSDictionary *parameters =@{
|
||||
@"gift_id":giftId?:@"",
|
||||
@"user_id":userId?:@"",
|
||||
@"room_id":roomId?:@""
|
||||
};
|
||||
[[QXRequset shareInstance] postWithUrl:QXUserCpResend parameters:parameters needCache:NO success:^(id responseObject) {
|
||||
if (successBlock) {
|
||||
successBlock(responseObject[@"data"]);
|
||||
}
|
||||
} fail:^(NSError *error, NSString *msg, NSURLSessionDataTask *task) {
|
||||
failBlock(error,msg);
|
||||
}];
|
||||
}
|
||||
+(void)userBestFriendsListWithUserId:(NSString*)userId
|
||||
page:(NSInteger)page
|
||||
successBlock:(void (^)(QXRoomBestFriendModel* model))successBlock
|
||||
failBlock:(void (^)(NSError * error, NSString * msg))failBlock{
|
||||
NSDictionary *parameters =@{
|
||||
@"user_id":userId?:@"",
|
||||
@"page":[NSNumber numberWithInteger:page]
|
||||
};
|
||||
[[QXRequset shareInstance] postWithUrl:QXBestFriendsList parameters:parameters needCache:NO success:^(id responseObject) {
|
||||
if (successBlock) {
|
||||
QXRoomBestFriendModel *model = [QXRoomBestFriendModel yy_modelWithJSON:responseObject[@"data"]];
|
||||
successBlock(model);
|
||||
}
|
||||
} fail:^(NSError *error, NSString *msg, NSURLSessionDataTask *task) {
|
||||
failBlock(error,msg);
|
||||
}];
|
||||
}
|
||||
|
||||
+(void)userBestFriendsMoreListWithUserId:(NSString*)userId
|
||||
relation_id:(NSString*)relation_id
|
||||
successBlock:(void (^)(NSArray< QXRelationshipListModel*>* model))successBlock
|
||||
failBlock:(void (^)(NSError * error, NSString * msg))failBlock{
|
||||
NSDictionary *parameters =@{
|
||||
@"user_id":userId?:@"",
|
||||
@"relation_id":relation_id?:@""
|
||||
};
|
||||
[[QXRequset shareInstance] postWithUrl:QXBestFriendsMoreList parameters:parameters needCache:NO success:^(id responseObject) {
|
||||
if (successBlock) {
|
||||
NSArray *list = [NSArray yy_modelArrayWithClass:[QXRelationshipListModel class] json:responseObject[@"data"]];
|
||||
successBlock(list);
|
||||
}
|
||||
} fail:^(NSError *error, NSString *msg, NSURLSessionDataTask *task) {
|
||||
failBlock(error,msg);
|
||||
}];
|
||||
}
|
||||
@end
|
||||
|
||||
Reference in New Issue
Block a user