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

6.6.2 - Alpha2 - 更新 Android Studio 下载链接信息

Browse Source
This commit is contained in:
SuperMonster003
2025-01-14 22:05:09 +08:00
parent 49fac78fec
commit b44eae18d9
10 changed files with 29 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.changelog/lang_zh-Hans.json
View File

@@ -6,7 +6,7 @@
"plugins.load 方法无法正常加载插件的问题 _[`issue #290`](http://issues.autojs6.com/290)_",
"dex 文件可能因权限问题无法正常加载的问题 (试修) _[`issue #290`](http://issues.autojs6.com/290)_",
"dx 库在 Android 7.x 无法正常使用的问题 _[`issue #293`](http://issues.autojs6.com/293)_",
"ScriptRuntime 使用 require 引用内置模块时可能出现的同步状态异常 (试修)_[`issue #298`](http://issues.autojs6.com/298)_",
"ScriptRuntime 使用 require 引用内置模块时可能出现的同步状态异常 (试修) _[`issue #298`](http://issues.autojs6.com/298)_",
"notice 模块缺失 getBuilder 等扩展方法的问题 _[`issue #301`](http://issues.autojs6.com/301)_",
"floaty.window/floaty.rawWindow 无法在子线程执行的问题"
],

12
.readme/common.json
View File

@@ -1,11 +1,11 @@
{
"android_studio_latest_recommended_version_name": "Android Studio Ladybug Feature Drop | 2024.2.2 RC 2",
"var_date_android_studio_latest_recommended_version_name": "2024/12/16",
"android_studio_latest_recommended_file_name_of_exe": "android-studio-2024.2.2.12-windows.exe",
"android_studio_latest_recommended_download_address_of_exe": "https://redirector.gvt1.com/edgedl/android/studio/install/2024.2.2.12/android-studio-2024.2.2.12-windows.exe",
"android_studio_latest_recommended_version_name": "Android Studio Ladybug Feature Drop | 2024.2.2",
"var_date_android_studio_latest_recommended_version_name": "2025/01/09",
"android_studio_latest_recommended_file_name_of_exe": "android-studio-2024.2.2.13-windows.exe",
"android_studio_latest_recommended_download_address_of_exe": "https://redirector.gvt1.com/edgedl/android/studio/install/2024.2.2.13/android-studio-2024.2.2.13-windows.exe",
"android_studio_latest_recommended_file_size_of_exe": "1.14 GB",
"android_studio_latest_recommended_file_name_of_zip": "android-studio-2024.2.2.12-windows.zip",
"android_studio_latest_recommended_download_address_of_zip": "https://redirector.gvt1.com/edgedl/android/studio/ide-zips/2024.2.2.12/android-studio-2024.2.2.12-windows.zip",
"android_studio_latest_recommended_file_name_of_zip": "android-studio-2024.2.2.13-windows.zip",
"android_studio_latest_recommended_download_address_of_zip": "https://redirector.gvt1.com/edgedl/android/studio/ide-zips/2024.2.2.13/android-studio-2024.2.2.13-windows.zip",
"android_studio_latest_recommended_file_size_of_zip": "1.15 GB",
"var_date_contribution_table_data_updated": "2025/01/01",
"latest_rhino_engine_name_with_github_lineno_address": "[v1.7.16-SNAPSHOT](http://rhino.autojs6.com/blob/master/gradle.properties#L3)",

1
apksigner/src/main/java/com/android/apksig/SigningCertificateLineage.java
View File

@@ -69,6 +69,7 @@ import java.util.List;
*
* @see <a href="https://source.android.com/security/apksigning/index.html">Application Signing</a>
*/
@SuppressWarnings("unchecked")
public class SigningCertificateLineage {
public final static int MAGIC = 0x3eff39d1;

1
apksigner/src/main/java/com/android/apksigner/ApkSignerTool.java
View File

@@ -55,6 +55,7 @@ import java.util.List;
* Command-line tool for signing APKs and for checking whether an APK's signature are expected to
* verify on Android devices.
*/
@SuppressWarnings("deprecation")
public class ApkSignerTool {
public static final int ZIP_MAGIC = 0x04034b50;

2
app/build.gradle.kts
View File

@@ -197,7 +197,7 @@ dependencies /* Unclassified */ {
implementation("com.github.getActivity:EasyWindow:10.3")
// Pinyin4j
implementation("com.belerweb:pinyin4j:2.5.0")
implementation("com.belerweb:pinyin4j:2.5.1")
// Jieba Analysis (zh-CN: 结巴分词)
// implementation("com.huaban:jieba-analysis:1.0.2")

4
app/src/main/java/org/autojs/autojs/core/image/ImageWrapper.kt
View File

@@ -160,7 +160,7 @@ open class ImageWrapper : Recyclable, MonitorResource {
}
return try {
true.also { saveWithBitmap(path) }
} catch (e: Exception) {
} catch (_: Exception) {
false
}
}
@@ -246,7 +246,7 @@ open class ImageWrapper : Recyclable, MonitorResource {
ensureNotRecycled()
return when (val bitmap = mBitmap) {
null -> ofMat(mat.clone())
else -> ofBitmap(bitmap.copy(bitmap.config, true))
else -> ofBitmap(bitmap.copy(bitmap.config ?: Bitmap.Config.ARGB_8888, true))
}
}

7
app/src/main/java/org/autojs/autojs/rhino/AndroidClassLoader.kt
View File

@@ -31,8 +31,6 @@ import com.legacy.android.dx.command.dexer.Main as LegacyMain
*/
class AndroidClassLoader(private val parent: ClassLoader, private val cacheDir: File) : ClassLoader(), GeneratedClassLoader {
private val mDexClassLoaders = HashMap<String, DexClassLoader>()
init {
if (cacheDir.exists()) {
deleteFilesOfDir(cacheDir)
@@ -80,7 +78,7 @@ class AndroidClassLoader(private val parent: ClassLoader, private val cacheDir:
}
return DexClassLoader(safeDexFile.path, cacheDir.path, null, parent).also {
mDexClassLoaders[safeDexFile.path] = it
dexClassLoaders[safeDexFile.path] = it
}
}
@@ -127,7 +125,7 @@ class AndroidClassLoader(private val parent: ClassLoader, private val cacheDir:
@Throws(ClassNotFoundException::class)
public override fun loadClass(name: String, resolve: Boolean): Class<*> {
findLoadedClass(name)?.let { return it }
for (dex in mDexClassLoaders.values) try {
for (dex in dexClassLoaders.values) try {
dex.loadClass(name)?.let { return it }
} catch (e: Exception) {
e.printStackTrace()
@@ -218,6 +216,7 @@ class AndroidClassLoader(private val parent: ClassLoader, private val cacheDir:
companion object {
private val TAG = AndroidClassLoader::class.java.simpleName
private val dexClassLoaders = HashMap<String, DexClassLoader>()
}

1
app/src/main/java/org/autojs/autojs/rhino/debug/Dim.java
View File

@@ -47,6 +47,7 @@ import java.util.Map;
/**
* Dim or Debugger Implementation for Rhino.
*/
@SuppressWarnings({"unchecked", "deprecation"})
public class Dim {
// Constants for instructing the debugger what action to perform

16
settings.gradle.kts
View File

@@ -145,10 +145,10 @@ pluginManagement {
val platforms = object {
val androidStudio = object : Platform(
name = "AndroidStudio", abbr = "as", vendor = "Google",
name = "AndroidStudio", vendor = "Google",
androidVersionMap = mapOf(
"2024.3" to "8.9.0-alpha07", /* Dec 25 2024. */
"2024.2" to "8.8.0-rc02", /* Dec 25 2024. */
"2024.3" to "8.9.0-alpha09", /* Jan 13, 2025. */
"2024.2" to "8.8.0", /* Jan 13, 2025. */
"2024.1" to "8.6.0", /* Aug 30, 2024. */
"2023.3" to "8.5.0-alpha02", /* Mar 28, 2024. */
"2023.2" to "8.3.0-rc02", /* Feb 14, 2024. */
@@ -210,7 +210,7 @@ pluginManagement {
}
val intelliJIdea = object : Platform(
name = "IntelliJIdea", abbr = "idea", vendor = "Jetbrains",
name = "IntelliJIdea", vendor = "Jetbrains",
androidVersionMap = mapOf(
"2024.3.1" to "8.7.3", /* Dec 10, 2024. */
"2024.3" to "8.7.0-rc01", /* Nov 15, 2024. */
@@ -235,7 +235,7 @@ pluginManagement {
}
val temurin = object : Platform(
name = "Temurin", vendor = "temurin", abbr = "Adoptium", /* More common as "Eclipse Adoptium". */
name = "Temurin", vendor = "temurin", /* More common as "Eclipse Adoptium". */
androidVersionMap = mapOf(
"20.0.2+9" to "8.2.2", /* Dec 2, 2024. */
consts.IDENTIFIER_FALLBACK to recommendedMinGradleVersion,
@@ -250,7 +250,7 @@ pluginManagement {
}
val unknown = object : Platform(
name = "Unknown", abbr = consts.IDENTIFIER_UNKNOWN, vendor = consts.IDENTIFIER_UNKNOWN,
name = "Unknown", vendor = consts.IDENTIFIER_UNKNOWN,
androidVersionMap = mapOf(
consts.IDENTIFIER_FALLBACK to recommendedMinGradleVersion,
),
@@ -304,6 +304,7 @@ pluginManagement {
)
val kspVersionMap = mapOf(
"2.1.10-RC" to "1.0.29", /* Jan 13, 2025. */
"2.1.20-Beta1" to "1.0.29", /* Dec 25, 2024. */
"2.1.0" to "1.0.29", /* Nov 28, 2024. */
"2.1.0" to "1.0.28", /* Nov 28, 2024. */
@@ -357,7 +358,6 @@ pluginManagement {
abstract inner class Platform(
var name: String,
val abbr: String,
val vendor: String,
val androidVersionMap: Map<String, String>,
val kotlinVersionMap: Map<String, String>,
@@ -368,6 +368,8 @@ pluginManagement {
open val gradleSettingsName: String? = null
open val weight: Int = -Int.MAX_VALUE
open var version: String = consts.DEFAULT_VERSION
@Suppress("unused")
open val shouldPrintProgress: Boolean = true
open val fullName

8
version.properties
View File

@@ -1,5 +1,5 @@
#Mon Jan 13 01:22:59 CST 2025
BUILD_TIME=1736702579820
#Tue Jan 14 22:03:25 CST 2025
BUILD_TIME=1736863405650
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=2967
VERSION_NAME=6.6.2 Alpha
VERSION_BUILD=2972
VERSION_NAME=6.6.2 Alpha2
VSCODE_EXT_REQUIRED_VERSION=1.0.8