fix demo code

Lision · Lision · commit 694b03f57171 · 2018-01-24T13:45:05.000+08:00
diff --git a/WKWebViewJavascriptBridge.xcodeproj/project.pbxproj b/WKWebViewJavascriptBridge.xcodeproj/project.pbxproj
@@ -14,6 +14,7 @@
 		BC4A38B320138F7500E96E5D /* WKWebViewJavascriptBridgeTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = BC4A38B220138F7500E96E5D /* WKWebViewJavascriptBridgeTests.swift */; };
 		BC4A38B520138F7500E96E5D /* WKWebViewJavascriptBridge.h in Headers */ = {isa = PBXBuildFile; fileRef = BC4A38A720138F7500E96E5D /* WKWebViewJavascriptBridge.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		BC942673201750BA00A5A6F9 /* WKWebViewJavascriptBridge.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BC4A38A420138F7500E96E5D /* WKWebViewJavascriptBridge.framework */; };
+		BC94267420182E8300A5A6F9 /* Demo.html in Resources */ = {isa = PBXBuildFile; fileRef = BC995A582016F6A60012F728 /* Demo.html */; };
 		BC995A492016F5690012F728 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = BC995A482016F5690012F728 /* AppDelegate.swift */; };
 		BC995A4B2016F5690012F728 /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = BC995A4A2016F5690012F728 /* ViewController.swift */; };
 		BC995A4E2016F5690012F728 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = BC995A4C2016F5690012F728 /* Main.storyboard */; };
@@ -272,6 +273,7 @@
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				BC94267420182E8300A5A6F9 /* Demo.html in Resources */,
 				BC995A532016F5690012F728 /* LaunchScreen.storyboard in Resources */,
 				BC995A502016F5690012F728 /* Assets.xcassets in Resources */,
 				BC995A4E2016F5690012F728 /* Main.storyboard in Resources */,
diff --git a/WKWebViewJavascriptBridgeDemo/Demo.html b/WKWebViewJavascriptBridgeDemo/Demo.html
@@ -8,7 +8,7 @@
 		.logLine { border-bottom:1px solid #ccc; padding:4px 2px; font-family:courier; font-size:11px; }
 	</style>
 </head><body>
-	<h1>WebViewJavascriptBridge Demo</h1>
+	<h1>Demo</h1>
 	<script>
 	window.onerror = function(err) {
 		log('window.onerror: ' + err)
@@ -23,7 +23,7 @@ <h1>WebViewJavascriptBridge Demo</h1>
 <!--        WVJBIframe.style.display = 'none';-->
 <!--        WVJBIframe.src = 'https://__bridge_loaded__';-->
 <!--        document.documentElement.appendChild(WVJBIframe);-->
-        window.webkit.messageHandlers.setupWKWebViewJavascriptBridge.postMessage()
+        window.webkit.messageHandlers.iOS_Native_InjectJavascript.postMessage(null)
 
 <!--        setTimeout(function() { document.documentElement.removeChild(WVJBIframe) }, 0)-->
     }
diff --git a/WKWebViewJavascriptBridgeDemo/ViewController.swift b/WKWebViewJavascriptBridgeDemo/ViewController.swift
@@ -20,10 +20,27 @@ class ViewController: UIViewController {
         webView.navigationDelegate = self
         bridge = WKWebViewJavascriptBridge(webView: webView)
         view.addSubview(webView)
+        loadDemoPage()
     }
     
     func loadDemoPage() {
-        let pagePath = Bundle.main.path(forResource: "Demo", ofType: "html")
+        enum LoadDemoPageError: Error {
+            case nilPath
+        }
+        
+        do {
+            let pagePath = Bundle.main.path(forResource: "Demo", ofType: "html")
+            guard pagePath != nil else {
+                throw LoadDemoPageError.nilPath
+            }
+            let pageHtml = try String(contentsOfFile: pagePath!, encoding: .utf8)
+            let baseURL = URL(fileURLWithPath: pagePath!)
+            webView.loadHTMLString(pageHtml, baseURL: baseURL)
+        } catch LoadDemoPageError.nilPath {
+            print(print("webView loadDemoPage error: pagePath is nil"))
+        } catch let error {
+            print("webView loadDemoPage error: \(error)")
+        }
     }
 }
 
