完善

like5188 · Mar 7, 2022 · d63b3b9 · d63b3b9
1 parent b30584e
commit d63b3b9
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 17 deletions.
diff --git a/sample/src/main/java/com/like/webview/sample/WebViewFragmentActivity.kt b/sample/src/main/java/com/like/webview/sample/WebViewFragmentActivity.kt
@@ -57,15 +57,6 @@ class WebViewFragmentActivity : BaseWebViewActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         mBinding
-        webViewFragment?.setListener(object : X5ListenerAdapter() {
-            override fun onReceivedIcon(webView: WebView?, icon: Bitmap?) {
-                mBinding.ivIcon.setImageBitmap(icon)
-            }
-
-            override fun onReceivedTitle(webView: WebView?, title: String?) {
-                mBinding.tvTitle.text = title
-            }
-        })
     }
 
     override fun getFragmentHolderResId(): Int {
@@ -79,6 +70,15 @@ class WebViewFragmentActivity : BaseWebViewActivity() {
         progressBarBgColorResId = intent.getIntExtra(KEY_PROGRESS_BAR_BG_COLOR_RES_ID, -1)
         progressBarProgressColorResId = intent.getIntExtra(KEY_PROGRESS_BAR_PROGRESS_COLOR_RES_ID, -1)
         javascriptInterfaceMap["appKcwc"] = JsUtils.JavascriptInterface()
+        x5Listener = object : X5ListenerAdapter() {
+            override fun onReceivedIcon(webView: WebView?, icon: Bitmap?) {
+                mBinding.ivIcon.setImageBitmap(icon)
+            }
+
+            override fun onReceivedTitle(webView: WebView?, title: String?) {
+                mBinding.tvTitle.text = title
+            }
+        }
     }
 
     fun pageUp(view: View) {

diff --git a/webview/src/main/java/com/like/webview/WebViewFragment.kt b/webview/src/main/java/com/like/webview/WebViewFragment.kt
@@ -34,6 +34,7 @@ class WebViewFragment(private val webViewFragmentConfig: WebViewFragmentConfig)
                 webViewFragmentConfig.progressBarBgColorResId,
                 webViewFragmentConfig.progressBarProgressColorResId
             )
+            x5Listener = webViewFragmentConfig.x5Listener
             x5WebView = getX5WebView()?.apply {
                 settings?.cacheMode = WebSettings.LOAD_NO_CACHE// 支持微信H5支付
                 webViewFragmentConfig.javascriptInterfaceMap.forEach {
@@ -43,21 +44,17 @@ class WebViewFragment(private val webViewFragmentConfig: WebViewFragmentConfig)
         }
     }
 
+    fun getWebView(): WebView? {
+        return x5WebView
+    }
+
     fun load(url: String?) {
         if (url.isNullOrEmpty()) {
             return
         }
         x5WebView?.loadUrl(url)
     }
 
-    fun getWebView(): WebView? {
-        return x5WebView
-    }
-
-    fun setListener(listener: X5Listener) {
-        x5WebViewWithErrorViewAndProgressBar?.x5Listener = listener
-    }
-
     fun pageUp() {
         x5WebView?.pageUp(true)
     }
@@ -138,4 +135,6 @@ class WebViewFragmentConfig {
      * 注册 js 调用 android 方法
      */
     val javascriptInterfaceMap = mutableMapOf<String, Any>()
+
+    var x5Listener: X5Listener? = null
 }