fixed webview cache bug

app/build.gradle

@@ -302,13 +302,6 @@ dependencies {
         exclude group: 'com.squareup.okhttp3', module: 'okhttp'
     }
 
-    //    implementation 'com.kf.framework:kf-utils:latest.integration@aar'
-
-    //    implementation 'com.kf.framework:kf-utils:1.4.5@aar'
-
-    //    implementation 'com.kf.framework:volleyplus:latest.integration@aar'
-
-    //    implementation 'com.kf.framework:volleyplus:1.4.5@aar'
     implementation "com.android.support:support-annotations:$supportLibVersion"
     implementation("com.android.support:recyclerview-v7:$supportLibVersion") {
         exclude group: 'com.android.support', module: 'support-annotations'
@@ -316,13 +309,6 @@ dependencies {
         exclude group: 'com.android.support', module: 'support-core-ui'
     }
 
-    //    implementation project(':datashare')
-
-    //    implementation files('libs/jackson-core-2.2.1.jar')
-
-    //    implementation files('libs/jackson-dataformat-xml-2.1.2.jar')
-
-    //    implementation 'io.reactivex:rxandroid:1.2.1'
     implementation('com.github.ithedan:TextViewDrawable:v1.0') {
         exclude group: 'com.android.support', module: 'appcompat-v7'
     }
@@ -404,29 +390,6 @@ dependencies {
     implementation(name: 'YoumiSdk_v8.3.0_2018-09-20', ext: 'aar')
     implementation project(':WaterWaveProgress')
 
-    //AndroidVideoCache 网络视频缓存 https://github.com/danikula/AndroidVideoCache
-
-    //    implementation 'com.danikula:videocache:2.7.1'
-
-    //视频图片选择
-
-    //    implementation ('cn.finalteam.rxgalleryfinal:library:1.1.3') {
-
-    //        exclude group: 'com.android.support', module: 'appcompat-v7'
-
-    //        exclude group: 'io.reactivex.rxjava2', module: 'rxandroid'
-
-    //        exclude group: 'io.reactivex.rxjava2', module: 'rxjava'
-
-    //        exclude group: 'com.yalantis', module: 'ucrop'
-
-    //        exclude group: 'com.android.support', module: 'recyclerview-v7'
-
-    //    }
-
-    //    implementation "com.android.support:exifinterface:$supportLibVersion"
-
-    //    implementation project(':RxGalleryFinal')
     implementation "com.android.support:exifinterface:$supportLibVersion"
     implementation('com.qiniu:qiniu-android-sdk:7.3.13') {
         exclude group: 'com.squareup.okhttp3', module: 'okhttp'

app/src/main/java/com/sheep/gamegroup/model/api/ApiService.java

@@ -1930,7 +1930,7 @@ public interface ApiService {
     Observable<BaseMessage> needPayPwd();
 
     @POST("app/user/check_pay_pwd")
-    Observable<BaseMessage> checkPayPwd(@Body JSONObject jsonObject);
+    Observable<BaseMessage> checkPayPwd(@Header("Authorization")String token, @Body JSONObject jsonObject);
 
     @POST("app/user/set_pay_pwd")
     Observable<BaseMessage> setPayPwd(@Body JSONObject jsonObject);

app/src/main/java/com/sheep/gamegroup/module/pay/activity/ActPayPassword.java

@@ -73,7 +73,7 @@ public class ActPayPassword extends BaseContainerActivity {
         } else if (action == ACTION_SET_PWD) {
             return new SetPasswordFragment();
         } else if (action == ACTION_VERIFY_PAY_PWD) {
-            return VerifyPayPwdFragment.newInstance(getIntent().getStringExtra("ext"));
+            return VerifyPayPwdFragment.newInstance(getIntent().getStringExtra("token"), getIntent().getStringExtra("ext"));
         } else {
             return null;
         }
@@ -105,6 +105,7 @@ public class ActPayPassword extends BaseContainerActivity {
             if (user.hasPayPwd()) {
                 Intent in = new Intent(activity, ActPayPassword.class);
                 in.putExtra("action", ACTION_VERIFY_PAY_PWD);
+                in.putExtra("token", token);
                 in.putExtra("ext", ext);
                 activity.startActivityForResult(in, 3);
                 callback.callback(true);

app/src/main/java/com/sheep/gamegroup/module/pay/fragment/VerifyPayPwdFragment.java

@@ -27,10 +27,12 @@ public class VerifyPayPwdFragment extends AbsConfirmFragment {
     TextView msgView;
 
     private String ext;
+    private String token;
 
-    public static VerifyPayPwdFragment newInstance(String ext) {
+    public static VerifyPayPwdFragment newInstance(String token, String ext) {
         VerifyPayPwdFragment fragment = new VerifyPayPwdFragment();
         fragment.ext = ext;
+        fragment.token = token;
         return fragment;
     }
 
@@ -65,7 +67,7 @@ public class VerifyPayPwdFragment extends AbsConfirmFragment {
         }
         JSONObject jsonObject = new JSONObject();
         jsonObject.put("pay_pwd", pwdBox.getText().toString());
-        SheepApp.getInstance().getNetComponent().getApiService().checkPayPwd(jsonObject)
+        SheepApp.getInstance().getNetComponent().getApiService().checkPayPwd(token, jsonObject)
                 .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
                 .subscribe(new SheepSubscriber<BaseMessage>(SheepApp.getInstance()) {

app/src/main/java/com/sheep/gamegroup/module/webview/fragment/FgtWeb.java

@@ -191,7 +191,7 @@ public class FgtWeb extends BaseFgtWeb {
         // webSetting.setPageCacheCapacity(IX5WebSettings.DEFAULT_CACHE_CAPACITY);
         webSetting.setPluginState(WebSettings.PluginState.ON_DEMAND);
         // webSetting.setRenderPriority(WebSettings.RenderPriority.HIGH);
-        webSetting.setCacheMode(NetUtil.CAN_CONNECT_SERVICE ? WebSettings.LOAD_DEFAULT : WebSettings.LOAD_CACHE_ELSE_NETWORK);
+        webSetting.setCacheMode(WebSettings.LOAD_NO_CACHE);
 
         // this.getSettingsExtension().setPageCacheCapacity(IX5WebSettings.DEFAULT_CACHE_CAPACITY);//extension
         // settings 的设计

app/src/main/java/com/sheep/gamegroup/module/webview/fragment/FgtWebX5.java

@@ -84,6 +84,8 @@ public class FgtWebX5 extends BaseFgtWebX5 {
     ImageView act_web_loading_iv;
     protected WebParams webParams;
 
+    private String finallyUrl;
+
     @Override
     public int getLayoutId() {
         return R.layout.fgt_web_x5;
@@ -170,14 +172,15 @@ public class FgtWebX5 extends BaseFgtWebX5 {
         webSetting.setSupportMultipleWindows(true);
         // webSetting.setLoadWithOverviewMode(true);
         webSetting.setAppCacheEnabled(true);
+        webSetting.setAppCacheMaxSize(Long.MAX_VALUE);
         // webSetting.setDatabaseEnabled(true);
         webSetting.setDomStorageEnabled(true);
         webSetting.setGeolocationEnabled(true);
-        webSetting.setAppCacheMaxSize(Long.MAX_VALUE);
         // webSetting.setPageCacheCapacity(IX5WebSettings.DEFAULT_CACHE_CAPACITY);
         webSetting.setPluginState(WebSettings.PluginState.ON_DEMAND);
         // webSetting.setRenderPriority(WebSettings.RenderPriority.HIGH);
-        webSetting.setCacheMode(NetUtil.CAN_CONNECT_SERVICE ? WebSettings.LOAD_DEFAULT : WebSettings.LOAD_CACHE_ELSE_NETWORK);
+//        webSetting.setCacheMode(NetUtil.CAN_CONNECT_SERVICE ? WebSettings.LOAD_DEFAULT : WebSettings.LOAD_CACHE_ELSE_NETWORK);
+        webSetting.setCacheMode(WebSettings.LOAD_NO_CACHE);
 
         // this.getSettingsExtension().setPageCacheCapacity(IX5WebSettings.DEFAULT_CACHE_CAPACITY);//extension
         // settings 的设计
@@ -319,23 +322,21 @@ public class FgtWebX5 extends BaseFgtWebX5 {
             }
         });
         mWebView.setWebViewClient(new WebViewClient() {
+
             @Override
-            public WebResourceResponse shouldInterceptRequest(WebView webView, String s) {
-                if (TestUtil.isDev()) {
-                    return super.shouldInterceptRequest(webView, s);
+            public WebResourceResponse shouldInterceptRequest(WebView webView, String inUrl) {
+                if (finallyUrl.equalsIgnoreCase(inUrl)) {
+                    return null;
                 }
-                if (s.contains("ssnocache=1")) return null;
-                LogUtil.println("ActWebX5", "shouldInterceptRequest from cache", url);
-                return WebResourceResponseAdapter.adapter(WebViewCacheInterceptorInst.getInstance().interceptRequest(s));
+                return WebResourceResponseAdapter.adapter(WebViewCacheInterceptorInst.getInstance().interceptRequest(inUrl));
             }
 
             @Override
             public WebResourceResponse shouldInterceptRequest(WebView webView, WebResourceRequest webResourceRequest) {
-                if (TestUtil.isDev()) {
-                    return super.shouldInterceptRequest(webView, webResourceRequest);
+                String fileUrl = webResourceRequest.getUrl().toString();
+                if (finallyUrl.equalsIgnoreCase(fileUrl)) {
+                    return null;
                 }
-                if (url.contains("ssnocache=1")) return null;
-                LogUtil.println("ActWebX5", "shouldInterceptRequest from cache", url);
                 return WebResourceResponseAdapter.adapter(WebViewCacheInterceptorInst.getInstance().interceptRequest(WebResourceRequestAdapter.adapter(webResourceRequest)));
             }
 
@@ -379,6 +380,7 @@ public class FgtWebX5 extends BaseFgtWebX5 {
                 } else if (url.startsWith("https://wx.tenpay.com")) {
                     Map<String, String> extraHeaders = new HashMap<>();
                     extraHeaders.put("Referer", "http://17xmy.com");
+                    finallyUrl = url;
                     webViewLoadUrl(view, extraHeaders, url);
                     return true;
                 } else if (url.contains("kfzs.com")
@@ -386,6 +388,7 @@ public class FgtWebX5 extends BaseFgtWebX5 {
                         || (url.startsWith("http://10.8.") && TestUtil.isDev())) {
                     Map<String, String> extraHeaders = new HashMap<>();
                     extraHeaders.put("Referer", "http://kfzs.com");
+                    finallyUrl = url;
                     webViewLoadUrl(view, extraHeaders, url);
                     return true;
                 } else {
@@ -427,8 +430,10 @@ public class FgtWebX5 extends BaseFgtWebX5 {
                 loadUrl = StringUtils.addUrlQuery(loadUrl, webParams.getInvitationCodeKey(), DataUtil.getInstance().getInvitationCode());
             }
             LogUtil.println("ActWebX5 loadUrl = " + loadUrl);
+            finallyUrl = loadUrl;
             webViewLoadUrl(mWebView, loadUrl);
         } else {
+            finallyUrl = url;
             webViewLoadUrl(mWebView, url);
         }
     }

app/src/main/java/com/sheep/gamegroup/util/Jump2View.java

@@ -397,7 +397,7 @@ public class Jump2View {
      * @param object
      */
     public void goHomePageView(final Activity context, Object object) {
-        final Intent intent = new Intent(context, ActTest.class).setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK);
+        final Intent intent = new Intent(context, ActMain.class).setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK);
         if (object instanceof String) {
             //统计用户登录信息
             UMConfigUtils.onProfileSignIn();

app/src/main/java/com/sheep/jiuyan/samllsheep/SheepApp.java

@@ -273,9 +273,9 @@ public class SheepApp extends MultiDexApplication {
         CacheExtensionConfig extension = new CacheExtensionConfig();
         extension.removeExtension("html");
         extension.removeExtension("htm");
-        extension.removeExtension("js");
-        extension.removeExtension("ico");
-        extension.removeExtension("css");
+//        extension.removeExtension("js");
+//        extension.removeExtension("ico");
+//        extension.removeExtension("css");
 
 //        extension.removeExtension("png");
 //        extension.removeExtension("jpg");