Bladeren bron

关闭鸿途信达广告;
优化h5缓存

zengjiebin 7 jaren geleden
bovenliggende
commit
8a7f6a0689

+ 2 - 1
app/build.gradle

@@ -448,7 +448,8 @@ dependencies {
     //    implementation 'com.github.yangjie10930:EpMedia:v0.9.5'
 
     //webView 缓存优化初始化 https://github.com/yale8848/CacheWebView
-    implementation 'ren.yale.android:cachewebviewlib:2.1.4'
+//    implementation 'ren.yale.android:cachewebviewlib:2.1.4'
+    implementation(name: 'cachewebviewlib-2.1.8', ext: 'aar')
 
     //GSYVideoPlayer https://github.com/CarGuo/GSYVideoPlayer
     implementation 'com.shuyu:gsyVideoPlayer-java:6.0.2'

BIN
app/libs/cachewebviewlib-2.1.8.aar


+ 1 - 1
app/src/main/java/com/sheep/gamegroup/module/ad_htxd/model/ArticleAd.java

@@ -22,7 +22,7 @@ public class ArticleAd extends Article {
 
     public static final String FEED = "1D0JLRMA102V277730B60000552042FE";
     public static final int INDEX = 4;//放在position为4的位置,即第5个
-    public static final boolean showAd = TestUtil.isSheep();//是否显示广告
+    public static final boolean showAd = false;//TestUtil.isSheep();//是否显示广告
 
     private NativeADDataInfo nativeADDataInfo;
     private PNative pNative;

+ 2 - 2
app/src/main/java/com/sheep/gamegroup/util/TestUtil.java

@@ -1026,7 +1026,7 @@ public class TestUtil {
 
     //开启后可 测试充值与绑定微信和身份信息逻辑 等
     public static boolean isDev() {
-        return BuildConfig.DEBUG;
-//        return false;
+//        return BuildConfig.DEBUG;
+        return false;
     }
 }

+ 11 - 0
app/src/main/java/com/sheep/gamegroup/util/js/BaseActWeb.java

@@ -7,6 +7,7 @@ import com.sheep.gamegroup.absBase.BaseUMActivity;
 import com.sheep.gamegroup.model.entity.UserEntity;
 import com.sheep.gamegroup.util.CommonUtil;
 import com.sheep.gamegroup.util.SysAppUtil;
+import com.sheep.gamegroup.util.TestUtil;
 import com.sheep.gamegroup.util.share.ShareLinkConfig;
 import com.sheep.jiuyan.samllsheep.BuildConfig;
 import com.sheep.jiuyan.samllsheep.R;
@@ -117,14 +118,24 @@ public abstract class BaseActWeb extends BaseUMActivity {
             webViewLoadUrl(webView, extraHeaders, url);
         } else {
             webView.loadUrl(url);
+            if(TestUtil.isDev()){
+                return;
+            }
             WebViewCacheInterceptorInst.getInstance().loadUrl(url, webView.getSettings().getUserAgentString());
         }
     }
     protected void webViewLoadUrl(com.tencent.smtt.sdk.WebView webView, Map<String, String> map, String url){
         webView.loadUrl(url, map);
+        if(TestUtil.isDev()){
+            return;
+        }
         WebViewCacheInterceptorInst.getInstance().loadUrl(url, map, webView.getSettings().getUserAgentString());
     }
     protected void webViewLoadUrl(WebView webView, String url){
+        if(TestUtil.isDev()){
+            webView.loadUrl(url);
+            return;
+        }
         WebViewCacheInterceptorInst.getInstance().loadUrl(webView,url);
     }
 

+ 0 - 4
app/src/main/java/com/sheep/gamegroup/view/activity/ActWebX5.java

@@ -74,7 +74,6 @@ public class ActWebX5 extends BaseActWeb {
     @BindView(R.id.act_web_loading_iv)
     ImageView act_web_loading_iv;
     private WebParams webParams;
-    private WebSettings webViewSettings;
 
     @Override
     protected int getLayoutId() {
@@ -102,8 +101,6 @@ public class ActWebX5 extends BaseActWeb {
                     .setTitleFinish(this);
         }
         initWebViewSettings(mWebView);
-        webViewSettings = mWebView.getSettings();
-        webViewSettings.setJavaScriptCanOpenWindowsAutomatically(true);
         try {
             if (TestUtil.isTest())
                 WebView.setWebContentsDebuggingEnabled(true);
@@ -385,7 +382,6 @@ public class ActWebX5 extends BaseActWeb {
                 loadJs();
             }
         });
-        webViewSettings.setJavaScriptEnabled(true);
 
         if (webParams.isNeedJsInteract()) {
             mWebView.addJavascriptInterface(new KFZSJs(this), "kfzsjs");

+ 17 - 1
app/src/main/java/com/sheep/jiuyan/samllsheep/SheepApp.java

@@ -292,13 +292,29 @@ public class SheepApp extends MultiDexApplication {
         extension.removeExtension("js");
         extension.removeExtension("ico");
         extension.removeExtension("css");
+
+//        extension.removeExtension("png");
+//        extension.removeExtension("jpg");
+//        extension.removeExtension("jpeg");
+//        extension.removeExtension("gif");
+//        extension.removeExtension("bmp");
+//        extension.removeExtension("ttf");
+//        extension.removeExtension("woff");
+//        extension.removeExtension("woff2");
+//        extension.removeExtension("otf");
+//        extension.removeExtension("eot");
+//        extension.removeExtension("svg");
+
         extension.removeExtension("xml");
         extension.removeExtension("swf");
         extension.removeExtension("txt");
         extension.removeExtension("text");
         extension.removeExtension("conf");
         extension.removeExtension("webp");
-        WebViewCacheInterceptorInst.getInstance().init(new WebViewCacheInterceptor.Builder(this).setCacheExtensionConfig(extension).setDebug(BuildConfig.DEBUG).setCacheSize(Long.MAX_VALUE));
+        WebViewCacheInterceptorInst.getInstance().init(new WebViewCacheInterceptor.Builder(this)
+                .setCacheExtensionConfig(extension)
+                .setDebug(BuildConfig.DEBUG)
+                .setCacheSize(Long.MAX_VALUE));
         //GSYVideoPlayer https://github.com/CarGuo/GSYVideoPlayer
         PlayerFactory.setPlayManager(Exo2PlayerManager.class);//EXO模式
 //        PlayerFactory.setPlayManager(SystemPlayerManager.class);//系统模式