From 20119c1e9849ab28add56b977ffbca87e13e1072 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期五, 14 二月 2025 10:47:09 +0800
Subject: [PATCH] 2025年02月14日10:46:45

---
 app/src/main/java/com/hdl/photovoltaic/ui/account/ChangePassword.java |   41 ++++++++++++++++++++++++++++++++++++++---
 1 files changed, 38 insertions(+), 3 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 673c308..2bca9c2 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
@@ -33,6 +33,9 @@
 import com.hdl.photovoltaic.other.HdlThreadLogic;
 import com.hdl.photovoltaic.widget.ConfirmationCancelDialog;
 import com.hdl.photovoltaic.widget.ConfirmationTipDialog;
+import com.sahooz.library.countrypicker.Country;
+import com.sahooz.library.countrypicker.CountryPickerFragment;
+import com.sahooz.library.countrypicker.PickCountryCallback;
 
 /**
  * 蹇樿瀵嗙爜鐣岄潰
@@ -73,8 +76,13 @@
      */
     private void initView() {
         switchPhoneOrMailView();
-        HdlCommonLogic.getInstance().setSpan(viewBinding.changePhoneVerificationTv, viewBinding.changePhoneVerificationTv.getText().toString(), true,null);
-        HdlCommonLogic.getInstance().setSpan(viewBinding.changeMailVerificationTv, viewBinding.changeMailVerificationTv.getText().toString(), true,null);
+        try {
+            Country.load(this);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        HdlCommonLogic.getInstance().setSpan(viewBinding.changePhoneVerificationTv, viewBinding.changePhoneVerificationTv.getText().toString(), true, null);
+        HdlCommonLogic.getInstance().setSpan(viewBinding.changeMailVerificationTv, viewBinding.changeMailVerificationTv.getText().toString(), true, null);
     }
 
 
@@ -108,6 +116,14 @@
 
             }
         });
+        //閫夋嫨鎵嬫満鍖哄彿鐨�
+        viewBinding.regionAccountRl.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                selectArea();
+            }
+        });
+
         //杈撳叆鎵嬫満鍙锋垨鑰呴偖绠�
         viewBinding.changeAccountEt.addTextChangedListener(accountTextWatcher);
         //鎵嬫満鍙疯幏鍙栭獙璇佺爜
@@ -245,6 +261,21 @@
     }
 
     /**
+     * 鍥藉鎵嬫満鍙峰尯鍙峰脊绐�
+     */
+    private void selectArea() {
+        CountryPickerFragment dialog = new CountryPickerFragment(this, new PickCountryCallback() {
+            @Override
+            public void onPick(Country country) {
+                if (country.flag != 0) viewBinding.regionAccountTv.setText(country.name);
+                viewBinding.regionAccountNumberTv.setText("+" + country.code);
+            }
+        });
+        dialog.show();
+        dialog.setDialogSize();
+    }
+
+    /**
      * 鍙戦�侀獙璇佺爜鎸囦护
      */
     private void sendVerification() {
@@ -266,7 +297,7 @@
                 //璁剧疆璐﹀彿鎵�鍦ㄥ尯鍩熷崗璁強鍦板潃
                 AppConfigManage.setUserRegionUrl(obj.getRegionUrl());
                 HDLLinkPMUser.getInstance().setUserRegionUrl(AppConfigManage.getUserRegionUrl());
-                HdlAccountLogic.getInstance().sendVerifyCode(isPhoneType, account, "86", 2, new CloudCallBeak<Boolean>() {
+                HdlAccountLogic.getInstance().sendVerifyCode(isPhoneType, account, viewBinding.regionAccountNumberTv.getText().toString(), 2, new CloudCallBeak<Boolean>() {
                     @Override
                     public void onSuccess(Boolean obj) {
                         if (isPhoneType) {
@@ -354,6 +385,8 @@
             viewBinding.changeMailRl.accountTitleTv.setTextColor(getResources().getColor(R.color.text_66FFFFFF));
             viewBinding.changeMailRl.lineV.setVisibility(View.GONE);
 
+
+            viewBinding.regionAccountRl.setVisibility(View.VISIBLE);
             //杈撳叆鎵嬫満鍙�
             viewBinding.changeAccountEt.setInputType(InputType.TYPE_CLASS_NUMBER);
             viewBinding.changeAccountEt.setHint(R.string.home_login_input_phone);
@@ -383,6 +416,8 @@
             viewBinding.changeMailRl.accountTitleTv.setTextSize(18);
             viewBinding.changeMailRl.accountTitleTv.setTextColor(getResources().getColor(R.color.text_E6FFFFFF));
             viewBinding.changeMailRl.lineV.setVisibility(View.VISIBLE);
+
+            viewBinding.regionAccountRl.setVisibility(View.GONE);
             //杈撳叆閭
             viewBinding.changeAccountEt.setInputType(InputType.TYPE_CLASS_TEXT);
             viewBinding.changeAccountEt.setHint(R.string.home_login_input_mail);

--
Gitblit v1.8.0