fix bug

Author: iceCola7

app/src/main/java/com/cxz/wanandroid/ext/Ext.kt

@@ -2,9 +2,6 @@ package com.cxz.wanandroid.ext
 
 import android.app.Activity
 import android.content.Context
-import com.google.android.material.snackbar.Snackbar
-import androidx.fragment.app.Fragment
-import androidx.core.content.ContextCompat
 import android.util.Log
 import android.view.View
 import android.view.ViewGroup
@@ -13,9 +10,13 @@ import android.webkit.WebView
 import android.webkit.WebViewClient
 import android.widget.Checkable
 import android.widget.TextView
+import androidx.core.content.ContextCompat
+import androidx.fragment.app.Fragment
+import com.cxz.wanandroid.BuildConfig
 import com.cxz.wanandroid.R
 import com.cxz.wanandroid.app.App
 import com.cxz.wanandroid.widget.CustomToast
+import com.google.android.material.snackbar.Snackbar
 import com.just.agentweb.AgentWeb
 import com.just.agentweb.DefaultWebClient
 import java.text.SimpleDateFormat
@@ -32,11 +33,17 @@ fun Any.loge(content: String?) {
 }
 
 fun loge(tag: String, content: String?) {
-    Log.e(tag, content ?: "")
+    if (BuildConfig.DEBUG) {
+        Log.e(tag, content ?: "")
+    }
+}
+
+fun showToast(content: String) {
+    CustomToast(App.context, content).show()
 }
 
 fun Fragment.showToast(content: String) {
-    CustomToast(this?.activity?.applicationContext, content).show()
+    CustomToast(this.requireContext(), content).show()
 }
 
 fun Context.showToast(content: String) {
@@ -47,7 +54,7 @@ fun Activity.showSnackMsg(msg: String) {
     val snackbar = Snackbar.make(this.window.decorView, msg, Snackbar.LENGTH_SHORT)
     val view = snackbar.view
     view.findViewById<TextView>(R.id.snackbar_text)
-            .setTextColor(ContextCompat.getColor(this, R.color.white))
+        .setTextColor(ContextCompat.getColor(this, R.color.white))
     snackbar.show()
 }
 
@@ -56,7 +63,7 @@ fun Fragment.showSnackMsg(msg: String) {
     val snackbar = Snackbar.make(this.activity!!.window.decorView, msg, Snackbar.LENGTH_SHORT)
     val view = snackbar.view
     view.findViewById<TextView>(R.id.snackbar_text)
-            .setTextColor(ContextCompat.getColor(this.activity!!, R.color.white))
+        .setTextColor(ContextCompat.getColor(this.activity!!, R.color.white))
     snackbar.show()
 }
 
@@ -80,26 +87,26 @@ inline fun <T : View> T.setSingleClickListener(time: Long = 1000, crossinline bl
  * getAgentWeb
  */
 fun String.getAgentWeb(
-        activity: Activity,
-        webContent: ViewGroup,
-        layoutParams: ViewGroup.LayoutParams,
-        webView: WebView,
-        webViewClient: WebViewClient?,
-        webChromeClient: WebChromeClient?,
-        indicatorColor: Int
+    activity: Activity,
+    webContent: ViewGroup,
+    layoutParams: ViewGroup.LayoutParams,
+    webView: WebView,
+    webViewClient: WebViewClient?,
+    webChromeClient: WebChromeClient?,
+    indicatorColor: Int
 ): AgentWeb = AgentWeb.with(activity)//传入Activity or Fragment
-        .setAgentWebParent(webContent, 1, layoutParams)//传入AgentWeb 的父控件
-        .useDefaultIndicator(indicatorColor, 2)// 使用默认进度条
-        .setWebView(webView)
-        .setWebViewClient(webViewClient)
-        .setWebChromeClient(webChromeClient)
-        .setMainFrameErrorView(R.layout.agentweb_error_page, -1)
-        .setSecurityType(AgentWeb.SecurityType.STRICT_CHECK)
-        .setOpenOtherPageWays(DefaultWebClient.OpenOtherPageWays.ASK)//打开其他应用时，弹窗咨询用户是否前往其他应用
-        .interceptUnkownUrl()
-        .createAgentWeb()//
-        .ready()
-        .go(this)
+    .setAgentWebParent(webContent, 1, layoutParams)//传入AgentWeb 的父控件
+    .useDefaultIndicator(indicatorColor, 2)// 使用默认进度条
+    .setWebView(webView)
+    .setWebViewClient(webViewClient)
+    .setWebChromeClient(webChromeClient)
+    .setMainFrameErrorView(R.layout.agentweb_error_page, -1)
+    .setSecurityType(AgentWeb.SecurityType.STRICT_CHECK)
+    .setOpenOtherPageWays(DefaultWebClient.OpenOtherPageWays.ASK)//打开其他应用时，弹窗咨询用户是否前往其他应用
+    .interceptUnkownUrl()
+    .createAgentWeb()//
+    .ready()
+    .go(this)
 
 /**
  * 格式化当前日期

app/src/main/java/com/cxz/wanandroid/ui/activity/ContentActivity.kt

@@ -93,7 +93,7 @@ class ContentActivity : BaseMvpSwipeBackActivity<ContentContract.View, ContentCo
 
         val webView = NestedScrollAgentWebView(this)
 
-        val layoutParams = androidx.coordinatorlayout.widget.CoordinatorLayout.LayoutParams(-1, -1)
+        val layoutParams = CoordinatorLayout.LayoutParams(-1, -1)
         layoutParams.behavior = AppBarLayout.ScrollingViewBehavior()
 
         mAgentWeb = shareUrl.getAgentWeb(

app/src/main/java/com/cxz/wanandroid/webclient/BaseWebClient.kt

@@ -60,7 +60,7 @@ open class BaseWebClient : WebViewClient() {
     }
 
     override fun shouldInterceptRequest(view: WebView?, url: String?): WebResourceResponse? {
-        loge(TAG, "------------>>$url")
+        loge(TAG, "shouldInterceptRequest: $url")
         if (shouldInterceptRequest(Uri.parse(url))) {
             return WebResourceResponse(null, null, null)
         }
@@ -78,12 +78,12 @@ open class BaseWebClient : WebViewClient() {
 
     override fun onPageStarted(view: WebView?, url: String?, favicon: Bitmap?) {
         super.onPageStarted(view, url, favicon)
-        loge(TAG, "onPageStarted---->>$url")
+        loge(TAG, "onPageStarted: $url")
     }
 
     override fun onPageFinished(view: WebView?, url: String?) {
         super.onPageFinished(view, url)
-        loge(TAG, "onPageFinished---->>$url")
+        loge(TAG, "onPageFinished: $url")
     }
 
     override fun onReceivedSslError(view: WebView?, handler: SslErrorHandler?, error: SslError?) {

app/src/main/java/com/cxz/wanandroid/widget/WebContainer.kt

@@ -15,8 +15,7 @@ import com.cxz.wanandroid.utils.SettingUtil
  * @date 2019/11/24
  * @desc WebContainer
  */
-class WebContainer constructor(context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = 0) :
-    CoordinatorLayout(context, attrs, defStyleAttr) {
+class WebContainer : CoordinatorLayout {
 
     private var mDarkTheme: Boolean = false
 
@@ -29,6 +28,12 @@ class WebContainer constructor(context: Context, attrs: AttributeSet? = null, de
         }
     }
 
+    constructor(context: Context) : super(context)
+
+    constructor(context: Context, attrs: AttributeSet) : super(context, attrs)
+
+    constructor(context: Context, attrs: AttributeSet, defStyleAttr: Int) : super(context, attrs, defStyleAttr)
+
     override fun dispatchDraw(canvas: Canvas) {
         super.dispatchDraw(canvas)
         if (mDarkTheme) {

app/src/main/res/layout/activity_content.xml

@@ -3,8 +3,7 @@
     android:id="@+id/cl_main"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/viewBackground"
-    android:orientation="vertical">
+    android:background="@color/viewBackground">
 
     <include layout="@layout/toolbar" />