diff --git a/app/src/main/java/org/autojs/autojs/ui/main/drawer/DrawerFragment.java b/app/src/main/java/org/autojs/autojs/ui/main/drawer/DrawerFragment.java index 16ebcaa5..b5947cc7 100644 --- a/app/src/main/java/org/autojs/autojs/ui/main/drawer/DrawerFragment.java +++ b/app/src/main/java/org/autojs/autojs/ui/main/drawer/DrawerFragment.java @@ -2,6 +2,7 @@ package org.autojs.autojs.ui.main.drawer; import android.annotation.SuppressLint; import android.app.AppOpsManager; +import android.content.DialogInterface; import android.content.Intent; import android.os.Build; import android.os.Bundle; @@ -238,7 +239,17 @@ public class DrawerFragment extends androidx.fragment.app.Fragment { } boolean enabled = AppOpsKt.isOpPermissionGranted(getContext(), AppOpsManager.OPSTR_GET_USAGE_STATS); boolean checked = holder.getSwitchCompat().isChecked(); - if ((checked && !enabled) || (!checked && enabled)) { + if(checked && !enabled){ + if(new NotAskAgainDialog.Builder(getContext(), "DrawerFragment.usage_stats") + .title(R.string.text_usage_stats_permission) + .content(R.string.description_usage_stats_permission) + .positiveText(R.string.ok) + .dismissListener(dialog -> IntentUtil.requestAppUsagePermission(getContext())) + .show() == null){ + IntentUtil.requestAppUsagePermission(getContext()); + } + } + if (!checked && enabled) { IntentUtil.requestAppUsagePermission(getContext()); } } diff --git a/app/src/main/res/layout/activity_build.xml b/app/src/main/res/layout/activity_build.xml index 58e80db1..4acdc1fd 100644 --- a/app/src/main/res/layout/activity_build.xml +++ b/app/src/main/res/layout/activity_build.xml @@ -76,7 +76,7 @@ - - - @@ -67,7 +67,7 @@ android:layout_height="wrap_content" android:layout_marginTop="@dimen/air_card_margin_top"/> - diff --git a/app/src/main/res/layout/air_card_report_compat.xml b/app/src/main/res/layout/air_card_report_compat.xml index 6e82d92e..6a555d1b 100644 --- a/app/src/main/res/layout/air_card_report_compat.xml +++ b/app/src/main/res/layout/air_card_report_compat.xml @@ -105,7 +105,7 @@ app:ael_interpolator="fastOutSlowIn" app:ael_orientation="vertical"> - key_night_mode Auto.js启动时 查看使用统计权限 + 通过\"查看使用统计\"权限可以获取本设备过去使用应用的情况,从而使获取当前应用(currentPackage)时更准确。 diff --git a/autojs/src/main/java/com/stardust/autojs/core/graphics/ScriptCanvas.java b/autojs/src/main/java/com/stardust/autojs/core/graphics/ScriptCanvas.java index f799a338..d7d79df3 100644 --- a/autojs/src/main/java/com/stardust/autojs/core/graphics/ScriptCanvas.java +++ b/autojs/src/main/java/com/stardust/autojs/core/graphics/ScriptCanvas.java @@ -12,6 +12,7 @@ import android.graphics.Rect; import android.graphics.RectF; import android.graphics.Region; import android.os.Build; + import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.annotation.RequiresApi; @@ -45,6 +46,10 @@ public class ScriptCanvas { } + public Canvas getAndroidCanvas() { + return mCanvas; + } + void setCanvas(Canvas canvas) { mCanvas = canvas; } diff --git a/inrt/src/main/res/layout/activity_main.xml b/inrt/src/main/res/layout/activity_main.xml index 58c2433f..69dfffe7 100644 --- a/inrt/src/main/res/layout/activity_main.xml +++ b/inrt/src/main/res/layout/activity_main.xml @@ -13,7 +13,7 @@ android:layout_height="wrap_content" android:theme="@style/AppTheme.AppBarOverlay"> - -