check x86

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

@@ -19,8 +19,8 @@ public class DeviceUtil {
 
     private static DeviceUtil deviceUtil;
 
-    public static DeviceUtil getInstance(){
-        if(deviceUtil == null){
+    public static DeviceUtil getInstance() {
+        if (deviceUtil == null) {
             deviceUtil = new DeviceUtil();
         }
         return deviceUtil;
@@ -32,15 +32,15 @@ public class DeviceUtil {
 //            return getInstance().getRandomId();
 //        }
         String deviceId = Settings.Secure.getString(context.getContentResolver(), Settings.Secure.ANDROID_ID);
-        if(TextUtils.isEmpty(deviceId)){
+        if (TextUtils.isEmpty(deviceId)) {
             try {
                 deviceId = DeviceIDUtil.getDeviceId(context);
             } catch (Exception ignore) {
             }
         }
-        if(TextUtils.isEmpty(deviceId)){
+        if (TextUtils.isEmpty(deviceId)) {
             deviceId = SpUtils.getDeviceIds(context);
-            if(TextUtils.isEmpty(deviceId)){
+            if (TextUtils.isEmpty(deviceId)) {
                 deviceId = getInstance().getRandomId();
                 SpUtils.saveDeviceIds(context, deviceId);
             }
@@ -50,19 +50,20 @@ public class DeviceUtil {
 
     /**
      * 随机生成
+     *
      * @return
      */
-    public String getRandomId(){
+    public String getRandomId() {
         Long h = System.currentTimeMillis();//获得当前时间的毫秒数
         String str = h.toString();//转化为字符串
         int i = str.length();//总长度
-        int j = i-7;//用来取此字符串的末尾7位数，因为前面的数是年份什么的基本不变，我们只用后面的7位
-        char[] charArray = str.substring(j,i).toCharArray();//将取到的7位数做成数组
+        int j = i - 7;//用来取此字符串的末尾7位数，因为前面的数是年份什么的基本不变，我们只用后面的7位
+        char[] charArray = str.substring(j, i).toCharArray();//将取到的7位数做成数组
         //将26位字母做成数组
-        String [] arr = {"a", "b", "c", "d","e", "f", "g",
-                "h","i","g", "k", "l","m", "n",
-                "o", "p","q", "r", "s", "t",
-                "u", "v", "w", "x","y", "z"};
+        String[] arr = {"a", "b", "c", "d", "e", "f", "g",
+                "h", "i", "g", "k", "l", "m", "n",
+                "o", "p", "q", "r", "s", "t",
+                "u", "v", "w", "x", "y", "z"};
         //将字母数组随机取3个字母组成一个字符串，一共组成3个字符串放到目标数组target中
         StringBuffer uniqueId = new StringBuffer();//用于生成唯一ID
         Random random = new Random();//用于取随机数和布尔值
@@ -71,48 +72,41 @@ public class DeviceUtil {
         int zimucount = 0;//用来控制插入字母的总数，别超过9 7个数字加上9个字母组合
         boolean timeflag = true;//判断时间是否插入了7位，默认true为不满
         boolean zimuflag = true;//判断字幕是否插入了9位，默认true为不满
-        while (zimucount<9||timecount<7) {//开始组合
-            if(insertflag){//默认为ture，先加字母，你也可以先加数字
-                if (zimucount<9) {//如果uniqueId插入的字幕总数没超过9个
+        while (zimucount < 9 || timecount < 7) {//开始组合
+            if (insertflag) {//默认为ture，先加字母，你也可以先加数字
+                if (zimucount < 9) {//如果uniqueId插入的字幕总数没超过9个
                     uniqueId.append(arr[random.nextInt(26)]);//则在字母数组中随机选一个插入
                     zimucount++;//对应加1
-                    if(timeflag){//如果时间没有插入满7位则重新抓阄看插入时间还是数字
+                    if (timeflag) {//如果时间没有插入满7位则重新抓阄看插入时间还是数字
                         insertflag = random.nextBoolean();//重置flag，随机产生false还是true
                     }//如果timeflag=false,时间数字已经插入满7位，则不抓阄了。保持insertflag=true
-                }else{//如果已经加够了否则不操作，
+                } else {//如果已经加够了否则不操作，
                     zimuflag = false;//将zimuflag变为已加够，false
                     insertflag = false;//将插入权判断给时间数字
                 }
-            }else{
-                if (timecount<7) {//先加时间转化成的数组，你也可以先加字母
+            } else {
+                if (timecount < 7) {//先加时间转化成的数组，你也可以先加字母
                     //此处取时间数字数组不能用random随机取。那样用时间来生成数组就没意义了
                     uniqueId.append(charArray[timecount]);//不可打乱顺序
                     timecount++;//对应加1
-                    if(zimuflag){//如果字母没有插入满9位则重新抓阄看插入时间还是数字
+                    if (zimuflag) {//如果字母没有插入满9位则重新抓阄看插入时间还是数字
                         insertflag = random.nextBoolean();
                     }//如果zimuflag=false,字幕已经插入满9位，则不抓阄了。保持insertflag=false
-                }else{
+                } else {
                     timeflag = false;//将timeflag变为已加够，false
                     insertflag = true;//将插入权判断给字母
                 }
             }
         }
-        return uniqueId.toString()+"";
+        return uniqueId.toString() + "";
     }
 
-    public static boolean checkCpuArchInfo() {
-        Field[] fields = Build.class.getDeclaredFields();
-        for (Field field : fields) {
-            try {
-                field.setAccessible(true);
-                if (field.getName().contains("CPU_ABI")) {
-                    Object obj = field.get(null);
-                    if (obj != null && "x86".equals(obj.toString())) {
-                        return false;
-                    }
+    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;
                 }
-            } catch (Exception e) {
-                e.printStackTrace();
             }
         }
         return true;

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

@@ -1023,7 +1023,7 @@ public class Jump2View {
             return;
         }
         Intent intent = null;
-        if (DeviceUtil.checkCpuArchInfo()) {
+        if (DeviceUtil.isNotX86()) {
             intent = new Intent(context, ActWebX5.class);
         } else {
             intent = new Intent(context, ActWeb.class);

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

@@ -4,17 +4,13 @@ import android.support.v4.app.Fragment;
 
 import com.sheep.gamegroup.model.entity.WebParams;
 import com.sheep.gamegroup.module.game.fragment.FgtGameCenter;
-import com.sheep.gamegroup.module.skin.util.SkinUtil;
 import com.sheep.gamegroup.module.webview.fragment.FgtWeb;
 import com.sheep.gamegroup.module.webview.fragment.FgtWebX5;
-import com.sheep.gamegroup.view.fragment.FgtAskGetMoney;
-import com.sheep.gamegroup.view.fragment.FgtAskGetMoneyNewYear;
 import com.sheep.gamegroup.view.fragment.FgtFind;
 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.sheep.jiuyan.samllsheep.SheepApp;
 
 /**
  * Created by realicing on 2018/1/4.
@@ -58,7 +54,7 @@ public enum MainTab {
         @Override
         public Fragment getFragment() {
 //            return SkinUtil.isLoadNewYearSkin() ? new FgtAskGetMoneyNewYear() : new FgtAskGetMoney();
-            if(DeviceUtil.checkCpuArchInfo()) {
+            if(DeviceUtil.isNotX86()) {
                 return FgtWebX5.newInstance(new WebParams(Config.getUrlByPath(Config.PATH_SMALL_SHEEP_INVITATION_HOME), "邀请赚钱"));
             }else{
                 return FgtWeb.newInstance(new WebParams(Config.getUrlByPath(Config.PATH_SMALL_SHEEP_INVITATION_HOME), "邀请赚钱"));

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

@@ -111,6 +111,7 @@ public class SplashAct extends BaseActivity implements EasyPermissions.Permissio
 
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
+        
         try {
             super.onCreate(savedInstanceState);
             hideSystemStatusBar();