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 | 12 ++++++++----
1 files changed, 8 insertions(+), 4 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 43d08c2..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
@@ -13,8 +13,10 @@
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;
@@ -34,6 +36,7 @@
@Override
public void onBindView(Bundle savedInstanceState) {
setStatusBarTranslucent();
+ getWindow().setNavigationBarColor(getColor(R.color.text_FF000000));
//鍒濆鍖�
initView();
//鍒濆鍖栫晫闈㈢洃鍚櫒
@@ -74,7 +77,7 @@
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);
@@ -98,6 +101,7 @@
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();
@@ -191,9 +195,9 @@
String verificationCode = viewBinding.changeMailVerificationEt.getText().toString().replace(" ", "");
boolean isEnabled = account.length() > 0 && verificationCode.length() > 0;
if (isEnabled) {
- viewBinding.bindPhoneTv.setTextColor(getColor(R.color.text_E6FFFFFF));
+ viewBinding.bindPhoneTv.setTextColor(getColor(R.color.text_FFACACAC));
} else {
- viewBinding.bindPhoneTv.setTextColor(getColor(R.color.text_66FFFFFF));
+ viewBinding.bindPhoneTv.setTextColor(getColor(R.color.text_FF5B5B5B));
}
viewBinding.bindPhoneTv.setEnabled(isEnabled);
return isEnabled;
--
Gitblit v1.8.0