From 01a4a94cfa12bf6d5343c0532f9b55455e9224da Mon Sep 17 00:00:00 2001 From: zu Date: Thu, 21 Oct 2021 21:21:43 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=A0=BC=E5=BC=8F=E5=8C=96?= =?UTF-8?q?=EF=BC=8C=E4=B8=8D=E9=87=8D=E8=A6=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- xplan-ios/Appdelegate/AppDelegate.m | 1 - xplan-ios/Base/MVP/Api/Api.h | 8 ++++---- xplan-ios/Base/MVP/Api/Api.m | 8 ++++---- xplan-ios/Main/Login/Api/Api+Login.h | 4 ++-- xplan-ios/Main/Login/Api/Api+Login.m | 4 ++-- .../Login/Presenter/LoginFullInfoPresenter.m | 4 ++-- .../Presenter/XPLoginVerifBindPhonePresenter.m | 4 ++-- xplan-ios/Main/Mine/Api/Api+Mine.h | 18 +++++++++--------- xplan-ios/Main/Mine/Api/Api+Mine.m | 18 +++++++++--------- .../Presenter/XPMineModifPayPwdPresenter.m | 2 +- .../Mine/Presenter/XPMinePayPwdPresenter.m | 2 +- .../Mine/Presenter/XPMineRechargePresenter.m | 10 +++++----- .../XPMineResetPayPasswordPresenter.m | 2 +- .../Presenter/XPMineTeenagerPwdPresenter.m | 2 +- .../Presenter/XPMineUserInfoEditPresenter.m | 4 ++-- .../Presenter/XPMineUserInfolbumPresenter.m | 6 +++--- .../Presenter/XPMineVerifIdentityPresenter.m | 2 +- xplan-ios/Main/RTC/RtcManager.m | 1 - xplan-ios/Main/Room/Api/Api+Room.h | 8 ++++---- xplan-ios/Main/Room/Api/Api+Room.m | 10 +++++----- .../Main/Room/Presenter/XPRoomPresenter.m | 4 ++-- xplan-ios/Main/Tabbar/MainPresenter.m | 2 +- 22 files changed, 61 insertions(+), 63 deletions(-) diff --git a/xplan-ios/Appdelegate/AppDelegate.m b/xplan-ios/Appdelegate/AppDelegate.m index 1f69a39d..8f3bc3eb 100644 --- a/xplan-ios/Appdelegate/AppDelegate.m +++ b/xplan-ios/Appdelegate/AppDelegate.m @@ -18,7 +18,6 @@ @implementation AppDelegate - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions { - [[FlutterBoost instance] setup:application]; TabbarViewController *vc = [[TabbarViewController alloc] init]; BaseNavigationController *bnc = [[BaseNavigationController alloc] initWithRootViewController:vc]; diff --git a/xplan-ios/Base/MVP/Api/Api.h b/xplan-ios/Base/MVP/Api/Api.h index e9cc1d20..a119b2c0 100644 --- a/xplan-ios/Base/MVP/Api/Api.h +++ b/xplan-ios/Base/MVP/Api/Api.h @@ -34,7 +34,7 @@ NS_ASSUME_NONNULL_BEGIN /// @param code 验证码 /// @param uid 用户的uid /// @param ticket ticket -+ (void)checkMoblieCodeWithComplection:(HttpRequestHelperCompletion)complection ++ (void)checkMoblieCode:(HttpRequestHelperCompletion)complection mobile:(NSString *)mobile code:(NSString *)code uid:(NSString *)uid @@ -43,19 +43,19 @@ NS_ASSUME_NONNULL_BEGIN /// 补全用户资料 /// @param complection 完成 /// @param userInfo 需要更新的用户信息 -+ (void)complementInfoWithComplection:(HttpRequestHelperCompletion)complection ++ (void)completeUserInfo:(HttpRequestHelperCompletion)complection userInfo:(NSDictionary *)userInfo; /// 获取用户钱包余额信息 /// @param complection 完成 /// @param uid 用户uid /// @param ticket ticketg -+ (void)getUserWalletInfoWithComplection:(HttpRequestHelperCompletion)complection ++ (void)getUserWalletInfo:(HttpRequestHelperCompletion)complection uid:(NSString *)uid ticket:(NSString *)ticket; /// 批量验证 /// @param complection 完成 /// @param transcationIdStr 需要验证的数据 -+ (void)requestCheckTranscationIdsWithComplection:(HttpRequestHelperCompletion)complection ++ (void)requestCheckTranscationIds:(HttpRequestHelperCompletion)complection transcationIdStr:(NSString *)transcationIdStr; @end diff --git a/xplan-ios/Base/MVP/Api/Api.m b/xplan-ios/Base/MVP/Api/Api.m index def525c0..4efa6ee7 100644 --- a/xplan-ios/Base/MVP/Api/Api.m +++ b/xplan-ios/Base/MVP/Api/Api.m @@ -54,7 +54,7 @@ /// @param code 验证码 /// @param uid 用户的uid /// @param ticket ticket -+ (void)checkMoblieCodeWithComplection:(HttpRequestHelperCompletion)complection ++ (void)checkMoblieCode:(HttpRequestHelperCompletion)complection mobile:(NSString *)mobile code:(NSString *)code uid:(NSString *)uid @@ -65,7 +65,7 @@ /// 补全用户资料 /// @param complection 完成 /// @param userInfo 需要更新的用户信息 -+ (void)complementInfoWithComplection:(HttpRequestHelperCompletion)complection ++ (void)completeUserInfo:(HttpRequestHelperCompletion)complection userInfo:(NSDictionary *)userInfo { [HttpRequestHelper request:@"user/v2/update" method:HttpRequestHelperMethodPOST params:userInfo completion:complection]; } @@ -75,14 +75,14 @@ /// @param complection 完成 /// @param uid 用户uid /// @param ticket ticketg -+ (void)getUserWalletInfoWithComplection:(HttpRequestHelperCompletion)complection uid:(NSString *)uid ticket:(NSString *)ticket { ++ (void)getUserWalletInfo:(HttpRequestHelperCompletion)complection uid:(NSString *)uid ticket:(NSString *)ticket { [self makeRequest:@"purse/query" method:HttpRequestHelperMethodGET completion:complection, __FUNCTION__, uid, ticket,nil]; } /// 批量验证 /// @param complection 完成 /// @param transcationIdStr 需要验证的数据 -+ (void)requestCheckTranscationIdsWithComplection:(HttpRequestHelperCompletion)complection ++ (void)requestCheckTranscationIds:(HttpRequestHelperCompletion)complection transcationIdStr:(NSString *)transcationIdStr { [self makeRequest:@"verify/checkIOSChargeRecord" method:HttpRequestHelperMethodPOST completion:complection, __FUNCTION__,transcationIdStr, nil]; } diff --git a/xplan-ios/Main/Login/Api/Api+Login.h b/xplan-ios/Main/Login/Api/Api+Login.h index 81fabd08..f5b1c49e 100644 --- a/xplan-ios/Main/Login/Api/Api+Login.h +++ b/xplan-ios/Main/Login/Api/Api+Login.h @@ -73,7 +73,7 @@ NS_ASSUME_NONNULL_BEGIN /// 随机获取一个昵称 /// @param completion 完成 -+ (void)randomNickWithComplection:(HttpRequestHelperCompletion)completion; ++ (void)randomNick:(HttpRequestHelperCompletion)completion; /// 绑定手机号码 /// @param complection 完成 @@ -81,7 +81,7 @@ NS_ASSUME_NONNULL_BEGIN /// @param code 验证码 /// @param uid 用户的uid /// @param ticket ticket -+ (void)bindMoblieCodeWithComplection:(HttpRequestHelperCompletion)complection ++ (void)bindMoblieCode:(HttpRequestHelperCompletion)complection mobile:(NSString *)mobile code:(NSString *)code uid:(NSString *)uid diff --git a/xplan-ios/Main/Login/Api/Api+Login.m b/xplan-ios/Main/Login/Api/Api+Login.m index 89d29221..d7c9d229 100644 --- a/xplan-ios/Main/Login/Api/Api+Login.m +++ b/xplan-ios/Main/Login/Api/Api+Login.m @@ -62,7 +62,7 @@ /// 随机获取一个昵称 /// @param completion 完成 -+ (void)randomNickWithComplection:(HttpRequestHelperCompletion)completion { ++ (void)randomNick:(HttpRequestHelperCompletion)completion { [self makeRequest:@"random/nick/get" method:HttpRequestHelperMethodPOST completion:completion, __FUNCTION__, nil]; } @@ -72,7 +72,7 @@ /// @param code 验证码 /// @param uid 用户的uid /// @param ticket ticket -+ (void)bindMoblieCodeWithComplection:(HttpRequestHelperCompletion)complection ++ (void)bindMoblieCode:(HttpRequestHelperCompletion)complection mobile:(NSString *)mobile code:(NSString *)code uid:(NSString *)uid diff --git a/xplan-ios/Main/Login/Presenter/LoginFullInfoPresenter.m b/xplan-ios/Main/Login/Presenter/LoginFullInfoPresenter.m index 1bd7be8a..4e2311b7 100644 --- a/xplan-ios/Main/Login/Presenter/LoginFullInfoPresenter.m +++ b/xplan-ios/Main/Login/Presenter/LoginFullInfoPresenter.m @@ -31,7 +31,7 @@ /// 随机获取昵称 - (void)randomRequestNick { - [Api randomNickWithComplection:[self createHttpCompletion:^(BaseModel * _Nonnull data) { + [Api randomNick:[self createHttpCompletion:^(BaseModel * _Nonnull data) { [[self getView] requestRandomNickSuccess:data.data]; }]]; } @@ -75,7 +75,7 @@ if (shareChannel.length > 0) { [params setObject:shareChannel forKey:@"shareChannel"]; } - [Api complementInfoWithComplection:[self createHttpCompletion:^(BaseModel * _Nonnull data) { + [Api completeUserInfo:[self createHttpCompletion:^(BaseModel * _Nonnull data) { [[self getView] complementInfoSuccess]; }] userInfo:params]; } diff --git a/xplan-ios/Main/Login/Presenter/XPLoginVerifBindPhonePresenter.m b/xplan-ios/Main/Login/Presenter/XPLoginVerifBindPhonePresenter.m index 73df8b65..20e7a79c 100644 --- a/xplan-ios/Main/Login/Presenter/XPLoginVerifBindPhonePresenter.m +++ b/xplan-ios/Main/Login/Presenter/XPLoginVerifBindPhonePresenter.m @@ -31,7 +31,7 @@ - (void)checkMoblieCodeWithMoblie:(NSString *)moblieNum code:(NSString *)code { NSString * uid = [[AccountInfoStorage instance] getUid]; NSString * ticket = [[AccountInfoStorage instance] getTicket]; - [Api checkMoblieCodeWithComplection:[self createHttpCompletion:^(BaseModel * _Nonnull data) { + [Api checkMoblieCode:[self createHttpCompletion:^(BaseModel * _Nonnull data) { [[self getView] checkMoblieCodeWithMoblieSuccess]; }] mobile:moblieNum code:code uid:uid ticket:ticket]; } @@ -42,7 +42,7 @@ - (void)bindkMoblieCodeWithMoblie:(NSString *)moblieNum code:(NSString *)code { NSString * uid = [[AccountInfoStorage instance] getUid]; NSString * ticket = [[AccountInfoStorage instance] getTicket]; - [Api bindMoblieCodeWithComplection:[self createHttpCompletion:^(BaseModel * _Nonnull data) { + [Api bindMoblieCode:[self createHttpCompletion:^(BaseModel * _Nonnull data) { [[self getView] bindMoblieCodeWithMoblieSuccess]; }] mobile:moblieNum code:code uid:uid ticket:ticket]; } diff --git a/xplan-ios/Main/Mine/Api/Api+Mine.h b/xplan-ios/Main/Mine/Api/Api+Mine.h index ec7c5ffd..706edcc7 100644 --- a/xplan-ios/Main/Mine/Api/Api+Mine.h +++ b/xplan-ios/Main/Mine/Api/Api+Mine.h @@ -43,7 +43,7 @@ NS_ASSUME_NONNULL_BEGIN /// @param code 验证码 /// @param uid uid /// @param ticket ticket -+ (void)setPayPasswordWithComplection:(HttpRequestHelperCompletion)complection ++ (void)setPayPassword:(HttpRequestHelperCompletion)complection newPasswd:(NSString *)newPasswd phone:(NSString *)phone code:(NSString *)code @@ -56,7 +56,7 @@ NS_ASSUME_NONNULL_BEGIN /// @param oldPasswd 旧的支付密码 /// @param uid uid /// @param ticket ticket -+ (void)modifPayPasswordWithComplection:(HttpRequestHelperCompletion)complection ++ (void)modifPayPassword:(HttpRequestHelperCompletion)complection newPasswd:(NSString *)newPasswd oldPasswd:(NSString *)oldPasswd uid:(NSString *)uid @@ -67,20 +67,20 @@ NS_ASSUME_NONNULL_BEGIN /// @param password 密码 /// @param status 状态 0 开启 1 关闭 /// @param uid 用户的uid -+ (void)openOrCloseParentModelWithComplection:(HttpRequestHelperCompletion)complection ++ (void)openOrCloseParentModel:(HttpRequestHelperCompletion)complection password:(NSString *)password status:(NSNumber *)status uid:(NSString *)uid; /// 上传七牛获取token /// @param complection 完成 -+ (void)qiniuUpLoadImageWithComplection:(HttpRequestHelperCompletion)complection; ++ (void)qiniuUpLoadImage:(HttpRequestHelperCompletion)complection; /// 上传用户图像到服务器 /// @param complection 完成 /// @param photoStr 相册 /// @param uid 用户的uid /// @param ticket ticket -+ (void)uploadUserAlbumWithComplection:(HttpRequestHelperCompletion)complection ++ (void)uploadUserAlbum:(HttpRequestHelperCompletion)complection photoStr:(NSString *)photoStr uid:(NSString *)uid ticket:(NSString *)ticket; @@ -89,7 +89,7 @@ NS_ASSUME_NONNULL_BEGIN /// @param pid 相册 /// @param uid 用户的uid /// @param ticket ticket -+ (void)deleteImageFromServerWithComplection:(HttpRequestHelperCompletion)complection ++ (void)deleteImageFromServer:(HttpRequestHelperCompletion)complection pid:(NSString *)pid uid:(NSString *)uid ticket:(NSString *)ticket; @@ -97,7 +97,7 @@ NS_ASSUME_NONNULL_BEGIN /// 请求充值列表 /// @param complection 完成 /// @param channelType channel -+ (void)getRechargeListWithComplection:(HttpRequestHelperCompletion)complection ++ (void)getRechargeList:(HttpRequestHelperCompletion)complection channelType:(NSString *)channelType; /// 苹果下单 @@ -107,7 +107,7 @@ NS_ASSUME_NONNULL_BEGIN /// @param ticket ticket /// @param deviceInfo uuid /// @param clientIp ip地址 -+ (void)requestIAPRechargeWithComplection:(HttpRequestHelperCompletion)complection ++ (void)requestIAPRecharge:(HttpRequestHelperCompletion)complection chargeProdId:(NSString *)chargeProdId uid:(NSString *)uid ticket:(NSString *)ticket @@ -122,7 +122,7 @@ NS_ASSUME_NONNULL_BEGIN /// @param transcationId 内购的唯一标识符 /// @param uid 用户uid /// @param ticket ticket -+ (void)checkReceiptWithComplection:(HttpRequestHelperCompletion)complection ++ (void)checkReceipt:(HttpRequestHelperCompletion)complection receipt:(NSString *)receipt chooseEnv:(NSString *)chooseEnv chargeRecordId:(NSString *)chargeRecordId diff --git a/xplan-ios/Main/Mine/Api/Api+Mine.m b/xplan-ios/Main/Mine/Api/Api+Mine.m index 027ccaa7..1b45199d 100644 --- a/xplan-ios/Main/Mine/Api/Api+Mine.m +++ b/xplan-ios/Main/Mine/Api/Api+Mine.m @@ -48,7 +48,7 @@ /// @param code 验证码 /// @param uid uid /// @param ticket ticket -+ (void)setPayPasswordWithComplection:(HttpRequestHelperCompletion)complection newPasswd:(NSString *)newPasswd phone:(NSString *)phone code:(NSString *)code uid:(NSString *)uid ticket:(NSString *)ticket { ++ (void)setPayPassword:(HttpRequestHelperCompletion)complection newPasswd:(NSString *)newPasswd phone:(NSString *)phone code:(NSString *)code uid:(NSString *)uid ticket:(NSString *)ticket { [self makeRequest:@"user/paymentPasswd/reset" method:HttpRequestHelperMethodPOST completion:complection, __FUNCTION__, newPasswd, phone, code,uid,ticket, nil]; } @@ -59,7 +59,7 @@ /// @param oldPasswd 旧的支付密码 /// @param uid uid /// @param ticket ticket -+ (void)modifPayPasswordWithComplection:(HttpRequestHelperCompletion)complection newPasswd:(NSString *)newPasswd oldPasswd:(NSString *)oldPasswd uid:(NSString *)uid ticket:(NSString *)ticket { ++ (void)modifPayPassword:(HttpRequestHelperCompletion)complection newPasswd:(NSString *)newPasswd oldPasswd:(NSString *)oldPasswd uid:(NSString *)uid ticket:(NSString *)ticket { [self makeRequest:@"user/paymentPasswd/modify" method:HttpRequestHelperMethodPOST completion:complection, __FUNCTION__, newPasswd,oldPasswd,uid,ticket, nil]; } @@ -69,13 +69,13 @@ /// @param password 密码 /// @param status 状态 0 开启 1 关闭 /// @param uid 用户的uid -+ (void)openOrCloseParentModelWithComplection:(HttpRequestHelperCompletion)complection password:(NSString *)password status:(NSNumber *)status uid:(NSString *)uid { ++ (void)openOrCloseParentModel:(HttpRequestHelperCompletion)complection password:(NSString *)password status:(NSNumber *)status uid:(NSString *)uid { [self makeRequest:@"user/openOrClose" method:HttpRequestHelperMethodPOST completion:complection, __FUNCTION__, password,status,uid, nil]; } /// 上传七牛获取token /// @param complection 完成 -+ (void)qiniuUpLoadImageWithComplection:(HttpRequestHelperCompletion)complection { ++ (void)qiniuUpLoadImage:(HttpRequestHelperCompletion)complection { [self makeRequest:@"qiniu/upload/getUploadToken" method:HttpRequestHelperMethodGET completion:complection, __FUNCTION__, nil]; } @@ -85,7 +85,7 @@ /// @param photoStr 相册 /// @param uid 用户的uid /// @param ticket ticket -+ (void)uploadUserAlbumWithComplection:(HttpRequestHelperCompletion)complection photoStr:(NSString *)photoStr uid:(NSString *)uid ticket:(NSString *)ticket { ++ (void)uploadUserAlbum:(HttpRequestHelperCompletion)complection photoStr:(NSString *)photoStr uid:(NSString *)uid ticket:(NSString *)ticket { [self makeRequest:@"photo/v2/upload" method:HttpRequestHelperMethodPOST completion:complection, __FUNCTION__,photoStr, uid, ticket, nil]; } @@ -94,7 +94,7 @@ /// @param pid 相册 /// @param uid 用户的uid /// @param ticket ticket -+ (void)deleteImageFromServerWithComplection:(HttpRequestHelperCompletion)complection pid:(NSString *)pid uid:(NSString *)uid ticket:(NSString *)ticket { ++ (void)deleteImageFromServer:(HttpRequestHelperCompletion)complection pid:(NSString *)pid uid:(NSString *)uid ticket:(NSString *)ticket { [self makeRequest:@"photo/delPhoto" method:HttpRequestHelperMethodPOST completion:complection, __FUNCTION__,pid, uid, ticket, nil]; } @@ -102,7 +102,7 @@ /// 请求充值列表 /// @param complection 完成 /// @param channelType channel -+ (void)getRechargeListWithComplection:(HttpRequestHelperCompletion)complection channelType:(NSString *)channelType { ++ (void)getRechargeList:(HttpRequestHelperCompletion)complection channelType:(NSString *)channelType { [self makeRequest:@"chargeprod/list" method:HttpRequestHelperMethodGET completion:complection, __FUNCTION__,channelType, nil]; } @@ -113,7 +113,7 @@ /// @param ticket ticket /// @param deviceInfo uuid /// @param clientIp ip地址 -+ (void)requestIAPRechargeWithComplection:(HttpRequestHelperCompletion)complection chargeProdId:(NSString *)chargeProdId uid:(NSString *)uid ticket:(NSString *)ticket deviceInfo:(NSString *)deviceInfo clientIp:(NSString *)clientIp { ++ (void)requestIAPRecharge:(HttpRequestHelperCompletion)complection chargeProdId:(NSString *)chargeProdId uid:(NSString *)uid ticket:(NSString *)ticket deviceInfo:(NSString *)deviceInfo clientIp:(NSString *)clientIp { [self makeRequest:@"order/placeV2" method:HttpRequestHelperMethodPOST completion:complection, __FUNCTION__,chargeProdId, uid, ticket, deviceInfo, clientIp, nil]; } @@ -126,7 +126,7 @@ /// @param transcationId 内购的唯一标识符 /// @param uid 用户uid /// @param ticket ticket -+ (void)checkReceiptWithComplection:(HttpRequestHelperCompletion)complection receipt:(NSString *)receipt chooseEnv:(NSString *)chooseEnv chargeRecordId:(NSString *)chargeRecordId transcationId:(NSString *)transcationId uid:(NSString *)uid ticket:(NSString *)ticket { ++ (void)checkReceipt:(HttpRequestHelperCompletion)complection receipt:(NSString *)receipt chooseEnv:(NSString *)chooseEnv chargeRecordId:(NSString *)chargeRecordId transcationId:(NSString *)transcationId uid:(NSString *)uid ticket:(NSString *)ticket { [self makeRequest:@"order/placeV2" method:HttpRequestHelperMethodPOST completion:complection, __FUNCTION__,receipt, chooseEnv, chargeRecordId, transcationId, uid, ticket, nil]; } diff --git a/xplan-ios/Main/Mine/Presenter/XPMineModifPayPwdPresenter.m b/xplan-ios/Main/Mine/Presenter/XPMineModifPayPwdPresenter.m index 7b0769d4..2f5697f3 100644 --- a/xplan-ios/Main/Mine/Presenter/XPMineModifPayPwdPresenter.m +++ b/xplan-ios/Main/Mine/Presenter/XPMineModifPayPwdPresenter.m @@ -26,7 +26,7 @@ NSString * ticket = [AccountInfoStorage instance].getTicket; NSString * newpasswordDes = [DESEncrypt encryptUseDES:newPasswd key:KeyWithType(KeyType_PasswordEncode)]; NSString * oldpasswordDes = [DESEncrypt encryptUseDES:oldPasswd key:KeyWithType(KeyType_PasswordEncode)]; - [Api modifPayPasswordWithComplection:[self createHttpCompletion:^(BaseModel * _Nonnull data) { + [Api modifPayPassword:[self createHttpCompletion:^(BaseModel * _Nonnull data) { [[self getView] modifPayPasswordSuccess]; }] newPasswd:newpasswordDes oldPasswd:oldpasswordDes uid:uid ticket:ticket]; } diff --git a/xplan-ios/Main/Mine/Presenter/XPMinePayPwdPresenter.m b/xplan-ios/Main/Mine/Presenter/XPMinePayPwdPresenter.m index f4e2795c..33741bf9 100644 --- a/xplan-ios/Main/Mine/Presenter/XPMinePayPwdPresenter.m +++ b/xplan-ios/Main/Mine/Presenter/XPMinePayPwdPresenter.m @@ -35,7 +35,7 @@ NSString * uid = [AccountInfoStorage instance].getUid; NSString * ticket = [AccountInfoStorage instance].getTicket; NSString * newpasswordDes = [DESEncrypt encryptUseDES:password key:KeyWithType(KeyType_PasswordEncode)]; - [Api setPayPasswordWithComplection:[self createHttpCompletion:^(BaseModel * _Nonnull data) { + [Api setPayPassword:[self createHttpCompletion:^(BaseModel * _Nonnull data) { [[self getView] setPayPasswordSuccess]; }] newPasswd:newpasswordDes phone:phone code:veriftCode uid:uid ticket:ticket]; } diff --git a/xplan-ios/Main/Mine/Presenter/XPMineRechargePresenter.m b/xplan-ios/Main/Mine/Presenter/XPMineRechargePresenter.m index dd70facb..99c6644f 100644 --- a/xplan-ios/Main/Mine/Presenter/XPMineRechargePresenter.m +++ b/xplan-ios/Main/Mine/Presenter/XPMineRechargePresenter.m @@ -25,7 +25,7 @@ - (void)getUserWalletInfo { NSString * uid = [AccountInfoStorage instance].getUid; NSString * ticket = [AccountInfoStorage instance].getTicket; - [Api getUserWalletInfoWithComplection:[self createHttpCompletion:^(BaseModel * _Nonnull data) { + [Api getUserWalletInfo:[self createHttpCompletion:^(BaseModel * _Nonnull data) { WalletInfoModel * model = [WalletInfoModel modelWithDictionary:data.data]; [[self getView] getUserWalletInfo:model]; }] uid:uid ticket:ticket]; @@ -35,7 +35,7 @@ /// 请求内购列表 /// @param channel 目前是8 - (void)requestRechargeListWithChannel:(NSString *)channel { - [Api getRechargeListWithComplection:[self createHttpCompletion:^(BaseModel * _Nonnull data) { + [Api getRechargeList:[self createHttpCompletion:^(BaseModel * _Nonnull data) { NSArray * array = [RechargeListModel modelsWithArray:data.data]; [[self getView] requestRechargeListSucccess:array]; }] channelType:channel]; @@ -48,7 +48,7 @@ NSString * ticket = [AccountInfoStorage instance].getTicket; NSString * deviceInfo = [YYUtility deviceID]; NSString * clientIp= [YYUtility ipAddress]; - [Api requestIAPRechargeWithComplection:[self createHttpCompletion:^(BaseModel * _Nonnull data) { + [Api requestIAPRecharge:[self createHttpCompletion:^(BaseModel * _Nonnull data) { NSString *orderId = (NSString *)data.data[@"recordId"]; [[self getView] requestIAPRechargeOrderSuccess:orderId chargeProdId:chargeProdId]; } showLoading:YES] chargeProdId:chargeProdId uid:uid ticket:ticket deviceInfo:deviceInfo clientIp:clientIp]; @@ -62,7 +62,7 @@ - (void)checkReceiptWithData:(NSString *)receipt orderId:(NSString *)orderId transcationId:(NSString *)transcationId { NSString * uid = [AccountInfoStorage instance].getUid; NSString * ticket = [AccountInfoStorage instance].getTicket; - [Api checkReceiptWithComplection:[self createHttpCompletion:^(BaseModel * _Nonnull data) { + [Api checkReceipt:[self createHttpCompletion:^(BaseModel * _Nonnull data) { [[self getView] checkReceiptSuccess:transcationId]; } showLoading:YES] receipt:receipt chooseEnv:@"true" chargeRecordId:orderId transcationId:transcationId uid:uid ticket:ticket]; } @@ -72,7 +72,7 @@ /// @param transcations 凭据的数组 - (void)checkTranscationIds:(NSArray *)transcations { NSString * transcationIdStr = [transcations objectToJSONString]; - [Api requestCheckTranscationIdsWithComplection:[self createHttpCompletion:^(BaseModel * _Nonnull data) { + [Api requestCheckTranscationIds:[self createHttpCompletion:^(BaseModel * _Nonnull data) { [[self getView] checkTranscationIdsSuccess]; }] transcationIdStr:transcationIdStr]; } diff --git a/xplan-ios/Main/Mine/Presenter/XPMineResetPayPasswordPresenter.m b/xplan-ios/Main/Mine/Presenter/XPMineResetPayPasswordPresenter.m index be110b43..4cbf9531 100644 --- a/xplan-ios/Main/Mine/Presenter/XPMineResetPayPasswordPresenter.m +++ b/xplan-ios/Main/Mine/Presenter/XPMineResetPayPasswordPresenter.m @@ -25,7 +25,7 @@ NSString * uid = [AccountInfoStorage instance].getUid; NSString * ticket = [AccountInfoStorage instance].getTicket; NSString * newpasswordDes = [DESEncrypt encryptUseDES:password key:KeyWithType(KeyType_PasswordEncode)]; - [Api setPayPasswordWithComplection:[self createHttpCompletion:^(BaseModel * _Nonnull data) { + [Api setPayPassword:[self createHttpCompletion:^(BaseModel * _Nonnull data) { [[self getView] resetPayPasswordSuccess]; }] newPasswd:newpasswordDes phone:phone code:veriftCode uid:uid ticket:ticket]; } diff --git a/xplan-ios/Main/Mine/Presenter/XPMineTeenagerPwdPresenter.m b/xplan-ios/Main/Mine/Presenter/XPMineTeenagerPwdPresenter.m index d192b456..16de807a 100644 --- a/xplan-ios/Main/Mine/Presenter/XPMineTeenagerPwdPresenter.m +++ b/xplan-ios/Main/Mine/Presenter/XPMineTeenagerPwdPresenter.m @@ -23,7 +23,7 @@ - (void)openOrCloseParentWithPassowrd:(NSString *)password status:(BOOL)status { NSString * uid = [AccountInfoStorage instance].getUid; NSString * newpasswordDes = [DESEncrypt encryptUseDES:password key:KeyWithType(KeyType_PasswordEncode)]; - [Api openOrCloseParentModelWithComplection:[self createHttpCompletion:^(BaseModel * _Nonnull data) { + [Api openOrCloseParentModel:[self createHttpCompletion:^(BaseModel * _Nonnull data) { [[self getView] openOrCloseParentSuccessStatus:status]; } fail:^(NSInteger code, NSString * _Nullable msg) { diff --git a/xplan-ios/Main/Mine/Presenter/XPMineUserInfoEditPresenter.m b/xplan-ios/Main/Mine/Presenter/XPMineUserInfoEditPresenter.m index 3806dd3c..dcd8f4b5 100644 --- a/xplan-ios/Main/Mine/Presenter/XPMineUserInfoEditPresenter.m +++ b/xplan-ios/Main/Mine/Presenter/XPMineUserInfoEditPresenter.m @@ -101,7 +101,7 @@ [dic setObject:uid forKey:@"uid"]; [dic setObject:ticket forKey:@"ticket"]; - [Api complementInfoWithComplection:[self createHttpCompletion:^(BaseModel * _Nonnull data) { + [Api completeUserInfo:[self createHttpCompletion:^(BaseModel * _Nonnull data) { [[self getView] complementUserInfoSuccess]; }] userInfo:dic]; } @@ -110,7 +110,7 @@ /// 上传头像 /// @param avatar 头像 - (void)uploadAvatar:(UIImage *)avatar { - [Api qiniuUpLoadImageWithComplection:[self createHttpCompletion:^(BaseModel * _Nonnull data) { + [Api qiniuUpLoadImage:[self createHttpCompletion:^(BaseModel * _Nonnull data) { NSString *key = data.data[@"key"]; NSString *token = data.data[@"token"]; [UploadImage uploadImage:avatar named:key token:token success:^(NSString * _Nonnull key, NSDictionary * _Nonnull resp) { diff --git a/xplan-ios/Main/Mine/Presenter/XPMineUserInfolbumPresenter.m b/xplan-ios/Main/Mine/Presenter/XPMineUserInfolbumPresenter.m index bcb4864e..08164e50 100644 --- a/xplan-ios/Main/Mine/Presenter/XPMineUserInfolbumPresenter.m +++ b/xplan-ios/Main/Mine/Presenter/XPMineUserInfolbumPresenter.m @@ -32,7 +32,7 @@ - (void)uploadUserAlbumWithUrlStr:(NSString *)url { NSString * uid = [AccountInfoStorage instance].getUid; NSString * ticket = [AccountInfoStorage instance].getTicket; - [Api uploadUserAlbumWithComplection:[self createHttpCompletion:^(BaseModel * _Nonnull data) { + [Api uploadUserAlbum:[self createHttpCompletion:^(BaseModel * _Nonnull data) { [[self getView] uploadUserAlbumSuccess]; } showLoading:YES] photoStr:url uid:uid ticket:ticket]; } @@ -40,7 +40,7 @@ /// 相册 /// @param albumImage 相册的image - (void)uploadAlbumImage:(UIImage *)albumImage { - [Api qiniuUpLoadImageWithComplection:[self createHttpCompletion:^(BaseModel * _Nonnull data) { + [Api qiniuUpLoadImage:[self createHttpCompletion:^(BaseModel * _Nonnull data) { NSString *key = data.data[@"key"]; NSString *token = data.data[@"token"]; [UploadImage uploadImage:albumImage named:key token:token success:^(NSString * _Nonnull key, NSDictionary * _Nonnull resp) { @@ -58,7 +58,7 @@ - (void)deleteImageUrlFromServerWithPid:(NSString *)pid { NSString * uid = [AccountInfoStorage instance].getUid; NSString * ticket = [AccountInfoStorage instance].getTicket; - [Api deleteImageFromServerWithComplection:[self createHttpCompletion:^(BaseModel * _Nonnull data) { + [Api deleteImageFromServer:[self createHttpCompletion:^(BaseModel * _Nonnull data) { [[self getView] deleteUserAlbumSuccess]; } showLoading:YES] pid:pid uid:uid ticket:ticket]; } diff --git a/xplan-ios/Main/Mine/Presenter/XPMineVerifIdentityPresenter.m b/xplan-ios/Main/Mine/Presenter/XPMineVerifIdentityPresenter.m index 84467099..a3d8383c 100644 --- a/xplan-ios/Main/Mine/Presenter/XPMineVerifIdentityPresenter.m +++ b/xplan-ios/Main/Mine/Presenter/XPMineVerifIdentityPresenter.m @@ -35,7 +35,7 @@ - (void)checkMoblieCodeWithMoblie:(NSString *)moblieNum code:(NSString *)code { NSString * uid = [[AccountInfoStorage instance] getUid]; NSString * ticket = [[AccountInfoStorage instance] getTicket]; - [Api checkMoblieCodeWithComplection:[self createHttpCompletion:^(BaseModel * _Nonnull data) { + [Api checkMoblieCode:[self createHttpCompletion:^(BaseModel * _Nonnull data) { [[self getView] checkMoblieCodeWithMoblieSuccess]; }] mobile:moblieNum code:code uid:uid ticket:ticket]; } diff --git a/xplan-ios/Main/RTC/RtcManager.m b/xplan-ios/Main/RTC/RtcManager.m index d18264c2..94dd18b1 100644 --- a/xplan-ios/Main/RTC/RtcManager.m +++ b/xplan-ios/Main/RTC/RtcManager.m @@ -69,7 +69,6 @@ _engineDelegate = delegate; } - - (id)engine { if (!_engine) { switch (_engineType) { diff --git a/xplan-ios/Main/Room/Api/Api+Room.h b/xplan-ios/Main/Room/Api/Api+Room.h index bb097d26..5e9f5d14 100644 --- a/xplan-ios/Main/Room/Api/Api+Room.h +++ b/xplan-ios/Main/Room/Api/Api+Room.h @@ -15,7 +15,7 @@ NS_ASSUME_NONNULL_BEGIN /// @param complection 完成 /// @param uid 用户的uid /// @param intoUid 自己的Uid 判断当前进房用户是否是平台超管 判断进房用户是否开启青少年 -+ (void)getRoomInfoWithComplection:(HttpRequestHelperCompletion)complection ++ (void)getRoomInfo:(HttpRequestHelperCompletion)complection uid:(NSString *)uid intoUid:(NSString *)intoUid; @@ -29,7 +29,7 @@ NS_ASSUME_NONNULL_BEGIN /// @param backPic 房间背景 /// @param uid 用户的uid /// @param ticket 用户的ticket -+ (void)openRoomWithComplection:(HttpRequestHelperCompletion)complection ++ (void)openRoom:(HttpRequestHelperCompletion)complection title:(NSString *)title type:(RoomType)type roomPwd:(NSString *)roomPwd @@ -44,7 +44,7 @@ NS_ASSUME_NONNULL_BEGIN /// @param roomId 房间的id /// @param position 坑位的序号 /// @param ticket ticket -+ (void)roomMicUpMicWithComplection:(HttpRequestHelperCompletion)complection ++ (void)roomMicUpMic:(HttpRequestHelperCompletion)complection micUid:(NSString *)micUid roomId:(NSString *)roomId position:(NSString *)position @@ -56,7 +56,7 @@ NS_ASSUME_NONNULL_BEGIN /// @param roomId 房间的id /// @param position 坑位的序号 /// @param ticket ticket -+ (void)roomMicDownMicWithComplection:(HttpRequestHelperCompletion)complection ++ (void)roomMicDownMic:(HttpRequestHelperCompletion)complection micUid:(NSString *)micUid roomId:(NSString *)roomId position:(NSString *)position diff --git a/xplan-ios/Main/Room/Api/Api+Room.m b/xplan-ios/Main/Room/Api/Api+Room.m index da55289a..69530c3e 100644 --- a/xplan-ios/Main/Room/Api/Api+Room.m +++ b/xplan-ios/Main/Room/Api/Api+Room.m @@ -13,7 +13,7 @@ /// @param complection 完成 /// @param uid 用户的uid /// @param intoUid 自己的Uid 判断当前进房用户是否是平台超管 判断进房用户是否开启青少年 -+ (void)getRoomInfoWithComplection:(HttpRequestHelperCompletion)complection uid:(NSString *)uid intoUid:(NSString *)intoUid { ++ (void)getRoomInfo:(HttpRequestHelperCompletion)complection uid:(NSString *)uid intoUid:(NSString *)intoUid { [self makeRequest:@"room/get" method:HttpRequestHelperMethodGET completion:complection, __FUNCTION__, uid, intoUid, nil]; } @@ -27,7 +27,7 @@ /// @param backPic 房间背景 /// @param uid 用户的uid /// @param ticket 用户的ticket -+ (void)openRoomWithComplection:(HttpRequestHelperCompletion)complection ++ (void)openRoom:(HttpRequestHelperCompletion)complection title:(NSString *)title type:(RoomType)type roomPwd:(NSString *)roomPwd @@ -43,7 +43,7 @@ /// @param complection 完成 /// @param uid 用户的uid /// @param ticket 用户的ticket -+ (void)closeRoomWithComplection:(HttpRequestHelperCompletion)complection uid:(NSString *)uid ticket:(NSString *)ticket { ++ (void)closeRoom:(HttpRequestHelperCompletion)complection uid:(NSString *)uid ticket:(NSString *)ticket { [Api makeRequest:@"room/close" method:HttpRequestHelperMethodPOST completion:complection,__FUNCTION__, uid, ticket, nil]; } @@ -54,7 +54,7 @@ /// @param roomId 房间的id /// @param position 坑位的序号 /// @param ticket ticket -+ (void)roomMicUpMicWithComplection:(HttpRequestHelperCompletion)complection micUid:(NSString *)micUid roomId:(NSString *)roomId position:(NSString *)position ticket:(NSString *)ticket { ++ (void)roomMicUpMic:(HttpRequestHelperCompletion)complection micUid:(NSString *)micUid roomId:(NSString *)roomId position:(NSString *)position ticket:(NSString *)ticket { [Api makeRequest:@"room/mic/upmic" method:HttpRequestHelperMethodPOST completion:complection, __FUNCTION__, micUid, roomId, position, ticket, nil]; } @@ -64,7 +64,7 @@ /// @param roomId 房间的id /// @param position 坑位的序号 /// @param ticket ticket -+ (void)roomMicDownMicWithComplection:(HttpRequestHelperCompletion)complection micUid:(NSString *)micUid roomId:(NSString *)roomId position:(NSString *)position ticket:(NSString *)ticket { ++ (void)roomMicDownMic:(HttpRequestHelperCompletion)complection micUid:(NSString *)micUid roomId:(NSString *)roomId position:(NSString *)position ticket:(NSString *)ticket { [Api makeRequest:@"room/mic/downmic" method:HttpRequestHelperMethodPOST completion:complection, __FUNCTION__, micUid, roomId, position, ticket, nil]; } diff --git a/xplan-ios/Main/Room/Presenter/XPRoomPresenter.m b/xplan-ios/Main/Room/Presenter/XPRoomPresenter.m index 50acd0c6..604742c6 100644 --- a/xplan-ios/Main/Room/Presenter/XPRoomPresenter.m +++ b/xplan-ios/Main/Room/Presenter/XPRoomPresenter.m @@ -32,7 +32,7 @@ /// @param uid 进入的房间的uid - (void)getRoomInfoWithUid:(NSString *)uid { NSString * intoUid = [AccountInfoStorage instance].getUid; - [Api getRoomInfoWithComplection:[self createHttpCompletion:^(BaseModel * _Nonnull data) { + [Api getRoomInfo:[self createHttpCompletion:^(BaseModel * _Nonnull data) { RoomInfoModel * model = [RoomInfoModel modelWithJSON:data.data]; [[self getView] getRoomInfoSuccess:model]; } fail:^(NSInteger code, NSString * _Nullable msg) { @@ -66,7 +66,7 @@ backPic = @""; } - [Api openRoomWithComplection:[self createHttpCompletion:^(BaseModel * _Nonnull data) { + [Api openRoom:[self createHttpCompletion:^(BaseModel * _Nonnull data) { RoomInfoModel * infoModel = [RoomInfoModel modelWithJSON:data.data]; [[self getView] openRoomSuccess:infoModel]; } fail:^(NSInteger code, NSString * _Nullable msg) { diff --git a/xplan-ios/Main/Tabbar/MainPresenter.m b/xplan-ios/Main/Tabbar/MainPresenter.m index ea26fef8..320ae6a7 100644 --- a/xplan-ios/Main/Tabbar/MainPresenter.m +++ b/xplan-ios/Main/Tabbar/MainPresenter.m @@ -61,7 +61,7 @@ return; } NSString * transcationIdStr = [array objectToJSONString]; - [Api requestCheckTranscationIdsWithComplection:[self createHttpCompletion:^(BaseModel * _Nonnull data) { + [Api requestCheckTranscationIds:[self createHttpCompletion:^(BaseModel * _Nonnull data) { NSString * uid = [AccountInfoStorage instance].getUid; [RechargeStorage delegateAllTranscationIdsWithUid:uid]; }] transcationIdStr:transcationIdStr];