fix web x5 conflict with leidian3.44

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

@@ -192,21 +192,21 @@ public class FgtWeb extends BaseFgtWeb {
         webView.setClickable(true);
         WebSettings webSetting = webView.getSettings();
         webSetting.setJavaScriptEnabled(true);
-//        webSetting.setJavaScriptCanOpenWindowsAutomatically(true);
+        webSetting.setJavaScriptCanOpenWindowsAutomatically(true);
         webSetting.setAllowFileAccess(true);
-//        webSetting.setLayoutAlgorithm(WebSettings.LayoutAlgorithm.NARROW_COLUMNS);
+        webSetting.setLayoutAlgorithm(WebSettings.LayoutAlgorithm.NARROW_COLUMNS);
 //        webSetting.setSupportZoom(true);
 //        webSetting.setBuiltInZoomControls(true);
         webSetting.setUseWideViewPort(true);
-//        webSetting.setSupportMultipleWindows(true);
+        webSetting.setSupportMultipleWindows(true);
         // webSetting.setLoadWithOverviewMode(true);
         webSetting.setAppCacheEnabled(true);
         // webSetting.setDatabaseEnabled(true);
         webSetting.setDomStorageEnabled(true);
-//        webSetting.setGeolocationEnabled(true);
+        webSetting.setGeolocationEnabled(true);
         webSetting.setAppCacheMaxSize(Long.MAX_VALUE);
         // webSetting.setPageCacheCapacity(IX5WebSettings.DEFAULT_CACHE_CAPACITY);
-//        webSetting.setPluginState(WebSettings.PluginState.ON_DEMAND);
+        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);
 

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

@@ -197,21 +197,21 @@ public class FgtWebX5 extends BaseFgtWebX5 {
         webView.setClickable(true);
         WebSettings webSetting = webView.getSettings();
         webSetting.setJavaScriptEnabled(true);
-//        webSetting.setJavaScriptCanOpenWindowsAutomatically(true);
+        webSetting.setJavaScriptCanOpenWindowsAutomatically(true);
         webSetting.setAllowFileAccess(true);
-//        webSetting.setLayoutAlgorithm(WebSettings.LayoutAlgorithm.NARROW_COLUMNS);
+        webSetting.setLayoutAlgorithm(WebSettings.LayoutAlgorithm.NARROW_COLUMNS);
 //        webSetting.setSupportZoom(true);
 //        webSetting.setBuiltInZoomControls(true);
         webSetting.setUseWideViewPort(true);
-//        webSetting.setSupportMultipleWindows(true);
+        webSetting.setSupportMultipleWindows(true);
         // webSetting.setLoadWithOverviewMode(true);
         webSetting.setAppCacheEnabled(true);
         // webSetting.setDatabaseEnabled(true);
         webSetting.setDomStorageEnabled(true);
-//        webSetting.setGeolocationEnabled(true);
+        webSetting.setGeolocationEnabled(true);
         webSetting.setAppCacheMaxSize(Long.MAX_VALUE);
         // webSetting.setPageCacheCapacity(IX5WebSettings.DEFAULT_CACHE_CAPACITY);
-//        webSetting.setPluginState(WebSettings.PluginState.ON_DEMAND);
+        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);
 

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

@@ -101,15 +101,4 @@ public class DeviceUtil {
         return uniqueId.toString() + "";
     }
 
-    public static boolean isNotX86() {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-            for (String abi : Build.SUPPORTED_ABIS) {
-                if ("x86".equalsIgnoreCase(abi)) {
-                    return false;
-                }
-            }
-        }
-        return true;
-    }
-
 }

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

@@ -181,6 +181,7 @@ import com.sheep.jiuyan.samllsheep.utils.G;
 import com.sheep.jiuyan.samllsheep.utils.PackageUtil;
 import com.sheep.jiuyan.samllsheep.utils.SpUtils;
 import com.sheep.jiuyan.samllsheep.utils.TitleBarUtils;
+import com.snail.antifake.jni.EmulatorDetectUtil;
 import com.youmi.android.offer.BaseActYmPermissionCheck;
 import com.youmi.android.offer.YmConfig;
 import com.zhy.http.okhttp.OkHttpUtils;
@@ -1023,10 +1024,10 @@ public class Jump2View {
             return;
         }
         Intent intent = null;
-        if (DeviceUtil.isNotX86()) {
-            intent = new Intent(context, ActWebX5.class);
-        } else {
+        if (EmulatorDetectUtil.isEmulator()) {
             intent = new Intent(context, ActWeb.class);
+        } else {
+            intent = new Intent(context, ActWebX5.class);
         }
         intent.putExtra(WebParams.class.getSimpleName(), webParams);
         if (webParams.isForResult()) {

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

@@ -11,6 +11,7 @@ import com.sheep.gamegroup.view.fragment.FgtPersonalCenter;
 import com.sheep.gamegroup.view.fragment.FgtSmallSheep;
 import com.sheep.jiuyan.samllsheep.Config;
 import com.sheep.jiuyan.samllsheep.R;
+import com.snail.antifake.jni.EmulatorDetectUtil;
 
 /**
  * Created by realicing on 2018/1/4.
@@ -23,12 +24,13 @@ public enum MainTab {
         public Fragment getFragment() {
             return new FgtSmallSheep();
         }
+
         @Override
         public int getDrawableId() {
             return R.drawable.drawable_selector_task;
         }
     },
-//    FgtMainAudit(R.string.main_tab_audit) {
+    //    FgtMainAudit(R.string.main_tab_audit) {
 //        @Override
 //        public Fragment getFragment() {
 //            return new FgtMainAudit();
@@ -54,10 +56,10 @@ public enum MainTab {
         @Override
         public Fragment getFragment() {
 //            return SkinUtil.isLoadNewYearSkin() ? new FgtAskGetMoneyNewYear() : new FgtAskGetMoney();
-            if(DeviceUtil.isNotX86()) {
-                return FgtWebX5.newInstance(new WebParams(Config.getUrlByPath(Config.PATH_SMALL_SHEEP_INVITATION_HOME), "邀请赚钱"));
-            }else{
+            if (EmulatorDetectUtil.isEmulator()) {
                 return FgtWeb.newInstance(new WebParams(Config.getUrlByPath(Config.PATH_SMALL_SHEEP_INVITATION_HOME), "邀请赚钱"));
+            } else {
+                return FgtWebX5.newInstance(new WebParams(Config.getUrlByPath(Config.PATH_SMALL_SHEEP_INVITATION_HOME), "邀请赚钱"));
             }
         }
 

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

@@ -191,21 +191,21 @@ public class ActWeb extends BaseActWeb {
         webView.setClickable(true);
         WebSettings webSetting = webView.getSettings();
         webSetting.setJavaScriptEnabled(true);
-//        webSetting.setJavaScriptCanOpenWindowsAutomatically(true);
+        webSetting.setJavaScriptCanOpenWindowsAutomatically(true);
         webSetting.setAllowFileAccess(true);
-//        webSetting.setLayoutAlgorithm(WebSettings.LayoutAlgorithm.NARROW_COLUMNS);
+        webSetting.setLayoutAlgorithm(WebSettings.LayoutAlgorithm.NARROW_COLUMNS);
 //        webSetting.setSupportZoom(true);
 //        webSetting.setBuiltInZoomControls(true);
         webSetting.setUseWideViewPort(true);
-//        webSetting.setSupportMultipleWindows(true);
+        webSetting.setSupportMultipleWindows(true);
         // webSetting.setLoadWithOverviewMode(true);
         webSetting.setAppCacheEnabled(true);
         // webSetting.setDatabaseEnabled(true);
         webSetting.setDomStorageEnabled(true);
-//        webSetting.setGeolocationEnabled(true);
+        webSetting.setGeolocationEnabled(true);
         webSetting.setAppCacheMaxSize(Long.MAX_VALUE);
         // webSetting.setPageCacheCapacity(IX5WebSettings.DEFAULT_CACHE_CAPACITY);
-//        webSetting.setPluginState(WebSettings.PluginState.ON_DEMAND);
+        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);
 

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

@@ -195,21 +195,21 @@ public class ActWebX5 extends BaseActWebX5 {
         webView.setClickable(true);
         WebSettings webSetting = webView.getSettings();
         webSetting.setJavaScriptEnabled(true);
-//        webSetting.setJavaScriptCanOpenWindowsAutomatically(true);
+        webSetting.setJavaScriptCanOpenWindowsAutomatically(true);
         webSetting.setAllowFileAccess(true);
-//        webSetting.setLayoutAlgorithm(WebSettings.LayoutAlgorithm.NARROW_COLUMNS);
+        webSetting.setLayoutAlgorithm(WebSettings.LayoutAlgorithm.NARROW_COLUMNS);
 //        webSetting.setSupportZoom(true);
 //        webSetting.setBuiltInZoomControls(true);
         webSetting.setUseWideViewPort(true);
-//        webSetting.setSupportMultipleWindows(true);
+        webSetting.setSupportMultipleWindows(true);
         // webSetting.setLoadWithOverviewMode(true);
         webSetting.setAppCacheEnabled(true);
         // webSetting.setDatabaseEnabled(true);
         webSetting.setDomStorageEnabled(true);
-//        webSetting.setGeolocationEnabled(true);
+        webSetting.setGeolocationEnabled(true);
         webSetting.setAppCacheMaxSize(Long.MAX_VALUE);
         // webSetting.setPageCacheCapacity(IX5WebSettings.DEFAULT_CACHE_CAPACITY);
-//        webSetting.setPluginState(WebSettings.PluginState.ON_DEMAND);
+        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);
 

app/src/main/java/com/snail/antifake/jni/EmulatorDetectUtil.java

@@ -0,0 +1,25 @@
+package com.snail.antifake.jni;
+
+/**
+ * Author: snail
+ * Data: 2017/7/20 下午4:46
+ * Des:
+ * version:
+ */
+
+public class EmulatorDetectUtil {
+
+    static {
+        System.loadLibrary("emulator_check");
+    }
+
+    public static native boolean detect();
+
+    public static boolean isEmulator() {
+        return detect();
+    }
+
+    public void throwNativeCrash(){
+
+    }
+}