Merge branch '1.4.4' into dev

wjc

2 天以前 db937c029a3f9dbaec86cbbc944ebbee3ece13be

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

@@ -11,6 +11,7 @@
import com.hdl.linkpm.sdk.core.exception.HDLException;
import com.hdl.photovoltaic.config.AppConfigManage;
import com.hdl.photovoltaic.config.UserConfigManage;
import com.hdl.photovoltaic.enums.ProjectOperation;
import com.hdl.photovoltaic.internet.HttpClient;
import com.hdl.photovoltaic.internet.api.HttpApi;
import com.hdl.photovoltaic.listener.CloudCallBeak;
@@ -176,6 +177,25 @@
    }

    /**
     * 电站Id对象更新
     *
     * @param houseIdBean 电站id对象
     */
    public void updateHouseIdBean(HouseIdBean houseIdBean) {
        if (houseIdBean == null) {
            return;
        }
        for (int i = 0; i < mHouseIdList.size(); i++) {
            HouseIdBean h = mHouseIdList.get(i);
            if (h.getHomeId().equals(houseIdBean.getHomeId())) {
                h.setDebugStatus(houseIdBean.getDebugStatus());
                //mHouseIdList.set(i,houseIdBean);整个对象替换
                break;
            }
        }
    }

    /**
     * 移动电站位置
     *
     * @param houseId 电站id
@@ -233,7 +253,7 @@
                                    houseInfoBean.setInstalledCapacity(houseIdBean.getInstalledCapacity());//装机容量
                                    houseInfoBean.setPower(houseIdBean.getPower());//发电功率
                                    houseInfoBean.setTodayElectricity(houseIdBean.getTodayElectricity());//今天发电量
                                    houseInfoBean.setPowerStationStatus(houseIdBean.getPowerStationStatus());//电站状态(电站状态   1:正常(运行),2:离线,3:连接中,4:故障)
                                    houseInfoBean.setPowerStationStatus(houseIdBean.getPowerStationStatus());//电站状态(电站状态    1:正常(运行),2:离线,3:连接中,4:故障)
                                    //添加到本地缓存
                                    addHouseToLocalMemory(houseInfoBean);
                                }
@@ -604,7 +624,7 @@
            json.addProperty("installedCapacityMin", installedCapacityMin);
        }
        if (!TextUtils.isEmpty(installedCapacityMax)) {
            json.addProperty("installedCapacityMin", installedCapacityMax);
            json.addProperty("installedCapacityMax", installedCapacityMax);
        }
        if (!TextUtils.isEmpty(debugStatus)) {
            json.addProperty("debugStatus", debugStatus);
@@ -1086,6 +1106,41 @@
    }

    /**
     * 更新项目状态 （交付、验收、撤销交付、验收未通过、重新调试、交付回滚等操作）（https://hdl-gz.yuque.com/wnkbmh/diiq35/kegldc#gWveC）
     *
     * @param homeId            电站id
     * @param communityId       社区id
     * @param flowRecordContent 流转记录内容
     * @param projectOperation  项目状态
     * @param cloudCallBeak     -
     */
    public void setUpdateProjectDebugStatus(String homeId, String communityId, String flowRecordContent, String projectOperation, CloudCallBeak<Boolean> cloudCallBeak) {
        String requestUrl = HttpApi.POST_UpdateProjectDebugStatus;
        JsonObject json = new JsonObject();
        json.addProperty("houseId", homeId);
        json.addProperty("communityId", communityId);
        json.addProperty("flowRecordContent", flowRecordContent);//流转记录内容
        json.addProperty("projectFlowRecordActionEnum", projectOperation);

        HttpClient.getInstance().requestHttp(requestUrl, json.toString(), new CloudCallBeak<String>() {
            @Override
            public void onSuccess(String jsonStr) {
                if (cloudCallBeak != null) {
                    cloudCallBeak.onSuccess(true);
                }
            }

            @Override
            public void onFailure(HDLException e) {
                if (cloudCallBeak != null) {
                    cloudCallBeak.onFailure(e);
                }
            }
        });

    }

    /**
     * 添加推送Token
     *
     * @param cloudCallBeak -
@@ -1098,6 +1153,37 @@
        json.addProperty("produce", AppConfigManage.isIsOnlineServer());//表示是否是正式服务器
        json.addProperty("pushToken", UserConfigManage.getInstance().getRegistrationID());//App的推送Token，在极光为RegId
        json.addProperty("software", "PHOTOVOLTAIC");//软件来源

        HttpClient.getInstance().requestHttp(requestUrl, json.toString(), new CloudCallBeak<String>() {
            @Override
            public void onSuccess(String jsonStr) {
                if (cloudCallBeak != null) {
                    cloudCallBeak.onSuccess(jsonStr);
                }

            }

            @Override
            public void onFailure(HDLException e) {
                if (cloudCallBeak != null) {
                    cloudCallBeak.onFailure(e);
                }
            }
        });


    }

    /**
     * 删除推送Token
     *
     * @param cloudCallBeak -
     */
    public void pushDel(CloudCallBeak<String> cloudCallBeak) {
        String requestUrl = HttpApi.POST_push_del;
        JsonObject json = new JsonObject();
        json.addProperty("pushId", UserConfigManage.getInstance().getPushId());
        json.addProperty("pushToken", UserConfigManage.getInstance().getRegistrationID());

        HttpClient.getInstance().requestHttp(requestUrl, json.toString(), new CloudCallBeak<String>() {
            @Override
@@ -1173,4 +1259,4 @@
        }
    }

}
}