tt/AutoJs6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

6.6.1 - Alpha3 - 修复打包应用可能出现的 DYNAMIC_RECEIVER_NOT_EXPORTED_PERMISSION 权限冲突

Browse Source
This commit is contained in:
SuperMonster003
2025-01-01 15:17:59 +08:00
parent 559e1cd237
commit 3ac6a643b6
4 changed files with 31 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/src/main/java/org/autojs/autojs/apkbuilder/ManifestEditor.java
View File

@@ -101,6 +101,13 @@ public class ManifestEditor {
@Override @Override
protected void onAttr(AxmlWriter.Attr a) { 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) { 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); this.ignore = !ManifestEditor.this.isPermissionRequired(((StringItem) a.value).data);
} }

33
libs/utils.build.gradle
View File

@@ -414,11 +414,12 @@ class Utils {
while ((bytesRead = inputStream.read(buffer)) != -1) { while ((bytesRead = inputStream.read(buffer)) != -1) {
outputStream.write(buffer, 0, bytesRead) outputStream.write(buffer, 0, bytesRead)
downloadedSize += bytesRead downloadedSize += bytesRead
if (project.ext["platform"]["shouldPrintProgress"] == true) {
double progress = (downloadedSize * 100.0 / fileSize) double progress = (downloadedSize * 100.0 / fileSize)
String progressBar = generateProgressBar(progress) String progressBar = generateProgressBar(progress)
print String.format("\rDownloading... [ %s ] %.2f%%", progressBar, progress) print String.format("\rDownloading... [ %s ] %.2f%%", progressBar, progress)
System.out.flush() System.out.flush()
}
} }
} }
} }
@@ -489,11 +490,12 @@ class Utils {
} }
} }
double progress = (processedEntries * 100.0 / totalEntries) if (project.ext["platform"]["shouldPrintProgress"] == true) {
String progressBar = generateProgressBar(progress) double progress = (processedEntries * 100.0 / totalEntries)
print String.format("\rExtracting... [ %s ] %.2f%%", progressBar, progress) String progressBar = generateProgressBar(progress)
System.out.flush() print String.format("\rExtracting... [ %s ] %.2f%%", progressBar, progress)
System.out.flush()
}
processedEntries++ processedEntries++
} }
} }
@@ -555,11 +557,12 @@ class Utils {
} }
} }
double progress = (processedEntries * 100.0 / totalEntries) if (project.ext["platform"]["shouldPrintProgress"] == true) {
String progressBar = generateProgressBar(progress) double progress = (processedEntries * 100.0 / totalEntries)
print String.format("\rExtracting... [ %s ] %.2f%%", progressBar, progress) String progressBar = generateProgressBar(progress)
System.out.flush() print String.format("\rExtracting... [ %s ] %.2f%%", progressBar, progress)
System.out.flush()
}
processedEntries++ processedEntries++
} }
} }

3
settings.gradle.kts
View File

@@ -234,6 +234,7 @@ pluginManagement {
), ),
) { ) {
override val weight = 5 override val weight = 5
override val shouldPrintProgress = false
} }
val unknown = object : Platform( val unknown = object : Platform(
@@ -355,6 +356,7 @@ pluginManagement {
open val gradleSettingsName: String? = null open val gradleSettingsName: String? = null
open val weight: Int = -Int.MAX_VALUE open val weight: Int = -Int.MAX_VALUE
open var version: String = consts.DEFAULT_VERSION open var version: String = consts.DEFAULT_VERSION
open val shouldPrintProgress: Boolean = true
open val fullName open val fullName
get() = uppercaseFirstChar(name) get() = uppercaseFirstChar(name)
@@ -626,6 +628,7 @@ pluginManagement {
extensions.extraProperties["kotlinVersion"] = notations.classpath.find { extensions.extraProperties["kotlinVersion"] = notations.classpath.find {
it.contains("kotlin-gradle-plugin") it.contains("kotlin-gradle-plugin")
}?.substringAfterLast(":") ?: config.fallbackKotlinVersion }?.substringAfterLast(":") ?: config.fallbackKotlinVersion
extensions.extraProperties["platform"] = platform
} }
} }

6
version.properties
View File

@@ -1,5 +1,5 @@
#Wed Jan 01 12:09:07 CST 2025 #Wed Jan 01 13:21:24 CST 2025
BUILD_TIME=1735704547526 BUILD_TIME=1735708884520
COMPILE_SDK_VERSION=34 COMPILE_SDK_VERSION=34
JAVA_VERSION=23 JAVA_VERSION=23
JAVA_VERSION_MIN_RADICAL=0 JAVA_VERSION_MIN_RADICAL=0
@@ -17,6 +17,6 @@ RAPID_OCR_OPENCV_MOBILE_LABEL_VERSION=13
RAPID_OCR_OPENCV_MOBILE_VERSION=4.5.3 RAPID_OCR_OPENCV_MOBILE_VERSION=4.5.3
TARGET_SDK_VERSION=34 TARGET_SDK_VERSION=34
TARGET_SDK_VERSION_INRT=29 TARGET_SDK_VERSION_INRT=29
VERSION_BUILD=2939 VERSION_BUILD=2940
VERSION_NAME=6.6.1 Alpha3 VERSION_NAME=6.6.1 Alpha3
VSCODE_EXT_REQUIRED_VERSION=1.0.8 VSCODE_EXT_REQUIRED_VERSION=1.0.8