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

修复 打包后应用后台重新进入会重新加载的问题

Browse Source
This commit is contained in:
hyb1996
2019-01-14 10:11:57 +08:00
parent 5d09249a2f
commit a0e9dbcc2e
5 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
.idea/caches/build_file_checksums.ser generated
View File

Binary file not shown.

10
app/src/main/java/org/autojs/autojs/ui/shortcut/ShortcutIconSelectActivity.java
View File

@@ -9,8 +9,6 @@ import android.graphics.Bitmap;
import android.graphics.BitmapFactory; import android.graphics.BitmapFactory;
import android.graphics.drawable.Drawable; import android.graphics.drawable.Drawable;
import android.net.Uri; import android.net.Uri;
import androidx.recyclerview.widget.GridLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.Menu; import android.view.Menu;
import android.view.MenuItem; import android.view.MenuItem;
@@ -18,18 +16,18 @@ import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
import android.widget.ImageView; 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.AfterViews;
import org.androidannotations.annotations.EActivity; import org.androidannotations.annotations.EActivity;
import org.androidannotations.annotations.ViewById; 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 org.autojs.autojs.workground.WrapContentGridLayoutManger;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import androidx.recyclerview.widget.RecyclerView;
import io.reactivex.Observable; import io.reactivex.Observable;
import io.reactivex.android.schedulers.AndroidSchedulers; import io.reactivex.android.schedulers.AndroidSchedulers;
import io.reactivex.schedulers.Schedulers; import io.reactivex.schedulers.Schedulers;

2
autojs/src/main/java/com/stardust/autojs/engine/RhinoJavaScriptEngine.kt
View File

@@ -68,7 +68,7 @@ open class RhinoJavaScriptEngine(private val mAndroidContext: android.content.Co
runtime.topLevelScope = mScriptable runtime.topLevelScope = mScriptable
} }
public override fun doExecution(source: JavaScriptSource): Any { public override fun doExecution(source: JavaScriptSource): Any? {
var reader = source.nonNullScriptReader var reader = source.nonNullScriptReader
try { try {
reader = preprocess(reader) reader = preprocess(reader)

2
inrt/src/main/assets/project/main.js
View File

@@ -1 +1 @@
Yﾎ?翔<EFBFBD>Mｺzｫｱ toast("Hello, Auto.js");

2
inrt/src/main/java/com/stardust/auojs/inrt/SettingsActivity.kt
View File

@@ -24,7 +24,7 @@ class SettingsActivity : AppCompatActivity() {
val toolbar = findViewById<Toolbar>(R.id.toolbar) val toolbar = findViewById<Toolbar>(R.id.toolbar)
toolbar.setTitle(R.string.text_settings) toolbar.setTitle(R.string.text_settings)
setSupportActionBar(toolbar) setSupportActionBar(toolbar)
toolbar.setNavigationOnClickListener { v -> finish() } toolbar.setNavigationOnClickListener { finish() }
supportActionBar?.setDisplayHomeAsUpEnabled(true) supportActionBar?.setDisplayHomeAsUpEnabled(true)
} }