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

app/build.gradle.kts

@@ -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")

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

@@ -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))
         }
     }
 

app/src/main/java/org/autojs/autojs/rhino/AndroidClassLoader.kt

@@ -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>()
 
     }
 

app/src/main/java/org/autojs/autojs/rhino/debug/Dim.java

@@ -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