Merge branch 'dev'

mac

2024-06-12 12d6db5780d8a2121a3bef2d58bf897b24ff552a

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

@@ -74,7 +74,7 @@
    }

    private void initEvent() {
        viewBinding.topBackBtn.setOnClickListener(this);
        viewBinding.topBackLl.setOnClickListener(this);
        viewBinding.topLogBtn.setOnClickListener(this);
        viewBinding.clickCommandTv.setOnClickListener(this);
        viewBinding.clickSelectDeviceTv.setOnClickListener(this);
@@ -101,7 +101,7 @@
    @Override
    public void onClick(View v) {
        int id = v.getId();
        if (id == viewBinding.topBackBtn.getId()) {
        if (id == viewBinding.topBackLl.getId()) {
            finish();
        } else if (id == viewBinding.topLogBtn.getId()) {
            startActivity(TestLogActivity.class);
@@ -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();