From cb397cf3325047d5c09a5c4f7e6200dd59489e81 Mon Sep 17 00:00:00 2001 From: limiaolong Date: Sun, 26 Apr 2020 09:53:16 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AF=BC=E5=87=BAaar?= =?UTF-8?q?=E7=9A=84=E7=9B=AE=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../feature/permission/PermissionActivity.kt | 2 +- lib/base/build.gradle | 21 +++++++++++++++++++ lib/common/build.gradle | 19 +++++++++++++++++ 3 files changed, 41 insertions(+), 1 deletion(-) diff --git a/feature/utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/permission/PermissionActivity.kt b/feature/utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/permission/PermissionActivity.kt index e7d3a90ab6..95cf08bc03 100644 --- a/feature/utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/permission/PermissionActivity.kt +++ b/feature/utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/permission/PermissionActivity.kt @@ -92,7 +92,7 @@ class PermissionActivity : CommonActivity() { } )) add(CommonItemSwitch( - R.string.permission_write_settings_status, + R.string.permission_draw_overlays_status, Utils.Supplier { return@Supplier PermissionUtils.isGrantedDrawOverlays() }, diff --git a/lib/base/build.gradle b/lib/base/build.gradle index 20033bc3f0..8ccee4990c 100644 --- a/lib/base/build.gradle +++ b/lib/base/build.gradle @@ -12,4 +12,25 @@ dependencies { api Config.depConfig.swipe_panel.dep api Config.depConfig.eventbus_lib.dep compileOnly Config.depConfig.lib_utildebug_no_op.dep +} + + +android { + buildTypes { + release { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' + android.libraryVariants.all { variant -> + if(variant.name.equalsIgnoreCase("release")) { + variant.outputs.all { output -> + def f = output.outputFileName + if (f != null && f.endsWith('.aar')) { + def fileName = "auc-lib-base-v${defaultConfig.versionName}.aar" + output.outputFileName = fileName + } + } + } + } + } + } } \ No newline at end of file diff --git a/lib/common/build.gradle b/lib/common/build.gradle index c4bb45fba5..5c710103f5 100644 --- a/lib/common/build.gradle +++ b/lib/common/build.gradle @@ -1,4 +1,23 @@ dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) api Config.depConfig.lib_base.dep +} +android { + buildTypes { + release { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' + android.libraryVariants.all { variant -> + if(variant.name.equalsIgnoreCase("release")) { + variant.outputs.all { output -> + def f = output.outputFileName + if (f != null && f.endsWith('.aar')) { + def fileName = "auc-lib-common-v${defaultConfig.versionName}.aar" + output.outputFileName = fileName + } + } + } + } + } + } } \ No newline at end of file From f407df4abada06119a776dffb8bda934aac4e55f Mon Sep 17 00:00:00 2001 From: limiaolong Date: Tue, 28 Apr 2020 11:37:23 +0800 Subject: [PATCH 2/3] =?UTF-8?q?unity=E7=94=B3=E8=AF=B7=E6=82=AC=E6=B5=AE?= =?UTF-8?q?=E7=AA=97=E6=9D=83=E9=99=90=E6=97=B6=EF=BC=8C=E5=A6=82=E6=9E=9C?= =?UTF-8?q?=E5=9C=A8=E6=9D=83=E9=99=90=E8=AE=BE=E7=BD=AE=E7=95=8C=E9=9D=A2?= =?UTF-8?q?=EF=BC=8Capp=E5=88=87=E5=88=B0=E5=90=8E=E5=8F=B0=EF=BC=8C?= =?UTF-8?q?=E5=86=8D=E5=88=87=E5=9B=9E=E6=9D=A5=E6=97=B6=E5=9B=9E=E8=B0=83?= =?UTF-8?q?=E4=B8=8D=E4=BC=9A=E8=A2=AB=E6=89=A7=E8=A1=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../blankj/utilcode/util/PermissionUtils.java | 47 +++++++++++++------ 1 file changed, 33 insertions(+), 14 deletions(-) diff --git a/lib/utilcode/src/main/java/com/blankj/utilcode/util/PermissionUtils.java b/lib/utilcode/src/main/java/com/blankj/utilcode/util/PermissionUtils.java index e76a8bcd5e..f8efe589ed 100755 --- a/lib/utilcode/src/main/java/com/blankj/utilcode/util/PermissionUtils.java +++ b/lib/utilcode/src/main/java/com/blankj/utilcode/util/PermissionUtils.java @@ -39,16 +39,16 @@ public final class PermissionUtils { private static PermissionUtils sInstance; - private String[] mPermissionsParam; + private String[] mPermissionsParam; private OnRationaleListener mOnRationaleListener; - private SimpleCallback mSimpleCallback; - private FullCallback mFullCallback; - private ThemeCallback mThemeCallback; - private Set mPermissions; - private List mPermissionsRequest; - private List mPermissionsGranted; - private List mPermissionsDenied; - private List mPermissionsDeniedForever; + private SimpleCallback mSimpleCallback; + private FullCallback mFullCallback; + private ThemeCallback mThemeCallback; + private Set mPermissions; + private List mPermissionsRequest; + private List mPermissionsGranted; + private List mPermissionsDenied; + private List mPermissionsDeniedForever; private static SimpleCallback sSimpleCallback4WriteSettings; private static SimpleCallback sSimpleCallback4DrawOverlays; @@ -363,10 +363,12 @@ private void onRequestPermissionsResult(final Activity activity) { @RequiresApi(api = Build.VERSION_CODES.M) static final class PermissionActivityImpl extends UtilsTransActivity.TransActivityDelegate { - private static final String TYPE = "TYPE"; - private static final int TYPE_RUNTIME = 0x01; - private static final int TYPE_WRITE_SETTINGS = 0x02; - private static final int TYPE_DRAW_OVERLAYS = 0x03; + private static final String TYPE = "TYPE"; + private static final int TYPE_RUNTIME = 0x01; + private static final int TYPE_WRITE_SETTINGS = 0x02; + private static final int TYPE_DRAW_OVERLAYS = 0x03; + + private static int currentRequestCode = -1; private static PermissionActivityImpl INSTANCE = new PermissionActivityImpl(); @@ -403,8 +405,10 @@ public void run() { } requestPermissions(activity); } else if (type == TYPE_WRITE_SETTINGS) { + currentRequestCode = TYPE_WRITE_SETTINGS; startWriteSettingsActivity(activity, TYPE_WRITE_SETTINGS); } else if (type == TYPE_DRAW_OVERLAYS) { + currentRequestCode = TYPE_DRAW_OVERLAYS; startOverlayPermissionActivity(activity, TYPE_DRAW_OVERLAYS); } else { activity.finish(); @@ -441,8 +445,24 @@ public boolean dispatchTouchEvent(UtilsTransActivity activity, MotionEvent ev) { return true; } + @Override + public void onDestroy(final UtilsTransActivity activity) { + //这两种方式，在unity游戏中，如果app从后台切回，当前activity会被强制关闭，所以需要检测一下 + //checkRequest(TYPE_DRAW_OVERLAYS); + //checkRequest(TYPE_WRITE_SETTINGS); + if (currentRequestCode != -1) { + checkRequest(currentRequestCode); + currentRequestCode = -1; + } + super.onDestroy(activity); + } + @Override public void onActivityResult(UtilsTransActivity activity, int requestCode, int resultCode, Intent data) { + activity.finish(); + } + + private void checkRequest(int requestCode) { if (requestCode == TYPE_WRITE_SETTINGS) { if (sSimpleCallback4WriteSettings == null) return; if (isGrantedWriteSettings()) { @@ -465,7 +485,6 @@ public void run() { } }, 100); } - activity.finish(); } } From fc8fdbc36f866c77ef18a2f6b40662d6f5c9bae3 Mon Sep 17 00:00:00 2001 From: limiaolong Date: Tue, 28 Apr 2020 11:37:54 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=89=93=E5=8C=85aar=E5=A2=9E=E5=BC=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/utilcode/build.gradle | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/lib/utilcode/build.gradle b/lib/utilcode/build.gradle index 283e55936b..3f0ab43303 100644 --- a/lib/utilcode/build.gradle +++ b/lib/utilcode/build.gradle @@ -40,6 +40,26 @@ dependencies { testImplementation Config.depConfig.eventbus_lib.dep } +android { + buildTypes { + release { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' + android.libraryVariants.all { variant -> + if(variant.name.equalsIgnoreCase("release")) { + variant.outputs.all { output -> + def f = output.outputFileName + if (f != null && f.endsWith('.aar')) { + def fileName = "auc-lib-util-v${defaultConfig.versionName}.aar" + output.outputFileName = fileName + } + } + } + } + } + } +} + afterEvaluate { verifyReleaseResources.enabled(false) }