diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser index d97f75ee..a5a098c3 100644 Binary files a/.idea/caches/build_file_checksums.ser and b/.idea/caches/build_file_checksums.ser differ diff --git a/app/src/main/java/org/autojs/autojs/ui/shortcut/ShortcutIconSelectActivity.java b/app/src/main/java/org/autojs/autojs/ui/shortcut/ShortcutIconSelectActivity.java index cf7853e3..3df3e701 100644 --- a/app/src/main/java/org/autojs/autojs/ui/shortcut/ShortcutIconSelectActivity.java +++ b/app/src/main/java/org/autojs/autojs/ui/shortcut/ShortcutIconSelectActivity.java @@ -9,8 +9,6 @@ import android.graphics.Bitmap; import android.graphics.BitmapFactory; import android.graphics.drawable.Drawable; import android.net.Uri; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import android.view.LayoutInflater; import android.view.Menu; import android.view.MenuItem; @@ -18,18 +16,18 @@ import android.view.View; import android.view.ViewGroup; import android.widget.ImageView; -import org.autojs.autojs.R; -import org.autojs.autojs.tool.BitmapTool; -import org.autojs.autojs.ui.BaseActivity; - import org.androidannotations.annotations.AfterViews; import org.androidannotations.annotations.EActivity; import org.androidannotations.annotations.ViewById; +import org.autojs.autojs.R; +import org.autojs.autojs.tool.BitmapTool; +import org.autojs.autojs.ui.BaseActivity; import org.autojs.autojs.workground.WrapContentGridLayoutManger; import java.util.ArrayList; import java.util.List; +import androidx.recyclerview.widget.RecyclerView; import io.reactivex.Observable; import io.reactivex.android.schedulers.AndroidSchedulers; import io.reactivex.schedulers.Schedulers; diff --git a/autojs/src/main/java/com/stardust/autojs/engine/RhinoJavaScriptEngine.kt b/autojs/src/main/java/com/stardust/autojs/engine/RhinoJavaScriptEngine.kt index d2d5f25c..d8bdde59 100644 --- a/autojs/src/main/java/com/stardust/autojs/engine/RhinoJavaScriptEngine.kt +++ b/autojs/src/main/java/com/stardust/autojs/engine/RhinoJavaScriptEngine.kt @@ -68,7 +68,7 @@ open class RhinoJavaScriptEngine(private val mAndroidContext: android.content.Co runtime.topLevelScope = mScriptable } - public override fun doExecution(source: JavaScriptSource): Any { + public override fun doExecution(source: JavaScriptSource): Any? { var reader = source.nonNullScriptReader try { reader = preprocess(reader) diff --git a/inrt/src/main/assets/project/main.js b/inrt/src/main/assets/project/main.js index bbb7dc69..b89ececf 100644 --- a/inrt/src/main/assets/project/main.js +++ b/inrt/src/main/assets/project/main.js @@ -1 +1 @@ -YÎ?ãÄüžMºz«± \ No newline at end of file +toast("Hello, Auto.js"); \ No newline at end of file diff --git a/inrt/src/main/java/com/stardust/auojs/inrt/SettingsActivity.kt b/inrt/src/main/java/com/stardust/auojs/inrt/SettingsActivity.kt index b2fffe43..02efc172 100644 --- a/inrt/src/main/java/com/stardust/auojs/inrt/SettingsActivity.kt +++ b/inrt/src/main/java/com/stardust/auojs/inrt/SettingsActivity.kt @@ -24,7 +24,7 @@ class SettingsActivity : AppCompatActivity() { val toolbar = findViewById(R.id.toolbar) toolbar.setTitle(R.string.text_settings) setSupportActionBar(toolbar) - toolbar.setNavigationOnClickListener { v -> finish() } + toolbar.setNavigationOnClickListener { finish() } supportActionBar?.setDisplayHomeAsUpEnabled(true) }