From 8f14c06d68437bbef44df779ab27c9723d787267 Mon Sep 17 00:00:00 2001 From: wjc <1243177876@qq.com> Date: 星期二, 25 二月 2025 20:37:18 +0800 Subject: [PATCH] 2025年02月25日20:37:15 --- app/src/main/java/com/hdl/photovoltaic/other/HdlDeviceLogic.java | 11 ++++------- 1 files changed, 4 insertions(+), 7 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 f50ad83..2f1d14c 100644 --- a/app/src/main/java/com/hdl/photovoltaic/other/HdlDeviceLogic.java +++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlDeviceLogic.java @@ -1732,13 +1732,10 @@ gatewayBean.setDevice_name(cloudInverterDeviceBean.getName());//璁惧鍚嶇О gatewayBean.setGatewayType(cloudInverterDeviceBean.getSpk());//璁剧疆spk gatewayBean.setLocalEncrypt(true); - if (cloudInverterDeviceBean.getSpk().equals(HdlDeviceLogic.sHdlDeviceLogic.OFF_INVERTER_OG_SPK)) { - //绂荤綉閫嗗彉鍣� - gatewayBean.setMaster(String.valueOf(cloudInverterDeviceBean.isMaster()));//榛樿閮芥槸涓婚�嗗彉鍣�(浠ュ悗鏀寔浠庨�嗗彉鍣ㄨ鏇存敼) - } else { - //閫嗗彉鍣� - gatewayBean.setMaster(GatewayMasterType.MasterTrue);//榛樿閮芥槸涓婚�嗗彉鍣�(浠ュ悗鏀寔浠庨�嗗彉鍣ㄨ鏇存敼) - } + //绂荤綉閫嗗彉鍣� + gatewayBean.setOgMaster(cloudInverterDeviceBean.isOgMaster()); + //閫嗗彉鍣� + gatewayBean.setMaster(GatewayMasterType.MasterTrue);//榛樿閮芥槸涓婚�嗗彉鍣�(浠ュ悗鏀寔浠庨�嗗彉鍣ㄨ鏇存敼) gatewayBean.setSystemStatusDesc(cloudInverterDeviceBean.getSystemStatusDesc());//璁惧鐘舵�� gatewayBean.setHwVersion(cloudInverterDeviceBean.getHwVersion());//杞欢鐗堟湰鍙� gatewayBean.setCategorySecondName(cloudInverterDeviceBean.getCategorySecondName());//璁惧绫诲瀷(浜у搧浜岀骇鍒嗙被鍚嶇О -- Gitblit v1.8.0