Merge branch 'dev-hxb' into wjc_new

mac

2024-04-12 1311774b7c71fe94016a7b2cdf508e3d39114422

 app/src/main/java/com/hdl/photovoltaic/ui/MyPowerStationActivity.java

@@ -406,7 +406,7 @@
                @Override
                public void onSuccess(MqttInfo info) {
                    if (info != null) {
                        MqttRecvClient.getInstance().setConnectParam(info.getUrl(), info.getClientId(), info.getUserName(), info.getPassWord());
                        MqttRecvClient.getInstance().setConnectParam(info.getUrl(), info.getClientId(), info.getUserName(), info.getPassWord(),null);
                        MqttRecvClient.getInstance().connect();
                    }
                }