From 9d6dd1ccc62eb2c7030eb0cc1e6aa05d7ee67458 Mon Sep 17 00:00:00 2001 From: mac <user@users-MacBook-Pro.local> Date: 星期三, 20 三月 2024 10:11:10 +0800 Subject: [PATCH] 2024年03月20日10:11:04 --- app/src/main/java/com/hdl/photovoltaic/ui/me/languageSelectionActivity.java | 32 ++++++++++++++++++++------------ 1 files changed, 20 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..fb98846 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 @@ -6,6 +6,7 @@ import android.os.Bundle; import android.view.View; +import com.hdl.linkpm.sdk.HDLLinkPMSdk; import com.hdl.photovoltaic.HDLApp; import com.hdl.photovoltaic.R; import com.hdl.photovoltaic.base.CustomBaseActivity; @@ -52,18 +53,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 +69,7 @@ viewBinding.toolbarTopFragmentHouseListRl.topBackBtn.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { + setResult(30); finish(); } }); @@ -86,12 +77,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); } @@ -115,6 +111,9 @@ public void Confirm() { UserConfigManage.getInstance().setCurrentAppLanguage(itemData.getLanguage()); UserConfigManage.getInstance().Save(); + //閰嶇疆鎺ュ彛璇锋眰璇█ + HDLLinkPMSdk.setLanguage(UserConfigManage.getInstance().getCurrentAppLanguage()); + dialog.dismiss(); AppManagerUtils.getAppManager().finishAllActivity(); Intent intent = new Intent(); intent.setClass(HDLApp.getInstance(), StartActivity.class); @@ -124,6 +123,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