From a0e9dbcc2e06791239cae54debb6dfe1c313e09b Mon Sep 17 00:00:00 2001
From: hyb1996 <946994919@qq.com>
Date: Mon, 14 Jan 2019 10:11:57 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20=E6=89=93=E5=8C=85?=
 =?UTF-8?q?=E5=90=8E=E5=BA=94=E7=94=A8=E5=90=8E=E5=8F=B0=E9=87=8D=E6=96=B0?=
 =?UTF-8?q?=E8=BF=9B=E5=85=A5=E4=BC=9A=E9=87=8D=E6=96=B0=E5=8A=A0=E8=BD=BD?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/caches/build_file_checksums.ser           | Bin 733 -> 733 bytes
 .../ui/shortcut/ShortcutIconSelectActivity.java |  10 ++++------
 .../autojs/engine/RhinoJavaScriptEngine.kt      |   2 +-
 inrt/src/main/assets/project/main.js            |   2 +-
 .../com/stardust/auojs/inrt/SettingsActivity.kt |   2 +-
 5 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
index d97f75ee1b078d6b7e9fd2fc9a1152af0320e537..a5a098c3facf3aa8f42345726ddbffc350429d26 100644
GIT binary patch
delta 245
zcmcc1dY5&=bk+>df5+7)&M6nLi1%N4JdxK)s#d&r15csYWMxJlfpvL#R~kR|d|lSW
z-l-qG{@vtyMhk%nxz`kGia*U4*Gd-%65{$k`8cC;+Lgnzdt@2^Xo@d-qxq`iVO9wP
zPf}@SPKsW7QDRC?YH1-u9RnK!1A{>GyZaNq|A|jpTl-z7?meSM34=gResW@tUO`cQ
zL26M+W@<4)@qzFrhN!-k>+as@FZZuC*fKeQNlxGadom|i^vU#DH98&D(dUvU*D)yw
tgavgRwNKjl@NU!JuKS;loSD3iNltLt8L92HzMWP=OD?w_pU8Wy0sz)gXVU-x

delta 245
zcmV<R01E%z1>FUZmj!2#)_IMQoOcjuX86+?NA%Ngo$eYyhXn|eBLPehoY#xsozsqE
zvmOER;f^yjlYap?5Zz+AF3MA>=G%<&CXEwfxRb{LBW7PsDC@EW-wXZ_JisgJHA{2=
z3}SU@Y-BEHa$#g_Wp!}?egFml000n>r0HfPW`7O69hb<%_JSC601#|%V_|GAaB^>O
zWpZ?BWpj0L0Db@l0000G(?GG}j>(=SBE90{q%m=$lTZR45Sgt$g>#Mh6qiNCaU(*v
v43mBWAQ0U@qHHxj;(|7irpTsKu2Yk)0v-`$Tk@4SH4>cDy71Z8F=O+13oU8J

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<Toolbar>(R.id.toolbar)
         toolbar.setTitle(R.string.text_settings)
         setSupportActionBar(toolbar)
-        toolbar.setNavigationOnClickListener { v -> finish() }
+        toolbar.setNavigationOnClickListener { finish() }
         supportActionBar?.setDisplayHomeAsUpEnabled(true)
     }