moliparty/peko-ios
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

资源位bug修复

Browse Source
This commit is contained in:
liyuhua
2024-02-21 10:51:08 +08:00
parent 6cbf6c55ca
commit 32c6c8c7d2
2 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
YuMi/Modules/YMRoom/Model/ActivityInfoModel.h
View File

@@ -30,7 +30,7 @@ typedef NS_ENUM(NSInteger, ActivityType) {
@interface ActivityInfoModel : PIBaseModel @interface ActivityInfoModel : PIBaseModel
@property(nonatomic,copy) NSString *code; @property(nonatomic,copy) NSString *code;
@property(nonatomic,copy) NSString *icon; @property(nonatomic,copy) NSString *icon;
@property(nonatomic,copy) NSString *url; @property(nonatomic,copy) NSString *skipContent;
///名称 ///名称
@property (nonatomic,copy) NSString *bannerName; @property (nonatomic,copy) NSString *bannerName;
///外面的活动的图片 ///外面的活动的图片

10
YuMi/Modules/YMRoom/View/ActivityContainerView/XPRoomActivityContainerView.m
View File

@@ -381,14 +381,14 @@ UIKIT_EXTERN NSString *kShowFirstRechargeView;
if (info.skipType == ActivitySkipType_Room) { if (info.skipType == ActivitySkipType_Room) {
[self.hostDelegate exitRoom]; [self.hostDelegate exitRoom];
[XPRoomViewController openRoom:info.url viewController:kWindow.rootViewController]; [XPRoomViewController openRoom:info.skipContent viewController:kWindow.rootViewController];
} else if(info.skipType == ActivitySkipType_Web) { } else if(info.skipType == ActivitySkipType_Web) {
PIRoomActivityWebView * webView = [[PIRoomActivityWebView alloc]initWithFrame:CGRectMake(0, KScreenHeight, KScreenWidth, KScreenHeight)]; PIRoomActivityWebView * webView = [[PIRoomActivityWebView alloc]initWithFrame:CGRectMake(0, KScreenHeight, KScreenWidth, KScreenHeight)];
webView.roomUid = [NSString stringWithFormat:@"%ld", self.hostDelegate.getRoomInfo.uid]; webView.roomUid = [NSString stringWithFormat:@"%ld", self.hostDelegate.getRoomInfo.uid];
webView.url = info.url; webView.url = info.skipContent;
webView.infoList = inftList; webView.infoList = inftList;
[kWindow addSubview:webView]; [kWindow addSubview:webView];
[UIView animateWithDuration:0.2 animations:^{ [UIView animateWithDuration:0.2 animations:^{
@@ -492,21 +492,19 @@ UIKIT_EXTERN NSString *kShowFirstRechargeView;
if(model.skipType == ActivityShowType_Half){ if(model.skipType == ActivityShowType_Half){
XPRoomHalfWebView * webView = [[XPRoomHalfWebView alloc] init]; XPRoomHalfWebView * webView = [[XPRoomHalfWebView alloc] init];
webView.roomUid = [NSString stringWithFormat:@"%ld", self.hostDelegate.getRoomInfo.uid]; webView.roomUid = [NSString stringWithFormat:@"%ld", self.hostDelegate.getRoomInfo.uid];
webView.url = model.url; webView.url = model.skipContent;
[TTPopup popupView:webView style:TTPopupStyleActionSheet]; [TTPopup popupView:webView style:TTPopupStyleActionSheet];
return; return;
} }
XPWebViewController * webVC = [[XPWebViewController alloc] init]; XPWebViewController * webVC = [[XPWebViewController alloc] init];
webVC.roomUid = [NSString stringWithFormat:@"%ld", self.hostDelegate.getRoomInfo.uid]; webVC.roomUid = [NSString stringWithFormat:@"%ld", self.hostDelegate.getRoomInfo.uid];
webVC.url = model.url; webVC.url = model.skipContent;
[self.hostDelegate.getCurrentNav pushViewController:webVC animated:YES]; [self.hostDelegate.getCurrentNav pushViewController:webVC animated:YES];
} }
} }
#pragma mark- PIRoomActivityChoosePlayViewDelegate #pragma mark- PIRoomActivityChoosePlayViewDelegate
-(void)choosePlayTypeWithView:(PIRoomActivityChoosePlayView *)view model:(ActivityInfoModel *)model{ -(void)choosePlayTypeWithView:(PIRoomActivityChoosePlayView *)view model:(ActivityInfoModel *)model{
[self hiddenViewActionWithView:view];
[self clickPlayTypeWithModel:model]; [self clickPlayTypeWithModel:model];
self.clickPlayView.model = model;
} }
-(void)hiddenViewActionWithView:(PIRoomActivityChoosePlayView *)view{ -(void)hiddenViewActionWithView:(PIRoomActivityChoosePlayView *)view{
CGFloat y = self.frame.size.height + self.frame.origin.y - 124; CGFloat y = self.frame.size.height + self.frame.origin.y - 124;