From 637e3152e3bfea430ca774c7dd178b4b9696c37f Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期二, 26 十二月 2023 17:11:58 +0800
Subject: [PATCH] 2023年12月26日17:11:48
---
app/src/main/java/com/hdl/photovoltaic/ui/me/languageSelectionActivity.java | 28 ++++++++++++++++------------
1 files changed, 16 insertions(+), 12 deletions(-)
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/me/languageSelectionActivity.java b/app/src/main/java/com/hdl/photovoltaic/ui/me/languageSelectionActivity.java
index 825c4cb..205f34e 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/me/languageSelectionActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/me/languageSelectionActivity.java
@@ -52,18 +52,7 @@
}
private void readData() {
- list = new ArrayList<>();
- LanguageAdapter.ItemData zh = new LanguageAdapter.ItemData();
- zh.setState(false);
- zh.setTitle("绠�浣撲腑鏂�");
- zh.setLanguage(LocalManageUtil.zh);
- list.add(zh);
- LanguageAdapter.ItemData en = new LanguageAdapter.ItemData();
- en.setState(false);
- en.setTitle("English");
- en.setLanguage(LocalManageUtil.en);
- list.add(en);
-
+ list = LocalManageUtil.getLanguageList();
for (int i = 0; i < list.size(); i++) {
LanguageAdapter.ItemData itemData = list.get(i);
if (itemData.getLanguage().equals(UserConfigManage.getInstance().getCurrentAppLanguage())) {
@@ -79,6 +68,7 @@
viewBinding.toolbarTopFragmentHouseListRl.topBackBtn.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
+ setResult(30);
finish();
}
});
@@ -86,12 +76,17 @@
languageAdapter.setNoOnclickListener(new LanguageAdapter.OnclickListener() {
@Override
public void onClick(int position, LanguageAdapter.ItemData itemData) {
+
for (int i = 0; i < list.size(); i++) {
LanguageAdapter.ItemData data = list.get(i);
data.setState(false);
}
list.get(position).setState(true);
languageAdapter.notifyDataSetChanged();
+ if (UserConfigManage.getInstance().getCurrentAppLanguage().equals(itemData.getLanguage())) {
+ //鍚屼竴涓笉鎵ц寮圭獥
+ return;
+ }
languageSelectionDialog(itemData);
}
@@ -124,6 +119,15 @@
dialog.setNoOnclickListener(new ConfirmationCancelDialog.onNoOnclickListener() {
@Override
public void Cancel() {
+ //鍙栨秷涔嬪悗杩樺師涔嬪墠鐘舵��
+ for (int i = 0; i < list.size(); i++) {
+ LanguageAdapter.ItemData data = list.get(i);
+ data.setState(false);
+ if (UserConfigManage.getInstance().getCurrentAppLanguage().equals(data.getLanguage())) {
+ data.setState(true);
+ }
+ }
+ languageAdapter.notifyDataSetChanged();
dialog.dismiss();
}
});
--
Gitblit v1.8.0