From ce3b8953780d1cd77c8781befec6bf7dc22b42b1 Mon Sep 17 00:00:00 2001 From: wjc <1243177876@qq.com> Date: 星期二, 22 四月 2025 13:12:00 +0800 Subject: [PATCH] 2025年04月22日13:11:57 --- app/src/main/java/com/hdl/photovoltaic/ui/bean/CloudInverterDeviceBean.java | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/bean/CloudInverterDeviceBean.java b/app/src/main/java/com/hdl/photovoltaic/ui/bean/CloudInverterDeviceBean.java index 373f4f7..dcc800f 100644 --- a/app/src/main/java/com/hdl/photovoltaic/ui/bean/CloudInverterDeviceBean.java +++ b/app/src/main/java/com/hdl/photovoltaic/ui/bean/CloudInverterDeviceBean.java @@ -127,7 +127,8 @@ } public String getSid() { - return sid == null ? "" : sid; + + return TextUtils.isEmpty(sid) ? "" : sid; } public void setSid(String sid) { @@ -279,7 +280,7 @@ if (this.location == null) { return this.address; } - return this.location.getNationName() + this.location.getProvinceName() + this.location.getCityName() + this.address; + return this.location.getNationName() + " " + this.location.getProvinceName() + " " + this.location.getCityName() + " " + this.address; } public String getHomeNameAndDeviceName() { -- Gitblit v1.8.0