recover to main branch

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

@@ -183,7 +183,7 @@ public class FgtWebX5 extends BaseFgtWebX5 {
         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);
+        webSetting.setCacheMode(WebSettings.LOAD_NO_CACHE);
 
         // this.getSettingsExtension().setPageCacheCapacity(IX5WebSettings.DEFAULT_CACHE_CAPACITY);//extension
         // settings 的设计
@@ -319,22 +319,22 @@ public class FgtWebX5 extends BaseFgtWebX5 {
         });
         mWebView.setWebViewClient(new WebViewClient() {
 
-//            @Override
-//            public WebResourceResponse shouldInterceptRequest(WebView webView, String inUrl) {
-//                if (finallyUrl.equalsIgnoreCase(inUrl)) {
-//                    return null;
-//                }
-//                return WebResourceResponseAdapter.adapter(WebViewCacheInterceptorInst.getInstance().interceptRequest(inUrl));
-//            }
-//
-//            @Override
-//            public WebResourceResponse shouldInterceptRequest(WebView webView, WebResourceRequest webResourceRequest) {
-//                String fileUrl = webResourceRequest.getUrl().toString();
-//                if (finallyUrl.equalsIgnoreCase(fileUrl)) {
-//                    return null;
-//                }
-//                return WebResourceResponseAdapter.adapter(WebViewCacheInterceptorInst.getInstance().interceptRequest(WebResourceRequestAdapter.adapter(webResourceRequest)));
-//            }
+            @Override
+            public WebResourceResponse shouldInterceptRequest(WebView webView, String inUrl) {
+                if (finallyUrl.equalsIgnoreCase(inUrl)) {
+                    return null;
+                }
+                return WebResourceResponseAdapter.adapter(WebViewCacheInterceptorInst.getInstance().interceptRequest(inUrl));
+            }
+
+            @Override
+            public WebResourceResponse shouldInterceptRequest(WebView webView, WebResourceRequest webResourceRequest) {
+                String fileUrl = webResourceRequest.getUrl().toString();
+                if (finallyUrl.equalsIgnoreCase(fileUrl)) {
+                    return null;
+                }
+                return WebResourceResponseAdapter.adapter(WebViewCacheInterceptorInst.getInstance().interceptRequest(WebResourceRequestAdapter.adapter(webResourceRequest)));
+            }
 
             @Override
             public boolean shouldOverrideUrlLoading(WebView view, String 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();