From 07fb950b0f6c460e4cc60c4e262bc5992074790e Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期二, 26 三月 2024 20:49:08 +0800
Subject: [PATCH] 2024年03月26日20:49:02
---
app/src/main/java/com/hdl/photovoltaic/ui/me/languageSelectionActivity.java | 41 +++++++++++++++++++++++++++++------------
1 files changed, 29 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..170a46c 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;
@@ -13,6 +14,7 @@
import com.hdl.photovoltaic.databinding.ActivityLanguageSelectionBinding;
import com.hdl.photovoltaic.ui.StartActivity;
import com.hdl.photovoltaic.ui.adapter.LanguageAdapter;
+import com.hdl.photovoltaic.uni.HDLUniMPSDKManager;
import com.hdl.photovoltaic.utils.AppManagerUtils;
import com.hdl.photovoltaic.utils.LocalManageUtil;
import com.hdl.photovoltaic.widget.ConfirmationCancelDialog;
@@ -52,18 +54,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 +70,7 @@
viewBinding.toolbarTopFragmentHouseListRl.topBackBtn.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
+ setResult(30);
finish();
}
});
@@ -86,12 +78,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 +112,17 @@
public void Confirm() {
UserConfigManage.getInstance().setCurrentAppLanguage(itemData.getLanguage());
UserConfigManage.getInstance().Save();
+ //閰嶇疆鎺ュ彛璇锋眰璇█
+ HDLLinkPMSdk.setLanguage(UserConfigManage.getInstance().getCurrentAppLanguage());
+ dialog.dismiss();
+ if (!UserConfigManage.getInstance().isBAccount()) {
+ finish();
+ //鍥犱负C绔富鐣岄潰鏄痷ni鍐欑殑锛岃繖閲岃瑷�鍒囨崲蹇呴』鎶ni鍏虫帀鍐嶉噸鏂板惎鍔�,鍚﹀垯浼氭敹涓嶅埌uni鍙戣繃鏉ョ殑鏁版嵁(鎺ュ彛涓簄ull)
+ if (null != HDLUniMPSDKManager.getInstance().getUniMP()) {
+ HDLUniMPSDKManager.getInstance().getUniMP().closeUniMP();
+ }
+ HDLUniMPSDKManager.getInstance().initDCUniMPSDK(HDLApp.getInstance());
+ }
AppManagerUtils.getAppManager().finishAllActivity();
Intent intent = new Intent();
intent.setClass(HDLApp.getInstance(), StartActivity.class);
@@ -124,6 +132,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