apple vor 5 Jahren
Ursprung
Commit
d08149b58b

BIN
ios/JianYuIOS/JianYuIOS.xcworkspace/xcuserdata/apple.xcuserdatad/UserInterfaceState.xcuserstate


+ 1 - 1
ios/JianYuIOS/JianYuIOS/AppDelegate.m

@@ -61,7 +61,7 @@
     [LXDataBaseManager shareDataBaseManager];//初始化单例
     [LXViewControllerManager shareViewControllerManager];
     [self initJPush:launchOptions];
-    [self initUM];
+//    [self initUM];
     [self registeredPush]; //注册原生推送
 
     if (launchOptions) {

+ 2 - 1
ios/JianYuIOS/JianYuIOS/Classes(模块)/JYNewExpViewController.m

@@ -406,7 +406,8 @@ NSString *const new_AesKey_3 = @"mGlAgnIBB8bx2nch";
     [self judgeIsHiddenBottom];//是否隐藏
     [self removeNoNetViews];
     [[LXViewControllerManager shareViewControllerManager] hideHud];
-    
+    [self.webView evaluateJavaScript:@"document.documentElement.style.webkitTouchCallout='none';" completionHandler:nil];
+    [self.webView evaluateJavaScript:@"document.documentElement.style.webkitUserSelect='none';"completionHandler:nil];
 
     //写数据
 //    [self writeWKWebData:webView.URL];

+ 2 - 2
ios/JianYuIOS/JianYuIOS/Classes(模块)/JYNewMineViewController.m

@@ -345,7 +345,6 @@ NSString *const new_AesKey_4 = @"mGlAgnIBB8bx2nch";
     }
 }
 
-
 //通过js alert 显示一个警告面板,调用原生会走此方法。
 - (void)webView:(WKWebView *)webView runJavaScriptAlertPanelWithMessage:(NSString *)message initiatedByFrame:(WKFrameInfo *)frame completionHandler:(void (^)(void))completionHandler
 {
@@ -431,7 +430,8 @@ NSString *const new_AesKey_4 = @"mGlAgnIBB8bx2nch";
     [self judgeIsHiddenBottom];
     [self removeNoNetViews];
     [[LXViewControllerManager shareViewControllerManager] hideHud];
-
+    [self.webView evaluateJavaScript:@"document.documentElement.style.webkitTouchCallout='none';" completionHandler:nil];
+//    [self.webView evaluateJavaScript:@"document.documentElement.style.webkitUserSelect='none';"completionHandler:nil];
     //写数据
 //    [self writeWKWebData:webView.URL];
 }

+ 2 - 1
ios/JianYuIOS/JianYuIOS/Classes(模块)/JYNewSearchViewController.m

@@ -592,7 +592,8 @@ NSString *const new_AesKey_1 = @"mGlAgnIBB8bx2nch";
     if(!notiFinish) {
         notiFinish = YES;
     }
-    
+    [self.webView evaluateJavaScript:@"document.documentElement.style.webkitTouchCallout='none';" completionHandler:nil];
+    [self.webView evaluateJavaScript:@"document.documentElement.style.webkitUserSelect='none';"completionHandler:nil];
     [self judgeIsHiddenBottom];//是否隐藏
     [self removeNoNetViews];
     [[LXViewControllerManager shareViewControllerManager] hideHud];

+ 2 - 1
ios/JianYuIOS/JianYuIOS/Classes(模块)/JYNewSubViewController.m

@@ -414,7 +414,8 @@ NSString *const new_AesKey_2 = @"mGlAgnIBB8bx2nch";
     [self judgeIsHiddenBottom];//是否隐藏
     [self removeNoNetViews];
     [[LXViewControllerManager shareViewControllerManager] hideHud];
-
+    [self.webView evaluateJavaScript:@"document.documentElement.style.webkitTouchCallout='none';" completionHandler:nil];
+    [self.webView evaluateJavaScript:@"document.documentElement.style.webkitUserSelect='none';"completionHandler:nil];
 
     //写数据
 //    [self writeWKWebData:webView.URL];

+ 77 - 6
ios/JianYuIOS/JianYuIOS/JYNewWebController.m

@@ -9,12 +9,12 @@
 #import "JYNewWebController.h"
 #import <WebKit/WebKit.h>
 
-@interface JYNewWebController ()
+@interface JYNewWebController ()<WKNavigationDelegate,UIWebViewDelegate>
 
 
 @property (nonatomic, strong) UIProgressView *progressView;
-@property (nonatomic, strong) WKWebView *webView;
-
+//@property (nonatomic, strong) WKWebView *webView;
+@property (nonatomic, strong) UIWebView *webView;
 @end
 
 @implementation JYNewWebController
@@ -103,13 +103,17 @@
         backBtn_1.hidden = NO;
     }
     
-    self.webView = [[WKWebView alloc] initWithFrame:CGRectMake(0, H, WIDTH, HEIGHT-TAB_BAR_HEIGHT)];
+    self.webView = [[UIWebView alloc] initWithFrame:CGRectMake(0, H, WIDTH, HEIGHT-STATUS_BAR_HEIGHT-H)];
     if (iPhoneX) {
         if (@available(iOS 11.0, *)) {
             self.webView.scrollView.contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentNever;
         }
     }
     self.webView.scrollView.bounces = NO;
+    _webView.scrollView.bounces = NO;
+
+    _webView.delegate = self;
+    _webView.userInteractionEnabled = YES;
     [self.webView addObserver:self forKeyPath:@"estimatedProgress" options:NSKeyValueObservingOptionNew context:nil];
     [self.view addSubview:self.webView];
     [self.webView loadRequest:[NSURLRequest requestWithURL:[NSURL URLWithString:self.url]]];
@@ -122,13 +126,80 @@
     // Do any additional setup after loading the view.
     
     self.view.backgroundColor = [UIColor whiteColor];
-    NSLog(@"title:%@",self.title);
+    NSLog(@"title:%@",self.titleShow);
+    NSLog(@"url:%@",self.url);
     [self initUI];//渲染页面
     [self.view addSubview:self.progressView];
-
     [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(dismissSelf) name:@"kNewWebControllerDismiss" object:nil];
 }
 
+#pragma mark - UIWebViewDelegate
+- (void)webViewDidStartLoad:(UIWebView *)webView {
+    [[LXViewControllerManager shareViewControllerManager] showHudText:@""];
+}
+- (void)webViewDidFinishLoad:(UIWebView *)webView{
+    [[LXViewControllerManager shareViewControllerManager] hideHud];
+    [webView stringByEvaluatingJavaScriptFromString:@"document.documentElement.style.webkitUserSelect='none';"];
+    // Disable callout
+    [webView stringByEvaluatingJavaScriptFromString:@"document.documentElement.style.webkitTouchCallout='none';"];
+}
+
+-(void)webView:(UIWebView *)webView didFailLoadWithError:(NSError *)error{
+    [[LXViewControllerManager shareViewControllerManager] hideHud];
+    [[GlobalData shareInstance] addOnePlistData:@{
+        @"detail":[[self.webView stringByEvaluatingJavaScriptFromString:@"document.location.href"] stringByAppendingString:[NSString stringWithFormat:@"\n%@",[error description]]],
+        @"reqTime":[NSNumber numberWithInt:0],
+    }];
+    
+}
+
+
+#pragma mark - WKNavigationDelegate
+/* 页面加载完成 */
+//- (void)webView:(WKWebView *)webView didFinishNavigation:(WKNavigation *)navigation{
+//
+//    [self.webView evaluateJavaScript:@"document.documentElement.style.webkitTouchCallout='none';" completionHandler:nil];
+//    [self.webView evaluateJavaScript:@"document.documentElement.style.webkitUserSelect='none';"completionHandler:nil];
+//}
+//// 页面开始加载时调用
+//- (void)webView:(WKWebView *)webView didStartProvisionalNavigation:(WKNavigation *)navigation{
+//
+//}
+//// 当内容开始返回时调用
+//- (void)webView:(WKWebView *)webView didCommitNavigation:(WKNavigation *)navigation{
+//}
+//
+//// 页面加载失败时调用
+//- (void)webView:(WKWebView *)webView didFailProvisionalNavigation:(WKNavigation *)navigation withError:(nonnull NSError *)error{
+//    [[GlobalData shareInstance] addOnePlistData:@{
+//        @"detail":[[self stringByEvaluatingJavaScriptFromString:@"document.location.href"] stringByAppendingString:[NSString stringWithFormat:@"\n%@",[error description]]],
+//        @"reqTime":[NSNumber numberWithInt:0],
+//    }];
+//}
+//- (NSString *)stringByEvaluatingJavaScriptFromString:(NSString *)script
+//{
+//    __block NSString *resultString = nil;
+//    __block BOOL finished = NO;
+//
+//    [self.webView evaluateJavaScript:script completionHandler:^(id result, NSError *error) {
+//        if (error == nil) {
+//            if (result != nil) {
+//                resultString = [NSString stringWithFormat:@"%@", result];
+//            }
+//        } else {
+//            NSLog(@"evaluateJavaScript error : %@", error.localizedDescription);
+//        }
+//        finished = YES;
+//    }];
+//
+//    while (!finished) {
+//        [[NSRunLoop currentRunLoop] runMode:NSDefaultRunLoopMode beforeDate:[NSDate distantFuture]];
+//    }
+//    return resultString;
+//}
+
+
+
 -(void)backBtn1Click
 {
     if (self.webView.canGoBack) {// web能退 就后退