yinmeng/yinmeng-ios
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

派对banner跳转，匹配跳转

Browse Source
This commit is contained in:
chenshuanglin
2023-03-16 22:47:27 +08:00
parent 125e301857
commit 251151da49
5 changed files with 35 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
xplan-ios.xcodeproj/project.pbxproj
View File

@@ -9,6 +9,8 @@
/* Begin PBXBuildFile section */
14566F2629BACBC500C73AE5 /* XPNewHomeFilterView.m in Sources */ = {isa = PBXBuildFile; fileRef = 14566F2529BACBC500C73AE5 /* XPNewHomeFilterView.m */; };
145C965229C30308009883AB /* XPRoomAnnouncementView.m in Sources */ = {isa = PBXBuildFile; fileRef = 145C965129C30308009883AB /* XPRoomAnnouncementView.m */; };
145C965429C360E5009883AB /* XPPartyListViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 145C965329C360E5009883AB /* XPPartyListViewController.m */; };
145C965629C360F5009883AB /* XPPartyViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 145C965529C360F5009883AB /* XPPartyViewController.m */; };
146567D929B1D62E00A1F5B9 /* XPNewHomeViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 146567D829B1D62E00A1F5B9 /* XPNewHomeViewController.m */; };
146567DC29B1D6A900A1F5B9 /* XPNewHomeNavView.m in Sources */ = {isa = PBXBuildFile; fileRef = 146567DB29B1D6A900A1F5B9 /* XPNewHomeNavView.m */; };
146567E229B1E1CF00A1F5B9 /* XPNewHomeHeaderView.m in Sources */ = {isa = PBXBuildFile; fileRef = 146567E129B1E1CF00A1F5B9 /* XPNewHomeHeaderView.m */; };
@@ -39,10 +41,8 @@
14EDBBB929B60341001D3E16 /* XPMomentListViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 14EDBBB829B60341001D3E16 /* XPMomentListViewController.m */; };
14EDBBBC29B6034C001D3E16 /* XPMomentListCollectionViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 14EDBBBA29B6034B001D3E16 /* XPMomentListCollectionViewCell.m */; };
14EDBBBF29B60A52001D3E16 /* XPMomentTopicHeaderView.m in Sources */ = {isa = PBXBuildFile; fileRef = 14EDBBBE29B60A52001D3E16 /* XPMomentTopicHeaderView.m */; };
14EDBBC229B60FFE001D3E16 /* XPPartyViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 14EDBBC129B60FFE001D3E16 /* XPPartyViewController.m */; };
14F9796229B6E1DE004BBFEB /* XPMomentTopicHeaderCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 14F9796129B6E1DE004BBFEB /* XPMomentTopicHeaderCell.m */; };
14F9796529B71189004BBFEB /* XPMonentsEmptyCollectionViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 14F9796429B71189004BBFEB /* XPMonentsEmptyCollectionViewCell.m */; };
14F9796829B71E94004BBFEB /* XPPartyListViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 14F9796729B71E94004BBFEB /* XPPartyListViewController.m */; };
14F9796B29B71EC9004BBFEB /* XPPartyListCollectionViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 14F9796A29B71EC9004BBFEB /* XPPartyListCollectionViewCell.m */; };
14F9796E29B72810004BBFEB /* XPPartyHeaderView.m in Sources */ = {isa = PBXBuildFile; fileRef = 14F9796D29B72810004BBFEB /* XPPartyHeaderView.m */; };
14F9797129B75B8C004BBFEB /* XPCycleVerticalView.m in Sources */ = {isa = PBXBuildFile; fileRef = 14F9797029B75B8C004BBFEB /* XPCycleVerticalView.m */; };
@@ -1292,6 +1292,8 @@
14566F2529BACBC500C73AE5 /* XPNewHomeFilterView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPNewHomeFilterView.m; sourceTree = "<group>"; };
145C965029C30308009883AB /* XPRoomAnnouncementView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPRoomAnnouncementView.h; sourceTree = "<group>"; };
145C965129C30308009883AB /* XPRoomAnnouncementView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPRoomAnnouncementView.m; sourceTree = "<group>"; };
145C965329C360E5009883AB /* XPPartyListViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XPPartyListViewController.m; sourceTree = "<group>"; };
145C965529C360F5009883AB /* XPPartyViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XPPartyViewController.m; sourceTree = "<group>"; };
146567D729B1D62E00A1F5B9 /* XPNewHomeViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPNewHomeViewController.h; sourceTree = "<group>"; };
146567D829B1D62E00A1F5B9 /* XPNewHomeViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPNewHomeViewController.m; sourceTree = "<group>"; };
146567DA29B1D6A900A1F5B9 /* XPNewHomeNavView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPNewHomeNavView.h; sourceTree = "<group>"; };
@@ -1349,13 +1351,11 @@
14EDBBBD29B60A52001D3E16 /* XPMomentTopicHeaderView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMomentTopicHeaderView.h; sourceTree = "<group>"; };
14EDBBBE29B60A52001D3E16 /* XPMomentTopicHeaderView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMomentTopicHeaderView.m; sourceTree = "<group>"; };
14EDBBC029B60FFE001D3E16 /* XPPartyViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPPartyViewController.h; sourceTree = "<group>"; };
14EDBBC129B60FFE001D3E16 /* XPPartyViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPPartyViewController.m; sourceTree = "<group>"; };
14F9796029B6E1DE004BBFEB /* XPMomentTopicHeaderCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMomentTopicHeaderCell.h; sourceTree = "<group>"; };
14F9796129B6E1DE004BBFEB /* XPMomentTopicHeaderCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMomentTopicHeaderCell.m; sourceTree = "<group>"; };
14F9796329B71189004BBFEB /* XPMonentsEmptyCollectionViewCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMonentsEmptyCollectionViewCell.h; sourceTree = "<group>"; };
14F9796429B71189004BBFEB /* XPMonentsEmptyCollectionViewCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMonentsEmptyCollectionViewCell.m; sourceTree = "<group>"; };
14F9796629B71E94004BBFEB /* XPPartyListViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPPartyListViewController.h; sourceTree = "<group>"; };
14F9796729B71E94004BBFEB /* XPPartyListViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPPartyListViewController.m; sourceTree = "<group>"; };
14F9796929B71EC9004BBFEB /* XPPartyListCollectionViewCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPPartyListCollectionViewCell.h; sourceTree = "<group>"; };
14F9796A29B71EC9004BBFEB /* XPPartyListCollectionViewCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPPartyListCollectionViewCell.m; sourceTree = "<group>"; };
14F9796C29B72810004BBFEB /* XPPartyHeaderView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPPartyHeaderView.h; sourceTree = "<group>"; };
@@ -8520,11 +8520,11 @@
14EDBBA829B5935F001D3E16 /* XPFindNewFriendViewController.h */,
14EDBBA929B5935F001D3E16 /* XPFindNewFriendViewController.m */,
14EDBBC029B60FFE001D3E16 /* XPPartyViewController.h */,
14EDBBC129B60FFE001D3E16 /* XPPartyViewController.m */,
145C965529C360F5009883AB /* XPPartyViewController.m */,
14F9796C29B72810004BBFEB /* XPPartyHeaderView.h */,
14F9796D29B72810004BBFEB /* XPPartyHeaderView.m */,
14F9796629B71E94004BBFEB /* XPPartyListViewController.h */,
14F9796729B71E94004BBFEB /* XPPartyListViewController.m */,
145C965329C360E5009883AB /* XPPartyListViewController.m */,
14F9796929B71EC9004BBFEB /* XPPartyListCollectionViewCell.h */,
14F9796A29B71EC9004BBFEB /* XPPartyListCollectionViewCell.m */,
);
@@ -9740,7 +9740,6 @@
E8834E3227FFD64F0029CCC1 /* GuildAuthModel.m in Sources */,
E82325F9274E2E42003A3332 /* Api+UserCard.m in Sources */,
E8AB632F28AE19DE0023B0D2 /* XPMonentMinePresenter.m in Sources */,
14EDBBC229B60FFE001D3E16 /* XPPartyViewController.m in Sources */,
9BD9A17C27A0EE24004186FE /* XPMineVisitorViewController.m in Sources */,
E82109B026F1D83500FC3319 /* LoginBindPhonePresent.m in Sources */,
E81C1B1F27705F7A0020D1E4 /* XPArrangeMicViewController.m in Sources */,
@@ -9968,10 +9967,10 @@
18E7B32126F098650064BC9B /* UserInfoSkillVo.m in Sources */,
14F9797429B75C5F004BBFEB /* XPCycleView.m in Sources */,
E8AC722726F482A4007D6E91 /* XPMineFeedbackPresenter.m in Sources */,
14F9796829B71E94004BBFEB /* XPPartyListViewController.m in Sources */,
E86B911A28102AF90007DEE7 /* SessionToolbarView.m in Sources */,
9BD6E435289A48E3007DCF42 /* XPNewUserRechargePresentTrasition.m in Sources */,
18AAF3F0279EA59300CD7DAD /* MessageContentTextClickable.m in Sources */,
145C965629C360F5009883AB /* XPPartyViewController.m in Sources */,
E8C6FFCC27548120004DC9F0 /* Api+Home.m in Sources */,
186A534E26FC6ED900D67B2C /* TTPopupService.m in Sources */,
18A61BD7274F7F6900A09A54 /* NetImageConfig.m in Sources */,
@@ -10351,6 +10350,7 @@
14973CAE29C1BD9E008E93E0 /* XPRoomRankListModel.m in Sources */,
E8834E4528003A8F0029CCC1 /* XPMineMangerListViewController.m in Sources */,
E86E79D028A4E0B2006DAF48 /* ContentRistAlertModel.m in Sources */,
145C965429C360E5009883AB /* XPPartyListViewController.m in Sources */,
9BFE0D922899042600F53C24 /* XPTaskCompleteTipView.m in Sources */,
9BE01AE728938AB600B50299 /* XPDressUpShopCardTableViewCell.m in Sources */,
E82E75062828E76400C25EF7 /* XPCoreDataManager.m in Sources */,

4
xplan-ios/Main/Home/Presenter/XPHomeRecommendPresenter.m
View File

@@ -136,7 +136,11 @@
/// 一键匹配
- (void)homeChatPick {
[Api homeChatPick:[self createHttpCompletion:^(BaseModel * _Nonnull data) {
if (data.data) {
[[self getView] homeChatPickSuccess:data.data];
}else{
[[self getView] homeChatPickFail];
}
}fail:^(NSInteger code, NSString * _Nullable msg) {
[[self getView] homeChatPickFail];
}]];

1
xplan-ios/Main/Home/View/XPNewHomeViewController.m
View File

@@ -250,6 +250,7 @@
- (void)homeChatPickFail {
[XCHUDTool hideHUD];
[self showErrorToast:@"匹配失败"];
}
- (void)getHomeRecommendDataFail {

21
xplan-ios/Main/Home/View/XPPartyViewController.m
View File

@@ -23,6 +23,8 @@
/// VC
#import "XPPartyListViewController.h"
#import "XPHomeLittleGameViewController.h"
#import "XPWebViewController.h"
#import "XPRoomViewController.h"
///P
#import "XPHomeContainerPresenter.h"
#import "XPHomeContainerProtocol.h"
@@ -165,7 +167,24 @@
#pragma mark - XPPartyHeaderViewDelegate
/// 点击banner
- (void)partyHeaderViewClickBanner:(HomeBannerInfoModel *)banner {
switch (banner.skipType) {
case HomeBannerInfoSkipType_Room:
{
if (banner.skipUri.length > 0) {
[XPRoomViewController openRoom:banner.skipUri viewController:self];
}
}
break;
case HomeBannerInfoSkipType_Web:
{
XPWebViewController *vc = [[XPWebViewController alloc]init];
vc.url = banner.skipUri;
[self.navigationController pushViewController:vc animated:YES];
}
break;
default:
break;
}
}

2
xplan-ios/Main/Mine/View/Recharge/XPMineNewRechargeViewController.m
View File

@@ -90,7 +90,7 @@
}
- (void)getRechargeList {
[self.presenter requestRechargeListWithChannel:@"8"];
[self.presenter requestRechargeListWithChannel:@"1"];
}
- (void)getUserWalletBalanceInfo {