From 1ef9c12f9e1edd46fd3edac5363d3519a5e0c05f Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期四, 30 五月 2024 21:12:37 +0800
Subject: [PATCH] Merge branch 'wjc_new' into develop_new
---
app/src/main/java/com/hdl/photovoltaic/ui/me/SetActivity.java | 13 ++++---------
1 files changed, 4 insertions(+), 9 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 8873f18..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
@@ -10,15 +10,10 @@
import com.hdl.linkpm.sdk.user.HDLLinkPMUser;
import com.hdl.photovoltaic.R;
import com.hdl.photovoltaic.base.CustomBaseActivity;
-import com.hdl.photovoltaic.config.ConstantManage;
import com.hdl.photovoltaic.config.UserConfigManage;
import com.hdl.photovoltaic.databinding.ActivitySetBinding;
-import com.hdl.photovoltaic.ui.MyPowerStationActivity;
import com.hdl.photovoltaic.utils.LocalManageUtil;
import com.hdl.photovoltaic.widget.ConfirmationCancelDialog;
-import com.hdl.sdk.link.core.bean.eventbus.BaseEventBus;
-
-import org.greenrobot.eventbus.EventBus;
/**
* 鎴戠殑-璁剧疆-鐣岄潰
@@ -47,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();
@@ -94,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);
@@ -125,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