From 1f8632951fc49051869dac10999ad3ffd4f2d3bc Mon Sep 17 00:00:00 2001 From: hyb1996 <946994919@qq.com> Date: Mon, 13 Feb 2017 11:00:28 +0800 Subject: [PATCH] ??? --- .../main/java/com/stardust/scriptdroid/EditActivity.java | 1 + .../com/stardust/scriptdroid/ImportIntentActivity.java | 2 +- .../main/java/com/stardust/scriptdroid/MainActivity.java | 2 +- .../java/com/stardust/scriptdroid/SettingsActivity.java | 2 +- .../main/java/com/stardust/scriptdroid/droid/Droid.java | 9 +++++---- .../stardust/scriptdroid/droid/runtime/DroidRuntime.java | 2 +- .../stardust/scriptdroid/ui/EditSideMenuFragment.java | 4 ++-- .../scriptdroid/ui/ScriptFileOperationPopupMenu.java | 2 ++ .../com/stardust/scriptdroid/ui/SlideMenuFragment.java | 4 ++-- .../view/accessibility/AccessibilityServiceUtils.java | 2 +- 10 files changed, 17 insertions(+), 13 deletions(-) diff --git a/app/src/main/java/com/stardust/scriptdroid/EditActivity.java b/app/src/main/java/com/stardust/scriptdroid/EditActivity.java index 831d9767..162c835e 100644 --- a/app/src/main/java/com/stardust/scriptdroid/EditActivity.java +++ b/app/src/main/java/com/stardust/scriptdroid/EditActivity.java @@ -44,6 +44,7 @@ public class EditActivity extends Editor920Activity { public static void editFile(Context context, String name, String path) { context.startActivity(new Intent(context, EditActivity.class) + .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK) .putExtra("path", path) .putExtra("name", name)); } diff --git a/app/src/main/java/com/stardust/scriptdroid/ImportIntentActivity.java b/app/src/main/java/com/stardust/scriptdroid/ImportIntentActivity.java index 4c89d1f0..40d85391 100644 --- a/app/src/main/java/com/stardust/scriptdroid/ImportIntentActivity.java +++ b/app/src/main/java/com/stardust/scriptdroid/ImportIntentActivity.java @@ -43,6 +43,6 @@ public class ImportIntentActivity extends BaseActivity { private void startMainActivity() { startActivity(new Intent(this, MainActivity.class) - .addFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP)); + .addFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP | Intent.FLAG_ACTIVITY_NEW_TASK)); } } \ No newline at end of file diff --git a/app/src/main/java/com/stardust/scriptdroid/MainActivity.java b/app/src/main/java/com/stardust/scriptdroid/MainActivity.java index c9f38170..7ab4b806 100644 --- a/app/src/main/java/com/stardust/scriptdroid/MainActivity.java +++ b/app/src/main/java/com/stardust/scriptdroid/MainActivity.java @@ -150,7 +150,7 @@ public class MainActivity extends BaseActivity implements FileChooserDialog.File @ViewBinding.Click(R.id.setting) private void startSettingActivity() { - startActivity(new Intent(this, SettingsActivity.class)); + startActivity(new Intent(this, SettingsActivity.class).addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)); } @ViewBinding.Click(R.id.exit) diff --git a/app/src/main/java/com/stardust/scriptdroid/SettingsActivity.java b/app/src/main/java/com/stardust/scriptdroid/SettingsActivity.java index 25d95356..5e9c06c0 100644 --- a/app/src/main/java/com/stardust/scriptdroid/SettingsActivity.java +++ b/app/src/main/java/com/stardust/scriptdroid/SettingsActivity.java @@ -75,7 +75,7 @@ public class SettingsActivity extends BaseActivity { .entry(getString(R.string.text_about), new Runnable() { @Override public void run() { - startActivity(new Intent(getActivity(), AboutActivity.class)); + startActivity(new Intent(getActivity(), AboutActivity.class).addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)); } }) .entry(getString(R.string.text_licenses), new Runnable() { diff --git a/app/src/main/java/com/stardust/scriptdroid/droid/Droid.java b/app/src/main/java/com/stardust/scriptdroid/droid/Droid.java index cf4c9233..9ae91366 100644 --- a/app/src/main/java/com/stardust/scriptdroid/droid/Droid.java +++ b/app/src/main/java/com/stardust/scriptdroid/droid/Droid.java @@ -47,7 +47,7 @@ public class Droid { }; private static Droid instance = new Droid(); - protected Droid() { + private Droid() { } public static Droid getInstance() { @@ -64,14 +64,15 @@ public class Droid { runScript(FileUtils.readString(file), listener, RunningConfig.getDefault()); } - private void runScript(String script) { - runScript(script, null, RunningConfig.getDefault()); - } public void runScriptFile(String path) { runScriptFile(new File(path)); } + private void runScript(String script) { + runScript(script, null, RunningConfig.getDefault()); + } + public void runScript(final String script, OnRunFinishedListener listener, RunningConfig config) { listener = listener == null ? DEFAULT_LISTENER : listener; if (config.runInNewThread) { diff --git a/app/src/main/java/com/stardust/scriptdroid/droid/runtime/DroidRuntime.java b/app/src/main/java/com/stardust/scriptdroid/droid/runtime/DroidRuntime.java index b7c9e5d6..86ffdb87 100644 --- a/app/src/main/java/com/stardust/scriptdroid/droid/runtime/DroidRuntime.java +++ b/app/src/main/java/com/stardust/scriptdroid/droid/runtime/DroidRuntime.java @@ -55,7 +55,7 @@ public class DroidRuntime implements IDroidRuntime { @Override public void launch(String packageName, String className) { - App.getApp().startActivity(new Intent().setClassName(packageName, className)); + App.getApp().startActivity(new Intent().setClassName(packageName, className).addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)); } @Override diff --git a/app/src/main/java/com/stardust/scriptdroid/ui/EditSideMenuFragment.java b/app/src/main/java/com/stardust/scriptdroid/ui/EditSideMenuFragment.java index 34d3437e..53de771e 100644 --- a/app/src/main/java/com/stardust/scriptdroid/ui/EditSideMenuFragment.java +++ b/app/src/main/java/com/stardust/scriptdroid/ui/EditSideMenuFragment.java @@ -84,12 +84,12 @@ public class EditSideMenuFragment extends com.stardust.app.Fragment { @ViewBinding.Click(R.id.syntax_and_api) private void startSyntaxHelpActivity() { - startActivity(new Intent(getContext(), DocumentActivity.class)); + startActivity(new Intent(getContext(), DocumentActivity.class).addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)); } @ViewBinding.Click(R.id.console) private void startConsoleActivity() { - startActivity(new Intent(getContext(), ConsoleActivity.class)); + startActivity(new Intent(getContext(), ConsoleActivity.class).addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)); } @ViewBinding.Check(R.id.sw_assist_service) diff --git a/app/src/main/java/com/stardust/scriptdroid/ui/ScriptFileOperationPopupMenu.java b/app/src/main/java/com/stardust/scriptdroid/ui/ScriptFileOperationPopupMenu.java index bffb9c3c..250acca8 100644 --- a/app/src/main/java/com/stardust/scriptdroid/ui/ScriptFileOperationPopupMenu.java +++ b/app/src/main/java/com/stardust/scriptdroid/ui/ScriptFileOperationPopupMenu.java @@ -1,6 +1,7 @@ package com.stardust.scriptdroid.ui; import android.content.Context; +import android.graphics.drawable.BitmapDrawable; import android.support.annotation.Nullable; import android.support.v7.widget.LinearLayoutManager; import android.support.v7.widget.RecyclerView; @@ -59,6 +60,7 @@ public class ScriptFileOperationPopupMenu extends PopupWindow { private void init() { setWidth(WindowManager.LayoutParams.WRAP_CONTENT); setHeight(WindowManager.LayoutParams.WRAP_CONTENT); + setBackgroundDrawable(new BitmapDrawable()); setOutsideTouchable(true); setAnimationStyle(-1); initContentView(); diff --git a/app/src/main/java/com/stardust/scriptdroid/ui/SlideMenuFragment.java b/app/src/main/java/com/stardust/scriptdroid/ui/SlideMenuFragment.java index ef1622cf..63792843 100644 --- a/app/src/main/java/com/stardust/scriptdroid/ui/SlideMenuFragment.java +++ b/app/src/main/java/com/stardust/scriptdroid/ui/SlideMenuFragment.java @@ -76,12 +76,12 @@ public class SlideMenuFragment extends Fragment { @ViewBinding.Click(R.id.console) private void startConsoleActivity() { - startActivity(new Intent(getContext(), ConsoleActivity.class)); + startActivity(new Intent(getContext(), ConsoleActivity.class).addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)); } @ViewBinding.Click(R.id.syntax_and_api) private void startSyntaxHelpActivity() { - startActivity(new Intent(getContext(), DocumentActivity.class)); + startActivity(new Intent(getContext(), DocumentActivity.class).addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)); } @ViewBinding.Click(R.id.auto_operate_service) diff --git a/app/src/main/java/com/stardust/view/accessibility/AccessibilityServiceUtils.java b/app/src/main/java/com/stardust/view/accessibility/AccessibilityServiceUtils.java index f1421694..7252d296 100644 --- a/app/src/main/java/com/stardust/view/accessibility/AccessibilityServiceUtils.java +++ b/app/src/main/java/com/stardust/view/accessibility/AccessibilityServiceUtils.java @@ -20,7 +20,7 @@ public class AccessibilityServiceUtils { if (Pref.isFirstGoToAccessibilitySetting()) { Toast.makeText(context, context.getString(R.string.text_please_choose) + context.getString(R.string.app_name), Toast.LENGTH_LONG).show(); } - context.startActivity(new Intent(Settings.ACTION_ACCESSIBILITY_SETTINGS)); + context.startActivity(new Intent(Settings.ACTION_ACCESSIBILITY_SETTINGS).addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)); } public static boolean isAccessibilityServiceEnabled(Context context, Class accessibilityService) {