From 1a08f52ec36e3b71204a23a8813fe50f1748b277 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期五, 11 四月 2025 19:36:29 +0800
Subject: [PATCH] 2025年04月11日19:36:26
---
app/src/main/java/com/hdl/photovoltaic/ui/LoginActivity.java | 47 ++++++++++++++---------------------------------
1 files changed, 14 insertions(+), 33 deletions(-)
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/LoginActivity.java b/app/src/main/java/com/hdl/photovoltaic/ui/LoginActivity.java
index 34acf2d..1178f32 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/LoginActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/LoginActivity.java
@@ -2,11 +2,7 @@
import android.content.Intent;
-import android.content.res.Configuration;
-import android.graphics.Color;
-import android.os.Build;
import android.os.Bundle;
-import android.os.LocaleList;
import android.text.Editable;
import android.text.SpannableStringBuilder;
import android.text.TextPaint;
@@ -16,8 +12,6 @@
import android.text.method.LinkMovementMethod;
import android.text.method.PasswordTransformationMethod;
import android.text.style.ClickableSpan;
-import android.text.style.StyleSpan;
-import android.util.DisplayMetrics;
import android.view.View;
import android.widget.TextView;
@@ -34,10 +28,8 @@
import com.hdl.photovoltaic.HDLApp;
import com.hdl.photovoltaic.R;
import com.hdl.photovoltaic.base.CustomBaseActivity;
-import com.hdl.photovoltaic.config.ConstantManage;
import com.hdl.photovoltaic.config.UserConfigManage;
import com.hdl.photovoltaic.databinding.ActivityHomeLoginBinding;
-import com.hdl.photovoltaic.other.HdlCommonLogic;
import com.hdl.photovoltaic.other.HdlResidenceLogic;
import com.hdl.photovoltaic.ui.account.ChangePassword;
import com.hdl.photovoltaic.ui.account.RegisterAccountActivity;
@@ -57,7 +49,6 @@
import com.hdl.photovoltaic.widget.adapter.ListDialogAdapter;
import java.util.List;
-import java.util.Locale;
/**
* 鐧诲綍鐨勭晫闈�
@@ -115,7 +106,7 @@
try {
viewBinding.homeLoginCheckBCCl.setSelected(UserConfigManage.getInstance().isBAccount());
viewBinding.homeLoginPrivacyCheckIv.setSelected(UserConfigManage.getInstance().isAcceiptPolicy());
- setStringDifferentColors(viewBinding.homeLoginPrivacyTv);
+ setStringDifferentColors(viewBinding.homeLoginPrivacyTv,false);
//娉ㄥ唽鍜屽繕璁板瘑鐮侀渶瑕佸姞涓嬪垝绾�
String registerTvStr = viewBinding.homeLoginRegisterTv.getText().toString();
@@ -131,7 +122,7 @@
public void updateDrawState(@NonNull TextPaint ds) {
super.updateDrawState(ds);
//璁剧疆瀛椾綋棰滆壊
- ds.setColor(getResources().getColor(R.color.text_E6FFFFFF, null));
+ ds.setColor(getResources().getColor(R.color.text_FFACACAC, null));
// 鍘绘帀涓嬪垝绾�
ds.setUnderlineText(true);
}
@@ -151,7 +142,7 @@
public void updateDrawState(@NonNull TextPaint ds) {
super.updateDrawState(ds);
//璁剧疆瀛椾綋棰滆壊
- ds.setColor(getResources().getColor(R.color.text_E6FFFFFF, null));
+ ds.setColor(getResources().getColor(R.color.text_FFACACAC, null));
// 鍘绘帀涓嬪垝绾�
ds.setUnderlineText(true);
}
@@ -180,14 +171,6 @@
// viewBinding.homeLoginPasswordEt.setText(pws);
checkClearIconShowOrNot(viewBinding.homeLoginAccountEt.getText().toString());
isLoginTextViewEnabled();
- if (UserConfigManage.getInstance().isBAccount()) {
- boolean is_Authorization = SharedPreUtils.getBoolean("isAuthorization");
- if (!is_Authorization) {
- //2025骞�03鏈�03鏃�14:45:17 鏉ㄦ稕瑕佹眰b绔处鍙烽渶瑕佹楠屾潈闄�
- HdlThreadLogic.toast(_mActivity, getString(R.string.forbidden_login));
- }
- }
-
} catch (Exception ignored) {
}
}
@@ -351,7 +334,6 @@
@Override
public void onSuccess(HDLLoginBean obj) {
if (UserConfigManage.getInstance().isBAccount()) {
- SharedPreUtils.putBoolean("isAuthorization", true);
restoreButtonStyleToInitializeState();
//瀹夎鍟嗚烦杞晫闈�
startActivity(BPowerStationActivity.class);
@@ -361,7 +343,6 @@
// HdlAccountLogic.getInstance().getCompanyParterMenu_B(new CloudCallBeak<Boolean>() {
// @Override
// public void onSuccess(Boolean isBoolean) {
-// SharedPreUtils.putBoolean("isAuthorization", isBoolean);
// if (isBoolean) {
// //2025骞�03鏈�03鏃�14:45:17 鏉ㄦ稕瑕佹眰b绔处鍙烽渶瑕佹楠屾潈闄�
// restoreButtonStyleToInitializeState();
@@ -377,7 +358,6 @@
//
// @Override
// public void onFailure(HDLException e) {
-// SharedPreUtils.putBoolean("isAuthorization", false);
// hideLoading();
// HdlThreadLogic.toast(_mActivity, e.getMsg() + "(" + e.getCode() + ")");
// }
@@ -460,9 +440,9 @@
String password = viewBinding.homeLoginPasswordEt.getText().toString().replace(" ", "");
boolean isEnabled = account.length() > 0 && password.length() > 0;
if (isEnabled) {
- viewBinding.homeLoginTv.setTextColor(getColor(R.color.text_E6FFFFFF));
+ viewBinding.homeLoginTv.setTextColor(getColor(R.color.text_FFACACAC));
} else {
- viewBinding.homeLoginTv.setTextColor(getColor(R.color.text_66FFFFFF));
+ viewBinding.homeLoginTv.setTextColor(getColor(R.color.text_FF5B5B5B));
}
viewBinding.homeLoginTv.setEnabled(isEnabled);
if (password.length() < 6 || password.length() > 16) {
@@ -537,12 +517,13 @@
/**
* 璁剧疆涓�涓插瓧绗﹀绉嶉鑹蹭互鍙婄偣鍑讳簨浠�
*
- * @param textView 褰撳墠缁勪欢
+ * @param textView 褰撳墠缁勪欢
+ * @param isHighlight 鏄惁楂樹寒锛坱rue琛ㄧず楂樹寒锛�
*/
- private void setStringDifferentColors(TextView textView) {
+ private void setStringDifferentColors(TextView textView, boolean isHighlight) {
try {
-
+ int text_color = isHighlight ? R.color.text_38C494 : R.color.text_FFACACAC;
if (textView == null) {
return;
}
@@ -580,8 +561,9 @@
@Override
public void updateDrawState(@NonNull TextPaint ds) {
super.updateDrawState(ds);
+
//璁剧疆瀛椾綋棰滆壊
- ds.setColor(getResources().getColor(R.color.text_E6FFFFFF, null));
+ ds.setColor(getResources().getColor(text_color, null));
// 鍘绘帀涓嬪垝绾�
ds.setUnderlineText(!UserConfigManage.getInstance().isZh());
}
@@ -604,11 +586,10 @@
public void updateDrawState(@NonNull TextPaint ds) {
super.updateDrawState(ds);
//璁剧疆瀛椾綋棰滆壊
- ds.setColor(getResources().getColor(R.color.text_E6FFFFFF, null));
+ ds.setColor(getResources().getColor(text_color, null));
// 鍘绘帀涓嬪垝绾�
ds.setUnderlineText(!UserConfigManage.getInstance().isZh());
}
-
}, startIndex2, endIndex2, 0);
// spannable.setSpan(new StyleSpan(android.graphics.Typeface.BOLD), startIndex2, endIndex2, 0);
@@ -617,7 +598,7 @@
}
textView.setText(spannable);
//涓�旈亣鍒扮偣鍑诲悗瀛椾綋鏄剧ず楂樹寒锛屽彇娑堥珮浜�
- textView.setHighlightColor(getResources().getColor(R.color.text_66FFFFFF, null));
+ textView.setHighlightColor(getResources().getColor(R.color.text_FFACACAC, null));
//鏈�鍚庤缃彲鐐瑰嚮锛屽繀椤诲疄鐜帮紝鍚﹀垯鍙兘鏄剧ず鏍峰紡锛屾棤娉曞疄鐜扮偣鍑绘晥鏋�
textView.setMovementMethod(LinkMovementMethod.getInstance());
} catch (Exception ignored) {
@@ -635,7 +616,7 @@
confirmationCancelDialog.show();
confirmationCancelDialog.isHideTitle(true);
confirmationCancelDialog.setContent(getString(R.string.loading_privacy_server));
- setStringDifferentColors(confirmationCancelDialog.getContentTextView());
+ setStringDifferentColors(confirmationCancelDialog.getContentTextView(),true);
confirmationCancelDialog.setConfirmation(getString(R.string.loading_agree));
confirmationCancelDialog.setCancel(getString(R.string.loading_on_agree));
confirmationCancelDialog.setYesOnclickListener(new ConfirmationCancelDialog.onYesOnclickListener() {
--
Gitblit v1.8.0