From ea68183f80f3b91ebac9155ed8f12151da62486d Mon Sep 17 00:00:00 2001 From: Seyud <2159455958@qq.com> Date: Tue, 29 Jul 2025 20:26:19 +0800 Subject: [PATCH] revert: fix: Remove the incorrect display of the KPM version and simplify the checking logic (#299) --- .../java/zako/zako/zako/zakoui/activity/component/BottomBar.kt | 2 +- .../main/java/zako/zako/zako/zakoui/activity/util/AppData.kt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/manager/app/src/main/java/zako/zako/zako/zakoui/activity/component/BottomBar.kt b/manager/app/src/main/java/zako/zako/zako/zakoui/activity/component/BottomBar.kt index 12debc22..c0217eed 100644 --- a/manager/app/src/main/java/zako/zako/zako/zakoui/activity/component/BottomBar.kt +++ b/manager/app/src/main/java/zako/zako/zako/zakoui/activity/component/BottomBar.kt @@ -59,7 +59,7 @@ fun BottomBar(navController: NavHostController) { ) { BottomBarDestination.entries.forEach { destination -> if (destination == BottomBarDestination.Kpm) { - if (kpmVersion.isNotEmpty() && !showKpmInfo && Natives.version >= Natives.MINIMAL_SUPPORTED_KPM) { + if (kpmVersion.isNotEmpty() && !kpmVersion.startsWith("Error") && !showKpmInfo && Natives.version >= Natives.MINIMAL_SUPPORTED_KPM) { if (!isFullFeatured && destination.rootRequired) return@forEach val isCurrentDestOnBackStack by navController.isRouteOnBackStackAsState(destination.direction) NavigationBarItem( diff --git a/manager/app/src/main/java/zako/zako/zako/zakoui/activity/util/AppData.kt b/manager/app/src/main/java/zako/zako/zako/zakoui/activity/util/AppData.kt index 3c498a1b..1ec67f81 100644 --- a/manager/app/src/main/java/zako/zako/zako/zakoui/activity/util/AppData.kt +++ b/manager/app/src/main/java/zako/zako/zako/zakoui/activity/util/AppData.kt @@ -88,7 +88,7 @@ object AppData { val version = getKpmVersion() if (version.isEmpty()) "" else version } catch (e: Exception) { - "" + "Error: ${e.message}" } }