2024年03月13日17:23:53

mac

2024-03-13 4a2d7f9ac055d10ba7baf58df690e0ad62826f52

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

@@ -7,6 +7,7 @@
import com.google.gson.JsonObject;
import com.google.gson.reflect.TypeToken;
import com.hdl.linkpm.sdk.core.exception.HDLException;
import com.hdl.linkpm.sdk.home.type.GatewayType;
import com.hdl.photovoltaic.config.AppConfigManage;
import com.hdl.photovoltaic.config.UserConfigManage;
import com.hdl.photovoltaic.internet.HttpClient;
@@ -36,6 +37,8 @@
import java.util.List;
import java.util.concurrent.atomic.AtomicInteger;

import io.dcloud.common.adapter.util.DeviceInfo;


/**
 * 设备逻辑
@@ -63,7 +66,7 @@
    /**
     * 获取当前住宅的逆变器列表(包括从的逆变器)
     */
    public List<GatewayBean> getCurrentHomeGatewayList() {
    public List<GatewayBean> getCurrentHomeGatewayList(String homeId) {
        List<GatewayBean> newList = new ArrayList<>();
        List<GatewayBean> list = HDLLinkLocalGateway.getInstance().getGatewayList();
        if (list.size() > 0) {
@@ -73,7 +76,7 @@
                    continue;
                }
                //用homeId筛选当前住宅的逆变器列表
                if (gatewayBean.getHomeId().equals(UserConfigManage.getInstance().getHomeId())) {
                if (gatewayBean.getHomeId().equals(homeId)) {
                    newList.add(gatewayBean);
                }
            }
@@ -84,21 +87,21 @@
    /**
     * 获取当前住宅的【主】逆变器
     */
    public GatewayBean getCurrentHomeMainGateway() {
        return queryCurrentHomeMainGateway(this.getCurrentHomeGatewayList());
    public GatewayBean getCurrentHomeMainGateway(String homeId) {
        return queryCurrentHomeMainGateway(this.getCurrentHomeGatewayList(homeId), homeId);
    }

    /**
     * 查询当前住宅的【主】逆变器
     */
    public GatewayBean queryCurrentHomeMainGateway(List<GatewayBean> list) {
    public GatewayBean queryCurrentHomeMainGateway(List<GatewayBean> list, String homeId) {
        if (list == null || list.size() == 0) {
            return null;
        }
        GatewayBean findGatewayBean = null;
        for (int i = 0; i < list.size(); i++) {
            GatewayBean gatewayBean = list.get(i);
            if (gatewayBean.getMaster().equals(GatewayMasterType.MasterTrue) && gatewayBean.getHomeId().equals(UserConfigManage.getInstance().getHomeId())) {
            if (gatewayBean.getMaster().equals(GatewayMasterType.MasterTrue) && gatewayBean.getHomeId().equals(homeId)) {
                //找到返回
                findGatewayBean = gatewayBean;
                break;
@@ -117,26 +120,26 @@
    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) {
            public void onSuccess(List<OidBean> oidBeanList) {
                if (oidBeanList == null) {
                    return;
                }
                fullUpdateOid(homeId, obj, new CloudCallBeak<Boolean>() {
                fullUpdateOid(homeId, oidBeanList, new CloudCallBeak<Boolean>() {
                    @Override
                    public void onSuccess(Boolean obj) {
                        HdlLogLogic.print("上传oid列表到云端成功-->" + homeId + "--->" + mac, true);
                        HdlLogLogic.print("上传oid列表到云端成功--->住宅id:" + homeId + "--->mac:" + mac, true);
                    }

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

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

@@ -152,16 +155,60 @@
     * @param name          -
     * @param cloudCallBeak -
     */
    public void addInverterDeviceToCloud(String mac, String spk, String sid, String oid, String name, CloudCallBeak<Boolean> cloudCallBeak) {
    public void addInverterDeviceToCloud(String homeId, 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("homeId", homeId);
        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(), new CloudCallBeak<String>() {
            @Override
            public void onSuccess(String str) {
                if (cloudCallBeak != null) {
                    cloudCallBeak.onSuccess(true);
                    //临时的逻辑，上传oid列表到云端
                    uploadDataToCloud(UserConfigManage.getInstance().getHomeId(), mac, null);
                }
            }

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

    /**
     * 添加多个逆变器到云端上
     *
     * @param mac           -
     * @param cloudCallBeak -
     */
    public void addAllInverterDeviceToCloud(String homeId, String mac, List<GatewayBean> list, CloudCallBeak<Boolean> cloudCallBeak) {

        String requestUrl = HttpApi.POST_Device_Add_All;
        JsonObject json = new JsonObject();
        json.addProperty("homeId", homeId);
        JsonArray ary = new JsonArray();
        for (int i = 0; i < list.size(); i++) {
            GatewayBean gatewayBean=list.get(i);
            JsonObject inverterInfo = new JsonObject();
            inverterInfo.addProperty("mac",gatewayBean.getDevice_mac());
            inverterInfo.addProperty("spk",gatewayBean.getGatewayType());
            inverterInfo.addProperty("sid",gatewayBean.getSid());
            inverterInfo.addProperty("oid",gatewayBean.getOid());
            inverterInfo.addProperty("name",gatewayBean.getDevice_name());
            ary.add(inverterInfo);
        }
        json.add("devices", ary);
        // json.addProperty("zoneType", "password");//区域

        HttpClient.getInstance().requestHttp(requestUrl, json.toString(), new CloudCallBeak<String>() {
@@ -227,10 +274,10 @@
     * @param deviceId      设备id
     * @param cloudCallBeak 回调
     */
    public void delInverterDevice(String deviceId, CloudCallBeak<Boolean> cloudCallBeak) {
    public void delInverterDevice(String homeId, String deviceId, CloudCallBeak<Boolean> cloudCallBeak) {
        String requestUrl = HttpApi.POST_Device_Remove;
        JsonObject json = new JsonObject();
        json.addProperty("homeId", UserConfigManage.getInstance().getHomeId());
        json.addProperty("homeId", homeId);
        json.addProperty("deviceId", deviceId);
        // json.addProperty("zoneType", "password");//区域

@@ -257,10 +304,10 @@
     * @param parentOid     上级设备的Oid
     * @param cloudCallBeak 回调
     */
    public void getInverterDeviceChildDeviceList(String parentOid, CloudCallBeak<List<CloudInverterChildDeviceBean>> cloudCallBeak) {
    public void getInverterDeviceChildDeviceList(String homeId, String parentOid, CloudCallBeak<List<CloudInverterChildDeviceBean>> cloudCallBeak) {
        String requestUrl = HttpApi.POST_Device_ChildDevices_List;
        JsonObject json = new JsonObject();
        json.addProperty("homeId", UserConfigManage.getInstance().getHomeId());
        json.addProperty("homeId", homeId);
        json.addProperty("parentOid", parentOid);
        // json.addProperty("zoneType", "password");//区域

@@ -332,7 +379,6 @@
                    cloudCallBeak.onSuccess(true);
                }

                HdlLogLogic.print("全量更新oid到云端成功--->", true);

            }

@@ -341,7 +387,6 @@
                if (cloudCallBeak != null) {
                    cloudCallBeak.onFailure(e);
                }
                HdlLogLogic.print("全量更新oid到云端失败--->" + e.getMsg() + "(" + e.getCode() + ")", true);
            }
        });

@@ -409,10 +454,10 @@
     * @param mac          设备mac
     * @param linkCallBack 回调update
     */
    public void setGatewayRemoteParam(String mac, LinkCallBack<Boolean> linkCallBack) {
    public void setGatewayRemoteParam(String homeId, String mac, LinkCallBack<Boolean> linkCallBack) {
        String requestUrl = TopicApi.SET_GATEWAY_REMOTE_EDIT;
        JsonObject json = new JsonObject();
        json.addProperty("homeId", UserConfigManage.getInstance().getHomeId());
        json.addProperty("homeId", homeId);
        json.addProperty("server_addr", AppConfigManage.getUserRegionUrl());
        json.addProperty("local_secret", UserConfigManage.getInstance().getLocalSecret());
        //解密负载数据(写密钥给网关一定是明文，因为那时网关还没有密钥)
@@ -444,7 +489,7 @@
     * 网关时间读取
     *
     * @param mac          设备mac
     * @param linkCallBack 回调update
     * @param linkCallBack 回调updatetime
     */
    public void getGatewayTime(String mac, LinkCallBack<DeviceTimeBean> linkCallBack) {
        String requestUrl = TopicApi.GET_GATEWAY_TIME;
@@ -484,13 +529,22 @@
     * @param mac          设备mac
     * @param date         日期
     * @param time         时间
     * @param timezone     时区
     * @param linkCallBack 回调update
     */
    public void editGatewayTime(String mac, String date, String time, LinkCallBack<Boolean> linkCallBack) {
    public void editGatewayTime(String mac, String date, String time, String timezone, LinkCallBack<Boolean> linkCallBack) {
        String requestUrl = TopicApi.SET_GATEWAY_TIME_EDIT;
        JsonObject json = new JsonObject();
        json.addProperty("date", date);// "2020-08-15"
        json.addProperty("time", time);//"17:25:20"
        if (!TextUtils.isEmpty(date)) {
            json.addProperty("date", date);// "2020-08-15"
        }
        if (!TextUtils.isEmpty(time)) {
            json.addProperty("time", time);//"17:25:20"
        }
        if (!TextUtils.isEmpty(timezone)) {
            json.addProperty("timezone", timezone);//时区(语雀https://hdl-gz.yuque.com/wnkbmh/cdrglh/yckkyp#qWOPS)
        }

        TcpClient.getInstance().sendDataToLinkGateway(mac, requestUrl, json, "", new HDLLinkCallBack() {
            @Override
            public void onSuccess(String msg) {
@@ -632,7 +686,7 @@
                        if (list == null || list.size() == 0) {
                            //云端没有绑定逆变器,默认返回本地逆变器列表;
                            if (cloudCallBeak != null) {
                                cloudCallBeak.onSuccess(getCurrentHomeGatewayList());
                                cloudCallBeak.onSuccess(getCurrentHomeGatewayList(homeId));
                            }
                            return;
                        }
@@ -646,7 +700,7 @@
                                public void onSuccess(DeviceRemoteInfo deviceRemoteInfo) {
                                    atomicInteger.set(atomicInteger.get() + 1);
                                    //更新逆变器本地缓存信息
                                    refreshGatewayCacheData(true, cloudInverterDeviceBean, deviceRemoteInfo);
                                    refreshGatewayCacheData(true, cloudInverterDeviceBean, deviceRemoteInfo, homeId);
                                    //最后一条才做删除逆变器逻辑处理
                                    if (atomicInteger.get() == list.size()) {
                                        //收集删除逆变器sid
@@ -667,7 +721,7 @@
                                            removeLocalInverter(removeSidList.get(i));
                                        }
                                        if (cloudCallBeak != null) {
                                            cloudCallBeak.onSuccess(getCurrentHomeGatewayList());
                                            cloudCallBeak.onSuccess(getCurrentHomeGatewayList(homeId));
                                        }
                                    }
                                }
@@ -695,7 +749,7 @@
                                            removeLocalInverter(removeSidList.get(i));
                                        }
                                        if (cloudCallBeak != null) {
                                            cloudCallBeak.onSuccess(getCurrentHomeGatewayList());
                                            cloudCallBeak.onSuccess(getCurrentHomeGatewayList(homeId));
                                        }
                                    }
                                    HdlLogLogic.print("获取设备远程通讯信息失败->msg->" + e.getMsg() + "(" + e.getCode() + ")");
@@ -711,7 +765,7 @@
                        ///情况2:有局域网，没有外网;
                        //本地有逆变器列表,获取云端绑定逆变器失败,默认返回本地逆变器列表;
                        if (cloudCallBeak != null) {
                            cloudCallBeak.onSuccess(getCurrentHomeGatewayList());
                            cloudCallBeak.onSuccess(getCurrentHomeGatewayList(homeId));
                        }
                    }
                });
@@ -745,11 +799,11 @@
                                public void onSuccess(DeviceRemoteInfo deviceRemoteInfo) {
                                    atomicInteger.set(atomicInteger.get() + 1);
                                    //更新逆变器本地缓存信息
                                    refreshGatewayCacheData(false, cloudInverterDeviceBean, deviceRemoteInfo);
                                    refreshGatewayCacheData(false, cloudInverterDeviceBean, deviceRemoteInfo, homeId);
                                    //到最后一条，才有回调
                                    if (atomicInteger.get() == list.size()) {
                                        if (cloudCallBeak != null) {
                                            cloudCallBeak.onSuccess(getCurrentHomeGatewayList());
                                            cloudCallBeak.onSuccess(getCurrentHomeGatewayList(homeId));
                                        }
                                    }
                                }
@@ -760,10 +814,10 @@
                                    //当最后一条请求失败了，才有回调
                                    if (atomicInteger.get() == list.size()) {
                                        if (cloudCallBeak != null) {
                                            cloudCallBeak.onSuccess(getCurrentHomeGatewayList());
                                            cloudCallBeak.onSuccess(getCurrentHomeGatewayList(homeId));
                                        }
                                    }
                                    HdlLogLogic.print("获取设备远程通讯信息失败->msg->" + e.getMsg() + "(" + e.getCode() + ")");
                                    HdlLogLogic.print("获取设备远程通讯信息失败--->msg--->" + e.getMsg() + "(" + e.getCode() + ")");
                                }
                            });
                        }
@@ -843,6 +897,7 @@
        JsonObject json = new JsonObject();
        json.addProperty("homeId", "");
        json.addProperty("server_addr", "");
        json.addProperty("local_secret", "");
        TcpClient.getInstance().sendDataToLinkGateway(mac, true, requestUrl, json, "", new HDLLinkCallBack() {
            @Override
            public void onSuccess(String msg) {
@@ -885,7 +940,7 @@
     *
     * @param gatewayCallBack -
     */
    public void searchAllGateway(GatewayCallBack gatewayCallBack) {
    public void searchAllNetworkGateway(GatewayCallBack gatewayCallBack) {
        //网关搜索
        HDLLinkLocalSdk.getInstance().refreshGateway(gatewayCallBack, this.getGatewaySpk());
    }
@@ -954,8 +1009,8 @@
     *
     * @param deviceMac 设备mac
     */
    public void checkInverterConnectedCloud(String deviceMac, CloudCallBeak<CloudInverterDeviceBean> cloudCallBeak) {
        this.getCloudInverterDeviceList(UserConfigManage.getInstance().getHomeId(), new CloudCallBeak<List<CloudInverterDeviceBean>>() {
    public void checkInverterConnectedCloud(String homeId, String deviceMac, CloudCallBeak<CloudInverterDeviceBean> cloudCallBeak) {
        this.getCloudInverterDeviceList(homeId, new CloudCallBeak<List<CloudInverterDeviceBean>>() {
            @Override
            public void onSuccess(List<CloudInverterDeviceBean> list) {
                CloudInverterDeviceBean cloudInverterDeviceBean = null;
@@ -992,7 +1047,7 @@
     * @param deviceRemoteInfo        设备远程通讯信息
     * @param cloudInverterDeviceBean 逆变器
     */
    private void refreshGatewayCacheData(boolean isLocal, CloudInverterDeviceBean cloudInverterDeviceBean, DeviceRemoteInfo deviceRemoteInfo) {
    private void refreshGatewayCacheData(boolean isLocal, CloudInverterDeviceBean cloudInverterDeviceBean, DeviceRemoteInfo deviceRemoteInfo, String homeId) {
        //本地查找逆变器
        GatewayBean gatewayBean = HDLLinkLocalGateway.getInstance().getLocalGateway(cloudInverterDeviceBean.getOsn());
        if (gatewayBean == null) {
@@ -1009,7 +1064,7 @@
            HDLLinkConfig.getInstance().setGatewayId(deviceRemoteInfo.getGatewayId());//设置gatewayId

        }
        gatewayBean.setHomeId(UserConfigManage.getInstance().getHomeId());//住宅id
        gatewayBean.setHomeId(homeId);//住宅id
        gatewayBean.setDeviceStatus(cloudInverterDeviceBean.getDeviceStatus());//设置网关状态
        gatewayBean.setDeviceId(cloudInverterDeviceBean.getDeviceId());//设置link设备id
        gatewayBean.setDevice_mac(cloudInverterDeviceBean.getOsn());//设置mac