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

Merge branch 'dev' of https://github.com/hyb1996/NoRootScriptDroid into dev

Browse Source 
# Conflicts:
#	.idea/caches/build_file_checksums.ser
This commit is contained in:
hyb1996
2019-01-22 20:56:25 +08:00
parent d05b65ba51 cfe6f92e13
commit ce5447859a
31 changed files with 443 additions and 330 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
app/src/main/java/org/autojs/autojs/model/script/Scripts.kt
View File

@@ -91,22 +91,22 @@ object Scripts {
}
fun edit(file: ScriptFile) {
EditActivity.editFile(GlobalAppContext.get(), file.simplifiedName, file.path)
fun edit(context: Context, file: ScriptFile) {
EditActivity.editFile(context, file.simplifiedName, file.path)
}
fun edit(path: String) {
edit(ScriptFile(path))
fun edit(context: Context, path: String) {
edit(context, ScriptFile(path))
}
fun run(file: ScriptFile): ScriptExecution? {
try {
return AutoJs.getInstance().scriptEngineService.execute(file.toSource(),
return try {
AutoJs.getInstance().scriptEngineService.execute(file.toSource(),
ExecutionConfig(workingDirectory = file.parent))
} catch (e: Exception) {
e.printStackTrace()
Toast.makeText(GlobalAppContext.get(), e.message, Toast.LENGTH_LONG).show()
return null
null
}
}

2
app/src/main/java/org/autojs/autojs/ui/common/ScriptOperations.java
View File

@@ -114,7 +114,7 @@ public class ScriptOperations {
}
notifyFileCreated(mCurrentDirectory, new ScriptFile(path));
if (edit)
Scripts.INSTANCE.edit(path);
Scripts.INSTANCE.edit(mContext, path);
} else {
showMessage(R.string.text_create_fail);
}

18
app/src/main/java/org/autojs/autojs/ui/edit/EditActivity.java
View File

@@ -4,9 +4,12 @@ import android.annotation.SuppressLint;
import android.content.Context;
import android.content.Intent;
import android.net.Uri;
import android.os.Build;
import android.os.Bundle;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import android.util.Log;
import android.view.ActionMode;
import android.view.Menu;
@@ -195,7 +198,15 @@ public class EditActivity extends BaseActivity implements OnActivityResultDelega
showExitConfirmDialog();
return;
}
super.finish();
finishAndRemoveFromRecents();
}
private void finishAndRemoveFromRecents() {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
finishAndRemoveTask();
} else {
finish();
}
}
private void showExitConfirmDialog() {
@@ -207,9 +218,9 @@ public class EditActivity extends BaseActivity implements OnActivityResultDelega
.neutralText(R.string.text_exit_directly)
.onNegative((dialog, which) -> {
mEditorView.saveFile();
EditActivity.super.finish();
finishAndRemoveFromRecents();
})
.onNeutral((dialog, which) -> EditActivity.super.finish())
.onNeutral((dialog, which) -> finishAndRemoveFromRecents())
.show();
}
@@ -294,4 +305,5 @@ public class EditActivity extends BaseActivity implements OnActivityResultDelega
super.onRequestPermissionsResult(requestCode, permissions, grantResults);
mRequestPermissionCallbacks.onRequestPermissionsResult(requestCode, permissions, grantResults);
}
}

2
app/src/main/java/org/autojs/autojs/ui/explorer/ExplorerView.java
View File

@@ -557,7 +557,7 @@ public class ExplorerView extends ThemeColorSwipeRefreshLayout implements SwipeR
@OnClick(R.id.edit)
void edit() {
Scripts.INSTANCE.edit(new ScriptFile(mExplorerItem.getPath()));
Scripts.INSTANCE.edit(getContext(), new ScriptFile(mExplorerItem.getPath()));
notifyOperated();
}

2
app/src/main/java/org/autojs/autojs/ui/main/community/CommunityWebView.java
View File

@@ -75,7 +75,7 @@ public class CommunityWebView extends EWebView {
.subscribe(file ->
Snackbar.make(CommunityWebView.this, getResources().getString(R.string.format_file_downloaded, file.getPath())
, Snackbar.LENGTH_LONG)
.setAction(R.string.text_open, v -> Scripts.INSTANCE.edit(file))
.setAction(R.string.text_open, v -> Scripts.INSTANCE.edit(getContext(), file))
.show(),
error -> {
error.printStackTrace();

2
app/src/main/java/org/autojs/autojs/ui/main/scripts/MyScriptListFragment.java
View File

@@ -62,7 +62,7 @@ public class MyScriptListFragment extends ViewPagerFragment implements FloatingA
mExplorerView.setExplorer(Explorers.workspace(), ExplorerDirPage.createRoot(Pref.getScriptDirPath()));
mExplorerView.setOnItemClickListener((view, item) -> {
if (item.isEditable()) {
Scripts.INSTANCE.edit(item.toScriptFile());
Scripts.INSTANCE.edit(getActivity(), item.toScriptFile());
} else {
IntentUtil.viewFile(GlobalAppContext.get(), item.getPath(), AppFileProvider.AUTHORITY);
}

12
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.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;
@@ -93,7 +91,7 @@ public class ShortcutIconSelectActivity extends BaseActivity {
@Override
public boolean onOptionsItemSelected(MenuItem item) {
startActivityForResult(new Intent(Intent.ACTION_GET_CONTENT)
.setType("image/*"), 11209);
.setType("image/*"), 11234);
return true;
}