diff --git a/xplan-ios/Main/Message/Model/SessionContent/ContentSecretaryModel.h b/xplan-ios/Main/Message/Model/SessionContent/ContentSecretaryModel.h index 0e86f666..ef2787a1 100644 --- a/xplan-ios/Main/Message/Model/SessionContent/ContentSecretaryModel.h +++ b/xplan-ios/Main/Message/Model/SessionContent/ContentSecretaryModel.h @@ -34,6 +34,10 @@ typedef NS_ENUM(NSInteger, SecretaryRouterType) { SecretaryRouterType_User_Card = 55, ///贵族气泡 SecretaryRouterType_Nobel_Bubble = 56, + ///装扮商城 + SecretaryRouterType_Dressup_Shop = 73, + ///我的装扮 + SecretaryRouterType_My_Dressup = 74, }; @interface ContentSecretaryModel : NSObject diff --git a/xplan-ios/Main/Message/View/Session/Content/MessageContentTextClickable.m b/xplan-ios/Main/Message/View/Session/Content/MessageContentTextClickable.m index 11f48190..03e24e2e 100644 --- a/xplan-ios/Main/Message/View/Session/Content/MessageContentTextClickable.m +++ b/xplan-ios/Main/Message/View/Session/Content/MessageContentTextClickable.m @@ -27,6 +27,7 @@ #import "XPMineRechargeViewController.h" #import "XPMineUserInfoViewController.h" #import "XPMineDressUpViewController.h" +#import "XPDressUpShopViewController.h" #import "XPNobleCenterViewController.h" #import "XPMineLoginPasswordViewController.h" ///P @@ -219,6 +220,21 @@ } uid:[AccountInfoStorage instance].getUid]; } break; + case SecretaryRouterType_Dressup_Shop: + { + XPDressUpShopViewController *vc = [[XPDressUpShopViewController alloc] init]; + vc.currentIndex = [value integerValue]; + [[XCCurrentVCStackManager shareManager].getCurrentVC.navigationController pushViewController:vc animated:YES]; + } + break; + case SecretaryRouterType_My_Dressup: + { + XPMineDressUpViewController * dressUpVC = [[XPMineDressUpViewController alloc] init]; + dressUpVC.currentIndex = [value integerValue]; + [[XCCurrentVCStackManager shareManager].getCurrentVC.navigationController pushViewController:dressUpVC animated:YES]; + } + break; + default: break; } diff --git a/xplan-ios/Main/Mine/View/DressUp/Api/Api+DressUp.h b/xplan-ios/Main/Mine/View/DressUp/Api/Api+DressUp.h index e8316fdf..50a5e444 100644 --- a/xplan-ios/Main/Mine/View/DressUp/Api/Api+DressUp.h +++ b/xplan-ios/Main/Mine/View/DressUp/Api/Api+DressUp.h @@ -87,16 +87,14 @@ NS_ASSUME_NONNULL_BEGIN /// 购买装扮 /// @param completion 完成 -/// @param dressType 装扮类型 /// @param dressId 装扮id -+ (void)requestDressUpShopBuy:(HttpRequestHelperCompletion)completion dressType:(NSString *)dressType dressId:(NSString *)dressId; ++ (void)requestDressUpShopBuy:(HttpRequestHelperCompletion)completion id:(NSString *)dressId; /// 赠送装扮 /// @param completion 完成 -/// @param dressType 装扮类型 /// @param dressId 装扮ID /// @param targetUid 目标用户UID -+ (void)requestSendDress:(HttpRequestHelperCompletion)completion dressType:(NSString *)dressType dressId:(NSString *)dressId targetUid:(NSString *)targetUid; ++ (void)requestSendDress:(HttpRequestHelperCompletion)completion id:(NSString *)dressId targetUid:(NSString *)targetUid; @end diff --git a/xplan-ios/Main/Mine/View/DressUp/Api/Api+DressUp.m b/xplan-ios/Main/Mine/View/DressUp/Api/Api+DressUp.m index 12db1a1f..dd409ea0 100644 --- a/xplan-ios/Main/Mine/View/DressUp/Api/Api+DressUp.m +++ b/xplan-ios/Main/Mine/View/DressUp/Api/Api+DressUp.m @@ -117,17 +117,16 @@ /// 购买装扮 /// @param completion 完成 /// @param dressId 装扮id -+ (void)requestDressUpShopBuy:(HttpRequestHelperCompletion)completion dressType:(NSString *)dressType dressId:(NSString *)dressId { - [self makeRequest:@"dress/shop/buy" method:HttpRequestHelperMethodPOST completion:completion, __FUNCTION__, dressType, dressId, nil]; ++ (void)requestDressUpShopBuy:(HttpRequestHelperCompletion)completion id:(NSString *)dressId { + [self makeRequest:@"dress/shop/buy" method:HttpRequestHelperMethodPOST completion:completion, __FUNCTION__, dressId, nil]; } /// 赠送装扮 /// @param completion 完成 -/// @param dressType 装扮类型 /// @param dressId 装扮ID /// @param targetUid 目标用户UID -+ (void)requestSendDress:(HttpRequestHelperCompletion)completion dressType:(NSString *)dressType dressId:(NSString *)dressId targetUid:(NSString *)targetUid { - [self makeRequest:@"dress/shop/give" method:HttpRequestHelperMethodPOST completion:completion, __FUNCTION__, dressType, dressId, targetUid, nil]; ++ (void)requestSendDress:(HttpRequestHelperCompletion)completion id:(NSString *)dressId targetUid:(NSString *)targetUid { + [self makeRequest:@"dress/shop/give" method:HttpRequestHelperMethodPOST completion:completion, __FUNCTION__, dressId, targetUid, nil]; } @end diff --git a/xplan-ios/Main/Mine/View/DressUp/Presenter/XPDressUpShopPresenter.m b/xplan-ios/Main/Mine/View/DressUp/Presenter/XPDressUpShopPresenter.m index 5c752f82..d8bde413 100644 --- a/xplan-ios/Main/Mine/View/DressUp/Presenter/XPDressUpShopPresenter.m +++ b/xplan-ios/Main/Mine/View/DressUp/Presenter/XPDressUpShopPresenter.m @@ -27,7 +27,7 @@ - (void)buyDressUp:(DressUpShopListType)dressType dressId:(NSString *)dressId { [Api requestDressUpShopBuy:[self createHttpCompletion:^(BaseModel * _Nonnull data) { [[self getView] buyShopDressSuccessWithType:dressType]; - } showLoading:YES] dressType:[NSString stringWithFormat:@"%zd", dressType] dressId:dressId]; + } showLoading:YES] id:dressId]; } @end diff --git a/xplan-ios/Main/Mine/View/DressUp/View/XPDressSearchViewController.m b/xplan-ios/Main/Mine/View/DressUp/View/XPDressSearchViewController.m index c979302b..7be4b2cd 100644 --- a/xplan-ios/Main/Mine/View/DressUp/View/XPDressSearchViewController.m +++ b/xplan-ios/Main/Mine/View/DressUp/View/XPDressSearchViewController.m @@ -114,7 +114,7 @@ } else { [self showErrorToast:msg]; } - } dressType:[NSString stringWithFormat:@"%zd", self.dressType] dressId:self.dressId targetUid:resultModel.uid]; + } id:self.dressId targetUid:resultModel.uid]; } #pragma mark - XPHomeSearchProtocol diff --git a/xplan-ios/Main/XPWebViewController.m b/xplan-ios/Main/XPWebViewController.m index 1c241a45..08f8f14f 100644 --- a/xplan-ios/Main/XPWebViewController.m +++ b/xplan-ios/Main/XPWebViewController.m @@ -346,24 +346,6 @@ NSString * const kJSOpenRoomForGiftId = @"openRoomForGiftId"; [[XCCurrentVCStackManager shareManager].getCurrentVC.navigationController pushViewController:vc animated:YES]; } break; - case 73: - { - //装扮商城 - NSString *index = [NSString stringWithFormat:@"%@", bodyDict[@"routerVal"]]; - XPDressUpShopViewController *vc = [[XPDressUpShopViewController alloc] init]; - vc.currentIndex = [index integerValue]; - [[XCCurrentVCStackManager shareManager].getCurrentVC.navigationController pushViewController:vc animated:YES]; - } - break; - case 74: - { - //我的装扮 - NSString *index = [NSString stringWithFormat:@"%@", bodyDict[@"routerVal"]]; - XPMineDressUpViewController *vc = [[XPMineDressUpViewController alloc] init]; - vc.currentIndex = [index integerValue]; - [[XCCurrentVCStackManager shareManager].getCurrentVC.navigationController pushViewController:vc animated:YES]; - } - break; default: break; }