Merge branch 'wxw_new' into dev-hxb

hxb

2024-04-11 1078968985ae81e79ea149e3251841cd9bd54a1e

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

@@ -346,7 +346,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();
                    }
                }
@@ -428,22 +428,4 @@
    }


    /**
     * 端口冲突
     */
    private void portConflictDialog() {
        if (!HDLUdpConnect.getInstance().isBindSuccess()) {
            ConfirmationTipDialog dialog = new ConfirmationTipDialog(_mActivity);
            dialog.show();
            dialog.setTitle(getString(R.string.home_account_registered_successfully));
            dialog.setYesOnclickListener(new ConfirmationCancelDialog.onYesOnclickListener() {
                @Override
                public void Confirm() {
                    finish();
                }
            });
        }
    }


}
}