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

航海燃料的更新

Browse Source
This commit is contained in:
fengshuo
2022-08-26 22:15:41 +08:00
parent 58da4adb2f
commit 522b8f6592
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
xplan-ios/Main/Room/View/AnchorCycleView/AnchorRoomScrollView.m
View File

@@ -150,7 +150,7 @@
- (BOOL)gestureRecognizer:(UIGestureRecognizer *)gestureRecognizer shouldRecognizeSimultaneouslyWithGestureRecognizer:(UIGestureRecognizer *)otherGestureRecognizer { - (BOOL)gestureRecognizer:(UIGestureRecognizer *)gestureRecognizer shouldRecognizeSimultaneouslyWithGestureRecognizer:(UIGestureRecognizer *)otherGestureRecognizer {
///666是外部的公屏消息列表 8888房间半屏弹框顶部消失的view ///666是外部的公屏消息列表 8888房间半屏弹框顶部消失的view
if (otherGestureRecognizer.view.tag == 666 || otherGestureRecognizer.view.tag == 8888) { if (otherGestureRecognizer.view.tag == 666 || otherGestureRecognizer.view.tag == 8888 || otherGestureRecognizer.view.tag == 888) {
self.scrollEnabled = NO; self.scrollEnabled = NO;
return NO; return NO;
} }

7
xplan-ios/Main/Room/View/Sailing/View/XPSailingViewController.m
View File

@@ -382,7 +382,12 @@ NSString * const kSailingPrizeAlertKey = @"kSailingPrizeAlertKey";
XPRoomHalfWebView * webView = [[XPRoomHalfWebView alloc] init]; XPRoomHalfWebView * webView = [[XPRoomHalfWebView alloc] init];
webView.url = URLWithType(kSailingActivityURL); webView.url = URLWithType(kSailingActivityURL);
webView.isSailing = YES; webView.isSailing = YES;
[TTPopup popupView:webView style:TTPopupStyleActionSheet]; TTPopupService * config = [[TTPopupService alloc] init];
config.contentView = webView;
config.didFinishDismissHandler = ^(BOOL isDismissOnBackgroundTouch) {
[self.presenter getSailingInfo];
};
[TTPopup popupWithConfig:config];
} }
- (void)recordButtonAction:(UIButton *)sender { - (void)recordButtonAction:(UIButton *)sender {