enhance demo,show webview performace data

lemon · lemon · commit 616977b6c81e · 2018-05-02T19:40:15.000+08:00
diff --git a/app/build.gradle b/app/build.gradle
@@ -49,7 +49,7 @@ android {
             zipAlignEnabled false
             minifyEnabled false
             shrinkResources false
-            debuggable false
+            debuggable true
         }
     }
 
@@ -67,4 +67,5 @@ dependencies {
     implementation project(':easybridge')
     implementation project(':easybridge-annotation')
     kapt project(':easybridge-processor')
+    implementation 'com.google.code.gson:gson:2.8.4'
 }
diff --git a/app/src/main/assets/demo.html b/app/src/main/assets/demo.html
@@ -43,7 +43,7 @@
 
 <body>
 
-<input type="text" value="http://google.com" id="tv_url">
+<input type="text" value="https://google.com" id="tv_url">
 <input type="button" value="jump" onclick="jumpToPage()">
 
 <a href="javascript:toast('click toast')"><h3>测试Toast</h3></a>
diff --git a/app/src/main/java/tech/easily/easybridge/MainActivity.kt b/app/src/main/java/tech/easily/easybridge/MainActivity.kt
@@ -1,18 +1,31 @@
 package tech.easily.easybridge
 
+import android.annotation.SuppressLint
+import android.graphics.Bitmap
 import android.net.Uri
 import android.os.Build
 import android.os.Bundle
 import android.support.v7.app.AppCompatActivity
+import android.view.View
 import android.webkit.*
 import android.widget.Toast
+import com.google.gson.Gson
 import tech.easily.easybridge.lib.EBHandlerManager
 import tech.easily.easybridge.lib.EasyBridgeWebChromeClient
 import kotlinx.android.synthetic.main.activity_main.*
+import kotlinx.android.synthetic.main.layout_performance.*
 import tech.easily.easybridge.lib.ResultCallBack
+import tech.easily.easybridge.model.PerformanceTiming
+import java.lang.Exception
 
 class MainActivity : AppCompatActivity() {
 
+    private val injectPerformanceHandler = "window.easyBridge.registerHandler('getPerformance', function (parameters, callback) {\n" +
+            "                    if (typeof callback == 'function') {\n" +
+            "                        callback(window.performance.timing);\n" +
+            "                    }\n" +
+            "                });"
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
@@ -35,9 +48,21 @@ class MainActivity : AppCompatActivity() {
         EBHandlerManager.register(webView)
         webView.setDebuggable(BuildConfig.DEBUG)
         webView.webViewClient = object : WebViewClient() {
+
+            override fun onPageStarted(view: WebView?, url: String?, favicon: Bitmap?) {
+                llPerformance.visibility = View.GONE
+            }
+
             override fun shouldOverrideUrlLoading(view: WebView?, url: String?): Boolean {
                 return false
             }
+
+            override fun onPageFinished(view: WebView?, url: String?) {
+                super.onPageFinished(view, url)
+                webView.postDelayed({
+                    getPerformanceData()
+                },500)
+            }
         }
         // set a global security checker,all the url with scheme https/http is not allowed to using the bridge
         webView.setPolicyChecker(({ url, parameters ->
@@ -46,12 +71,40 @@ class MainActivity : AppCompatActivity() {
             // control the bridge inject action
                 EasyBridgeWebChromeClient.SECURITY_CHECK_PARAMETERS -> when (page.scheme) {
                     "http" -> false
-                    "https" -> false
+                    "https" -> true
                     else -> true
                 }
                 else -> true
             }
         }))
+        // inject a performance js interface
+        webView.setBridgeInjectedListener {
+            webView.loadUrl("javascript:$injectPerformanceHandler")
+        }
+    }
+
+    private fun getPerformanceData() {
+        webView.callHandler("getPerformance", null, object : ResultCallBack() {
+            override fun onResult(result: Any?) {
+                try {
+                    val performanceTimingJson = result as String
+                    val performanceTiming = Gson().fromJson<PerformanceTiming>(performanceTimingJson, PerformanceTiming::class.java)
+                    renderPerformance(performanceTiming)
+                } catch (e: Exception) {
+                    e.printStackTrace()
+                }
+            }
+        })
+    }
+
+    @SuppressLint("SetTextI18n")
+    private fun renderPerformance(performanceTiming: PerformanceTiming) {
+        llPerformance.visibility = View.VISIBLE
+        with(performanceTiming) {
+            tvNet.text = (responseEnd - fetchStart).toString() + " ms"
+            tvRender.text = (loadEventEnd - responseEnd).toString() + " ms"
+            tvTotal.text = (loadEventEnd - fetchStart).toString() + " ms"
+        }
     }
 
     override fun onBackPressed() {
diff --git a/app/src/main/java/tech/easily/easybridge/model/PerformanceTiming.kt b/app/src/main/java/tech/easily/easybridge/model/PerformanceTiming.kt
@@ -1,4 +1,4 @@
-package tech.easily.webviewperformancedemo
+package tech.easily.easybridge.model
 
 data class PerformanceTiming(val connectEnd: Long, val connectStart: Long, val domComplete: Long, val domContentLoadedEventEnd: Long,
                              val domContentLoadedEventStart: Long, val domInteractive: Long, val domLoading: Long, val domainLookupEnd: Long,
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
@@ -22,4 +22,14 @@
         android:text="callJS"
         android:textColor="#fff" />
 
+
+    <include
+        android:layout_margin="16dp"
+        android:id="@+id/llPerformance"
+        layout="@layout/layout_performance"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="bottom|left"
+        android:visibility="gone" />
+
 </FrameLayout>
diff --git a/app/src/main/res/layout/layout_performance.xml b/app/src/main/res/layout/layout_performance.xml
@@ -2,7 +2,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
-    android:background="#50000000"
+    android:background="#60000000"
     android:orientation="vertical">
 
     <LinearLayout
@@ -17,7 +17,7 @@
             android:text="网络耗时：" />
 
         <TextView
-            android:id="@+id/tv_net"
+            android:id="@+id/tvNet"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content" />
     </LinearLayout>
@@ -34,7 +34,7 @@
             android:text="渲染耗时：" />
 
         <TextView
-            android:id="@+id/tv_render"
+            android:id="@+id/tvRender"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content" />
     </LinearLayout>
@@ -51,7 +51,7 @@
             android:text="总耗时长：" />
 
         <TextView
-            android:id="@+id/tv_total"
+            android:id="@+id/tvTotal"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content" />
     </LinearLayout>

Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ android {`
`49`	`49`	`zipAlignEnabled false`
`50`	`50`	`minifyEnabled false`
`51`	`51`	`shrinkResources false`
`52`		`- debuggable false`
	`52`	`+ debuggable true`
`53`	`53`	`}`
`54`	`54`	`}`
`55`	`55`
`@@ -67,4 +67,5 @@ dependencies {`
`67`	`67`	`implementation project(':easybridge')`
`68`	`68`	`implementation project(':easybridge-annotation')`
`69`	`69`	`kapt project(':easybridge-processor')`
	`70`	`+ implementation 'com.google.code.gson:gson:2.8.4'`
`70`	`71`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package tech.easily.webviewperformancedemo`
	`1`	`+package tech.easily.easybridge.model`
`2`	`2`
`3`	`3`	`data class PerformanceTiming(val connectEnd: Long, val connectStart: Long, val domComplete: Long, val domContentLoadedEventEnd: Long,`
`4`	`4`	`val domContentLoadedEventStart: Long, val domInteractive: Long, val domLoading: Long, val domainLookupEnd: Long,`