From c48f6e1e7f7fc4ca3db8ecadf441d6da942ceb8f Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期五, 22 十二月 2023 18:05:13 +0800
Subject: [PATCH] 2023年12月22日18:05:07
---
app/src/main/java/com/hdl/photovoltaic/ui/me/MeChangePasswordActivity.java | 88 +++++++++++++++++++++++++------------------
1 files changed, 51 insertions(+), 37 deletions(-)
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/me/MeChangePasswordActivity.java b/app/src/main/java/com/hdl/photovoltaic/ui/me/MeChangePasswordActivity.java
index 54be3de..bdffd5b 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/me/MeChangePasswordActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/me/MeChangePasswordActivity.java
@@ -2,32 +2,31 @@
import androidx.appcompat.content.res.AppCompatResources;
-import android.graphics.drawable.Drawable;
import android.os.Bundle;
import android.text.Editable;
-import android.text.Spannable;
-import android.text.SpannableStringBuilder;
import android.text.TextUtils;
import android.text.TextWatcher;
import android.text.method.HideReturnsTransformationMethod;
import android.text.method.PasswordTransformationMethod;
-import android.text.style.ForegroundColorSpan;
import android.view.View;
import android.widget.EditText;
import android.widget.ImageView;
import com.hdl.linkpm.sdk.core.exception.HDLException;
+import com.hdl.linkpm.sdk.user.HDLLinkPMUser;
import com.hdl.photovoltaic.R;
-import com.hdl.photovoltaic.base.BaseActivity;
+import com.hdl.photovoltaic.base.CustomBaseActivity;
import com.hdl.photovoltaic.config.UserConfigManage;
import com.hdl.photovoltaic.databinding.ActivityMeChangePasswordBinding;
import com.hdl.photovoltaic.listener.CloudCallBeak;
import com.hdl.photovoltaic.other.HdlAccountLogic;
import com.hdl.photovoltaic.other.HdlThreadLogic;
-import com.hdl.photovoltaic.widget.FlashingBoxDialog;
+import com.hdl.photovoltaic.widget.ConfirmationCancelDialog;
-
-public class MeChangePasswordActivity extends BaseActivity {
+/**
+ * 鎴戠殑-淇敼瀵嗙爜-鐣岄潰
+ */
+public class MeChangePasswordActivity extends CustomBaseActivity {
private ActivityMeChangePasswordBinding viewBinding;
@@ -39,10 +38,13 @@
@Override
public void onBindView(Bundle savedInstanceState) {
+ setNotificationBarBackgroundColor(CustomColor.white);
+ setStatusBarTextColor();
//鍒濆鍖�
initView();
//鍒濆鍖栫晫闈㈢洃鍚櫒
initEvent();
+
}
/**
@@ -86,7 +88,24 @@
viewBinding.homeAffirmTv.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
- sendChangePassword();
+ // 浜屾纭鎻愮ず妗�
+ ConfirmationCancelDialog dialog = new ConfirmationCancelDialog(_mActivity);
+ dialog.setTitle(getString(R.string.loading_title_tip));
+ dialog.setContent("瀵嗙爜淇敼鎴愬姛,灏嗛噸鏂扮櫥褰�.");
+ dialog.show();
+ dialog.setYesOnclickListener(new ConfirmationCancelDialog.onYesOnclickListener() {
+ @Override
+ public void Confirm() {
+ sendChangePassword();
+ }
+ });
+ dialog.setNoOnclickListener(new ConfirmationCancelDialog.onNoOnclickListener() {
+ @Override
+ public void Cancel() {
+ dialog.dismiss();
+ }
+ });
+
}
});
}
@@ -98,67 +117,62 @@
String oldPsw = viewBinding.meChangePasswordOldIc.mePswEt.getText().toString().replaceAll(" +", "");
String newPsw = viewBinding.meChangePasswordNewIc.mePswEt.getText().toString().replaceAll(" +", "");
String affirmPsw = viewBinding.meChangePasswordAffirmIc.mePswEt.getText().toString().replaceAll(" +", "");
+
+ if (isEditTextPassword(oldPsw, newPsw) || isEditTextPassword(oldPsw, affirmPsw)) {
+ HdlThreadLogic.tipFlashingBox(_mActivity, true, "鍘熷瘑鐮佸拰鏂板瘑鐮佷笉鑳戒竴鏍�.", -1);
+ return;
+ }
+
+ if (newPsw.length() < 6 || affirmPsw.length() < 6) {
+ HdlThreadLogic.tipFlashingBox(_mActivity, true, getString(R.string.home_login_least6), -1);
+ return;
+ }
if (!isEditTextPassword(newPsw, affirmPsw)) {
- tipFlashingBox(AppCompatResources.getDrawable(_mActivity, R.drawable.tip_fail), getString(R.string.home_login_input_unlike_psw), -1);
+ HdlThreadLogic.tipFlashingBox(_mActivity, true, getString(R.string.home_login_input_unlike_psw), -1);
return;
}
if (UserConfigManage.getInstance().isBAccount()) {
//B绔洿鏀逛釜浜哄瘑鐮�
- HdlAccountLogic.getInstance().updateBPassword(oldPsw, newPsw, new CloudCallBeak<String>() {
+ HdlAccountLogic.getInstance().updatePassword_B(oldPsw, newPsw, new CloudCallBeak<String>() {
@Override
public void onSuccess(String str) {
- tipFlashingBox(AppCompatResources.getDrawable(_mActivity, R.drawable.tip_succeed), getString(R.string.home_login_pws_reset_succeeded), 0);
+// HdlThreadLogic.tipFlashingBox(_mActivity, true, getString(R.string.home_login_pws_reset_succeeded), 0);
+ HDLLinkPMUser.getInstance().logout(0);
}
@Override
public void onFailure(HDLException e) {
- tipFlashingBox(AppCompatResources.getDrawable(_mActivity, R.drawable.tip_fail), e.getMsg(), e.getCode());
+ HdlThreadLogic.tipFlashingBox(_mActivity, false, e.getMsg(), e.getCode());
}
});
} else {
//C绔洿鏀逛釜浜哄瘑鐮�
- HdlAccountLogic.getInstance().updateCPassword(oldPsw, newPsw, new CloudCallBeak<String>() {
+ HdlAccountLogic.getInstance().updatePassword_C(oldPsw, newPsw, new CloudCallBeak<String>() {
@Override
public void onSuccess(String obj) {
- tipFlashingBox(AppCompatResources.getDrawable(_mActivity, R.drawable.tip_succeed), getString(R.string.home_login_pws_reset_succeeded), 0);
+
+ HDLLinkPMUser.getInstance().logout(0);
+
+
}
@Override
public void onFailure(HDLException e) {
- tipFlashingBox(AppCompatResources.getDrawable(_mActivity, R.drawable.tip_fail), e.getMsg(), e.getCode());
+ HdlThreadLogic.tipFlashingBox(_mActivity, false, e.getMsg(), e.getCode());
}
});
}
}
-
- /**
- * 鎻愮ず妗�
- *
- * @param drawable 鍥炬爣
- * @param msg 淇℃伅
- * @param code 鐘舵��
- */
- private void tipFlashingBox(Drawable drawable, String msg, int code) {
- HdlThreadLogic.runMainThread(new Runnable() {
- @Override
- public void run() {
- FlashingBoxDialog flashingBoxDialog = new FlashingBoxDialog(_mActivity);
- flashingBoxDialog.setImage(drawable);
- flashingBoxDialog.setContent(msg + "\r\n(" + code + ")");
- flashingBoxDialog.show();
- }
- }, null, null);
- }
/**
* 鍒濆鍖�
*/
private void initView() {
- viewBinding.toolbarTopFragmentHouseListRl.topBarView.setBackgroundColor(getResources().getColor(R.color.text_FFFFFFFF));
+ viewBinding.toolbarTopFragmentHouseListRl.topBarView.setBackgroundColor(getResources().getColor(R.color.text_FFFFFFFF, null));
viewBinding.toolbarTopFragmentHouseListRl.topTitleTv.setText(R.string.home_login_change_password);
- viewBinding.toolbarTopFragmentHouseListRl.topTitleTv.setTextColor(getResources().getColor(R.color.text_030D1C));
+ viewBinding.toolbarTopFragmentHouseListRl.topTitleTv.setTextColor(getResources().getColor(R.color.text_030D1C, null));
viewBinding.toolbarTopFragmentHouseListRl.topBackBtn.setVisibility(View.VISIBLE);
viewBinding.meChangePasswordOldIc.mePswTitleTv.setText(R.string.home_login_old_pws);
viewBinding.meChangePasswordOldIc.mePswEt.setHint(R.string.home_login_input_old_pws);
--
Gitblit v1.8.0