Merge branch 'sheep_develop' of 10.8.230.114:xmy_android/small_sheep_android into sheep_develop

app/src/main/java/com/sheep/gamegroup/view/activity/ActWeb.java

@@ -59,7 +59,7 @@ public class ActWeb extends BaseActWeb {
 
     @Override
     protected int getLayoutId() {
-        return R.layout.act_web_x5;
+        return R.layout.act_web;
     }
 
     @RequiresApi(api = Build.VERSION_CODES.KITKAT)
@@ -140,7 +140,7 @@ public class ActWeb extends BaseActWeb {
         // webSetting.setPageCacheCapacity(IX5WebSettings.DEFAULT_CACHE_CAPACITY);
         webSetting.setPluginState(WebSettings.PluginState.ON_DEMAND);
         // webSetting.setRenderPriority(WebSettings.RenderPriority.HIGH);
-        webSetting.setCacheMode(WebSettings.LOAD_NO_CACHE);
+        webSetting.setCacheMode(WebSettings.LOAD_CACHE_ELSE_NETWORK);
 
         // this.getSettingsExtension().setPageCacheCapacity(IX5WebSettings.DEFAULT_CACHE_CAPACITY);//extension
         // settings 的设计

app/src/main/java/com/sheep/gamegroup/view/activity/ActWebX5.java

@@ -141,7 +141,7 @@ public class ActWebX5 extends BaseActWeb {
         // webSetting.setPageCacheCapacity(IX5WebSettings.DEFAULT_CACHE_CAPACITY);
         webSetting.setPluginState(WebSettings.PluginState.ON_DEMAND);
         // webSetting.setRenderPriority(WebSettings.RenderPriority.HIGH);
-        webSetting.setCacheMode(WebSettings.LOAD_NO_CACHE);
+        webSetting.setCacheMode(WebSettings.LOAD_CACHE_ELSE_NETWORK);
 
         // this.getSettingsExtension().setPageCacheCapacity(IX5WebSettings.DEFAULT_CACHE_CAPACITY);//extension
         // settings 的设计

build.gradle

@@ -14,7 +14,7 @@ buildscript {
         classpath 'com.neenbedankt.gradle.plugins:android-apt:+'
         classpath 'org.greenrobot:greendao-gradle-plugin:3.1.0'
         //aria使用本地library时添加的
-        classpath 'com.novoda:bintray-release:0.5.0'
+//        classpath 'com.novoda:bintray-release:0.5.0'
         //Realm数据库
        // classpath "io.realm:realm-gradle-plugin:3.7.0"
         //插件化