From a59bbb7890e107a681f677765f2600e278c06a0d Mon Sep 17 00:00:00 2001 From: mac <user@users-MacBook-Pro.local> Date: 星期一, 09 十月 2023 10:16:37 +0800 Subject: [PATCH] 2023年10月09日10:16:35 --- app/src/main/java/com/hdl/photovoltaic/other/HdlDeviceLogic.java | 473 +++++++++++++++++++++++++++++++++++++++++++++++++++------- 1 files changed, 410 insertions(+), 63 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 f914f0e..6462ac8 100644 --- a/app/src/main/java/com/hdl/photovoltaic/other/HdlDeviceLogic.java +++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlDeviceLogic.java @@ -1,11 +1,15 @@ package com.hdl.photovoltaic.other; +import android.text.TextUtils; + import com.google.gson.Gson; import com.google.gson.JsonArray; import com.google.gson.JsonObject; import com.google.gson.reflect.TypeToken; import com.hdl.hdlhttp.HxHttp; +import com.hdl.linkpm.sdk.core.exception.HDLException; import com.hdl.photovoltaic.bean.HttpResponsePack; +import com.hdl.photovoltaic.bean.LocalResponse; import com.hdl.photovoltaic.config.AppConfigManage; import com.hdl.photovoltaic.config.UserConfigManage; import com.hdl.photovoltaic.internet.HttpClient; @@ -14,14 +18,18 @@ import com.hdl.photovoltaic.internet.api.TopicApi; import com.hdl.photovoltaic.listener.BaseSuccessFailureCallBeak; import com.hdl.photovoltaic.listener.CloudCallBeak; +import com.hdl.photovoltaic.listener.LinkCallBack; import com.hdl.photovoltaic.ui.bean.CloudInverterChildDeviceBean; import com.hdl.photovoltaic.ui.bean.CloudInverterDeviceBean; import com.hdl.photovoltaic.ui.bean.InverterDeviceBean; import com.hdl.photovoltaic.ui.bean.OidBean; import com.hdl.photovoltaic.uni.HDLUniMP; import com.hdl.photovoltaic.uni.HDLUniMPSDKManager; +import com.hdl.sdk.link.common.exception.HDLLinkCode; import com.hdl.sdk.link.common.exception.HDLLinkException; import com.hdl.sdk.link.core.bean.gateway.GatewayBean; +import com.hdl.sdk.link.core.bean.request.BaseLocalRequest; +import com.hdl.sdk.link.core.bean.response.BaseLocalResponse; import com.hdl.sdk.link.core.callback.GatewayCallBack; import com.hdl.sdk.link.core.callback.HDLLinkCallBack; import com.hdl.sdk.link.gateway.HDLLinkLocalGateway; @@ -30,13 +38,35 @@ import java.util.ArrayList; import java.util.List; -import io.reactivex.rxjava3.disposables.Disposable; /** - * 璁惧閫昏緫鐨勭晫闈� + * 璁惧閫昏緫 */ public class HdlDeviceLogic { private static volatile HdlDeviceLogic sHdlDeviceLogic; + + /** + * 鑾峰彇褰撳墠浣忓畢鐨勯�嗗彉鍣ㄥ垪琛� + */ + public List<GatewayBean> getGatewayList() { + List<GatewayBean> newList = new ArrayList<>(); + List<GatewayBean> list = HDLLinkLocalGateway.getInstance().getGatewayList(); + if (list.size() > 0) { + for (int i = 0; i < list.size(); i++) { + GatewayBean gatewayBean = list.get(i); + if (TextUtils.isEmpty(gatewayBean.getDevice_mac())) { + continue; + } + if (gatewayBean.getMaster().equals("true") + && gatewayBean.getHomeId().equals(UserConfigManage.getInstance().getHomeId())) { +// if ("0101050217BBC400".equals(gatewayBean.getOid()))//娴嬭瘯鏃惰繃婊ゆ帀鏃犳晥鐨勶紝杩欒鍚庨潰浠g爜瑕佸垹闄� +// continue; + newList.add(gatewayBean); + } + } + } + return newList; + } /** * 鑾峰彇褰撳墠瀵硅薄 @@ -56,72 +86,106 @@ } /** - * 娣诲姞閫嗗彉鍣� + * 娣诲姞閫嗗彉鍣ㄥ埌浜戠涓� * - * @param inverterDeviceBean 閫嗗彉鍣ㄥ璞� - * @param cloudCallBeak 鍥炶皟 + * @param mac - + * @param spk - + * @param sid - + * @param oid - + * @param name - + * @param cloudCallBeak - */ - public void addInverterDevice(InverterDeviceBean inverterDeviceBean, CloudCallBeak<Boolean> cloudCallBeak) { + public void addInverterDeviceToCloud(String mac, String spk, String sid, String oid, String name, CloudCallBeak<Boolean> cloudCallBeak) { + String requestUrl = HttpApi.POST_Device_Add; JsonObject json = new JsonObject(); json.addProperty("homeId", UserConfigManage.getInstance().getHomeId()); - json.addProperty("mac", inverterDeviceBean.getDevice_mac()); - json.addProperty("spk", inverterDeviceBean.getGateway_type()); - json.addProperty("sid", inverterDeviceBean.getSid()); - json.addProperty("oid", inverterDeviceBean.getOid()); - json.addProperty("name", inverterDeviceBean.getDevice_name()); + json.addProperty("mac", mac); + json.addProperty("spk", spk); + json.addProperty("sid", sid); + json.addProperty("oid", oid); + json.addProperty("name", name); // json.addProperty("zoneType", "password");//鍖哄煙 - HttpClient.getInstance().requestHttp(requestUrl, json.toString(), true, true, new BaseSuccessFailureCallBeak() { + HttpClient.getInstance().requestHttp(requestUrl, json.toString(), new CloudCallBeak<String>() { @Override - public void onSuccess(HttpResponsePack httpResponsePack) { + public void onSuccess(String str) { if (cloudCallBeak != null) { cloudCallBeak.onSuccess(true); + //涓存椂鐨勯�昏緫锛屼笂浼爋id鍒楄〃鍒颁簯绔� + getGatewayOidList(mac, new LinkCallBack<List<OidBean>>() { + @Override + public void onSuccess(List<OidBean> obj) { + if (obj == null) { + return; + } + fullUpdateOid(obj, new CloudCallBeak<Boolean>() { + @Override + public void onSuccess(Boolean obj) { + + } + + @Override + public void onFailure(HDLException e) { + + } + }); + } + + @Override + public void onError(HDLLinkException e) { + + } + }); } } @Override - public void onFailure(Exception exception) { + public void onFailure(HDLException e) { if (cloudCallBeak != null) { - cloudCallBeak.onFailure(exception); + cloudCallBeak.onFailure(e); } } }); } /** - * 鑾峰彇閫嗗彉鍣ㄥ垪琛� + * 鑾峰彇浜戠閫嗗彉鍣ㄥ垪琛� * * @param homeId 浣忓畢id * @param cloudCallBeak 鍥炶皟 */ - public void getInverterDeviceList(String homeId, CloudCallBeak<CloudInverterDeviceBean> cloudCallBeak) { + public void getCloudInverterDeviceList(String homeId, CloudCallBeak<List<CloudInverterDeviceBean>> cloudCallBeak) { String requestUrl = HttpApi.POST_Device_List; JsonObject json = new JsonObject(); json.addProperty("homeId", homeId); // json.addProperty("zoneType", "password");//鍖哄煙 - HttpClient.getInstance().requestHttp(requestUrl, json.toString(), true, true, new BaseSuccessFailureCallBeak() { + HttpClient.getInstance().requestHttp(requestUrl, json.toString(), new CloudCallBeak<String>() { @Override - public void onSuccess(HttpResponsePack httpResponsePack) { - if (httpResponsePack != null && httpResponsePack.getData() != null) { - Gson gson = new Gson(); - String json = gson.toJson(httpResponsePack.getData()); - CloudInverterDeviceBean loginUserRegionBean = new Gson().fromJson(json, CloudInverterDeviceBean.class); + public void onSuccess(String jsonStr) { + if (TextUtils.isEmpty(jsonStr)) { if (cloudCallBeak != null) { - cloudCallBeak.onSuccess(loginUserRegionBean); + cloudCallBeak.onSuccess(null); } + } + Type type = new TypeToken<List<CloudInverterDeviceBean>>() { + }.getType(); + List<CloudInverterDeviceBean> list = new Gson().fromJson(jsonStr, type); + if (cloudCallBeak != null) { + cloudCallBeak.onSuccess(list); } } @Override - public void onFailure(Exception exception) { + public void onFailure(HDLException e) { if (cloudCallBeak != null) { - cloudCallBeak.onFailure(exception); + cloudCallBeak.onFailure(e); } } }); } + /** * 鍒犻櫎閫嗗彉鍣� @@ -136,18 +200,18 @@ json.addProperty("deviceId", deviceId); // json.addProperty("zoneType", "password");//鍖哄煙 - HttpClient.getInstance().requestHttp(requestUrl, json.toString(), true, true, new BaseSuccessFailureCallBeak() { + HttpClient.getInstance().requestHttp(requestUrl, json.toString(), new CloudCallBeak<String>() { @Override - public void onSuccess(HttpResponsePack httpResponsePack) { + public void onSuccess(String str) { if (cloudCallBeak != null) { cloudCallBeak.onSuccess(true); } } @Override - public void onFailure(Exception exception) { + public void onFailure(HDLException e) { if (cloudCallBeak != null) { - cloudCallBeak.onFailure(exception); + cloudCallBeak.onFailure(e); } } }); @@ -166,25 +230,28 @@ json.addProperty("parentOid", parentOid); // json.addProperty("zoneType", "password");//鍖哄煙 - HttpClient.getInstance().requestHttp(requestUrl, json.toString(), true, true, new BaseSuccessFailureCallBeak() { + HttpClient.getInstance().requestHttp(requestUrl, json.toString(), new CloudCallBeak<String>() { @Override - public void onSuccess(HttpResponsePack httpResponsePack) { - if (httpResponsePack != null && httpResponsePack.getData() != null) { - Gson gson = new Gson(); - String json = gson.toJson(httpResponsePack.getData()); - Type typeOfT = new TypeToken<List<CloudInverterChildDeviceBean>>() { - }.getType(); - List<CloudInverterChildDeviceBean> list = gson.fromJson(json, typeOfT); + public void onSuccess(String jsonStr) { + if (TextUtils.isEmpty(jsonStr)) { if (cloudCallBeak != null) { - cloudCallBeak.onSuccess(list); + cloudCallBeak.onSuccess(null); } + return; + } + Gson gson = new Gson(); + Type typeOfT = new TypeToken<List<CloudInverterChildDeviceBean>>() { + }.getType(); + List<CloudInverterChildDeviceBean> list = gson.fromJson(jsonStr, typeOfT); + if (cloudCallBeak != null) { + cloudCallBeak.onSuccess(list); } } @Override - public void onFailure(Exception exception) { + public void onFailure(HDLException e) { if (cloudCallBeak != null) { - cloudCallBeak.onFailure(exception); + cloudCallBeak.onFailure(e); } } }); @@ -197,7 +264,7 @@ * @param cloudCallBeak 鍥炶皟update */ public void fullUpdateOid(List<OidBean> oidList, CloudCallBeak<Boolean> cloudCallBeak) { - String requestUrl = HttpApi.POST_Device_ChildDevices_List; + String requestUrl = HttpApi.POST_Device_Oid; JsonObject json = new JsonObject(); json.addProperty("operationSource", "PROGRAM_ENERGY");// json.addProperty("homeId", UserConfigManage.getInstance().getHomeId()); @@ -207,7 +274,7 @@ JsonObject jsonObject = new JsonObject(); jsonObject.addProperty("protocolType", oidBean.getProtocolType()); jsonObject.addProperty("deviceType", oidBean.getDeviceType()); - jsonObject.addProperty("mac", oidBean.getMac()); + jsonObject.addProperty("mac", oidBean.getDevice_mac()); jsonObject.addProperty("oid", oidBean.getOid()); jsonObject.addProperty("device_name", oidBean.getDevice_name()); jsonObject.addProperty("device_model", oidBean.getDevice_model()); @@ -219,9 +286,9 @@ json.add("devices", jsonArray); // json.addProperty("zoneType", "password");//鍖哄煙 - HttpClient.getInstance().requestHttp(requestUrl, json.toString(), true, true, new BaseSuccessFailureCallBeak() { + HttpClient.getInstance().requestHttp(requestUrl, json.toString(), new CloudCallBeak<String>() { @Override - public void onSuccess(HttpResponsePack httpResponsePack) { + public void onSuccess(String str) { if (cloudCallBeak != null) { cloudCallBeak.onSuccess(true); @@ -230,9 +297,9 @@ } @Override - public void onFailure(Exception exception) { + public void onFailure(HDLException e) { if (cloudCallBeak != null) { - cloudCallBeak.onFailure(exception); + cloudCallBeak.onFailure(e); } } }); @@ -243,52 +310,311 @@ /** * 璁剧疆缃戝叧杩滅▼鍙傛暟 * - * @param mac 璁惧mac - * @param cloudCallBeak 鍥炶皟update + * @param mac 璁惧mac + * @param linkCallBack 鍥炶皟update */ - public void steGatewayParam(String mac, CloudCallBeak<Boolean> cloudCallBeak) { - String requestUrl = TopicApi.GATEWAY_SEND_REMOTE_EDIT; + public void setGatewayRemoteParam(String mac, LinkCallBack<Boolean> linkCallBack) { + String requestUrl = TopicApi.SET_GATEWAY_REMOTE_EDIT; JsonObject json = new JsonObject(); json.addProperty("homeId", UserConfigManage.getInstance().getHomeId()); json.addProperty("server_addr", AppConfigManage.getUserRegionUrl()); json.addProperty("local_secret", UserConfigManage.getInstance().getLocalSecret()); - TcpClient.getInstance().sendDataToLinkGateway(mac, true, requestUrl, json, "", new HDLLinkCallBack() { + //瑙e瘑璐熻浇鏁版嵁(鍥犱负鍐欏瘑閽ョ粰缃戝叧涓�瀹氭槑鏂囷紝鍥犱负閭f椂缃戝叧杩樻病鏈夊瘑閽�) + TcpClient.getInstance().sendDataToLinkGateway(mac, false, requestUrl, json, "", new HDLLinkCallBack() { @Override public void onSuccess(String msg) { + GatewayBean gatewayBean = HDLLinkLocalGateway.getInstance().getLocalGateway(mac); + if (gatewayBean != null) { + if (!TextUtils.isEmpty(UserConfigManage.getInstance().getLocalSecret())) { + gatewayBean.setLocalEncrypt(true); + } + } + if (linkCallBack != null) { + linkCallBack.onSuccess(true); + } } @Override public void onError(HDLLinkException e) { - + if (linkCallBack != null) { + linkCallBack.onError(e); + } } }); } /** - * 缂栬緫缃戝叧鍙傛暟 + * 缃戝叧鏃堕棿璇诲彇 * - * @param mac 璁惧mac - * @param cloudCallBeak 鍥炶皟update + * @param mac 璁惧mac + * @param linkCallBack 鍥炶皟update */ - public void steEditGatewayParam(String mac, CloudCallBeak<Boolean> cloudCallBeak) { - String requestUrl = TopicApi.GATEWAY_SEND_EDIT; - JsonObject json = new JsonObject(); - json.addProperty("master", "true"); - TcpClient.getInstance().sendDataToLinkGateway(mac, true, requestUrl, json, "", new HDLLinkCallBack() { + public void getGatewayTime(String mac, LinkCallBack<Boolean> linkCallBack) { + String requestUrl = TopicApi.GET_GATEWAY_TIME; + TcpClient.getInstance().sendDataToLinkGateway(mac, requestUrl, null, "", new HDLLinkCallBack() { @Override public void onSuccess(String msg) { - + if (linkCallBack != null) { + linkCallBack.onSuccess(true); + } } @Override public void onError(HDLLinkException e) { - + if (linkCallBack != null) { + linkCallBack.onError(e); + } } }); } + /** + * 缃戝叧鏃堕棿淇敼 + * + * @param mac 璁惧mac + * @param linkCallBack 鍥炶皟update + */ + public void editGatewayTime(String mac, JsonObject jsonObject, LinkCallBack<Boolean> linkCallBack) { + String requestUrl = TopicApi.SET_GATEWAY_TIME_EDIT; +// JsonObject json = new JsonObject(); +// json.addProperty("master", "true"); +// "objects": { +// "date": "2020-08-15", +// "time": "17:25:20" +// } + TcpClient.getInstance().sendDataToLinkGateway(mac, requestUrl, jsonObject, "", new HDLLinkCallBack() { + @Override + public void onSuccess(String msg) { + if (linkCallBack != null) { + linkCallBack.onSuccess(true); + } + } + + @Override + public void onError(HDLLinkException e) { + if (linkCallBack != null) { + linkCallBack.onError(e); + } + } + }); + + } + + /** + * 缂栬緫缃戝叧鍙傛暟 + * + * @param mac 璁惧mac + * @param linkCallBack 鍥炶皟update + */ + public void editGatewayParam(String mac, LinkCallBack<Boolean> linkCallBack) { + String requestUrl = TopicApi.SET_GATEWAY_EDIT; + JsonObject json = new JsonObject(); + json.addProperty("master", "true"); + TcpClient.getInstance().sendDataToLinkGateway(mac, requestUrl, json, "", new HDLLinkCallBack() { + @Override + public void onSuccess(String msg) { + if (linkCallBack != null) { + linkCallBack.onSuccess(true); + } + } + + @Override + public void onError(HDLLinkException e) { + if (linkCallBack != null) { + linkCallBack.onError(e); + } + } + }); + + } + + /** + * 鑾峰彇缃戝叧璇︽儏淇℃伅 + * + * @param mac 缃戝叧mac + * @param linkCallBack 鍥炶皟 + */ + public void getGatewayInfo(String mac, LinkCallBack<GatewayBean> linkCallBack) { + String requestUrl = TopicApi.GET_GATEWAY_INFO; + TcpClient.getInstance().sendDataToLinkGateway(mac, requestUrl, null, "", new HDLLinkCallBack() { + @Override + public void onSuccess(String json) { + if (TextUtils.isEmpty(json)) { + if (linkCallBack != null) { + linkCallBack.onSuccess(null); + } + return; + } + Gson gson = new Gson(); + GatewayBean gatewayBean = gson.fromJson(json, GatewayBean.class); + if (linkCallBack != null) { + linkCallBack.onSuccess(gatewayBean); + } + } + + @Override + public void onError(HDLLinkException e) { + if (linkCallBack != null) { + linkCallBack.onError(e); + } + } + }); + + } + + /** + * 鑾峰彇缃戝叧oid鍒楄〃 + * + * @param mac 缃戝叧mac + * @param linkCallBack 鍥炶皟 + */ + public void getGatewayOidList(String mac, LinkCallBack<List<OidBean>> linkCallBack) { + String requestUrl = TopicApi.GET_GATEWAY_OID_LIST; + TcpClient.getInstance().sendDataToLinkGateway(mac, requestUrl, null, "", new HDLLinkCallBack() { + @Override + public void onSuccess(String json) { + if (TextUtils.isEmpty(json)) { + if (linkCallBack != null) { + linkCallBack.onSuccess(null); + } + return; + } + Gson gson = new Gson(); + Type typeOfT = new TypeToken<BaseLocalResponse<List<OidBean>>>() { + }.getType(); + BaseLocalResponse<List<OidBean>> baseLocalResponse = gson.fromJson(json, typeOfT); + + if (linkCallBack == null) { + return; + } + if (baseLocalResponse == null || baseLocalResponse.getObjects() == null) { + linkCallBack.onSuccess(new ArrayList<>()); + } else { + linkCallBack.onSuccess(baseLocalResponse.getObjects()); + } + } + + @Override + public void onError(HDLLinkException e) { + if (linkCallBack != null) { + linkCallBack.onError(e); + } + } + }); + + } + + /** + * 鑾峰彇鏈湴璁惧鍒楄〃 + * 娉ㄦ剰:鏈夊缃戜互浜戠璁惧涓哄噯,鏈湴瀛樺湪锛屼簯绔病鏈夊垯鍒犻櫎锛涘唴缃戜互鏈湴涓轰富,鎼滅储澶氬皯涓澶囧氨鏄剧ず澶氬皯涓紱 + * + * @param cloudCallBeak - + */ + public void getLocalGatewayList(CloudCallBeak<Boolean> cloudCallBeak) { + HdlDeviceLogic.getInstance().searchGateway(new GatewayCallBack() { + @Override + public void onSuccess(List<GatewayBean> gatewayBeanList) { + HdlDeviceLogic.getInstance().getCloudInverterDeviceList(UserConfigManage.getInstance().getHomeId(), new CloudCallBeak<List<CloudInverterDeviceBean>>() { + @Override + public void onSuccess(List<CloudInverterDeviceBean> list) { + if (list == null || list.size() == 0) { +// //浜戠娌℃湁缁戝畾閫嗗彉鍣�,浠ユ湰鍦颁负涓�; +// HDLLinkLocalGateway.getInstance().getGatewayList().clear(); + if (cloudCallBeak != null) { + cloudCallBeak.onSuccess(true); + } + return; + } + //鏀堕泦鍒犻櫎閫嗗彉鍣╯id + List<String> removeSidList = new ArrayList<>(); + for (int i = 0; i < list.size(); i++) { + CloudInverterDeviceBean cloudInverterDeviceBean = list.get(i); + for (int j = 0; j < HDLLinkLocalGateway.getInstance().getGatewayList().size(); j++) { + GatewayBean gatewayBean = HDLLinkLocalGateway.getInstance().getGatewayList().get(j); + if (!cloudInverterDeviceBean.getSid().equals(gatewayBean.getSid())) { + //鏈湴鏈夛紝浜戠娌℃湁,鍒犻櫎鏈湴锛� + removeSidList.add(gatewayBean.getSid()); + } + + } + } + for (int i = 0; i < removeSidList.size(); i++) { + //鍒犻櫎鏈湴鐨勯�嗗彉鍣� + removeInverter(removeSidList.get(i)); + } + + for (int i = 0; i < list.size(); i++) { + CloudInverterDeviceBean cloudInverterDeviceBean = list.get(i); + GatewayBean gatewayBean = HDLLinkLocalGateway.getInstance().getLocalGateway(cloudInverterDeviceBean.getSid()); + objectAssignment(cloudInverterDeviceBean, gatewayBean); + } + + if (cloudCallBeak != null) { + cloudCallBeak.onSuccess(true); + } + } + + @Override + public void onFailure(HDLException e) { + if (cloudCallBeak != null) { + cloudCallBeak.onFailure(e); + } + } + }); + } + + @Override + public void onError(HDLLinkException e) { + HdlDeviceLogic.getInstance().getCloudInverterDeviceList(UserConfigManage.getInstance().getHomeId(), new CloudCallBeak<List<CloudInverterDeviceBean>>() { + @Override + public void onSuccess(List<CloudInverterDeviceBean> list) { + //娓呮鏈湴缃戝叧鍒楄〃 + HDLLinkLocalGateway.getInstance().getGatewayList().clear(); + if (list == null || list.size() == 0) { + if (cloudCallBeak != null) { + cloudCallBeak.onSuccess(true); + } + return; + } + for (int i = 0; i < list.size(); i++) { + CloudInverterDeviceBean cloudInverterDeviceBean = list.get(i); + //浜戠瀵硅薄鏁版嵁浜ゆ崲鍒版湰鍦板璞� + GatewayBean gatewayBean = new GatewayBean(); + objectAssignment(cloudInverterDeviceBean, gatewayBean); + + //娣诲姞缃戝叧 + HDLLinkLocalGateway.getInstance().getGatewayList().add(gatewayBean); + } + if (cloudCallBeak != null) { + cloudCallBeak.onSuccess(true); + } + + } + + @Override + public void onFailure(HDLException e) { + if (cloudCallBeak != null) { + cloudCallBeak.onFailure(e); + } + } + }); + } + }); + } + + /** + * 鍒犻櫎鏈湴閫嗗彉鍣� + * + * @param sid 璁惧sid + */ + private void removeInverter(String sid) { + GatewayBean gatewayBean = HDLLinkLocalGateway.getInstance().getLocalGateway(sid); + if (gatewayBean != null) { + HDLLinkLocalGateway.getInstance().getGatewayList().remove(gatewayBean); + } + } /** * 鎼滅储缃戝叧鍒楄〃 @@ -301,6 +627,27 @@ HDLLinkLocalGateway.getInstance().refreshGatewayByHomeIdAndSpk(UserConfigManage.getInstance().getHomeId(), spks, true, gatewayCallBack); } + + private void objectAssignment(CloudInverterDeviceBean cloudInverterDeviceBean, GatewayBean gatewayBean) { + if (cloudInverterDeviceBean == null || gatewayBean == null) { + return; + } + gatewayBean.setOid(cloudInverterDeviceBean.getOid()); + gatewayBean.setSid(cloudInverterDeviceBean.getSid()); + gatewayBean.setGatewayId(cloudInverterDeviceBean.getGatewayId()); + gatewayBean.setOnline(cloudInverterDeviceBean.isOnline()); + gatewayBean.setDevice_mac(cloudInverterDeviceBean.getOsn());//璁惧mac + gatewayBean.setDevice_name(cloudInverterDeviceBean.getGatewayName()); + gatewayBean.setHomeId(UserConfigManage.getInstance().getHomeId()); + gatewayBean.setLocalEncrypt(true); + gatewayBean.setMaster("true"); + gatewayBean.setSystemStatusDesc(cloudInverterDeviceBean.getSystemStatusDesc()); + gatewayBean.setHwVersion(cloudInverterDeviceBean.getHwVersion()); + gatewayBean.setCategorySecondName(cloudInverterDeviceBean.getCategorySecondName()); + gatewayBean.setDeviceId(cloudInverterDeviceBean.getDeviceId()); + + } + /** * 鑾峰彇缃戝叧spk鍒楄〃 * -- Gitblit v1.8.0