From 31e89a8697d049410c9d8d5c333cba33223bc9dc Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期二, 01 四月 2025 19:39:26 +0800
Subject: [PATCH] 2025年04月01日19:39:19

---
 app/src/main/java/com/hdl/photovoltaic/HDLApp.java |   23 +++++++++++++++++++++--
 1 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/com/hdl/photovoltaic/HDLApp.java b/app/src/main/java/com/hdl/photovoltaic/HDLApp.java
index 98ba351..b4ba57d 100644
--- a/app/src/main/java/com/hdl/photovoltaic/HDLApp.java
+++ b/app/src/main/java/com/hdl/photovoltaic/HDLApp.java
@@ -99,8 +99,8 @@
         String language = UserConfigManage.getInstance().getCurrentAppLanguage();
         if (TextUtils.isEmpty(language)) {
             //浠庡唴瀛橀噷闈㈣幏鍙栦笉鍒拌瑷�,鑾峰彇褰撳墠绯荤粺鐨�;
-            String str = getResources().getConfiguration().locale.getCountry();
-            if (str.equals("CN") || str.equals("TW")) {
+            String str = getResources().getConfiguration().locale.getLanguage();
+            if (str.equals(LocalManageUtil.zh)) {
                 UserConfigManage.getInstance().setCurrentAppLanguage(LocalManageUtil.zh);
             } else {
                 UserConfigManage.getInstance().setCurrentAppLanguage(LocalManageUtil.en);
@@ -349,6 +349,7 @@
         });
     }
 
+
     /**
      * 鍒濆鍖杣ni app mqtt
      */
@@ -366,6 +367,7 @@
         }
     }
 
+
     @Override
     protected void attachBaseContext(Context base) {
         MultiDex.install(base);
@@ -375,6 +377,23 @@
     /**
      * 鏀寔涓嫳鏂囧垏鎹�
      */
+    public Context getAppLocaleContext(Context context) {
+        try {
+            Locale locale = new Locale(UserConfigManage.getInstance().getCurrentAppLanguage());
+            Configuration configuration = context.getResources().getConfiguration();
+            configuration.setLocale(locale);
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+                configuration.setLocales(new LocaleList(locale));
+            }
+            return context.createConfigurationContext(configuration);
+        } catch (Exception e) {
+            return context;
+        }
+    }
+
+    /**
+     * 鏀寔涓嫳鏂囧垏鎹�
+     */
     public Context getAppLocaleContext() {
         try {
             Locale locale = new Locale(UserConfigManage.getInstance().getCurrentAppLanguage());

--
Gitblit v1.8.0