2024年11月28日19:45:06

wjc

2024-11-28 3a70ebddb80aa8420af1da25d19ef6b4aea9dc72

2024年11月28日19:45:06

 app/src/main/java/com/hdl/photovoltaic/ui/adapter/LanguageAdapter.java

@@ -43,11 +43,8 @@
        try {
            ItemData itemData = this.mList.get(position);
            holder.item_lift_name_tv.setText(itemData.getTitle());
            holder.item_lift_name_tv.setTextColor(mContext.getColor(R.color.text_E6000000));
            holder.item_right_icon_iv.setBackground(null);
            if (itemData.isState()) {
                holder.item_lift_name_tv.setTextColor(mContext.getColor(R.color.text_245EC3));

                holder.item_right_icon_iv.setBackground(AppCompatResources.getDrawable(mContext, R.drawable.select));
            }
            if (position == this.mList.size() - 1) {

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

@@ -82,10 +82,7 @@

    private void initView() {
        viewBinding.toolbarTopRl.topTitleTv.setText(R.string.set_account_security);
        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));

        if (UserConfigManage.getInstance().isBAccount()) {
            //云端接口不支持

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

@@ -67,9 +67,6 @@
    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);
@@ -79,24 +76,25 @@

        viewBinding.personalDataUserPortraitIl.sllLlRlRightContentIv.setVisibility(View.VISIBLE);
        viewBinding.personalDataUserPortraitIl.sllLlRlRightNextIv.setVisibility(View.GONE);
        viewBinding.personalDataUserPortraitIl.lineV.setVisibility(View.VISIBLE);
        viewBinding.personalDataUserNameIl.sllLlRlRightContentTv.setVisibility(View.VISIBLE);
        viewBinding.personalDataUserNameIl.sllLlRlRightNextIv.setVisibility(View.GONE);
        viewBinding.personalDataUserNameIl.lineV.setVisibility(View.VISIBLE);
        viewBinding.personalDataMailIl.sllLlRlRightContentTv.setVisibility(View.VISIBLE);
        viewBinding.personalDataMailIl.sllLlRlRightNextIv.setVisibility(View.GONE);
        viewBinding.personalDataMailIl.lineV.setVisibility(View.VISIBLE);
        viewBinding.personalDataPhoneIl.sllLlRlRightContentTv.setVisibility(View.VISIBLE);
        viewBinding.personalDataPhoneIl.sllLlRlRightNextIv.setVisibility(View.GONE);
        viewBinding.personalDataPhoneIl.lineV.setVisibility(View.VISIBLE);
        viewBinding.personalDataQrCodeIl.sllLlRlRightContentIv.setVisibility(View.VISIBLE);


        viewBinding.personalDataUserPortraitIl.sllLlRlRightContentIv.setImageDrawable(AppCompatResources.getDrawable(_mActivity, R.drawable.default_image));
        viewBinding.personalDataUserNameIl.sllLlRlRightContentTv.setText(UserConfigManage.getInstance().getUserName());
        viewBinding.personalDataUserNameIl.sllLlRlRightContentTv.setTextColor(getColor(R.color.text_E6000000));
        String bingEmail = TextUtils.isEmpty(UserConfigManage.getInstance().getBingEmail()) ? _mActivity.getString(R.string.set_not_bind) : UserConfigManage.getInstance().getBingEmail();
        viewBinding.personalDataMailIl.sllLlRlRightContentTv.setText(bingEmail);
        viewBinding.personalDataMailIl.sllLlRlRightContentTv.setTextColor(getColor(R.color.text_E6000000));
        String bingPhone = TextUtils.isEmpty(UserConfigManage.getInstance().getBingPhone()) ? _mActivity.getString(R.string.set_not_bind) : UserConfigManage.getInstance().getBingPhone();
        viewBinding.personalDataPhoneIl.sllLlRlRightContentTv.setText(bingPhone);
        viewBinding.personalDataPhoneIl.sllLlRlRightContentTv.setTextColor(getColor(R.color.text_E6000000));
        viewBinding.personalDataQrCodeIl.sllLlRlRightContentIv.setImageDrawable(AppCompatResources.getDrawable(_mActivity, R.drawable.qr_code));
    }


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

@@ -163,11 +163,8 @@
     * 初始化
     */
    private void initView() {
        viewBinding.toolbarTopRl.topBarView.setBackgroundColor(getResources().getColor(R.color.text_FFECECEC, null));
        viewBinding.toolbarTopRl.topTitleTv.setText(R.string.home_login_change_password);
        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.meChangePasswordOldIc.mePswTitleTv.setText(R.string.home_login_old_pws);
        viewBinding.meChangePasswordOldIc.mePswEt.setHint(R.string.home_login_input_old_pws);
        viewBinding.meChangePasswordOldIc.lineV.setVisibility(View.GONE);
@@ -190,6 +187,11 @@
        String newPsw = viewBinding.meChangePasswordNewIc.mePswEt.getText().toString();
        String affirmPsw = viewBinding.meChangePasswordAffirmIc.mePswEt.getText().toString();
        boolean isEnabled = oldPsw.length() > 0 && newPsw.length() > 0 && affirmPsw.length() > 0;
        if (isEnabled) {
            viewBinding.homeAffirmTv.setTextColor(getColor(R.color.text_E6FFFFFF));
        } else {
            viewBinding.homeAffirmTv.setTextColor(getColor(R.color.text_66FFFFFF));
        }
        viewBinding.homeAffirmTv.setEnabled(isEnabled);
    }


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

@@ -34,8 +34,7 @@

    @Override
    public void onBindView(Bundle savedInstanceState) {
        setNotificationBarBackgroundColor(CustomBaseActivity.CustomColor.white);
        setStatusBarTextColor();
        setStatusBarTranslucent();
        //初始化
        initView();
        //初始化界面监听器
@@ -49,7 +48,7 @@


    private void initEvent() {
        viewBinding.toolbarTopQrCodeRl.topBackLl.setOnClickListener(new View.OnClickListener() {
        viewBinding.topBackLl.setOnClickListener(new View.OnClickListener() {
            @Override
            public void onClick(View v) {
                finish();
@@ -89,11 +88,8 @@
    }

    private void initView() {
        viewBinding.toolbarTopQrCodeRl.topTitleTv.setText(R.string.qr_code_business_card);
        viewBinding.toolbarTopQrCodeRl.topBackLl.setVisibility(View.VISIBLE);
        viewBinding.toolbarTopQrCodeRl.topLeftIv.setImageResource(R.drawable.back_c);
        viewBinding.toolbarTopQrCodeRl.topTitleTv.setTextColor(getResources().getColor(R.color.text_030D1C, null));
        viewBinding.toolbarTopQrCodeRl.topBarView.setBackgroundColor(getResources().getColor(R.color.text_FFECECEC, null));
        viewBinding.topTitleTv.setText(R.string.qr_code_business_card);
        viewBinding.topBackLl.setVisibility(View.VISIBLE);
//        viewBinding.toolbarTopQrCodeRl.topMoreBtn.setVisibility(View.VISIBLE);
//        viewBinding.toolbarTopQrCodeRl.topMoreIv.setImageDrawable(AppCompatResources.getDrawable(_mActivity, R.drawable.save_image));
        if (!TextUtils.isEmpty(UserConfigManage.getInstance().getUserName())) {
@@ -105,13 +101,13 @@
            viewBinding.userAccountTv.setVisibility(View.VISIBLE);
            viewBinding.userAccountTv.setText(str);
        }
        QrCodeBean qrCodeBean = new QrCodeBean();
        qrCodeBean.setUserEmail(UserConfigManage.getInstance().getBingEmail());
        qrCodeBean.setUserPhone(UserConfigManage.getInstance().getBingPhone());
        qrCodeBean.setUserName(UserConfigManage.getInstance().getUserName());
        qrCodeBean.setAccount(UserConfigManage.getInstance().getAccount());
        String content = new Gson().toJson(qrCodeBean);
        Bitmap bitmap = HdlCommonLogic.getInstance().createQRCodeBitmap(content, 229, 229, "UTF-8", "H", "1", Color.BLACK, Color.WHITE);
//        QrCodeBean qrCodeBean = new QrCodeBean();
//        qrCodeBean.setUserEmail(UserConfigManage.getInstance().getBingEmail());
//        qrCodeBean.setUserPhone(UserConfigManage.getInstance().getBingPhone());
//        qrCodeBean.setUserName(UserConfigManage.getInstance().getUserName());
//        qrCodeBean.setAccount(UserConfigManage.getInstance().getAccount());
        String content = UserConfigManage.getInstance().getAccount();// new Gson().toJson(qrCodeBean);内容过长微信扫码显示有问题
        Bitmap bitmap = HdlCommonLogic.getInstance().createQRCodeBitmap(content, 168, 168, "UTF-8", "H", "0", Color.BLACK, Color.WHITE);
        viewBinding.qrCodeIv.setImageBitmap(bitmap);

    }

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

@@ -99,14 +99,13 @@

    private void initView() {
        viewBinding.toolbarTopRl.topTitleTv.setText(R.string.me_set);
        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));
        viewBinding.setLanguageIl.sllLlRlNameTv.setText(R.string.set_multilingual);
        viewBinding.setAccountSecurityIl.sllLlRlNameTv.setText(R.string.set_account_security);
        viewBinding.setTemperatureUnitIl.sllLlRlNameTv.setText(R.string.set_temperature_unit);
        viewBinding.setLanguageIl.sllLlRlRightContentTv.setVisibility(View.VISIBLE);
        viewBinding.setLanguageIl.lineV.setVisibility(View.VISIBLE);
        viewBinding.setAccountSecurityIl.lineV.setVisibility(View.VISIBLE);
        String str = LocalManageUtil.getLanguage(UserConfigManage.getInstance().getCurrentAppLanguage()).getTitle();
        viewBinding.setLanguageIl.sllLlRlRightContentTv.setText(str);
        viewBinding.setTemperatureUnitIl.sllLlRlRightContentTv.setVisibility(View.VISIBLE);

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

@@ -112,10 +112,7 @@

    private void initView() {
        viewBinding.toolbarTopRl.topTitleTv.setText(R.string.set_temperature_unit);
        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));
        LinearLayoutManager linearLayout = new LinearLayoutManager(_mActivity);
        languageAdapter = new LanguageAdapter(this.mList, _mActivity);
        viewBinding.languageRc.setLayoutManager(linearLayout);

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

@@ -198,10 +198,7 @@

    private void initView() {
        viewBinding.toolbarTopRl.topTitleTv.setText(R.string.set_language_choice);
        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));
        LinearLayoutManager linearLayout = new LinearLayoutManager(_mActivity);
        languageAdapter = new LanguageAdapter(this.list, _mActivity);
        viewBinding.languageRc.setLayoutManager(linearLayout);

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

New file
@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
    <solid android:color="#FF555859" />
    <corners android:radius="@dimen/dp_13" />
</shape>

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

New file
@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
    <solid android:color="#FF555859" />
    <corners android:radius="23.5dp" />
</shape>

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

New file
@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
    <solid android:color="@color/text_00000000"/>
    <corners android:radius="23.5dp"/>
    <stroke android:width="@dimen/dp_1" android:color="#FF5C5F60"/>
</shape>

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

New file
@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<solid android:color="@color/text_00000000"/>
    <corners android:radius="@dimen/dp_13"/>
    <stroke android:width="@dimen/dp_1" android:color="#FF5C5F60"/>
</shape>

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

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

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

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

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

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

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

New file
@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
    <corners android:radius="@dimen/dp_8" />
    <solid android:color="@color/text_FF555859" />
</shape>

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

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

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

 app/src/main/res/layout/activity_account_and_security.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.AccountAndSecurityActivity">

    <include

 app/src/main/res/layout/activity_bpersonal_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.BPersonalDataActivity">

    <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_language_selection.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.languageSelectionActivity">
    <include
        android:id="@+id/toolbar_top_rl"
@@ -18,7 +18,7 @@
        android:id="@+id/language_rc"
        android:layout_width="match_parent"
        android:layout_height="@dimen/dp_0"
        android:layout_marginTop="@dimen/dp_12"
        android:layout_marginTop="@dimen/dp_10"
        app:layout_constraintBottom_toBottomOf="parent"
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintStart_toStartOf="parent"

 app/src/main/res/layout/activity_me_change_password.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.MeChangePasswordActivity">

    <include
@@ -37,27 +37,36 @@
        android:id="@+id/me_psw_error_tv"
        android:layout_width="wrap_content"
        android:layout_height="@dimen/dp_20"
        android:layout_marginTop="@dimen/dp_30"
        android:layout_marginTop="@dimen/dp_8"
        android:layout_marginEnd="@dimen/dp_20"
        android:text="@string/home_login_least6"
        android:textColor="@color/text_565758"
        android:textColor="@color/text_66FFFFFF"
        android:textSize="@dimen/text_14"
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintTop_toBottomOf="@+id/me_psw_ll" />

    <ImageView
        android:id="@+id/tip"
        android:layout_width="@dimen/dp_16"
        android:layout_height="@dimen/dp_16"
        android:src="@drawable/tip"
        app:layout_constraintBottom_toBottomOf="@+id/me_psw_error_tv"
        app:layout_constraintEnd_toStartOf="@+id/me_psw_error_tv"
        app:layout_constraintTop_toTopOf="@+id/me_psw_error_tv" />

    <TextView
        android:id="@+id/home_affirm_tv"
        android:layout_width="0dp"
        android:layout_height="52dp"
        android:layout_marginTop="@dimen/dp_100"
        android:layout_marginStart="@dimen/dp_20"
        android:layout_marginTop="@dimen/dp_100"
        android:layout_marginEnd="@dimen/dp_20"
        android:background="@drawable/yesandnocheck"
        android:background="@drawable/bj_ff555859"
        android:enabled="false"
        android:gravity="center"
        android:text="@string/home_login_affirm"
        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/me_psw_ll" />

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

@@ -132,7 +132,7 @@
        android:id="@+id/message_info_work_out"
        android:layout_width="match_parent"
        android:layout_height="82dp"
        android:background="@color/ffffff"
        android:background="@color/text_FF333738"
        android:gravity="center"
        android:orientation="horizontal"
        android:paddingStart="@dimen/dp_20"
@@ -146,11 +146,11 @@
            android:id="@+id/message_info_back_tv"
            android:layout_width="157.5dp"
            android:layout_height="@dimen/dp_52"
            android:background="@drawable/fillet_line_00000000"
            android:background="@drawable/bj_ff555859_no"
            android:gravity="center"
            android:text="@string/message_alarm_details_back"
            android:textColor="@color/text_FF245EC3"
            android:textSize="@dimen/text_18" />
            android:textColor="@color/text_E6FFFFFF"
            android:textSize="@dimen/text_14" />

        <View
            android:layout_width="@dimen/dp_20"
@@ -160,11 +160,11 @@
            android:id="@+id/message_info_solve_tv"
            android:layout_width="157.5dp"
            android:layout_height="@dimen/dp_52"
            android:background="@drawable/checked"
            android:background="@drawable/bj_ff555859"
            android:gravity="center"
            android:text="@string/message_alarm_details_resolved"
            android:textColor="@color/text_FFFFFFFF"
            android:textSize="@dimen/text_18" />
            android:textColor="@color/text_E6FFFFFF"
            android:textSize="@dimen/text_14" />
    </LinearLayout>



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

@@ -4,43 +4,121 @@
    xmlns:tools="http://schemas.android.com/tools"
    android:layout_width="match_parent"
    android:layout_height="match_parent"
    android:background="@color/text_FFECECEC"
    android:background="@drawable/bj"
    tools:context=".ui.me.QrCodeMainActivity">

    <include
        android:id="@+id/toolbar_top_qr_code_rl"
        layout="@layout/toolbar_top_view_44" />


    <ImageView
        android:id="@+id/qr_code_iv"
        android:layout_width="229dp"
        android:layout_height="229dp"
        android:layout_marginStart="38.5dp"
        android:layout_marginTop="65.5dp"
        android:layout_marginEnd="38.5dp"
    <RelativeLayout
        android:id="@+id/top_bar_view"
        android:layout_width="match_parent"
        android:layout_height="@dimen/dp_54"
        android:layout_marginTop="@dimen/dp_44"
        android:orientation="horizontal"
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintStart_toStartOf="parent"
        app:layout_constraintTop_toBottomOf="@+id/toolbar_top_qr_code_rl" />
        app:layout_constraintTop_toTopOf="parent">

        <RelativeLayout
            android:id="@+id/top_content_view"
            android:layout_width="match_parent"
            android:layout_height="@dimen/dp_44"
            android:layout_marginTop="@dimen/dp_10"
            android:orientation="horizontal">
            <!--1.返回按钮 增大点击区域-->
            <LinearLayout
                android:id="@+id/top_back_ll"
                android:layout_width="@dimen/dp_56"
                android:layout_height="match_parent"
                android:gravity="center_vertical"
                android:orientation="horizontal">

                <ImageView
                    android:id="@+id/top_left_iv"
                    android:layout_width="@dimen/dp_30"
                    android:layout_height="@dimen/dp_30"
                    android:layout_gravity="center"
                    android:layout_marginStart="@dimen/dp_16"
                    android:scaleType="centerInside"
                    android:src="@drawable/back" />
            </LinearLayout>

            <!--2.标题文本-->
            <TextView
                android:id="@+id/top_title_tv"
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
                android:layout_centerInParent="true"
                android:layout_marginLeft="@dimen/dp_60"
                android:layout_marginRight="@dimen/dp_60"
                android:gravity="center"
                android:maxLines="1"
                android:text=""
                android:textColor="@color/text_E6FFFFFF"
                android:textSize="@dimen/text_18" />

            <!--3.更多按钮 默认隐藏-->
            <LinearLayout
                android:id="@+id/top_more_btn"
                android:layout_width="wrap_content"
                android:layout_height="match_parent"
                android:layout_alignParentEnd="true"
                android:gravity="center_vertical"
                android:orientation="horizontal"
                android:src="@drawable/add"
                android:visibility="gone">

                <ImageView
                    android:id="@+id/top_more_iv"
                    android:layout_width="@dimen/dp_28"
                    android:layout_height="@dimen/dp_28"
                    android:layout_marginStart="20dp"
                    android:layout_marginEnd="20dp"
                    android:adjustViewBounds="true"
                    android:scaleType="centerInside" />

            </LinearLayout>

        </RelativeLayout>
    </RelativeLayout>


    <RelativeLayout
        android:id="@+id/qr_code_box"
        android:layout_width="180dp"
        android:layout_height="180dp"
        android:layout_marginStart="38.5dp"
        android:layout_marginTop="35.5dp"
        android:layout_marginEnd="38.5dp"
        android:background="@drawable/code_box"
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintStart_toStartOf="parent"
        app:layout_constraintTop_toBottomOf="@+id/top_bar_view">

        <ImageView
            android:id="@+id/qr_code_iv"
            android:layout_width="168dp"
            android:layout_height="168dp"
            android:layout_centerInParent="true" />
    </RelativeLayout>


    <TextView
        android:id="@+id/user_name_tv"
        android:layout_width="wrap_content"
        android:layout_height="@dimen/dp_20"
        android:layout_marginTop="@dimen/dp_16"
        android:textColor="@color/text_030D1C"
        android:textSize="@dimen/text_14"
        android:textColor="@color/text_E6FFFFFF"
        android:textSize="@dimen/text_18"
        android:visibility="gone"
        app:layout_constraintEnd_toEndOf="@+id/qr_code_iv"
        app:layout_constraintStart_toStartOf="@+id/qr_code_iv"
        app:layout_constraintTop_toBottomOf="@+id/qr_code_iv" />
        app:layout_constraintEnd_toEndOf="@+id/qr_code_box"
        app:layout_constraintStart_toStartOf="@+id/qr_code_box"
        app:layout_constraintTop_toBottomOf="@+id/qr_code_box" />

    <TextView
        android:id="@+id/user_account_tv"
        android:layout_width="wrap_content"
        android:layout_height="@dimen/dp_20"
        android:layout_marginTop="@dimen/dp_16"
        android:textColor="@color/text_030D1C"
        android:textColor="@color/text_66FFFFFF"
        android:textSize="@dimen/text_14"
        android:visibility="gone"
        app:layout_constraintEnd_toEndOf="@+id/user_name_tv"
@@ -52,11 +130,11 @@
        android:layout_width="158dp"
        android:layout_height="@dimen/dp_52"
        android:layout_marginTop="@dimen/dp_16"
        android:background="@drawable/selected_8_38c494"
        android:background="@drawable/selected_8_ff555859"
        android:gravity="center"
        android:text="@string/save_to_album"
        android:textColor="@color/text_FFFFFFFF"
        android:textSize="@dimen/text_18"
        android:textColor="@color/text_66FFFFFF"
        android:textSize="@dimen/text_14"
        app:layout_constraintEnd_toEndOf="@+id/user_name_tv"
        app:layout_constraintStart_toStartOf="@+id/user_name_tv"
        app:layout_constraintTop_toBottomOf="@+id/user_account_tv" />

 app/src/main/res/layout/activity_set.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.SetActivity">

    <include
@@ -26,7 +26,7 @@
            android:id="@+id/sll_ll"
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
            android:background="@color/text_FFFFFFFF"
            android:background="@color/text_FF333738"
            android:orientation="vertical">

            <include
@@ -51,10 +51,10 @@
        android:layout_marginStart="@dimen/dp_20"
        android:layout_marginEnd="@dimen/dp_20"
        android:layout_marginBottom="@dimen/dp_55"
        android:background="@drawable/backgruond_ff6b6b"
        android:background="@drawable/bj_ff555859"
        android:gravity="center"
        android:text="@string/set_logout"
        android:textColor="@color/text_FFFFFFFF"
        android:textColor="@color/text_E6FFFFFF"
        android:textSize="@dimen/text_18"
        app:layout_constraintBottom_toBottomOf="parent"
        app:layout_constraintEnd_toEndOf="parent"

 app/src/main/res/layout/activity_temperature_unit.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.TemperatureUnitActivity">

    <include

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

@@ -6,13 +6,14 @@

    <androidx.constraintlayout.widget.ConstraintLayout
        android:id="@+id/loading_confirmation_cl"
        android:layout_width="match_parent"
        android:layout_width="0dp"
        android:layout_height="wrap_content"
        android:layout_marginStart="@dimen/dp_48"
        android:layout_marginTop="@dimen/dp_20"
        android:layout_marginEnd="@dimen/dp_48"
        android:layout_marginBottom="@dimen/dp_20"
        android:background="@drawable/loading_confirmation_bj"
        android:paddingBottom="@dimen/dp_24"
        android:background="@drawable/bj_ff333738"
        app:layout_constraintBottom_toBottomOf="parent"
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintStart_toStartOf="parent"
@@ -25,8 +26,8 @@
            android:layout_marginStart="@dimen/dp_20"
            android:layout_marginTop="@dimen/dp_25"
            android:layout_marginEnd="@dimen/dp_20"
            android:textColor="@color/text_030D1C"
            android:textSize="@dimen/text_18"
            android:textColor="@color/text_E6FFFFFF"
            android:textSize="@dimen/text_14"
            app:layout_constraintEnd_toEndOf="parent"
            app:layout_constraintStart_toStartOf="parent"
            app:layout_constraintTop_toTopOf="parent" />
@@ -38,12 +39,12 @@
            android:layout_marginStart="@dimen/dp_20"
            android:layout_marginTop="@dimen/dp_43"
            android:layout_marginEnd="@dimen/dp_20"
            android:layout_marginBottom="@dimen/dp_34"
            android:layout_marginBottom="@dimen/dp_25"
            android:gravity="center"
            android:singleLine="false"
            android:tag="click"
            android:textColor="@color/text_222222"
            android:textSize="@dimen/text_18"
            android:textColor="@color/text_66FFFFFF"
            android:textSize="@dimen/text_14"
            app:layout_constraintBottom_toTopOf="@+id/dialog_confirm_bottom_line_ly"
            app:layout_constraintEnd_toEndOf="parent"
            app:layout_constraintStart_toStartOf="parent"
@@ -55,7 +56,9 @@
        <LinearLayout
            android:id="@+id/dialog_confirm_bottom_line_ly"
            android:layout_width="0dp"
            android:layout_height="@dimen/dp_68"
            android:layout_height="@dimen/dp_41"
            android:layout_marginStart="@dimen/dp_16"
            android:layout_marginEnd="@dimen/dp_16"
            android:orientation="horizontal"
            app:layout_constraintBottom_toBottomOf="parent"
            app:layout_constraintEnd_toEndOf="parent"
@@ -67,6 +70,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
@@ -74,23 +78,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
@@ -98,8 +101,8 @@
                    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>


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

@@ -15,12 +15,12 @@
        <TextView
            android:id="@+id/sll_ll_rl_name_tv"
            android:layout_width="wrap_content"
            android:layout_height="@dimen/dp_21"
            android:layout_height="wrap_content"
            android:layout_centerVertical="true"
            android:layout_marginStart="@dimen/dp_16"
            android:text="@string/set_nickname"
            android:textColor="@color/text_030D1C"
            android:textSize="@dimen/text_15"
            android:textColor="@color/text_E6FFFFFF"
            android:textSize="@dimen/text_14"

            />

@@ -52,10 +52,10 @@
            <TextView
                android:id="@+id/sll_ll_rl_right_content_tv"
                android:layout_width="wrap_content"
                android:layout_height="@dimen/dp_21"
                android:layout_height="wrap_content"
                android:gravity="end"
                android:textColor="@color/text_7C8590"
                android:textSize="@dimen/text_15"
                android:textColor="@color/text_66FFFFFF"
                android:textSize="@dimen/text_14"
                android:visibility="gone" />
        </LinearLayout>

@@ -89,7 +89,7 @@
            android:layout_width="match_parent"
            android:layout_height="0.5dp"
            android:layout_alignParentBottom="true"
            android:background="@color/text_E1E1E1"
            android:background="@color/text_1AFFFFFF"
            android:visibility="gone"

            />

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

@@ -2,52 +2,40 @@
<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="71dp"
    android:background="@color/text_FFFFFFFF">
    android:layout_height="57dp"
    android:background="@color/text_FF333738">

    <androidx.constraintlayout.widget.ConstraintLayout
    <TextView
        android:id="@+id/item_lift_name_tv"
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
        android:layout_marginStart="@dimen/dp_16"
        android:textColor="@color/text_E6FFFFFF"
        android:textSize="@dimen/text_14"
        app:layout_constraintBottom_toBottomOf="parent"
        app:layout_constraintStart_toStartOf="parent"
        app:layout_constraintTop_toTopOf="parent" />

    <ImageView
        android:id="@+id/item_right_icon_iv"
        android:layout_width="@dimen/dp_39"
        android:layout_height="@dimen/dp_39"
        android:layout_marginEnd="@dimen/dp_16"
        app:layout_constraintBottom_toBottomOf="parent"
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintTop_toTopOf="parent" />

    <View
        android:id="@+id/item_bottom_line_v"
        android:layout_width="match_parent"
        android:layout_height="71dp"
        android:layout_height="0.5dp"
        android:layout_marginBottom="0.5dp"
        android:background="@color/text_1AFFFFFF"
        app:layout_constraintBottom_toBottomOf="parent"
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintStart_toStartOf="parent"
        app:layout_constraintTop_toTopOf="parent">

        <TextView
            android:id="@+id/item_lift_name_tv"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            android:layout_marginStart="@dimen/dp_16"
            android:textSize="@dimen/text_16"
            app:layout_constraintBottom_toBottomOf="parent"
            app:layout_constraintStart_toStartOf="parent"
            app:layout_constraintTop_toTopOf="parent" />

        <ImageView
            android:id="@+id/item_right_icon_iv"
            android:layout_width="@dimen/dp_44"
            android:layout_height="@dimen/dp_44"
            android:layout_marginEnd="@dimen/dp_21"
            android:textSize="@dimen/text_16"
            app:layout_constraintBottom_toBottomOf="parent"
            app:layout_constraintEnd_toEndOf="parent"
            app:layout_constraintTop_toTopOf="parent" />

        <View
            android:id="@+id/item_bottom_line_v"
            android:layout_width="match_parent"
            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"
            app:layout_constraintBottom_toBottomOf="parent"
            app:layout_constraintEnd_toEndOf="parent"
            app:layout_constraintStart_toStartOf="parent"

            />


    </androidx.constraintlayout.widget.ConstraintLayout>
        />


</androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -18,7 +18,7 @@
            android:layout_height="@dimen/dp_20"
            android:layout_marginStart="@dimen/dp_20"
            android:layout_marginTop="@dimen/dp_21"
            android:textColor="@color/text_65000000"
            android:textColor="@color/text_E6FFFFFF"
            android:textSize="@dimen/text_14"
            />

@@ -46,9 +46,9 @@
                android:inputType="textPassword"
                android:lines="1"
                android:maxLines="1"
                android:textColor="@color/text_E6000000"
                android:textColorHint="@color/text_66000000"
                android:textSize="@dimen/text_16" />
                android:textColor="@color/text_E6FFFFFF"
                android:textColorHint="@color/text_66FFFFFF"
                android:textSize="@dimen/text_14" />

            <ImageView
                android:id="@+id/me_psw_hide_iv"

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

@@ -6,10 +6,10 @@
    android:layout_height="match_parent">

    <RelativeLayout
        android:background="@color/text_FF333738"
        android:id="@+id/sll_ll_name_rl"
        android:layout_width="match_parent"
        android:layout_height="@dimen/dp_57"
        android:background="@color/text_FFFFFFFF"
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintStart_toStartOf="parent"
        app:layout_constraintTop_toTopOf="parent">
@@ -21,7 +21,7 @@
            android:layout_centerVertical="true"
            android:layout_marginStart="@dimen/dp_16"
            android:text="--"
            android:textColor="@color/text_E6000000"
            android:textColor="@color/text_E6FFFFFF"
            android:textSize="@dimen/text_15"

            />
@@ -58,7 +58,7 @@
            android:layout_centerVertical="true"
            android:layout_marginEnd="@dimen/dp_9"
            android:layout_toStartOf="@+id/sll_ll_rl_right_icon_ll"
            android:textColor="@color/text_66000000"
            android:textColor="@color/text_66FFFFFF"
            android:textSize="@dimen/text_15"
            android:visibility="gone" />
        <!--底部的线,默认隐藏-->
@@ -67,7 +67,7 @@
            android:layout_width="match_parent"
            android:layout_height="0.5dp"
            android:layout_alignParentBottom="true"
            android:background="@color/text_E1E1E1"
            android:background="@color/text_1AFFFFFF"
            android:visibility="gone"

            />

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

@@ -4,6 +4,7 @@
    android:layout_width="match_parent"
    android:layout_height="@dimen/dp_54"
    android:orientation="horizontal"
    android:background="@color/text_FF161616"
    >

    <RelativeLayout
@@ -22,8 +23,9 @@

            <ImageView
                android:id="@+id/top_left_iv"
                android:layout_width="@dimen/dp_24"
                android:layout_height="@dimen/dp_24"
                android:layout_width="@dimen/dp_30"
                android:layout_height="@dimen/dp_30"
                android:src="@drawable/back"
                android:layout_gravity="center"
                android:layout_marginStart="@dimen/dp_16"
                android:scaleType="centerInside" />
@@ -40,7 +42,7 @@
            android:gravity="center"
            android:maxLines="1"
            android:text=""
            android:textColor="@color/text_FF000000"
            android:textColor="@color/text_E6FFFFFF"
            android:textSize="@dimen/text_18" />

        <!--3.更多按钮 默认隐藏-->