From cb79815beaa49dd657e806539d7fe2d755aad40a Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期一, 23 十二月 2024 18:15:01 +0800
Subject: [PATCH] 2024年12月23日18:14:59
---
app/src/main/res/drawable/qr_code.png | 0
app/src/main/res/drawable/me_change_psw_bj.xml | 2
app/src/main/java/com/hdl/photovoltaic/ui/powerstation/DeviceSearchActivity.java | 1
app/src/main/res/drawable/tip_succeed.png | 0
app/src/main/res/layout/dialog_agree_onagree.xml | 6
app/src/main/res/drawable/home_page_selected.png | 0
app/src/main/res/layout/activity_power_stations_move.xml | 2
app/src/main/java/com/hdl/photovoltaic/ui/me/BindPhoneActivity.java | 1
app/src/main/res/drawable/bj_un_ff39383d_24.xml | 6 +
app/src/main/res/drawable/language_pull_down.png | 0
app/src/main/res/drawable/unselected.png | 0
app/src/main/res/layout/activity_message_center_list.xml | 4
app/src/main/java/com/hdl/photovoltaic/ui/me/languageSelectionActivity.java | 1
app/src/main/java/com/hdl/photovoltaic/ui/newC/PowerStationsMoveActivity.java | 1
app/src/main/res/drawable/tip_fail.png | 0
app/src/main/res/layout/dialog_type_title_list.xml | 2
app/src/main/res/layout/activity_bind_phone.xml | 4
app/src/main/java/com/hdl/photovoltaic/ui/me/CPersonalDataActivity.java | 1
app/src/main/res/drawable/dialog_flashing_box.xml | 4
app/src/main/res/drawable/hide.png | 0
app/src/main/res/layout/activity_device_search.xml | 2
app/src/main/res/layout/activity_account_and_security.xml | 2
app/src/main/res/drawable/editor_house.png | 0
app/src/main/res/layout/dialog_confirm_cancel.xml | 6
app/src/main/res/layout/activity_as_regards.xml | 10 +-
app/src/main/res/layout/activity_search_messge.xml | 2
app/src/main/res/layout/activity_web.xml | 4
app/src/main/java/com/hdl/photovoltaic/ui/me/ContactUsActivity.java | 1
app/src/main/java/com/hdl/photovoltaic/ui/newC/PowerStationsListEdit.java | 2
app/src/main/res/layout/activity_bpersonal_data.xml | 4
app/src/main/res/drawable/default_image.png | 0
app/src/main/res/layout/view_camera_album.xml | 6
app/src/main/res/drawable/move_c_house.png | 0
app/src/main/res/layout/activity_me_change_password.xml | 4
app/src/main/java/com/hdl/photovoltaic/ui/me/AsRegardsActivity.java | 2
app/src/main/res/drawable/bj_un_ff39383d.xml | 8 ++
app/src/main/java/com/hdl/photovoltaic/ui/me/WebActivity.java | 13 +-
app/src/main/res/values/colors.xml | 1
app/src/main/java/com/hdl/photovoltaic/ui/newC/MessageCenterList.java | 2
app/src/main/res/layout/item_house_line_c.xml | 2
app/src/main/java/com/hdl/photovoltaic/ui/message/SearchMessageActivity.java | 1
app/src/main/res/drawable/l.png | 0
app/src/main/java/com/hdl/photovoltaic/ui/me/MeChangePasswordActivity.java | 1
app/src/main/res/layout/activity_language_selection.xml | 2
app/src/main/res/layout/dialog_confirm_input.xml | 6
app/src/main/java/com/hdl/photovoltaic/ui/me/BPersonalDataActivity.java | 1
app/src/main/res/drawable/spinner.png | 0
app/src/main/res/drawable/selected.png | 0
app/src/main/res/layout/activity_power_stations_list.xml | 6
app/src/main/java/com/hdl/photovoltaic/ui/me/TemperatureUnitActivity.java | 1
app/src/main/res/drawable/clear.png | 0
app/src/main/res/layout/activity_contact_us.xml | 6
app/src/main/res/layout/dialog_static_list.xml | 6
app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseSearchActivity.java | 1
app/src/main/java/com/hdl/photovoltaic/ui/me/SetActivity.java | 1
app/src/main/res/layout/activity_bind_mail.xml | 4
app/src/main/res/layout/activity_house_search.xml | 2
app/src/main/res/layout/dialog_list.xml | 2
app/src/main/res/layout/set_line.xml | 2
app/src/main/res/drawable/selected_8_ff39383d.xml | 5 +
app/src/main/res/layout/dialog_update_confirm_cancel.xml | 4
app/src/main/res/drawable/bj_ccffff_13.xml | 2
/dev/null | 0
app/src/main/res/layout/activity_qr_code_main.xml | 4
app/src/main/res/drawable/history_del.png | 0
app/src/main/res/drawable/select.png | 0
app/src/main/res/layout/activity_temperature_unit.xml | 2
countrypicker/src/main/res/drawable/search_bj.xml | 2
app/src/main/res/values-en/strings.xml | 2
app/src/main/res/drawable/loading_confirmation_edit_bj.xml | 2
app/src/main/res/layout/item_language.xml | 2
app/src/main/java/com/hdl/photovoltaic/ui/me/AccountAndSecurityActivity.java | 1
app/src/main/java/com/hdl/photovoltaic/ui/me/BindMailActivity.java | 1
app/src/main/res/drawable/bj_ff39383d_24.xml | 5 +
app/src/main/res/layout/activity_personal_data.xml | 4
75 files changed, 112 insertions(+), 72 deletions(-)
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/me/AccountAndSecurityActivity.java b/app/src/main/java/com/hdl/photovoltaic/ui/me/AccountAndSecurityActivity.java
index 7702f38..b17834e 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/me/AccountAndSecurityActivity.java
+++ b/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();
//鍒濆鍖栫晫闈㈢洃鍚櫒
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/me/AsRegardsActivity.java b/app/src/main/java/com/hdl/photovoltaic/ui/me/AsRegardsActivity.java
index 7884f75..05583af 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/me/AsRegardsActivity.java
+++ b/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();
//鍒濆鍖栫晫闈㈢洃鍚櫒
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/me/BPersonalDataActivity.java b/app/src/main/java/com/hdl/photovoltaic/ui/me/BPersonalDataActivity.java
index 6f050ee..27842ba 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/me/BPersonalDataActivity.java
+++ b/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();
//鍒濆鍖栫晫闈㈢洃鍚櫒
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/me/BindMailActivity.java b/app/src/main/java/com/hdl/photovoltaic/ui/me/BindMailActivity.java
index 43d08c2..0f90e10 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/me/BindMailActivity.java
+++ b/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();
//鍒濆鍖栫晫闈㈢洃鍚櫒
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/me/BindPhoneActivity.java b/app/src/main/java/com/hdl/photovoltaic/ui/me/BindPhoneActivity.java
index b161c89..a2f736b 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/me/BindPhoneActivity.java
+++ b/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();
//鍒濆鍖栫晫闈㈢洃鍚櫒
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/me/CPersonalDataActivity.java b/app/src/main/java/com/hdl/photovoltaic/ui/me/CPersonalDataActivity.java
index 5ef1a0d..6087317 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/me/CPersonalDataActivity.java
+++ b/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();
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/me/ContactUsActivity.java b/app/src/main/java/com/hdl/photovoltaic/ui/me/ContactUsActivity.java
index 15b7b2a..f79d032 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/me/ContactUsActivity.java
+++ b/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();
//鍒濆鍖栫晫闈㈢洃鍚櫒
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/me/MeChangePasswordActivity.java b/app/src/main/java/com/hdl/photovoltaic/ui/me/MeChangePasswordActivity.java
index 45a5744..88eb1b0 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/me/MeChangePasswordActivity.java
+++ b/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();
//鍒濆鍖栫晫闈㈢洃鍚櫒
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/me/SetActivity.java b/app/src/main/java/com/hdl/photovoltaic/ui/me/SetActivity.java
index 644ccaa..d981c48 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/me/SetActivity.java
+++ b/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();
//鍒濆鍖栫晫闈㈢洃鍚櫒
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/me/TemperatureUnitActivity.java b/app/src/main/java/com/hdl/photovoltaic/ui/me/TemperatureUnitActivity.java
index 0c9f49c..9697ddf 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/me/TemperatureUnitActivity.java
+++ b/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();
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/me/WebActivity.java b/app/src/main/java/com/hdl/photovoltaic/ui/me/WebActivity.java
index 6188e99..82ec784 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/me/WebActivity.java
+++ b/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");
}
}
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/me/languageSelectionActivity.java b/app/src/main/java/com/hdl/photovoltaic/ui/me/languageSelectionActivity.java
index 2f8bee1..0f074a3 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/me/languageSelectionActivity.java
+++ b/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();
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/message/SearchMessageActivity.java b/app/src/main/java/com/hdl/photovoltaic/ui/message/SearchMessageActivity.java
index 6268561..0817798 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/message/SearchMessageActivity.java
+++ b/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());
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/newC/MessageCenterList.java b/app/src/main/java/com/hdl/photovoltaic/ui/newC/MessageCenterList.java
index 124f66a..73ec0cb 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/newC/MessageCenterList.java
+++ b/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();
//鍒濆鍖�
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/newC/PowerStationsListEdit.java b/app/src/main/java/com/hdl/photovoltaic/ui/newC/PowerStationsListEdit.java
index ddf7acf..9548f9a 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/newC/PowerStationsListEdit.java
+++ b/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();
//鍒濆鍖�
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/newC/PowerStationsMoveActivity.java b/app/src/main/java/com/hdl/photovoltaic/ui/newC/PowerStationsMoveActivity.java
index 33cff50..f4c043a 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/newC/PowerStationsMoveActivity.java
+++ b/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();
//鍒濆鍖�
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/powerstation/DeviceSearchActivity.java b/app/src/main/java/com/hdl/photovoltaic/ui/powerstation/DeviceSearchActivity.java
index 2f3bfd8..5c99ae0 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/powerstation/DeviceSearchActivity.java
+++ b/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());
//鍒濆鍖栨暟鎹�
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseSearchActivity.java b/app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseSearchActivity.java
index 819b4f4..e5e58ce 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseSearchActivity.java
+++ b/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());
//鍒濆鍖栨暟鎹�
diff --git a/app/src/main/res/drawable/bj_ccffff_13.xml b/app/src/main/res/drawable/bj_ccffff_13.xml
index 3056fd2..b4ac005 100644
--- a/app/src/main/res/drawable/bj_ccffff_13.xml
+++ b/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>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bj_ff39383d_24.xml b/app/src/main/res/drawable/bj_ff39383d_24.xml
new file mode 100644
index 0000000..83ef247
--- /dev/null
+++ b/app/src/main/res/drawable/bj_ff39383d_24.xml
@@ -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>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bj_ff555859_23.xml b/app/src/main/res/drawable/bj_ff555859_23.xml
deleted file mode 100644
index 3790a64..0000000
--- a/app/src/main/res/drawable/bj_ff555859_23.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?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>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bj_ff555859_23_no.xml b/app/src/main/res/drawable/bj_ff555859_23_no.xml
deleted file mode 100644
index 43bad85..0000000
--- a/app/src/main/res/drawable/bj_ff555859_23_no.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?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>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bj_un_ff39383d.xml b/app/src/main/res/drawable/bj_un_ff39383d.xml
new file mode 100644
index 0000000..14cadad
--- /dev/null
+++ b/app/src/main/res/drawable/bj_un_ff39383d.xml
@@ -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>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bj_un_ff39383d_24.xml b/app/src/main/res/drawable/bj_un_ff39383d_24.xml
new file mode 100644
index 0000000..15b8409
--- /dev/null
+++ b/app/src/main/res/drawable/bj_un_ff39383d_24.xml
@@ -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>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/clear.png b/app/src/main/res/drawable/clear.png
index f2f3434..4e7eec6 100644
--- a/app/src/main/res/drawable/clear.png
+++ b/app/src/main/res/drawable/clear.png
Binary files differ
diff --git a/app/src/main/res/drawable/default_image.png b/app/src/main/res/drawable/default_image.png
index ee42313..2d97d33 100644
--- a/app/src/main/res/drawable/default_image.png
+++ b/app/src/main/res/drawable/default_image.png
Binary files differ
diff --git a/app/src/main/res/drawable/dialog_flashing_box.xml b/app/src/main/res/drawable/dialog_flashing_box.xml
index edb61a3..e1ef056 100644
--- a/app/src/main/res/drawable/dialog_flashing_box.xml
+++ b/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"/>
+ <corners android:radius="@dimen/dp_13" />
+ <solid android:color="@color/text_FF484848" />
</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/editor_house.png b/app/src/main/res/drawable/editor_house.png
index 7c1799f..4379db1 100644
--- a/app/src/main/res/drawable/editor_house.png
+++ b/app/src/main/res/drawable/editor_house.png
Binary files differ
diff --git a/app/src/main/res/drawable/hide.png b/app/src/main/res/drawable/hide.png
index 97219ab..d14e468 100644
--- a/app/src/main/res/drawable/hide.png
+++ b/app/src/main/res/drawable/hide.png
Binary files differ
diff --git a/app/src/main/res/drawable/history_del.png b/app/src/main/res/drawable/history_del.png
index 9e3ae6f..38fd4d9 100644
--- a/app/src/main/res/drawable/history_del.png
+++ b/app/src/main/res/drawable/history_del.png
Binary files differ
diff --git a/app/src/main/res/drawable/home_page_selected.png b/app/src/main/res/drawable/home_page_selected.png
index 10190cb..1b4b7d4 100644
--- a/app/src/main/res/drawable/home_page_selected.png
+++ b/app/src/main/res/drawable/home_page_selected.png
Binary files differ
diff --git a/app/src/main/res/drawable/l.png b/app/src/main/res/drawable/l.png
index 77621c0..445f6ad 100644
--- a/app/src/main/res/drawable/l.png
+++ b/app/src/main/res/drawable/l.png
Binary files differ
diff --git a/app/src/main/res/drawable/language_pull_down.png b/app/src/main/res/drawable/language_pull_down.png
index 855ed62..bda4c8c 100644
--- a/app/src/main/res/drawable/language_pull_down.png
+++ b/app/src/main/res/drawable/language_pull_down.png
Binary files differ
diff --git a/app/src/main/res/drawable/loading_confirmation_edit_bj.xml b/app/src/main/res/drawable/loading_confirmation_edit_bj.xml
index 0442808..b8a6834 100644
--- a/app/src/main/res/drawable/loading_confirmation_edit_bj.xml
+++ b/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>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/me_change_psw_bj.xml b/app/src/main/res/drawable/me_change_psw_bj.xml
index 0fecf39..165cec3 100644
--- a/app/src/main/res/drawable/me_change_psw_bj.xml
+++ b/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>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/move_c_house.png b/app/src/main/res/drawable/move_c_house.png
index 2925995..95a1511 100644
--- a/app/src/main/res/drawable/move_c_house.png
+++ b/app/src/main/res/drawable/move_c_house.png
Binary files differ
diff --git a/app/src/main/res/drawable/qr_code.png b/app/src/main/res/drawable/qr_code.png
index 918c4b6..bb28a59 100644
--- a/app/src/main/res/drawable/qr_code.png
+++ b/app/src/main/res/drawable/qr_code.png
Binary files differ
diff --git a/app/src/main/res/drawable/select.png b/app/src/main/res/drawable/select.png
index 10dc130..0c03289 100644
--- a/app/src/main/res/drawable/select.png
+++ b/app/src/main/res/drawable/select.png
Binary files differ
diff --git a/app/src/main/res/drawable/selected.png b/app/src/main/res/drawable/selected.png
index 19ed7c0..1db8307 100644
--- a/app/src/main/res/drawable/selected.png
+++ b/app/src/main/res/drawable/selected.png
Binary files differ
diff --git a/app/src/main/res/drawable/selected_8_ff39383d.xml b/app/src/main/res/drawable/selected_8_ff39383d.xml
new file mode 100644
index 0000000..532e66a
--- /dev/null
+++ b/app/src/main/res/drawable/selected_8_ff39383d.xml
@@ -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>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/spinner.png b/app/src/main/res/drawable/spinner.png
index 703562d..746d9a1 100644
--- a/app/src/main/res/drawable/spinner.png
+++ b/app/src/main/res/drawable/spinner.png
Binary files differ
diff --git a/app/src/main/res/drawable/tip_fail.png b/app/src/main/res/drawable/tip_fail.png
index 9b8e47e..f66be85 100644
--- a/app/src/main/res/drawable/tip_fail.png
+++ b/app/src/main/res/drawable/tip_fail.png
Binary files differ
diff --git a/app/src/main/res/drawable/tip_succeed.png b/app/src/main/res/drawable/tip_succeed.png
index 81a0f9e..c6e463e 100644
--- a/app/src/main/res/drawable/tip_succeed.png
+++ b/app/src/main/res/drawable/tip_succeed.png
Binary files differ
diff --git a/app/src/main/res/drawable/unselected.png b/app/src/main/res/drawable/unselected.png
index 087fe97..e7819f7 100644
--- a/app/src/main/res/drawable/unselected.png
+++ b/app/src/main/res/drawable/unselected.png
Binary files differ
diff --git a/app/src/main/res/drawable/version_icon.png b/app/src/main/res/drawable/version_icon.png
deleted file mode 100644
index 54426b7..0000000
--- a/app/src/main/res/drawable/version_icon.png
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/layout/activity_account_and_security.xml b/app/src/main/res/layout/activity_account_and_security.xml
index 0394358..c6ad23b 100644
--- a/app/src/main/res/layout/activity_account_and_security.xml
+++ b/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
diff --git a/app/src/main/res/layout/activity_as_regards.xml b/app/src/main/res/layout/activity_as_regards.xml
index 6886434..f295bbf 100644
--- a/app/src/main/res/layout/activity_as_regards.xml
+++ b/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">
diff --git a/app/src/main/res/layout/activity_bind_mail.xml b/app/src/main/res/layout/activity_bind_mail.xml
index ffbb8c6..8339de0 100644
--- a/app/src/main/res/layout/activity_bind_mail.xml
+++ b/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"
diff --git a/app/src/main/res/layout/activity_bind_phone.xml b/app/src/main/res/layout/activity_bind_phone.xml
index ae8bdd9..76345ad 100644
--- a/app/src/main/res/layout/activity_bind_phone.xml
+++ b/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"
diff --git a/app/src/main/res/layout/activity_bpersonal_data.xml b/app/src/main/res/layout/activity_bpersonal_data.xml
index c5590e7..6722326 100644
--- a/app/src/main/res/layout/activity_bpersonal_data.xml
+++ b/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"
diff --git a/app/src/main/res/layout/activity_contact_us.xml b/app/src/main/res/layout/activity_contact_us.xml
index e4d80ff..bf2473c 100644
--- a/app/src/main/res/layout/activity_contact_us.xml
+++ b/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">
diff --git a/app/src/main/res/layout/activity_device_search.xml b/app/src/main/res/layout/activity_device_search.xml
index a44cb64..c05f88f 100644
--- a/app/src/main/res/layout/activity_device_search.xml
+++ b/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">
<!--鎼滅储-->
diff --git a/app/src/main/res/layout/activity_house_search.xml b/app/src/main/res/layout/activity_house_search.xml
index cbe3165..15e039f 100644
--- a/app/src/main/res/layout/activity_house_search.xml
+++ b/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
diff --git a/app/src/main/res/layout/activity_language_selection.xml b/app/src/main/res/layout/activity_language_selection.xml
index 6841f13..7ac3061 100644
--- a/app/src/main/res/layout/activity_language_selection.xml
+++ b/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
diff --git a/app/src/main/res/layout/activity_me_change_password.xml b/app/src/main/res/layout/activity_me_change_password.xml
index bf1c392..05a2361 100644
--- a/app/src/main/res/layout/activity_me_change_password.xml
+++ b/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"
diff --git a/app/src/main/res/layout/activity_message_center_list.xml b/app/src/main/res/layout/activity_message_center_list.xml
index 7e3ed82..9c099f1 100644
--- a/app/src/main/res/layout/activity_message_center_list.xml
+++ b/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"
diff --git a/app/src/main/res/layout/activity_personal_data.xml b/app/src/main/res/layout/activity_personal_data.xml
index 87bcb79..0a07bc8 100644
--- a/app/src/main/res/layout/activity_personal_data.xml
+++ b/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"
diff --git a/app/src/main/res/layout/activity_power_stations_list.xml b/app/src/main/res/layout/activity_power_stations_list.xml
index e608935..61bf887 100644
--- a/app/src/main/res/layout/activity_power_stations_list.xml
+++ b/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"
diff --git a/app/src/main/res/layout/activity_power_stations_move.xml b/app/src/main/res/layout/activity_power_stations_move.xml
index e6ed008..5d9dd50 100644
--- a/app/src/main/res/layout/activity_power_stations_move.xml
+++ b/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
diff --git a/app/src/main/res/layout/activity_qr_code_main.xml b/app/src/main/res/layout/activity_qr_code_main.xml
index a8cd664..53b5e42 100644
--- a/app/src/main/res/layout/activity_qr_code_main.xml
+++ b/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"
diff --git a/app/src/main/res/layout/activity_search_messge.xml b/app/src/main/res/layout/activity_search_messge.xml
index d0aa02a..7cfa3ed 100644
--- a/app/src/main/res/layout/activity_search_messge.xml
+++ b/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
diff --git a/app/src/main/res/layout/activity_temperature_unit.xml b/app/src/main/res/layout/activity_temperature_unit.xml
index a912cda..9cbc5f6 100644
--- a/app/src/main/res/layout/activity_temperature_unit.xml
+++ b/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
diff --git a/app/src/main/res/layout/activity_web.xml b/app/src/main/res/layout/activity_web.xml
index 517a14c..3aa1772 100644
--- a/app/src/main/res/layout/activity_web.xml
+++ b/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"
diff --git a/app/src/main/res/layout/dialog_agree_onagree.xml b/app/src/main/res/layout/dialog_agree_onagree.xml
index 9c78e39..1df2794 100644
--- a/app/src/main/res/layout/dialog_agree_onagree.xml
+++ b/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"
diff --git a/app/src/main/res/layout/dialog_confirm_cancel.xml b/app/src/main/res/layout/dialog_confirm_cancel.xml
index 8347455..d29cfee 100644
--- a/app/src/main/res/layout/dialog_confirm_cancel.xml
+++ b/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
diff --git a/app/src/main/res/layout/dialog_confirm_input.xml b/app/src/main/res/layout/dialog_confirm_input.xml
index fe472fc..3ce6136 100644
--- a/app/src/main/res/layout/dialog_confirm_input.xml
+++ b/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
diff --git a/app/src/main/res/layout/dialog_list.xml b/app/src/main/res/layout/dialog_list.xml
index 5b024ef..e214a36 100644
--- a/app/src/main/res/layout/dialog_list.xml
+++ b/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">
diff --git a/app/src/main/res/layout/dialog_static_list.xml b/app/src/main/res/layout/dialog_static_list.xml
index d8106a6..e827916 100644
--- a/app/src/main/res/layout/dialog_static_list.xml
+++ b/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"
diff --git a/app/src/main/res/layout/dialog_type_title_list.xml b/app/src/main/res/layout/dialog_type_title_list.xml
index 3e6f37e..3b7a909 100644
--- a/app/src/main/res/layout/dialog_type_title_list.xml
+++ b/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"
diff --git a/app/src/main/res/layout/dialog_update_confirm_cancel.xml b/app/src/main/res/layout/dialog_update_confirm_cancel.xml
index 1762dc4..92e8ae7 100644
--- a/app/src/main/res/layout/dialog_update_confirm_cancel.xml
+++ b/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
diff --git a/app/src/main/res/layout/item_house_line_c.xml b/app/src/main/res/layout/item_house_line_c.xml
index 259da00..eae0213 100644
--- a/app/src/main/res/layout/item_house_line_c.xml
+++ b/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"
diff --git a/app/src/main/res/layout/item_language.xml b/app/src/main/res/layout/item_language.xml
index f4223ce..20f2ca0 100644
--- a/app/src/main/res/layout/item_language.xml
+++ b/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"
diff --git a/app/src/main/res/layout/set_line.xml b/app/src/main/res/layout/set_line.xml
index 5d131ca..73e0a28 100644
--- a/app/src/main/res/layout/set_line.xml
+++ b/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"
diff --git a/app/src/main/res/layout/view_camera_album.xml b/app/src/main/res/layout/view_camera_album.xml
index 35d5f6c..52b093e 100644
--- a/app/src/main/res/layout/view_camera_album.xml
+++ b/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"
diff --git a/app/src/main/res/values-en/strings.xml b/app/src/main/res/values-en/strings.xml
index 8d6dd8b..c64dc80 100644
--- a/app/src/main/res/values-en/strings.xml
+++ b/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>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index b2ec9a0..a9e93eb 100644
--- a/app/src/main/res/values/colors.xml
+++ b/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>
\ No newline at end of file
diff --git a/countrypicker/src/main/res/drawable/search_bj.xml b/countrypicker/src/main/res/drawable/search_bj.xml
index 0d5d5c8..167b2ba 100644
--- a/countrypicker/src/main/res/drawable/search_bj.xml
+++ b/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>
\ No newline at end of file
--
Gitblit v1.8.0