From 5d9cd8a239484bc553e6e388be81ba2614d9c7b2 Mon Sep 17 00:00:00 2001 From: fankesyooni Date: Fri, 13 May 2022 22:54:08 +0800 Subject: [PATCH] Added CPU ABI shower in AppErrorsDetailActivity --- .../apperrorstracking/locale/LocaleString.kt | 6 +++ .../ui/activity/AppErrorsDetailActivity.kt | 1 + .../utils/factory/FunctionFactory.kt | 13 +++++++ app/src/main/res/drawable/bg_black_round.xml | 6 +++ .../res/layout/activity_app_errors_detail.xml | 39 +++++++++++++++---- app/src/main/res/values-ja/strings.xml | 1 + app/src/main/res/values-zh-rCN/strings.xml | 1 + app/src/main/res/values-zh-rHK/strings.xml | 1 + app/src/main/res/values-zh-rMO/strings.xml | 1 + app/src/main/res/values-zh-rTW/strings.xml | 1 + app/src/main/res/values/strings.xml | 1 + 11 files changed, 63 insertions(+), 8 deletions(-) create mode 100644 app/src/main/res/drawable/bg_black_round.xml diff --git a/app/src/main/java/com/fankes/apperrorstracking/locale/LocaleString.kt b/app/src/main/java/com/fankes/apperrorstracking/locale/LocaleString.kt index 25c3463..c824027 100644 --- a/app/src/main/java/com/fankes/apperrorstracking/locale/LocaleString.kt +++ b/app/src/main/java/com/fankes/apperrorstracking/locale/LocaleString.kt @@ -214,4 +214,10 @@ object LocaleString { /** @string Automatic generated */ fun exportAllErrorsFail(vararg objArrs: Any) = R.string.export_all_errors_fail.bind(*objArrs) + + /** @string Automatic generated */ + val noCpuAbi get() = noCpuAbi() + + /** @string Automatic generated */ + fun noCpuAbi(vararg objArrs: Any) = R.string.no_cpu_abi.bind(*objArrs) } \ No newline at end of file diff --git a/app/src/main/java/com/fankes/apperrorstracking/ui/activity/AppErrorsDetailActivity.kt b/app/src/main/java/com/fankes/apperrorstracking/ui/activity/AppErrorsDetailActivity.kt index efa86bf..9e300d3 100644 --- a/app/src/main/java/com/fankes/apperrorstracking/ui/activity/AppErrorsDetailActivity.kt +++ b/app/src/main/java/com/fankes/apperrorstracking/ui/activity/AppErrorsDetailActivity.kt @@ -79,6 +79,7 @@ class AppErrorsDetailActivity : BaseActivity() { binding.appIcon.setImageDrawable(appIcon(appErrorsInfo.packageName)) binding.appNameText.text = appName(appErrorsInfo.packageName) binding.appVersionText.text = appVersion(appErrorsInfo.packageName) + binding.appAbiText.text = appCpuAbi(appErrorsInfo.packageName).ifBlank { LocaleString.noCpuAbi } binding.jvmErrorPanel.isGone = appErrorsInfo.isNativeCrash binding.errorTypeIcon.setImageResource(if (appErrorsInfo.isNativeCrash) R.drawable.ic_cpp else R.drawable.ic_java) binding.errorInfoText.text = appErrorsInfo.exceptionMessage diff --git a/app/src/main/java/com/fankes/apperrorstracking/utils/factory/FunctionFactory.kt b/app/src/main/java/com/fankes/apperrorstracking/utils/factory/FunctionFactory.kt index a83a6b9..4a46521 100644 --- a/app/src/main/java/com/fankes/apperrorstracking/utils/factory/FunctionFactory.kt +++ b/app/src/main/java/com/fankes/apperrorstracking/utils/factory/FunctionFactory.kt @@ -36,6 +36,8 @@ import androidx.core.content.res.ResourcesCompat import com.fankes.apperrorstracking.BuildConfig import com.fankes.apperrorstracking.R import com.fankes.apperrorstracking.locale.LocaleString +import com.highcapable.yukihookapi.hook.factory.field +import com.highcapable.yukihookapi.hook.type.android.ApplicationInfoClass /** * 系统深色模式是否开启 @@ -84,6 +86,17 @@ fun Context.appVersion(packageName: String) = packageManager.getPackageInfo(packageName, PackageManager.GET_META_DATA)?.let { "${it.versionName} (${it.versionCode})" } }.getOrNull() ?: "" +/** + * 获取 APP CPU ABI 名称 + * @param packageName 包名 + * @return [String] + */ +fun Context.appCpuAbi(packageName: String) = + runCatching { + ApplicationInfoClass.field { name = "primaryCpuAbi" } + .get(packageManager.getPackageInfo(packageName, PackageManager.GET_META_DATA)?.applicationInfo).string() + }.getOrNull() ?: "" + /** * 获取 APP 图标 * @param packageName 包名 diff --git a/app/src/main/res/drawable/bg_black_round.xml b/app/src/main/res/drawable/bg_black_round.xml new file mode 100644 index 0000000..de7532e --- /dev/null +++ b/app/src/main/res/drawable/bg_black_round.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_app_errors_detail.xml b/app/src/main/res/layout/activity_app_errors_detail.xml index 197d6f7..1625875 100644 --- a/app/src/main/res/layout/activity_app_errors_detail.xml +++ b/app/src/main/res/layout/activity_app_errors_detail.xml @@ -7,7 +7,7 @@ android:background="@color/colorThemeBackground" android:orientation="vertical" tools:context=".ui.activity.AppErrorsDetailActivity" - tools:ignore="ContentDescription,UseCompoundDrawables"> + tools:ignore="ContentDescription,UseCompoundDrawables,SmallSp"> - + android:gravity="center|start" + android:orientation="horizontal"> + + + + + 詳細を見る すべてのエラーレコードがエクスポートされました すべてのエラーレコードのエクスポートに失敗しました + アビなし \ No newline at end of file diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 0d7d61c..6535ab1 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -42,4 +42,5 @@ 查看详情 已导出全部异常记录 导出全部异常记录失败 + 无原生库 \ No newline at end of file diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml index e7ea425..9597e59 100644 --- a/app/src/main/res/values-zh-rHK/strings.xml +++ b/app/src/main/res/values-zh-rHK/strings.xml @@ -42,4 +42,5 @@ 查看詳情 已導出全部異常紀錄 導出全部異常紀錄失敗 + 無原生庫 \ No newline at end of file diff --git a/app/src/main/res/values-zh-rMO/strings.xml b/app/src/main/res/values-zh-rMO/strings.xml index 14890aa..6a96a94 100644 --- a/app/src/main/res/values-zh-rMO/strings.xml +++ b/app/src/main/res/values-zh-rMO/strings.xml @@ -42,4 +42,5 @@ 查看詳情 已導出全部異常紀錄 導出全部異常紀錄失敗 + 無原生庫 \ No newline at end of file diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 44d59eb..0121b82 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -42,4 +42,5 @@ 查看詳情 已導出全部異常紀錄 導出全部異常紀錄失敗 + 無原生庫 \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index d4d6706..eedf183 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -41,4 +41,5 @@ View detail All errors record exported Failed to exported all errors record + No ABI \ No newline at end of file