Merge branch 'wjc_new' into wxw_new

mac

2024-05-22 78f8167844484f8601ac6f4dad84a3eb5097a2fd

 app/src/main/java/com/hdl/photovoltaic/ui/me/SetActivity.java

@@ -120,9 +120,9 @@
    private void logoutRequest() {
        // 二次确认提示框
        ConfirmationCancelDialog dialog = new ConfirmationCancelDialog(this);
        dialog.setTitle(getString(R.string.loading_title_tip));
        dialog.setContent(getString(R.string.loading_log_out));
        dialog.show();
        dialog.setContent(getString(R.string.loading_log_out));
        dialog.isHideTitle(true);
        dialog.setYesOnclickListener(new ConfirmationCancelDialog.onYesOnclickListener() {
            @Override
            public void Confirm() {