diff --git a/app/src/main/java/com/fankes/apperrorstracking/bean/AppErrorsInfoBean.kt b/app/src/main/java/com/fankes/apperrorstracking/bean/AppErrorsInfoBean.kt index 72be1cb..007a9f1 100644 --- a/app/src/main/java/com/fankes/apperrorstracking/bean/AppErrorsInfoBean.kt +++ b/app/src/main/java/com/fankes/apperrorstracking/bean/AppErrorsInfoBean.kt @@ -100,7 +100,7 @@ data class AppErrorsInfoBean( userId = userId, cpuAbi = packageName?.let { context.appCpuAbiOf(it) } ?: "", packageName = packageName ?: "unknown", - versionName = packageName?.let { context.appVersionNameOf(it) } ?: "", + versionName = packageName?.let { context.appVersionNameOf(it).ifBlank { "unknown" } } ?: "", versionCode = packageName?.let { context.appVersionCodeOf(it) } ?: -1L, isNativeCrash = isNativeCrash, exceptionClassName = crashInfo?.exceptionClassName ?: "unknown", diff --git a/app/src/main/java/com/fankes/apperrorstracking/data/AppErrorsRecordData.kt b/app/src/main/java/com/fankes/apperrorstracking/data/AppErrorsRecordData.kt index 3f7ec5d..74c4119 100644 --- a/app/src/main/java/com/fankes/apperrorstracking/data/AppErrorsRecordData.kt +++ b/app/src/main/java/com/fankes/apperrorstracking/data/AppErrorsRecordData.kt @@ -87,7 +87,7 @@ object AppErrorsRecordData { ?.toEntityOrNull>() ?.onEach { e -> e.cpuAbi = it.appCpuAbiOf(e.packageName) - e.versionName = it.appVersionNameOf(e.packageName) + e.versionName = it.appVersionNameOf(e.packageName).ifBlank { "unknown" } e.versionCode = it.appVersionCodeOf(e.packageName) e.toJsonOrNull()?.also { json -> File(errorsInfoDataFolder.absolutePath, e.jsonFileName).writeText(json) } }.let { result -> diff --git a/app/src/main/java/com/fankes/apperrorstracking/hook/entity/FrameworkHooker.kt b/app/src/main/java/com/fankes/apperrorstracking/hook/entity/FrameworkHooker.kt index a0d3e14..ecfa62f 100644 --- a/app/src/main/java/com/fankes/apperrorstracking/hook/entity/FrameworkHooker.kt +++ b/app/src/main/java/com/fankes/apperrorstracking/hook/entity/FrameworkHooker.kt @@ -274,7 +274,7 @@ object FrameworkHooker : YukiBaseHooker() { */ private fun AppErrorsProcessData.handleShowAppErrorUi(context: Context) { /** 当前 APP 名称 */ - val appName = appInfo?.let { context.appNameOf(it.packageName) } ?: packageName + val appName = appInfo?.let { context.appNameOf(it.packageName).ifBlank { it.packageName } } ?: packageName /** 当前 APP 名称 (包含用户 ID) */ val appNameWithUserId = if (userId != 0) "$appName (${LocaleString.userId(userId)})" else appName diff --git a/app/src/main/java/com/fankes/apperrorstracking/ui/activity/errors/AppErrorsDetailActivity.kt b/app/src/main/java/com/fankes/apperrorstracking/ui/activity/errors/AppErrorsDetailActivity.kt index 241076b..719e71d 100644 --- a/app/src/main/java/com/fankes/apperrorstracking/ui/activity/errors/AppErrorsDetailActivity.kt +++ b/app/src/main/java/com/fankes/apperrorstracking/ui/activity/errors/AppErrorsDetailActivity.kt @@ -106,7 +106,7 @@ class AppErrorsDetailActivity : BaseActivity() { }, LocaleString.shareErrorStack)) } binding.appIcon.setImageDrawable(appIconOf(appErrorsInfo.packageName)) - binding.appNameText.text = appNameOf(appErrorsInfo.packageName) + binding.appNameText.text = appNameOf(appErrorsInfo.packageName).ifBlank { appErrorsInfo.packageName } binding.appVersionText.text = appErrorsInfo.versionBrand binding.appUserIdText.isVisible = appErrorsInfo.userId > 0 binding.appUserIdText.text = LocaleString.userId(appErrorsInfo.userId) @@ -133,7 +133,9 @@ class AppErrorsDetailActivity : BaseActivity() { } } binding.appPanelScrollView.setOnScrollChangeListener { _, _, y, _, _ -> - binding.detailTitleText.text = if (y >= 30.dp(context = this)) appNameOf(appErrorsInfo.packageName) else LocaleString.appName + binding.detailTitleText.text = if (y >= 30.dp(context = this)) + appNameOf(appErrorsInfo.packageName).ifBlank { appErrorsInfo.packageName } + else LocaleString.appName } binding.detailTitleText.setOnClickListener { binding.appPanelScrollView.smoothScrollTo(0, 0) } resetScrollView() diff --git a/app/src/main/java/com/fankes/apperrorstracking/ui/activity/errors/AppErrorsMutedActivity.kt b/app/src/main/java/com/fankes/apperrorstracking/ui/activity/errors/AppErrorsMutedActivity.kt index 2662596..b2d4bc4 100644 --- a/app/src/main/java/com/fankes/apperrorstracking/ui/activity/errors/AppErrorsMutedActivity.kt +++ b/app/src/main/java/com/fankes/apperrorstracking/ui/activity/errors/AppErrorsMutedActivity.kt @@ -59,7 +59,7 @@ class AppErrorsMutedActivity : BaseActivity() { onBindViews { binding, position -> listData[position].also { bean -> binding.appIcon.setImageDrawable(appIconOf(bean.packageName)) - binding.appNameText.text = appNameOf(bean.packageName) + binding.appNameText.text = appNameOf(bean.packageName).ifBlank { bean.packageName } binding.muteTypeText.text = when (bean.type) { MutedErrorsAppBean.MuteType.UNTIL_UNLOCKS -> LocaleString.muteIfUnlock MutedErrorsAppBean.MuteType.UNTIL_REBOOTS -> LocaleString.muteIfRestart diff --git a/app/src/main/java/com/fankes/apperrorstracking/ui/activity/errors/AppErrorsRecordActivity.kt b/app/src/main/java/com/fankes/apperrorstracking/ui/activity/errors/AppErrorsRecordActivity.kt index 074082a..b866199 100644 --- a/app/src/main/java/com/fankes/apperrorstracking/ui/activity/errors/AppErrorsRecordActivity.kt +++ b/app/src/main/java/com/fankes/apperrorstracking/ui/activity/errors/AppErrorsRecordActivity.kt @@ -96,7 +96,7 @@ class AppErrorsRecordActivity : BaseActivity() { binding.totalErrorsUnitText.text = LocaleString.totalErrorsUnit(listData.size) binding.totalAppsUnitText.text = LocaleString.totalAppsUnit(it.size) binding.mostErrorsAppIcon.setImageDrawable(appIconOf(mostAppPackageName)) - binding.mostErrorsAppText.text = appNameOf(mostAppPackageName) + binding.mostErrorsAppText.text = appNameOf(mostAppPackageName).ifBlank { mostAppPackageName } binding.mostErrorsTypeText.text = mostErrorsType binding.totalPptOfErrorsText.text = "$pptCount%" confirmButton(LocaleString.gotIt) @@ -134,7 +134,7 @@ class AppErrorsRecordActivity : BaseActivity() { onBindViews { binding, position -> listData[position].also { bean -> binding.appIcon.setImageDrawable(appIconOf(bean.packageName)) - binding.appNameText.text = appNameOf(bean.packageName) + binding.appNameText.text = appNameOf(bean.packageName).ifBlank { bean.packageName } binding.appUserIdText.isVisible = bean.userId > 0 binding.appUserIdText.text = LocaleString.userId(bean.userId) binding.errorsTimeText.text = bean.crossTime