6.7.0 - Alpha2 - 修复 ErrorDialogActivity 可能无法正常启动的问题 (issue #414, #340); 修复错误报告页面复制详细信息功能失效的问题

This commit is contained in:
SuperMonster003
2025-06-28 19:53:56 +08:00
parent 65ebc8311f
commit 23f84d935d
21 changed files with 279 additions and 151 deletions

View File

@@ -1,15 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:fitsSystemWindows="true"
android:orientation="vertical">
<com.google.android.material.appbar.AppBarLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:fitsSystemWindows="true"
app:theme="@style/AppTheme.AppBarOverlay">
<org.autojs.autojs.theme.widget.ThemeColorToolbar
@@ -21,14 +22,130 @@
</com.google.android.material.appbar.AppBarLayout>
<TextView
android:id="@+id/error"
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:padding="16dp"
android:scrollbars="vertical"
android:textColor="@android:color/secondary_text_light"
android:textSize="16sp"
tools:text="@string/text_error" />
android:orientation="vertical">
<ScrollView
android:id="@+id/error_message_container"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1">
<org.autojs.autojs.ui.widget.SelectableTextView
android:id="@+id/error_message"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:padding="16dp"
android:scrollbars="vertical"
android:textColor="@color/day_night_full"
android:textSize="16sp"
tools:text="@string/text_error" />
</ScrollView>
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="@color/day_night_alpha_20" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="41dp"
android:layout_gravity="center_horizontal"
android:baselineAligned="false">
<LinearLayout
android:id="@+id/copy"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:background="?selectableItemBackground"
android:gravity="center"
android:orientation="horizontal">
<ImageView
android:layout_width="16dp"
android:layout_height="16dp"
android:layout_gravity="center"
android:layout_marginEnd="10dp"
android:src="@drawable/ic_content_copy_small_black_48dp"
app:tint="?android:textColorPrimary"
tools:ignore="ContentDescription" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginEnd="4dp"
android:gravity="center"
android:text="@string/text_copy"
android:textColor="?android:textColorPrimary"
android:textSize="15sp" />
</LinearLayout>
<LinearLayout
android:id="@+id/restart"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:background="?selectableItemBackground"
android:gravity="center"
android:orientation="horizontal">
<ImageView
android:layout_width="16dp"
android:layout_height="16dp"
android:layout_gravity="center"
android:layout_marginEnd="10dp"
android:src="@drawable/ic_refresh_white_24dp"
app:tint="?android:textColorPrimary"
tools:ignore="ContentDescription" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginEnd="4dp"
android:gravity="center"
android:text="@string/text_restart"
android:textColor="?android:textColorPrimary"
android:textSize="15sp" />
</LinearLayout>
<LinearLayout
android:id="@+id/exit"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:background="?selectableItemBackground"
android:gravity="center"
android:orientation="horizontal">
<ImageView
android:layout_width="16dp"
android:layout_height="16dp"
android:layout_gravity="center"
android:layout_marginEnd="10dp"
android:src="@drawable/ic_ali_exit"
app:tint="?android:textColorPrimary"
tools:ignore="ContentDescription" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginEnd="4dp"
android:textColor="?android:textColorPrimary"
android:gravity="center"
android:text="@string/text_exit"
android:textSize="15sp" />
</LinearLayout>
</LinearLayout>
</LinearLayout>
</LinearLayout>

View File

@@ -83,7 +83,7 @@
android:layout_gravity="center_vertical"
android:layout_marginEnd="4dp"
android:gravity="center"
android:text="@string/text_restart_app"
android:text="@string/text_restart"
android:textColor="?android:textColorPrimary"
android:textSize="15sp" />

View File

@@ -910,7 +910,7 @@
<string name="text_reset_succeed">نجحت إعادة تعيين</string>
<string name="text_reset_to_initial_content">إعادة تعيين في البداية</string>
<string name="text_reset_to_initial_content_only_for_assets">إعادة التعيين هي فقط للعينات</string>
<string name="text_restart_app">إعادة بدء</string>
<string name="text_restart">إعادة بدء</string>
<string name="text_result">نتيجة</string>
<string name="text_revoke_autojs6_access_in_shizuku_app">قم بإلغاء الوصول إلى AutoJs6 في تطبيق Shizuku</string>
<string name="text_root_mode_title">فحص الجذر مجموعة القوة</string>

View File

@@ -905,7 +905,7 @@
<string name="text_reset_succeed">Reset succeeded</string>
<string name="text_reset_to_initial_content">Reset initially</string>
<string name="text_reset_to_initial_content_only_for_assets">Reset is only for samples</string>
<string name="text_restart_app">Restart</string>
<string name="text_restart">Restart</string>
<string name="text_result">Result</string>
<string name="text_revoke_autojs6_access_in_shizuku_app">Revoke AutoJs6 access in Shizuku app</string>
<string name="text_root_mode_title">Force set root check</string>

View File

@@ -908,7 +908,7 @@
<string name="text_reset_succeed">Restablecer con éxito</string>
<string name="text_reset_to_initial_content">Restablecer inicialmente</string>
<string name="text_reset_to_initial_content_only_for_assets">El restablecimiento es sólo para las muestras</string>
<string name="text_restart_app">Reiniciar</string>
<string name="text_restart">Reiniciar</string>
<string name="text_result">Resultado</string>
<string name="text_revoke_autojs6_access_in_shizuku_app">Revocar privilegios de AutoJs6 en una aplicación Shizuku</string>
<string name="text_root_mode_title">Forzar la comprobación de root</string>

View File

@@ -908,7 +908,7 @@
<string name="text_reset_succeed">Réinitialisation réussie</string>
<string name="text_reset_to_initial_content">Réinitialisation initiale</string>
<string name="text_reset_to_initial_content_only_for_assets">Reset n\'est que pour les échantillons</string>
<string name="text_restart_app">Redémarrer</string>
<string name="text_restart">Redémarrer</string>
<string name="text_result">Résultat</string>
<string name="text_revoke_autojs6_access_in_shizuku_app">Révoquer les privilèges AutoJs6 dans une application Shizuku</string>
<string name="text_root_mode_title">Force set root check</string>

View File

@@ -909,7 +909,7 @@
<string name="text_reset_succeed">リセット成功</string>
<string name="text_reset_to_initial_content">初期リセット</string>
<string name="text_reset_to_initial_content_only_for_assets">リセットはサンプルのみ</string>
<string name="text_restart_app">再起動</string>
<string name="text_restart">再起動</string>
<string name="text_result">結果</string>
<string name="text_revoke_autojs6_access_in_shizuku_app">Shizuku アプリケーションで AutoJs6 権限を取り消す</string>
<string name="text_root_mode_title">強制的に root にするチェック</string>

View File

@@ -910,7 +910,7 @@
<string name="text_reset_succeed">재설정이 성공했습니다</string>
<string name="text_reset_to_initial_content">처음에 재설정하십시오</string>
<string name="text_reset_to_initial_content_only_for_assets">재설정은 샘플에만 해당됩니다</string>
<string name="text_restart_app">재시작</string>
<string name="text_restart">재시작</string>
<string name="text_result">결과</string>
<string name="text_revoke_autojs6_access_in_shizuku_app">Shizuku 애플리케이션에서 AutoJs6 권한 취소하기</string>
<string name="text_root_mode_title">강제 설정 루트 검사</string>

View File

@@ -908,7 +908,7 @@
<string name="text_reset_succeed">Сброс выполнен успешно</string>
<string name="text_reset_to_initial_content">Сброс первоначально</string>
<string name="text_reset_to_initial_content_only_for_assets">Сброс выполняется только для образцов</string>
<string name="text_restart_app">Перезапустить</string>
<string name="text_restart">Перезапустить</string>
<string name="text_result">Результат</string>
<string name="text_revoke_autojs6_access_in_shizuku_app">Отмена привилегий AutoJs6 в приложении Shizuku</string>
<string name="text_root_mode_title">Проверка принудительной установки root</string>

View File

@@ -906,7 +906,7 @@
<string name="text_reset_succeed">重置成功</string>
<string name="text_reset_to_initial_content">重置為初始內容</string>
<string name="text_reset_to_initial_content_only_for_assets">只能重置示例代碼文件</string>
<string name="text_restart_app">重啓</string>
<string name="text_restart">重啓</string>
<string name="text_result">結果</string>
<string name="text_revoke_autojs6_access_in_shizuku_app">在 Shizuku 應用中撤銷 AutoJs6 權限</string>
<string name="text_root_mode_title">強制 Root 權限檢查</string>

View File

@@ -906,7 +906,7 @@
<string name="text_reset_succeed">重置成功</string>
<string name="text_reset_to_initial_content">重置為初始內容</string>
<string name="text_reset_to_initial_content_only_for_assets">只能重置示例程式碼檔案</string>
<string name="text_restart_app">重啟</string>
<string name="text_restart">重啟</string>
<string name="text_result">結果</string>
<string name="text_revoke_autojs6_access_in_shizuku_app">在 Shizuku 應用中撤銷 AutoJs6 許可權</string>
<string name="text_root_mode_title">強制 Root 許可權檢查</string>

View File

@@ -906,7 +906,7 @@
<string name="text_reset_succeed">重置成功</string>
<string name="text_reset_to_initial_content">重置为初始内容</string>
<string name="text_reset_to_initial_content_only_for_assets">只能重置示例代码文件</string>
<string name="text_restart_app">重启</string>
<string name="text_restart">重启</string>
<string name="text_result">结果</string>
<string name="text_revoke_autojs6_access_in_shizuku_app">在 Shizuku 应用中撤销 AutoJs6 权限</string>
<string name="text_root_mode_title">强制 Root 权限检查</string>

View File

@@ -1136,7 +1136,7 @@
<string name="text_reset_succeed">Reset succeeded</string>
<string name="text_reset_to_initial_content">Reset initially</string>
<string name="text_reset_to_initial_content_only_for_assets">Reset is only for samples</string>
<string name="text_restart_app">Restart</string>
<string name="text_restart">Restart</string>
<string name="text_result">Result</string>
<string name="text_revoke_autojs6_access_in_shizuku_app">Revoke AutoJs6 access in Shizuku app</string>
<string name="text_root_mode_title">Force set root check</string>