From 2c7615cd73dfa6a7ca4df975430d2217524513d2 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期四, 28 九月 2023 11:38:28 +0800
Subject: [PATCH] 2023年09月28日11:38:24
---
app/src/main/java/com/hdl/photovoltaic/ui/account/ChangePassword.java | 80 ++++++++++++++++++++++++++++------------
1 files changed, 56 insertions(+), 24 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 b60bbd8..09c300c 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
@@ -1,6 +1,6 @@
package com.hdl.photovoltaic.ui.account;
-import android.app.AppComponentFactory;
+
import android.os.Bundle;
import android.os.CountDownTimer;
import android.text.Editable;
@@ -11,7 +11,7 @@
import android.text.method.PasswordTransformationMethod;
import android.view.View;
-import androidx.appcompat.app.AppCompatActivity;
+
import androidx.appcompat.content.res.AppCompatResources;
import com.hdl.linkpm.sdk.core.exception.HDLException;
@@ -20,6 +20,7 @@
import com.hdl.photovoltaic.R;
import com.hdl.photovoltaic.base.CustomBaseActivity;
import com.hdl.photovoltaic.config.AppConfigManage;
+import com.hdl.photovoltaic.config.UserConfigManage;
import com.hdl.photovoltaic.databinding.ActivityChangePasswordBinding;
import com.hdl.photovoltaic.listener.CloudCallBeak;
import com.hdl.photovoltaic.other.HdlAccountLogic;
@@ -251,30 +252,57 @@
} else {
verification_code = viewBinding.changeMailVerificationEt.getText().toString();
}
- HdlAccountLogic.getInstance().changePassword(isPhoneType, account, psw, verification_code, new CloudCallBeak<Boolean>() {
- @Override
- public void onSuccess(Boolean obj) {
- HdlThreadLogic.runMainThread(new Runnable() {
- @Override
- public void run() {
- ConfirmationTipDialog dialog = new ConfirmationTipDialog(_mActivity);
- dialog.show();
- dialog.setYesOnclickListener(new ConfirmationCancelDialog.onYesOnclickListener() {
- @Override
- public void Confirm() {
- finish();
- }
- });
- }
- }, null, null);
+ if (UserConfigManage.getInstance().isBAccount()) {
+ HdlAccountLogic.getInstance().changeBPassword(isPhoneType, account, psw, verification_code, new CloudCallBeak<Boolean>() {
+ @Override
+ public void onSuccess(Boolean obj) {
+ HdlThreadLogic.runMainThread(new Runnable() {
+ @Override
+ public void run() {
+ ConfirmationTipDialog dialog = new ConfirmationTipDialog(_mActivity);
+ dialog.show();
+ dialog.setYesOnclickListener(new ConfirmationCancelDialog.onYesOnclickListener() {
+ @Override
+ public void Confirm() {
+ finish();
+ }
+ });
+ }
+ }, null, null);
- }
+ }
- @Override
- public void onFailure(HDLException e) {
+ @Override
+ public void onFailure(HDLException e) {
- }
- });
+ }
+ });
+ } else {
+ HdlAccountLogic.getInstance().changeCPassword(isPhoneType, account, psw, verification_code, new CloudCallBeak<Boolean>() {
+ @Override
+ public void onSuccess(Boolean obj) {
+ HdlThreadLogic.runMainThread(new Runnable() {
+ @Override
+ public void run() {
+ ConfirmationTipDialog dialog = new ConfirmationTipDialog(_mActivity);
+ dialog.show();
+ dialog.setYesOnclickListener(new ConfirmationCancelDialog.onYesOnclickListener() {
+ @Override
+ public void Confirm() {
+ finish();
+ }
+ });
+ }
+ }, null, null);
+
+ }
+
+ @Override
+ public void onFailure(HDLException e) {
+
+ }
+ });
+ }
}
});
@@ -294,9 +322,12 @@
}
return;
}
+ //鑾峰彇璐﹀彿鍖哄煙淇℃伅
HdlAccountLogic.getInstance().regionByAccount(account, new CloudCallBeak<HDLUserRegionBean>() {
+ //鍙戦�佹秷鎭獙璇佺爜
@Override
public void onSuccess(HDLUserRegionBean obj) {
+ //璁剧疆璐﹀彿鎵�鍦ㄥ尯鍩熷崗璁強鍦板潃
AppConfigManage.setUserRegionUrl(obj.getRegionUrl());
HDLLinkPMUser.getInstance().setUserRegionUrl(AppConfigManage.getUserRegionUrl());
HdlAccountLogic.getInstance().sendVerifyCode(isPhoneType, account, "86", 2, new CloudCallBeak<Boolean>() {
@@ -318,7 +349,8 @@
@Override
public void onFailure(HDLException e) {
- hideLoading();
+
+// hideLoading();
}
});
}
--
Gitblit v1.8.0