2023年10月30日18:21:12

mac

2023-10-30 a8e0bddc9903d854808e9526600128e95560faa3

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

@@ -18,6 +18,7 @@
import com.hdl.photovoltaic.ui.bean.CloudInverterChildDeviceBean;
import com.hdl.photovoltaic.ui.bean.CloudInverterDeviceBean;
import com.hdl.photovoltaic.ui.bean.DeviceRemoteInfo;
import com.hdl.photovoltaic.ui.bean.DeviceTimeBean;
import com.hdl.photovoltaic.ui.bean.OidBean;
import com.hdl.sdk.link.common.exception.HDLLinkException;
import com.hdl.sdk.link.core.bean.gateway.GatewayBean;
@@ -69,13 +70,32 @@
                if (TextUtils.isEmpty(gatewayBean.getDevice_mac())) {
                    continue;
                }
                if (gatewayBean.getMaster().equals(GatewayMasterType.MasterTrue)
                        && gatewayBean.getHomeId().equals(UserConfigManage.getInstance().getHomeId())) {
                if (gatewayBean.getMaster().equals(GatewayMasterType.MasterTrue) && gatewayBean.getHomeId().equals(UserConfigManage.getInstance().getHomeId())) {
                    newList.add(gatewayBean);
                }
            }
        }
        return newList;
    }

    /**
     * 获取当前住宅的【主】逆变器列表
     */
    public GatewayBean getCurrentHomeMainGateway() {
        List<GatewayBean> list = HDLLinkLocalGateway.getInstance().getGatewayList();
        if (list.size() > 0) {
            for (int i = 0; i < list.size(); i++) {
                GatewayBean gatewayBean = list.get(i);
                if (TextUtils.isEmpty(gatewayBean.getDevice_mac())) {
                    continue;
                }
                if (gatewayBean.getMaster().equals(GatewayMasterType.MasterTrue) && gatewayBean.getHomeId().equals(UserConfigManage.getInstance().getHomeId())) {
                    //找到返回
                    return gatewayBean;
                }
            }
        }
        return null;
    }

    /**
@@ -353,13 +373,25 @@
     * @param mac          设备mac
     * @param linkCallBack 回调update
     */
    public void getGatewayTime(String mac, LinkCallBack<Boolean> linkCallBack) {
    public void getGatewayTime(String mac, LinkCallBack<DeviceTimeBean> linkCallBack) {
        String requestUrl = TopicApi.GET_GATEWAY_TIME;
        TcpClient.getInstance().sendDataToLinkGateway(mac, requestUrl, null, "", new HDLLinkCallBack() {
            @Override
            public void onSuccess(String msg) {
            public void onSuccess(String json) {

                if (TextUtils.isEmpty(json)) {
                    if (linkCallBack != null) {
                        linkCallBack.onSuccess(new DeviceTimeBean());
                    }
                    return;
                }

                Gson gson = new Gson();
                Type typeOfT = new TypeToken<BaseLocalResponse<DeviceTimeBean>>() {
                }.getType();
                BaseLocalResponse<DeviceTimeBean> baseLocalResponse = gson.fromJson(json, typeOfT);
                if (linkCallBack != null) {
                    linkCallBack.onSuccess(true);
                    linkCallBack.onSuccess(baseLocalResponse.getObjects());
                }
            }

@@ -377,17 +409,16 @@
     * 网关时间修改
     *
     * @param mac          设备mac
     * @param date         日期
     * @param time         时间
     * @param linkCallBack 回调update
     */
    public void editGatewayTime(String mac, JsonObject jsonObject, LinkCallBack<Boolean> linkCallBack) {
    public void editGatewayTime(String mac, String date, String time, LinkCallBack<Boolean> linkCallBack) {
        String requestUrl = TopicApi.SET_GATEWAY_TIME_EDIT;
//        JsonObject json = new JsonObject();
//        json.addProperty("master", "true");
//        "objects": {
//            "date": "2020-08-15",
//                    "time": "17:25:20"
//        }
        TcpClient.getInstance().sendDataToLinkGateway(mac, requestUrl, jsonObject, "", new HDLLinkCallBack() {
        JsonObject json = new JsonObject();
        json.addProperty("date", date);// "2020-08-15"
        json.addProperty("time", time);//"17:25:20"
        TcpClient.getInstance().sendDataToLinkGateway(mac, requestUrl, json, "", new HDLLinkCallBack() {
            @Override
            public void onSuccess(String msg) {
                if (linkCallBack != null) {
@@ -511,7 +542,7 @@

    /**
     * 获取逆变器列表
     * 注意:有外网以云端设备为准,本地存在，云端没有则删除；内网以本地为主,搜索多少个设备就显示多少个；
     * 注意:有外网以云端设备为准;本地存在，云端没有则删除；内网以本地为主,搜索多少个设备就显示多少个；
     *
     * @param cloudCallBeak 返回逆变器列表
     */
@@ -671,7 +702,6 @@
     * @param spk           spk
     * @param mac           设备mac
     * @param cloudCallBeak 回调
     * @return -
     */
    public void getDeviceRemoteInfo(String homeId, String spk, String mac, CloudCallBeak<DeviceRemoteInfo> cloudCallBeak) {
        String requestUrl = HttpApi.POST_Device_RemoteInfo;
@@ -705,7 +735,7 @@
    }

    /**
     * 删除本地逆变器
     * 删除本地缓存逆变器
     *
     * @param sid 设备sid
     */
@@ -724,7 +754,7 @@
    public void clearInverterHomeId(String mac, LinkCallBack<Boolean> callBeak) {
        String requestUrl = TopicApi.SET_GATEWAY_REMOTE_EDIT;
        JsonObject json = new JsonObject();
        json.addProperty("homeId","");
        json.addProperty("homeId", "");
        json.addProperty("server_addr", "");
        TcpClient.getInstance().sendDataToLinkGateway(mac, true, requestUrl, json, "", new HDLLinkCallBack() {
            @Override
@@ -760,6 +790,7 @@
        //网关搜索
        HDLLinkLocalGateway.getInstance().refreshGatewayByHomeIdAndSpk(UserConfigManage.getInstance().getHomeId(), spks, true, gatewayCallBack);
    }


    /**
     * 刷新逆变器缓存信息(包括设置mqtt秘钥）
@@ -804,6 +835,7 @@
        gatewayBean.setPowerPvNow(cloudInverterDeviceBean.getPowerPvNow());//发电功率
        gatewayBean.setTotalElectricityPvToday(cloudInverterDeviceBean.getTotalElectricityPvToday());//今日发电量
        gatewayBean.setDevice_model(cloudInverterDeviceBean.getOmodel());//设备型号
        gatewayBean.setSpk(cloudInverterDeviceBean.getSpk());//设备spk


    }