2024年12月23日18:14:59

wjc

2024-12-23 cb79815beaa49dd657e806539d7fe2d755aad40a

2024年12月23日18:14:59

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

@@ -29,6 +29,7 @@
    @Override
    public void onBindView(Bundle savedInstanceState) {
       setStatusBarTranslucent();
        getWindow().setNavigationBarColor(getColor(R.color.text_FF000000));
        //初始化
        initView();
        //初始化界面监听器

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

@@ -49,7 +49,7 @@
    @Override
    public void onBindView(Bundle savedInstanceState) {
        setStatusBarTranslucent();
        getWindow().setNavigationBarColor(getColor(R.color.text_00000000));
        getWindow().setNavigationBarColor(getColor(R.color.text_FF000000));
        //初始化
        initView();
        //初始化界面监听器

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

@@ -28,6 +28,7 @@
    @Override
    public void onBindView(Bundle savedInstanceState) {
        setStatusBarTranslucent();
        getWindow().setNavigationBarColor(getColor(R.color.text_FF000000));
        //初始化
        initView();
        //初始化界面监听器

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

@@ -34,6 +34,7 @@
    @Override
    public void onBindView(Bundle savedInstanceState) {
        setStatusBarTranslucent();
        getWindow().setNavigationBarColor(getColor(R.color.text_FF000000));
        //初始化
        initView();
        //初始化界面监听器

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

@@ -37,6 +37,7 @@
    @Override
    public void onBindView(Bundle savedInstanceState) {
        setStatusBarTranslucent();
        getWindow().setNavigationBarColor(getColor(R.color.text_FF000000));
        //初始化
        initView();
        //初始化界面监听器

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

@@ -61,6 +61,7 @@
    @Override
    public void onBindView(Bundle savedInstanceState) {
        setStatusBarTranslucent();
        getWindow().setNavigationBarColor(getColor(R.color.text_FF000000));
        mMemberHeadIconUrl = UserConfigManage.getInstance().getUserImageUrl();
        //初始化
        initView();

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

@@ -32,6 +32,7 @@
    @Override
    public void onBindView(Bundle savedInstanceState) {
        setStatusBarTranslucent();
        getWindow().setNavigationBarColor(getColor(R.color.text_FF000000));
        //初始化
        initView();
        //初始化界面监听器

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

@@ -39,6 +39,7 @@
    @Override
    public void onBindView(Bundle savedInstanceState) {
       setStatusBarTranslucent();
        getWindow().setNavigationBarColor(getColor(R.color.text_FF000000));
        //初始化
        initView();
        //初始化界面监听器

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

@@ -34,6 +34,7 @@
    @Override
    public void onBindView(Bundle savedInstanceState) {
        setStatusBarTranslucent();
        getWindow().setNavigationBarColor(getColor(R.color.text_FF000000));
        //初始化
        initView();
        //初始化界面监听器

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

@@ -42,6 +42,7 @@
    @Override
    public void onBindView(Bundle savedInstanceState) {
        setStatusBarTranslucent();
        getWindow().setNavigationBarColor(getColor(R.color.text_FF000000));
        readData();
        //初始化
        initView();

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

@@ -37,6 +37,7 @@
    @Override
    public void onBindView(Bundle savedInstanceState) {
        setStatusBarTranslucent();
        getWindow().setNavigationBarColor(getColor(R.color.text_FF000000));
        this.typeIntValue = getIntent().getIntExtra("type", 0);
        //初始化
        initView();
@@ -57,7 +58,7 @@
    private void initView() {
        viewBinding.contentView.getSettings().setJavaScriptEnabled(true);
        //xml里面设置背景无效
        viewBinding.contentView.setBackgroundColor(getColor(R.color.text_FF161616));
        viewBinding.contentView.setBackgroundColor(getColor(R.color.text_FF000000));
        if (this.typeIntValue == 0) {
            viewBinding.toolbarTopRl.topTitleTv.setText(R.string.app_service_agreement);
        } else {
@@ -68,20 +69,20 @@
        if (UserConfigManage.getInstance().getCurrentAppLanguage().equals(LocalManageUtil.zh)) {
            //中文
            if (this.typeIntValue == 0) {
                //用户协议
                viewBinding.contentView.loadUrl("https://nearest.hdlcontrol.com/common-h5/#/pages/greenEnergyAgreement/userAgreement");
                //用户协议 https://nearest.hdlcontrol.com
                viewBinding.contentView.loadUrl("https://common.hdlcontrol.com/common-h5/#/pages/greenEnergyAgreement/userAgreement");
            } else {
                //隐私协议
                viewBinding.contentView.loadUrl("https://nearest.hdlcontrol.com/common-h5/#/pages/greenEnergyAgreement/privacyAgreement");
                viewBinding.contentView.loadUrl("https://common.hdlcontrol.com/common-h5/#/pages/greenEnergyAgreement/privacyAgreement");
            }
        } else {
            //英文
            if (this.typeIntValue == 0) {
                //用户协议
                viewBinding.contentView.loadUrl("https://nearest.hdlcontrol.com/common-h5/#/pages/greenEnergyAgreement/userAgreementEn");
                viewBinding.contentView.loadUrl("https://common.hdlcontrol.com/common-h5/#/pages/greenEnergyAgreement/userAgreementEn");
            } else {
                //隐私协议
                viewBinding.contentView.loadUrl("https://nearest.hdlcontrol.com/common-h5/#/pages/greenEnergyAgreement/privacyAgreementEn");
                viewBinding.contentView.loadUrl("https://common.hdlcontrol.com/common-h5/#/pages/greenEnergyAgreement/privacyAgreementEn");
            }
        }


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

@@ -45,6 +45,7 @@
    @Override
    public void onBindView(Bundle savedInstanceState) {
        setStatusBarTranslucent();
        getWindow().setNavigationBarColor(getColor(R.color.text_FF000000));
        readData();
        //初始化
        initView();

 app/src/main/java/com/hdl/photovoltaic/ui/message/SearchMessageActivity.java

@@ -66,6 +66,7 @@
    @Override
    public void onBindView(Bundle savedInstanceState) {
        setStatusBarTranslucent();
        getWindow().setNavigationBarColor(getColor(R.color.text_FF000000));
        mMessageStateType = getIntent().getStringExtra("MessageStateType");
        //历史记录文件夹创建
        HdlFileLogic.getInstance().createFileDir(HdlFileLogic.getInstance().getCurrentUserRootPath());

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

@@ -88,7 +88,7 @@
    @Override
    public void onBindView(Bundle savedInstanceState) {
        setStatusBarTranslucent();
        getWindow().setNavigationBarColor(getColor(R.color.text_FF333738));
        getWindow().setNavigationBarColor(getColor(R.color.text_FF1C1C1E));
        //初始化数据
        initData();
        //初始化

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

@@ -59,7 +59,7 @@
    @Override
    public void onBindView(Bundle savedInstanceState) {
        setStatusBarTranslucent();
        getWindow().setNavigationBarColor(getColor(R.color.text_FF333738));
        getWindow().setNavigationBarColor(getColor(R.color.text_FF000000));
        //初始化数据
        initData();
        //初始化

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

@@ -42,6 +42,7 @@
    @Override
    public void onBindView(Bundle savedInstanceState) {
        setStatusBarTranslucent();
        getWindow().setNavigationBarColor(getColor(R.color.text_FF000000));
        //初始化数据
        initData();
        //初始化

 app/src/main/java/com/hdl/photovoltaic/ui/powerstation/DeviceSearchActivity.java

@@ -74,6 +74,7 @@
    @Override
    public void onBindView(Bundle savedInstanceState) {
        setStatusBarTranslucent();
        getWindow().setNavigationBarColor(getColor(R.color.text_FF000000));
        //历史记录文件夹创建
        HdlFileLogic.getInstance().createFileDir(HdlFileLogic.getInstance().getCurrentUserRootPath());
        //初始化数据

 app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseSearchActivity.java

@@ -68,6 +68,7 @@
    @Override
    public void onBindView(Bundle savedInstanceState) {
        setStatusBarTranslucent();
        getWindow().setNavigationBarColor(getColor(R.color.text_FF000000));
        //历史记录文件夹创建
        HdlFileLogic.getInstance().createFileDir(HdlFileLogic.getInstance().getCurrentUserRootPath());
        //初始化数据

 app/src/main/res/drawable/bj_ccffff_13.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_13" />
    <solid android:color="#20FFFFFF" />
    <solid android:color="#10FFFFFF" />
</shape>

 app/src/main/res/drawable/bj_ff39383d_24.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="@color/text_FF39383D" />
    <corners android:radius="24dp" />
</shape>

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

File was deleted

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

File was deleted

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

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

</shape>

 app/src/main/res/drawable/bj_un_ff39383d_24.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="24dp"/>
    <stroke android:width="@dimen/dp_1" android:color="@color/text_FF39383D"/>
</shape>

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

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

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

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

</shape>

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

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

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

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

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

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

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

@@ -3,5 +3,5 @@
    <corners android:radius="@dimen/dp_8" />
    <stroke
        android:width="1dp"
        android:color="#FF5C5F60" />
        android:color="@color/text_FF39383D" />
</shape>

 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_8" />
    <stroke android:width="@dimen/dp_1" android:color="#FF5C5F60" />
    <stroke android:width="@dimen/dp_1" android:color="@color/text_FF39383D" />
</shape>

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

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

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

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

 app/src/main/res/drawable/selected_8_ff39383d.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_FF39383D" />
</shape>

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

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

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

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

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

Binary files differ

 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_FF161616"
    android:background="@color/text_FF000000"
    tools:context=".ui.me.AccountAndSecurityActivity">

    <include

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

@@ -4,7 +4,7 @@
    xmlns:tools="http://schemas.android.com/tools"
    android:layout_width="match_parent"
    android:layout_height="match_parent"
    android:background="@drawable/bj"
    android:background="@color/text_FF000000"
    tools:context=".ui.me.AsRegardsActivity">

    <include
@@ -87,7 +87,7 @@
                android:layout_width="match_parent"
                android:layout_height="@dimen/dp_57"
                android:layout_marginTop="@dimen/dp_29"
                android:background="@color/text_FF333738"
                android:background="@color/text_FF1C1C1E"
                app:layout_constraintEnd_toEndOf="parent"
                app:layout_constraintStart_toStartOf="parent"
                app:layout_constraintTop_toBottomOf="@+id/as_regards_download_app_tv">
@@ -142,7 +142,7 @@
                android:id="@+id/service_agreement_rl"
                android:layout_width="match_parent"
                android:layout_height="@dimen/dp_57"
                android:background="@color/text_FF333738"
                android:background="@color/text_FF1C1C1E"
                app:layout_constraintEnd_toEndOf="parent"
                app:layout_constraintStart_toStartOf="parent"
                app:layout_constraintTop_toBottomOf="@+id/as_regards_version_updating_rl">
@@ -185,7 +185,7 @@
                android:id="@+id/privacy_policy_rl"
                android:layout_width="match_parent"
                android:layout_height="@dimen/dp_57"
                android:background="@color/text_FF333738"
                android:background="@color/text_FF1C1C1E"
                app:layout_constraintEnd_toEndOf="parent"
                app:layout_constraintStart_toStartOf="parent"
                app:layout_constraintTop_toBottomOf="@+id/service_agreement_rl">
@@ -229,7 +229,7 @@
                android:id="@+id/contact_us_rl"
                android:layout_width="match_parent"
                android:layout_height="@dimen/dp_57"
                android:background="@color/text_FF333738"
                android:background="@color/text_FF1C1C1E"
                app:layout_constraintEnd_toEndOf="parent"
                app:layout_constraintStart_toStartOf="parent"
                app:layout_constraintTop_toBottomOf="@+id/privacy_policy_rl">

 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_FF161616"
    android:background="@color/text_FF000000"
    tools:context=".ui.me.BindMailActivity">


@@ -181,7 +181,7 @@
        android:layout_marginStart="@dimen/dp_20"
        android:layout_marginTop="50dp"
        android:layout_marginEnd="@dimen/dp_20"
        android:background="@drawable/bj_ff555859"
        android:background="@drawable/bj_ff39383d"
        android:gravity="center"
        android:text="@string/home_login_affirm"
        android:enabled="false"

 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_FF161616"
    android:background="@color/text_FF000000"
    tools:context=".ui.me.BindPhoneActivity">

    <include
@@ -244,7 +244,7 @@
        android:layout_marginStart="@dimen/dp_20"
        android:layout_marginTop="50dp"
        android:layout_marginEnd="@dimen/dp_20"
        android:background="@drawable/bj_ff555859"
        android:background="@drawable/bj_ff39383d"
        android:enabled="false"
        android:gravity="center"
        android:text="@string/home_login_affirm"

 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_FF161616"
    android:background="@color/text_FF000000"
    tools:context=".ui.me.BPersonalDataActivity">

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

 app/src/main/res/layout/activity_contact_us.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_FF161616"
    android:background="@color/text_FF000000"
    tools:context=".ui.me.ContactUsActivity">

    <include
@@ -22,7 +22,7 @@
        android:layout_width="match_parent"
        android:layout_height="@dimen/dp_57"
        android:layout_marginTop="@dimen/dp_10"
        android:background="@color/text_FF333738"
        android:background="@color/text_FF1C1C1E"
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintStart_toStartOf="parent"
        app:layout_constraintTop_toBottomOf="@+id/toolbar_top_rl">
@@ -61,7 +61,7 @@
        android:id="@+id/idemail_address_rl"
        android:layout_width="match_parent"
        android:layout_height="@dimen/dp_57"
        android:background="@color/text_FF333738"
        android:background="@color/text_FF1C1C1E"
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintStart_toStartOf="parent"
        app:layout_constraintTop_toBottomOf="@+id/wechat_id_rl">

 app/src/main/res/layout/activity_device_search.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_FF161616"
    android:background="@color/text_FF000000"
    tools:context=".ui.powerstation.DeviceSearchActivity">

    <!--搜索-->

 app/src/main/res/layout/activity_house_search.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_FF161616"
    android:background="@color/text_FF000000"
    tools:context=".ui.powerstation.HouseSearchActivity">
    <!--搜索-->
    <RelativeLayout

 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_FF161616"
    android:background="@color/text_FF000000"
    tools:context=".ui.me.languageSelectionActivity">

    <include

 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_FF161616"
    android:background="@color/text_FF000000"
    tools:context=".ui.me.MeChangePasswordActivity">

    <include
@@ -67,7 +67,7 @@
        android:layout_marginStart="@dimen/dp_20"
        android:layout_marginTop="@dimen/dp_100"
        android:layout_marginEnd="@dimen/dp_20"
        android:background="@drawable/bj_ff555859"
        android:background="@drawable/bj_ff39383d"
        android:enabled="false"
        android:gravity="center"
        android:text="@string/home_login_affirm"

 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_FF161616"
    android:background="@color/text_FF000000"
    tools:context=".ui.newC.MessageCenterList">

    <include
@@ -161,7 +161,7 @@
        android:id="@+id/message_bottom_cl"
        android:layout_width="match_parent"
        android:layout_height="64dp"
        android:background="@color/text_FF333738"
        android:background="@color/text_FF1C1C1E"
        android:orientation="vertical"
        app:layout_constraintBottom_toBottomOf="parent"
        app:layout_constraintEnd_toEndOf="parent"

 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_FF161616"
    android:background="@color/text_FF000000"
    tools:context=".ui.me.CPersonalDataActivity">

    <include
@@ -22,7 +22,7 @@
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
        android:layout_marginTop="@dimen/dp_12"
        android:background="@color/text_FF333738"
        android:background="@color/text_FF1C1C1E"
        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_FF161616"
    android:background="@color/text_FF000000"
    tools:context=".ui.newC.PowerStationsListEdit">


@@ -40,7 +40,7 @@
        android:id="@+id/add_power_station_rl"
        android:layout_width="match_parent"
        android:layout_height="82dp"
        android:background="@color/text_FF333738"
        android:background="@color/text_00000000"
        android:gravity="center"
        app:layout_constraintBottom_toBottomOf="parent"
        app:layout_constraintEnd_toEndOf="parent"
@@ -50,7 +50,7 @@
            android:id="@+id/add_power_station_tv"
            android:layout_width="335dp"
            android:layout_height="52dp"
            android:background="@drawable/bj_ff555859"
            android:background="@drawable/bj_ff39383d"
            android:gravity="center"
            android:text="@string/add_power_station"
            android:textColor="@color/text_E6FFFFFF"

 app/src/main/res/layout/activity_power_stations_move.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_FF161616"
    android:background="@color/text_FF000000"
    tools:context=".ui.newC.PowerStationsMoveActivity">

    <include

 app/src/main/res/layout/activity_qr_code_main.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_FF161616"
    android:background="@color/text_FF000000"
    tools:context=".ui.me.QrCodeMainActivity">

<!--    <androidx.constraintlayout.widget.ConstraintLayout-->
@@ -76,7 +76,7 @@
        android:layout_width="158dp"
        android:layout_height="@dimen/dp_52"
        android:layout_marginTop="@dimen/dp_50"
        android:background="@drawable/selected_8_ff555859"
        android:background="@drawable/selected_8_ff39383d"
        android:gravity="center"
        android:text="@string/save_to_album"
        android:textColor="@color/text_E6FFFFFF"

 app/src/main/res/layout/activity_search_messge.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_FF161616"
    android:background="@color/text_FF000000"
    tools:context=".ui.message.SearchMessageActivity">
    <!--搜索-->
    <RelativeLayout

 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_FF161616"
    android:background="@color/text_FF000000"
    tools:context=".ui.me.TemperatureUnitActivity">

    <include

 app/src/main/res/layout/activity_web.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_FF161616"
    android:background="@color/text_FF000000"
    tools:context=".ui.me.WebActivity">

    <include
@@ -21,7 +21,7 @@
        android:id="@+id/content_view"
        android:layout_width="0dp"
        android:layout_height="0dp"
        android:background="@color/text_FF161616"
        android:background="@color/text_FF000000"
        app:layout_constraintBottom_toBottomOf="parent"
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintStart_toStartOf="parent"

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

@@ -12,7 +12,7 @@
        android:layout_marginTop="@dimen/dp_20"
        android:layout_marginEnd="@dimen/dp_48"
        android:layout_marginBottom="@dimen/dp_20"
        android:background="@drawable/bj_ff1c1c1e"
        android:background="@drawable/dalog_bj_ff222222"
        app:layout_constraintBottom_toBottomOf="parent"
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintStart_toStartOf="parent"
@@ -68,7 +68,7 @@
                android:layout_width="0dp"
                android:layout_height="match_parent"
                android:layout_weight="1"
                android:background="@drawable/bj_ff555859_no">
                android:background="@drawable/bj_un_ff39383d_24">

                <TextView
                    android:id="@+id/dialog_cancel_tv"
@@ -91,7 +91,7 @@
                android:layout_width="0dp"
                android:layout_height="match_parent"
                android:layout_weight="1"
                android:background="@drawable/bj_ff555859">
                android:background="@drawable/bj_ff39383d_24">

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

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

@@ -13,7 +13,7 @@
        android:layout_marginEnd="@dimen/dp_48"
        android:layout_marginBottom="@dimen/dp_20"
        android:paddingBottom="@dimen/dp_24"
        android:background="@drawable/bj_ff1c1c1e"
        android:background="@drawable/dalog_bj_ff222222"
        app:layout_constraintBottom_toBottomOf="parent"
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintStart_toStartOf="parent"
@@ -70,7 +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:background="@drawable/bj_un_ff39383d_24"
                android:gravity="center">

                <TextView
@@ -93,7 +93,7 @@
                android:layout_width="@dimen/dp_0"
                android:layout_height="match_parent"
                android:layout_weight="1"
                android:background="@drawable/bj_ff555859_23"
                android:background="@drawable/bj_ff39383d_24"
                android:gravity="center">

                <TextView

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

@@ -11,7 +11,7 @@
        android:layout_height="225dp"
        android:layout_marginStart="@dimen/dp_48"
        android:layout_marginEnd="@dimen/dp_48"
        android:background="@drawable/bj_ff1c1c1e"
        android:background="@drawable/dalog_bj_ff222222"
        android:paddingBottom="@dimen/dp_24"
        app:layout_constraintBottom_toBottomOf="parent"
        app:layout_constraintEnd_toEndOf="parent"
@@ -99,7 +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:background="@drawable/bj_un_ff39383d_24"
                android:gravity="center">

                <TextView
@@ -122,7 +122,7 @@
                android:layout_width="@dimen/dp_0"
                android:layout_height="match_parent"
                android:layout_weight="1"
                android:background="@drawable/bj_ff555859_23"
                android:background="@drawable/bj_ff39383d_24"
                android:gravity="center">

                <TextView

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

@@ -4,7 +4,7 @@
    android:id="@+id/dialog_parent"
    android:layout_width="wrap_content"
    android:layout_height="wrap_content"
    android:background="@drawable/bj_ff1c1c1e"
    android:background="@drawable/dalog_bj_ff222222"
    app:layout_constraintStart_toStartOf="parent"
    app:layout_constraintTop_toTopOf="parent">


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

@@ -14,7 +14,7 @@
        android:id="@+id/hdl_china_ll"
        android:layout_width="match_parent"
        android:layout_height="@dimen/dp_50"
        android:background="@color/text_FF333738"
        android:background="@color/text_FF222222"
        android:gravity="center"
        android:orientation="horizontal"
        app:layout_constraintEnd_toEndOf="parent"
@@ -46,7 +46,7 @@
        android:id="@+id/hdl_bahrain_ll"
        android:layout_width="match_parent"
        android:layout_height="@dimen/dp_50"
        android:background="@color/text_FF333738"
        android:background="@color/text_FF222222"
        android:gravity="center"
        android:orientation="horizontal"
        app:layout_constraintEnd_toEndOf="parent"
@@ -69,7 +69,7 @@
        android:layout_width="match_parent"
        android:layout_height="@dimen/dp_50"
        android:layout_marginTop="@dimen/dp_20"
        android:background="@color/text_FF333738"
        android:background="@color/text_FF222222"
        android:gravity="center"
        android:orientation="horizontal"
        app:layout_constraintEnd_toEndOf="parent"

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

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

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

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

                <TextView
@@ -112,7 +112,7 @@
                android:layout_width="@dimen/dp_0"
                android:layout_height="match_parent"
                android:layout_weight="1"
                android:background="@drawable/bj_ff555859_23"
                android:background="@drawable/bj_ff39383d_24"
                android:gravity="center">

                <TextView

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

@@ -4,7 +4,7 @@
    android:id="@+id/item_parent_cl"
    android:layout_width="match_parent"
    android:layout_height="@dimen/dp_52"
    android:background="@color/text_FF333738">
    android:background="@color/text_FF1C1C1E">

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

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

@@ -3,7 +3,7 @@
    xmlns:app="http://schemas.android.com/apk/res-auto"
    android:layout_width="match_parent"
    android:layout_height="57dp"
    android:background="@color/text_FF333738">
    android:background="@color/text_FF1C1C1E">

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

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

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

    <RelativeLayout
        android:background="@color/text_FF333738"
        android:background="@color/text_FF1C1C1E"
        android:id="@+id/sll_ll_name_rl"
        android:layout_width="match_parent"
        android:layout_height="@dimen/dp_57"

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

@@ -15,7 +15,7 @@
            android:id="@+id/tv_Camera"
            android:layout_width="match_parent"
            android:layout_height="@dimen/dp_54"
            android:background="@color/text_FF333738"
            android:background="@color/text_FF1C1C1E"
            android:gravity="center"
            android:text="@string/me_personal_data_photograph"
            android:textColor="@color/text_E6FFFFFF"
@@ -30,7 +30,7 @@
            android:id="@+id/tv_Album"
            android:layout_width="match_parent"
            android:layout_height="@dimen/dp_54"
            android:background="@color/text_FF333738"
            android:background="@color/text_FF1C1C1E"
            android:gravity="center"
            android:text="@string/me_personal_data_select_album"
            android:textColor="@color/text_E6FFFFFF"
@@ -44,7 +44,7 @@
            android:id="@+id/tv_Cancel"
            android:layout_width="match_parent"
            android:layout_height="@dimen/dp_54"
            android:background="@color/text_FF333738"
            android:background="@color/text_FF1C1C1E"
            android:gravity="center"
            android:text="@string/loading_cancel"
            android:textColor="@color/text_66FFFFFF"

 app/src/main/res/values-en/strings.xml

@@ -235,7 +235,7 @@
    <string name="alarm_all_grade_warning">warning</string>
    <string name="alarm_all_grade_tip">hint</string>
    <string name="alarm_all_time">All time</string>
    <string name="alarm_all_time_same_day">the day</string>
    <string name="alarm_all_time_same_day">Today</string>
    <string name="alarm_all_time_3">Last 3 Days</string>
    <string name="alarm_all_time_7">Last 7 Days</string>
    <string name="alarm_all_time_30">Last 30 Days</string>

 app/src/main/res/values/colors.xml

@@ -67,5 +67,6 @@
    <color name="text_FF39383D">#FF39383D</color>
    <color name="text_FF8E8E8E">#FF8E8E8E</color>
    <color name="text_FF222222">#FF222222</color>
    <color name="text_FF484848">#FF484848</color>

</resources>

 countrypicker/src/main/res/drawable/search_bj.xml

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
    <corners android:radius="17dp" />
    <solid android:color="#FF333738" />
    <solid android:color="#FF222222" />

</shape>