From b9c6f40690f4a34f69e1b149888ac11a19520e89 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期五, 18 四月 2025 14:12:23 +0800
Subject: [PATCH] 2025-04-18 14:12:01 集成友盟SDK抓闪退

---
 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