From 87cd5df70918e6ba1af849c5f026d3719bfdb1ac Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期三, 09 四月 2025 09:06:29 +0800
Subject: [PATCH] Merge branch '1.5.2' into dev
---
app/src/main/java/com/hdl/photovoltaic/ui/me/BindMailActivity.java | 108 ++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 92 insertions(+), 16 deletions(-)
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/me/BindMailActivity.java b/app/src/main/java/com/hdl/photovoltaic/ui/me/BindMailActivity.java
index 6d14d1e..428d112 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/me/BindMailActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/me/BindMailActivity.java
@@ -3,8 +3,9 @@
import android.os.Bundle;
import android.os.CountDownTimer;
-import android.os.Process;
+import android.text.Editable;
import android.text.TextUtils;
+import android.text.TextWatcher;
import android.view.View;
import com.hdl.linkpm.sdk.core.exception.HDLException;
@@ -12,14 +13,12 @@
import com.hdl.photovoltaic.base.CustomBaseActivity;
import com.hdl.photovoltaic.config.UserConfigManage;
import com.hdl.photovoltaic.databinding.ActivityBindMailBinding;
+import com.hdl.photovoltaic.enums.VerifyType;
import com.hdl.photovoltaic.listener.CloudCallBeak;
import com.hdl.photovoltaic.other.HdlAccountLogic;
+import com.hdl.photovoltaic.other.HdlCommonLogic;
import com.hdl.photovoltaic.other.HdlLogLogic;
import com.hdl.photovoltaic.other.HdlThreadLogic;
-import com.hdl.photovoltaic.utils.AppManagerUtils;
-import com.sahooz.library.countrypicker.Country;
-import com.sahooz.library.countrypicker.CountryPickerFragment;
-import com.sahooz.library.countrypicker.PickCountryCallback;
/**
* 淇敼缁戝畾閭鐨勭晫闈�
@@ -36,8 +35,8 @@
@Override
public void onBindView(Bundle savedInstanceState) {
- setNotificationBarBackgroundColor(CustomBaseActivity.CustomColor.white);
- setStatusBarTextColor();
+ setStatusBarTranslucent();
+ getWindow().setNavigationBarColor(getColor(R.color.text_FF000000));
//鍒濆鍖�
initView();
//鍒濆鍖栫晫闈㈢洃鍚櫒
@@ -47,7 +46,7 @@
private void initEvent() {
- viewBinding.toolbarTopFragmentHouseListRl.topBackBtn.setOnClickListener(new View.OnClickListener() {
+ viewBinding.toolbarTopRl.topBackLl.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
setResult(20);
@@ -68,17 +67,22 @@
viewBinding.bindMailEt.setText("");
}
});
+ //杈撳叆璐﹀彿
+ viewBinding.bindMailEt.addTextChangedListener(accountTextWatcher);
+ //杈撳叆楠岃瘉鐮�
+ viewBinding.changeMailVerificationEt.addTextChangedListener(verificationCodeTextWatcher);
viewBinding.bindPhoneTv.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
- if (isLocalCheck()) {
+ if (isEnabled()) {
String mailStr = viewBinding.bindMailEt.getText().toString();
String verificationStr = viewBinding.changeMailVerificationEt.getText().toString();
- HdlAccountLogic.getInstance().bindingAccount_C("", mailStr, verificationStr, new CloudCallBeak<Boolean>() {
+ HdlAccountLogic.getInstance().bindingAccount_C("", mailStr, verificationStr,"", new CloudCallBeak<Boolean>() {
@Override
public void onSuccess(Boolean obj) {
UserConfigManage.getInstance().setBingEmail(mailStr);
UserConfigManage.getInstance().Save();
+ setResult(20);
finish();
}
@@ -94,10 +98,10 @@
}
private void initView() {
- viewBinding.toolbarTopFragmentHouseListRl.topTitleTv.setText(R.string.set_change_bind_mail);
- viewBinding.toolbarTopFragmentHouseListRl.topTitleTv.setTextColor(getResources().getColor(R.color.text_030D1C, null));
- viewBinding.toolbarTopFragmentHouseListRl.topBackBtn.setVisibility(View.VISIBLE);
- viewBinding.toolbarTopFragmentHouseListRl.topBarView.setBackgroundColor(getResources().getColor(R.color.text_FFFFFFFF, null));
+ viewBinding.toolbarTopRl.topTitleTv.setText(R.string.set_change_bind_mail);
+ viewBinding.toolbarTopRl.topBackLl.setVisibility(View.VISIBLE);
+ checkClearIconShowOrNot(viewBinding.bindMailEt.getText().toString());
+ HdlCommonLogic.getInstance().setSpan(viewBinding.bindMailVerificationTv, viewBinding.bindMailVerificationTv.getText().toString(), true, null);
}
/**
@@ -110,7 +114,7 @@
HdlThreadLogic.tipFlashingBox(this, false, getString(R.string.home_login_mail_null), -1);
return;
}
- HdlAccountLogic.getInstance().sendVerifyCode(false, account, "86", 3, new CloudCallBeak<Boolean>() {
+ HdlAccountLogic.getInstance().sendVerifyCode_C(false, account, "86", VerifyType.VerifyType_3, new CloudCallBeak<Boolean>() {
@Override
public void onSuccess(Boolean obj) {
countDownTimer.start();
@@ -168,6 +172,76 @@
}
+ /**
+ * 妫�娴嬫竻闄ゅ浘鏍囨槸鍚︽樉绀�
+ */
+ private void checkClearIconShowOrNot(String s) {
+ if (s.replace(" ", "").length() > 0) {
+ if (viewBinding.bindMailClearIv.getVisibility() == View.GONE) {
+ viewBinding.bindMailClearIv.setVisibility(View.VISIBLE);
+ }
+ } else {
+ if (viewBinding.bindMailClearIv.getVisibility() == View.VISIBLE) {
+ viewBinding.bindMailClearIv.setVisibility(View.GONE);
+ }
+ }
+ }
+
+ /**
+ * 鏍￠獙纭鎸夐挳鏄惁鍚敤
+ */
+ private boolean isEnabled() {
+ String account = viewBinding.bindMailEt.getText().toString().replace(" ", "");
+ String verificationCode = viewBinding.changeMailVerificationEt.getText().toString().replace(" ", "");
+ boolean isEnabled = account.length() > 0 && verificationCode.length() > 0;
+ if (isEnabled) {
+ viewBinding.bindPhoneTv.setTextColor(getColor(R.color.text_FFACACAC));
+ } else {
+ viewBinding.bindPhoneTv.setTextColor(getColor(R.color.text_FF5B5B5B));
+ }
+ viewBinding.bindPhoneTv.setEnabled(isEnabled);
+ return isEnabled;
+
+ }
+
+ /**
+ * 杈撳叆璐﹀彿
+ */
+ private final TextWatcher accountTextWatcher = new TextWatcher() {
+ @Override
+ public void beforeTextChanged(CharSequence s, int start, int count, int after) {
+
+ }
+
+ @Override
+ public void onTextChanged(CharSequence s, int start, int before, int count) {
+ }
+
+ @Override
+ public void afterTextChanged(Editable s) {
+ checkClearIconShowOrNot(s.toString());
+ isEnabled();
+ }
+ };
+
+ /**
+ * 杈撳叆楠岃瘉鐮�
+ */
+ private final TextWatcher verificationCodeTextWatcher = new TextWatcher() {
+ @Override
+ public void beforeTextChanged(CharSequence s, int start, int count, int after) {
+
+ }
+
+ @Override
+ public void onTextChanged(CharSequence s, int start, int before, int count) {
+ }
+
+ @Override
+ public void afterTextChanged(Editable s) {
+ isEnabled();
+ }
+ };
@Override
protected void onDestroy() {
@@ -177,7 +251,8 @@
countDownTimer.cancel();
countDownTimer = null;
}
-
+ viewBinding.bindMailEt.removeTextChangedListener(accountTextWatcher);
+ viewBinding.changeMailVerificationEt.removeTextChangedListener(verificationCodeTextWatcher);
}
@@ -189,4 +264,5 @@
setResult(20);
super.onBackPressed();
}
+
}
\ No newline at end of file
--
Gitblit v1.8.0