2025年04月10日16:35:00

wjc

2025-04-10 13420bde01402f662559045910bf0dece36a3926

2025年04月10日16:35:00

 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();
@@ -518,11 +518,12 @@
     * 设置一串字符多种颜色以及点击事件
     *
     * @param textView 当前组件
     * @param isHighlight 是否高亮（true表示高亮）
     */
    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() {

 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) {

 app/src/main/res/drawable/dalog_bj_13_ff1c1c1c.xml

File was renamed from app/src/main/res/drawable/dalog_bj_13_ff222222.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>

 app/src/main/res/drawable/dalog_bj_ff1c1c1c.xml

 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"

 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"

            />

 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"

 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"

 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"

 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" />



 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">


 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">



 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"

 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">

 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"

 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"

 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"

 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>

 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>


 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>