From 13420bde01402f662559045910bf0dece36a3926 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期四, 10 四月 2025 16:35:02 +0800
Subject: [PATCH] 2025年04月10日16:35:00
---
app/src/main/java/com/hdl/photovoltaic/ui/LoginActivity.java | 19 +++++----
app/src/main/res/layout/dialog_static_list.xml | 2
app/src/main/res/layout/dialog_type_title_list.xml | 2
app/src/main/java/com/hdl/photovoltaic/ui/StartActivity.java | 6 +-
app/src/main/res/layout/dialog_change_avatar.xml | 10 ++--
app/src/main/res/layout/dialog_type_title_list_b.xml | 2
app/src/main/res/layout/dialog_flashing_icon_box.xml | 2
app/src/main/res/layout/dialog_agree_onagree.xml | 6 +-
app/src/main/res/layout/dialog_list.xml | 2
app/src/main/res/layout/dialog_default_filtering.xml | 2
app/src/main/res/drawable/dalog_bj_13_ff1c1c1c.xml | 2
app/src/main/res/layout/dialog_update_confirm_cancel.xml | 4 +-
app/src/main/res/layout/dialog_confirm_cancel.xml | 4 +-
app/src/main/res/layout/dialog_confirm_input.xml | 2
app/src/main/res/layout/fragment_home_page.xml | 2
countrypicker/src/main/res/drawable/search_bj.xml | 2
app/src/main/res/layout/diaog_list_line.xml | 2
countrypicker/src/main/res/layout/dialog_country_picker.xml | 4 +-
app/src/main/res/drawable/dalog_bj_ff1c1c1c.xml | 0
countrypicker/src/main/res/layout/item_country.xml | 4 +-
20 files changed, 40 insertions(+), 39 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 930817f..1178f32 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/LoginActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/LoginActivity.java
@@ -106,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();
@@ -517,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;
}
@@ -560,8 +561,9 @@
@Override
public void updateDrawState(@NonNull TextPaint ds) {
super.updateDrawState(ds);
+
//璁剧疆瀛椾綋棰滆壊
- ds.setColor(getResources().getColor(R.color.text_FFACACAC, null));
+ ds.setColor(getResources().getColor(text_color, null));
// 鍘绘帀涓嬪垝绾�
ds.setUnderlineText(!UserConfigManage.getInstance().isZh());
}
@@ -584,11 +586,10 @@
public void updateDrawState(@NonNull TextPaint ds) {
super.updateDrawState(ds);
//璁剧疆瀛椾綋棰滆壊
- ds.setColor(getResources().getColor(R.color.text_FFACACAC, 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);
@@ -597,7 +598,7 @@
}
textView.setText(spannable);
//涓�旈亣鍒扮偣鍑诲悗瀛椾綋鏄剧ず楂樹寒锛屽彇娑堥珮浜�
- textView.setHighlightColor(getResources().getColor(R.color.text_FF5B5B5B, null));
+ textView.setHighlightColor(getResources().getColor(R.color.text_FFACACAC, null));
//鏈�鍚庤缃彲鐐瑰嚮锛屽繀椤诲疄鐜帮紝鍚﹀垯鍙兘鏄剧ず鏍峰紡锛屾棤娉曞疄鐜扮偣鍑绘晥鏋�
textView.setMovementMethod(LinkMovementMethod.getInstance());
} catch (Exception ignored) {
@@ -615,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() {
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/StartActivity.java b/app/src/main/java/com/hdl/photovoltaic/ui/StartActivity.java
index fe166b3..027db28 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/StartActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/StartActivity.java
@@ -184,7 +184,7 @@
public void updateDrawState(@NonNull TextPaint ds) {
super.updateDrawState(ds);
//璁剧疆瀛椾綋棰滆壊
- ds.setColor(getResources().getColor(R.color.text_FFACACAC, null));
+ ds.setColor(getResources().getColor(R.color.text_38C494, null));
// 鍘绘帀涓嬪垝绾�
ds.setUnderlineText(!UserConfigManage.getInstance().isZh());
}
@@ -207,7 +207,7 @@
public void updateDrawState(@NonNull TextPaint ds) {
super.updateDrawState(ds);
//璁剧疆瀛椾綋棰滆壊
- ds.setColor(getResources().getColor(R.color.text_FFACACAC, null));
+ ds.setColor(getResources().getColor(R.color.text_38C494, null));
// 鍘绘帀涓嬪垝绾�
ds.setUnderlineText(!UserConfigManage.getInstance().isZh());
}
@@ -220,7 +220,7 @@
}
textView.setText(spannable);
//涓�旈亣鍒扮偣鍑诲悗瀛椾綋鏄剧ず楂樹寒锛屽彇娑堥珮浜�
- textView.setHighlightColor(getResources().getColor(R.color.text_FF5B5B5B, null));
+ textView.setHighlightColor(getResources().getColor(R.color.text_FFACACAC, null));
//鏈�鍚庤缃彲鐐瑰嚮锛屽繀椤诲疄鐜帮紝鍚﹀垯鍙兘鏄剧ず鏍峰紡锛屾棤娉曞疄鐜扮偣鍑绘晥鏋�
textView.setMovementMethod(LinkMovementMethod.getInstance());
} catch (Exception ignored) {
diff --git a/app/src/main/res/drawable/dalog_bj_13_ff222222.xml b/app/src/main/res/drawable/dalog_bj_13_ff1c1c1c.xml
similarity index 79%
rename from app/src/main/res/drawable/dalog_bj_13_ff222222.xml
rename to app/src/main/res/drawable/dalog_bj_13_ff1c1c1c.xml
index 6c2ca40..b5115fc 100644
--- a/app/src/main/res/drawable/dalog_bj_13_ff222222.xml
+++ b/app/src/main/res/drawable/dalog_bj_13_ff1c1c1c.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<corners android:topLeftRadius="@dimen/dp_13" android:topRightRadius="@dimen/dp_13" />
- <solid android:color="@color/text_FF222222" />
+ <solid android:color="@color/text_FF1C1C1E" />
</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/dalog_bj_ff222222.xml b/app/src/main/res/drawable/dalog_bj_ff1c1c1c.xml
similarity index 100%
rename from app/src/main/res/drawable/dalog_bj_ff222222.xml
rename to app/src/main/res/drawable/dalog_bj_ff1c1c1c.xml
diff --git a/app/src/main/res/layout/dialog_agree_onagree.xml b/app/src/main/res/layout/dialog_agree_onagree.xml
index 0dde711..a24f6bf 100644
--- a/app/src/main/res/layout/dialog_agree_onagree.xml
+++ b/app/src/main/res/layout/dialog_agree_onagree.xml
@@ -12,7 +12,7 @@
android:layout_marginTop="@dimen/dp_20"
android:layout_marginEnd="@dimen/dp_48"
android:layout_marginBottom="@dimen/dp_20"
- android:background="@drawable/dalog_bj_ff222222"
+ android:background="@drawable/dalog_bj_ff1c1c1c"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
@@ -26,7 +26,7 @@
android:layout_marginTop="@dimen/dp_25"
android:layout_marginEnd="@dimen/dp_20"
android:gravity="center"
- android:textColor="@color/text_030D1C"
+ android:textColor="@color/text_FFACACAC"
android:textSize="@dimen/text_18"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
@@ -42,7 +42,7 @@
android:layout_marginBottom="@dimen/dp_34"
android:singleLine="false"
android:tag="click"
- android:textColor="@color/text_030D1C"
+ android:textColor="@color/text_FFACACAC"
app:layout_constraintBottom_toTopOf="@+id/dialog_confirm_bottom_line_ly"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/dialog_change_avatar.xml b/app/src/main/res/layout/dialog_change_avatar.xml
index 05ac5f5..96d8299 100644
--- a/app/src/main/res/layout/dialog_change_avatar.xml
+++ b/app/src/main/res/layout/dialog_change_avatar.xml
@@ -8,7 +8,7 @@
android:id="@+id/dialog_change_photograph"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_54"
- android:background="@color/text_FFFFFFFF"
+ android:background="@color/text_C1C1C1"
android:gravity="center"
android:orientation="horizontal"
app:layout_constraintBottom_toTopOf="@+id/line"
@@ -20,7 +20,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/me_personal_data_photograph"
- android:textColor="@color/text_FF222222"
+ android:textColor="@color/text_FFACACAC"
android:textSize="16sp"
/>
@@ -42,7 +42,7 @@
android:layout_width="match_parent"
android:layout_height="@dimen/dp_54"
android:layout_marginBottom="8dp"
- android:background="@color/text_FFFFFFFF"
+ android:background="@color/text_C1C1C1"
android:gravity="center"
android:orientation="horizontal"
app:layout_constraintBottom_toTopOf="@+id/dialog_change_avatar_cancel_ll"
@@ -56,7 +56,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/me_personal_data_select_album"
- android:textColor="@color/text_FF222222"
+ android:textColor="@color/text_FFACACAC"
android:textSize="16sp"
/>
@@ -78,7 +78,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/loading_cancel"
- android:textColor="@color/text_FF5757"
+ android:textColor="@color/text_FF5B5B5B"
android:textSize="16sp"
/>
diff --git a/app/src/main/res/layout/dialog_confirm_cancel.xml b/app/src/main/res/layout/dialog_confirm_cancel.xml
index ecc307d..e1e75db 100644
--- a/app/src/main/res/layout/dialog_confirm_cancel.xml
+++ b/app/src/main/res/layout/dialog_confirm_cancel.xml
@@ -13,7 +13,7 @@
android:layout_marginEnd="@dimen/dp_48"
android:layout_marginBottom="@dimen/dp_20"
android:paddingBottom="@dimen/dp_24"
- android:background="@drawable/dalog_bj_ff222222"
+ android:background="@drawable/dalog_bj_ff1c1c1c"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
@@ -43,7 +43,7 @@
android:gravity="center"
android:singleLine="false"
android:tag="click"
- android:textColor="@color/text_FF5B5B5B"
+ android:textColor="@color/text_FFACACAC"
android:textSize="@dimen/text_14"
android:lineSpacingExtra="@dimen/dp_2"
app:layout_constraintBottom_toTopOf="@+id/dialog_confirm_bottom_line_ly"
diff --git a/app/src/main/res/layout/dialog_confirm_input.xml b/app/src/main/res/layout/dialog_confirm_input.xml
index 139e1a7..e12defc 100644
--- a/app/src/main/res/layout/dialog_confirm_input.xml
+++ b/app/src/main/res/layout/dialog_confirm_input.xml
@@ -11,7 +11,7 @@
android:layout_height="225dp"
android:layout_marginStart="@dimen/dp_48"
android:layout_marginEnd="@dimen/dp_48"
- android:background="@drawable/dalog_bj_ff222222"
+ android:background="@drawable/dalog_bj_ff1c1c1c"
android:paddingBottom="@dimen/dp_24"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout/dialog_default_filtering.xml b/app/src/main/res/layout/dialog_default_filtering.xml
index cd50b72..ca85e8f 100644
--- a/app/src/main/res/layout/dialog_default_filtering.xml
+++ b/app/src/main/res/layout/dialog_default_filtering.xml
@@ -4,7 +4,7 @@
android:id="@+id/default_filtering_cl"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:background="@drawable/dalog_bj_13_ff222222">
+ android:background="@drawable/dalog_bj_13_ff1c1c1c">
<RelativeLayout
android:id="@+id/cancel_affirm_cl"
diff --git a/app/src/main/res/layout/dialog_flashing_icon_box.xml b/app/src/main/res/layout/dialog_flashing_icon_box.xml
index e0e634a..1dc34d4 100644
--- a/app/src/main/res/layout/dialog_flashing_icon_box.xml
+++ b/app/src/main/res/layout/dialog_flashing_icon_box.xml
@@ -36,7 +36,7 @@
android:paddingTop="@dimen/dp_2"
android:paddingEnd="@dimen/dp_8"
android:paddingBottom="@dimen/dp_2"
- android:textColor="@color/text_FFFFFFFF"
+ android:textColor="@color/text_FFACACAC"
android:textSize="@dimen/text_14" />
diff --git a/app/src/main/res/layout/dialog_list.xml b/app/src/main/res/layout/dialog_list.xml
index e214a36..0c00708 100644
--- a/app/src/main/res/layout/dialog_list.xml
+++ b/app/src/main/res/layout/dialog_list.xml
@@ -4,7 +4,7 @@
android:id="@+id/dialog_parent"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:background="@drawable/dalog_bj_ff222222"
+ android:background="@drawable/dalog_bj_ff1c1c1c"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">
diff --git a/app/src/main/res/layout/dialog_static_list.xml b/app/src/main/res/layout/dialog_static_list.xml
index dbe651f..e3fa811 100644
--- a/app/src/main/res/layout/dialog_static_list.xml
+++ b/app/src/main/res/layout/dialog_static_list.xml
@@ -3,7 +3,7 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:background="@color/text_FF222222"
+ android:background="@color/text_FF1C1C1E"
android:orientation="vertical">
diff --git a/app/src/main/res/layout/dialog_type_title_list.xml b/app/src/main/res/layout/dialog_type_title_list.xml
index 3b7a909..b86caf3 100644
--- a/app/src/main/res/layout/dialog_type_title_list.xml
+++ b/app/src/main/res/layout/dialog_type_title_list.xml
@@ -4,7 +4,7 @@
android:id="@+id/type_parent_cl"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:background="@drawable/dalog_bj_ff222222">
+ android:background="@drawable/dalog_bj_ff1c1c1c">
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/type_list_rl"
diff --git a/app/src/main/res/layout/dialog_type_title_list_b.xml b/app/src/main/res/layout/dialog_type_title_list_b.xml
index b855723..8b606ab 100644
--- a/app/src/main/res/layout/dialog_type_title_list_b.xml
+++ b/app/src/main/res/layout/dialog_type_title_list_b.xml
@@ -4,7 +4,7 @@
android:id="@+id/dialog_parent_cl"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:background="@drawable/dalog_bj_ff222222"
+ android:background="@drawable/dalog_bj_ff1c1c1c"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">
diff --git a/app/src/main/res/layout/dialog_update_confirm_cancel.xml b/app/src/main/res/layout/dialog_update_confirm_cancel.xml
index 371aefe..c963f1d 100644
--- a/app/src/main/res/layout/dialog_update_confirm_cancel.xml
+++ b/app/src/main/res/layout/dialog_update_confirm_cancel.xml
@@ -44,7 +44,7 @@
android:layout_marginBottom="@dimen/dp_0"
android:singleLine="false"
android:tag="click"
- android:textColor="@color/text_FF5B5B5B"
+ android:textColor="@color/text_FFACACAC"
app:layout_constraintBottom_toTopOf="@+id/loading_confirmation_content2_tv"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
@@ -63,7 +63,7 @@
android:layout_marginBottom="@dimen/dp_34"
android:singleLine="false"
android:tag="click"
- android:textColor="@color/text_FF5B5B5B"
+ android:textColor="@color/text_FFACACAC"
app:layout_constraintBottom_toTopOf="@+id/dialog_confirm_bottom_line_ly"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/diaog_list_line.xml b/app/src/main/res/layout/diaog_list_line.xml
index a4b84ea..0506455 100644
--- a/app/src/main/res/layout/diaog_list_line.xml
+++ b/app/src/main/res/layout/diaog_list_line.xml
@@ -13,7 +13,7 @@
android:layout_marginEnd="@dimen/dp_16"
android:layout_marginBottom="@dimen/dp_17"
android:gravity="center"
- android:textColor="@color/text_FF5B5B5B"
+ android:textColor="@color/text_FFACACAC"
android:textSize="@dimen/text_14"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout/fragment_home_page.xml b/app/src/main/res/layout/fragment_home_page.xml
index 646bbfb..19b088c 100644
--- a/app/src/main/res/layout/fragment_home_page.xml
+++ b/app/src/main/res/layout/fragment_home_page.xml
@@ -51,7 +51,7 @@
android:id="@+id/sl"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:layout_marginTop="@dimen/dp_5">
+ android:layout_marginTop="@dimen/dp_10">
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
diff --git a/countrypicker/src/main/res/drawable/search_bj.xml b/countrypicker/src/main/res/drawable/search_bj.xml
index 167b2ba..ec0ab95 100644
--- a/countrypicker/src/main/res/drawable/search_bj.xml
+++ b/countrypicker/src/main/res/drawable/search_bj.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<corners android:radius="17dp" />
- <solid android:color="#FF222222" />
+ <solid android:color="#FF1C1C1E" />
</shape>
\ No newline at end of file
diff --git a/countrypicker/src/main/res/layout/dialog_country_picker.xml b/countrypicker/src/main/res/layout/dialog_country_picker.xml
index 69c3d31..6c6d616 100644
--- a/countrypicker/src/main/res/layout/dialog_country_picker.xml
+++ b/countrypicker/src/main/res/layout/dialog_country_picker.xml
@@ -33,8 +33,8 @@
android:background="@null"
android:gravity="start|center_vertical"
android:hint="@string/search"
- android:textColor="#E6FFFFFF"
- android:textColorHint="#66FFFFFF"
+ android:textColor="#FFACACAC"
+ android:textColorHint="#FF5B5B5B"
android:textSize="14sp" />
</RelativeLayout>
diff --git a/countrypicker/src/main/res/layout/item_country.xml b/countrypicker/src/main/res/layout/item_country.xml
index 3639afb..3ed7fcc 100644
--- a/countrypicker/src/main/res/layout/item_country.xml
+++ b/countrypicker/src/main/res/layout/item_country.xml
@@ -28,7 +28,7 @@
android:layout_height="wrap_content"
android:minWidth="320dp"
android:singleLine="true"
- android:textColor="#E6FFFFFF"
+ android:textColor="#FFACACAC"
android:textSize="14sp" />
<Space
@@ -40,7 +40,7 @@
android:id="@+id/tv_code"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:textColor="#E6FFFFFF"
+ android:textColor="#FFACACAC"
android:textSize="14sp" />
</LinearLayout>
--
Gitblit v1.8.0