From 522b8f659240c7ba52f9527763e1d0f32181c8f2 Mon Sep 17 00:00:00 2001 From: fengshuo <963787902@qq.com> Date: Fri, 26 Aug 2022 22:15:41 +0800 Subject: [PATCH] =?UTF-8?q?=E8=88=AA=E6=B5=B7=E7=87=83=E6=96=99=E7=9A=84?= =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Main/Room/View/AnchorCycleView/AnchorRoomScrollView.m | 2 +- .../Main/Room/View/Sailing/View/XPSailingViewController.m | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/xplan-ios/Main/Room/View/AnchorCycleView/AnchorRoomScrollView.m b/xplan-ios/Main/Room/View/AnchorCycleView/AnchorRoomScrollView.m index 190091b9..d6f8a243 100644 --- a/xplan-ios/Main/Room/View/AnchorCycleView/AnchorRoomScrollView.m +++ b/xplan-ios/Main/Room/View/AnchorCycleView/AnchorRoomScrollView.m @@ -150,7 +150,7 @@ - (BOOL)gestureRecognizer:(UIGestureRecognizer *)gestureRecognizer shouldRecognizeSimultaneouslyWithGestureRecognizer:(UIGestureRecognizer *)otherGestureRecognizer { ///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; return NO; } diff --git a/xplan-ios/Main/Room/View/Sailing/View/XPSailingViewController.m b/xplan-ios/Main/Room/View/Sailing/View/XPSailingViewController.m index f9ce83c9..01e6c221 100644 --- a/xplan-ios/Main/Room/View/Sailing/View/XPSailingViewController.m +++ b/xplan-ios/Main/Room/View/Sailing/View/XPSailingViewController.m @@ -382,7 +382,12 @@ NSString * const kSailingPrizeAlertKey = @"kSailingPrizeAlertKey"; XPRoomHalfWebView * webView = [[XPRoomHalfWebView alloc] init]; webView.url = URLWithType(kSailingActivityURL); 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 {