From 24d4d5d3f5b1250db3ef4bc1c89e9259a1c19d86 Mon Sep 17 00:00:00 2001
From: tanjianbin <632190820@qq.com>
Date: Mon, 20 Apr 2026 19:11:02 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E8=AE=BE=E5=A4=87ID?=
 =?UTF-8?q?=E5=BA=8F=E5=88=97=E5=8F=B7=E5=8F=AF=E8=83=BD=E4=B8=BAnull?=
 =?UTF-8?q?=E5=AF=BC=E8=87=B4=E7=9A=84=E5=B4=A9=E6=BA=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

将robot.serialNumber的返回值视为可空类型，在trim()和判空前添加安全调用操作符
---
 .../java/com/example/lzwcai_terminal_temi/SettingsActivity.kt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/com/example/lzwcai_terminal_temi/SettingsActivity.kt b/app/src/main/java/com/example/lzwcai_terminal_temi/SettingsActivity.kt
index bc87602..8caaa4a 100644
--- a/app/src/main/java/com/example/lzwcai_terminal_temi/SettingsActivity.kt
+++ b/app/src/main/java/com/example/lzwcai_terminal_temi/SettingsActivity.kt
@@ -402,8 +402,8 @@ class SettingsActivity : AppCompatActivity() {
         if (saved.isNotEmpty()) {
             return saved
         }
-        val serial = runCatching { robot.serialNumber }.getOrDefault("").trim()
-        val deviceId = if (serial.isNotEmpty()) serial else "unknown-device"
+        val serial = runCatching { robot.serialNumber }.getOrDefault("")?.trim()
+        val deviceId = if (serial?.isNotEmpty() == true) serial else "unknown-device"
         prefs.edit().putString(HttpManager.PREF_KEY_DEVICE_ID, deviceId).apply()
         return deviceId
     }