From 12d6db5780d8a2121a3bef2d58bf897b24ff552a Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期三, 12 六月 2024 15:54:29 +0800
Subject: [PATCH] Merge branch 'dev'
---
app/src/main/java/com/hdl/photovoltaic/ui/me/SetActivity.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/me/SetActivity.java b/app/src/main/java/com/hdl/photovoltaic/ui/me/SetActivity.java
index 65cbb2d..3dba84b 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/me/SetActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/me/SetActivity.java
@@ -42,7 +42,7 @@
}
private void initEvent() {
- viewBinding.toolbarTopFragmentHouseListRl.topBackBtn.setOnClickListener(new View.OnClickListener() {
+ viewBinding.toolbarTopFragmentHouseListRl.topBackLl.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
finish();
@@ -89,7 +89,7 @@
private void initView() {
viewBinding.toolbarTopFragmentHouseListRl.topTitleTv.setText(R.string.me_set);
viewBinding.toolbarTopFragmentHouseListRl.topTitleTv.setTextColor(getResources().getColor(R.color.text_030D1C, null));
- viewBinding.toolbarTopFragmentHouseListRl.topBackBtn.setVisibility(View.VISIBLE);
+ viewBinding.toolbarTopFragmentHouseListRl.topBackLl.setVisibility(View.VISIBLE);
viewBinding.toolbarTopFragmentHouseListRl.topBarView.setBackgroundColor(getResources().getColor(R.color.text_FFFFFFFF, null));
viewBinding.setLanguageIl.sllLlRlNameTv.setText(R.string.set_multilingual);
viewBinding.setAccountSecurityIl.sllLlRlNameTv.setText(R.string.set_account_security);
@@ -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() {
--
Gitblit v1.8.0