diff --git a/app/src/main/java/org/autojs/autojs/ui/explorer/ExplorerView.java b/app/src/main/java/org/autojs/autojs/ui/explorer/ExplorerView.java index e4155f85..c4ce2a58 100644 --- a/app/src/main/java/org/autojs/autojs/ui/explorer/ExplorerView.java +++ b/app/src/main/java/org/autojs/autojs/ui/explorer/ExplorerView.java @@ -2,6 +2,7 @@ package org.autojs.autojs.ui.explorer; import android.annotation.SuppressLint; import android.content.Context; +import android.content.Intent; import android.graphics.drawable.GradientDrawable; import androidx.annotation.Nullable; import com.google.android.material.snackbar.Snackbar; @@ -354,6 +355,7 @@ public class ExplorerView extends ThemeColorSwipeRefreshLayout implements SwipeR case R.id.action_build_apk: BuildActivity_.intent(getContext()) .extra(BuildActivity.EXTRA_SOURCE, mSelectedItem.getPath()) + .flags(Intent.FLAG_ACTIVITY_NEW_TASK) .start(); notifyOperated(); break; diff --git a/app/src/main/java/org/autojs/autojs/ui/project/BuildActivity.java b/app/src/main/java/org/autojs/autojs/ui/project/BuildActivity.java index 85afa663..d925f17f 100644 --- a/app/src/main/java/org/autojs/autojs/ui/project/BuildActivity.java +++ b/app/src/main/java/org/autojs/autojs/ui/project/BuildActivity.java @@ -197,6 +197,7 @@ public class BuildActivity extends BaseActivity implements ApkBuilder.ProgressCa @Click(R.id.icon) void selectIcon() { ShortcutIconSelectActivity_.intent(this) + .flags(Intent.FLAG_ACTIVITY_NEW_TASK) .startForResult(REQUEST_CODE); } diff --git a/app/src/main/java/org/autojs/autojs/ui/project/ProjectConfigActivity.java b/app/src/main/java/org/autojs/autojs/ui/project/ProjectConfigActivity.java index 704113ae..29102b08 100644 --- a/app/src/main/java/org/autojs/autojs/ui/project/ProjectConfigActivity.java +++ b/app/src/main/java/org/autojs/autojs/ui/project/ProjectConfigActivity.java @@ -189,6 +189,7 @@ public class ProjectConfigActivity extends BaseActivity { @Click(R.id.icon) void selectIcon() { ShortcutIconSelectActivity_.intent(this) + .flags(Intent.FLAG_ACTIVITY_NEW_TASK) .startForResult(REQUEST_CODE); } diff --git a/app/src/main/java/org/autojs/autojs/ui/shortcut/ShortcutCreateActivity.java b/app/src/main/java/org/autojs/autojs/ui/shortcut/ShortcutCreateActivity.java index 2aec7e0a..632f3092 100644 --- a/app/src/main/java/org/autojs/autojs/ui/shortcut/ShortcutCreateActivity.java +++ b/app/src/main/java/org/autojs/autojs/ui/shortcut/ShortcutCreateActivity.java @@ -84,6 +84,7 @@ public class ShortcutCreateActivity extends AppCompatActivity { @OnClick(R.id.icon) void selectIcon() { ShortcutIconSelectActivity_.intent(this) + .flags(Intent.FLAG_ACTIVITY_NEW_TASK) .startForResult(21209); } diff --git a/autojs/src/main/java/com/stardust/autojs/AutoJs.java b/autojs/src/main/java/com/stardust/autojs/AutoJs.java index cdc39489..12365951 100644 --- a/autojs/src/main/java/com/stardust/autojs/AutoJs.java +++ b/autojs/src/main/java/com/stardust/autojs/AutoJs.java @@ -101,9 +101,6 @@ public abstract class AutoJs { return exception; }); ResourceMonitor.setUnclosedResourceDetectedHandler(mGlobalConsole::error); -// if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) { -// mContext.startForegroundService(new Intent(mContext, CaptureForegroundService.class).addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)); -// } } public abstract void ensureAccessibilityServiceEnabled(); diff --git a/autojs/src/main/java/com/stardust/autojs/core/image/ImageWrapper.java b/autojs/src/main/java/com/stardust/autojs/core/image/ImageWrapper.java index ce1da7bb..69a15a9b 100644 --- a/autojs/src/main/java/com/stardust/autojs/core/image/ImageWrapper.java +++ b/autojs/src/main/java/com/stardust/autojs/core/image/ImageWrapper.java @@ -149,7 +149,11 @@ public class ImageWrapper { public synchronized void recycle() { if (mBitmap != null && !mBitmap.isRecycled()) { - mBitmap.recycle(); + try { + mBitmap.recycle(); + } catch (Exception e) { + Log.e("ImageWrapper", "回收bitmap失败"); + } mBitmap = null; } else if (mBitmap != null && mBitmap.isRecycled()) { Log.d("ImageWrapper", "recycle bitmap: not null but is recycled"); diff --git a/common/src/main/java/com/stardust/util/SdkVersionUtil.java b/common/src/main/java/com/stardust/util/SdkVersionUtil.java index d66be0a7..d49cdf7e 100644 --- a/common/src/main/java/com/stardust/util/SdkVersionUtil.java +++ b/common/src/main/java/com/stardust/util/SdkVersionUtil.java @@ -10,7 +10,7 @@ public class SdkVersionUtil { "1.0", "1.1", "1.5", "1.6", "2.0", "2.0.1", "2.1.x", "2.2.x", "2.3", "2.3.3", "3.0.x", "3.1.x", "3.2", "4.0", "4.0.3", "4.1", "4.2", "4.3", "4.4.2", "4.4W", "5.0", "5.1", "6.0", "7.0", "7.1", - "8.0" + "8.0", "8.1", "9.0", "10.0", "11.0", "12.0" }; public static String sdkIntToString(int i) {