From f7c38847b8e00c84c30e51a92c03071d3e9a9da8 Mon Sep 17 00:00:00 2001 From: mac <user@users-MacBook-Pro.local> Date: 星期二, 14 五月 2024 09:08:57 +0800 Subject: [PATCH] 2024年05月14日09:08:49 --- app/src/main/java/com/hdl/photovoltaic/other/HdlDeviceLogic.java | 363 +++++++++++++++++++++++++++++++++++++++++++-------- 1 files changed, 304 insertions(+), 59 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 c87fbd2..0a1e88a 100644 --- a/app/src/main/java/com/hdl/photovoltaic/other/HdlDeviceLogic.java +++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlDeviceLogic.java @@ -9,6 +9,7 @@ import com.google.gson.JsonObject; import com.google.gson.reflect.TypeToken; import com.hdl.linkpm.sdk.core.exception.HDLException; +import com.hdl.photovoltaic.bean.PageNumberObject; import com.hdl.photovoltaic.config.AppConfigManage; import com.hdl.photovoltaic.config.UserConfigManage; import com.hdl.photovoltaic.internet.HttpClient; @@ -19,9 +20,13 @@ 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.DeviceBean; import com.hdl.photovoltaic.ui.bean.DeviceRemoteInfo; import com.hdl.photovoltaic.ui.bean.DeviceTimeBean; +import com.hdl.photovoltaic.ui.bean.HouseInfoBean; +import com.hdl.photovoltaic.ui.bean.MessageBean; import com.hdl.photovoltaic.ui.bean.OidBean; +import com.hdl.photovoltaic.ui.bean.StatusOverviewBean; import com.hdl.sdk.link.HDLLinkLocalSdk; import com.hdl.sdk.link.common.config.TopicConstant; import com.hdl.sdk.link.common.exception.HDLLinkCode; @@ -67,6 +72,27 @@ return sHdlDeviceLogic; } + public static final String kWp = "kWp"; + public static final String kWh = "kW.h"; + + public static final String kW = "kW"; + private List<DeviceBean> mListDevice = new ArrayList<>(); + + public void clearDeviceList() { + if (mListDevice == null) { + return; + } + if (mListDevice.size() > 0) { + mListDevice.clear(); + } + } + + public List<DeviceBean> getDeviceList() { + if (mListDevice == null) { + return new ArrayList<>(); + } + return mListDevice; + } /** * 鑾峰彇褰撳墠浣忓畢鐨勯�嗗彉鍣ㄥ垪琛�(鍖呮嫭浠庣殑閫嗗彉鍣�) @@ -89,36 +115,252 @@ return newList; } + /** + * 娣诲姞閫嗗彉鍣ㄥ埌缂撳瓨鍒楄〃閲岄潰鍘� + * + * @param homeId 鐢电珯id + * @param newGatewayBean 閫嗗彉鍣ㄥ璞� + */ + public void addGatewayToLocalCacheMemory(String homeId, GatewayBean newGatewayBean) { + if (newGatewayBean == null || TextUtils.isEmpty(homeId)) { + return; + } + List<GatewayBean> list = getCurrentHomeGatewayList(homeId); + if (list == null || list.size() == 0) { + return; + } + int index = -1; + for (int i = 0; i < list.size(); i++) { + GatewayBean gatewayBean = list.get(i); + if (gatewayBean.getDevice_mac().equals(newGatewayBean.getDevice_mac())) { + index = i; + break; + } + } + if (index > 0) { + list.remove(index); + list.add(index, newGatewayBean); + + } + } + + /** + * 绉婚櫎缂撳瓨鍒楄〃閲岄潰閫嗗彉鍣� + * + * @param homeId 鐢电珯id + * @param mac 閫嗗彉鍣╩ac + */ + public void removeLocalCacheMemoryGateway(String homeId, String mac) { + if (TextUtils.isEmpty(mac)) { + return; + } + List<GatewayBean> list = getCurrentHomeGatewayList(homeId); + if (list == null || list.size() == 0) { + return; + } + int index = -1; + for (int i = 0; i < list.size(); i++) { + GatewayBean gatewayBean = list.get(i); + if (gatewayBean.getDevice_mac().equals(mac)) { + index = i; + break; + } + } + if (index > 0) { + list.remove(index); + } + } + + /** + * 鑾峰彇璁惧鍒楄〃(瀹夎鍟�) + * + * @param searchTxt 鎼滅储鍐呭 + * @param pageNo 椤电爜 + * @param pageSize 椤垫暟 + */ + public void getPowerStationDeviceList(String searchTxt, long pageNo, long pageSize, CloudCallBeak<PageNumberObject<DeviceBean>> cloudCallBeak) { + String requestUrl = HttpApi.POST_deviceList; + JsonObject json = new JsonObject(); + if (!TextUtils.isEmpty(searchTxt)) { + json.addProperty("searchTxt", searchTxt); + } + json.addProperty("pageNo", pageNo);//椤电爜 + json.addProperty("pageSize", pageSize);//椤垫暟 +// json.addProperty("zoneType", zoneType);//鍖哄煙 + HttpClient.getInstance().requestHttp(requestUrl, json.toString(), new CloudCallBeak<String>() { + @Override + public void onSuccess(String jsonStr) { + if (TextUtils.isEmpty(jsonStr)) { + if (cloudCallBeak != null) { + cloudCallBeak.onSuccess(new PageNumberObject<>()); + } + } + Gson gson = new Gson(); + Type type = new TypeToken<PageNumberObject<DeviceBean>>() { + }.getType(); + PageNumberObject<DeviceBean> pageNumberObject = gson.fromJson(jsonStr, type); + if (cloudCallBeak != null) { + cloudCallBeak.onSuccess(pageNumberObject); + } + } + + @Override + public void onFailure(HDLException e) { + if (cloudCallBeak != null) { + cloudCallBeak.onFailure(e); + } + } + }); + } + + /** + * 鐢电珯鐘舵�佹瑙�(瀹夎鍟�) + */ + public void getStatusOverview(CloudCallBeak<StatusOverviewBean> cloudCallBeak) { + String requestUrl = HttpApi.POST_statusOverview; + JsonObject json = new JsonObject(); +// json.addProperty("zoneType", zoneType);//鍖哄煙 + HttpClient.getInstance().requestHttp(requestUrl, json.toString(), new CloudCallBeak<String>() { + @Override + public void onSuccess(String jsonStr) { + if (TextUtils.isEmpty(jsonStr)) { + if (cloudCallBeak != null) { + cloudCallBeak.onSuccess(new StatusOverviewBean()); + } + } + Gson gson = new Gson(); + StatusOverviewBean statusOverviewBean = gson.fromJson(jsonStr, StatusOverviewBean.class); + if (cloudCallBeak != null) { + cloudCallBeak.onSuccess(statusOverviewBean); + } + } + + @Override + public void onFailure(HDLException e) { + if (cloudCallBeak != null) { + cloudCallBeak.onFailure(e); + } + } + }); + } + + /** + * 娣诲姞銆愯澶囧垪琛ㄣ�戝埌鏈湴缂撳瓨 + * + * @param list -璁惧鍒楄〃 + */ + public void setListDevice(List<DeviceBean> list) { + try { + if (list == null || list.size() == 0) { + return; + } + if (this.mListDevice.size() == 0) { + this.mListDevice.addAll(list); + return; + } + for (int i = 0; i < list.size(); i++) { + this.setSingleDevice(list.get(i)); + } + } catch (Exception ignored) { + } + } + + /** + * 娣诲姞璁惧鍒板垪琛ㄩ噷闈� + * + * @param deviceBean -璁惧瀵硅薄 + */ + public void setSingleDevice(DeviceBean deviceBean) { + try { + if (deviceBean == null) { + return; + } + boolean if_boolean = false; + for (int i = 0; i < mListDevice.size(); i++) { + if (mListDevice.get(i).getOsn().equals(deviceBean.getOsn())) { + //瀛樺湪鏇挎崲 + mListDevice.remove(i); + mListDevice.add(i, deviceBean); + if_boolean = true; + break; + } + } + if (!if_boolean) { + //娌℃湁娣诲姞 + this.mListDevice.add(deviceBean); + } + } catch (Exception e) { + String mes = e.getMessage(); + HdlLogLogic.print("--->" + mes); + } + } /** * 閫嗗彉鍣ㄤ笂浼犳暟鎹埌浜戠(鍖呮嫭:sid锛宱id) * - * @param homeId 浣忓畢id - * @param list 閫嗗彉鍣ㄥ垪琛� + * @param homeId 浣忓畢id + * @param list 閫嗗彉鍣ㄥ垪琛� + * @param whetherToAdd true琛ㄧず鐢ㄥ閲�,false琛ㄧず鐢ㄥ叏閲� */ - public void uploadDataToCloud(String homeId, List<GatewayBean> list, CloudCallBeak<Boolean> callBeak) { + public void uploadOidDataToCloud(String homeId, List<GatewayBean> list, boolean whetherToAdd, CloudCallBeak<Boolean> callBeak) { if (list == null || list.size() == 0) { return; } - List<OidBean> oidList = new ArrayList<>(); - AtomicInteger atomicInteger = new AtomicInteger(0); - for (int i = 0; i < list.size(); i++) { - GatewayBean gatewayBean = list.get(i); - if (gatewayBean == null || TextUtils.isEmpty(gatewayBean.getDevice_mac())) { - continue; - } - getInverterOidList(gatewayBean.getDevice_mac(), new LinkCallBack<List<OidBean>>() { - @Override - public void onSuccess(List<OidBean> oidBeanList) { - atomicInteger.set(atomicInteger.get() + 1); - if (oidBeanList == null) { - return; - } - oidList.addAll(oidBeanList); - if (atomicInteger.get() == list.size()) { - if (oidList.size() == 0) { + if (whetherToAdd) { + for (int i = 0; i < list.size(); i++) { + GatewayBean gatewayBean = list.get(i); + if (gatewayBean == null || TextUtils.isEmpty(gatewayBean.getDevice_mac())) { + continue; + } + getInverterOidList(gatewayBean.getDevice_mac(), new LinkCallBack<List<OidBean>>() { + @Override + public void onSuccess(List<OidBean> oidBeanList) { + if (oidBeanList == null) { + HdlLogLogic.print("涓婁紶oid鍒楄〃鍒颁簯绔垚鍔�--->浣忓畢id:" + homeId + "--->mac:" + gatewayBean.getDevice_mac() + "--->鏁版嵁鏄痭ull", true); return; } + //澧為噺娣诲姞oid + updateOidAdd(homeId, oidBeanList, new CloudCallBeak<Boolean>() { + @Override + public void onSuccess(Boolean obj) { + HdlLogLogic.print("涓婁紶oid鍒楄〃鍒颁簯绔垚鍔�(澧為噺)--->浣忓畢id:" + homeId + "--->mac:" + gatewayBean.getDevice_mac() + "--->\r\n鏁版嵁--->" + new Gson().toJson(oidBeanList), true); + } + + @Override + public void onFailure(HDLException e) { + HdlLogLogic.print("涓婁紶oid鍒楄〃鍒颁簯绔け璐�(澧為噺)--->浣忓畢id:" + homeId + "--->mac:" + gatewayBean.getDevice_mac() + "-->" + e.getMsg() + "(" + e.getCode() + ")", true); + } + }); + + } + + @Override + public void onError(HDLLinkException e) { + } + }); + SystemClock.sleep(200); + } + } else { + //鍙湁杩涘叆璇︽儏鐣岄潰 + List<OidBean> newOidList = new ArrayList<>(); + AtomicInteger atomicInteger = new AtomicInteger(0); + for (int i = 0; i < list.size(); i++) { + GatewayBean gatewayBean = list.get(i); + if (gatewayBean == null || TextUtils.isEmpty(gatewayBean.getDevice_mac())) { + continue; + } + getInverterOidList(gatewayBean.getDevice_mac(), new LinkCallBack<List<OidBean>>() { + @Override + public void onSuccess(List<OidBean> oidBeanList) { + atomicInteger.set(atomicInteger.get() + 1); + if (oidBeanList == null) { + return; + } + newOidList.addAll(oidBeanList); + if (atomicInteger.get() == list.size()) { + if (newOidList.size() == 0) { + return; + } // //澧為噺娣诲姞oid // updateOidAdd(homeId, oidList, new CloudCallBeak<Boolean>() { // @Override @@ -132,45 +374,47 @@ // } // }); - //鍏ㄩ儴鑾峰彇鍚庡啀涓婁紶 - fullUpdateOid(homeId, oidList, new CloudCallBeak<Boolean>() { - @Override - public void onSuccess(Boolean obj) { - HdlLogLogic.print("涓婁紶oid鍒楄〃鍒颁簯绔垚鍔�--->浣忓畢id:" + homeId + "--->mac:" + gatewayBean.getDevice_mac(), true); - } + //鍏ㄩ儴鑾峰彇鍚庡啀涓婁紶 + fullUpdateOid(homeId, newOidList, new CloudCallBeak<Boolean>() { + @Override + public void onSuccess(Boolean obj) { + HdlLogLogic.print("涓婁紶oid鍒楄〃鍒颁簯绔垚鍔�(鍏ㄩ噺)--->浣忓畢id:" + homeId + "--->mac:" + gatewayBean.getDevice_mac() + "--->\r\n鏁版嵁--->" + new Gson().toJson(newOidList), true); + } - @Override - public void onFailure(HDLException e) { - HdlLogLogic.print("涓婁紶oid鍒楄〃鍒颁簯绔け璐�--->浣忓畢id:" + homeId + "--->mac:" + gatewayBean.getDevice_mac() + "-->" + e.getMsg() + "(" + e.getCode() + ")", true); - } - }); - } - } - - @Override - public void onError(HDLLinkException e) { - atomicInteger.set(atomicInteger.get() + 1); - if (oidList.size() == 0) { - HdlLogLogic.print("鑾峰彇閫嗗彉鍣╫id鍒楄〃澶辫触--->浣忓畢id:" + homeId + "--->mac:" + gatewayBean.getDevice_mac() + "-->" + e.getMsg() + "(" + e.getCode() + ")", true); - return; - } - //澧為噺娣诲姞oid - updateOidAdd(homeId, oidList, new CloudCallBeak<Boolean>() { - @Override - public void onSuccess(Boolean obj) { - HdlLogLogic.print("涓婁紶oid鍒楄〃鍒颁簯绔垚鍔�--->浣忓畢id:" + homeId + "--->mac:" + gatewayBean.getDevice_mac(), true); + @Override + public void onFailure(HDLException e) { + HdlLogLogic.print("涓婁紶oid鍒楄〃鍒颁簯绔け璐�(鍏ㄩ噺)--->浣忓畢id:" + homeId + "--->mac:" + gatewayBean.getDevice_mac() + "-->" + e.getMsg() + "(" + e.getCode() + ")", true); + } + }); } + } - @Override - public void onFailure(HDLException e) { - HdlLogLogic.print("涓婁紶oid鍒楄〃鍒颁簯绔け璐�--->浣忓畢id:" + homeId + "--->mac:" + gatewayBean.getDevice_mac() + "-->" + e.getMsg() + "(" + e.getCode() + ")", true); + @Override + public void onError(HDLLinkException e) { + atomicInteger.set(atomicInteger.get() + 1); + if (atomicInteger.get() == list.size()) { + if (newOidList.size() == 0) { + HdlLogLogic.print("鑾峰彇閫嗗彉鍣╫id鍒楄〃澶辫触--->浣忓畢id:" + homeId + "--->mac:" + gatewayBean.getDevice_mac() + "-->" + e.getMsg() + "(" + e.getCode() + ")", true); + return; + } + //澧為噺娣诲姞oid + updateOidAdd(homeId, newOidList, new CloudCallBeak<Boolean>() { + @Override + public void onSuccess(Boolean obj) { + HdlLogLogic.print("涓婁紶oid鍒楄〃鍒颁簯绔垚鍔�(澧為噺)--->浣忓畢id:" + homeId + "--->mac:" + gatewayBean.getDevice_mac() + "--->\r\n鏁版嵁--->" + new Gson().toJson(newOidList), true); + } + + @Override + public void onFailure(HDLException e) { + HdlLogLogic.print("涓婁紶oid鍒楄〃鍒颁簯绔け璐�(澧為噺)--->浣忓畢id:" + homeId + "--->mac:" + gatewayBean.getDevice_mac() + "-->" + e.getMsg() + "(" + e.getCode() + ")", true); + } + }); } - }); - } - }); + } + }); + SystemClock.sleep(200); + } } - - } /** @@ -202,7 +446,7 @@ cloudCallBeak.onSuccess(true); //涓存椂鐨勯�昏緫锛屼笂浼爋id鍒楄〃鍒颁簯绔� List<GatewayBean> list = HdlDeviceLogic.getInstance().getCurrentHomeGatewayList(homeId); - uploadDataToCloud(UserConfigManage.getInstance().getHomeId(), list, null); + uploadOidDataToCloud(UserConfigManage.getInstance().getHomeId(), list, true, null); } } @@ -245,8 +489,8 @@ public void onSuccess(String str) { if (cloudCallBeak != null) { cloudCallBeak.onSuccess(true); - //涓存椂鐨勯�昏緫锛屼笂浼爋id鍒楄〃鍒颁簯绔紙鍘绘帀锛屽師鍥犳槸鎴戜笂浼犳垚鍔熷悗锛岀綉鍏冲啀娆″叏閲忎笂浼爋id鍒楄〃锛屼細鎶婁箣鍓峯id鍒楄〃瑕嗙洊鎺夛級 - uploadDataToCloud(homeId, list, null); + //涓存椂鐨勯�昏緫锛屼笂浼爋id鍒楄〃鍒颁簯绔� + uploadOidDataToCloud(homeId, list, true, null); } } @@ -657,9 +901,9 @@ /** * 鍒濆鍖栭�嗗彉鍣� * - * @param mac 缃戝叧mac + * @param mac 閫嗗彉鍣╩ac */ - public void initializeGateway(String mac, LinkCallBack<Boolean> linkCallBack) { + public void initializeInverter(String mac, LinkCallBack<Boolean> linkCallBack) { String requestUrl = TopicApi.GATEWAY_INITIALIZE_REMOTE; JsonObject jObject = new JsonObject(); jObject.addProperty("device_mac", mac); @@ -1181,6 +1425,7 @@ gatewayBean.setPowerPvNow(cloudInverterDeviceBean.getPowerPvNow());//鍙戠數鍔熺巼 gatewayBean.setTotalElectricityPvToday(cloudInverterDeviceBean.getTotalElectricityPvToday());//浠婃棩鍙戠數閲� if (!TextUtils.isEmpty(cloudInverterDeviceBean.getOmodel())) { + //鍙兘璁惧娌℃湁涓婃姤缁欎簯绔�,寤鸿缁戝畾閫嗗彉鍣ㄦ椂鍊欒拷鍔犱竴涓弬鏁�; gatewayBean.setDevice_model(cloudInverterDeviceBean.getOmodel());//璁惧鍨嬪彿 } gatewayBean.setSpk(cloudInverterDeviceBean.getSpk());//璁惧spk -- Gitblit v1.8.0