Merge from 'swift 2.3'

Pluto-Y · Sep 29, 2017 · e0fd21d · e0fd21d
1 parent 770a8b9
commit e0fd21d
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/SwiftyEcharts.podspec b/SwiftyEcharts.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name                = "SwiftyEcharts"
-  s.version             = "0.0.1"
+  s.version             = "0.0.2"
   s.summary             = "A custom component for the ecomfe's echarts 3."
   s.homepage            = "https://github.com/Pluto-Y/SwiftyEcharts"
   s.license             = { :type => "MIT", :file => 'LICENSE' }

diff --git a/SwiftyEcharts/Views/EchartsView.swift b/SwiftyEcharts/Views/EchartsView.swift
@@ -143,15 +143,16 @@ open class EchartsView: WKWebView, WKNavigationDelegate, WKUIDelegate, WKScriptM
             bundle = frameworkBundle
         }
 
-        let urlPath = bundle.path(forResource: "echarts", ofType: "html")
-        guard let path = urlPath else {
+        if let urlPath = bundle.path(forResource: "echarts", ofType: "html") {
+            bundlePath = urlPath
+        } else if let urlPath = bundle.path(forResource: "echarts", ofType: "html", inDirectory: "SwiftyEcharts.bundle") {
+            bundlePath = urlPath
+        } else {
             printError("ERROR: Can not find the echarts.html, please contact the developer")
             return
         }
 
-        bundlePath = path
-
-        guard let htmlStr = try? String(contentsOfFile: path) else {
+        guard let htmlStr = try? String(contentsOfFile: bundlePath) else {
             return
         }
         printInfo("Info: the content of the echcart.html: \(htmlStr)")