Skip to content

pidan / FuSiLive

Go to a project
Commit e2edef2f by pierce
Options

删除没用的网络请求和URL宏定义

parent f89dccdf
Inline Side-by-side
Showing with 6 additions and 1097 deletions
FuSiLive/AppDelegate.m
......@@ -598,7 +598,6 @@ static dispatch_queue_t get_status_queue() {
[[NSUserDefaults standardUserDefaults] setObject:@(NO) forKey:kFUSConfigAppzfStatusUDKey];
[[NSUserDefaults standardUserDefaults] setObject:@(0) forKey:TABBAR_ITEM_SOUND];
[[NSUserDefaults standardUserDefaults] setObject:@(YES) forKey:SHOULD_REMOTE_NOTIFICATION_TIP];
[[NSUserDefaults standardUserDefaults] setObject:URL_WEB_BAOFANG_ACTIVE_URL forKey:UDKEY_BAOFANG_ACTIVE_PAGE_WEB_URL];
[[NSUserDefaults standardUserDefaults] setObject:@([NSDate date].timeIntervalSince1970) forKey:FirstLaunchTimeUDKey];
}
......
FuSiLive/Classes/BaoFang/Main/Other/FUSBaoFangHttpHelper.h
......@@ -62,22 +62,7 @@ typedef enum : NSUInteger {
NSInteger totalLikes,
NSArray *recommands))success
failure:(void (^)(NSString *msg,
int code))failure ;
/**
* 首页获取附近的包房
*
* @param page 页数
* @param pageSize每页大小
* @param success 成功回调
* @param failure 失败回调
*/
+ (void)fus_requestNearbyBaoFangWithPage:(NSInteger)page
pageSize:(NSInteger)pageSize
sex:(NSInteger)sex
withDataKey:(NSString *)dataKey
success:(void (^)(NSArray *likeBaoFangModelArray, NSInteger code,NSInteger pageSize, NSString *newDataKey))success
failure:(void (^)(NSString *msg, int code))failure;
int code))failure;
/**
* 空间获取指定用户追踪的包房
......@@ -133,24 +118,6 @@ typedef enum : NSUInteger {
NSInteger code))success
failure:(void (^)(NSString *msg, int code))failure;
/**
* 获取视讯、声优聊天主播首页信息
*
* @param vcType 视讯、声优聊天
* @param type 数据源类型
* @param page 页码
* @param success 成功回调
* @param failure 失败回调
*/
+ (void)fus_requestAccompanyingAnchorsInfosWithControllerType:(FUSBaoFangControllerType)vcType
withType:(FUSDataSourceType)type
page:(NSInteger)page
sex:(NSInteger)sex
size:(NSInteger)size
success:(void (^)(NSMutableArray *userInfos,BOOL isLastPage, int code))success
failure:(void (^)(NSString *msg, int code))failure;
/**
* 结束直播间推荐热门列表
*
......@@ -159,17 +126,6 @@ typedef enum : NSUInteger {
*/
+(void)fus_requestEndRecommendRoomsSuccess:(void (^)(NSMutableArray *userInfos, int code))success failure:(void (^)(NSString *msg, int code))failure;
/**
* 获取用户相册
*
* @param success 成功回调
* @param failure 失败回调
*/
+ (void)fus_getUserPhotosWithSuccess:(void (^)(NSArray *imageArray))success
failure:(void (^)(NSString *msg))failure;
/**
获取循环广播
......@@ -203,18 +159,6 @@ typedef enum : NSUInteger {
/**
请求主题包房的数据
@param success
@param failure
*/
+ (void)fus_requestThemeRoomDataWithThemeId:(NSString *)themeId
pageSize:(NSInteger)pageSize
page:(NSInteger)page
success:(void(^)(NSArray *models))success
failure:(void(^)(NSString *msg, int code))failure;
/**
请求开屏推送的数据
@param success
......
FuSiLive/Classes/BaoFang/Main/Other/FUSBaoFangHttpHelper.m
......@@ -83,72 +83,6 @@
}
/**
* 获取附近的包房
*
* @param page 页数
* @param pageSize每页大小
* @param success 成功回调
* @param failure 失败回调
*/
+ (void)fus_requestNearbyBaoFangWithPage:(NSInteger)page pageSize:(NSInteger)pageSize sex:(NSInteger)sex withDataKey:(NSString *)dataKey success:(void (^)(NSArray *, NSInteger,NSInteger,NSString *))success failure:(void (^)(NSString *, int))failure{
NSString *location = [[NSUserDefaults standardUserDefaults] objectForKey:@"location"];
// 空值判断
if (page == 0 || pageSize == 0) {
FUSLogInfo(@"--->获取追踪的包房失败, page或pageSize为0,或者uid为零");
return;
}
if ([NSString isNull:location]) {
FUSLogInfo(@"位置信息为空");
}
// 构建请求参数
if ([NSString isNull:dataKey]) {
dataKey = @"";
}
NSMutableDictionary *params = [NSMutableDictionary dictionary];
params[@"pageSize"] = @(pageSize);
params[@"page"] = @(page);
params[@"location"] = location;
params[@"dataKey"] = dataKey;
params[@"cityCode"] = 0;
params[@"sex"] = @(sex);
if ([FUSConfig sharedInstanced].devConfigs.enableHttpDebug) {
FUSLogInfo(@"请求参数%@",params);
}
[FUSHttpHelper postRequestBinaryWithUrl:URL_BAOFANG_NEARBY params:params success:^(NSDictionary *dataDict, int code) {
NSArray *modelDics = dataDict[@"rooms"];
NSString *dataKey = dataDict[@"dataKey"];
NSInteger pageSize = [[dataDict[@"pageSize"] description] integerValue];
NSMutableArray *models = [NSMutableArray array];
if (![NSArray isNull:modelDics]) {
for (NSDictionary *dic in modelDics) {
FUSBaoFangAnchorModel *model = [FUSBaoFangAnchorModel fus_modelWithDict:dic];
[models addObject:model];
}
}
if (success) {
success(models,code,pageSize,dataKey);
}
} failure:^(NSDictionary *dataDict, int code) {
if (failure) {
failure(FAILURE_MESSAGE,code);
}
}];
}
/**
* 获取追踪的包房
*
......@@ -234,9 +168,6 @@
}
NSString *url = URL_BAOFANG_TYPEPAGE;
if (vcType == FUSBaoFangControllerTypeChatRoom) {
url = URL_BAOFANG_ChatRoom;
}
// Http网络请求
[FUSHttpHelper postRequestBinaryWithUrl:url params:params success:^(NSDictionary *dataDict, int code) {
......@@ -377,75 +308,6 @@
}
/**
* 获取视讯、声优聊天主播首页信息
*
* @param vcType 视讯、声优聊天
* @param type 数据源类型
* @param page 页码
* @param success 成功回调
* @param failure 失败回调
*/
+ (void)fus_requestAccompanyingAnchorsInfosWithControllerType:(FUSBaoFangControllerType)vcType
withType:(FUSDataSourceType)type
page:(NSInteger)page
sex:(NSInteger)sex
size:(NSInteger)size
success:(void (^)(NSMutableArray *, BOOL, int))success
failure:(void (^)(NSString *, int))failure
{
NSString *location = [[NSUserDefaults standardUserDefaults] objectForKey:@"location"];
//请求参数
NSMutableDictionary *params = [NSMutableDictionary dictionary];
params[@"page"] = @(page);
params[@"pageSize"] = @(size);
params[@"category"] = @(vcType);
params[@"type"] = @(type);
params[@"locat"] = location;
params[@"filterSex"] = @(sex);
if ([FUSConfig sharedInstanced].devConfigs.enableHttpDebug) {
FUSLogInfo(@"=====>>>请求参数：%@",params);
}
// 视讯、声优聊天Http网络请求
[FUSHttpHelper postRequestBinaryWithUrl:URL_BAOFANG_ACCOMPAY params:params success:^(NSDictionary *dataDict, int code) {
NSString *uid = [[[FUSCacheDataShare shareStore]userDetailInfo]uid];
BOOL isCheckCountLogined = [[[NSUserDefaults standardUserDefaults] objectForKey:CHECKCOUNT_LOGINED] boolValue];
if (([FUSConfig.sharedInstanced.devConfigs.blackUserDict objectForKey:uid] && !FUSConfig.sharedInstanced.devConfigs.appStatus && !TEST_CODE) || (isCheckCountLogined && !FUSConfig.sharedInstanced.devConfigs.appStatus)) {
dataDict = @{};
}
NSArray *userJsons = dataDict[@"results"];
NSInteger page = [dataDict[@"page"] integerValue];
NSInteger pageTotal = [dataDict[@"pageTotal"] integerValue];
BOOL isLastPage = page >= pageTotal;
NSMutableArray *anchors = [NSMutableArray array];
if (![NSArray isNull:userJsons]) {
for (NSDictionary *dic in userJsons) {
FUSBaoFangSingleModel *anchor = [FUSBaoFangSingleModel fus_modelWithDict:dic];
anchor.videoModel = [FUSHomeVideoChatModel fus_modelWithDict:anchor.chatWith];
if ([anchor.chatWith[@"videoPrice"] integerValue] <= 0
&& [anchor.chatWith[@"audioPrice"] integerValue] <= 0) {
[anchors addObject:anchor];
}
}
}
if (success) success(anchors, isLastPage, code);
} failure:^(NSDictionary *dataDict, int code) {
if (failure) failure(FAILURE_MESSAGE, code);
}];
}
/**
* 结束直播间推荐热门列表
*
* @param success 成功回调
......@@ -476,27 +338,6 @@
}];
}
/**
* 获取用户相册
*
* @param success 成功回调
* @param failure 失败回调
*/
+ (void)fus_getUserPhotosWithSuccess:(void (^)(NSArray *imageArray))success failure:(void (^)(NSString *msg))failure {
[FUSHttpHelper postRequestBinaryWithUrl:URL_GET_USER_PHOTOS params:nil success:^(NSDictionary *dataDict, int code) {
NSMutableArray *mutArray = [NSMutableArray array];
for (NSInteger i = 0; i < [dataDict[@"photos"] count]; i++) {
[mutArray addObject:dataDict[@"photos"][i]];
}
if (success) success(mutArray);
} failure:^(NSDictionary *dataDict, int code) {
if (failure) failure([FUSHttpErrorMessage fus_getErrorMessageWithDict:dataDict]);
}];
}
/**
获取循环广播
......@@ -588,37 +429,6 @@
}];
}
/**
请求主题包房的数据
@param success
@param failure
*/
+ (void)fus_requestThemeRoomDataWithThemeId:(NSString *)themeId pageSize:(NSInteger)pageSize page:(NSInteger)page success:(void (^)(NSArray *))success failure:(void (^)(NSString *, int))failure{
NSMutableDictionary *param = [NSMutableDictionary dictionary];
param[@"themeId"] = themeId;
param[@"page"] = @(page);
param[@"pageSize"] = @(pageSize);
[FUSHttpHelper postRequestBinaryWithUrl:URL_THEME_ROOM params:param success:^(NSDictionary *dataDict, int code) {
NSArray *rooms = dataDict[@"rooms"];
NSMutableArray *roomArr = [NSMutableArray array];
for (NSDictionary *dict in rooms) {
FUSBaoFangAnchorModel *model = [FUSBaoFangAnchorModel fus_modelWithDict:dict];
[roomArr addObject:model];
}
if (success) {
success(roomArr);
}
} failure:^(NSDictionary *dataDict, int code) {
if (failure) {
failure(FAILURE_MESSAGE, code);
}
}];
}
/**
请求开屏推送的数据
......
FuSiLive/Classes/Common/Other/FUSCommonCacheOperate.m
......@@ -376,99 +376,6 @@
}
///**
// * 更新等级信息数据
// *
// * @param type 类型：1-内存->本地->服务器，2-本地->服务器，3-服务器
// * @param success 成功回调
// * @param failure 失败回调
// */
//+ (void)fus_getUpdateLevelWithType:(ReadCacheOrder)type success:(void (^)(NSArray *levelArray))success failure:(void (^)(NSString *msg))failure
//{
// // 从内存获取数据
// if (type <= 1) {
// NSArray *levelModelArray = [[FUSCacheDataShare shareStore] levelModelArray];
// if (![NSArray isNull:levelModelArray]) {
// if (success) success(levelModelArray);
// return;
// }
// }
//
// // 从本地获取数据
// if (type <= 2) {
// // 获取本地数据
// NSArray *levelDictArray = [FUSCustomizedInfosStore fus_readCommonInfosWithKey:HOT_LEVEL_DICT_ARRAY];
// // 解析字典数组为Model数组
// NSMutableArray *levelModelArray = [NSMutableArray array];
// for (NSDictionary *levelDict in levelDictArray) {
// FUSLevelDataModel *levelModel = [FUSLevelDataModel fus_modelWithDict:levelDict];
// // 容错
// if ([FUSBaseModel fus_isNullWithModel:levelModel] || [NSString isNull:levelModel.lid]) continue;
//
// [levelModelArray addObject:levelModel];
//
// // 预下载图片
// [[YYWebImageManager sharedManager] requestImageWithURL:[NSURL URLWithString:[FUSConfig.sharedInstanced.pathConfigs downloadPath:levelModel.icon]] options:0 progress:nil transform:nil completion:nil];
// }
// // 更新内存, 回调数据
// if (![NSArray isNull:levelModelArray]) {
// // 更新内存数据
// [[FUSCacheDataShare shareStore] setLevelModelArray:levelModelArray];
// // 回调数据
// if (success) success(levelModelArray);
// return;
// }
// }
//
// // 从服务器获取数据
// if (type <= 3) {
// [FUSCommonHttpRequest fus_updateLevelWithSuccess:^(NSDictionary *dataDict, int code){
// // 解析数据
// NSString *levelMd5 = [dataDict objectForKey:@"levelMd5"];
// NSArray *levelDictArray = [dataDict objectForKey:@"data"];
// // 将字典数组转为Model数组
// NSMutableArray *levelModelArray = [NSMutableArray array];
//
// NSMutableDictionary *liveUserInfoLevelBgDict = [NSMutableDictionary dictionary];
// NSMutableDictionary *liveChatLevelBgDict = [NSMutableDictionary dictionary];
// NSMutableDictionary *liveEnterRoomLevelBgDict = [NSMutableDictionary dictionary];
//
// for (NSDictionary *dataDict in levelDictArray) {
// FUSLevelDataModel *levelModel = [FUSLevelDataModel fus_modelWithDict:dataDict];
//
// // 容错
// if ([FUSBaseModel fus_isNullWithModel:levelModel] || [NSString isNull:levelModel.lid]) continue;
//
// [levelModelArray addObject:levelModel];
//
// //vip等级图片
// liveUserInfoLevelBgDict[levelModel.level] = levelModel.power;
// liveChatLevelBgDict[levelModel.level] = levelModel.chatPower;
// liveEnterRoomLevelBgDict[levelModel.level] = levelModel.carPower;
//
// // 预下载图片
// [[YYWebImageManager sharedManager] requestImageWithURL:[NSURL URLWithString:[FUSConfig.sharedInstanced.pathConfigs downloadPath:levelModel.icon]] options:0 progress:nil transform:nil completion:nil];
// }
// // 更新内存数据
// FUSHotDataMD5Model *hotDataMD5Model = [[FUSCacheDataShare shareStore] hotDataMD5Model];
// hotDataMD5Model.levelMd5 = levelMd5;
// [[FUSCacheDataShare shareStore] setLevelModelArray:levelModelArray];
// // 更新本地数据
// [FUSCustomizedInfosStore fus_addCommonInfosWithKey:HOT_UPDATE_CHECK_MD5_DICT value:[hotDataMD5Model fus_getDictionary]];
// [FUSCustomizedInfosStore fus_addCommonInfosWithKey:HOT_LEVEL_DICT_ARRAY value:levelDictArray];
// [FUSCustomizedInfosStore fus_addCommonInfosWithKey:VIP_LEVEL_BGVIEW_DICT value:liveUserInfoLevelBgDict];
// [FUSCustomizedInfosStore fus_addCommonInfosWithKey:VIP_CHAT_LEVEL_BGVIEW_DICT value:liveChatLevelBgDict];
// [FUSCustomizedInfosStore fus_addCommonInfosWithKey:VIP_ENTERROOM_LEVEL_BGVIEW_DICT value:liveEnterRoomLevelBgDict];
// // 回调数据
// if (success) success(levelModelArray);
//
// } failure:^(NSString *msg, int code) {
// if (failure) failure(msg);
// }];
// }
//}
/**
* 更新横幅广告数据
*
......
FuSiLive/Classes/Common/Other/FUSCommonHttpRequest.h
......@@ -131,14 +131,6 @@ typedef enum : NSUInteger {
+ (void)fus_updateChatGiftWithSuccess:(void(^)(NSDictionary *dataDict, int code))success failure:(void(^)(NSString *msg, int code))failure;
/**
* 更新等级信息数据
*
* @param success 成功回调
* @param failure 失败回调
*/
+ (void)fus_updateLevelWithSuccess:(void (^)(NSDictionary *dataDict, int code))success failure:(void (^)(NSString *msg, int code))failure;
/**
* 更新横幅广告数据
*
* @param success 成功回调
......@@ -147,18 +139,6 @@ typedef enum : NSUInteger {
+ (void)fus_updateBannerWithSuccess:(void (^)(NSDictionary *dataDict, int code))success failure:(void (^)(NSString *msg, int code))failure;
/**
* 获取国家列表
*
* @param success 成功回调
* @param failure 失败回调
*/
+ (void)fus_getCountryShowList:(NSInteger)page
pageSize:(NSInteger)pageSize
type:(NSInteger)type
success:(void (^)(NSArray<FUSCountryModel *> *countryList, int code))success
failure:(void (^)(NSString *msg, int code))failure;
/**
* 更新座驾数据
*
* @param success 成功回调
......
FuSiLive/Classes/Common/Other/FUSCommonHttpRequest.m
......@@ -275,20 +275,6 @@
/**
* 更新等级信息数据
*
* @param success 成功回调
* @param failure 失败回调
*/
+ (void)fus_updateLevelWithSuccess:(void (^)(NSDictionary *dataDict, int code))success failure:(void (^)(NSString *msg, int code))failure
{
[FUSHttpHelper postRequestBinaryWithUrl:URL_UPDATE_LEVEL params:nil retryTimes:3 success:success failure:^(NSDictionary *dataDict, int code) {
if (failure) failure(FAILURE_MESSAGE, code);
}];
}
/**
* 更新横幅广告数据
*
* @param success 成功回调
......@@ -314,42 +300,6 @@
}];
}
// 已废除
/**
* 获取国家列表
*
* @param success 成功回调
* @param failure 失败回调
*/
+ (void)fus_getCountryShowList:(NSInteger)page
pageSize:(NSInteger)pageSize
type:(NSInteger)type
success:(void (^)(NSArray<FUSCountryModel *> *countryList, int code))success
failure:(void (^)(NSString *msg, int code))failure
{
[FUSHttpHelper postRequestBinaryWithUrl:URL_GET_COUNTRY_SHOW params:@{@"type":@(type),@"page":@(page),@"pageSize":@(pageSize)} retryTimes:3 success:^(NSDictionary *dataDict, int code) {
BOOL isShow = [dataDict[@"isShow"] boolValue];
NSArray *list = dataDict[@"list"];
if (!isShow || [NSArray isNull:list]) {
if (success) {
success(nil,code);
}
return;
}
NSMutableArray *countryList = [NSMutableArray arrayWithCapacity:list.count];
if (success) {
success(countryList,code);
}
} failure:^(NSDictionary *dataDict, int code) {
if (failure) failure(FAILURE_MESSAGE, code);
}];
}
/**
* 更新包房提示信息
*
......
FuSiLive/Classes/Foundation/DataStores/FUSUserDefaultsStore.h
......@@ -407,9 +407,6 @@
// 语音签名文字链数据列表
#define UDKEY_COMMON_VOICE_SIGN_DEMO_LIST @"UDKEY_COMMON_VOICE_SIGN_DEMO_LIST"
// 首页包房活动页的地址
#define UDKEY_BAOFANG_ACTIVE_PAGE_WEB_URL @"UDKEY_BAOFANG_ACTIVE_PAGE_WEB_URL"
// TTSDK初始化的信息
#define UDKEY_TTSDK_INFOS @"UDKEY_TTSDK_INIT_INFOS"
// LIVE_PUSH_CONFIG 数据 Key 值
......
FuSiLive/Classes/Foundation/Http/FUSURLDictionary.h
......@@ -17,15 +17,11 @@
#define DNS_ACCOUNTS(url) [NSString stringWithFormat:@"%@%@",[[FUSAPIDNSManager shareInstance] accountsDNS],url]
//#define DNS_WEB(url) [NSString stringWithFormat:@"%@/footseen%@",[[FUSAPIDNSManager shareInstance] webURL],url]
#define DNS_WEB(url) [NSString stringWithFormat:@"%@%@",[[FUSAPIDNSManager shareInstance] webURL],url]
#define DNS_PAYMENTS(url) [NSString stringWithFormat:@"%@%@",[[FUSAPIDNSManager shareInstance] payURL],url]
#pragma mark -- 登录注册相关
// 绑定用户列表
#define URL_BIND_USER_LIST DNS_FUS_API(@"/user/getAgentBindingUser.html")
// 打开 App 发送 IDFA
#define URL_IDFA DNS_FUS_API(@"/open/open_automatic.html")
......@@ -42,26 +38,6 @@
// 登录注册问题反馈
#define URL_LOGIN_FEEDBACK DNS_FUS_API(@"/account/feedback")
#define URL_USER_TIME_GET DNS_FUS_API(@"/user/live/time/get")
// 修改密码获取验证码
#define URL_MODIFY_GET_VERIFY_CODE DNS_ACCOUNTS(@"/yzcomm/findpw.do")
// 校验修改验证码
#define URL_MODIFY_CHECK_VERIFY_CODE DNS_ACCOUNTS(@"/yzcomm/checkCap.do")
// 修改密码
#define URL_MODIFY_PASSWORD DNS_ACCOUNTS(@"/app/recovery/resetpwd.do")
// 获取验证密码
#define URL_GET_VERIFY_PWD DNS_ACCOUNTS(@"/yzcomm/getpw.do")
// 注册新用户
#define URL_REGIST_USER DNS_ACCOUNTS(@"/yzcomm/reg.do")
// FuSi社区注册
#define URL_REGIST_COMMUNITY DNS_FUS_API(@"/user/reg.html")
// 第三方登录
#define URL_THIRD_LOGIN DNS_FUS_API(@"/third/login.html")
......@@ -77,9 +53,6 @@
// 获取指定用户的信息
#define URL_FRIEND_INFO DNS_FUS_API(@"/sync/getUser.html")
// 获取添加好友之前需要的礼物ID数组
#define URL_GIFT_ARR_ADD_FRIEND DNS_FUS_API(@"/friend/applygift.html")
// 获取用户信息
#define URL_USER_INFO DNS_FUS_API(@"/sync/me.html")
......@@ -104,9 +77,6 @@
// 完成注册激活漂流瓶消息
#define URL_COMPLETE_REGISTATION DNS_FUS_API(@"/index/completeRegistration.html")
// 校验版本更新
#define URL_CHECK_VERSION_UPDATE DNS_FUS_API(@"/update/yz")
// 上传用户个推 clientid
#define URL_GETTUI_CLIENTID DNS_FUS_API(@"/push/report/pushCid")
......@@ -144,44 +114,13 @@
// 绑定手机
#define URL_PHONE_AUTH DNS_FUS_API(@"/account/bindphone.html")
//校验证件的格式
#define URL_CARDNUMBER_FORMATF DNS_FUS_API(@"/user/checkDataFormat.html")
//上传身份认证信息
#define URL_UPLOADUSER_INFO DNS_FUS_API(@"/user/identityAuth.html")
//请求身份证认证状态
#define URL_IDCARD_VERIFYSTATE DNS_FUS_API(@"/user/checkAuthState.html")
#pragma mark -- 包房相关
// 获取用户相册
#define URL_GET_USER_PHOTOS DNS_FUS_API(@"/zone/photos.html")
// 获取主播首页信息(除附近的人,都用这个)v6.1.1以前
//#define URL_BAOFANG_TYPEPAGE DNS_FUS_API(@"/room/type.html")
// 获取主播首页信息(除附近的人,都用这个)v6.1.1修改接口
//#define URL_BAOFANG_TYPEPAGE DNS_FUS_API(@"/room/v2/queryRoomList")
// 获取主播首页信息(除附近的人,都用这个)v6.1.3修改接口
#define URL_BAOFANG_TYPEPAGE DNS_FUS_API(@"/home/queryLiveRoomList")
// 获取聊天（推荐/追踪/亲密）列表
#define URL_BAOFANG_ChatRoom DNS_FUS_API(@"/home/queryChatRoomList")
// 获取国家筛选列表
#define URL_BAOFANG_GET_ROOMS_BY_COUNTRY DNS_FUS_API(@"/room/getRoomsByCountry")
// 获取伴聊首页信息(声优聊天，视讯)
//#define URL_BAOFANG_ACCOMPAY DNS_FUS_API(@"/chatWith/getList.html")
// 获取伴聊首页信息(声优聊天，视讯)===>v5.8以前
//#define URL_BAOFANG_ACCOMPAY DNS_FUS_API(@"/chatWith/getVideos.html")
// 获取伴聊首页信息(声优聊天，视讯)===>v5.8
//#define URL_BAOFANG_ACCOMPAY DNS_FUS_API(@"/chatWith/getUnicastList.html")
// 获取伴聊首页信息(声优聊天，视讯)===>v6.1.3
#define URL_BAOFANG_ACCOMPAY DNS_FUS_API(@"/home/queryUnicastList")
// 获取追踪的包房(空间)
#define URL_BAOFANG_LIKE_LIST DNS_FUS_API(@"/room/getHomeLikeList.html")
......@@ -200,15 +139,9 @@
// 直播间活动图标信息
#define URL_LIVE_ACTIVITY_INFO DNS_FUS_API(@"/activityIcon/getActivityIcon.html")
// 获取附近的人
#define URL_BAOFANG_NEARBY DNS_FUS_API(@"/room/nearby.html")
// 获取推荐的主播
#define URL_RECOMMENDED DNS_FUS_API(@"/room/recommend.html")
// 获取主题包房
#define URL_THEME_ROOM DNS_FUS_API(@"/room/getThemeLives.html")
// 批量追踪
#define URL_LIKE_USERS DNS_FUS_API(@"/room/likes.html")
......@@ -221,25 +154,7 @@
// 领取新人礼物礼包
#define URL_LIVE_ENTER_ROOM_GET_GIFT DNS_FUS_API(@"/live/new/gift/get.html")
// 3.9.0 接口合并，废弃该接口
// 获得包房IP、端口号 getBarIpAndPort
//#define URL_GET_ROOM_IP_PORT DNS_FUS_API(@"/room/enter.html")
// 发送包房广播
#define URL_ROOM_SEND_BROADCAST DNS_FUS_API(@"/room/sendRadio.html")
// 修改包房信息
#define URL_UPDATE_ROOM_INFO DNS_FUS_API(@"/room/update.html")
// 包房追踪我的人
#define URL_ROOM_SUBSCRIBE DNS_FUS_API(@"/room/likeme.html")
// 获取房间信息
#define URL_ROOM_INFO DNS_FUS_API(@"/room/info.html")
// 获取房间内用户的信息
//#define URL_ROOM_USER_INFO DNS_FUS_API(@"/room/user.html")
// v5.1.0之前用上面注释的那个，之后用下面这个
#define URL_ROOM_USER_INFO DNS_FUS_API(@"/room/v2/user.html")
// 获取房间内神秘用户的信息
......@@ -251,24 +166,6 @@
// 取消追踪包房
#define URL_ROOM_UNLIKE DNS_FUS_API(@"/room/unlike.html")
// 邀请进入包房
#define URL_ROOM_INVITE DNS_FUS_API(@"/room/inv.html")
// 任务列表
#define URL_MISSION_LIST DNS_FUS_API(@"/task/list.html")
// 分享任务列表
#define URL_SHARE_MISSION DNS_FUS_API(@"/task/share.html")
// 领取奖励
#define URL_GET_AWARD DNS_FUS_API(@"/task/prize.html")
// 完成任务
#define URL_FINISH_MISSION DNS_FUS_API(@"/task/doneshare.html")
// 获取包房最新消息
#define URL_ROOM_LIKED_NEW_MESSAGE DNS_FUS_API(@"/sync/roommsg.html")
// 获取包房活动数据
#define URL_ROOM_ACTIVITY DNS_FUS_API(@"/sync/active.html")
......@@ -300,13 +197,8 @@
#define URL_CREATE_ROOM DNS_FUS_API(@"/room/createnew.html")
// 重连包房
//#define URL_LIVE_RECONNECT DNS_FUS_API(@"/live/afreshRoom.html")
#define URL_LIVE_RECONNECT DNS_FUS_API(@"/live/reconnect.html")
// 3.9.0 接口合并，废弃该接口
// 加入包房
//#define URL_LIVE_JOIN DNS_FUS_API(@"/live/joinRoom.html")
// 退出包房
#define URL_LIVE_EXIT DNS_FUS_API(@"/live/exitRoom.html")
......@@ -349,9 +241,6 @@
// 发送点赞
#define URL_LIVE_SEND_LIKE DNS_FUS_API(@"/live/sendPraise.html")
//包房发送红包
#define URL_ROOM_SEND_RED_PACKET DNS_FUS_API(@"/redPacket/send.html")
// 获取红包宝箱zip资源
#define URL_ROOM_UPDATE_RED_PACKET_RESOURCE DNS_FUS_API(@"/redPacket/updateRedPacketResource.html")
......@@ -370,9 +259,6 @@
//红包领取详情
#define URL_ROOM_RED_PACKET_LIST DNS_FUS_API(@"/redPacket/getReceiveList.html")
// 获取红包配置数据
#define URL_LIVE_RED_PACKET_CONFIG DNS_FUS_API(@"/redPacket/getConfig.html")
// 获取红包列表数据
#define URL_LIVE_RED_PACKET_LIST DNS_FUS_API(@"/redPacket/getList.html")
......@@ -452,68 +338,14 @@
// 兑换宝石
#define URL_ZONE_EXCHANGE_DIAMOND DNS_FUS_API(@"/setting/updateexchangepoints.html")
// 获取微信参数
#define URL_GET_WECHAT_CONFIG DNS_ACCOUNTS(@"/pay/conf/weixin/yz.do")
// 储值订单查询
#define URL_PAY_ORDER_QUERY DNS_ACCOUNTS(@"/order/query.do")
// 储值返利提交推荐人
#define URL_RECOMMEND_OTHER DNS_FUS_API(@"/payorder/recommend.html")
// 创建订单
//#define URL_CREATE_ORDER DNS_ACCOUNTS(@"/yz/pay.do")
// 新版苹果支付
//#define URL_NEW_APPLE_PURCHASE DNS_FUS_API(@"/pay/createOrder.html")
// 测试用新版苹果支付创建订单
#define URL_TEST_NEW_IAP_CREAT_ORDER DNS_PAYMENTS(@"/order/new.html")
// 储值回调
//#define URL_PAYMENT_NOTIFY DNS_ACCOUNTS(@"/payhandle/appstore/notify.do")
// 新版储值回调
//#define URL_NEW_PAYMENT_CALL_BACK DNS_FUS_API(@"/pay/appstoreCallback.html")
// 测试用新版
#define URL_TEST_PAYMENT_CALL_BACK DNS_PAYMENTS(@"/notify/apple.html")
// 微信提现
#define URL_BANK_WEIXIN_PAY_PAGE DNS_FUS_API(@"/withdraw/wx.html")
// 提现记录
#define URL_BANK_RECORD_PAGE DNS_FUS_API(@"/withdraw/record.html")
// 兑换萤火
#define URL_EXCHANGE_BOND_PAGE DNS_FUS_API(@"/withdraw/bond.html")
// 兑换银币
#define URL_EXCHANGE_GOLD_PAGE DNS_FUS_API(@"/withdraw/coin.html")
// 消费记录
#define URL_TRADE_RECORD_PAGE DNS_FUS_API(@"/withdraw/trade.html")
// 储值记录
#define URL_RECHARGE_RECORD_PAGE DNS_FUS_API(@"/withdraw/recharge.html")
// 进入储值页面统计
#define URL_RECHARGE_STATISTICS DNS_FUS_API(@"/stat/torecharge")
// 萤火兑换宝石
#define URL_EXCHANGE_DIAMOND DNS_FUS_API(@"/user/exchange.html")
// 提现
//#define URL_CRASH_WITHDRAW DNS_WEB(@"/Nesting/fireflyRmb/cashReality.html")
#define URL_CRASH_WITHDRAW DNS_WEB(@"/Nesting/fireflyRmb/new-cashReality.html")
//#define URL_NEWSFEED_INPUT DNS_WEB(@"/Nesting/moving/news.html")
#define URL_NEWSFEED_INPUT DNS_WEB(@"/fusi/moving/news.html")
// 提现
#define URL_FACEBOOK_GETBACK DNS_WEB(@"/Nesting/getBack/index.html")
#pragma mark -- 热更新相关
// 校验更新的MD5
......@@ -522,12 +354,6 @@
// 表情更新
#define URL_UPDATE_EXPRESSION DNS_FUS_API(@"/setting/expression.html")
// 储值点更新
//#define URL_UPDATE_RECHARGE DNS_FUS_API(@"/setting/recharge.html")
// 测试用新版储值点获取
#define URL_NEW_UPDATE_RECHARGE DNS_PAYMENTS(@"/pay/recharge")
// 礼物更新
#define URL_UPDATE_GIFT DNS_FUS_API(@"/setting/gift.html")
......@@ -540,18 +366,12 @@
// 座驾更新
#define URL_UPDATE_MOTORING DNS_FUS_API(@"/setting/motoring.html")
// 等级信息更新
#define URL_UPDATE_LEVEL DNS_FUS_API(@"/setting/updateuserlevel.html")// /setting/level.html
// 横幅广告更新
#define URL_UPDATE_BANNER DNS_FUS_API(@"/setting/banner.html")
/// 获取开播主题配置
#define URL_Start_Live_Config DNS_FUS_API(@"/setting/start/live/config")
// 获取国家列表
#define URL_GET_COUNTRY_SHOW DNS_FUS_API(@"/room/getCountryShow.html")
// 包房信息提示更新
#define URL_UPDATE_ROOM_TIP DNS_FUS_API(@"/setting/config.html")
......@@ -564,15 +384,10 @@
// 打开App初始化配置
#define URL_OPEN_INIT_CONFIG DNS_FUS_API(@"/open/init/config")
// 泡泡、TabBar 图片等资源更新
#define URL_UPDATE_BUTTON_IMAGE DNS_FUS_API(@"/setting/button.html")
// 2.1.0 更新直播间礼物数据
#define URL_UPDATE_LIVE_GIFT_DATA DNS_FUS_API(@"/setting/updatelivegift.html")
// 获取直播间包裹礼物
// FuSi 5.5.0 修改了接口，背包接口从/inventory/getgifts.html 改为/inventory/getBackpack.html
//#define URL_LIVE_PARCELGIFT_DATA DNS_FUS_API(@"/inventory/getgifts.html")
#define URL_LIVE_BACKPACK_DATA DNS_FUS_API(@"/inventory/getBackpack.html")
//爆奖礼物面板广播数据
......@@ -598,10 +413,8 @@
// FuSi 5.8.0 换成了新接口
// 修改自己的视讯开关
//#define URL_PRIVATE_LIVE_EDIT_SWITCH DNS_FUS_API(@"/chatWith/setswitch.html")
#define URL_PRIVATE_LIVE_EDIT_SWITCH DNS_FUS_API(@"/chatWith/setUnicastSwitch.html")
// 修改自己的视讯价格
#define URL_PRIVATE_LIVE_EDIT_PRICE DNS_FUS_API(@"/chatWith/setUnicastPrice.html")
......@@ -653,11 +466,7 @@
// 通话扣宝石
#define URL_CONVERSATION_MINUTES_CONSUME DNS_FUS_API(@"/chatWith/callConsume.html")
// firefly 5.8.0以后换成新接口了
//// 结束当前的通话
//#define URL_CONVERSATION_DID_ENDCALL DNS_FUS_API(@"/chatWith/endCall.html")
// 结束当前的通话
#define URL_CONVERSATION_DID_ENDCALL DNS_FUS_API(@"/chatWith/v2/endCall.html")
// 结束当前的通话
......@@ -673,29 +482,19 @@
// 检查当前进行中的通话 是否有效
#define URL_CONVERSATION_CHECK_CALL_VALID DNS_FUS_API(@"/chatWith/checkcallisend.html")
// 获取自己空间首页数据 4002
#define URL_ZONE_HOME_OWN DNS_FUS_API(@"/zone/own_v2.html")
// 获取自己空间首页数据 新接口 V3(海外)
#define URL_ZONE_HOME_OWN_V1 DNS_FUS_API(@"/zone/my/v1.html")
// 阿里云OSS 授权接口
#define URL_ALIOSS_GETAUTH DNS_FUS_API(@"/user/getAliSTS.html")
// 获取他人空间首页数据 4002
//#define URL_ZONE_HOME_OTHER DNS_FUS_API(@"/zone/other_v2.html")
// 获取他人空间首页数据 新接口 V1(海外)
#define URL_ZONE_HOME_OTHER_V1 DNS_FUS_API(@"/zone/other/v1.html")
// 用户个人资料修改 10020
#define URL_ZONE_UPDATE_USERINFO DNS_FUS_API(@"/user/updateUserData.html")
// 上传图片 10013
#define URL_ZONE_UPLOAD_IAMGE DNS_FUS_API(@"/zone/upload/img.html")
// 上传头像 v5.8.0换成新接口
//#define URL_ZONE_UPLOAD_HEAD DNS_FUS_API(@"/zone/upload/face.html")
#define URL_ZONE_UPLOAD_HEAD DNS_FUS_API(@"/userManager/changeFace")
// 获取连麦礼物分润比例列表
......@@ -737,12 +536,6 @@
// 请求粉丝列表
#define URL_ZONE_FOLLOW_LIST DNS_FUS_API(@"/zone/follow.html")
// 查询是否有修改过性别
#define URL_ZONE_IS_UPDATED_SEX DNS_FUS_API(@"/user/isupsex.html")
// 修改用户性别
#define URL_ZONE_UPDATE_SEX DNS_FUS_API(@"/user/upsex.html")
// 获取座驾仓库
#define URL_ZONE_MY_MOTORING_LIST DNS_FUS_API(@"/zone/vehicle.html")
......@@ -767,8 +560,6 @@
// 热力榜榜单说明
#define URL_BOARD_README_HEATING_POWER DNS_WEB(@"/Nesting/help/hot.html")
// 萤火提现的页面
#define URL_WEB_WITHDRAW_PAGE DNS_WEB(@"/Nesting/withdraw/index.html")
// 获取任务包裹列表
#define URL_ZONE_TASK_LIST DNS_FUS_API(@"/task/getcenter.html")
// 获取任务列表
......@@ -835,9 +626,6 @@
// 连麦赠送礼物
#define URL_GIFT_SEND_MIC_GIFT DNS_FUS_API(@"/gift/mic/send")
// 根据数量送礼接口
#define URL_LIVE_SEND_GIFT_NUM DNS_FUS_API(@"/gift/sendNum.html")
//包裹礼物送礼
#define URL_LIVE_SEND_PARCELGIFT DNS_FUS_API(@"/inventory/sendgift.html")
......@@ -850,9 +638,6 @@
// 下载语音
#define URL_SINGLE_CHAT_DOWNLOAD_VOICE DNS_FUS_API(@"/msg/voice/down/")
//视频和语音功能是否开启
#define URL_SINGLE_CHAT_VOICE_AND_VIDEO_SETTING_CHECK DNS_FUS_API(@"/setting/check.html")
#pragma mark -- 动态相关
// 获取首页动态（推荐/追踪/亲密）列表
......@@ -933,9 +718,6 @@
// 动态 分享成功统计
#define URL_SHARE_NEWSFEED_STASTISTICS DNS_FUS_API(@"/dynamic/share/report")
// 设置视频动态为约会视频简介
#define URL_ZONE_DYNAMIC_SETUP_VIDEO DNS_FUS_API(@"/zone/dynamic/setupVideo")
#pragma mark -- 其它
// 获取城市代码
......@@ -944,15 +726,12 @@
// 分享统计
#define URL_SHARE_STASTISTICS DNS_FUS_API(@"/stat/share")
// 检测是否在AppStore审核状态
// 检测是否sh状态
#define URL_APPSTORE_REVIEW_STATU DNS_FUS_API(@"/setting/check.html")
// 拉取是否需要版本更新
#define URL_UPDATE_VERSION DNS_FUS_API(@"/update/yz.html")
// 客服
#define URL_SERVICE DNS_FUS_API(@"/redirect/concat.html")
// 在线搜索
#define URL_ONLINE_SEARCH DNS_FUS_API(@"/user/searchmore.html")
......@@ -968,9 +747,6 @@
// 在线搜索
#define URL_ONLINE_SEARCH_RECORD DNS_FUS_API(@"/user/getSearchKeyword.html")
// 热门标签
#define URL_GET_THEME_TAGS DNS_FUS_API(@"/live/getThemeTags.html")
// 推流日志统计
#define URL_PUSH_STATICS DNS_FUS_API(@"/stat/pushlive.html")
......@@ -986,18 +762,12 @@
// 获取分享总数
#define URL_SHARE_NUM DNS_FUS_API(@"/rank/sharecount.html")
// 创建私密直播
#define URL_CREATE_PRIVATE_LIVE DNS_FUS_API(@"/room/privatelive.html")
// 检测私密直播
#define URL_CHECK_IS_PRIVATE_LIVING DNS_FUS_API(@"/room/isprivatelive.html")
// 切换直播间类型
#define URL_CHANGE_ROOMTYPE DNS_FUS_API(@"/live/change/roomType")
// 获取与主播的历史过往
#define URL_LIVE_VERSUS_USER_HISTORY DNS_FUS_API(@"/room/versusUserHistory")
// 直播间同步用户权益信息
#define URL_LIVE_SYNC_RIGHT_RESULT DNS_FUS_API(@"/live/syncRightResult")
......@@ -1027,7 +797,6 @@
// 备用域名url接口
#define URL_API_URL DNS_FUS_API(@"/update/server.html")
//#define URL_API_URL @"http://test.api.lvdou66.com/update/server.html"
#pragma mark - 固定链接
// FuSi官网
......@@ -1039,9 +808,6 @@
// FuSi伴聊往期
#define URL_WEB_YABO_ACCOMPANY DNS_WEB(@"/article/past.html")
// FuSi游戏
#define URL_WEB_GAME EDNS_WEB(@"/mygame.html")//@"https://zhiboweb.ishuaji.cn/mygame.html"
// FuSi帮助
#define URL_WEB_HELP DNS_WEB(@"/Nesting/help/index.html")
......@@ -1057,24 +823,9 @@
// iTunesStore
#define URL_WEB_APPSTORE [NSString stringWithFormat:@"itms-apps://itunes.apple.com/WebObjects/MZStore.woa/wa/viewSoftware?id=%@",FUSConfig.sharedInstanced.appConfigs.appId]
//充值记录
#define URL_WEB_RECHARGE DNS_WEB(@"/Nesting/recording/money.html")
//消费记录
#define URL_WEB_CONSUME_RECORD DNS_WEB(@"/Nesting/recording/consum.html")
// 可提现萤火
#define URL_WEB_FIREFLY_WITHDRAW DNS_WEB(@"/Nesting/fireflyRmb/canFireFly.html")
// 露水获得记录
#define URL_WEB_DEW_MONEY DNS_WEB(@"/Nesting/dew/devMoney.html")
// 经纪人邀请分享
#define URL_WEB_AGENT_INVITE_SHARE DNS_WEB(@"/Nesting/newShare/index.html")
// 提现记录
#define URL_WEB_WITHDRAW_RECORD DNS_WEB(@"/Nesting/fireflyRmb/takeOut.html")
// 获取空间守护榜数据
#define URL_ZONE_SHOW_GUARDS DNS_FUS_API(@"/zone/showGuards.html")
......@@ -1087,12 +838,6 @@
// 背包道具消耗记录
#define URL_WEB_BACKPACK_CONSUME_RECORD DNS_WEB(@"/Nesting/backpack/consume.html")
// 正式服首页包房的地址
#define URL_WEB_BAOFANG_ACTIVE_URL @"https://activity.yazhaiyabo.com/active2021/activityCenter/index.html"
// 测试服首页包房的地址
#define URL_WEB_TEST_BAOFANG_ACTIVE_URL @"http://test.ybact.yazhaiyabo.com/active2021/activityCenter/index.html"
// 账号管理
#define URL_WEB_ACCOUNT_MANAGER DNS_WEB(@"/Nesting/logOff/index.html")
......@@ -1114,21 +859,11 @@
#define URL_PAYMENT_APPSTORE_NOTIFY DNS_FUS_API(@"/payorder/appstore/notify.html")
//更新储值点
//#define URL_PAYMENT_RECHARGE_INFO DNS_PAYMENTS(@"/setting/recharge.html")
#define URL_PAYMENT_RECHARGE_INFO DNS_FUS_API(@"/setting/recharge.html")
// 同步充值点首充信息
#define URL_RECHARGE_QUERY_ELEMENT DNS_FUS_API(@"/userManager/recharge/queryElement")
// 登录接口
//#define FUS_URL_LOGIN DNS_FUS_API(@"/user/login.html")
// Meet ID登录
#define FUS_YABOID_LOGIN DNS_FUS_API(@"/user/yaboidLogin.html")
// Meet ID注册
#define FUS_YABOID_REGISTE DNS_FUS_API(@"/third/bindYabo.html")
// 注册接口
#define FUS_URL_REGISTE DNS_FUS_API(@"/user/reg.html")
......@@ -1139,7 +874,6 @@
#define FUS_URL_GET_VERIFY_CODE DNS_FUS_API(@"/user/getRegcap.html")
// 注册
//#define FUS_URL_VERIFY_CODE DNS_FUS_API(@"/user/verifyRegcap.html")
#define FUS_URL_VERIFY_CODE DNS_FUS_API(@"/account/phoneRegister.html")
//设备是否已经注册过
......@@ -1155,46 +889,14 @@
#define FUS_URL_VERIFY_RESET_CODE DNS_FUS_API(@"/user/verifyResetcap.html")
// 社会化平台登录
//#define FUS_URL_SOCIAL_LOG_IN DNS_FUS_API(@"/third/login.html")
#define FUS_URL_SOCIAL_LOG_IN DNS_FUS_API(@"/account/thirdLogin.html")
// 获取国家码
#define URL_GET_COUNTRY_CODE DNS_FUS_API(@"/room/getCountryCode.html")
// 上传用户坐标信息
#define URL_UPDATE_USERLACTIONINFO DNS_FUS_API(@"/account/updateUserPlace.html")
// 上传评论
#define URL_UPDATE_REVIEW DNS_FUS_API(@"/data/appStoreReview")
#pragma mark -- 珍爱团
// 粉丝团首页信息
#define URL_FANS_GROUP_INDEX DNS_FUS_API(@"/fans/group/index")
// 编辑粉丝团名称
#define URL_FANS_GROUP_MODIFY_NAME DNS_FUS_API(@"/fans/group/modify/name")
// 编辑粉丝团宣言
#define URL_FANS_GROUP_MODIFY_SIGN DNS_FUS_API(@"/fans/group/modify/sign")
// 获取粉丝团成员列表
#define URL_FANS_GROUP_MEMBER_LIST DNS_FUS_API(@"/fans/group/member/list")
// 获取粉丝团榜单信息
#define URL_FANS_GROUP_RANK_LIST DNS_FUS_API(@"/fans/group/rank/list")
// 获取粉丝团任务列表
#define URL_FANS_GROUP_TASK_LIST DNS_FUS_API(@"/fans/group/task/list")
// 主播获取任务完成情况
#define URL_FANS_GROUP_TASK_CONDITION_DETAIL DNS_FUS_API(@"/fans/group/task/condition/detail")
// 领取粉丝团任务奖励
#define URL_FANS_GROUP_TASK_AWARD_RECEIVE DNS_FUS_API(@"/fans/group/task/award/receive")
// 珍爱值记录
#define URL_WEB_FANS_GROUP_RECORD DNS_WEB(@"/Nesting/treasureGroup/records.html")
#pragma mark -- PK
// 房间PK信息
#define URL_LIVE_PK_ROOM_PK_INFO DNS_FUS_API(@"/pk/roompkinfo.html")
......
FuSiLive/Classes/InstantMessaging/Controller/FUSChatDetailViewController.m
......@@ -1611,15 +1611,12 @@
} msgFailure:^(NSInteger refreshIndex, NSString *msgID) {
[self fus_refrshMessgaeCellWithSendState:FUSMsgStateFail refreshIndex:refreshIndex serverMsgID:msgID sendMsgInfo:nil];
} yaServerFailure:^(NSInteger errorCode) {
if (errorCode == -100 || errorCode == -101) {
if (errorCode == -100) {
NSString *alertTitle = @"";
NSString *alertRightOption = @"";
if (errorCode == -100) {
alertTitle = [NSString fus_localString:@"宝石不足"];
alertRightOption = [NSString fus_localString:@"前往储值"];
}else if (errorCode == -101){
alertTitle = [NSString fus_localString:@"银币不足"];
alertRightOption = [NSString fus_localString:@"宝石兑换"];
}
[self fus_endEditState];
......
FuSiLive/Classes/Login/Other/FUSLoginHelper.m
......@@ -394,9 +394,7 @@
// 标记自动登录
[[NSUserDefaults standardUserDefaults] setObject:@(1) forKey:AUTO_LOGIN_MARK_BOOL];
// 检测版本更新！
[self checkVersionUpdate];
// 调用日常统计日志
[FUSIntervalTaskHelper fus_doEverydayStatLog];
......@@ -575,38 +573,6 @@
}
/**
检查版本更新
*/
- (void)checkVersionUpdate
{
[FUSLoginHttpHelper fus_checkVersionUpdateWithSuccess:^(FUSUpdateModel *updateModel) {
if ([updateModel.enforce intValue] == 1) { // 强制更新
[FUSAlertView showAlertWithTitle:updateModel.title message:updateModel.text cancelButtonTitle:nil otherButtonTitles:@[[NSString fus_localString:@"去更新"]] clickBlock:^(NSInteger buttonIndex) {
// 注销登录
[[FUSIMUserService shareInstance] fus_logOffWithSuccess:nil failure:nil];
[self logOut];
// 转跳到启动页
FUSStartPageViewController *startPageVC = [[FUSStartPageViewController alloc] initNeedWaitTime:NO];
UINavigationController *navGuide = [[UINavigationController alloc] initWithRootViewController:startPageVC];
[[[[UIApplication sharedApplication] delegate] window] setRootViewController:navGuide];
[navGuide.navigationController popToRootViewControllerAnimated:YES];
// 跳转链接
UIApplication *application = [UIApplication sharedApplication];
[application openURL:[NSURL URLWithString:URL_WEB_APPSTORE]];
}];
}else if([updateModel.enforce intValue] == 0){ // 建议更新(可以跳过)
[FUSAlertView showAlertWithTitle:updateModel.title message:updateModel.text cancelButtonTitle:[NSString fus_localString:@"取消"] otherButtonTitles:@[[NSString fus_localString:@"去更新"]] clickBlock:^(NSInteger buttonIndex) {
if (buttonIndex == 1) {
UIApplication *application = [UIApplication sharedApplication];
[application openURL:[NSURL URLWithString:URL_WEB_APPSTORE]];
}
}];
}
} failure:nil];
}
/**
获取用户信息
@param type 读取数据策略， ReadMemoryBegin:从内存开始: 内存 -> 数据库 -> 服务器 / ReadDatabaseBegin:从数据库开始: 数据库 -> 服务器 / ReadServerBegin:从服务器开始: 服务器
......
FuSiLive/Classes/Login/Other/FUSLoginHttpHelper.h
......@@ -49,15 +49,6 @@ typedef NS_ENUM(NSInteger, Platform) {
failure:(void (^)(NSString *msg, int code))failure;
/**
检查版本更新
@param success 成功回调
@param failure 失败回调
*/
+ (void)fus_checkVersionUpdateWithSuccess:(void (^)(FUSUpdateModel *updateModel))success
failure:(void (^)(NSString *msg, int code))failure;
/**
同步用户相关数据
@param success 成功回调
......
FuSiLive/Classes/Login/Other/FUSLoginHttpHelper.m
......@@ -189,27 +189,6 @@
}];
}
/**
检查版本更新
@param success 成功回调
@param failure 失败回调
*/
+ (void)fus_checkVersionUpdateWithSuccess:(void (^)(FUSUpdateModel *updateModel))success
failure:(void (^)(NSString *msg, int code))failure
{
// 请求服务器
// [FUSHttpHelper getRequestBinaryWithUrl:URL_CHECK_VERSION_UPDATE params:nil success:^(NSDictionary *dataDict, int code) {
//
// FUSUpdateModel *updateModel = [FUSUpdateModel fus_modelWithDict:[dataDict objectForKey:@"result"]];
// if (success) success(updateModel);
//
// } failure:^(NSDictionary *dataDict, int code) {
//
// if (failure) failure(FAILURE_MESSAGE, code);
//
// }];
}
/**
获取验证密码
......
FuSiLive/Classes/NewLive/Main/Other/FUSLiveHttpHelper.h
......@@ -179,17 +179,6 @@
success:(void (^)(int code, NSDictionary *infoDict))success
failure:(void (^)(NSString *msg, int code, NSDictionary *errorDict))failure;
/**
创建视讯room
@param cityCode 城市code
@param success 成功回调
@param failure 失败回调
*/
+ (void)fus_createPrivateLiveWithFid:(NSString *)fid
introduce:(NSString *)introduce
success:(void (^)(FUSStreamModel *streamModel))success
failure:(void (^)(NSString *msg, int code, NSDictionary *errorDict))failure;
/// 切换直播范围
/// @param fid 当前主播的id
......@@ -721,12 +710,6 @@
*/
+ (void)fus_requestLiveTaskParcelListSuccess:(void(^)(NSArray *taskDataArr, NSString *dailyWaitReceiveTotal))success failure:(void(^)(NSString *msg,int code))failure;
/// 获取与主播的历史过往
/// @param fid 当前主播的id
/// @param success 成功回调
/// @param failure 失败回调
+ (void)fus_requestLiveversusUserHistory:(NSInteger)fid success:(void (^)(NSDictionary *dataDict))success failure:(void (^)(NSString *msg, int code))failure;
/// 贴纸列表
/// @param roomId 房间id
/// @param success 成功回调
......
FuSiLive/Classes/NewLive/Main/Other/FUSLiveHttpHelper.m
......@@ -624,34 +624,6 @@
}];
}
/**
创建视讯room
@param cityCode 城市code
@param success 成功回调
@param failure 失败回调
*/
+ (void)fus_createPrivateLiveWithFid:(NSString *)fid introduce:(NSString *)introduce success:(void (^)(FUSStreamModel *streamModel))success failure:(void (^)(NSString *msg, int code, NSDictionary *errorDict))failure {
if ([NSString isNull:fid]) return;
NSString *cityCode = [[NSUserDefaults standardUserDefaults] objectForKey:LOCATION_CITY_CODE];
if ([NSString isNull:cityCode]) cityCode = @"0";
if ([NSString isNull:introduce]) introduce = @"";
[FUSHttpHelper postRequestBinaryWithUrl:URL_CREATE_PRIVATE_LIVE params:@{@"cityCode":cityCode, @"fid":fid, @"introduce":introduce} success:^(NSDictionary *dataDict, int code) {
FUSStreamModel *streamModel = [FUSStreamModel fus_modelWithDict:dataDict];
if (success) success(streamModel);
} failure:^(NSDictionary *dataDict, int code) {
if (failure) failure(FAILURE_MESSAGE, code,dataDict);
}];
}
+ (void)fus_requestChangeRoomType:(NSString *)roomType
fid:(NSString *)fid
success:(void (^)(NSDictionary *dataDict))success
......@@ -1161,58 +1133,6 @@
}];
}
///**
// 根据数量送礼
//
// @param fid 接收方 uid
// @param gid 礼物 id
// @param num 礼物数量
// @param success 成功回调
// @param failure 失败回调
// */
//+ (void)fus_sendGiftToFid:(NSString *)fid
// giftId:(NSString *)gid
// num:(NSInteger)num
// md5:(NSString *)md5
// success:(void(^)(NSDictionary *changed))success
// failure:(void(^)(NSString *msg, int code))failure
//{
// if ([NSString isNull:fid] ||
// [NSString isNull:gid] ||
// num == 0) {
// FUSLogInfo(@"---> 发送礼物失败，数据为空");
// if (failure) {
// failure(@"数据为空", ERROR_CODE);
// }
// return;
// }
//
// if ([NSString isNull:md5]) {
// md5 = @"";
// }
//
// NSDictionary *params = @{@"fid":fid,
// @"gid":gid,
// @"num":[NSString stringWithFormat:@"%ld", num],
// @"md5":md5
// };
//
// [FUSHttpHelper postRequestBinaryWithUrl:URL_LIVE_SEND_GIFT_NUM params:params success:^(NSDictionary *dataDict, int code) {
//
// NSDictionary *changed = [dataDict objectForKey:@"cv"];
// if (success) {
// success(changed);
// }
//
// } failure:^(NSDictionary *dataDict, int code) {
//
// if (failure) {
// failure(FAILURE_MESSAGE, code);
// }
//
// }];
//}
/**
发送消息
......@@ -2302,26 +2222,6 @@
}];
}
/// 获取与主播的历史过往
/// @param fid 当前主播的id
/// @param success 成功回调
/// @param failure 失败回调
+ (void)fus_requestLiveversusUserHistory:(NSInteger)fid success:(void (^)(NSDictionary *dataDict))success failure:(void (^)(NSString *msg, int code))failure {
NSDictionary *params = @{@"fid":@(fid)};
[FUSHttpHelper postRequestBinaryWithUrl:URL_LIVE_VERSUS_USER_HISTORY params:params success:^(NSDictionary *dataDict, int code) {
if (success) {
success(dataDict);
}
} failure:^(NSDictionary *dataDict, int code) {
if (failure) {
failure(FAILURE_MESSAGE,code);
}
}];
}
/// 直播间同步用户权益信息
/// @param fid 当前主播的id
/// @param success 成功回调
......
FuSiLive/Classes/NewLive/Main/View/FunctionView/ChatInputView/FUSLiveChatInputHelper.m
......@@ -566,7 +566,6 @@
- (void)dealSendGiftFailureWithMessage:(NSString *)msg code:(int)code gid:(NSString *)gid
{
if (code != -100 &&
code != -101 &&
code != -201) {
[FUSDialogView fus_showDialog:msg];
FUSLogInfo(@"送礼失败：%@ code:%d", msg, code);
......
FuSiLive/Classes/NewLive/Main/View/FunctionView/ChatInputView/FUSLiveChatInputView.m
......@@ -983,27 +983,6 @@
}];
}
break;
case -101:
{
[FUSAlertView showAlertWithTitle:@""
message:[NSString fus_localString:@"银币不足"]
cancelButtonTitle:[NSString fus_localString:@"取消"]
otherButtonTitles:@[/*@"赚取银币", */[NSString fus_localString:@"宝石兑换"]]
clickBlock:^(NSInteger buttonIndex) {
if (buttonIndex == 1) {
if (self.delegate && [self.delegate respondsToSelector:@selector(fus_chatInputView:pushViewController:)]) {
FUSUserVerifyModel *userVerifyInfo = [[FUSCacheDataShare shareStore] userVerifyInfo];
FUSWKWebViewController *webViewCtrl = [[FUSWKWebViewController alloc] init];
webViewCtrl.webUrlString = [NSString stringWithFormat:@"%@?uid=%@&token=%@", URL_EXCHANGE_GOLD_PAGE, userVerifyInfo.uid, userVerifyInfo.token];
[self.delegate fus_chatInputView:self pushViewController:webViewCtrl];
}
}
}];
}
break;
default:
[FUSDialogView fus_showDialog:msg];
break;
......
FuSiLive/Classes/NewLive/Main/View/FunctionView/GiftView/FUSLiveGiftView.m
......@@ -2097,7 +2097,6 @@ static FUSLiveGiftView *giftView = nil;
weakSelf.bgView.userInteractionEnabled = YES;
if (code != -100 &&
code != -101 &&
code != -201 &&
code != -116) {
// 点击连胜按钮的不弹toast
......@@ -2132,14 +2131,6 @@ static FUSLiveGiftView *giftView = nil;
if (!weakSelf.diamondAlertTimer) {
weakSelf.diamondAlertTimer = [NSTimer scheduledTimerWithTimeInterval:.2 target:[YYWeakProxy proxyWithTarget:self] selector:@selector(showAlertViewWithDelay:) userInfo:@{@"msg":msg, @"code":@(code), @"btnArr":btnArr} repeats:NO];
}
}else if (code == -101){
// 银币不足
btnArr = @[/*[NSString fus_localString:@"赚取银币"],*/[NSString fus_localString:@"兑换宝石"], [NSString fus_localString:@"取消"]];
msg = [NSString fus_localString:@"银币不足"];
if (!weakSelf.coinAlertTimer) {
weakSelf.coinAlertTimer = [NSTimer scheduledTimerWithTimeInterval:.2 target:[YYWeakProxy proxyWithTarget:self] selector:@selector(showAlertViewWithDelay:) userInfo:@{@"msg":msg, @"code":@(code), @"btnArr":btnArr} repeats:NO];
}
} else if (code == -201) {
if (weakSelf.isUpdating) {
[FUSDialogView fus_showDialog:[NSString fus_localString:@"正在更新礼物..."]];
......@@ -2536,11 +2527,7 @@ static FUSLiveGiftView *giftView = nil;
[[FUSLiveHelper shareInstance].currentFunctionView fus_autoShowFirstChargeViewWhenBackFromRechargeIfNeeded];
}];
return;
}else if (code == -101){
// 银币不足
message = [NSString fus_localString:@"银币不足"];
title = [NSString fus_localString:@"银币不足"];
}else if (code == -116) {
} else if (code == -116) {
// 露水不足
message = [NSString fus_localString:@"您的露水不足，无法送礼"];
title = [NSString fus_localString:@"露水不足"];
......@@ -2595,27 +2582,7 @@ static FUSLiveGiftView *giftView = nil;
[self fus_dismissWithAnimate:YES needUpload:NO];
}
}else if (code == -101){
[_coinAlertTimer invalidate];
_coinAlertTimer = nil;
if (buttonIndex == 1) {
return ;
}
if (buttonIndex == 0) {
if (self.currentVC) {
FUSLogInfo(@"--->兑换银币");
FUSUserVerifyModel *userVerifyInfo = [[FUSCacheDataShare shareStore] userVerifyInfo];
FUSWKWebViewController *webViewCtrl = [[FUSWKWebViewController alloc] init];
webViewCtrl.webUrlString = [NSString stringWithFormat:@"%@?uid=%@&token=%@", URL_EXCHANGE_GOLD_PAGE, userVerifyInfo.uid, userVerifyInfo.token];
[self.currentVC.navigationController pushViewController:webViewCtrl animated:YES];
[self fus_dismissWithAnimate:NO needUpload:NO];
FUSLogInfo(@"。。。。。No11");
}
}
}else if (code == -116){
} else if (code == -116){
if (buttonIndex == 1) {
FUSLogInfo(@"--->兑换露水");
......
FuSiLive/Classes/NewsFeed/Other/FUSNewsFeedHttpHelper.h
......@@ -165,14 +165,6 @@ NS_ASSUME_NONNULL_BEGIN
+ (void)fus_requestRecommentTopicIdsWithSuccess:(void(^)(NSDictionary *dataDict))success
failure:(void(^)(NSString *msg, int code))failure;
/// 查看动态详细
/// @param topicId 动态主题ID
/// @param success 成功回调
/// @param failure 失败回调
+ (void)fus_setupDateVideoWith:(NSString *)topicId
success:(void(^)(void))success
failure:(void(^)(NSString *msg, int code))failure;
@end
NS_ASSUME_NONNULL_END
FuSiLive/Classes/NewsFeed/Other/FUSNewsFeedHttpHelper.m
......@@ -580,26 +580,4 @@
}
}
/// 查看动态详细
/// @param topicId 动态主题ID
/// @param success 成功回调
/// @param failure 失败回调
+ (void)fus_setupDateVideoWith:(NSString *)topicId
success:(void(^)(void))success
failure:(void(^)(NSString *msg, int code))failure {
if ([NSString isNull:topicId] || topicId.intValue == 0) {
return;
}
NSMutableDictionary *param = [NSMutableDictionary dictionaryWithDictionary:@{@"topicId":topicId}];
[FUSHttpHelper postRequestBinaryWithUrl:URL_ZONE_DYNAMIC_SETUP_VIDEO params:param success:^(NSDictionary *dataDict, int code) {
if (success) success();
} failure:^(NSDictionary *dataDict, int code) {
[self fus_handlerNewsFeedHasDeletedWithCode:code];
if (failure) failure(dataDict[@"msg"], code);
}];
}
@end
FuSiLive/Classes/Test/Controller/FUSDebugEnvViewController.m
......@@ -75,7 +75,6 @@ typedef NS_ENUM(NSInteger, DebugEnv){
- (IBAction)onClickEnvChoseButton:(UIButton *)sender {
[[NSUserDefaults standardUserDefaults] setObject:URL_WEB_BAOFANG_ACTIVE_URL forKey:UDKEY_BAOFANG_ACTIVE_PAGE_WEB_URL];
switch (sender.tag) {
case DebugEnvProduct:
{
......@@ -99,7 +98,6 @@ typedef NS_ENUM(NSInteger, DebugEnv){
case DebugEnvTest:
{
[[NSUserDefaults standardUserDefaults] setObject:@"http://apitest.yabolive.co" forKey:CUSTOM_API_ADDRESS];
[[NSUserDefaults standardUserDefaults] setObject:URL_WEB_TEST_BAOFANG_ACTIVE_URL forKey:UDKEY_BAOFANG_ACTIVE_PAGE_WEB_URL];
[FUSAPIDNSManager fus_checkCurrentDNSAddress];
......
FuSiLive/Classes/ZhaiXin/Main/Other/FUSZhaiXinDBCacheOperate.m
......@@ -141,25 +141,6 @@
}
/**
* 拉取追踪包房的最新信息
*
* @param success 成功回调
* @param failure 失败回调
*/
+ (void)fus_getRoomNewMessageWithSuccess:(void (^)(NSArray *roomModelArray))success failure:(void (^)(NSString *msg))failure
{
[FUSZhaiXinHttpHelper fus_getRoomNewMessageWithSuccess:^(NSArray *roomModelArray) {
BOOL result = [FUSZhaiXinDBOperate fus_writeMultiBaoFangDataToZhaiXinInfosTableWithModelArray:roomModelArray];
if (result) {
if (success) success(roomModelArray);
}else{
if (failure) failure(@"写入追踪包房的最新信息失败");
}
} failure:failure];
}
/**
* 写入单人聊天数据到寨信表
*
* @param socketModel 单聊SocketModel
......
FuSiLive/Classes/ZhaiXin/Main/Other/FUSZhaiXinDBOperate.h
......@@ -7,7 +7,6 @@
//
#define SINGLE_CHAT @"singleChat"
#define BAOFANG_CHAT @"baofangChat"
#define OFFICIAL_MESSAGE @"OfficialMessage"
#define FUSBO_ACCOMPANY @"YaboAccompany"
#define NOTIFICATION_MESSAGE @"NotificationMessage"
......
FuSiLive/Classes/ZhaiXin/Main/Other/FUSZhaiXinHttpHelper.h
......@@ -13,15 +13,6 @@
@interface FUSZhaiXinHttpHelper : NSObject
/**
* 拉取追踪包房的最新信息
*
* @param success 成功回调
* @param failure 失败回调
*/
+ (void)fus_getRoomNewMessageWithSuccess:(void (^)(NSArray *roomModelArray))success failure:(void (^)(NSString *msg))failure ;
/**
拉取视讯历史记录列表
......
FuSiLive/Classes/ZhaiXin/Main/Other/FUSZhaiXinHttpHelper.m
......@@ -13,50 +13,6 @@
@implementation FUSZhaiXinHttpHelper
/**
* 拉取追踪包房的最新信息
*
* @param success 成功回调
* @param failure 失败回调
*/
+ (void)fus_getRoomNewMessageWithSuccess:(void (^)(NSArray *roomModelArray))success failure:(void (^)(NSString *msg))failure {
[FUSHttpHelper postRequestBinaryWithUrl:URL_ROOM_LIKED_NEW_MESSAGE params:nil success:^(NSDictionary *dataDict, int code) {
NSMutableArray *roomModelArray = [NSMutableArray array];
// 解析自己的房间
NSDictionary *myRoomDict = dataDict[@"myRoom"];
if (![NSDictionary isNull:myRoomDict]) {
FUSZhaiXinModel *myRoomModel = [FUSZhaiXinModel fus_modelWithDict:myRoomDict];
myRoomModel.unread = @"1";
myRoomModel.typeId = [NSString stringWithFormat:@"%@%@",BAOFANG_CHAT,myRoomModel.roomId];
[roomModelArray addObject:myRoomModel];
}
// 解析追踪的包房
NSArray *likeRoomArray = dataDict[@"likeRoom"];
if (![NSArray isNull:likeRoomArray]) {
for (NSDictionary *likeRoomDict in likeRoomArray) {
FUSZhaiXinModel *likeRoomModel = [FUSZhaiXinModel fus_modelWithDict:likeRoomDict];
likeRoomModel.unread = @"1";
likeRoomModel.typeId = [NSString stringWithFormat:@"%@%@",BAOFANG_CHAT,likeRoomModel.roomId];
if ([likeRoomModel.type integerValue] == 7) {
likeRoomModel.content = @"[红包消息]";
}
[roomModelArray addObject:likeRoomModel];
}
}
if (success) success(roomModelArray);
} failure:^(NSDictionary *dataDict, int code) {
if (failure) failure(FAILURE_MESSAGE);
}];
}
/**
拉取视讯历史记录列表
......
FuSiLive/Classes/Zone/Other/FUSZoneHttpRequest.h
......@@ -188,13 +188,6 @@ typedef NS_ENUM(NSInteger, FUSZoneHttpUploadImageType)
success:(void (^)(NSString *path, int code))success
failure:(void (^)(NSString *msg, int code))failure;
/**
* 获取自己空间信息
*
* @param success 成功回调
* @param failure 失败回调
*/
+ (void)fus_getMyZoneInfosSuccess:(void (^)(FUSZoneInfosModel *zoneModel, int code))success failure:(void (^)(NSString *msg, int code))failure;
/**
* 获取用户的粉丝列表
......
FuSiLive/Classes/Zone/Other/FUSZoneHttpRequest.m
......@@ -471,35 +471,6 @@
* @param success 成功回调
* @param failure 失败回调
*/
+ (void)fus_getMyZoneInfosSuccess:(void (^)(FUSZoneInfosModel *zoneModel, int code))success failure:(void (^)(NSString *msg, int code))failure
{
// HTTP请求
[FUSHttpHelper postRequestBinaryWithUrl:URL_ZONE_HOME_OWN params:nil success:^(NSDictionary *dataDict, int code) {
NSDictionary *zoneInfo = [dataDict objectForKey:@"data"];
FUSZoneInfosModel *zoneModel = [FUSZoneInfosModel fus_modelWithDict:zoneInfo];
//获取最新的model
FUSZoneInfosModel *zoneAddInfoModel = [[[FUSCacheDataShare shareStore] zoneInfosDict] objectForKey:zoneModel.uid];
//model为空创建
if ([FUSBaseModel fus_isNullWithModel:zoneAddInfoModel]) zoneAddInfoModel = [[FUSZoneInfosModel alloc] init];
if (![FUSBaseModel fus_isNullWithModel:zoneModel]) {
//将更新的信息写入最新的model
[zoneAddInfoModel fus_setValueWithModel:zoneModel];
if(success) success(zoneAddInfoModel, code);
}else{
if (failure) failure(@"获取空间信息为空", ERROR_CODE);
}
} failure:^(NSDictionary *dataDict, int code) {
if (failure) failure(FAILURE_MESSAGE, code);
}];
}
/**
* 获取自己空间信息
*
* @param success 成功回调
* @param failure 失败回调
*/
+ (void)fus_getNewMyZoneInfosSuccess:(void (^)(FUSZoneInfosModel *zoneModel, int code))success failure:(void (^)(NSString *msg, int code))failure
{
// HTTP请求
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment