From 0072f28ec596eccb4a8a90cd8eae84069c825865 Mon Sep 17 00:00:00 2001 From: PeanutMelonSeedBigAlmond Date: Fri, 2 Feb 2024 20:16:50 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BF=AE=E6=94=B9=E8=8E=B7=E5=8F=96?= =?UTF-8?q?=E8=AE=BE=E5=A4=87=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../app/src/main/kotlin/com/lifegpc/ehf/MainActivity.kt | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/android/app/src/main/kotlin/com/lifegpc/ehf/MainActivity.kt b/android/app/src/main/kotlin/com/lifegpc/ehf/MainActivity.kt index 06c3256..2dbf8b9 100644 --- a/android/app/src/main/kotlin/com/lifegpc/ehf/MainActivity.kt +++ b/android/app/src/main/kotlin/com/lifegpc/ehf/MainActivity.kt @@ -3,6 +3,7 @@ package com.lifegpc.ehf import android.app.Activity import android.content.Intent import android.os.Build +import android.provider.Settings import android.view.WindowManager import com.lifegpc.ehf.annotation.ChannelMethod import com.lifegpc.ehf.eventbus.SAFAuthEvent @@ -68,5 +69,11 @@ class MainActivity : FlutterActivity() { @ChannelMethod(methodName = "deviceName") @Suppress("unused") - private fun getDeviceName(): String = Build.MODEL + private fun getDeviceName(): String { + return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N_MR1) { + Settings.Global.getString(contentResolver, Settings.Global.DEVICE_NAME) ?: Build.MODEL + } else { + Build.MODEL + } + } }