Merge branch 'dev' into feature/v1.4.1

mac

2024-06-05 31de722a45e886eae89cfea2f1740c1f4d3b0216

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

@@ -403,12 +403,26 @@
                    cloudCallBeak.onSuccess(true);
                    //临时的逻辑，上传oid列表到云端
                    List<GatewayBean> list = HdlDeviceLogic.getInstance().getCurrentHomeGatewayList(homeId);
                    uploadOidDataToCloud(UserConfigManage.getInstance().getHomeId(), list, true, null);
                    uploadOidDataToCloud(homeId, list, true, null);
                }
            }

            @Override
            public void onFailure(HDLException e) {
                //添加逆变器失败后初始化逆变器
                HdlLogLogic.print("添加逆变器失败后开始初始化逆变器-->", true);
                HdlDeviceLogic.getInstance().initializeInverter(mac, new LinkCallBack<Boolean>() {
                    @Override
                    public void onSuccess(Boolean obj) {
                        HdlLogLogic.print("初始化逆变器成功-->mac:" + mac, true);
                    }

                    @Override
                    public void onError(HDLLinkException e) {
                        HdlLogLogic.print("初始化逆变器失败-->mac:" + mac, true);
                    }
                });

                if (cloudCallBeak != null) {
                    cloudCallBeak.onFailure(e);
                }
@@ -453,9 +467,27 @@

            @Override
            public void onFailure(HDLException e) {
                //添加逆变器失败后初始化逆变器
                HdlLogLogic.print("添加逆变器失败后开始初始化逆变器-->", true);
                for (int i = 0; i < list.size(); i++) {
                    GatewayBean gatewayBean = list.get(i);
                    HdlDeviceLogic.getInstance().initializeInverter(gatewayBean.getDevice_mac(), new LinkCallBack<Boolean>() {
                        @Override
                        public void onSuccess(Boolean obj) {
                            HdlLogLogic.print("初始化逆变器成功-->mac:" + gatewayBean.getDevice_mac(), true);
                        }

                        @Override
                        public void onError(HDLLinkException e) {
                            HdlLogLogic.print("初始化逆变器失败-->mac:" + gatewayBean.getDevice_mac(), true);
                        }
                    });
                }
                if (cloudCallBeak != null) {
                    cloudCallBeak.onFailure(e);
                }


            }
        });
    }
@@ -967,7 +999,7 @@
     * @param cloudCallBeak 返回逆变器列表
     */
    public void getCurrentHomeLocalAndCloudGatewayList(String homeId, CloudCallBeak<List<GatewayBean>> cloudCallBeak) {
        HdlDeviceLogic.getInstance().searchCurrentHomeGateway(new GatewayCallBack() {
        HdlDeviceLogic.getInstance().searchCurrentHomeGateway(homeId,new GatewayCallBack() {
            @Override
            public void onSuccess(List<GatewayBean> gatewayBeanList) {
                //局域网有2种情况(1:有局域网，有外网；2:有局域网，没有外网);
@@ -1169,10 +1201,10 @@
     *
     * @param gatewayCallBack -
     */
    public void searchCurrentHomeGateway(GatewayCallBack gatewayCallBack) {
    public void searchCurrentHomeGateway(String homeId,GatewayCallBack gatewayCallBack) {
        List<String> spks = this.getGatewaySpk();
        //网关搜索
        HDLLinkLocalGateway.getInstance().refreshGatewayByHomeIdAndSpk(UserConfigManage.getInstance().getHomeId(), spks, true, gatewayCallBack);
        HDLLinkLocalGateway.getInstance().refreshGatewayByHomeIdAndSpk(homeId, spks, true, gatewayCallBack);
    }

    /**
@@ -1193,8 +1225,8 @@
     * @param deviceMac 设备mac，
     * @param callBeak  返回 true=本地连接;false=远程;
     */
    public void isLocalConnect(String deviceMac, CloudCallBeak<Boolean> callBeak) {
        searchCurrentHomeGateway(new GatewayCallBack() {
    public void isLocalConnect(String homeId,String deviceMac, CloudCallBeak<Boolean> callBeak) {
        searchCurrentHomeGateway(homeId,new GatewayCallBack() {
            @Override
            public void onSuccess(List<GatewayBean> gatewayBeanList) {
                if (gatewayBeanList == null || gatewayBeanList.size() == 0) {