~wjc/HDLPhotovoltaicDebugAPP.git

parent: 367102bb | 补丁 | 提交 | ignore whitespace

2024年11月29日19:14:02

wjc

2024-11-29 194987595d55583e7ac89fb014880c90a9edeebf

2024年11月29日19:14:02

26个文件已修改

	app/src/main/java/com/hdl/photovoltaic/ui/LoginActivity.java	84 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	app/src/main/java/com/hdl/photovoltaic/ui/me/AccountAndSecurityActivity.java	1 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	app/src/main/java/com/hdl/photovoltaic/ui/me/BindMailActivity.java	3 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	app/src/main/java/com/hdl/photovoltaic/ui/me/BindPhoneActivity.java	6 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	app/src/main/java/com/hdl/photovoltaic/ui/me/CPersonalDataActivity.java	7 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	app/src/main/java/com/hdl/photovoltaic/ui/newC/MessageCenterList.java	10 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	app/src/main/java/com/hdl/photovoltaic/ui/newC/PowerStationsListEdit.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	app/src/main/java/com/hdl/photovoltaic/ui/newC/adapter/HouseListAdapter.java	3 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	app/src/main/java/com/hdl/photovoltaic/ui/newC/adapter/MessageCenterListAdapter.java	8 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	app/src/main/res/drawable/editor_house.png	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	app/src/main/res/drawable/line_view.xml	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	app/src/main/res/drawable/loading_confirmation_edit_bj.xml	6 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	app/src/main/res/drawable/move_c_house.png	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	app/src/main/res/drawable/selected.png	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	app/src/main/res/drawable/spinner.png	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	app/src/main/res/layout/activity_bind_mail.xml	24 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	app/src/main/res/layout/activity_bind_phone.xml	40 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	app/src/main/res/layout/activity_message_center_list.xml	25 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	app/src/main/res/layout/activity_personal_data.xml	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	app/src/main/res/layout/activity_power_stations_list.xml	10 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	app/src/main/res/layout/dialog_confirm_input.xml	32 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	app/src/main/res/layout/dialog_type_title_list.xml	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	app/src/main/res/layout/item_house_line_c.xml	24 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	app/src/main/res/layout/item_message_c.xml	58 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	app/src/main/res/layout/item_type_title.xml	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	app/src/main/res/layout/view_camera_album.xml	15 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 app/src/main/java/com/hdl/photovoltaic/ui/LoginActivity.java

@@ -104,28 +104,76 @@
     * 初始化UI
     */
    private void initView() {
        viewBinding.homeLoginCheckBCCl.setSelected(UserConfigManage.getInstance().isBAccount());
        viewBinding.homeLoginPrivacyCheckIv.setSelected(UserConfigManage.getInstance().isAcceiptPolicy());
        setStringDifferentColors(viewBinding.homeLoginPrivacyTv);
        if (UserConfigManage.getInstance().getCurrentAppLanguage().equals(LocalManageUtil.zh)) {
            viewBinding.homeLoginLanguageTv.setText("简体中文");
        } else {
            viewBinding.homeLoginLanguageTv.setText("English");
        }
        if (UserConfigManage.getInstance().isBAccount()) {
            viewBinding.homeLoginRegisterTv.setVisibility(View.GONE);
        } else {
            viewBinding.homeLoginRegisterTv.setVisibility(View.VISIBLE);
        }
        try {
            viewBinding.homeLoginCheckBCCl.setSelected(UserConfigManage.getInstance().isBAccount());
            viewBinding.homeLoginPrivacyCheckIv.setSelected(UserConfigManage.getInstance().isAcceiptPolicy());
            setStringDifferentColors(viewBinding.homeLoginPrivacyTv);

            //注册和忘记密码需要加下划线
            String registerTvStr = viewBinding.homeLoginRegisterTv.getText().toString();
            String forgetPasswordTvStr = viewBinding.homeLoginForgetPasswordTv.getText().toString();
            SpannableStringBuilder registerTvStrSpannable = new SpannableStringBuilder(registerTvStr);
            registerTvStrSpannable.setSpan(new ClickableSpan() {
                @Override
                public void onClick(@NonNull View widget) {

                }

                @Override
                public void updateDrawState(@NonNull TextPaint ds) {
                    super.updateDrawState(ds);
                    //设置字体颜色
                    ds.setColor(getResources().getColor(R.color.text_E6FFFFFF, null));
                    // 去掉下划线
                    ds.setUnderlineText(!UserConfigManage.getInstance().isZh());
                }


            }, 0, registerTvStr.length(), 0);
            viewBinding.homeLoginRegisterTv.setText(registerTvStrSpannable);

            SpannableStringBuilder forgetPasswordTvStrSpannable = new SpannableStringBuilder(forgetPasswordTvStr);
            forgetPasswordTvStrSpannable.setSpan(new ClickableSpan() {
                @Override
                public void onClick(@NonNull View widget) {

                }

                @Override
                public void updateDrawState(@NonNull TextPaint ds) {
                    super.updateDrawState(ds);
                    //设置字体颜色
                    ds.setColor(getResources().getColor(R.color.text_E6FFFFFF, null));
                    // 去掉下划线
                    ds.setUnderlineText(!UserConfigManage.getInstance().isZh());
                }


            }, 0, forgetPasswordTvStr.length(), 0);
            viewBinding.homeLoginForgetPasswordTv.setText(forgetPasswordTvStrSpannable);


            if (UserConfigManage.getInstance().getCurrentAppLanguage().equals(LocalManageUtil.zh)) {
                viewBinding.homeLoginLanguageTv.setText("简体中文");
            } else {
                viewBinding.homeLoginLanguageTv.setText("English");
            }
            if (UserConfigManage.getInstance().isBAccount()) {
                viewBinding.homeLoginRegisterTv.setVisibility(View.GONE);
            } else {
                viewBinding.homeLoginRegisterTv.setVisibility(View.VISIBLE);
            }
//        String acc = "18402017839";
//        String acc = "13375012441";
//        String acc = "18316672920";
//        String pws = "123456";
        //测试用
        viewBinding.homeLoginAccountEt.setText(UserConfigManage.getInstance().getAccount());
            //测试用
            viewBinding.homeLoginAccountEt.setText(UserConfigManage.getInstance().getAccount());
//        viewBinding.homeLoginPasswordEt.setText(pws);
        checkClearIconShowOrNot(viewBinding.homeLoginAccountEt.getText().toString());
        isLoginTextViewEnabled();
            checkClearIconShowOrNot(viewBinding.homeLoginAccountEt.getText().toString());
            isLoginTextViewEnabled();
        } catch (Exception ignored) {
        }
    }

    /**
@@ -526,7 +574,7 @@
            }
            textView.setText(spannable);
            //中途遇到点击后字体显示高亮，取消高亮
            textView.setHighlightColor(getResources().getColor(R.color.text_00000000, null));
            textView.setHighlightColor(getResources().getColor(R.color.text_66FFFFFF, null));
            //最后设置可点击，必须实现，否则只能显示样式，无法实现点击效果
            textView.setMovementMethod(LinkMovementMethod.getInstance());
        } catch (Exception ignored) {

 app/src/main/java/com/hdl/photovoltaic/ui/me/AccountAndSecurityActivity.java

@@ -94,6 +94,7 @@

            viewBinding.setAccountPhoneIl.sllLlRlNameTv.setText(R.string.home_login_phone);
            viewBinding.setAccountPhoneIl.sllLlRlRightContentTv.setVisibility(View.VISIBLE);
            viewBinding.setAccountPhoneIl.lineV.setVisibility(View.VISIBLE);

            viewBinding.setAccountMailIl.sllLlRlNameTv.setText(R.string.set_email_address);
            viewBinding.setAccountMailIl.sllLlRlRightContentTv.setVisibility(View.VISIBLE);

 app/src/main/java/com/hdl/photovoltaic/ui/me/BindMailActivity.java

@@ -91,10 +91,7 @@

    private void initView() {
        viewBinding.toolbarTopRl.topTitleTv.setText(R.string.set_change_bind_mail);
        viewBinding.toolbarTopRl.topTitleTv.setTextColor(getResources().getColor(R.color.text_030D1C, null));
        viewBinding.toolbarTopRl.topBackLl.setVisibility(View.VISIBLE);
        viewBinding.toolbarTopRl.topLeftIv.setImageResource(R.drawable.back_c);
        viewBinding.toolbarTopRl.topBarView.setBackgroundColor(getResources().getColor(R.color.text_FFECECEC, null));
    }

    /**

 app/src/main/java/com/hdl/photovoltaic/ui/me/BindPhoneActivity.java

@@ -100,10 +100,7 @@

    private void initView() {
        viewBinding.toolbarTopRl.topTitleTv.setText(R.string.set_change_bind_phone_number);
        viewBinding.toolbarTopRl.topTitleTv.setTextColor(getResources().getColor(R.color.text_030D1C, null));
        viewBinding.toolbarTopRl.topBackLl.setVisibility(View.VISIBLE);
        viewBinding.toolbarTopRl.topLeftIv.setImageResource(R.drawable.back_c);
        viewBinding.toolbarTopRl.topBarView.setBackgroundColor(getResources().getColor(R.color.text_FFECECEC, null));
        try {
            Country.load(this);
        } catch (Exception e) {
@@ -162,7 +159,6 @@
            long time = (millisUntilFinished / 1000);
            String str = time + "s" + getString(R.string.home_login_psw_verification_repeater);
            viewBinding.bindPhoneVerificationTv.setText(str);
            viewBinding.bindPhoneVerificationTv.setTextColor(getResources().getColor(R.color.text_25000000, null));
            viewBinding.bindPhoneVerificationTv.setEnabled(false);

        }
@@ -170,7 +166,6 @@
        @Override
        public void onFinish() {
            viewBinding.bindPhoneVerificationTv.setText(getString(R.string.home_login_verification_regain));
            viewBinding.bindPhoneVerificationTv.setTextColor(getResources().getColor(R.color.text_245EC3, null));
            viewBinding.bindPhoneVerificationTv.setEnabled(true);


@@ -191,7 +186,6 @@
            HdlThreadLogic.tipFlashingBox(this, false, getString(R.string.home_login_null_verification_code), -1);
            return false;
        }

        return true;

    }

 app/src/main/java/com/hdl/photovoltaic/ui/me/CPersonalDataActivity.java

@@ -162,18 +162,19 @@
    private void initView() {
        viewBinding.toolbarTopFragmentMeRl.topTitleTv.setText(R.string.me_personal_data);
        viewBinding.toolbarTopFragmentMeRl.topBackLl.setVisibility(View.VISIBLE);
        viewBinding.toolbarTopFragmentMeRl.topLeftIv.setImageResource(R.drawable.back_c);
        viewBinding.toolbarTopFragmentMeRl.topTitleTv.setTextColor(getResources().getColor(R.color.text_030D1C, null));
        viewBinding.toolbarTopFragmentMeRl.topBarView.setBackgroundColor(getResources().getColor(R.color.text_FFECECEC, null));
        viewBinding.personalDataUserPortraitIl.sllLlRlNameTv.setText(R.string.me_personal_data_portrait);
        viewBinding.personalDataUserNameIl.sllLlRlNameTv.setText(R.string.me_personal_data_user_name);
        viewBinding.personalDataMailIl.sllLlRlNameTv.setText(R.string.home_login_email);
        viewBinding.personalDataPhoneIl.sllLlRlNameTv.setText(R.string.home_login_phone);
        viewBinding.personalDataQrCodeIl.sllLlRlNameTv.setText(R.string.qr_code_business_card);
        viewBinding.personalDataUserPortraitIl.sllLlRlRightContentIv.setVisibility(View.VISIBLE);
        viewBinding.personalDataUserPortraitIl.lineV.setVisibility(View.VISIBLE);
        viewBinding.personalDataUserNameIl.sllLlRlRightContentTv.setVisibility(View.VISIBLE);
        viewBinding.personalDataUserNameIl.lineV.setVisibility(View.VISIBLE);
        viewBinding.personalDataMailIl.sllLlRlRightContentTv.setVisibility(View.VISIBLE);
        viewBinding.personalDataMailIl.lineV.setVisibility(View.VISIBLE);
        viewBinding.personalDataPhoneIl.sllLlRlRightContentTv.setVisibility(View.VISIBLE);
        viewBinding.personalDataPhoneIl.lineV.setVisibility(View.VISIBLE);
        viewBinding.personalDataQrCodeIl.sllLlRlRightContentIv.setVisibility(View.VISIBLE);
        viewBinding.personalDataUserNameIl.sllLlRlRightContentTv.setText(UserConfigManage.getInstance().getUserName());
        viewBinding.personalDataQrCodeIl.sllLlRlRightContentIv.setImageDrawable(AppCompatResources.getDrawable(_mActivity, R.drawable.qr_code));

 app/src/main/java/com/hdl/photovoltaic/ui/newC/MessageCenterList.java

@@ -326,9 +326,7 @@
    }

    private void initView() {
        viewBinding.toolbarTopMessageCenterListRl.getRoot().setBackgroundColor(getColor(R.color.text_FFECECEC));
        viewBinding.toolbarTopMessageCenterListRl.topBackLl.setVisibility(View.VISIBLE);
        viewBinding.toolbarTopMessageCenterListRl.topLeftIv.setImageResource(R.drawable.back_c);
        viewBinding.toolbarTopMessageCenterListRl.topTitleTv.setText(R.string.set_message_center);
        viewBinding.toolbarTopMessageCenterListRl.topMoreBtn.setVisibility(View.VISIBLE);
        viewBinding.toolbarTopMessageCenterListRl.topMoreIv.setImageResource(R.drawable.clearall);
@@ -498,19 +496,11 @@
            @Override
            public void run() {
                if (typeClick) {
                    viewBinding.messageBottomAlarmDeviceTitleTv.setTextColor(getColor(R.color.text_191919));
                    viewBinding.messageBottomAlarmDeviceLineV.setVisibility(View.VISIBLE);
                    viewBinding.messageBottomAlarmRecordTitleTv.setTextColor(getColor(R.color.text_B2B2B2));
                    viewBinding.messageBottomAlarmRecordLineV.setVisibility(View.GONE);
                    viewBinding.messageBottomAlarmDeviceTitleTv.setTypeface(null, Typeface.BOLD);
                    viewBinding.messageBottomAlarmRecordTitleTv.setTypeface(null, Typeface.NORMAL);
                } else {
                    viewBinding.messageBottomAlarmDeviceTitleTv.setTextColor(getColor(R.color.text_B2B2B2));
                    viewBinding.messageBottomAlarmDeviceLineV.setVisibility(View.GONE);
                    viewBinding.messageBottomAlarmRecordTitleTv.setTextColor(getColor(R.color.text_191919));
                    viewBinding.messageBottomAlarmRecordLineV.setVisibility(View.VISIBLE);
                    viewBinding.messageBottomAlarmDeviceTitleTv.setTypeface(null, Typeface.NORMAL);
                    viewBinding.messageBottomAlarmRecordTitleTv.setTypeface(null, Typeface.BOLD);
                }

            }

 app/src/main/java/com/hdl/photovoltaic/ui/newC/PowerStationsListEdit.java

@@ -195,9 +195,7 @@
    }

    private void initView() {
        viewBinding.toolbarTopRl.getRoot().setBackgroundColor(getColor(R.color.text_FFECECEC));
        viewBinding.toolbarTopRl.topBackLl.setVisibility(View.VISIBLE);
        viewBinding.toolbarTopRl.topLeftIv.setImageResource(R.drawable.back_c);
        viewBinding.toolbarTopRl.topTitleTv.setText(R.string.power_station_selection);
        viewBinding.toolbarTopRl.topMoreBtn.setVisibility(View.VISIBLE);
        viewBinding.toolbarTopRl.topMoreIv.setImageResource(R.drawable.editor_house);

 app/src/main/java/com/hdl/photovoltaic/ui/newC/adapter/HouseListAdapter.java

@@ -62,13 +62,10 @@
        if (!houseIdBean.isMove()) {
            holder.houseSelectIv.setVisibility(View.VISIBLE);
            holder.houseSelectIv.setBackground(null);
            holder.homeNameTv.setTextColor(mContext.getColor(R.color.text_E6000000));
            if (houseIdBean.isState_select()) {
                holder.homeNameTv.setTextColor(mContext.getColor(R.color.text_38C494));
                holder.houseSelectIv.setBackground(AppCompatResources.getDrawable(mContext, R.drawable.select));
            }
        } else {
            holder.homeNameTv.setTextColor(mContext.getColor(R.color.text_E6000000));
            holder.houseSelectIv.setVisibility(View.GONE);
        }


 app/src/main/java/com/hdl/photovoltaic/ui/newC/adapter/MessageCenterListAdapter.java

@@ -50,16 +50,16 @@
        String date = TimeUtils.getTimeFromTimestamp(messageBean.getCreateTime());
        holder.item_time_tv.setText(date);
        String type = "";//FAULT:故障,WARN:告警,EVENT:事件
        Drawable drawable = AppCompatResources.getDrawable(mContext, R.drawable.state_ffb300);
        Drawable drawable = AppCompatResources.getDrawable(mContext, R.drawable.device_satte_ffb300);
        if (messageBean.getType().equals(MessageAlarmStateType.fault)) {
            type = mContext.getString(R.string.my_power_station_malfunction);
            drawable = AppCompatResources.getDrawable(mContext, R.drawable.state_e34343);
            drawable = AppCompatResources.getDrawable(mContext, R.drawable.device_state_fff55252);
        } else if (messageBean.getType().equals(MessageAlarmStateType.warn)) {
            type = mContext.getString(R.string.alarm_all_grade_warning);
            drawable = AppCompatResources.getDrawable(mContext, R.drawable.state_ffb300);
            drawable = AppCompatResources.getDrawable(mContext, R.drawable.device_satte_ffb300);
        } else if (messageBean.getType().equals(MessageAlarmStateType.event)) {
            type = mContext.getString(R.string.loading_title_tip);
            drawable = AppCompatResources.getDrawable(mContext, R.drawable.state_b9b9b9);
            drawable = AppCompatResources.getDrawable(mContext, R.drawable.device_state_ffb9b9b9);
        }
        holder.item_estate_tv.setText(type);
        holder.item_estate_tv.setBackground(drawable);

 app/src/main/res/drawable/editor_house.png



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

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
    <solid android:color="@color/text_191919" />
    <solid android:color="@color/text_E6FFFFFF" />
    <corners android:radius="79.5dp" />
</shape>

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

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
    <corners android:radius="@dimen/dp_4" />
    <corners android:radius="@dimen/dp_8" />
    <stroke
        android:width="0.5dp"
        android:color="@color/text_E1E1E1" />
        android:width="1dp"
        android:color="#FF5C5F60" />
</shape>

 app/src/main/res/drawable/move_c_house.png



 app/src/main/res/drawable/selected.png



 app/src/main/res/drawable/spinner.png



 app/src/main/res/layout/activity_bind_mail.xml

@@ -4,7 +4,7 @@
    xmlns:tools="http://schemas.android.com/tools"
    android:layout_width="match_parent"
    android:layout_height="match_parent"
    android:background="@color/text_FFECECEC"
    android:background="@color/text_FF161616"
    tools:context=".ui.me.BindMailActivity">

    <include
@@ -27,7 +27,7 @@
            android:layout_marginStart="@dimen/dp_20"
            android:layout_marginTop="@dimen/dp_24"
            android:text="@string/home_login_email"
            android:textColor="@color/text_65000000"
            android:textColor="@color/text_E6FFFFFF"
            android:textSize="@dimen/text_14" />

        <RelativeLayout
@@ -54,9 +54,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" />

            <ImageView
                android:id="@+id/bind_mail_clear_iv"
@@ -97,7 +97,7 @@
            android:layout_height="@dimen/dp_20"
            android:layout_marginStart="@dimen/dp_20"
            android:text="@string/verification"
            android:textColor="@color/text_65000000"
            android:textColor="@color/text_E6FFFFFF"
            android:textSize="@dimen/text_14" />

        <!--邮箱获取验证码-->
@@ -121,7 +121,7 @@
                android:paddingStart="@dimen/dp_16"
                android:paddingEnd="@dimen/dp_0"
                android:text="@string/home_login_verification_code"
                android:textColor="@color/text_245EC3"
                android:textColor="@color/text_E6FFFFFF"
                android:textSize="@dimen/text_14" />

            <View
@@ -130,7 +130,7 @@
                android:layout_height="20dp"
                android:layout_alignStart="@+id/bind_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"
@@ -144,8 +144,8 @@
                android:inputType="text"
                android:lines="1"
                android:maxLines="1"
                android:textColor="@color/text_FF000000"
                android:textColorHint="@color/text_25000000"
                android:textColor="@color/text_E6FFFFFF"
                android:textColorHint="@color/text_66FFFFFF"
                android:textSize="@dimen/text_16"

                />
@@ -174,10 +174,10 @@
        android:layout_marginStart="@dimen/dp_20"
        android:layout_marginTop="73dp"
        android:layout_marginEnd="@dimen/dp_20"
        android:background="@drawable/yesandnocheck"
        android:background="@drawable/bj_ff555859"
        android:gravity="center"
        android:text="@string/home_login_affirm"
        android:textColor="@color/text_FFFFFFFF"
        android:textColor="@color/text_E6FFFFFF"
        android:textSize="18sp"
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintStart_toStartOf="parent"

 app/src/main/res/layout/activity_bind_phone.xml

@@ -4,7 +4,7 @@
    xmlns:tools="http://schemas.android.com/tools"
    android:layout_width="match_parent"
    android:layout_height="match_parent"
    android:background="@color/text_FFECECEC"
    android:background="@color/text_FF161616"
    tools:context=".ui.me.BindPhoneActivity">

    <include
@@ -26,7 +26,7 @@
            android:layout_marginStart="@dimen/dp_20"
            android:layout_marginTop="@dimen/dp_24"
            android:text="@string/home_phone_number"
            android:textColor="@color/text_65000000"
            android:textColor="@color/text_E6FFFFFF"
            android:textSize="@dimen/text_14" />

        <RelativeLayout
@@ -47,7 +47,7 @@
                android:layout_marginEnd="@dimen/dp_150"
                android:gravity="center_vertical"
                android:text="@string/home_chinese_mainland"
                android:textColor="@color/text_E6000000"
                android:textColor="@color/text_E6FFFFFF"
                android:textSize="@dimen/text_16" />

            <TextView
@@ -59,15 +59,15 @@
                android:layout_marginEnd="@dimen/dp_43"
                android:gravity="center_vertical|end"
                android:text="+86"
                android:textColor="@color/text_030D1C"
                android:textSize="@dimen/text_16"
                android:textColor="@color/text_66FFFFFF"
                android:textSize="@dimen/text_14"

                />

            <ImageView
                android:id="@+id/bind_area_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_6"
@@ -93,7 +93,7 @@
            android:layout_marginStart="@dimen/dp_20"
            android:layout_marginTop="@dimen/dp_24"
            android:text="@string/home_login_phone"
            android:textColor="@color/text_65000000"
            android:textColor="@color/text_E6FFFFFF"
            android:textSize="@dimen/text_14" />

        <RelativeLayout
@@ -120,8 +120,8 @@
                android:inputType="number"
                android:lines="1"
                android:maxLines="1"
                android:textColor="@color/text_FF000000"
                android:textColorHint="@color/text_25000000"
                android:textColor="@color/text_E6FFFFFF"
                android:textColorHint="@color/text_66FFFFFF"
                android:textSize="@dimen/text_16" />

            <ImageView
@@ -140,7 +140,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"
                android:visibility="gone"

                />
@@ -163,7 +163,7 @@
            android:layout_height="@dimen/dp_20"
            android:layout_marginStart="@dimen/dp_20"
            android:text="@string/verification"
            android:textColor="@color/text_65000000"
            android:textColor="@color/text_E6FFFFFF"
            android:textSize="@dimen/text_14" />

        <!--手机获取验证码-->
@@ -187,7 +187,7 @@
                android:paddingStart="@dimen/dp_16"
                android:paddingEnd="@dimen/dp_0"
                android:text="@string/home_login_verification_code"
                android:textColor="@color/text_245EC3"
                android:textColor="@color/text_E6FFFFFF"
                android:textSize="@dimen/text_14" />

            <View
@@ -196,7 +196,7 @@
                android:layout_height="20dp"
                android:layout_alignStart="@+id/bind_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"
@@ -210,8 +210,8 @@
                android:inputType="text"
                android:lines="1"
                android:maxLines="1"
                android:textColor="@color/text_FF000000"
                android:textColorHint="@color/text_25000000"
                android:textColor="@color/text_E6FFFFFF"
                android:textColorHint="@color/text_66FFFFFF"
                android:textSize="@dimen/text_16"

                />
@@ -222,7 +222,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"
                android:visibility="gone"

                />
@@ -240,11 +240,11 @@
        android:layout_marginStart="@dimen/dp_20"
        android:layout_marginTop="73dp"
        android:layout_marginEnd="@dimen/dp_20"
        android:background="@drawable/yesandnocheck"
        android:background="@drawable/bj_ff555859"
        android:gravity="center"
        android:text="@string/home_login_affirm"
        android:textColor="@color/text_FFFFFFFF"
        android:textSize="18sp"
        android:textColor="@color/text_E6FFFFFF"
        android:textSize="14sp"
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintStart_toStartOf="parent"
        app:layout_constraintTop_toBottomOf="@+id/bind_phone_verification_parent_rl" />

 app/src/main/res/layout/activity_message_center_list.xml

@@ -4,7 +4,7 @@
    xmlns:tools="http://schemas.android.com/tools"
    android:layout_width="match_parent"
    android:layout_height="match_parent"
    android:background="@color/text_FFECECEC"
    android:background="@color/text_FF161616"
    tools:context=".ui.newC.MessageCenterList">

    <include
@@ -39,7 +39,7 @@
                    android:layout_width="wrap_content"
                    android:layout_height="@dimen/dp_20"
                    android:text="@string/alarm_all_device"
                    android:textColor="@color/text_E6000000"
                    android:textColor="@color/text_E6FFFFFF"
                    android:textSize="@dimen/text_14"
                    app:layout_constraintBottom_toBottomOf="parent"
                    app:layout_constraintStart_toStartOf="parent"
@@ -74,7 +74,7 @@
                    android:layout_width="wrap_content"
                    android:layout_height="@dimen/dp_20"
                    android:text="@string/alarm_all_grade"
                    android:textColor="@color/text_E6000000"
                    android:textColor="@color/text_E6FFFFFF"
                    android:textSize="@dimen/text_14"
                    app:layout_constraintBottom_toBottomOf="parent"
                    app:layout_constraintEnd_toEndOf="parent"
@@ -111,7 +111,7 @@
                    android:layout_height="@dimen/dp_20"
                    android:layout_marginEnd="@dimen/dp_5"
                    android:text="@string/alarm_all_time"
                    android:textColor="@color/text_E6000000"
                    android:textColor="@color/text_E6FFFFFF"
                    android:textSize="@dimen/text_14"
                    app:layout_constraintBottom_toBottomOf="parent"
                    app:layout_constraintEnd_toStartOf="@+id/all_time_title_iv"
@@ -164,10 +164,16 @@
        android:id="@+id/message_bottom_cl"
        android:layout_width="match_parent"
        android:layout_height="64dp"
        android:background="@drawable/ffffff_18"
        android:background="@color/text_FF333738"
        android:orientation="vertical"
        app:layout_constraintBottom_toBottomOf="parent"
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintStart_toStartOf="parent">

        <View
            android:layout_width="match_parent"
            android:layout_height="0.5dp"
            android:background="@color/text_1AFFFFFF" />

        <LinearLayout
            android:layout_width="match_parent"
@@ -189,9 +195,8 @@
                    android:layout_marginTop="@dimen/dp_16"
                    android:gravity="center"
                    android:text="@string/alarm_device"
                    android:textColor="@color/text_191919"
                    android:textSize="@dimen/text_16"
                    android:textStyle="bold" />
                    android:textColor="@color/text_E6FFFFFF"
                    android:textSize="@dimen/text_14" />

                <View
                    android:id="@+id/message_bottom_alarm_device_line_v"
@@ -218,8 +223,8 @@
                    android:layout_marginTop="@dimen/dp_16"
                    android:gravity="center"
                    android:text="@string/alarm_record"
                    android:textColor="@color/text_191919"
                    android:textSize="@dimen/text_16" />
                    android:textColor="@color/text_E6FFFFFF"
                    android:textSize="@dimen/text_14" />

                <View
                    android:id="@+id/message_bottom_alarm_record_line_v"

 app/src/main/res/layout/activity_personal_data.xml

@@ -4,7 +4,7 @@
    xmlns:tools="http://schemas.android.com/tools"
    android:layout_width="match_parent"
    android:layout_height="match_parent"
    android:background="@color/text_FFECECEC"
    android:background="@color/text_FF161616"
    tools:context=".ui.me.CPersonalDataActivity">

    <include
@@ -16,7 +16,7 @@
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
        android:layout_marginTop="@dimen/dp_12"
        android:background="@color/text_FFFFFFFF"
        android:background="@color/text_FF333738"
        android:orientation="vertical"
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintStart_toStartOf="parent"

 app/src/main/res/layout/activity_power_stations_list.xml

@@ -4,7 +4,7 @@
    xmlns:tools="http://schemas.android.com/tools"
    android:layout_width="match_parent"
    android:layout_height="match_parent"
    android:background="@color/text_FFECECEC"
    android:background="@color/text_FF161616"
    tools:context=".ui.newC.PowerStationsListEdit">

    <include
@@ -33,7 +33,7 @@
        android:id="@+id/add_power_station_rl"
        android:layout_width="match_parent"
        android:layout_height="82dp"
        android:background="@color/text_FFFFFFFF"
        android:background="@color/text_FF333738"
        android:gravity="center"
        app:layout_constraintBottom_toBottomOf="parent"
        app:layout_constraintEnd_toEndOf="parent"
@@ -43,11 +43,11 @@
            android:id="@+id/add_power_station_tv"
            android:layout_width="335dp"
            android:layout_height="52dp"
            android:background="@drawable/checked"
            android:background="@drawable/bj_ff555859"
            android:gravity="center"
            android:text="@string/add_power_station"
            android:textColor="@color/text_FFFFFFFF"
            android:textSize="18sp" />
            android:textColor="@color/text_E6FFFFFF"
            android:textSize="14sp" />
    </RelativeLayout>



 app/src/main/res/layout/dialog_confirm_input.xml

@@ -11,7 +11,8 @@
        android:layout_height="225dp"
        android:layout_marginStart="@dimen/dp_48"
        android:layout_marginEnd="@dimen/dp_48"
        android:background="@drawable/loading_confirmation_bj"
        android:background="@drawable/bj_ff333738"
        android:paddingBottom="@dimen/dp_24"
        app:layout_constraintBottom_toBottomOf="parent"
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintStart_toStartOf="parent"
@@ -27,8 +28,8 @@
            android:layout_marginTop="@dimen/dp_25"
            android:layout_marginEnd="@dimen/dp_20"
            android:text="wifi_ssid"
            android:textColor="@color/text_030D1C"
            android:textSize="@dimen/text_18" />
            android:textColor="@color/text_E6FFFFFF"
            android:textSize="@dimen/text_16" />

        <androidx.constraintlayout.widget.ConstraintLayout
            android:id="@+id/loading_confirmation_input_cl"
@@ -54,8 +55,8 @@
                android:maxLines="1"
                android:paddingStart="@dimen/dp_16"
                android:paddingEnd="@dimen/dp_16"
                android:textColor="@color/text_030D1C"
                android:textColorHint="@color/text_25000000"
                android:textColor="@color/text_E6FFFFFF"
                android:textColorHint="@color/text_66FFFFFF"
                app:layout_constraintBottom_toBottomOf="parent"
                app:layout_constraintEnd_toEndOf="parent"
                app:layout_constraintStart_toStartOf="parent"
@@ -86,8 +87,10 @@
        <LinearLayout
            android:id="@+id/dialog_confirm_bottom_line_ly"
            android:layout_width="match_parent"
            android:layout_height="@dimen/dp_52"
            android:layout_height="@dimen/dp_41"
            android:layout_alignParentBottom="true"
            android:layout_marginStart="@dimen/dp_16"
            android:layout_marginEnd="@dimen/dp_16"
            android:orientation="horizontal">


@@ -96,6 +99,7 @@
                android:layout_width="@dimen/dp_0"
                android:layout_height="match_parent"
                android:layout_weight="1"
                android:background="@drawable/bj_ff555859_23_no"
                android:gravity="center">

                <TextView
@@ -103,23 +107,22 @@
                    android:layout_width="wrap_content"
                    android:layout_height="wrap_content"
                    android:text="@string/loading_cancel"
                    android:textColor="@color/text_7C8590"
                    android:textSize="@dimen/text_18" />
                    android:textColor="@color/text_E6FFFFFF"
                    android:textSize="@dimen/text_14" />


            </LinearLayout>

            <View
                android:layout_width="0.5dp"
                android:layout_height="@dimen/dp_23"
                android:layout_gravity="center"
                android:background="@color/text_E1E1E1" />
                android:layout_width="9.5dp"
                android:layout_height="match_parent" />

            <LinearLayout
                android:id="@+id/dialog_confirm_ly"
                android:layout_width="@dimen/dp_0"
                android:layout_height="match_parent"
                android:layout_weight="1"
                android:background="@drawable/bj_ff555859_23"
                android:gravity="center">

                <TextView
@@ -127,11 +130,12 @@
                    android:layout_width="wrap_content"
                    android:layout_height="wrap_content"
                    android:text="@string/loading_affirm"
                    android:textColor="@color/text_FF245EC3"
                    android:textSize="@dimen/text_18" />
                    android:textColor="@color/text_E6FFFFFF"
                    android:textSize="@dimen/text_14" />
            </LinearLayout>
        </LinearLayout>


    </RelativeLayout>



 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/ffffff_13">
    android:background="@drawable/bj_ff333738">

    <androidx.recyclerview.widget.RecyclerView
        android:id="@+id/type_list_rl"

 app/src/main/res/layout/item_house_line_c.xml

@@ -3,8 +3,8 @@
    xmlns:app="http://schemas.android.com/apk/res-auto"
    android:id="@+id/item_parent_cl"
    android:layout_width="match_parent"
    android:layout_height="@dimen/dp_70"
    android:background="@color/text_FFFFFFFF">
    android:layout_height="@dimen/dp_52"
    android:background="@color/text_FF333738">

    <TextView
        android:id="@+id/house_name_tv"
@@ -15,8 +15,8 @@
        android:ellipsize="end"
        android:singleLine="true"
        android:text="@string/power_station"
        android:textColor="@color/text_E6000000"
        android:textSize="@dimen/text_16"
        android:textColor="@color/text_E6FFFFFF"
        android:textSize="@dimen/text_14"
        app:layout_constraintBottom_toBottomOf="parent"
        app:layout_constraintEnd_toStartOf="@+id/house_Image_ll"
        app:layout_constraintStart_toStartOf="parent"
@@ -42,27 +42,25 @@

        <ImageView
            android:id="@+id/house_move_iv"
            android:layout_width="@dimen/dp_40"
            android:layout_height="@dimen/dp_40"
            android:layout_width="@dimen/dp_26"
            android:layout_height="@dimen/dp_26"
            android:layout_marginEnd="@dimen/dp_21"
            android:src="@drawable/move_c_house"
            android:visibility="gone" />

        <ImageView
            android:id="@+id/house_select_iv"
            android:layout_width="@dimen/dp_40"
            android:layout_height="@dimen/dp_40"
            android:layout_marginEnd="@dimen/dp_21"
            android:layout_width="@dimen/dp_39"
            android:layout_height="@dimen/dp_39"
            android:layout_marginEnd="@dimen/dp_16"
            android:visibility="gone" />
    </LinearLayout>

    <View
        android:layout_width="match_parent"
        android:layout_width="0dp"
        android:layout_height="0.5dp"
        android:layout_marginStart="@dimen/dp_16"
        android:layout_marginEnd="@dimen/dp_16"
        android:layout_marginBottom="0.5dp"
        android:background="@color/text_E1E1E1"
        android:background="@color/text_1AFFFFFF"
        app:layout_constraintBottom_toBottomOf="parent"
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintStart_toStartOf="parent"

 app/src/main/res/layout/item_message_c.xml

@@ -2,14 +2,14 @@
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:app="http://schemas.android.com/apk/res-auto"
    android:layout_width="match_parent"
    android:layout_height="@dimen/dp_115">
    android:layout_height="117.5dp">

    <androidx.constraintlayout.widget.ConstraintLayout
        android:layout_width="match_parent"
        android:layout_height="99dp"
        android:layout_width="0dp"
        android:layout_height="107.5dp"
        android:layout_marginStart="@dimen/dp_16"
        android:layout_marginEnd="@dimen/dp_16"
        android:background="@drawable/house_list_line_parent_bg"
        android:background="@drawable/bj_ff333738"
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintStart_toStartOf="parent"
        app:layout_constraintTop_toTopOf="parent">
@@ -17,26 +17,38 @@
        <!--未读标签-->
        <TextView
            android:id="@+id/item_unread_message_tv"
            android:layout_width="8dp"
            android:layout_height="8dp"
            android:layout_width="9dp"
            android:layout_height="9dp"
            android:layout_marginTop="@dimen/dp_3"
            android:layout_marginEnd="@dimen/dp_2"
            android:background="@drawable/red_font"
            app:layout_constraintEnd_toEndOf="parent"
            app:layout_constraintTop_toTopOf="parent" />

        <TextView
            android:id="@+id/item_estate_tv"
            android:layout_width="7dp"
            android:layout_height="7dp"
            android:layout_marginStart="@dimen/dp_16"
            android:layout_marginTop="22.5dp"
            android:background="@drawable/device_state_ffb9b9b9"
            app:layout_constraintStart_toStartOf="parent"
            app:layout_constraintTop_toTopOf="parent" />

        <TextView
            android:id="@+id/item_content_tv"
            android:layout_width="0dp"
            android:layout_height="@dimen/dp_23"
            android:layout_marginStart="22dp"
            android:layout_height="@dimen/dp_20"
            android:layout_marginStart="6dp"
            android:layout_marginTop="16dp"
            android:layout_marginEnd="@dimen/dp_5"
            android:ellipsize="end"
            android:gravity="center_vertical"
            android:singleLine="true"
            android:textColor="@color/text_E6000000"
            android:textSize="@dimen/text_16"
            app:layout_constraintEnd_toStartOf="@+id/item_estate_tv"
            app:layout_constraintStart_toStartOf="parent"
            android:textColor="@color/text_E6FFFFFF"
            android:textSize="@dimen/text_14"
            app:layout_constraintStart_toEndOf="@+id/item_estate_tv"
            app:layout_constraintEnd_toEndOf="parent"
            app:layout_constraintTop_toTopOf="parent" />

        <TextView
@@ -44,9 +56,9 @@
            android:layout_width="wrap_content"
            android:layout_height="@dimen/dp_17"
            android:layout_marginTop="@dimen/dp_6"
            android:textColor="@color/text_66000000"
            android:textColor="@color/text_66FFFFFF"
            android:textSize="@dimen/text_12"
            app:layout_constraintStart_toStartOf="@+id/item_content_tv"
            app:layout_constraintStart_toStartOf="@+id/item_estate_tv"
            app:layout_constraintTop_toBottomOf="@+id/item_content_tv" />

        <TextView
@@ -55,24 +67,12 @@
            android:layout_height="@dimen/dp_17"
            android:layout_marginTop="@dimen/dp_6"
            android:gravity="center_vertical"
            android:textColor="@color/text_66000000"
            android:textColor="@color/text_66FFFFFF"
            android:textSize="@dimen/text_12"
            app:layout_constraintStart_toStartOf="@+id/item_home_name_tv"
            app:layout_constraintStart_toStartOf="@+id/item_estate_tv"
            app:layout_constraintTop_toBottomOf="@+id/item_home_name_tv" />

        <TextView
            android:id="@+id/item_estate_tv"
            android:layout_width="wrap_content"
            android:layout_height="@dimen/dp_33"
            android:background="@drawable/state_ffb300"
            android:gravity="center"
            android:paddingStart="@dimen/dp_12"
            android:paddingEnd="@dimen/dp_12"
            android:text="@string/message_alarm"
            android:textColor="@color/text_FFFFFFFF"
            android:textSize="@dimen/text_12"
            app:layout_constraintEnd_toEndOf="parent"
            app:layout_constraintTop_toTopOf="parent" />

    </androidx.constraintlayout.widget.ConstraintLayout>

</androidx.constraintlayout.widget.ConstraintLayout>

 app/src/main/res/layout/item_type_title.xml

@@ -2,9 +2,7 @@
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:app="http://schemas.android.com/apk/res-auto"
    android:layout_width="match_parent"
    android:layout_height="54dp"
    android:layout_marginStart="@dimen/dp_16"
    android:layout_marginEnd="@dimen/dp_16">
    android:layout_height="54dp">

    <TextView
        android:id="@+id/type_title_tv"

 app/src/main/res/layout/view_camera_album.xml

@@ -11,28 +11,29 @@
        android:orientation="vertical">

        <TextView

            android:id="@+id/tv_Camera"
            android:layout_width="match_parent"
            android:layout_height="@dimen/dp_54"
            android:background="@color/white"
            android:background="@color/text_FF333738"
            android:gravity="center"
            android:text="@string/me_personal_data_photograph"
            android:textColor="@color/text_222222"
            android:textColor="@color/text_E6FFFFFF"
            android:textSize="16sp" />

        <View
            android:layout_width="match_parent"
            android:layout_height="@dimen/dp_0_5"
            android:background="@color/text_E1E1E1" />
            android:background="@color/text_1AFFFFFF" />

        <TextView
            android:id="@+id/tv_Album"
            android:layout_width="match_parent"
            android:layout_height="@dimen/dp_54"
            android:background="@color/white"
            android:background="@color/text_FF333738"
            android:gravity="center"
            android:text="@string/me_personal_data_select_album"
            android:textColor="@color/text_222222"
            android:textColor="@color/text_E6FFFFFF"
            android:textSize="16sp" />

        <View
@@ -43,10 +44,10 @@
            android:id="@+id/tv_Cancel"
            android:layout_width="match_parent"
            android:layout_height="@dimen/dp_54"
            android:background="@color/white"
            android:background="@color/text_FF333738"
            android:gravity="center"
            android:text="@string/loading_cancel"
            android:textColor="@color/text_FF5757"
            android:textColor="@color/text_66FFFFFF"
            android:textSize="16sp" />

    </LinearLayout>

			@@ -104,28 +104,76 @@
			* 初始化UI
			*/
			private void initView() {
			viewBinding.homeLoginCheckBCCl.setSelected(UserConfigManage.getInstance().isBAccount());
			viewBinding.homeLoginPrivacyCheckIv.setSelected(UserConfigManage.getInstance().isAcceiptPolicy());
			setStringDifferentColors(viewBinding.homeLoginPrivacyTv);
			if (UserConfigManage.getInstance().getCurrentAppLanguage().equals(LocalManageUtil.zh)) {
			viewBinding.homeLoginLanguageTv.setText("简体中文");
			} else {
			viewBinding.homeLoginLanguageTv.setText("English");
			}
			if (UserConfigManage.getInstance().isBAccount()) {
			viewBinding.homeLoginRegisterTv.setVisibility(View.GONE);
			} else {
			viewBinding.homeLoginRegisterTv.setVisibility(View.VISIBLE);
			}
			try {
			viewBinding.homeLoginCheckBCCl.setSelected(UserConfigManage.getInstance().isBAccount());
			viewBinding.homeLoginPrivacyCheckIv.setSelected(UserConfigManage.getInstance().isAcceiptPolicy());
			setStringDifferentColors(viewBinding.homeLoginPrivacyTv);

			//注册和忘记密码需要加下划线
			String registerTvStr = viewBinding.homeLoginRegisterTv.getText().toString();
			String forgetPasswordTvStr = viewBinding.homeLoginForgetPasswordTv.getText().toString();
			SpannableStringBuilder registerTvStrSpannable = new SpannableStringBuilder(registerTvStr);
			registerTvStrSpannable.setSpan(new ClickableSpan() {
			@Override
			public void onClick(@NonNull View widget) {

			}

			@Override
			public void updateDrawState(@NonNull TextPaint ds) {
			super.updateDrawState(ds);
			//设置字体颜色
			ds.setColor(getResources().getColor(R.color.text_E6FFFFFF, null));
			// 去掉下划线
			ds.setUnderlineText(!UserConfigManage.getInstance().isZh());
			}


			}, 0, registerTvStr.length(), 0);
			viewBinding.homeLoginRegisterTv.setText(registerTvStrSpannable);

			SpannableStringBuilder forgetPasswordTvStrSpannable = new SpannableStringBuilder(forgetPasswordTvStr);
			forgetPasswordTvStrSpannable.setSpan(new ClickableSpan() {
			@Override
			public void onClick(@NonNull View widget) {

			}

			@Override
			public void updateDrawState(@NonNull TextPaint ds) {
			super.updateDrawState(ds);
			//设置字体颜色
			ds.setColor(getResources().getColor(R.color.text_E6FFFFFF, null));
			// 去掉下划线
			ds.setUnderlineText(!UserConfigManage.getInstance().isZh());
			}


			}, 0, forgetPasswordTvStr.length(), 0);
			viewBinding.homeLoginForgetPasswordTv.setText(forgetPasswordTvStrSpannable);


			if (UserConfigManage.getInstance().getCurrentAppLanguage().equals(LocalManageUtil.zh)) {
			viewBinding.homeLoginLanguageTv.setText("简体中文");
			} else {
			viewBinding.homeLoginLanguageTv.setText("English");
			}
			if (UserConfigManage.getInstance().isBAccount()) {
			viewBinding.homeLoginRegisterTv.setVisibility(View.GONE);
			} else {
			viewBinding.homeLoginRegisterTv.setVisibility(View.VISIBLE);
			}
			// String acc = "18402017839";
			// String acc = "13375012441";
			// String acc = "18316672920";
			// String pws = "123456";
			//测试用
			viewBinding.homeLoginAccountEt.setText(UserConfigManage.getInstance().getAccount());
			//测试用
			viewBinding.homeLoginAccountEt.setText(UserConfigManage.getInstance().getAccount());
			// viewBinding.homeLoginPasswordEt.setText(pws);
			checkClearIconShowOrNot(viewBinding.homeLoginAccountEt.getText().toString());
			isLoginTextViewEnabled();
			checkClearIconShowOrNot(viewBinding.homeLoginAccountEt.getText().toString());
			isLoginTextViewEnabled();
			} catch (Exception ignored) {
			}
			}

			/**
			@@ -526,7 +574,7 @@
			}
			textView.setText(spannable);
			//中途遇到点击后字体显示高亮，取消高亮
			textView.setHighlightColor(getResources().getColor(R.color.text_00000000, null));
			textView.setHighlightColor(getResources().getColor(R.color.text_66FFFFFF, null));
			//最后设置可点击，必须实现，否则只能显示样式，无法实现点击效果
			textView.setMovementMethod(LinkMovementMethod.getInstance());
			} catch (Exception ignored) {

			@@ -94,6 +94,7 @@

			viewBinding.setAccountPhoneIl.sllLlRlNameTv.setText(R.string.home_login_phone);
			viewBinding.setAccountPhoneIl.sllLlRlRightContentTv.setVisibility(View.VISIBLE);
			viewBinding.setAccountPhoneIl.lineV.setVisibility(View.VISIBLE);

			viewBinding.setAccountMailIl.sllLlRlNameTv.setText(R.string.set_email_address);
			viewBinding.setAccountMailIl.sllLlRlRightContentTv.setVisibility(View.VISIBLE);

			@@ -91,10 +91,7 @@

			private void initView() {
			viewBinding.toolbarTopRl.topTitleTv.setText(R.string.set_change_bind_mail);
			viewBinding.toolbarTopRl.topTitleTv.setTextColor(getResources().getColor(R.color.text_030D1C, null));
			viewBinding.toolbarTopRl.topBackLl.setVisibility(View.VISIBLE);
			viewBinding.toolbarTopRl.topLeftIv.setImageResource(R.drawable.back_c);
			viewBinding.toolbarTopRl.topBarView.setBackgroundColor(getResources().getColor(R.color.text_FFECECEC, null));
			}

			/**

			@@ -100,10 +100,7 @@

			private void initView() {
			viewBinding.toolbarTopRl.topTitleTv.setText(R.string.set_change_bind_phone_number);
			viewBinding.toolbarTopRl.topTitleTv.setTextColor(getResources().getColor(R.color.text_030D1C, null));
			viewBinding.toolbarTopRl.topBackLl.setVisibility(View.VISIBLE);
			viewBinding.toolbarTopRl.topLeftIv.setImageResource(R.drawable.back_c);
			viewBinding.toolbarTopRl.topBarView.setBackgroundColor(getResources().getColor(R.color.text_FFECECEC, null));
			try {
			Country.load(this);
			} catch (Exception e) {
			@@ -162,7 +159,6 @@
			long time = (millisUntilFinished / 1000);
			String str = time + "s" + getString(R.string.home_login_psw_verification_repeater);
			viewBinding.bindPhoneVerificationTv.setText(str);
			viewBinding.bindPhoneVerificationTv.setTextColor(getResources().getColor(R.color.text_25000000, null));
			viewBinding.bindPhoneVerificationTv.setEnabled(false);

			}
			@@ -170,7 +166,6 @@
			@Override
			public void onFinish() {
			viewBinding.bindPhoneVerificationTv.setText(getString(R.string.home_login_verification_regain));
			viewBinding.bindPhoneVerificationTv.setTextColor(getResources().getColor(R.color.text_245EC3, null));
			viewBinding.bindPhoneVerificationTv.setEnabled(true);


			@@ -191,7 +186,6 @@
			HdlThreadLogic.tipFlashingBox(this, false, getString(R.string.home_login_null_verification_code), -1);
			return false;
			}

			return true;

			}

			@@ -162,18 +162,19 @@
			private void initView() {
			viewBinding.toolbarTopFragmentMeRl.topTitleTv.setText(R.string.me_personal_data);
			viewBinding.toolbarTopFragmentMeRl.topBackLl.setVisibility(View.VISIBLE);
			viewBinding.toolbarTopFragmentMeRl.topLeftIv.setImageResource(R.drawable.back_c);
			viewBinding.toolbarTopFragmentMeRl.topTitleTv.setTextColor(getResources().getColor(R.color.text_030D1C, null));
			viewBinding.toolbarTopFragmentMeRl.topBarView.setBackgroundColor(getResources().getColor(R.color.text_FFECECEC, null));
			viewBinding.personalDataUserPortraitIl.sllLlRlNameTv.setText(R.string.me_personal_data_portrait);
			viewBinding.personalDataUserNameIl.sllLlRlNameTv.setText(R.string.me_personal_data_user_name);
			viewBinding.personalDataMailIl.sllLlRlNameTv.setText(R.string.home_login_email);
			viewBinding.personalDataPhoneIl.sllLlRlNameTv.setText(R.string.home_login_phone);
			viewBinding.personalDataQrCodeIl.sllLlRlNameTv.setText(R.string.qr_code_business_card);
			viewBinding.personalDataUserPortraitIl.sllLlRlRightContentIv.setVisibility(View.VISIBLE);
			viewBinding.personalDataUserPortraitIl.lineV.setVisibility(View.VISIBLE);
			viewBinding.personalDataUserNameIl.sllLlRlRightContentTv.setVisibility(View.VISIBLE);
			viewBinding.personalDataUserNameIl.lineV.setVisibility(View.VISIBLE);
			viewBinding.personalDataMailIl.sllLlRlRightContentTv.setVisibility(View.VISIBLE);
			viewBinding.personalDataMailIl.lineV.setVisibility(View.VISIBLE);
			viewBinding.personalDataPhoneIl.sllLlRlRightContentTv.setVisibility(View.VISIBLE);
			viewBinding.personalDataPhoneIl.lineV.setVisibility(View.VISIBLE);
			viewBinding.personalDataQrCodeIl.sllLlRlRightContentIv.setVisibility(View.VISIBLE);
			viewBinding.personalDataUserNameIl.sllLlRlRightContentTv.setText(UserConfigManage.getInstance().getUserName());
			viewBinding.personalDataQrCodeIl.sllLlRlRightContentIv.setImageDrawable(AppCompatResources.getDrawable(_mActivity, R.drawable.qr_code));

			@@ -326,9 +326,7 @@
			}

			private void initView() {
			viewBinding.toolbarTopMessageCenterListRl.getRoot().setBackgroundColor(getColor(R.color.text_FFECECEC));
			viewBinding.toolbarTopMessageCenterListRl.topBackLl.setVisibility(View.VISIBLE);
			viewBinding.toolbarTopMessageCenterListRl.topLeftIv.setImageResource(R.drawable.back_c);
			viewBinding.toolbarTopMessageCenterListRl.topTitleTv.setText(R.string.set_message_center);
			viewBinding.toolbarTopMessageCenterListRl.topMoreBtn.setVisibility(View.VISIBLE);
			viewBinding.toolbarTopMessageCenterListRl.topMoreIv.setImageResource(R.drawable.clearall);
			@@ -498,19 +496,11 @@
			@Override
			public void run() {
			if (typeClick) {
			viewBinding.messageBottomAlarmDeviceTitleTv.setTextColor(getColor(R.color.text_191919));
			viewBinding.messageBottomAlarmDeviceLineV.setVisibility(View.VISIBLE);
			viewBinding.messageBottomAlarmRecordTitleTv.setTextColor(getColor(R.color.text_B2B2B2));
			viewBinding.messageBottomAlarmRecordLineV.setVisibility(View.GONE);
			viewBinding.messageBottomAlarmDeviceTitleTv.setTypeface(null, Typeface.BOLD);
			viewBinding.messageBottomAlarmRecordTitleTv.setTypeface(null, Typeface.NORMAL);
			} else {
			viewBinding.messageBottomAlarmDeviceTitleTv.setTextColor(getColor(R.color.text_B2B2B2));
			viewBinding.messageBottomAlarmDeviceLineV.setVisibility(View.GONE);
			viewBinding.messageBottomAlarmRecordTitleTv.setTextColor(getColor(R.color.text_191919));
			viewBinding.messageBottomAlarmRecordLineV.setVisibility(View.VISIBLE);
			viewBinding.messageBottomAlarmDeviceTitleTv.setTypeface(null, Typeface.NORMAL);
			viewBinding.messageBottomAlarmRecordTitleTv.setTypeface(null, Typeface.BOLD);
			}

			}

			@@ -195,9 +195,7 @@
			}

			private void initView() {
			viewBinding.toolbarTopRl.getRoot().setBackgroundColor(getColor(R.color.text_FFECECEC));
			viewBinding.toolbarTopRl.topBackLl.setVisibility(View.VISIBLE);
			viewBinding.toolbarTopRl.topLeftIv.setImageResource(R.drawable.back_c);
			viewBinding.toolbarTopRl.topTitleTv.setText(R.string.power_station_selection);
			viewBinding.toolbarTopRl.topMoreBtn.setVisibility(View.VISIBLE);
			viewBinding.toolbarTopRl.topMoreIv.setImageResource(R.drawable.editor_house);

			@@ -62,13 +62,10 @@
			if (!houseIdBean.isMove()) {
			holder.houseSelectIv.setVisibility(View.VISIBLE);
			holder.houseSelectIv.setBackground(null);
			holder.homeNameTv.setTextColor(mContext.getColor(R.color.text_E6000000));
			if (houseIdBean.isState_select()) {
			holder.homeNameTv.setTextColor(mContext.getColor(R.color.text_38C494));
			holder.houseSelectIv.setBackground(AppCompatResources.getDrawable(mContext, R.drawable.select));
			}
			} else {
			holder.homeNameTv.setTextColor(mContext.getColor(R.color.text_E6000000));
			holder.houseSelectIv.setVisibility(View.GONE);
			}

			@@ -50,16 +50,16 @@
			String date = TimeUtils.getTimeFromTimestamp(messageBean.getCreateTime());
			holder.item_time_tv.setText(date);
			String type = "";//FAULT:故障,WARN:告警,EVENT:事件
			Drawable drawable = AppCompatResources.getDrawable(mContext, R.drawable.state_ffb300);
			Drawable drawable = AppCompatResources.getDrawable(mContext, R.drawable.device_satte_ffb300);
			if (messageBean.getType().equals(MessageAlarmStateType.fault)) {
			type = mContext.getString(R.string.my_power_station_malfunction);
			drawable = AppCompatResources.getDrawable(mContext, R.drawable.state_e34343);
			drawable = AppCompatResources.getDrawable(mContext, R.drawable.device_state_fff55252);
			} else if (messageBean.getType().equals(MessageAlarmStateType.warn)) {
			type = mContext.getString(R.string.alarm_all_grade_warning);
			drawable = AppCompatResources.getDrawable(mContext, R.drawable.state_ffb300);
			drawable = AppCompatResources.getDrawable(mContext, R.drawable.device_satte_ffb300);
			} else if (messageBean.getType().equals(MessageAlarmStateType.event)) {
			type = mContext.getString(R.string.loading_title_tip);
			drawable = AppCompatResources.getDrawable(mContext, R.drawable.state_b9b9b9);
			drawable = AppCompatResources.getDrawable(mContext, R.drawable.device_state_ffb9b9b9);
			}
			holder.item_estate_tv.setText(type);
			holder.item_estate_tv.setBackground(drawable);

			@@ -1,5 +1,5 @@
			<?xml version="1.0" encoding="utf-8"?>
			<shape xmlns:android="http://schemas.android.com/apk/res/android">
			<solid android:color="@color/text_191919" />
			<solid android:color="@color/text_E6FFFFFF" />
			<corners android:radius="79.5dp" />
			</shape>

			@@ -1,7 +1,7 @@
			<?xml version="1.0" encoding="utf-8"?>
			<shape xmlns:android="http://schemas.android.com/apk/res/android">
			<corners android:radius="@dimen/dp_4" />
			<corners android:radius="@dimen/dp_8" />
			<stroke
			android:width="0.5dp"
			android:color="@color/text_E1E1E1" />
			android:width="1dp"
			android:color="#FF5C5F60" />
			</shape>

			@@ -4,7 +4,7 @@
			xmlns:tools="http://schemas.android.com/tools"
			android:layout_width="match_parent"
			android:layout_height="match_parent"
			android:background="@color/text_FFECECEC"
			android:background="@color/text_FF161616"
			tools:context=".ui.me.BindMailActivity">

			<include
			@@ -27,7 +27,7 @@
			android:layout_marginStart="@dimen/dp_20"
			android:layout_marginTop="@dimen/dp_24"
			android:text="@string/home_login_email"
			android:textColor="@color/text_65000000"
			android:textColor="@color/text_E6FFFFFF"
			android:textSize="@dimen/text_14" />

			<RelativeLayout
			@@ -54,9 +54,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" />

			<ImageView
			android:id="@+id/bind_mail_clear_iv"
			@@ -97,7 +97,7 @@
			android:layout_height="@dimen/dp_20"
			android:layout_marginStart="@dimen/dp_20"
			android:text="@string/verification"
			android:textColor="@color/text_65000000"
			android:textColor="@color/text_E6FFFFFF"
			android:textSize="@dimen/text_14" />

			<!--邮箱获取验证码-->
			@@ -121,7 +121,7 @@
			android:paddingStart="@dimen/dp_16"
			android:paddingEnd="@dimen/dp_0"
			android:text="@string/home_login_verification_code"
			android:textColor="@color/text_245EC3"
			android:textColor="@color/text_E6FFFFFF"
			android:textSize="@dimen/text_14" />

			<View
			@@ -130,7 +130,7 @@
			android:layout_height="20dp"
			android:layout_alignStart="@+id/bind_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"
			@@ -144,8 +144,8 @@
			android:inputType="text"
			android:lines="1"
			android:maxLines="1"
			android:textColor="@color/text_FF000000"
			android:textColorHint="@color/text_25000000"
			android:textColor="@color/text_E6FFFFFF"
			android:textColorHint="@color/text_66FFFFFF"
			android:textSize="@dimen/text_16"

			/>
			@@ -174,10 +174,10 @@
			android:layout_marginStart="@dimen/dp_20"
			android:layout_marginTop="73dp"
			android:layout_marginEnd="@dimen/dp_20"
			android:background="@drawable/yesandnocheck"
			android:background="@drawable/bj_ff555859"
			android:gravity="center"
			android:text="@string/home_login_affirm"
			android:textColor="@color/text_FFFFFFFF"
			android:textColor="@color/text_E6FFFFFF"
			android:textSize="18sp"
			app:layout_constraintEnd_toEndOf="parent"
			app:layout_constraintStart_toStartOf="parent"

			@@ -11,7 +11,8 @@
			android:layout_height="225dp"
			android:layout_marginStart="@dimen/dp_48"
			android:layout_marginEnd="@dimen/dp_48"
			android:background="@drawable/loading_confirmation_bj"
			android:background="@drawable/bj_ff333738"
			android:paddingBottom="@dimen/dp_24"
			app:layout_constraintBottom_toBottomOf="parent"
			app:layout_constraintEnd_toEndOf="parent"
			app:layout_constraintStart_toStartOf="parent"
			@@ -27,8 +28,8 @@
			android:layout_marginTop="@dimen/dp_25"
			android:layout_marginEnd="@dimen/dp_20"
			android:text="wifi_ssid"
			android:textColor="@color/text_030D1C"
			android:textSize="@dimen/text_18" />
			android:textColor="@color/text_E6FFFFFF"
			android:textSize="@dimen/text_16" />

			<androidx.constraintlayout.widget.ConstraintLayout
			android:id="@+id/loading_confirmation_input_cl"
			@@ -54,8 +55,8 @@
			android:maxLines="1"
			android:paddingStart="@dimen/dp_16"
			android:paddingEnd="@dimen/dp_16"
			android:textColor="@color/text_030D1C"
			android:textColorHint="@color/text_25000000"
			android:textColor="@color/text_E6FFFFFF"
			android:textColorHint="@color/text_66FFFFFF"
			app:layout_constraintBottom_toBottomOf="parent"
			app:layout_constraintEnd_toEndOf="parent"
			app:layout_constraintStart_toStartOf="parent"
			@@ -86,8 +87,10 @@
			<LinearLayout
			android:id="@+id/dialog_confirm_bottom_line_ly"
			android:layout_width="match_parent"
			android:layout_height="@dimen/dp_52"
			android:layout_height="@dimen/dp_41"
			android:layout_alignParentBottom="true"
			android:layout_marginStart="@dimen/dp_16"
			android:layout_marginEnd="@dimen/dp_16"
			android:orientation="horizontal">


			@@ -96,6 +99,7 @@
			android:layout_width="@dimen/dp_0"
			android:layout_height="match_parent"
			android:layout_weight="1"
			android:background="@drawable/bj_ff555859_23_no"
			android:gravity="center">

			<TextView
			@@ -103,23 +107,22 @@
			android:layout_width="wrap_content"
			android:layout_height="wrap_content"
			android:text="@string/loading_cancel"
			android:textColor="@color/text_7C8590"
			android:textSize="@dimen/text_18" />
			android:textColor="@color/text_E6FFFFFF"
			android:textSize="@dimen/text_14" />


			</LinearLayout>

			<View
			android:layout_width="0.5dp"
			android:layout_height="@dimen/dp_23"
			android:layout_gravity="center"
			android:background="@color/text_E1E1E1" />
			android:layout_width="9.5dp"
			android:layout_height="match_parent" />

			<LinearLayout
			android:id="@+id/dialog_confirm_ly"
			android:layout_width="@dimen/dp_0"
			android:layout_height="match_parent"
			android:layout_weight="1"
			android:background="@drawable/bj_ff555859_23"
			android:gravity="center">

			<TextView
			@@ -127,11 +130,12 @@
			android:layout_width="wrap_content"
			android:layout_height="wrap_content"
			android:text="@string/loading_affirm"
			android:textColor="@color/text_FF245EC3"
			android:textSize="@dimen/text_18" />
			android:textColor="@color/text_E6FFFFFF"
			android:textSize="@dimen/text_14" />
			</LinearLayout>
			</LinearLayout>


			</RelativeLayout>

			@@ -4,7 +4,7 @@
			android:id="@+id/type_parent_cl"
			android:layout_width="match_parent"
			android:layout_height="wrap_content"
			android:background="@drawable/ffffff_13">
			android:background="@drawable/bj_ff333738">

			<androidx.recyclerview.widget.RecyclerView
			android:id="@+id/type_list_rl"

			@@ -3,8 +3,8 @@
			xmlns:app="http://schemas.android.com/apk/res-auto"
			android:id="@+id/item_parent_cl"
			android:layout_width="match_parent"
			android:layout_height="@dimen/dp_70"
			android:background="@color/text_FFFFFFFF">
			android:layout_height="@dimen/dp_52"
			android:background="@color/text_FF333738">

			<TextView
			android:id="@+id/house_name_tv"
			@@ -15,8 +15,8 @@
			android:ellipsize="end"
			android:singleLine="true"
			android:text="@string/power_station"
			android:textColor="@color/text_E6000000"
			android:textSize="@dimen/text_16"
			android:textColor="@color/text_E6FFFFFF"
			android:textSize="@dimen/text_14"
			app:layout_constraintBottom_toBottomOf="parent"
			app:layout_constraintEnd_toStartOf="@+id/house_Image_ll"
			app:layout_constraintStart_toStartOf="parent"
			@@ -42,27 +42,25 @@

			<ImageView
			android:id="@+id/house_move_iv"
			android:layout_width="@dimen/dp_40"
			android:layout_height="@dimen/dp_40"
			android:layout_width="@dimen/dp_26"
			android:layout_height="@dimen/dp_26"
			android:layout_marginEnd="@dimen/dp_21"
			android:src="@drawable/move_c_house"
			android:visibility="gone" />

			<ImageView
			android:id="@+id/house_select_iv"
			android:layout_width="@dimen/dp_40"
			android:layout_height="@dimen/dp_40"
			android:layout_marginEnd="@dimen/dp_21"
			android:layout_width="@dimen/dp_39"
			android:layout_height="@dimen/dp_39"
			android:layout_marginEnd="@dimen/dp_16"
			android:visibility="gone" />
			</LinearLayout>

			<View
			android:layout_width="match_parent"
			android:layout_width="0dp"
			android:layout_height="0.5dp"
			android:layout_marginStart="@dimen/dp_16"
			android:layout_marginEnd="@dimen/dp_16"
			android:layout_marginBottom="0.5dp"
			android:background="@color/text_E1E1E1"
			android:background="@color/text_1AFFFFFF"
			app:layout_constraintBottom_toBottomOf="parent"
			app:layout_constraintEnd_toEndOf="parent"
			app:layout_constraintStart_toStartOf="parent"

			@@ -2,14 +2,14 @@
			<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
			xmlns:app="http://schemas.android.com/apk/res-auto"
			android:layout_width="match_parent"
			android:layout_height="@dimen/dp_115">
			android:layout_height="117.5dp">

			<androidx.constraintlayout.widget.ConstraintLayout
			android:layout_width="match_parent"
			android:layout_height="99dp"
			android:layout_width="0dp"
			android:layout_height="107.5dp"
			android:layout_marginStart="@dimen/dp_16"
			android:layout_marginEnd="@dimen/dp_16"
			android:background="@drawable/house_list_line_parent_bg"
			android:background="@drawable/bj_ff333738"
			app:layout_constraintEnd_toEndOf="parent"
			app:layout_constraintStart_toStartOf="parent"
			app:layout_constraintTop_toTopOf="parent">
			@@ -17,26 +17,38 @@
			<!--未读标签-->
			<TextView
			android:id="@+id/item_unread_message_tv"
			android:layout_width="8dp"
			android:layout_height="8dp"
			android:layout_width="9dp"
			android:layout_height="9dp"
			android:layout_marginTop="@dimen/dp_3"
			android:layout_marginEnd="@dimen/dp_2"
			android:background="@drawable/red_font"
			app:layout_constraintEnd_toEndOf="parent"
			app:layout_constraintTop_toTopOf="parent" />

			<TextView
			android:id="@+id/item_estate_tv"
			android:layout_width="7dp"
			android:layout_height="7dp"
			android:layout_marginStart="@dimen/dp_16"
			android:layout_marginTop="22.5dp"
			android:background="@drawable/device_state_ffb9b9b9"
			app:layout_constraintStart_toStartOf="parent"
			app:layout_constraintTop_toTopOf="parent" />

			<TextView
			android:id="@+id/item_content_tv"
			android:layout_width="0dp"
			android:layout_height="@dimen/dp_23"
			android:layout_marginStart="22dp"
			android:layout_height="@dimen/dp_20"
			android:layout_marginStart="6dp"
			android:layout_marginTop="16dp"
			android:layout_marginEnd="@dimen/dp_5"
			android:ellipsize="end"
			android:gravity="center_vertical"
			android:singleLine="true"
			android:textColor="@color/text_E6000000"
			android:textSize="@dimen/text_16"
			app:layout_constraintEnd_toStartOf="@+id/item_estate_tv"
			app:layout_constraintStart_toStartOf="parent"
			android:textColor="@color/text_E6FFFFFF"
			android:textSize="@dimen/text_14"
			app:layout_constraintStart_toEndOf="@+id/item_estate_tv"
			app:layout_constraintEnd_toEndOf="parent"
			app:layout_constraintTop_toTopOf="parent" />

			<TextView
			@@ -44,9 +56,9 @@
			android:layout_width="wrap_content"
			android:layout_height="@dimen/dp_17"
			android:layout_marginTop="@dimen/dp_6"
			android:textColor="@color/text_66000000"
			android:textColor="@color/text_66FFFFFF"
			android:textSize="@dimen/text_12"
			app:layout_constraintStart_toStartOf="@+id/item_content_tv"
			app:layout_constraintStart_toStartOf="@+id/item_estate_tv"
			app:layout_constraintTop_toBottomOf="@+id/item_content_tv" />

			<TextView
			@@ -55,24 +67,12 @@
			android:layout_height="@dimen/dp_17"
			android:layout_marginTop="@dimen/dp_6"
			android:gravity="center_vertical"
			android:textColor="@color/text_66000000"
			android:textColor="@color/text_66FFFFFF"
			android:textSize="@dimen/text_12"
			app:layout_constraintStart_toStartOf="@+id/item_home_name_tv"
			app:layout_constraintStart_toStartOf="@+id/item_estate_tv"
			app:layout_constraintTop_toBottomOf="@+id/item_home_name_tv" />

			<TextView
			android:id="@+id/item_estate_tv"
			android:layout_width="wrap_content"
			android:layout_height="@dimen/dp_33"
			android:background="@drawable/state_ffb300"
			android:gravity="center"
			android:paddingStart="@dimen/dp_12"
			android:paddingEnd="@dimen/dp_12"
			android:text="@string/message_alarm"
			android:textColor="@color/text_FFFFFFFF"
			android:textSize="@dimen/text_12"
			app:layout_constraintEnd_toEndOf="parent"
			app:layout_constraintTop_toTopOf="parent" />

			</androidx.constraintlayout.widget.ConstraintLayout>

			</androidx.constraintlayout.widget.ConstraintLayout>

			@@ -2,9 +2,7 @@
			<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
			xmlns:app="http://schemas.android.com/apk/res-auto"
			android:layout_width="match_parent"
			android:layout_height="54dp"
			android:layout_marginStart="@dimen/dp_16"
			android:layout_marginEnd="@dimen/dp_16">
			android:layout_height="54dp">

			<TextView
			android:id="@+id/type_title_tv"

			@@ -11,28 +11,29 @@
			android:orientation="vertical">

			<TextView

			android:id="@+id/tv_Camera"
			android:layout_width="match_parent"
			android:layout_height="@dimen/dp_54"
			android:background="@color/white"
			android:background="@color/text_FF333738"
			android:gravity="center"
			android:text="@string/me_personal_data_photograph"
			android:textColor="@color/text_222222"
			android:textColor="@color/text_E6FFFFFF"
			android:textSize="16sp" />

			<View
			android:layout_width="match_parent"
			android:layout_height="@dimen/dp_0_5"
			android:background="@color/text_E1E1E1" />
			android:background="@color/text_1AFFFFFF" />

			<TextView
			android:id="@+id/tv_Album"
			android:layout_width="match_parent"
			android:layout_height="@dimen/dp_54"
			android:background="@color/white"
			android:background="@color/text_FF333738"
			android:gravity="center"
			android:text="@string/me_personal_data_select_album"
			android:textColor="@color/text_222222"
			android:textColor="@color/text_E6FFFFFF"
			android:textSize="16sp" />

			<View
			@@ -43,10 +44,10 @@
			android:id="@+id/tv_Cancel"
			android:layout_width="match_parent"
			android:layout_height="@dimen/dp_54"
			android:background="@color/white"
			android:background="@color/text_FF333738"
			android:gravity="center"
			android:text="@string/loading_cancel"
			android:textColor="@color/text_FF5757"
			android:textColor="@color/text_66FFFFFF"
			android:textSize="16sp" />

			</LinearLayout>