diff --git a/.idea/misc.xml b/.idea/misc.xml index fbb6828..5d19981 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -37,7 +37,7 @@ - + diff --git a/CZBaseDevTool/src/main/java/com/xinyi/czbasedevtool/base/manager/PermissionManager.java b/CZBaseDevTool/src/main/java/com/xinyi/czbasedevtool/base/manager/PermissionManager.java index a9713b8..8258c1a 100644 --- a/CZBaseDevTool/src/main/java/com/xinyi/czbasedevtool/base/manager/PermissionManager.java +++ b/CZBaseDevTool/src/main/java/com/xinyi/czbasedevtool/base/manager/PermissionManager.java @@ -120,11 +120,12 @@ public boolean isFloatWindowOpAllowed(Context context) { if (version >= 19) { return checkOp(context, 24); // AppOpsManager.OP_SYSTEM_ALERT_WINDOW } else { - if ((context.getApplicationInfo().flags & 1 << 27) == 1 << 27) { - return true; - } else { - return false; - } +// if ((context.getApplicationInfo().flags & 1 << 27) == 1 << 27) { +// return true; +// } else { +// return false; +// } + return true; } } diff --git a/CZBaseDevTool/src/main/java/com/xinyi/czbasedevtool/base/manager/ui_about/dialog/MaterialDialogFactory.java b/CZBaseDevTool/src/main/java/com/xinyi/czbasedevtool/base/manager/ui_about/dialog/MaterialDialogFactory.java index 30fc943..d87ba6d 100644 --- a/CZBaseDevTool/src/main/java/com/xinyi/czbasedevtool/base/manager/ui_about/dialog/MaterialDialogFactory.java +++ b/CZBaseDevTool/src/main/java/com/xinyi/czbasedevtool/base/manager/ui_about/dialog/MaterialDialogFactory.java @@ -187,30 +187,18 @@ public MaterialDialog createChoiceListMaterialDialog(String title,int itemRes,S * @param content */ public MaterialDialog createProgressMaterialDialog(String title,String content){ -// if(progressMaterialDialogBuilder== null){ -// progressMaterialDialogBuilder = new MaterialDialog.Builder(mContext); -// }else{ -// if(progressMaterialDialogBuilder.getContext() != mContext){ -// progressMaterialDialogBuilder = new MaterialDialog.Builder(mContext); -// } -// } progressMaterialDialogBuilder = new MaterialDialog.Builder(mContext); - - if(progressMaterialDialog != null){ - progressMaterialDialog.setTitle(title); - progressMaterialDialog.setContent(content); - - if(!progressMaterialDialog.isShowing()){ - progressMaterialDialog.show(); - } - return progressMaterialDialog; - } - - progressMaterialDialog = progressMaterialDialogBuilder.title(title) + MaterialDialog.Builder builder = progressMaterialDialogBuilder.title(title) .content(content) .progress(true, 0) - .show(); + .title(title) + .content(content); + progressMaterialDialog = builder.build(); + if(!progressMaterialDialog.isShowing()){ + progressMaterialDialog.show(); + } + return progressMaterialDialog; } diff --git a/CZBaseDevTool/src/main/java/com/xinyi/czbasedevtool/base/utils/RegularUtil.java b/CZBaseDevTool/src/main/java/com/xinyi/czbasedevtool/base/utils/RegularUtil.java index 8b74003..b761851 100644 --- a/CZBaseDevTool/src/main/java/com/xinyi/czbasedevtool/base/utils/RegularUtil.java +++ b/CZBaseDevTool/src/main/java/com/xinyi/czbasedevtool/base/utils/RegularUtil.java @@ -20,7 +20,7 @@ public static boolean isNumeric(String str){ public static boolean isEmail(String email){ return check(email,"^([a-z0-9A-Z]+[-|_|\\.]?)+[a-z0-9A-Z]@([a-z0-9A-Z]+(-[a-z0-9A-Z]+)?\\.)+[a-zA-Z]{2,}$"); } - + public static boolean check(String input ,String reg){ Pattern pattern = Pattern.compile(reg); Matcher isNum = pattern.matcher(input);