wjc
2024-12-05 d07814fd6d289487769bbe44b5d805d67c969944
2024年12月05日15:13:57
9个文件已修改
311 ■■■■■ 已修改文件
app/src/main/java/com/hdl/photovoltaic/other/HdlCommonLogic.java 53 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/java/com/hdl/photovoltaic/other/HdlThreadLogic.java 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/java/com/hdl/photovoltaic/ui/account/ChangePassword.java 44 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/java/com/hdl/photovoltaic/ui/account/RegisterAccountActivity.java 38 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/res/drawable/null_data_icon.gif 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/res/layout/activity_change_password.xml 68 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/res/layout/activity_register_account.xml 95 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/res/layout/dialog_flashing_box.xml 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/res/values/themes.xml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/java/com/hdl/photovoltaic/other/HdlCommonLogic.java
@@ -4,11 +4,16 @@
import android.content.Context;
import android.graphics.Bitmap;
import android.os.SystemClock;
import android.text.SpannableStringBuilder;
import android.text.TextPaint;
import android.text.TextUtils;
import android.text.style.ClickableSpan;
import android.view.View;
import android.view.inputmethod.InputMethodManager;
import android.widget.ImageView;
import android.widget.TextView;
import androidx.annotation.NonNull;
import com.google.gson.JsonObject;
import com.google.zxing.BarcodeFormat;
@@ -16,6 +21,8 @@
import com.google.zxing.common.BitMatrix;
import com.google.zxing.qrcode.QRCodeWriter;
import com.hdl.linkpm.sdk.user.HDLLinkPMUser;
import com.hdl.photovoltaic.HDLApp;
import com.hdl.photovoltaic.R;
import com.hdl.photovoltaic.config.ConstantManage;
import com.hdl.photovoltaic.config.UserConfigManage;
import com.hdl.photovoltaic.enums.HomepageTitleTabSwitch;
@@ -23,6 +30,7 @@
import com.hdl.photovoltaic.enums.UnitType;
import com.hdl.photovoltaic.utils.GlideUtils;
import com.hdl.sdk.link.core.bean.eventbus.BaseEventBus;
import com.hdl.sdk.link.core.callback.BaseCallBack;
import org.greenrobot.eventbus.EventBus;
import org.json.JSONObject;
@@ -221,7 +229,6 @@
    }
    /**
     * 没有数据界面的样式
     *
@@ -238,6 +245,46 @@
            GlideUtils.getDrawableGifAnimation(mContext, imageView);
            textView.setText(str);
        }
    }
    /**
     * 设置字体的富文本已经下划线
     *
     * @param view         当前组件
     * @param str          内容字符串
     * @param isUnderline  是否显示下划线(true=显示)
     * @param spanCallBack 点击文本后回调事件,不需要回调事件填null
     */
    public void setSpan(TextView view, String str, boolean isUnderline, SpanCallBack spanCallBack) {
        if (view == null || TextUtils.isEmpty(str)) {
            return;
        }
        try {
            SpannableStringBuilder registerTvStrSpannable = new SpannableStringBuilder(str);
            registerTvStrSpannable.setSpan(new ClickableSpan() {
                @Override
                public void onClick(@NonNull View widget) {
                    if (spanCallBack != null) {
                        spanCallBack.onClick();
                    }
                }
                @Override
                public void updateDrawState(@NonNull TextPaint ds) {
                    super.updateDrawState(ds);
                    //设置字体颜色
                    ds.setColor(HDLApp.getInstance().getResources().getColor(R.color.text_E6FFFFFF, null));
                    // 去掉下划线
                    ds.setUnderlineText(isUnderline);
                }
            }, 0, str.length(), 0);
            view.setText(registerTvStrSpannable);
        } catch (Exception ignored) {
        }
    }
@@ -300,4 +347,8 @@
        EventBus.getDefault().post(baseEventBus);
    }
    public interface SpanCallBack {
        void onClick();
    }
}
app/src/main/java/com/hdl/photovoltaic/other/HdlThreadLogic.java
@@ -14,6 +14,7 @@
import com.hdl.photovoltaic.enums.ShowErrorMode;
import com.hdl.photovoltaic.widget.ConfirmationCancelDialog;
import com.hdl.photovoltaic.widget.ConfirmationExceptionDialog;
import com.hdl.photovoltaic.widget.FlashingBoxDialog;
import com.hdl.photovoltaic.widget.FlashingIconBoxDialog;
/**
@@ -110,6 +111,9 @@
        handler.post(new Runnable() {
            @Override
            public void run() {
//                FlashingBoxDialog flashingIconBoxDialog = new FlashingBoxDialog(context, 1500);
//                flashingIconBoxDialog.setContent(text);
//                flashingIconBoxDialog.show();
                Toast.makeText(context, text, Toast.LENGTH_SHORT).show();
            }
        });
@@ -122,6 +126,9 @@
        handler.post(new Runnable() {
            @Override
            public void run() {
//                FlashingBoxDialog flashingIconBoxDialog = new FlashingBoxDialog(context, 1500);
//                flashingIconBoxDialog.setContent(hdlException.getMsg() + "(" + hdlException.getCode() + ")");
//                flashingIconBoxDialog.show();
                Toast.makeText(context, hdlException.getMsg() + "(" + hdlException.getCode() + ")", Toast.LENGTH_SHORT).show();
            }
        });
@@ -134,6 +141,7 @@
        handler.post(new Runnable() {
            @Override
            public void run() {
                Toast.makeText(context, resId, Toast.LENGTH_SHORT).show();
            }
        });
app/src/main/java/com/hdl/photovoltaic/ui/account/ChangePassword.java
@@ -5,13 +5,18 @@
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;
@@ -24,6 +29,7 @@
import com.hdl.photovoltaic.databinding.ActivityChangePasswordBinding;
import com.hdl.photovoltaic.listener.CloudCallBeak;
import com.hdl.photovoltaic.other.HdlAccountLogic;
import com.hdl.photovoltaic.other.HdlCommonLogic;
import com.hdl.photovoltaic.other.HdlThreadLogic;
import com.hdl.photovoltaic.widget.ConfirmationCancelDialog;
import com.hdl.photovoltaic.widget.ConfirmationTipDialog;
@@ -54,7 +60,7 @@
    @Override
    public void onBindView(Bundle savedInstanceState) {
      setStatusBarTranslucent();
        setStatusBarTranslucent();
        //初始化
        initView();
        //初始化界面监听器
@@ -66,7 +72,10 @@
     */
    private void initView() {
        switchPhoneOrMailView();
        HdlCommonLogic.getInstance().setSpan(viewBinding.changePhoneVerificationTv, viewBinding.changePhoneVerificationTv.getText().toString(), true,null);
        HdlCommonLogic.getInstance().setSpan(viewBinding.changeMailVerificationTv, viewBinding.changeMailVerificationTv.getText().toString(), true,null);
    }
    /**
     * 设置监听事件
@@ -290,7 +299,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_25000000));
//            viewBinding.changePhoneVerificationTv.setTextColor(getResources().getColor(R.color.text_E6FFFFFF));
            viewBinding.changePhoneVerificationTv.setEnabled(false);
        }
@@ -298,7 +307,7 @@
        @Override
        public void onFinish() {
            viewBinding.changePhoneVerificationTv.setText(getString(R.string.home_login_verification_regain));
            viewBinding.changePhoneVerificationTv.setTextColor(getResources().getColor(R.color.text_245EC3));
//            viewBinding.changePhoneVerificationTv.setTextColor(getResources().getColor(R.color.text_E6FFFFFF));
            viewBinding.changePhoneVerificationTv.setEnabled(true);
@@ -314,7 +323,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_25000000));
//            viewBinding.changeMailVerificationTv.setTextColor(getResources().getColor(R.color.text_E6FFFFFF));
            viewBinding.changeMailVerificationTv.setEnabled(false);
        }
@@ -322,7 +331,7 @@
        @Override
        public void onFinish() {
            viewBinding.changeMailVerificationTv.setText(getString(R.string.home_login_verification_regain));
            viewBinding.changeMailVerificationTv.setTextColor(getResources().getColor(R.color.text_245EC3));
//            viewBinding.changeMailVerificationTv.setTextColor(getResources().getColor(R.color.text_E6FFFFFF));
            viewBinding.changeMailVerificationTv.setEnabled(true);
        }
@@ -335,13 +344,13 @@
        if (isPhoneType) {
            //手机号
            viewBinding.changePhoneIc.accountTitleTv.setText(R.string.home_login_phone);
            viewBinding.changePhoneIc.accountTitleTv.setTextSize(20);
            viewBinding.changePhoneIc.accountTitleTv.setTextColor(getResources().getColor(R.color.text_E6000000));
            viewBinding.changePhoneIc.lineV.setVisibility(View.VISIBLE);
            viewBinding.changePhoneIc.accountTitleTv.setTextSize(18);
            viewBinding.changePhoneIc.accountTitleTv.setTextColor(getResources().getColor(R.color.text_E6FFFFFF));
            viewBinding.changePhoneIc.lineV.setVisibility(View.GONE);
            viewBinding.changeMailRl.accountTitleTv.setText(R.string.home_login_email);
            viewBinding.changeMailRl.accountTitleTv.setTextSize(16);
            viewBinding.changeMailRl.accountTitleTv.setTextColor(getResources().getColor(R.color.text_66000000));
            viewBinding.changeMailRl.accountTitleTv.setTextSize(14);
            viewBinding.changeMailRl.accountTitleTv.setTextColor(getResources().getColor(R.color.text_66FFFFFF));
            viewBinding.changeMailRl.lineV.setVisibility(View.GONE);
            //输入手机号
@@ -365,14 +374,14 @@
        } else {
            //邮箱
            viewBinding.changePhoneIc.accountTitleTv.setText(R.string.home_login_phone);
            viewBinding.changePhoneIc.accountTitleTv.setTextSize(16);
            viewBinding.changePhoneIc.accountTitleTv.setTextColor(getResources().getColor(R.color.text_66000000));
            viewBinding.changePhoneIc.accountTitleTv.setTextSize(14);
            viewBinding.changePhoneIc.accountTitleTv.setTextColor(getResources().getColor(R.color.text_66FFFFFF));
            viewBinding.changePhoneIc.lineV.setVisibility(View.GONE);
            viewBinding.changeMailRl.accountTitleTv.setText(R.string.home_login_email);
            viewBinding.changeMailRl.accountTitleTv.setTextSize(20);
            viewBinding.changeMailRl.accountTitleTv.setTextColor(getResources().getColor(R.color.text_E6000000));
            viewBinding.changeMailRl.lineV.setVisibility(View.VISIBLE);
            viewBinding.changeMailRl.accountTitleTv.setTextSize(18);
            viewBinding.changeMailRl.accountTitleTv.setTextColor(getResources().getColor(R.color.text_E6FFFFFF));
            viewBinding.changeMailRl.lineV.setVisibility(View.GONE);
            //输入邮箱
            viewBinding.changeAccountEt.setInputType(InputType.TYPE_CLASS_TEXT);
            viewBinding.changeAccountEt.setHint(R.string.home_login_input_mail);
@@ -411,6 +420,11 @@
            verification_code = viewBinding.changeMailVerificationEt.getText().toString();
        }
        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));
        } else {
            viewBinding.confirmTv.setTextColor(getColor(R.color.text_66FFFFFF));
        }
        viewBinding.confirmTv.setEnabled(isEnabled);
    }
app/src/main/java/com/hdl/photovoltaic/ui/account/RegisterAccountActivity.java
@@ -24,6 +24,7 @@
import com.hdl.photovoltaic.databinding.ActivityRegisterAccountBinding;
import com.hdl.photovoltaic.listener.CloudCallBeak;
import com.hdl.photovoltaic.other.HdlAccountLogic;
import com.hdl.photovoltaic.other.HdlCommonLogic;
import com.hdl.photovoltaic.other.HdlLogLogic;
import com.hdl.photovoltaic.other.HdlThreadLogic;
import com.hdl.photovoltaic.utils.KeyboardStateObserverUtils;
@@ -65,7 +66,7 @@
    @Override
    public void onBindView(Bundle savedInstanceState) {
       setStatusBarTranslucent();
        setStatusBarTranslucent();
        //初始化
        initView();
        //初始化界面监听器
@@ -75,8 +76,7 @@
            public void onKeyboardShow(int h) {
                ConstraintSet cs = new ConstraintSet();
                cs.clone(viewBinding.parentCl);
                cs.connect(viewBinding.registerConfirmPswEt.getId(), ConstraintSet.BOTTOM, ConstraintSet.PARENT_ID, ConstraintSet.BOTTOM, px2dip(h))
                ;//
                cs.connect(viewBinding.registerConfirmPswEt.getId(), ConstraintSet.BOTTOM, ConstraintSet.PARENT_ID, ConstraintSet.BOTTOM, px2dip(h));//
                //应用约束
                cs.applyTo(viewBinding.parentCl);
            }
@@ -110,6 +110,8 @@
        } catch (Exception e) {
            e.printStackTrace();
        }
        HdlCommonLogic.getInstance().setSpan(viewBinding.registerPhoneVerificationTv, viewBinding.registerPhoneVerificationTv.getText().toString(), true, null);
        HdlCommonLogic.getInstance().setSpan(viewBinding.registerMailVerificationTv, viewBinding.registerMailVerificationTv.getText().toString(), true, null);
    }
    private void initEvent() {
@@ -382,7 +384,7 @@
            String str = time + "s" + getString(R.string.home_login_psw_verification_repeater);
            viewBinding.registerMailVerificationTv.setText(str);
            viewBinding.registerMailVerificationTv.setTextColor(getResources().getColor(R.color.text_25000000, null));
//            viewBinding.registerMailVerificationTv.setTextColor(getResources().getColor(R.color.text_E6FFFFFF, null));
            viewBinding.registerMailVerificationTv.setEnabled(false);
        }
@@ -390,7 +392,7 @@
        @Override
        public void onFinish() {
            viewBinding.registerMailVerificationTv.setText(getString(R.string.home_login_verification_regain));
            viewBinding.registerMailVerificationTv.setTextColor(getResources().getColor(R.color.text_245EC3, null));
//            viewBinding.registerMailVerificationTv.setTextColor(getResources().getColor(R.color.text_E6FFFFFF, null));
            viewBinding.registerMailVerificationTv.setEnabled(true);
        }
@@ -403,8 +405,7 @@
        CountryPickerFragment dialog = new CountryPickerFragment(this, new PickCountryCallback() {
            @Override
            public void onPick(Country country) {
                if (country.flag != 0)
                    viewBinding.regionAccountTv.setText(country.name);
                if (country.flag != 0) viewBinding.regionAccountTv.setText(country.name);
                viewBinding.regionAccountNumberTv.setText("+" + country.code);
            }
        });
@@ -421,13 +422,13 @@
        if (isPhoneType) {
            //手机号
            viewBinding.registerPhoneTitleIc.accountTitleTv.setText(R.string.home_login_phone);
            viewBinding.registerPhoneTitleIc.accountTitleTv.setTextSize(20);
            viewBinding.registerPhoneTitleIc.accountTitleTv.setTextColor(getResources().getColor(R.color.text_E6000000, null));
            viewBinding.registerPhoneTitleIc.lineV.setVisibility(View.VISIBLE);
            viewBinding.registerPhoneTitleIc.accountTitleTv.setTextSize(18);
            viewBinding.registerPhoneTitleIc.accountTitleTv.setTextColor(getResources().getColor(R.color.text_E6FFFFFF, null));
            viewBinding.registerPhoneTitleIc.lineV.setVisibility(View.GONE);
            viewBinding.registerMailTitleIc.accountTitleTv.setText(R.string.home_login_email);
            viewBinding.registerMailTitleIc.accountTitleTv.setTextSize(16);
            viewBinding.registerMailTitleIc.accountTitleTv.setTextColor(getResources().getColor(R.color.text_66000000, null));
            viewBinding.registerMailTitleIc.accountTitleTv.setTextSize(14);
            viewBinding.registerMailTitleIc.accountTitleTv.setTextColor(getResources().getColor(R.color.text_66FFFFFF, null));
            viewBinding.registerMailTitleIc.lineV.setVisibility(View.GONE);
            //显示区号
            viewBinding.registerRegionAccountRl.setVisibility(View.VISIBLE);
@@ -453,13 +454,13 @@
            //邮箱
            viewBinding.registerPhoneTitleIc.accountTitleTv.setText(R.string.home_login_phone);
            viewBinding.registerPhoneTitleIc.accountTitleTv.setTextSize(16);
            viewBinding.registerPhoneTitleIc.accountTitleTv.setTextColor(getResources().getColor(R.color.text_66000000, null));
            viewBinding.registerPhoneTitleIc.accountTitleTv.setTextColor(getResources().getColor(R.color.text_66FFFFFF, null));
            viewBinding.registerPhoneTitleIc.lineV.setVisibility(View.GONE);
            viewBinding.registerMailTitleIc.accountTitleTv.setText(R.string.home_login_email);
            viewBinding.registerMailTitleIc.accountTitleTv.setTextSize(20);
            viewBinding.registerMailTitleIc.accountTitleTv.setTextColor(getResources().getColor(R.color.text_E6000000, null));
            viewBinding.registerMailTitleIc.lineV.setVisibility(View.VISIBLE);
            viewBinding.registerMailTitleIc.accountTitleTv.setTextSize(18);
            viewBinding.registerMailTitleIc.accountTitleTv.setTextColor(getResources().getColor(R.color.text_E6FFFFFF, null));
            viewBinding.registerMailTitleIc.lineV.setVisibility(View.GONE);
            //隐藏区号
            viewBinding.registerRegionAccountRl.setVisibility(View.GONE);
@@ -501,6 +502,11 @@
            verification_code = viewBinding.registerMailVerificationEt.getText().toString();
        }
        boolean isEnabled = account.length() > 0 && psw1.length() > 0 && psw2.length() > 0 && verification_code.length() > 0;
        if (isEnabled) {
            viewBinding.registerCompleteTv.setTextColor(getColor(R.color.text_E6FFFFFF));
        } else {
            viewBinding.registerCompleteTv.setTextColor(getColor(R.color.text_66FFFFFF));
        }
        viewBinding.registerCompleteTv.setEnabled(isEnabled);
    }
app/src/main/res/drawable/null_data_icon.gif

app/src/main/res/layout/activity_change_password.xml
@@ -4,6 +4,7 @@
    xmlns:tools="http://schemas.android.com/tools"
    android:layout_width="match_parent"
    android:layout_height="match_parent"
    android:background="@drawable/login"
    tools:context=".ui.account.ChangePassword">
    <TextView
@@ -21,12 +22,11 @@
        android:layout_width="wrap_content"
        android:layout_height="@dimen/dp_39"
        android:layout_marginStart="@dimen/dp_20"
        android:layout_marginTop="@dimen/dp_42"
        android:layout_marginTop="@dimen/dp_39"
        android:text="@string/home_login_change_password"
        android:textAlignment="center"
        android:textColor="@color/text_E6000000"
        android:textColor="@color/text_E6FFFFFF"
        android:textSize="@dimen/text_28"
        android:textStyle="bold"
        app:layout_constraintStart_toStartOf="parent"
        app:layout_constraintTop_toBottomOf="@+id/change_back_tv" />
    <!--手机号-->
@@ -34,8 +34,8 @@
        android:id="@+id/change_phone_ic"
        layout="@layout/text_underline"
        android:layout_width="wrap_content"
        android:layout_height="@dimen/dp_31"
        android:layout_marginTop="@dimen/dp_52"
        android:layout_height="wrap_content"
        android:layout_marginTop="@dimen/dp_43"
        app:layout_constraintStart_toStartOf="@+id/change_title_tv"
        app:layout_constraintTop_toBottomOf="@+id/change_title_tv" />
    <!--邮箱-->
@@ -43,9 +43,9 @@
        android:id="@+id/change_mail_rl"
        layout="@layout/text_underline"
        android:layout_width="wrap_content"
        android:layout_height="@dimen/dp_31"
        android:layout_height="wrap_content"
        android:layout_marginStart="@dimen/dp_28"
        android:layout_marginTop="@dimen/dp_52"
        android:layout_marginTop="@dimen/dp_43"
        app:layout_constraintStart_toEndOf="@+id/change_phone_ic"
        app:layout_constraintTop_toBottomOf="@+id/change_title_tv" />
@@ -69,9 +69,9 @@
            android:inputType="text"
            android:lines="1"
            android:maxLines="1"
            android:textColor="@color/text_FF000000"
            android:textColorHint="@color/text_25000000"
            android:textSize="@dimen/text_16" />
            android:textColor="@color/text_E6FFFFFF"
            android:textColorHint="@color/text_66FFFFFF"
            android:textSize="@dimen/text_14" />
        <View
            android:layout_width="match_parent"
@@ -79,7 +79,7 @@
            android:layout_alignParentBottom="true"
            android:layout_marginStart="@dimen/dp_20"
            android:layout_marginEnd="@dimen/dp_20"
            android:background="@color/text_E1E1E1" />
            android:background="@color/text_1AFFFFFF" />
    </RelativeLayout>
    <!--手机获取验证码-->
@@ -101,7 +101,7 @@
            android:gravity="center"
            android:padding="@dimen/dp_16"
            android:text="@string/home_login_verification_code"
            android:textColor="@color/text_245EC3"
            android:textColor="@color/text_E6FFFFFF"
            android:textSize="@dimen/text_14" />
        <View
@@ -110,7 +110,7 @@
            android:layout_height="20dp"
            android:layout_alignStart="@+id/change_phone_verification_tv"
            android:layout_centerInParent="true"
            android:background="@color/text_E1E1E1" />
            android:background="@color/text_1AFFFFFF" />
        <EditText
            android:id="@+id/change_phone_verification_et"
@@ -124,9 +124,9 @@
            android:inputType="text"
            android:lines="1"
            android:maxLines="1"
            android:textColor="@color/text_FF000000"
            android:textColorHint="@color/text_25000000"
            android:textSize="@dimen/text_16"
            android:textColor="@color/text_E6FFFFFF"
            android:textColorHint="@color/text_66FFFFFF"
            android:textSize="@dimen/text_14"
            />
@@ -136,7 +136,7 @@
            android:layout_alignParentBottom="true"
            android:layout_marginStart="@dimen/dp_20"
            android:layout_marginEnd="@dimen/dp_20"
            android:background="@color/text_E1E1E1" />
            android:background="@color/text_1AFFFFFF" />
    </RelativeLayout>
@@ -159,7 +159,7 @@
            android:gravity="center"
            android:padding="@dimen/dp_16"
            android:text="@string/home_login_verification_code"
            android:textColor="@color/text_245EC3"
            android:textColor="@color/text_E6FFFFFF"
            android:textSize="@dimen/text_14" />
        <View
@@ -168,7 +168,7 @@
            android:layout_height="20dp"
            android:layout_alignStart="@+id/change_mail_verification_tv"
            android:layout_centerInParent="true"
            android:background="@color/text_E1E1E1" />
            android:background="@color/text_1AFFFFFF" />
        <EditText
            android:id="@+id/change_mail_verification_et"
@@ -182,9 +182,9 @@
            android:inputType="text"
            android:lines="1"
            android:maxLines="1"
            android:textColor="@color/text_FF000000"
            android:textColorHint="@color/text_25000000"
            android:textSize="@dimen/text_16"
            android:textColor="@color/text_E6FFFFFF"
            android:textColorHint="@color/text_66FFFFFF"
            android:textSize="@dimen/text_14"
            />
@@ -194,7 +194,7 @@
            android:layout_alignParentBottom="true"
            android:layout_marginStart="@dimen/dp_20"
            android:layout_marginEnd="@dimen/dp_20"
            android:background="@color/text_E1E1E1" />
            android:background="@color/text_1AFFFFFF" />
    </RelativeLayout>
@@ -219,9 +219,9 @@
            android:inputType="textPassword"
            android:lines="1"
            android:maxLines="1"
            android:textColor="@color/text_FF000000"
            android:textColorHint="@color/text_25000000"
            android:textSize="@dimen/text_16" />
            android:textColor="@color/text_E6FFFFFF"
            android:textColorHint="@color/text_66FFFFFF"
            android:textSize="@dimen/text_14" />
        <ImageView
            android:id="@+id/change_psw_hide_iv"
@@ -238,7 +238,7 @@
            android:layout_alignParentBottom="true"
            android:layout_marginStart="@dimen/dp_20"
            android:layout_marginEnd="@dimen/dp_20"
            android:background="@color/text_E1E1E1" />
            android:background="@color/text_1AFFFFFF" />
    </RelativeLayout>
@@ -261,9 +261,9 @@
            android:inputType="textPassword"
            android:lines="1"
            android:maxLines="1"
            android:textColor="@color/text_FF000000"
            android:textColorHint="@color/text_25000000"
            android:textSize="@dimen/text_16" />
            android:textColor="@color/text_E6FFFFFF"
            android:textColorHint="@color/text_66FFFFFF"
            android:textSize="@dimen/text_14" />
        <ImageView
            android:id="@+id/change_confirm_psw_hide_iv"
@@ -280,7 +280,7 @@
            android:layout_alignParentBottom="true"
            android:layout_marginStart="@dimen/dp_20"
            android:layout_marginEnd="@dimen/dp_20"
            android:background="@color/text_E1E1E1" />
            android:background="@color/text_1AFFFFFF" />
    </RelativeLayout>
@@ -302,12 +302,12 @@
        android:layout_marginStart="@dimen/dp_20"
        android:layout_marginTop="@dimen/dp_42"
        android:layout_marginEnd="@dimen/dp_20"
        android:background="@drawable/yesandnocheck"
        android:background="@drawable/bj_ccffff_13"
        android:enabled="false"
        android:gravity="center"
        android:text="@string/home_login_confirm_reset"
        android:textColor="@color/text_FFFFFFFF"
        android:textSize="18sp"
        android:textColor="@color/text_66FFFFFF"
        android:textSize="14sp"
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintStart_toStartOf="parent"
        app:layout_constraintTop_toBottomOf="@+id/change_confirm_psw_rl" />
app/src/main/res/layout/activity_register_account.xml
@@ -5,7 +5,17 @@
    android:id="@+id/parent_cl"
    android:layout_width="match_parent"
    android:layout_height="match_parent"
    android:background="@drawable/login"
    tools:context=".ui.account.RegisterAccountActivity">
    <!--    <ImageView-->
    <!--        android:layout_width="0dp"-->
    <!--        android:layout_height="0dp"-->
    <!--        android:background="@drawable/bj"-->
    <!--        app:layout_constraintBottom_toBottomOf="parent"-->
    <!--        app:layout_constraintEnd_toEndOf="parent"-->
    <!--        app:layout_constraintStart_toStartOf="parent"-->
    <!--        app:layout_constraintTop_toTopOf="parent" />-->
    <TextView
        android:id="@+id/register_back_tv"
@@ -22,12 +32,11 @@
        android:layout_width="wrap_content"
        android:layout_height="@dimen/dp_39"
        android:layout_marginStart="@dimen/dp_20"
        android:layout_marginTop="@dimen/dp_42"
        android:layout_marginTop="@dimen/dp_39"
        android:text="@string/home_login_register"
        android:textAlignment="center"
        android:textColor="@color/text_E6000000"
        android:textColor="@color/text_E6FFFFFF"
        android:textSize="@dimen/text_28"
        android:textStyle="bold"
        app:layout_constraintStart_toStartOf="parent"
        app:layout_constraintTop_toBottomOf="@+id/register_back_tv" />
    <!--手机号-->
@@ -36,7 +45,7 @@
        layout="@layout/text_underline"
        android:layout_width="wrap_content"
        android:layout_height="@dimen/dp_31"
        android:layout_marginTop="@dimen/dp_52"
        android:layout_marginTop="@dimen/dp_43"
        app:layout_constraintStart_toStartOf="@+id/register_title_tv"
        app:layout_constraintTop_toBottomOf="@+id/register_title_tv" />
    <!--邮箱-->
@@ -46,7 +55,7 @@
        android:layout_width="wrap_content"
        android:layout_height="@dimen/dp_31"
        android:layout_marginStart="@dimen/dp_28"
        android:layout_marginTop="@dimen/dp_52"
        android:layout_marginTop="@dimen/dp_43"
        app:layout_constraintStart_toEndOf="@+id/register_phone_title_ic"
        app:layout_constraintTop_toBottomOf="@+id/register_title_tv" />
@@ -65,7 +74,7 @@
            android:layout_height="@dimen/dp_13"
            android:layout_centerVertical="true"
            android:layout_marginStart="@dimen/dp_20"
            android:src="@drawable/region" />
            android:src="@drawable/l" />
        <TextView
@@ -77,8 +86,8 @@
            android:layout_toEndOf="@+id/region_iv"
            android:gravity="center_vertical"
            android:text="HDL China"
            android:textColor="@color/text_E6000000"
            android:textSize="@dimen/text_16" />
            android:textColor="@color/text_E6FFFFFF"
            android:textSize="@dimen/text_14" />
        <ImageView
            android:id="@+id/region_next_iv"
@@ -95,7 +104,7 @@
            android:layout_alignParentBottom="true"
            android:layout_marginStart="@dimen/dp_20"
            android:layout_marginEnd="@dimen/dp_20"
            android:background="@color/text_E1E1E1" />
            android:background="@color/text_1AFFFFFF" />
    </RelativeLayout>
@@ -115,8 +124,8 @@
            android:layout_marginEnd="@dimen/dp_150"
            android:gravity="center_vertical"
            android:text="@string/home_chinese_mainland"
            android:textColor="@color/text_E6000000"
            android:textSize="@dimen/text_16" />
            android:textColor="@color/text_E6FFFFFF"
            android:textSize="@dimen/text_14" />
        <TextView
            android:id="@+id/region_account_number_tv"
@@ -127,15 +136,15 @@
            android:layout_marginEnd="@dimen/dp_58"
            android:gravity="center_vertical|end"
            android:text="+86"
            android:textColor="@color/text_030D1C"
            android:textSize="@dimen/text_16"
            android:textColor="@color/text_E6FFFFFF"
            android:textSize="@dimen/text_14"
            />
        <ImageView
            android:id="@+id/region_account_next_iv"
            android:layout_width="@dimen/dp_32"
            android:layout_height="@dimen/dp_32"
            android:layout_width="@dimen/dp_20"
            android:layout_height="@dimen/dp_20"
            android:layout_alignParentEnd="true"
            android:layout_centerVertical="true"
            android:layout_marginEnd="@dimen/dp_26"
@@ -147,7 +156,7 @@
            android:layout_alignParentBottom="true"
            android:layout_marginStart="@dimen/dp_20"
            android:layout_marginEnd="@dimen/dp_20"
            android:background="@color/text_E1E1E1" />
            android:background="@color/text_1AFFFFFF" />
    </RelativeLayout>
@@ -170,9 +179,9 @@
            android:inputType="text"
            android:lines="1"
            android:maxLines="1"
            android:textColor="@color/text_FF000000"
            android:textColorHint="@color/text_25000000"
            android:textSize="@dimen/text_16" />
            android:textColor="@color/text_E6FFFFFF"
            android:textColorHint="@color/text_66FFFFFF"
            android:textSize="@dimen/text_14" />
        <View
            android:layout_width="match_parent"
@@ -180,7 +189,7 @@
            android:layout_alignParentBottom="true"
            android:layout_marginStart="@dimen/dp_20"
            android:layout_marginEnd="@dimen/dp_20"
            android:background="@color/text_E1E1E1" />
            android:background="@color/text_1AFFFFFF" />
    </RelativeLayout>
@@ -203,9 +212,9 @@
            android:inputType="textPassword"
            android:lines="1"
            android:maxLines="1"
            android:textColor="@color/text_FF000000"
            android:textColorHint="@color/text_25000000"
            android:textSize="@dimen/text_16" />
            android:textColor="@color/text_E6FFFFFF"
            android:textColorHint="@color/text_66FFFFFF"
            android:textSize="@dimen/text_14" />
        <ImageView
            android:id="@+id/register_psw_hide_iv"
@@ -222,7 +231,7 @@
            android:layout_alignParentBottom="true"
            android:layout_marginStart="@dimen/dp_20"
            android:layout_marginEnd="@dimen/dp_20"
            android:background="@color/text_E1E1E1" />
            android:background="@color/text_1AFFFFFF" />
    </RelativeLayout>
@@ -245,9 +254,9 @@
            android:inputType="textPassword"
            android:lines="1"
            android:maxLines="1"
            android:textColor="@color/text_FF000000"
            android:textColorHint="@color/text_25000000"
            android:textSize="@dimen/text_16" />
            android:textColor="@color/text_E6FFFFFF"
            android:textColorHint="@color/text_66FFFFFF"
            android:textSize="@dimen/text_14" />
        <ImageView
            android:id="@+id/register_confirm_psw_hide_iv"
@@ -264,7 +273,7 @@
            android:layout_alignParentBottom="true"
            android:layout_marginStart="@dimen/dp_20"
            android:layout_marginEnd="@dimen/dp_20"
            android:background="@color/text_E1E1E1" />
            android:background="@color/text_1AFFFFFF" />
    </RelativeLayout>
@@ -287,7 +296,7 @@
            android:gravity="center"
            android:padding="@dimen/dp_16"
            android:text="@string/home_login_verification_code"
            android:textColor="@color/text_245EC3"
            android:textColor="@color/text_E6FFFFFF"
            android:textSize="@dimen/text_14" />
        <View
@@ -296,7 +305,7 @@
            android:layout_height="20dp"
            android:layout_alignStart="@+id/register_phone_verification_tv"
            android:layout_centerInParent="true"
            android:background="@color/text_E1E1E1" />
            android:background="@color/text_1AFFFFFF" />
        <EditText
            android:id="@+id/register_phone_verification_et"
@@ -310,9 +319,9 @@
            android:inputType="text"
            android:lines="1"
            android:maxLines="1"
            android:textColor="@color/text_FF000000"
            android:textColorHint="@color/text_25000000"
            android:textSize="@dimen/text_16"
            android:textColor="@color/text_E6FFFFFF"
            android:textColorHint="@color/text_66FFFFFF"
            android:textSize="@dimen/text_14"
            />
@@ -322,7 +331,7 @@
            android:layout_alignParentBottom="true"
            android:layout_marginStart="@dimen/dp_20"
            android:layout_marginEnd="@dimen/dp_20"
            android:background="@color/text_E1E1E1" />
            android:background="@color/text_1AFFFFFF" />
    </RelativeLayout>
@@ -347,7 +356,7 @@
            android:gravity="center"
            android:padding="@dimen/dp_16"
            android:text="@string/home_login_send_mail"
            android:textColor="@color/text_245EC3"
            android:textColor="@color/text_E6FFFFFF"
            android:textSize="@dimen/text_14" />
        <View
@@ -356,7 +365,7 @@
            android:layout_height="20dp"
            android:layout_alignStart="@+id/register_mail_verification_tv"
            android:layout_centerInParent="true"
            android:background="@color/text_E1E1E1" />
            android:background="@color/text_1AFFFFFF" />
        <EditText
            android:id="@+id/register_mail_verification_et"
@@ -370,9 +379,9 @@
            android:inputType="text"
            android:lines="1"
            android:maxLines="1"
            android:textColor="@color/text_FF000000"
            android:textColorHint="@color/text_25000000"
            android:textSize="@dimen/text_16"
            android:textColor="@color/text_E6FFFFFF"
            android:textColorHint="@color/text_66FFFFFF"
            android:textSize="@dimen/text_14"
            />
@@ -382,7 +391,7 @@
            android:layout_alignParentBottom="true"
            android:layout_marginStart="@dimen/dp_20"
            android:layout_marginEnd="@dimen/dp_20"
            android:background="@color/text_E1E1E1" />
            android:background="@color/text_1AFFFFFF" />
    </RelativeLayout>
@@ -405,12 +414,12 @@
        android:layout_marginStart="@dimen/dp_20"
        android:layout_marginTop="102dp"
        android:layout_marginEnd="@dimen/dp_20"
        android:background="@drawable/yesandnocheck"
        android:background="@drawable/bj_ccffff_13"
        android:enabled="false"
        android:gravity="center"
        android:text="@string/home_login_register"
        android:textColor="@color/text_FFFFFFFF"
        android:textSize="18sp"
        android:textColor="@color/text_66FFFFFF"
        android:textSize="14sp"
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintStart_toStartOf="parent"
        app:layout_constraintTop_toBottomOf="@+id/register_confirm_psw_rl" />
app/src/main/res/layout/dialog_flashing_box.xml
@@ -23,9 +23,10 @@
            android:id="@+id/tip_content_tv"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            android:gravity="center"
            android:paddingStart="@dimen/dp_4"
            android:paddingEnd="@dimen/dp_4"
            android:textColor="@color/text_FFFFFFFF"
            android:textColor="@color/text_E6FFFFFF"
            android:textSize="@dimen/text_14" />
    </LinearLayout>
app/src/main/res/values/themes.xml
@@ -72,7 +72,7 @@
        <!--        &lt;!&ndash;如果有底部虚拟导航栏,则将底部虚拟导航栏设置为透明,并将界面内容布局下边界下沉至虚拟导航栏底部&ndash;&gt;-->
        <!--        <item name="android:windowTranslucentNavigation">true</item>-->
        <!--给window窗口设置背景图-->
                <item name="android:windowBackground">@drawable/logo_bj</item>
        <item name="android:windowBackground">@drawable/logo_bj</item>
        <item name="android:windowFullscreen">true</item>
    </style>