From 46f45f42abf00acf70e8160e73faa71aec3df13d Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期一, 01 七月 2024 13:46:30 +0800
Subject: [PATCH] 2024年07月01日13:46:18
---
app/src/main/java/com/hdl/photovoltaic/ui/me/SetActivity.java | 86 +++++++++++++------------------------------
1 files changed, 26 insertions(+), 60 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 0cb3ecc..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
@@ -1,34 +1,19 @@
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.utils.LocalManageUtil;
import com.hdl.photovoltaic.widget.ConfirmationCancelDialog;
-import com.hdl.photovoltaic.widget.ConfirmationInputDialog;
/**
* 鎴戠殑-璁剧疆-鐣岄潰
@@ -57,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();
@@ -67,7 +52,9 @@
viewBinding.setLanguageIl.getRoot().setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
- startActivity(languageSelectionActivity.class);
+ Intent intent = new Intent();
+ intent.setClass(_mActivity, languageSelectionActivity.class);
+ startActivityForResult(intent, 30);
}
});
//璐﹀彿涓庡畨鍏�
@@ -83,7 +70,9 @@
viewBinding.setTemperatureUnitIl.getRoot().setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
- startActivity(TemperatureUnitActivity.class);
+ Intent intent = new Intent();
+ intent.setClass(_mActivity, TemperatureUnitActivity.class);
+ startActivityForResult(intent, 40);
}
});
//閫�鍑虹櫥褰�
@@ -100,54 +89,30 @@
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);
viewBinding.setTemperatureUnitIl.sllLlRlNameTv.setText(R.string.set_temperature_unit);
+ viewBinding.setLanguageIl.sllLlRlRightContentTv.setVisibility(View.VISIBLE);
+ String str = LocalManageUtil.getLanguage(UserConfigManage.getInstance().getCurrentAppLanguage()).getTitle();
+ viewBinding.setLanguageIl.sllLlRlRightContentTv.setText(str);
+ viewBinding.setTemperatureUnitIl.sllLlRlRightContentTv.setVisibility(View.VISIBLE);
+ viewBinding.setTemperatureUnitIl.sllLlRlRightContentTv.setText(UserConfigManage.getInstance().getTemperature_unit());
+
}
- /**
- * 淇敼鐢ㄦ埛鏄电О
- */
- private void changedNickname() {
- if (UserConfigManage.getInstance().isBAccount()) {
- //todo B绔笉鏀寔鏇存敼鏄电О
- } else {
- ConfirmationInputDialog confirmationInputDialog = new ConfirmationInputDialog(_mActivity);
- confirmationInputDialog.setTitle(getString(R.string.set_nickname_modification));
- confirmationInputDialog.setEditContent(UserConfigManage.getInstance().getUserName());
- confirmationInputDialog.show();
-
- confirmationInputDialog.setYesOnclickListener(new ConfirmationInputDialog.onYesOnclickListener() {
- @Override
- public void Confirm(String str) {
- HdlAccountLogic.getInstance().updateMemberInfo_C("", str, "", "", "", "", new CloudCallBeak<Boolean>() {
- @Override
- public void onSuccess(Boolean obj) {
- UserConfigManage.getInstance().setUserName(str);
- UserConfigManage.getInstance().Save();
- HdlThreadLogic.tipFlashingBox(_mActivity, true, getString(R.string.home_login_change_name_succeed), 0);
- }
-
- @Override
- public void onFailure(HDLException e) {
- HdlThreadLogic.tipFlashingBox(_mActivity, false, e.getMessage(), e.getCode());
- }
- });
-
- }
- });
- confirmationInputDialog.setNoOnclickListener(new ConfirmationInputDialog.onNoOnclickListener() {
- @Override
- public void Cancel() {
- confirmationInputDialog.dismiss();
- }
- });
+ @Override
+ protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {
+ super.onActivityResult(requestCode, resultCode, data);
+ if (requestCode == 30 && resultCode == 30) {
+ String str = LocalManageUtil.getLanguage(UserConfigManage.getInstance().getCurrentAppLanguage()).getTitle();
+ viewBinding.setLanguageIl.sllLlRlRightContentTv.setText(str);
+ } else if (requestCode == 40 && resultCode == 40) {
+ viewBinding.setTemperatureUnitIl.sllLlRlRightContentTv.setText(UserConfigManage.getInstance().getTemperature_unit());
}
}
-
/**
* 閫�鍑虹櫥褰曡姹傜殑鏂规硶
@@ -155,12 +120,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