fix some bugs

gitxindong · Dec 9, 2017 · effc862 · effc862
1 parent d7f1c07
commit effc862
Show file tree

Hide file tree

Showing 9 changed files with 19 additions and 29 deletions.
diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 # CacheWebView
 
-[![](https://img.shields.io/badge/jcenter-1.2.8-519dd9.svg)](https://bintray.com/yale8848/maven/CacheWebView/1.2.3)
+[![](https://img.shields.io/badge/jcenter-1.2.9-519dd9.svg)](https://bintray.com/yale8848/maven/CacheWebView/1.2.3)
 
   [English](https://github.com/yale8848/CacheWebView/blob/master/README_EN.md)
 
@@ -18,7 +18,7 @@
 ### 引入库
 
 ```groovy
-compile 'ren.yale.android:cachewebviewlib:1.2.8'
+compile 'ren.yale.android:cachewebviewlib:1.2.9'
 ```
 
 ### 修改代码

diff --git a/README_EN.md b/README_EN.md
@@ -1,6 +1,6 @@
 # CacheWebView
 
-[![](https://img.shields.io/badge/jcenter-1.2.8-519dd9.svg)](https://bintray.com/yale8848/maven/CacheWebView/1.2.3)
+[![](https://img.shields.io/badge/jcenter-1.2.9-519dd9.svg)](https://bintray.com/yale8848/maven/CacheWebView/1.2.3)
 
   CacheWebView is a custom implement of Android WebView, through intercept each request to create ram cache(LRU) and disk cache(LRU). It beyond system WebView cache space
   limit, let cache config more simple ,fast and flexible. Visit website by offline.
@@ -17,7 +17,7 @@
 ### use lib
 
 ```groovy
-compile 'ren.yale.android:cachewebviewlib:1.2.8'
+compile 'ren.yale.android:cachewebviewlib:1.2.9'
 ```
 
 ### Change code

diff --git a/app/src/main/java/ren/yale/android/cachewebview/Main2Activity.java b/app/src/main/java/ren/yale/android/cachewebview/Main2Activity.java
@@ -17,11 +17,12 @@
 
 import java.io.File;
 
+import ren.yale.android.cachewebviewlib.CacheWebView;
 import ren.yale.android.cachewebviewlib.utils.NetworkUtils;
 
 public class Main2Activity extends Activity {
 
-    private WebView mWebView;
+    private CacheWebView mWebView;
     public static final String KEY_URL="";
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -48,14 +49,14 @@ public void onPageFinished(WebView view, String url) {
             @TargetApi(Build.VERSION_CODES.LOLLIPOP)
             @Override
             public boolean shouldOverrideUrlLoading(WebView view, WebResourceRequest request) {
-                view.loadUrl(request.getUrl().toString());
-                return true;
+                //view.loadUrl(request.getUrl().toString());
+                return super.shouldOverrideUrlLoading(view,request);
             }
 
             @Override
             public boolean shouldOverrideUrlLoading(WebView view, String url) {
-                view.loadUrl(url);
-                return true;
+                //view.loadUrl(url);
+                return super.shouldOverrideUrlLoading(view,url);
             }
 
 

diff --git a/app/src/main/java/ren/yale/android/cachewebview/MainActivity.java b/app/src/main/java/ren/yale/android/cachewebview/MainActivity.java
@@ -74,7 +74,7 @@ public boolean shouldOverrideUrlLoading(WebView view, String url) {
                     CacheWebView v = (CacheWebView) view;
                     view.loadUrl(url,getHeaderMap(url));
                 }
-                return true;
+                return super.shouldOverrideUrlLoading(view,url);
             }
 
             @Override

diff --git a/app/src/main/res/layout/activity_main2.xml b/app/src/main/res/layout/activity_main2.xml
@@ -7,10 +7,10 @@
     android:layout_height="match_parent"
     tools:context="ren.yale.android.cachewebview.Main2Activity">
 
-    <WebView
+    <ren.yale.android.cachewebviewlib.CacheWebView
         android:id="@+id/webview"
         android:layout_width="match_parent"
         android:layout_height="match_parent">
-    </WebView>
+    </ren.yale.android.cachewebviewlib.CacheWebView>
 
 </LinearLayout>
diff --git a/cachewebviewlib/config/bintray.gradle b/cachewebviewlib/config/bintray.gradle
@@ -4,7 +4,7 @@ apply plugin: 'com.github.dcendents.android-maven'
 apply plugin: 'com.jfrog.bintray'
 
 
-version = '1.2.8'
+version = '1.2.9'
 
 repositories {
     jcenter()

diff --git a/cachewebviewlib/src/main/java/ren/yale/android/cachewebviewlib/CacheWebViewClient.java b/cachewebviewlib/src/main/java/ren/yale/android/cachewebviewlib/CacheWebViewClient.java
@@ -143,12 +143,7 @@ public String getHost(String u){
     public boolean shouldOverrideUrlLoading(WebView view, String url) {
 
         if (mCustomWebViewClient!=null){
-            boolean load =  mCustomWebViewClient.shouldOverrideUrlLoading(view,url);
-            if (!load){
-
-                view.loadUrl(url);
-            }
-            return load;
+            return mCustomWebViewClient.shouldOverrideUrlLoading(view,url);
         }
         view.loadUrl(url);
         return true;
@@ -158,11 +153,7 @@ public boolean shouldOverrideUrlLoading(WebView view, String url) {
     public boolean shouldOverrideUrlLoading(WebView view, WebResourceRequest request) {
         if (mCustomWebViewClient!=null){
             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
-                boolean load =   mCustomWebViewClient.shouldOverrideUrlLoading(view,request);
-                if (!load){
-                    view.loadUrl(request.getUrl().toString());
-                }
-                return load;
+                return  mCustomWebViewClient.shouldOverrideUrlLoading(view,request);
             }
         }
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {

diff --git a/cachewebviewlib/src/main/java/ren/yale/android/cachewebviewlib/StaticRes.java b/cachewebviewlib/src/main/java/ren/yale/android/cachewebviewlib/StaticRes.java
@@ -86,15 +86,13 @@ private void add(HashSet set,String extension){
         if (TextUtils.isEmpty(extension)){
             return ;
         }
-        extension = extension.replaceAll("\\.","");
-        set.add(extension.toLowerCase().trim());
+        set.add(extension.replace(".","").toLowerCase().trim());
     }
     private void remove(HashSet set,String extension){
         if (TextUtils.isEmpty(extension)){
             return;
         }
-        extension = extension.replaceAll("\\.","");
-        set.remove(extension.toLowerCase().trim());
+        set.remove(extension.replace(".","").toLowerCase().trim());
     }
     public StaticRes addExtension(String extension){
         add(STATIC,extension);

diff --git a/gradle.properties b/gradle.properties
@@ -15,4 +15,4 @@ org.gradle.jvmargs=-Xmx1536m
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 # org.gradle.parallel=true
-org.gradle.java.home=C:\\Program Files\\Java\\jdk1.8.0_92
+#org.gradle.java.home=C:\\Program Files\\Java\\jdk1.8.0_92