From f91ef956cf482ed4ce0885dc47794b783c20c415 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期三, 30 四月 2025 10:14:43 +0800
Subject: [PATCH] Merge branch '1.2.0' into 1.5.1_google

---
 app/src/main/java/com/hdl/photovoltaic/ui/me/languageSelectionActivity.java |   23 ++++++++++++++++++-----
 1 files changed, 18 insertions(+), 5 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 cda1b23..0f074a3 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
@@ -2,6 +2,7 @@
 
 import androidx.recyclerview.widget.LinearLayoutManager;
 
+import android.content.DialogInterface;
 import android.content.Intent;
 import android.os.Bundle;
 import android.os.SystemClock;
@@ -43,8 +44,8 @@
 
     @Override
     public void onBindView(Bundle savedInstanceState) {
-        setNotificationBarBackgroundColor(CustomColor.white);
-        setStatusBarTextColor();
+        setStatusBarTranslucent();
+        getWindow().setNavigationBarColor(getColor(R.color.text_FF000000));
         readData();
         //鍒濆鍖�
         initView();
@@ -178,14 +179,26 @@
                 dialog.dismiss();
             }
         });
+
+        dialog.setOnDismissListener(new DialogInterface.OnDismissListener() {
+            @Override
+            public void onDismiss(DialogInterface dialog) {
+                //鍙栨秷涔嬪悗杩樺師涔嬪墠鐘舵��
+                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();
+            }
+        });
     }
 
     private void initView() {
         viewBinding.toolbarTopRl.topTitleTv.setText(R.string.set_language_choice);
-        viewBinding.toolbarTopRl.topTitleTv.setTextColor(getResources().getColor(R.color.text_030D1C, null));
         viewBinding.toolbarTopRl.topBackLl.setVisibility(View.VISIBLE);
-        viewBinding.toolbarTopRl.topLeftIv.setImageResource(R.drawable.back_c);
-        viewBinding.toolbarTopRl.topBarView.setBackgroundColor(getResources().getColor(R.color.text_FFECECEC, null));
         LinearLayoutManager linearLayout = new LinearLayoutManager(_mActivity);
         languageAdapter = new LanguageAdapter(this.list, _mActivity);
         viewBinding.languageRc.setLayoutManager(linearLayout);

--
Gitblit v1.8.0