From 8a6763af48a243ad3c7e04adfd6a2520d119adac Mon Sep 17 00:00:00 2001 From: hxb <hxb@hdlchina.com.cn> Date: 星期三, 28 六月 2023 18:05:25 +0800 Subject: [PATCH] Merge branch 'wjc' into hxb --- app/src/main/java/com/hdl/photovoltaic/other/HdlDeviceLogic.java | 22 ++++++++++++++++++---- 1 files changed, 18 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/com/hdl/photovoltaic/other/HdlDeviceLogic.java b/app/src/main/java/com/hdl/photovoltaic/other/HdlDeviceLogic.java index da64b67..b22dc3b 100644 --- a/app/src/main/java/com/hdl/photovoltaic/other/HdlDeviceLogic.java +++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlDeviceLogic.java @@ -233,11 +233,25 @@ } - public void searchGateway(GatewayCallBack gatewayCallBack) - { - List<String> spks = new ArrayList<>(); - spks.add("energy.hdl_inverter"); + /** + * 鎼滅储缃戝叧鍒楄〃 + * + * @param gatewayCallBack - + */ + public void searchGateway(GatewayCallBack gatewayCallBack) { + List<String> spks = this.getGatewaySpk(); //缃戝叧鎼滅储 HDLLinkLocalGateway.getInstance().refreshGatewayByHomeIdAndSpk(UserConfigManage.getInstance().getHomeId(), spks, true, gatewayCallBack); } + + /** + * 鑾峰彇缃戝叧spk鍒楄〃 + * + * @return - + */ + private List<String> getGatewaySpk() { + List<String> spks = new ArrayList<>(); + spks.add("energy.hdl_inverter"); + return spks; + } } -- Gitblit v1.8.0