From 3ac6a643b6ce93e9c8a8728ae57c3309434ecaed Mon Sep 17 00:00:00 2001 From: SuperMonster003 Date: Wed, 1 Jan 2025 15:17:59 +0800 Subject: [PATCH] =?UTF-8?q?6.6.1=20-=20Alpha3=20-=20=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E6=89=93=E5=8C=85=E5=BA=94=E7=94=A8=E5=8F=AF=E8=83=BD=E5=87=BA?= =?UTF-8?q?=E7=8E=B0=E7=9A=84=20DYNAMIC=5FRECEIVER=5FNOT=5FEXPORTED=5FPERM?= =?UTF-8?q?ISSION=20=E6=9D=83=E9=99=90=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../autojs/apkbuilder/ManifestEditor.java | 7 ++++ libs/utils.build.gradle | 33 ++++++++++--------- settings.gradle.kts | 3 ++ version.properties | 6 ++-- 4 files changed, 31 insertions(+), 18 deletions(-) diff --git a/app/src/main/java/org/autojs/autojs/apkbuilder/ManifestEditor.java b/app/src/main/java/org/autojs/autojs/apkbuilder/ManifestEditor.java index c89317be..484a289d 100644 --- a/app/src/main/java/org/autojs/autojs/apkbuilder/ManifestEditor.java +++ b/app/src/main/java/org/autojs/autojs/apkbuilder/ManifestEditor.java @@ -101,6 +101,13 @@ public class ManifestEditor { @Override protected void onAttr(AxmlWriter.Attr a) { + if ("permission".equals(this.name.data) && "name".equals(a.name.data) && a.value instanceof StringItem) { + if ("org.autojs.autojs6.inrt.DYNAMIC_RECEIVER_NOT_EXPORTED_PERMISSION".equals(((StringItem) a.value).data)) { + ((StringItem) a.value).data = mPackageName + ".DYNAMIC_RECEIVER_NOT_EXPORTED_PERMISSION"; + super.onAttr(a); + return; + } + } if ("uses-permission".equals(this.name.data) && "name".equals(a.name.data) && a.value instanceof StringItem) { this.ignore = !ManifestEditor.this.isPermissionRequired(((StringItem) a.value).data); } diff --git a/libs/utils.build.gradle b/libs/utils.build.gradle index 2baf5c54..345e2dac 100644 --- a/libs/utils.build.gradle +++ b/libs/utils.build.gradle @@ -414,11 +414,12 @@ class Utils { while ((bytesRead = inputStream.read(buffer)) != -1) { outputStream.write(buffer, 0, bytesRead) downloadedSize += bytesRead - - double progress = (downloadedSize * 100.0 / fileSize) - String progressBar = generateProgressBar(progress) - print String.format("\rDownloading... [ %s ] %.2f%%", progressBar, progress) - System.out.flush() + if (project.ext["platform"]["shouldPrintProgress"] == true) { + double progress = (downloadedSize * 100.0 / fileSize) + String progressBar = generateProgressBar(progress) + print String.format("\rDownloading... [ %s ] %.2f%%", progressBar, progress) + System.out.flush() + } } } } @@ -489,11 +490,12 @@ class Utils { } } - double progress = (processedEntries * 100.0 / totalEntries) - String progressBar = generateProgressBar(progress) - print String.format("\rExtracting... [ %s ] %.2f%%", progressBar, progress) - System.out.flush() - + if (project.ext["platform"]["shouldPrintProgress"] == true) { + double progress = (processedEntries * 100.0 / totalEntries) + String progressBar = generateProgressBar(progress) + print String.format("\rExtracting... [ %s ] %.2f%%", progressBar, progress) + System.out.flush() + } processedEntries++ } } @@ -555,11 +557,12 @@ class Utils { } } - double progress = (processedEntries * 100.0 / totalEntries) - String progressBar = generateProgressBar(progress) - print String.format("\rExtracting... [ %s ] %.2f%%", progressBar, progress) - System.out.flush() - + if (project.ext["platform"]["shouldPrintProgress"] == true) { + double progress = (processedEntries * 100.0 / totalEntries) + String progressBar = generateProgressBar(progress) + print String.format("\rExtracting... [ %s ] %.2f%%", progressBar, progress) + System.out.flush() + } processedEntries++ } } diff --git a/settings.gradle.kts b/settings.gradle.kts index 4e50d3ce..e116dd49 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -234,6 +234,7 @@ pluginManagement { ), ) { override val weight = 5 + override val shouldPrintProgress = false } val unknown = object : Platform( @@ -355,6 +356,7 @@ pluginManagement { open val gradleSettingsName: String? = null open val weight: Int = -Int.MAX_VALUE open var version: String = consts.DEFAULT_VERSION + open val shouldPrintProgress: Boolean = true open val fullName get() = uppercaseFirstChar(name) @@ -626,6 +628,7 @@ pluginManagement { extensions.extraProperties["kotlinVersion"] = notations.classpath.find { it.contains("kotlin-gradle-plugin") }?.substringAfterLast(":") ?: config.fallbackKotlinVersion + extensions.extraProperties["platform"] = platform } } diff --git a/version.properties b/version.properties index d7ccd569..aabdb046 100644 --- a/version.properties +++ b/version.properties @@ -1,5 +1,5 @@ -#Wed Jan 01 12:09:07 CST 2025 -BUILD_TIME=1735704547526 +#Wed Jan 01 13:21:24 CST 2025 +BUILD_TIME=1735708884520 COMPILE_SDK_VERSION=34 JAVA_VERSION=23 JAVA_VERSION_MIN_RADICAL=0 @@ -17,6 +17,6 @@ RAPID_OCR_OPENCV_MOBILE_LABEL_VERSION=13 RAPID_OCR_OPENCV_MOBILE_VERSION=4.5.3 TARGET_SDK_VERSION=34 TARGET_SDK_VERSION_INRT=29 -VERSION_BUILD=2939 +VERSION_BUILD=2940 VERSION_NAME=6.6.1 Alpha3 VSCODE_EXT_REQUIRED_VERSION=1.0.8