fix: iOS run exception,conflict with webview_flutter: ^2.8.0（Issues #9 #11 ）

Author: wenzhiming

CHANGELOG.md

@@ -1,3 +1,6 @@
+## 1.0.3
+- fix: iOS run exception,conflict with webview_flutter: ^2.8.0（Issues #9 #11 ）
+
 ## 1.0.2
 - support select pdf|doc|xls files（Issues #6 ）
 

README.md

@@ -1,6 +1,6 @@
 # Flutter WebView Pro
 
-[![pub package](https://img.shields.io/badge/pub-v1.0.2-orange)](https://pub.dartlang.org/packages/flutter_webview_pro)
+[![pub package](https://img.shields.io/badge/pub-v1.0.3-orange)](https://pub.dartlang.org/packages/flutter_webview_pro)
 
 A Flutter plugin that provides a WebView widget   who Support photo upload/take camera and Geolocation.
 The official flutter plugin `webview_flutter` Android does not support H5 file upload, that is, it does not support the H5 code below.
@@ -18,7 +18,7 @@ Add this to your package's `pubspec.yaml` file:
 
 ```yaml
 dependencies:
-  flutter_webview_pro: ^1.0.2
+  flutter_webview_pro: ^1.0.3
 ```
 
 ## Import

example/ios/.symlinks/plugins/flutter_webview_pro

@@ -0,0 +1 @@
+/Users/zhimingwen/Develop/GitHub/flutter_webview_pro/

example/ios/.symlinks/plugins/integration_test

@@ -0,0 +1 @@
+/Users/zhimingwen/Develop/flutter/packages/integration_test/

example/ios/Podfile.lock

@@ -0,0 +1,35 @@
+PODS:
+  - Flutter (1.0.0)
+  - flutter_webview_pro (1.0.0):
+    - Flutter
+  - integration_test (0.0.1):
+    - Flutter
+  - OCMock (3.5)
+
+DEPENDENCIES:
+  - Flutter (from `Flutter`)
+  - flutter_webview_pro (from `.symlinks/plugins/flutter_webview_pro/ios`)
+  - integration_test (from `.symlinks/plugins/integration_test/ios`)
+  - OCMock (= 3.5)
+
+SPEC REPOS:
+  trunk:
+    - OCMock
+
+EXTERNAL SOURCES:
+  Flutter:
+    :path: Flutter
+  flutter_webview_pro:
+    :path: ".symlinks/plugins/flutter_webview_pro/ios"
+  integration_test:
+    :path: ".symlinks/plugins/integration_test/ios"
+
+SPEC CHECKSUMS:
+  Flutter: 50d75fe2f02b26cc09d224853bb45737f8b3214a
+  flutter_webview_pro: 569314997078b3d00ae8fd6aaa791832efff1795
+  integration_test: 7db6d89f336f671dcbc7563ee27a5b08f6f8aee1
+  OCMock: 4ab4577fc941af31f4a0398f6e7e230cf21fc72a
+
+PODFILE CHECKSUM: b36feef8b3c1de558c5a548dd556cc98c8b0ca10
+
+COCOAPODS: 1.11.2

example/ios/Runner.xcworkspace/xcuserdata/zhimingwen.xcuserdatad/UserInterfaceState.xcuserstate

@@ -6,8 +6,8 @@
 
 #import "GeneratedPluginRegistrant.h"
 
-#if __has_include(<flutter_webview_pro/FLWebViewFlutterPlugin.h>)
-#import <flutter_webview_pro/FLWebViewFlutterPlugin.h>
+#if __has_include(<flutter_webview_pro/WebViewProFlutterPlugin.h>)
+#import <flutter_webview_pro/WebViewProFlutterPlugin.h>
 #else
 @import flutter_webview_pro;
 #endif
@@ -21,7 +21,7 @@
 @implementation GeneratedPluginRegistrant
 
 + (void)registerWithRegistry:(NSObject<FlutterPluginRegistry>*)registry {
-  [FLWebViewFlutterPlugin registerWithRegistrar:[registry registrarForPlugin:@"FLWebViewFlutterPlugin"]];
+  [WebViewProFlutterPlugin registerWithRegistrar:[registry registrarForPlugin:@"WebViewProFlutterPlugin"]];
   [IntegrationTestPlugin registerWithRegistrar:[registry registrarForPlugin:@"IntegrationTestPlugin"]];
 }
 

example/ios/Runner/GeneratedPluginRegistrant.m

@@ -4,7 +4,7 @@
 
 #import "FlutterWebView.h"
 #import "FLWKNavigationDelegate.h"
-#import "FLWKProgressionDelegate.h"
+#import "ProWKProgressionDelegate.h"
 #import "JavaScriptChannelHandler.h"
 
 @implementation FLWebViewFactory {
@@ -65,7 +65,7 @@ @implementation FLWebViewController {
   // The set of registered JavaScript channel names.
   NSMutableSet* _javaScriptChannelNames;
   FLWKNavigationDelegate* _navigationDelegate;
-  FLWKProgressionDelegate* _progressionDelegate;
+  ProWKProgressionDelegate* _progressionDelegate;
 }
 
 - (instancetype)initWithFrame:(CGRect)frame
@@ -336,7 +336,7 @@ - (NSString*)applySettings:(NSDictionary<NSString*, id>*)settings {
       NSNumber* hasProgressTrackingValue = settings[key];
       bool hasProgressTracking = [hasProgressTrackingValue boolValue];
       if (hasProgressTracking) {
-        _progressionDelegate = [[FLWKProgressionDelegate alloc] initWithWebView:_webView
+        _progressionDelegate = [[ProWKProgressionDelegate alloc] initWithWebView:_webView
                                                                          channel:_channel];
       }
     } else if ([key isEqualToString:@"debuggingEnabled"]) {

ios/Classes/FlutterWebView.m

@@ -8,7 +8,7 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
-@interface FLWKProgressionDelegate : NSObject
+@interface ProWKProgressionDelegate : NSObject
 
 - (instancetype)initWithWebView:(WKWebView *)webView channel:(FlutterMethodChannel *)channel;
 

ios/Classes/FLWKProgressionDelegate.h ios/Classes/ProWKProgressionDelegate.hios/Classes/FLWKProgressionDelegate.h renamed to ios/Classes/ProWKProgressionDelegate.h

@@ -2,11 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#import "FLWKProgressionDelegate.h"
+#import "ProWKProgressionDelegate.h"
 
-NSString *const FLTWKEstimatedProgressKeyPath = @"estimatedProgress";
+NSString *const ProWKEstimatedProgressKeyPath = @"estimatedProgress";
 
-@implementation FLWKProgressionDelegate {
+@implementation ProWKProgressionDelegate {
   FlutterMethodChannel *_methodChannel;
 }
 
@@ -15,22 +15,22 @@ - (instancetype)initWithWebView:(WKWebView *)webView channel:(FlutterMethodChann
   if (self) {
     _methodChannel = channel;
     [webView addObserver:self
-              forKeyPath:FLTWKEstimatedProgressKeyPath
+              forKeyPath:ProWKEstimatedProgressKeyPath
                  options:NSKeyValueObservingOptionNew
                  context:nil];
   }
   return self;
 }
 
 - (void)stopObservingProgress:(WKWebView *)webView {
-  [webView removeObserver:self forKeyPath:FLTWKEstimatedProgressKeyPath];
+  [webView removeObserver:self forKeyPath:ProWKEstimatedProgressKeyPath];
 }
 
 - (void)observeValueForKeyPath:(NSString *)keyPath
                       ofObject:(id)object
                         change:(NSDictionary<NSKeyValueChangeKey, id> *)change
                        context:(void *)context {
-  if ([keyPath isEqualToString:FLTWKEstimatedProgressKeyPath]) {
+  if ([keyPath isEqualToString:ProWKEstimatedProgressKeyPath]) {
     NSNumber *newValue =
         change[NSKeyValueChangeNewKey] ?: 0;          // newValue is anywhere between 0.0 and 1.0
     int newValueAsInt = [newValue floatValue] * 100;  // Anywhere between 0 and 100