备份一下代码

mac

2023-12-27 936fb552a30c05fc7a60c20f47bf6fccbc2dc1c1

 app/src/main/java/com/hdl/photovoltaic/other/HdlDeviceLogic.java

@@ -111,31 +111,32 @@
    /**
     * 逆变器上传数据到云端(包括:sid，oid)
     *
     * @param mac 设备mac
     * @param homeId 住宅id
     * @param mac    设备mac
     */
    public void uploadDataToCloud(String mac, CloudCallBeak<Boolean> callBeak) {
    public void uploadDataToCloud(String homeId, String mac, CloudCallBeak<Boolean> callBeak) {
        getInverterOidList(mac, new LinkCallBack<List<OidBean>>() {
            @Override
            public void onSuccess(List<OidBean> obj) {
                if (obj == null) {
                    return;
                }
                fullUpdateOid(obj, new CloudCallBeak<Boolean>() {
                fullUpdateOid(homeId, obj, new CloudCallBeak<Boolean>() {
                    @Override
                    public void onSuccess(Boolean obj) {
                        HdlLogLogic.print("上传oid列表到云端成功-->" + mac, true);
                        HdlLogLogic.print("上传oid列表到云端成功-->" + homeId + "--->" + mac, true);
                    }

                    @Override
                    public void onFailure(HDLException e) {
                        HdlLogLogic.print("上传oid列表到云端失败-->" + mac + "-->" + e.getMsg() + "(" + e.getCode() + ")", true);
                        HdlLogLogic.print("上传oid列表到云端失败-->" + homeId + "--->" + mac + "-->" + e.getMsg() + "(" + e.getCode() + ")", true);
                    }
                });
            }

            @Override
            public void onError(HDLLinkException e) {
                HdlLogLogic.print("获取逆变器oid列表失败-->" + mac + "-->" + e.getMsg() + "(" + e.getCode() + ")", true);
                HdlLogLogic.print("获取逆变器oid列表失败-->" + homeId + "--->" + mac + "-->" + e.getMsg() + "(" + e.getCode() + ")", true);
            }
        });

@@ -169,7 +170,7 @@
                if (cloudCallBeak != null) {
                    cloudCallBeak.onSuccess(true);
                    //临时的逻辑，上传oid列表到云端
                    uploadDataToCloud(mac, null);
                    uploadDataToCloud(UserConfigManage.getInstance().getHomeId(), mac, null);
                }
            }

@@ -293,14 +294,15 @@
    /**
     * 全量更新OID
     *
     * @param homeId        住宅id
     * @param oidList       oid列表
     * @param cloudCallBeak 回调update
     */
    public void fullUpdateOid(List<OidBean> oidList, CloudCallBeak<Boolean> cloudCallBeak) {
    public void fullUpdateOid(String homeId, List<OidBean> oidList, CloudCallBeak<Boolean> cloudCallBeak) {
        String requestUrl = HttpApi.POST_Device_Oid;
        JsonObject json = new JsonObject();
        json.addProperty("operationSource", "PROGRAM_ENERGY");//
        json.addProperty("homeId", UserConfigManage.getInstance().getHomeId());
        json.addProperty("homeId", homeId);
        JsonArray jsonArray = new JsonArray();
        for (int i = 0; i < oidList.size(); i++) {
            OidBean oidBean = oidList.get(i);