From 90d5f028ccdaaaf64286f9d632cb335a4d0544b9 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期二, 07 一月 2025 09:40:52 +0800
Subject: [PATCH] Merge branch '1.5.1'
---
app/src/main/java/com/hdl/photovoltaic/ui/me/SetActivity.java | 48 ++++++++++++++++++++++--------------------------
1 files changed, 22 insertions(+), 26 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 f421a78..d981c48 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
@@ -1,35 +1,20 @@
package com.hdl.photovoltaic.ui.me;
-import android.content.ComponentName;
-import android.content.Context;
import android.content.Intent;
-import android.content.ServiceConnection;
import android.os.Bundle;
-import android.os.IBinder;
import android.view.View;
import androidx.annotation.Nullable;
-import com.hdl.linkpm.sdk.HDLLinkPMSdk;
-import com.hdl.linkpm.sdk.core.exception.HDLException;
import com.hdl.linkpm.sdk.user.HDLLinkPMUser;
-import com.hdl.photovoltaic.HDLApp;
import com.hdl.photovoltaic.R;
import com.hdl.photovoltaic.base.CustomBaseActivity;
import com.hdl.photovoltaic.config.UserConfigManage;
import com.hdl.photovoltaic.databinding.ActivitySetBinding;
-import com.hdl.photovoltaic.internet.HttpServer.MyNanoHttpServer;
-import com.hdl.photovoltaic.internet.HttpServer.MyNanoHttpService;
-import com.hdl.photovoltaic.listener.CloudCallBeak;
-import com.hdl.photovoltaic.other.HdlAccountLogic;
-import com.hdl.photovoltaic.other.HdlThreadLogic;
-import com.hdl.photovoltaic.ui.StartActivity;
-import com.hdl.photovoltaic.ui.adapter.LanguageAdapter;
-import com.hdl.photovoltaic.utils.AppManagerUtils;
+import com.hdl.photovoltaic.ui.test.TestMainActivity;
import com.hdl.photovoltaic.utils.LocalManageUtil;
import com.hdl.photovoltaic.widget.ConfirmationCancelDialog;
-import com.hdl.photovoltaic.widget.ConfirmationInputDialog;
/**
* 鎴戠殑-璁剧疆-鐣岄潰
@@ -48,8 +33,8 @@
@Override
public void onBindView(Bundle savedInstanceState) {
- setNotificationBarBackgroundColor(CustomColor.white);
- setStatusBarTextColor();
+ setStatusBarTranslucent();
+ getWindow().setNavigationBarColor(getColor(R.color.text_FF000000));
//鍒濆鍖�
initView();
//鍒濆鍖栫晫闈㈢洃鍚櫒
@@ -58,7 +43,7 @@
}
private void initEvent() {
- viewBinding.toolbarTopFragmentHouseListRl.topBackBtn.setOnClickListener(new View.OnClickListener() {
+ viewBinding.toolbarTopRl.topBackLl.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
finish();
@@ -98,19 +83,29 @@
logoutRequest();
}
});
-
+ final int[] count = {0};
+ viewBinding.toolbarTopRl.topTitleTv.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ count[0] = count[0] + 1;
+ if (count[0] > 3) {
+ count[0] = 0;
+ startActivity(TestMainActivity.class);
+ }
+ }
+ });
}
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.topBarView.setBackgroundColor(getResources().getColor(R.color.text_FFFFFFFF, null));
+ viewBinding.toolbarTopRl.topTitleTv.setText(R.string.me_set);
+ viewBinding.toolbarTopRl.topBackLl.setVisibility(View.VISIBLE);
viewBinding.setLanguageIl.sllLlRlNameTv.setText(R.string.set_multilingual);
viewBinding.setAccountSecurityIl.sllLlRlNameTv.setText(R.string.set_account_security);
viewBinding.setTemperatureUnitIl.sllLlRlNameTv.setText(R.string.set_temperature_unit);
viewBinding.setLanguageIl.sllLlRlRightContentTv.setVisibility(View.VISIBLE);
+ viewBinding.setLanguageIl.lineV.setVisibility(View.VISIBLE);
+ viewBinding.setAccountSecurityIl.lineV.setVisibility(View.VISIBLE);
String str = LocalManageUtil.getLanguage(UserConfigManage.getInstance().getCurrentAppLanguage()).getTitle();
viewBinding.setLanguageIl.sllLlRlRightContentTv.setText(str);
viewBinding.setTemperatureUnitIl.sllLlRlRightContentTv.setVisibility(View.VISIBLE);
@@ -136,12 +131,13 @@
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() {
+ dialog.dismiss();
HDLLinkPMUser.getInstance().logout(0);
}
});
--
Gitblit v1.8.0