fix: 修复设备ID序列号可能为null导致的崩溃
将robot.serialNumber的返回值视为可空类型,在trim()和判空前添加安全调用操作符
This commit is contained in:
@@ -402,8 +402,8 @@ class SettingsActivity : AppCompatActivity() {
|
|||||||
if (saved.isNotEmpty()) {
|
if (saved.isNotEmpty()) {
|
||||||
return saved
|
return saved
|
||||||
}
|
}
|
||||||
val serial = runCatching { robot.serialNumber }.getOrDefault("").trim()
|
val serial = runCatching { robot.serialNumber }.getOrDefault("")?.trim()
|
||||||
val deviceId = if (serial.isNotEmpty()) serial else "unknown-device"
|
val deviceId = if (serial?.isNotEmpty() == true) serial else "unknown-device"
|
||||||
prefs.edit().putString(HttpManager.PREF_KEY_DEVICE_ID, deviceId).apply()
|
prefs.edit().putString(HttpManager.PREF_KEY_DEVICE_ID, deviceId).apply()
|
||||||
return deviceId
|
return deviceId
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user