diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 76c542ca..fa798b90 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -5,7 +5,7 @@ - + @@ -84,6 +84,7 @@ diff --git a/app/src/main/java/org/autojs/autojs/external/open/EditIntentActivity.java b/app/src/main/java/org/autojs/autojs/external/open/EditIntentActivity.java index 87c58cae..98296956 100644 --- a/app/src/main/java/org/autojs/autojs/external/open/EditIntentActivity.java +++ b/app/src/main/java/org/autojs/autojs/external/open/EditIntentActivity.java @@ -5,7 +5,9 @@ import android.content.Intent; import android.net.Uri; import android.os.Bundle; import android.os.Environment; + import androidx.annotation.Nullable; + import android.text.TextUtils; import android.widget.Toast; @@ -56,9 +58,9 @@ public class EditIntentActivity extends BaseActivity { } } if (!TextUtils.isEmpty(path)) { - EditActivity.editFile(this, path); + EditActivity.editFile(this, path, false); } else { - EditActivity.editFile(this, uri); + EditActivity.editFile(this, uri, false); } } } diff --git a/app/src/main/java/org/autojs/autojs/model/script/Scripts.kt b/app/src/main/java/org/autojs/autojs/model/script/Scripts.kt index 15f3d3de..f15e7831 100644 --- a/app/src/main/java/org/autojs/autojs/model/script/Scripts.kt +++ b/app/src/main/java/org/autojs/autojs/model/script/Scripts.kt @@ -92,7 +92,7 @@ object Scripts { fun edit(context: Context, file: ScriptFile) { - EditActivity.editFile(context, file.simplifiedName, file.path) + EditActivity.editFile(context, file.simplifiedName, file.path, true) } fun edit(context: Context, path: String) { diff --git a/app/src/main/java/org/autojs/autojs/ui/edit/EditActivity.java b/app/src/main/java/org/autojs/autojs/ui/edit/EditActivity.java index a8fdd3b2..6690e0eb 100644 --- a/app/src/main/java/org/autojs/autojs/ui/edit/EditActivity.java +++ b/app/src/main/java/org/autojs/autojs/ui/edit/EditActivity.java @@ -1,6 +1,7 @@ package org.autojs.autojs.ui.edit; import android.annotation.SuppressLint; +import android.app.Activity; import android.content.Context; import android.content.Intent; import android.net.Uri; @@ -31,6 +32,7 @@ import org.autojs.autojs.theme.dialog.ThemeColorMaterialDialogBuilder; import org.androidannotations.annotations.AfterViews; import org.androidannotations.annotations.EActivity; import org.androidannotations.annotations.ViewById; +import org.autojs.autojs.ui.main.MainActivity_; import java.io.File; import java.io.IOException; @@ -56,35 +58,46 @@ public class EditActivity extends BaseActivity implements OnActivityResultDelega @ViewById(R.id.editor_view) EditorView mEditorView; - private EditorMenu mEditorMenu; private RequestPermissionCallbacks mRequestPermissionCallbacks = new RequestPermissionCallbacks(); + private boolean mNewTask; - public static void editFile(Context context, String path) { - editFile(context, null, path); + public static void editFile(Context context, String path, boolean newTask) { + editFile(context, null, path, newTask); } - public static void editFile(Context context, Uri uri) { - context.startActivity(new Intent(context, EditActivity_.class) - .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK) + public static void editFile(Context context, Uri uri, boolean newTask) { + context.startActivity(newIntent(context, newTask) .setData(uri)); } - public static void editFile(Context context, String name, String path) { - context.startActivity(new Intent(context, EditActivity_.class) - .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK) + public static void editFile(Context context, String name, String path, boolean newTask) { + context.startActivity(newIntent(context, newTask) .putExtra(EXTRA_PATH, path) .putExtra(EXTRA_NAME, name)); } - public static void viewContent(Context context, String name, String content) { - context.startActivity(new Intent(context, EditActivity_.class) - .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK) + public static void viewContent(Context context, String name, String content, boolean newTask) { + context.startActivity(newIntent(context, newTask) .putExtra(EXTRA_CONTENT, content) .putExtra(EXTRA_NAME, name) .putExtra(EXTRA_READ_ONLY, true)); } + private static Intent newIntent(Context context, boolean newTask) { + Intent intent = new Intent(context, EditActivity_.class); + if (newTask || !(context instanceof Activity)) { + intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); + } + return intent; + } + + @Override + protected void onCreate(@Nullable Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + mNewTask = (getIntent().getFlags() & Intent.FLAG_ACTIVITY_NEW_TASK) != 0; + } + @SuppressLint("CheckResult") @AfterViews void setUpViews() { @@ -142,14 +155,6 @@ public class EditActivity extends BaseActivity implements OnActivityResultDelega return super.onPrepareOptionsMenu(menu); } - public boolean onPrepareActionMode(Menu menu) { - Log.d(LOG_TAG, "onPrepareActionMode: " + menu); - boolean isScriptRunning = mEditorView.getScriptExecutionId() != ScriptExecution.NO_ID; - MenuItem forceStopItem = menu.findItem(R.id.action_force_stop); - forceStopItem.setEnabled(isScriptRunning); - return super.onPrepareOptionsMenu(menu); - } - @Override public void onActionModeStarted(ActionMode mode) { Log.d(LOG_TAG, "onActionModeStarted: " + mode); @@ -207,6 +212,9 @@ public class EditActivity extends BaseActivity implements OnActivityResultDelega } else { finish(); } + if (mNewTask) { + startActivity(new Intent(this, MainActivity_.class)); + } } private void showExitConfirmDialog() { diff --git a/app/src/main/java/org/autojs/autojs/ui/edit/ViewSampleActivity.java b/app/src/main/java/org/autojs/autojs/ui/edit/ViewSampleActivity.java index 0cc13051..d1728d4a 100644 --- a/app/src/main/java/org/autojs/autojs/ui/edit/ViewSampleActivity.java +++ b/app/src/main/java/org/autojs/autojs/ui/edit/ViewSampleActivity.java @@ -5,8 +5,11 @@ import android.content.Context; import android.content.Intent; import android.content.IntentFilter; import android.os.Bundle; + import com.google.android.material.snackbar.Snackbar; + import androidx.appcompat.app.AppCompatActivity; + import android.util.SparseArray; import android.view.Menu; import android.view.MenuItem; @@ -15,13 +18,16 @@ import android.view.View; import com.stardust.app.OnActivityResultDelegate; import com.stardust.autojs.engine.JavaScriptEngine; import com.stardust.autojs.execution.ScriptExecution; + import org.autojs.autojs.R; import org.autojs.autojs.autojs.AutoJs; import org.autojs.autojs.model.sample.SampleFile; import org.autojs.autojs.ui.BaseActivity; import org.autojs.autojs.ui.common.ScriptOperations; + import com.stardust.theme.ThemeColorManager; import com.stardust.util.SparseArrayEntries; + import org.autojs.autojs.ui.widget.ToolbarMenuItem; import butterknife.ButterKnife; @@ -99,12 +105,9 @@ public class ViewSampleActivity extends AppCompatActivity implements OnActivityR new ScriptOperations(this, mView) .importSample(mSample) .observeOn(AndroidSchedulers.mainThread()) - .subscribe(new Consumer() { - @Override - public void accept(@NonNull String path) throws Exception { - EditActivity.editFile(ViewSampleActivity.this, path); - finish(); - } + .subscribe(path -> { + EditActivity.editFile(ViewSampleActivity.this, path, false); + finish(); }); } diff --git a/app/src/main/java/org/autojs/autojs/ui/main/MainActivity.java b/app/src/main/java/org/autojs/autojs/ui/main/MainActivity.java index c55080c2..624ea6e0 100644 --- a/app/src/main/java/org/autojs/autojs/ui/main/MainActivity.java +++ b/app/src/main/java/org/autojs/autojs/ui/main/MainActivity.java @@ -4,7 +4,9 @@ import android.Manifest; import android.content.Intent; import android.content.pm.PackageManager; import android.os.Bundle; + import androidx.annotation.NonNull; + import com.google.android.material.floatingactionbutton.FloatingActionButton; import androidx.core.view.GravityCompat; @@ -65,7 +67,6 @@ import java.util.Arrays; @EActivity(R.layout.activity_main) public class MainActivity extends BaseActivity implements OnActivityResultDelegate.DelegateHost, BackPressedHandler.HostActivity, PermissionRequestProxyActivity { - public static class DrawerOpenEvent { static DrawerOpenEvent SINGLETON = new DrawerOpenEvent(); } @@ -138,7 +139,7 @@ public class MainActivity extends BaseActivity implements OnActivityResultDelega } private void checkPermissions() { - checkPermission(Manifest.permission.WRITE_EXTERNAL_STORAGE); + checkPermission(Manifest.permission.READ_EXTERNAL_STORAGE, Manifest.permission.WRITE_EXTERNAL_STORAGE); } private void showAccessibilitySettingPromptIfDisabled() { @@ -180,8 +181,6 @@ public class MainActivity extends BaseActivity implements OnActivityResultDelega } private void setUpViewPagerFragmentBehaviors() { - - mPagerAdapter.setOnFragmentInstantiateListener((pos, fragment) -> { ((ViewPagerFragment) fragment).setFab(mFab); if (pos == mViewPager.getCurrentItem()) { diff --git a/autojs/src/main/AndroidManifest.xml b/autojs/src/main/AndroidManifest.xml index 034707df..54f43b7d 100644 --- a/autojs/src/main/AndroidManifest.xml +++ b/autojs/src/main/AndroidManifest.xml @@ -9,6 +9,7 @@ + diff --git a/autojs/src/main/java/com/stardust/autojs/core/graphics/ScriptCanvasView.kt b/autojs/src/main/java/com/stardust/autojs/core/graphics/ScriptCanvasView.kt index dcf3e5a1..afbb721b 100644 --- a/autojs/src/main/java/com/stardust/autojs/core/graphics/ScriptCanvasView.kt +++ b/autojs/src/main/java/com/stardust/autojs/core/graphics/ScriptCanvasView.kt @@ -56,7 +56,6 @@ class ScriptCanvasView(context: Context, private val mScriptRuntime: ScriptRunti while (mDrawing) { canvas = lockCanvas() scriptCanvas.setCanvas(canvas) - // scriptCanvas.drawColor(Color.WHITE); emit("draw", scriptCanvas, this@ScriptCanvasView) unlockCanvasAndPost(canvas) canvas = null diff --git a/inrt/src/main/jniLibs/armeabi-v7a/libopencv_java3.so b/inrt/src/main/jniLibs/armeabi-v7a/libopencv_java3.so new file mode 100644 index 00000000..38f1ba4f Binary files /dev/null and b/inrt/src/main/jniLibs/armeabi-v7a/libopencv_java3.so differ diff --git a/project-versions.json b/project-versions.json index 5f9d5e94..51dc8205 100644 --- a/project-versions.json +++ b/project-versions.json @@ -1,6 +1,6 @@ { - "appVersionCode": 455, - "appVersionName": "4.1.0 Alpha5", + "appVersionCode": 460, + "appVersionName": "4.1.1 Alpha", "target": 28, "mini": 17, "compile": 28,