diff --git a/xplan-ios/Main/XPWebViewController.m b/xplan-ios/Main/XPWebViewController.m index 4acf9f79..96eb0dfd 100644 --- a/xplan-ios/Main/XPWebViewController.m +++ b/xplan-ios/Main/XPWebViewController.m @@ -91,6 +91,7 @@ NSString * const kCloseWebView = @"closeWebView"; NSString * const kJumpAppointPage = @"jumpAppointPage"; NSString * const kJSOpenRoom = @"openRoom"; NSString * const kJSOpenRoomForGiftId = @"openRoomForGiftId"; +NSString * const kProhibitRightSlip = @"prohibitRightSlip"; @implementation XPWebViewController @@ -99,6 +100,11 @@ NSString * const kJSOpenRoomForGiftId = @"openRoomForGiftId"; [self initView]; } +- (void)viewWillDisappear:(BOOL)animated { + [super viewWillDisappear:animated]; + self.navigationController.interactivePopGestureRecognizer.enabled = YES; +} + - (void)initView { if (self.navigationController.viewControllers.count > 1){ UIBarButtonItem *leftBarButtonItem = [[UIBarButtonItem alloc]initWithImage:[UIImage imageNamed:@"common_nav_back"] style:UIBarButtonItemStylePlain target:self action:@selector(backButtonClick)]; @@ -286,7 +292,9 @@ NSString * const kJSOpenRoomForGiftId = @"openRoomForGiftId"; if (uid.length > 0) { [XPRoomViewController openRoom:uid viewController:[XCCurrentVCStackManager shareManager].getCurrentVC]; } - } else if([message.name isEqualToString:kJSOpenRoomForGiftId]) { + } else if ([message.name isEqualToString:kProhibitRightSlip]) { + self.navigationController.interactivePopGestureRecognizer.enabled = NO; + } else if([message.name isEqualToString:kJSOpenRoomForGiftId]) { NSLog(@"%@", message.body); NSDictionary *bodyDict; if ([message.body isKindOfClass:[NSDictionary class]]) { @@ -612,6 +620,8 @@ NSString * const kJSOpenRoomForGiftId = @"openRoomForGiftId"; [_userContentController addScriptMessageHandler:weakScriptMessageDelegate name:kJSOpenRoom]; //进房并弹出礼物面板 [_userContentController addScriptMessageHandler:weakScriptMessageDelegate name:kJSOpenRoomForGiftId]; + ///禁用侧滑手势 + [_userContentController addScriptMessageHandler:weakScriptMessageDelegate name:kProhibitRightSlip]; } return _userContentController; }