From 6f4e4bc481ca1ef264e6a3795033a31d3e709f77 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期一, 07 四月 2025 20:22:20 +0800
Subject: [PATCH] 2025-04-07 20:22:08 加载效果
---
app/src/main/java/com/hdl/photovoltaic/ui/LoginActivity.java | 86 +++++++++++++++++++++----------------------
1 files changed, 42 insertions(+), 44 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 bcb0620..aff6241 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;
/**
* 鐧诲綍鐨勭晫闈�
@@ -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);
}
@@ -290,7 +281,7 @@
boolean isSelected = UserConfigManage.getInstance().isAcceiptPolicy();
if (!isSelected) {
//闅愮鍗忚鎻愮ず
- getDialog();
+ getAcceiptPolicyDialog();
return;
}
//鐧诲綍
@@ -351,30 +342,37 @@
@Override
public void onSuccess(HDLLoginBean obj) {
if (UserConfigManage.getInstance().isBAccount()) {
- 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();
- //瀹夎鍟嗚烦杞晫闈�
- startActivity(BPowerStationActivity.class);
- hideLoading();
- finish();
- } else {
- hideLoading();
- HdlThreadLogic.toast(_mActivity, getString(R.string.forbidden_login));
- }
- }
-
- @Override
- public void onFailure(HDLException e) {
- SharedPreUtils.putBoolean("isAuthorization", false);
- hideLoading();
- HdlThreadLogic.toast(_mActivity, e.getMsg() + "(" + e.getCode() + ")");
- }
- });
+ SharedPreUtils.putBoolean("isAuthorization", true);
+ restoreButtonStyleToInitializeState();
+ //瀹夎鍟嗚烦杞晫闈�
+ startActivity(BPowerStationActivity.class);
+ hideLoading();
+ finish();
+ //浜戠杩樻病鏈夊尮閰嶅钩鍙板ソ锛屽厛闅愯棌鏍￠獙璐﹀彿鍔熻兘 2025骞�03鏈�24鏃�15:16:37
+// 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();
+// //瀹夎鍟嗚烦杞晫闈�
+// startActivity(BPowerStationActivity.class);
+// hideLoading();
+// finish();
+// } else {
+// hideLoading();
+// HdlThreadLogic.toast(_mActivity, getString(R.string.forbidden_login));
+// }
+// }
+//
+// @Override
+// public void onFailure(HDLException e) {
+// SharedPreUtils.putBoolean("isAuthorization", false);
+// hideLoading();
+// HdlThreadLogic.toast(_mActivity, e.getMsg() + "(" + e.getCode() + ")");
+// }
+// });
} else {
//C绔渶瑕佸厛鑾峰彇鐢电珯鍒楄〃;
@@ -453,9 +451,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) {
@@ -574,9 +572,9 @@
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);
+ ds.setUnderlineText(!UserConfigManage.getInstance().isZh());
}
@@ -597,9 +595,9 @@
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);
+ ds.setUnderlineText(!UserConfigManage.getInstance().isZh());
}
@@ -610,7 +608,7 @@
}
textView.setText(spannable);
//涓�旈亣鍒扮偣鍑诲悗瀛椾綋鏄剧ず楂樹寒锛屽彇娑堥珮浜�
- textView.setHighlightColor(getResources().getColor(R.color.text_66FFFFFF, null));
+ textView.setHighlightColor(getResources().getColor(R.color.text_FF5B5B5B, null));
//鏈�鍚庤缃彲鐐瑰嚮锛屽繀椤诲疄鐜帮紝鍚﹀垯鍙兘鏄剧ず鏍峰紡锛屾棤娉曞疄鐜扮偣鍑绘晥鏋�
textView.setMovementMethod(LinkMovementMethod.getInstance());
} catch (Exception ignored) {
@@ -622,7 +620,7 @@
/**
* 寮圭獥
*/
- private void getDialog() {
+ private void getAcceiptPolicyDialog() {
ConfirmationCancelDialog confirmationCancelDialog = new ConfirmationCancelDialog(_mActivity);
confirmationCancelDialog.show();
--
Gitblit v1.8.0