From d9d4c62bf2c6ec8cfe93ae93f076e38d519e07bf Mon Sep 17 00:00:00 2001 From: PeanutMelonSeedBigAlmond Date: Fri, 2 Feb 2024 23:03:16 +0800 Subject: [PATCH] =?UTF-8?q?fix:=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=202?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/kotlin/com/lifegpc/ehf/MainActivity.kt | 10 +++++++++- 1 file changed, 9 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 2dbf8b9..c9dbe10 100644 --- a/android/app/src/main/kotlin/com/lifegpc/ehf/MainActivity.kt +++ b/android/app/src/main/kotlin/com/lifegpc/ehf/MainActivity.kt @@ -4,6 +4,7 @@ import android.app.Activity import android.content.Intent import android.os.Build import android.provider.Settings +import android.util.Log import android.view.WindowManager import com.lifegpc.ehf.annotation.ChannelMethod import com.lifegpc.ehf.eventbus.SAFAuthEvent @@ -55,6 +56,11 @@ class MainActivity : FlutterActivity() { } } + override fun onResume() { + super.onResume() + Log.i("MainActivity","DeviceName=${getDeviceName()}") + } + @ChannelMethod(methodName = "enableProtect") @Suppress("unused") private fun enableFlagSecure() { @@ -71,7 +77,9 @@ class MainActivity : FlutterActivity() { @Suppress("unused") 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 + Settings.Global.getString(contentResolver, Settings.Global.DEVICE_NAME) + ?: Settings.System.getString(contentResolver, Settings.Global.DEVICE_NAME) + ?: Build.MODEL } else { Build.MODEL }