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

修复崩溃问题

Browse Source 
增加 查看使用统计权限的说明
This commit is contained in:
hyb1996
2018-11-30 14:52:30 +08:00
parent ee2860b6de
commit a38bc53b61
8 changed files with 25 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
app/src/main/java/org/autojs/autojs/ui/main/drawer/DrawerFragment.java
View File

@@ -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());
}
}

4
app/src/main/res/layout/activity_build.xml
View File

@@ -76,7 +76,7 @@
</com.google.android.material.textfield.TextInputLayout>
<android.support.v7.widget.AppCompatButton
<androidx.appcompat.widget.AppCompatButton
android:id="@+id/select_source"
style="@style/Base.Widget.AppCompat.Button.Borderless.Colored"
android:layout_width="60dp"
@@ -106,7 +106,7 @@
</com.google.android.material.textfield.TextInputLayout>
<android.support.v7.widget.AppCompatButton
<androidx.appcompat.widget.AppCompatButton
android:id="@+id/select_output"
style="@style/Base.Widget.AppCompat.Button.Borderless.Colored"
android:layout_width="60dp"

4
app/src/main/res/layout/air_activity_issue_reporter.xml
View File

@@ -33,7 +33,7 @@
android:layout_height="wrap_content"
android:theme="@style/AppTheme.AppBarOverlay">
<android.support.v7.widget.Toolbar
<androidx.appcompat.widget.Toolbar
android:id="@+id/air_toolbar"
android:layout_width="match_parent"
android:layout_height="wrap_content"/>
@@ -67,7 +67,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/air_card_margin_top"/>
<androidx.core.widget.Space
<android.widget.Space
android:layout_width="match_parent"
android:layout_height="56dp"
android:layout_margin="@dimen/air_baseline"/>

2
app/src/main/res/layout/air_card_report_compat.xml
View File

@@ -105,7 +105,7 @@
app:ael_interpolator="fastOutSlowIn"
app:ael_orientation="vertical">
<android.support.v7.widget.AppCompatTextView
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/air_textDeviceInfo"
android:layout_width="match_parent"
android:layout_height="wrap_content"

1
app/src/main/res/values/strings.xml
View File

@@ -430,4 +430,5 @@
<string name="key_night_mode">key_night_mode</string>
<string name="text_run_on_startup">Auto.js启动时</string>
<string name="text_usage_stats_permission">查看使用统计权限</string>
<string name="description_usage_stats_permission">通过\"查看使用统计\"权限可以获取本设备过去使用应用的情况，从而使获取当前应用(currentPackage)时更准确。</string>
</resources>

5
autojs/src/main/java/com/stardust/autojs/core/graphics/ScriptCanvas.java
View File

@@ -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;
}

2
inrt/src/main/res/layout/activity_main.xml
View File

@@ -13,7 +13,7 @@
android:layout_height="wrap_content"
android:theme="@style/AppTheme.AppBarOverlay">
<android.support.v7.widget.Toolbar
<androidx.appcompat.widget.Toolbar
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="wrap_content"

2
inrt/src/main/res/layout/activity_settings.xml
View File

@@ -13,7 +13,7 @@
android:layout_height="wrap_content"
android:theme="@style/AppTheme.AppBarOverlay">
<android.support.v7.widget.Toolbar
<androidx.appcompat.widget.Toolbar
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="wrap_content"