From fa060dca587b6395ac6f80173a121da395676f15 Mon Sep 17 00:00:00 2001 From: WenHao2130 <98936399+WenHao2130@users.noreply.github.com> Date: Sun, 8 Jun 2025 15:47:48 +0800 Subject: [PATCH] manager: Refactoring the get device name logic (#152) * manager: Import `getDeviceInfo()` from bmax/APatch Co-authored-by: GarfieldHan <2652609017@qq.com> Signed-off-by: WenHao2130 * manager: Use `getDeviceInfo()` instead `Build.DEVICE` Signed-off-by: WenHao2130 --------- Signed-off-by: WenHao2130 Co-authored-by: GarfieldHan <2652609017@qq.com> --- .../com/sukisu/ultra/ui/viewmodel/HomeViewModel.kt | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/manager/app/src/main/java/com/sukisu/ultra/ui/viewmodel/HomeViewModel.kt b/manager/app/src/main/java/com/sukisu/ultra/ui/viewmodel/HomeViewModel.kt index eaa918d0..3893cedd 100644 --- a/manager/app/src/main/java/com/sukisu/ultra/ui/viewmodel/HomeViewModel.kt +++ b/manager/app/src/main/java/com/sukisu/ultra/ui/viewmodel/HomeViewModel.kt @@ -236,6 +236,16 @@ class HomeViewModel : ViewModel() { } } + private fun getDeviceInfo(): String { + var manufacturer = + Build.MANUFACTURER[0].uppercaseChar().toString() + Build.MANUFACTURER.substring(1) + if (Build.BRAND != Build.MANUFACTURER) { + manufacturer += " " + Build.BRAND[0].uppercaseChar() + Build.BRAND.substring(1) + } + manufacturer += " " + Build.MODEL + " " + return manufacturer + } + @SuppressLint("PrivateApi") private fun getDeviceModel(): String { return try { @@ -247,7 +257,7 @@ class HomeViewModel : ViewModel() { "ro.vivo.market.name", // Vivo "ro.config.marketing_name" // Huawei ) - var result = Build.DEVICE + var result = getDeviceInfo() for (key in marketNameKeys) { val marketName = getMethod.invoke(null, key, "") as String if (marketName.isNotEmpty()) { @@ -258,7 +268,7 @@ class HomeViewModel : ViewModel() { result } catch (e: Exception) { Log.e(TAG, "Error getting device model", e) - Build.DEVICE + getDeviceInfo() } }