From 667e26d6bbf4d420f38c57e03b3917df837c43e6 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期一, 17 三月 2025 14:03:54 +0800
Subject: [PATCH] 2025年03月17日14:03:51

---
 app/src/main/java/com/hdl/photovoltaic/ui/account/ChangePassword.java |   55 +++++++++++++++++++++++++++++++++++++++----------------
 1 files changed, 39 insertions(+), 16 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 18b6e25..15cd080 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
@@ -27,6 +27,7 @@
 import com.hdl.photovoltaic.config.AppConfigManage;
 import com.hdl.photovoltaic.config.UserConfigManage;
 import com.hdl.photovoltaic.databinding.ActivityChangePasswordBinding;
+import com.hdl.photovoltaic.enums.VerifyType;
 import com.hdl.photovoltaic.listener.CloudCallBeak;
 import com.hdl.photovoltaic.other.HdlAccountLogic;
 import com.hdl.photovoltaic.other.HdlCommonLogic;
@@ -212,7 +213,7 @@
                     verification_code = viewBinding.changeMailVerificationEt.getText().toString();
                 }
                 if (UserConfigManage.getInstance().isBAccount()) {
-                    HdlAccountLogic.getInstance().changePassword_B(isPhoneType, account, psw, verification_code, new CloudCallBeak<Boolean>() {
+                    HdlAccountLogic.getInstance().changePassword_B(isPhoneType, account, psw, verification_code, viewBinding.regionAccountNumberTv.getText().toString(), new CloudCallBeak<Boolean>() {
                         @Override
                         public void onSuccess(Boolean obj) {
                             HdlThreadLogic.runMainThread(new Runnable() {
@@ -237,7 +238,7 @@
                         }
                     });
                 } else {
-                    HdlAccountLogic.getInstance().changePassword_C(isPhoneType, account, psw, verification_code, new CloudCallBeak<Boolean>() {
+                    HdlAccountLogic.getInstance().changePassword_C(isPhoneType, account, psw, verification_code, viewBinding.regionAccountNumberTv.getText().toString(), new CloudCallBeak<Boolean>() {
                         @Override
                         public void onSuccess(Boolean obj) {
                             HdlThreadLogic.runMainThread(new Runnable() {
@@ -304,21 +305,43 @@
                 //璁剧疆璐﹀彿鎵�鍦ㄥ尯鍩熷崗璁強鍦板潃
                 AppConfigManage.setUserRegionUrl(obj.getRegionUrl());
                 HDLLinkPMUser.getInstance().setUserRegionUrl(AppConfigManage.getUserRegionUrl());
-                HdlAccountLogic.getInstance().sendVerifyCode(isPhoneType, account, viewBinding.regionAccountNumberTv.getText().toString(), 2, new CloudCallBeak<Boolean>() {
-                    @Override
-                    public void onSuccess(Boolean obj) {
-                        if (isPhoneType) {
-                            phoneCountDownTimer.start();
-                        } else {
-                            mailCountDownTimer.start();
-                        }
-                    }
 
-                    @Override
-                    public void onFailure(HDLException e) {
-                        HdlThreadLogic.toast(_mActivity, e);
-                    }
-                });
+
+                if (UserConfigManage.getInstance().isBAccount()) {
+                    //B绔彂閫佽幏鍙栭獙璇佺爜
+                    HdlAccountLogic.getInstance().sendVerifyCode_B(isPhoneType, account, viewBinding.regionAccountNumberTv.getText().toString(), VerifyType.VerifyType_FIND_PASSWORD, new CloudCallBeak<Boolean>() {
+                        @Override
+                        public void onSuccess(Boolean obj) {
+                            if (isPhoneType) {
+                                phoneCountDownTimer.start();
+                            } else {
+                                mailCountDownTimer.start();
+                            }
+                        }
+
+                        @Override
+                        public void onFailure(HDLException e) {
+                            HdlThreadLogic.toast(_mActivity, e);
+                        }
+                    });
+                } else {
+                    //C绔彂閫佽幏鍙栭獙璇佺爜
+                    HdlAccountLogic.getInstance().sendVerifyCode_C(isPhoneType, account, viewBinding.regionAccountNumberTv.getText().toString(), VerifyType.VerifyType_2, new CloudCallBeak<Boolean>() {
+                        @Override
+                        public void onSuccess(Boolean obj) {
+                            if (isPhoneType) {
+                                phoneCountDownTimer.start();
+                            } else {
+                                mailCountDownTimer.start();
+                            }
+                        }
+
+                        @Override
+                        public void onFailure(HDLException e) {
+                            HdlThreadLogic.toast(_mActivity, e);
+                        }
+                    });
+                }
             }
 
             @Override

--
Gitblit v1.8.0