Merge branch 'wjc_new' into develop_new

mac

2024-05-30 1ef9c12f9e1edd46fd3edac5363d3519a5e0c05f

 app/src/main/java/com/hdl/photovoltaic/ui/test/TestMainActivity.java

@@ -291,7 +291,7 @@
                    public void Confirm() {
                        confirmationCancelDialog.dismiss();
                        showLoading("解绑中...");
                        HdlDeviceLogic.getInstance().initializeGateway(gatewayBean.getDevice_mac(), new LinkCallBack<Boolean>() {
                        HdlDeviceLogic.getInstance().initializeInverter(gatewayBean.getDevice_mac(), new LinkCallBack<Boolean>() {
                            @Override
                            public void onSuccess(Boolean obj) {
                                hideLoading();