From 11409771024381e06173490d846bf121e6a19552 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期四, 15 一月 2026 21:29:05 +0800
Subject: [PATCH] 2026年01月15日21:29:00

---
 app/src/main/java/com/hdl/photovoltaic/ui/account/ChangePassword.java |   69 +++++++++++++++++++++++++---------
 1 files changed, 51 insertions(+), 18 deletions(-)

diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/account/ChangePassword.java b/app/src/main/java/com/hdl/photovoltaic/ui/account/ChangePassword.java
index 91c829d..c86a48e 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/account/ChangePassword.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/account/ChangePassword.java
@@ -22,6 +22,7 @@
 import com.hdl.photovoltaic.config.AppConfigManage;
 import com.hdl.photovoltaic.config.UserConfigManage;
 import com.hdl.photovoltaic.databinding.ActivityChangePasswordBinding;
+import com.hdl.photovoltaic.enums.Languages;
 import com.hdl.photovoltaic.enums.VerifyType;
 import com.hdl.photovoltaic.listener.CloudCallBeak;
 import com.hdl.photovoltaic.other.HdlAccountLogic;
@@ -72,7 +73,7 @@
      * 鍒濆鍖栫晫闈�
      */
     private void initView() {
-        if (UserConfigManage.getInstance().isZh()) {
+        if (UserConfigManage.getInstance().getCurrentAppLanguage().equals(Languages.zh)) {
             viewBinding.regionAccountTv.setText(getText(R.string.home_chinese_mainland));
             viewBinding.regionAccountNumberTv.setText("+86");
         } else {
@@ -80,25 +81,57 @@
             viewBinding.regionAccountNumberTv.setText("+964");
         }
         switchPhoneOrMailView();
-        try {
-            Country.load(this);
-            Country country = null;
-            if (TextUtils.isEmpty(GPSManagerUtils.getInstance().getCountryCode(this))) {
-                //鍐嶆牴鎹郴缁熻瑷�
-                country = Country.getCountryInfo();
-            } else {
-                //鍏堟牴鎹畾浣�
-                country = Country.getLocationCountryInfo(GPSManagerUtils.getInstance().getCountryCode(this));
-            }
-            if (country != null) {
-                viewBinding.regionAccountTv.setText(country.translate);
-                viewBinding.regionAccountNumberTv.setText("+" + country.code);
-            }
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
+//        try {
+//            Country.load(this);
+//            Country country = null;
+//            if (TextUtils.isEmpty(GPSManagerUtils.getInstance().getCountryCode(this))) {
+//                //鍐嶆牴鎹郴缁熻瑷�
+//                country = Country.getCountryInfo();
+//            } else {
+//                //鍏堟牴鎹畾浣�
+//                country = Country.getLocationCountryInfo(GPSManagerUtils.getInstance().getCountryCode(this));
+//            }
+//            if (country != null) {
+//                viewBinding.regionAccountTv.setText(country.translate);
+//                viewBinding.regionAccountNumberTv.setText("+" + country.code);
+//            }
+//        } catch (Exception e) {
+//            e.printStackTrace();
+//        }
+        new Thread(
+                new Runnable() {
+                    @Override
+                    public void run() {
+                        try {
+                            final Country[] country = new Country[1];
+                            Country.load(_mActivity);
+                            if (TextUtils.isEmpty(GPSManagerUtils.getInstance().getCountryCode(_mActivity))) {
+                                //鍐嶆牴鎹郴缁熻瑷�
+                                country[0] = Country.getCountryInfo();
+                            } else {
+                                //鍏堟牴鎹畾浣�
+                                country[0] = Country.getLocationCountryInfo(GPSManagerUtils.getInstance().getCountryCode(_mActivity));
+                            }
+                            runOnUiThread(new Runnable() {
+                                @Override
+                                public void run() {
+                                    if (country != null) {
+                                        viewBinding.regionAccountTv.setText(country[0].translate);
+                                        viewBinding.regionAccountNumberTv.setText("+" + country[0].code);
+                                    }
+                                }
+                            });
+                        } catch (Exception e) {
+                            e.printStackTrace();
+                        }
+                    }
+                }
+        ).start();
         HdlCommonLogic.getInstance().setSpan(viewBinding.changePhoneVerificationTv, viewBinding.changePhoneVerificationTv.getText().toString(), true, null);
         HdlCommonLogic.getInstance().setSpan(viewBinding.changeMailVerificationTv, viewBinding.changeMailVerificationTv.getText().toString(), true, null);
+        if (UserConfigManage.getInstance().isArabicLanguage()) {
+            viewBinding.changeBackTv.setRotation(180); // 鏃嬭浆180搴�
+        }
     }
 
 

--
Gitblit v1.8.0