From 0ee94492079e07ae2cd33f64fff441bb93f2c8c1 Mon Sep 17 00:00:00 2001 From: mac <user@users-MacBook-Pro.local> Date: 星期四, 23 五月 2024 15:42:15 +0800 Subject: [PATCH] 2024年05月23日15:42:10 --- app/src/main/java/com/hdl/photovoltaic/ui/bean/CloudInverterDeviceBean.java | 9 +++++++++ app/src/main/java/com/hdl/photovoltaic/ui/powerstation/DeviceSearchActivity.java | 5 +++++ 2 files changed, 14 insertions(+), 0 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 d1a5959..23c31b7 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 @@ -47,6 +47,8 @@ private String outputActivePower;//閫嗗彉鍣ㄨ緭鍑烘湁鍔熷姛鐜� private String address;//璇︾粏鍦板潃 private HouseInfoBean.Location location;//鐢电珯鍦板潃 + private String localSecret;//鎵�灞炵數绔欑殑鏈湴瀵嗛挜 + public String getSystemStatusDesc() { return systemStatusDesc == null ? "" : systemStatusDesc; @@ -250,6 +252,13 @@ this.location = location; } + public String getLocalSecret() { + return localSecret == null ? "" : this.localSecret; + } + + public void setLocalSecret(String localSecret) { + this.localSecret = localSecret; + } /** * 鎷间綇瀹呭湴鍧� diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/powerstation/DeviceSearchActivity.java b/app/src/main/java/com/hdl/photovoltaic/ui/powerstation/DeviceSearchActivity.java index cb83d64..14fd13f 100644 --- a/app/src/main/java/com/hdl/photovoltaic/ui/powerstation/DeviceSearchActivity.java +++ b/app/src/main/java/com/hdl/photovoltaic/ui/powerstation/DeviceSearchActivity.java @@ -17,6 +17,7 @@ import com.hdl.photovoltaic.R; import com.hdl.photovoltaic.base.CustomBaseActivity; import com.hdl.photovoltaic.bean.PageNumberObject; +import com.hdl.photovoltaic.config.UserConfigManage; import com.hdl.photovoltaic.databinding.ActivityDeviceSearchBinding; import com.hdl.photovoltaic.enums.ShowErrorMode; import com.hdl.photovoltaic.listener.CloudCallBeak; @@ -32,6 +33,7 @@ import com.hdl.photovoltaic.uni.HDLUniMP; import com.hdl.photovoltaic.utils.URLEncodingUtils; import com.hdl.sdk.link.core.bean.gateway.GatewayBean; +import com.hdl.sdk.link.core.config.HDLLinkConfig; import com.hdl.sdk.link.gateway.HDLLinkLocalGateway; import java.util.ArrayList; @@ -183,6 +185,9 @@ searchDeviceAdapter.setOnclickListener(new DeviceInfoAdapter.OnClickListener() { @Override public void onClick(int position, CloudInverterDeviceBean deviceBean) { + //閰嶇疆鏈湴閫氫俊鐨勪俊鎭� + HDLLinkConfig.getInstance().setHomeId(deviceBean.getHomeId()); + HDLLinkConfig.getInstance().setLocalSecret(deviceBean.getLocalSecret()); List<CloudInverterDeviceBean> newList = new ArrayList<>(); newList.add(deviceBean); //鐩殑鏄负浜嗚幏鍙栨嬁鍒扮綉鍏矷D锛宮qtt閫氳绉橀挜绛変俊鎭紝缂撳瓨鏈湴閫嗗彉鍣ㄥ垪琛ㄩ噷闈紝鍙戦�佹暟鎹暟鎹椂鑷姩鍘荤紦瀛樺垪琛ㄩ噷闈㈠幓鏌ユ壘锛� -- Gitblit v1.8.0