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

6.7.0 - Alpha6 - Fine tuning

Browse Source
This commit is contained in:
SuperMonster003
2025-09-28 23:28:10 +08:00
parent ac2b242be0
commit 24e4443c0c
19 changed files with 51 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/src/main/java/com/stardust/autojs/runtime/api/AppUtils.java
View File

@@ -7,7 +7,7 @@ import android.content.pm.ApplicationInfo;
import android.content.pm.PackageManager;
import android.net.Uri;
import androidx.annotation.Nullable;
import androidx.localbroadcastmanager.content.LocalBroadcastManager;
// import androidx.localbroadcastmanager.content.LocalBroadcastManager;
import android.util.Log;
@@ -52,7 +52,8 @@ public class AppUtils {
@ScriptInterface
public void sendLocalBroadcastSync(Intent intent) {
LocalBroadcastManager.getInstance(mContext).sendBroadcastSync(intent);
// LocalBroadcastManager.getInstance(mContext).sendBroadcastSync(intent);
throw new UnsupportedOperationException("This method has been obsoleted as LocalBroadcastManager is deprecated");
}
@ScriptInterface

4
app/src/main/java/org/autojs/autojs/AbstractAutoJs.kt
View File

@@ -60,8 +60,8 @@ abstract class AbstractAutoJs protected constructor(val application: Application
scriptEngineManager.registerEngine(JavaScriptSource.ENGINE) {
val rt = createRuntime()
when (isInrt) {
true -> LoopBasedJavaScriptEngineWithDecryption(rt, applicationContext)
else -> LoopBasedJavaScriptEngine(rt, applicationContext)
true -> LoopBasedJavaScriptEngineWithDecryption(applicationContext)
else -> LoopBasedJavaScriptEngine(applicationContext)
}.also { it.runtime = rt }
}
initContextFactory()

4
app/src/main/java/org/autojs/autojs/engine/LoopBasedJavaScriptEngine.java
View File

@@ -26,8 +26,8 @@ public class LoopBasedJavaScriptEngine extends RhinoJavaScriptEngine {
private Handler mHandler;
private boolean mLooping = false;
public LoopBasedJavaScriptEngine(ScriptRuntime scriptRuntime, Context context) {
super(scriptRuntime, context);
public LoopBasedJavaScriptEngine(Context context) {
super(context);
}
public interface ExecuteCallback {

2
app/src/main/java/org/autojs/autojs/engine/RhinoJavaScriptEngine.kt
View File

@@ -44,7 +44,7 @@ import java.util.*
* Created by Stardust on Apr 2, 2017.
* Modified by SuperMonster003 as of May 26, 2022.
*/
open class RhinoJavaScriptEngine(private val scriptRuntime: ScriptRuntime, private val androidContext: android.content.Context) : JavaScriptEngine() {
open class RhinoJavaScriptEngine(private val androidContext: android.content.Context) : JavaScriptEngine() {
private val mWrapFactory = WrapFactory()
val context: Context = enterContext()

12
app/src/main/java/org/autojs/autojs/extension/ViewExtensions.kt
View File

@@ -31,12 +31,16 @@ object ViewExtensions {
}
val Toolbar.titleView: TextView?
get() = this.findViewById(com.google.android.material.R.id.action_bar_title)
?: Toolbar::class.java.getDeclaredField("mTitleTextView").apply { isAccessible = true }.get(this@titleView) as TextView?
get() = this.findViewById(androidx.appcompat.R.id.action_bar_title)
?: runCatching {
Toolbar::class.java.getDeclaredField("mTitleTextView").apply { isAccessible = true }.get(this@titleView) as TextView?
}.getOrNull()
val Toolbar.subtitleView: TextView?
get() = this.findViewById(com.google.android.material.R.id.action_bar_subtitle)
?: Toolbar::class.java.getDeclaredField("mSubtitleTextView").apply { isAccessible = true }.get(this@subtitleView) as TextView?
get() = this.findViewById(androidx.appcompat.R.id.action_bar_subtitle)
?: runCatching {
Toolbar::class.java.getDeclaredField("mSubtitleTextView").apply { isAccessible = true }.get(this@subtitleView) as TextView?
}.getOrNull()
@JvmStatic
fun Toolbar.setOnTitleViewClickListener(l: View.OnClickListener?) {

3
app/src/main/java/org/autojs/autojs/inrt/autojs/LoopBasedJavaScriptEngineWithDecryption.kt
View File

@@ -4,14 +4,13 @@ import android.content.Context
import org.autojs.autojs.engine.LoopBasedJavaScriptEngine
import org.autojs.autojs.engine.encryption.ScriptEncryption
import org.autojs.autojs.pio.PFiles
import org.autojs.autojs.runtime.ScriptRuntime
import org.autojs.autojs.script.EncryptedScriptFileHeader
import org.autojs.autojs.script.EncryptedScriptFileHeader.BLOCK_SIZE
import org.autojs.autojs.script.JavaScriptFileSource
import org.autojs.autojs.script.ScriptSource
import org.autojs.autojs.script.StringScriptSource
class LoopBasedJavaScriptEngineWithDecryption(scriptRuntime: ScriptRuntime, context: Context) : LoopBasedJavaScriptEngine(scriptRuntime, context) {
class LoopBasedJavaScriptEngineWithDecryption(context: Context) : LoopBasedJavaScriptEngine(context) {
override fun execute(source: ScriptSource?, callback: ExecuteCallback?) {
if (source is JavaScriptFileSource) {