Merge branch 'master' into 1.2.1_google

wjc

昨天 29e200b8db74d31f49d4d1ac64a41ad44e1b3a90

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

@@ -725,7 +725,7 @@
        }
        String requestUrl = HttpApi.POST_Device_Oid;
        JsonObject json = new JsonObject();
        json.addProperty("operationSource", "PROGRAM_ENERGY");//
        json.addProperty("operationSource", "PROGRAM_ENERGY");//操作来源：固定传：PROGRAM_ENERGY  = 能源，PROGRAM = studio 默认
        json.addProperty("homeId", homeId);
        JsonArray jsonArray = new JsonArray();
        for (int i = 0; i < oidList.size(); i++) {
@@ -785,6 +785,7 @@
        String requestUrl = HttpApi.POST_Device_IncrAdd;
        JsonObject json = new JsonObject();
        json.addProperty("homeId", homeId);
        json.addProperty("operationSource", "PROGRAM_ENERGY");//操作来源：固定传：PROGRAM_ENERGY  = 能源，PROGRAM = studio 默认
        JsonArray jsonArray = new JsonArray();
        for (int i = 0; i < oidList.size(); i++) {
            OidBean oidBean = oidList.get(i);