From 80f2ca2df62ff1cd03046864af504245be078eb2 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期四, 05 六月 2025 10:37:28 +0800
Subject: [PATCH] 2025年06月05日10:37:26
---
app/src/main/java/com/hdl/photovoltaic/ui/account/ChangePassword.java | 38 +++++++++++++++++++++++---------------
1 files changed, 23 insertions(+), 15 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 15cd080..91c829d 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
@@ -5,18 +5,13 @@
import android.os.CountDownTimer;
import android.text.Editable;
import android.text.InputType;
-import android.text.SpannableStringBuilder;
-import android.text.TextPaint;
import android.text.TextUtils;
import android.text.TextWatcher;
import android.text.method.HideReturnsTransformationMethod;
import android.text.method.PasswordTransformationMethod;
-import android.text.style.ClickableSpan;
import android.view.View;
-import android.widget.TextView;
-import androidx.annotation.NonNull;
import androidx.appcompat.content.res.AppCompatResources;
import com.hdl.linkpm.sdk.core.exception.HDLException;
@@ -32,6 +27,7 @@
import com.hdl.photovoltaic.other.HdlAccountLogic;
import com.hdl.photovoltaic.other.HdlCommonLogic;
import com.hdl.photovoltaic.other.HdlThreadLogic;
+import com.hdl.photovoltaic.utils.GPSManagerUtils;
import com.hdl.photovoltaic.widget.ConfirmationCancelDialog;
import com.hdl.photovoltaic.widget.ConfirmationTipDialog;
import com.sahooz.library.countrypicker.Country;
@@ -86,6 +82,18 @@
switchPhoneOrMailView();
try {
Country.load(this);
+ Country country = null;
+ if (TextUtils.isEmpty(GPSManagerUtils.getInstance().getCountryCode(this))) {
+ //鍐嶆牴鎹郴缁熻瑷�
+ country = Country.getCountryInfo();
+ } else {
+ //鍏堟牴鎹畾浣�
+ country = Country.getLocationCountryInfo(GPSManagerUtils.getInstance().getCountryCode(this));
+ }
+ if (country != null) {
+ viewBinding.regionAccountTv.setText(country.translate);
+ viewBinding.regionAccountNumberTv.setText("+" + country.code);
+ }
} catch (Exception e) {
e.printStackTrace();
}
@@ -361,7 +369,7 @@
long time = (millisUntilFinished / 1000);
String str = time + "s" + getString(R.string.home_login_psw_verification_repeater);
viewBinding.changePhoneVerificationTv.setText(str);
-// viewBinding.changePhoneVerificationTv.setTextColor(getResources().getColor(R.color.text_E6FFFFFF));
+// viewBinding.changePhoneVerificationTv.setTextColor(getResources().getColor(R.color.text_FFACACAC));
viewBinding.changePhoneVerificationTv.setEnabled(false);
}
@@ -369,7 +377,7 @@
@Override
public void onFinish() {
viewBinding.changePhoneVerificationTv.setText(getString(R.string.home_login_verification_regain));
-// viewBinding.changePhoneVerificationTv.setTextColor(getResources().getColor(R.color.text_E6FFFFFF));
+// viewBinding.changePhoneVerificationTv.setTextColor(getResources().getColor(R.color.text_FFACACAC));
viewBinding.changePhoneVerificationTv.setEnabled(true);
@@ -385,7 +393,7 @@
String str = time + "s" + getString(R.string.home_login_psw_verification_repeater);
viewBinding.changeMailVerificationTv.setText(str);
-// viewBinding.changeMailVerificationTv.setTextColor(getResources().getColor(R.color.text_E6FFFFFF));
+// viewBinding.changeMailVerificationTv.setTextColor(getResources().getColor(R.color.text_FFACACAC));
viewBinding.changeMailVerificationTv.setEnabled(false);
}
@@ -393,7 +401,7 @@
@Override
public void onFinish() {
viewBinding.changeMailVerificationTv.setText(getString(R.string.home_login_verification_regain));
-// viewBinding.changeMailVerificationTv.setTextColor(getResources().getColor(R.color.text_E6FFFFFF));
+// viewBinding.changeMailVerificationTv.setTextColor(getResources().getColor(R.color.text_FFACACAC));
viewBinding.changeMailVerificationTv.setEnabled(true);
}
@@ -407,12 +415,12 @@
//鎵嬫満鍙�
viewBinding.changePhoneIc.accountTitleTv.setText(R.string.home_login_phone);
viewBinding.changePhoneIc.accountTitleTv.setTextSize(18);
- viewBinding.changePhoneIc.accountTitleTv.setTextColor(getResources().getColor(R.color.text_E6FFFFFF));
+ viewBinding.changePhoneIc.accountTitleTv.setTextColor(getResources().getColor(R.color.text_FFACACAC));
viewBinding.changePhoneIc.lineV.setVisibility(View.VISIBLE);
viewBinding.changeMailRl.accountTitleTv.setText(R.string.home_login_email);
viewBinding.changeMailRl.accountTitleTv.setTextSize(14);
- viewBinding.changeMailRl.accountTitleTv.setTextColor(getResources().getColor(R.color.text_66FFFFFF));
+ viewBinding.changeMailRl.accountTitleTv.setTextColor(getResources().getColor(R.color.text_FF5B5B5B));
viewBinding.changeMailRl.lineV.setVisibility(View.GONE);
@@ -439,12 +447,12 @@
//閭
viewBinding.changePhoneIc.accountTitleTv.setText(R.string.home_login_phone);
viewBinding.changePhoneIc.accountTitleTv.setTextSize(14);
- viewBinding.changePhoneIc.accountTitleTv.setTextColor(getResources().getColor(R.color.text_66FFFFFF));
+ viewBinding.changePhoneIc.accountTitleTv.setTextColor(getResources().getColor(R.color.text_FF5B5B5B));
viewBinding.changePhoneIc.lineV.setVisibility(View.GONE);
viewBinding.changeMailRl.accountTitleTv.setText(R.string.home_login_email);
viewBinding.changeMailRl.accountTitleTv.setTextSize(18);
- viewBinding.changeMailRl.accountTitleTv.setTextColor(getResources().getColor(R.color.text_E6FFFFFF));
+ viewBinding.changeMailRl.accountTitleTv.setTextColor(getResources().getColor(R.color.text_FFACACAC));
viewBinding.changeMailRl.lineV.setVisibility(View.VISIBLE);
viewBinding.regionAccountRl.setVisibility(View.GONE);
@@ -487,9 +495,9 @@
}
boolean isEnabled = account.length() > 0 && psw1.length() > 0 && psw2.length() > 0 && verification_code.length() > 0;
if (isEnabled) {
- viewBinding.confirmTv.setTextColor(getColor(R.color.text_E6FFFFFF));
+ viewBinding.confirmTv.setTextColor(getColor(R.color.text_FFACACAC));
} else {
- viewBinding.confirmTv.setTextColor(getColor(R.color.text_66FFFFFF));
+ viewBinding.confirmTv.setTextColor(getColor(R.color.text_FF5B5B5B));
}
viewBinding.confirmTv.setEnabled(isEnabled);
}
--
Gitblit v1.8.0