From 3f617fbe58fd89a61e2f4013fe80dba673fbd7ae Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期四, 19 九月 2024 14:38:24 +0800
Subject: [PATCH] 2024年09月19日14:38:04
---
app/src/main/res/layout/activity_set.xml | 6
app/src/main/java/com/hdl/photovoltaic/ui/me/QrCodeMainActivity.java | 2
app/src/main/res/layout/activity_me_change_password.xml | 6
app/src/main/java/com/hdl/photovoltaic/ui/me/AsRegardsActivity.java | 12 +-
app/src/main/java/com/hdl/photovoltaic/ui/me/WebActivity.java | 14 +-
app/src/main/java/com/hdl/photovoltaic/ui/newC/MessageCenterList.java | 2
app/src/main/java/com/hdl/photovoltaic/ui/me/MeChangePasswordActivity.java | 12 +-
app/src/main/res/layout/activity_language_selection.xml | 6
app/src/main/java/com/hdl/photovoltaic/ui/me/BindPhoneActivity.java | 12 +-
app/src/main/java/com/hdl/photovoltaic/ui/me/BPersonalDataActivity.java | 2
app/src/main/res/layout/activity_power_stations_list.xml | 6
app/src/main/res/layout/activity_message_center_list.xml | 2
app/src/main/java/com/hdl/photovoltaic/ui/me/TemperatureUnitActivity.java | 12 +-
app/src/main/java/com/hdl/photovoltaic/ui/me/languageSelectionActivity.java | 12 +-
app/src/main/res/layout/activity_contact_us.xml | 6
app/src/main/res/layout/activity_bind_phone.xml | 6
app/src/main/java/com/hdl/photovoltaic/ui/me/CPersonalDataActivity.java | 2
app/src/main/java/com/hdl/photovoltaic/ui/me/SetActivity.java | 12 +-
app/src/main/res/layout/activity_account_and_security.xml | 6
app/src/main/res/layout/activity_bind_mail.xml | 6
app/src/main/res/layout/activity_qr_code_main.xml | 2
app/src/main/res/layout/activity_as_regards.xml | 6
app/src/main/res/layout/activity_web.xml | 12 +-
app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseListEditActivity.java | 10 +-
app/src/main/res/layout/activity_temperature_unit.xml | 6
app/src/main/java/com/hdl/photovoltaic/ui/me/ContactUsActivity.java | 12 +-
app/src/main/java/com/hdl/photovoltaic/ui/newC/PowerStationsListEdit.java | 20 ++--
app/src/main/java/com/hdl/photovoltaic/ui/me/AccountAndSecurityActivity.java | 12 +-
app/src/main/res/layout/activity_bpersonal_data.xml | 2
app/src/main/java/com/hdl/photovoltaic/ui/me/BindMailActivity.java | 12 +-
app/src/main/res/layout/activity_house_list_edit.xml | 4
app/src/main/java/com/hdl/photovoltaic/base/CustomBaseActivity.java | 7
app/src/main/res/layout/activity_personal_data.xml | 2
33 files changed, 126 insertions(+), 125 deletions(-)
diff --git a/app/src/main/java/com/hdl/photovoltaic/base/CustomBaseActivity.java b/app/src/main/java/com/hdl/photovoltaic/base/CustomBaseActivity.java
index abecc76..0c686b1 100644
--- a/app/src/main/java/com/hdl/photovoltaic/base/CustomBaseActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/base/CustomBaseActivity.java
@@ -24,10 +24,10 @@
}
+
// 灏哠tatusBar璁剧疆涓洪�忔槑
public void setStatusBarTranslucent() {
- StatusBarUtil.setTranslucentForImageViewInFragment(this,
- 0, null);
+ StatusBarUtil.setTranslucentForImageViewInFragment(this, 0, null);
StatusBarUtil.setLightMode(this);
}
@@ -50,7 +50,8 @@
break;
}
case white: {
- getWindow().setStatusBarColor(getColor(R.color.text_FFFFFFFF));
+// getWindow().setStatusBarColor(getColor(R.color.text_FFFFFFFF));
+ getWindow().setStatusBarColor(getColor(R.color.text_FFECECEC));
break;
}
}
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 e2b8729..85d9a7e 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
@@ -38,7 +38,7 @@
private void initEvent() {
- viewBinding.toolbarTopFragmentHouseListRl.topBackLl.setOnClickListener(new View.OnClickListener() {
+ viewBinding.toolbarTopRl.topBackLl.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
@@ -81,11 +81,11 @@
}
private void initView() {
- viewBinding.toolbarTopFragmentHouseListRl.topTitleTv.setText(R.string.set_account_security);
- viewBinding.toolbarTopFragmentHouseListRl.topTitleTv.setTextColor(getResources().getColor(R.color.text_030D1C, null));
- viewBinding.toolbarTopFragmentHouseListRl.topBackLl.setVisibility(View.VISIBLE);
- viewBinding.toolbarTopFragmentHouseListRl.topLeftIv.setImageResource(R.drawable.back_c);
- viewBinding.toolbarTopFragmentHouseListRl.topBarView.setBackgroundColor(getResources().getColor(R.color.text_FFFFFFFF, null));
+ 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()) {
//浜戠鎺ュ彛涓嶆敮鎸�
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 3b5ccb1..e55f75d 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
@@ -84,7 +84,7 @@
private void initEvent() {
- viewBinding.toolbarTopFragmentHouseListRl.topBackLl.setOnClickListener(new View.OnClickListener() {
+ viewBinding.toolbarTopRl.topBackLl.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
finish();
@@ -131,11 +131,11 @@
}
private void initView() {
- viewBinding.toolbarTopFragmentHouseListRl.topTitleTv.setText(R.string.me_regard);
- viewBinding.toolbarTopFragmentHouseListRl.topTitleTv.setTextColor(getResources().getColor(R.color.text_030D1C, null));
- viewBinding.toolbarTopFragmentHouseListRl.topBackLl.setVisibility(View.VISIBLE);
- viewBinding.toolbarTopFragmentHouseListRl.topLeftIv.setImageResource(R.drawable.back_c);
- viewBinding.toolbarTopFragmentHouseListRl.topBarView.setBackgroundColor(getResources().getColor(R.color.text_FFFFFFFF, null));
+ viewBinding.toolbarTopRl.topTitleTv.setText(R.string.me_regard);
+ 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));
String versionsStr = _mActivity.getResources().getString(R.string.app_version_number) + " " + AppConfigManage.getVersionName();
viewBinding.asRegardsIconVersionsTv.setText(versionsStr);
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 43fde85..57c225d 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
@@ -69,7 +69,7 @@
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_FFFFFFFF, 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);
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 d7b2fe8..9930866 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
@@ -42,7 +42,7 @@
private void initEvent() {
- viewBinding.toolbarTopFragmentHouseListRl.topBackLl.setOnClickListener(new View.OnClickListener() {
+ viewBinding.toolbarTopRl.topBackLl.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
setResult(20);
@@ -90,11 +90,11 @@
}
private void initView() {
- viewBinding.toolbarTopFragmentHouseListRl.topTitleTv.setText(R.string.set_change_bind_mail);
- viewBinding.toolbarTopFragmentHouseListRl.topTitleTv.setTextColor(getResources().getColor(R.color.text_030D1C, null));
- viewBinding.toolbarTopFragmentHouseListRl.topBackLl.setVisibility(View.VISIBLE);
- viewBinding.toolbarTopFragmentHouseListRl.topLeftIv.setImageResource(R.drawable.back_c);
- viewBinding.toolbarTopFragmentHouseListRl.topBarView.setBackgroundColor(getResources().getColor(R.color.text_FFFFFFFF, null));
+ viewBinding.toolbarTopRl.topTitleTv.setText(R.string.set_change_bind_mail);
+ viewBinding.toolbarTopRl.topTitleTv.setTextColor(getResources().getColor(R.color.text_030D1C, null));
+ viewBinding.toolbarTopRl.topBackLl.setVisibility(View.VISIBLE);
+ viewBinding.toolbarTopRl.topLeftIv.setImageResource(R.drawable.back_c);
+ viewBinding.toolbarTopRl.topBarView.setBackgroundColor(getResources().getColor(R.color.text_FFECECEC, null));
}
/**
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 2f0cf99..03cfe22 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
@@ -45,7 +45,7 @@
private void initEvent() {
- viewBinding.toolbarTopFragmentHouseListRl.topBackLl.setOnClickListener(new View.OnClickListener() {
+ viewBinding.toolbarTopRl.topBackLl.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
setResult(20);
@@ -99,11 +99,11 @@
}
private void initView() {
- viewBinding.toolbarTopFragmentHouseListRl.topTitleTv.setText(R.string.set_change_bind_phone_number);
- viewBinding.toolbarTopFragmentHouseListRl.topTitleTv.setTextColor(getResources().getColor(R.color.text_030D1C, null));
- viewBinding.toolbarTopFragmentHouseListRl.topBackLl.setVisibility(View.VISIBLE);
- viewBinding.toolbarTopFragmentHouseListRl.topLeftIv.setImageResource(R.drawable.back_c);
- viewBinding.toolbarTopFragmentHouseListRl.topBarView.setBackgroundColor(getResources().getColor(R.color.text_FFFFFFFF, null));
+ viewBinding.toolbarTopRl.topTitleTv.setText(R.string.set_change_bind_phone_number);
+ viewBinding.toolbarTopRl.topTitleTv.setTextColor(getResources().getColor(R.color.text_030D1C, null));
+ viewBinding.toolbarTopRl.topBackLl.setVisibility(View.VISIBLE);
+ viewBinding.toolbarTopRl.topLeftIv.setImageResource(R.drawable.back_c);
+ viewBinding.toolbarTopRl.topBarView.setBackgroundColor(getResources().getColor(R.color.text_FFECECEC, null));
try {
Country.load(this);
} catch (Exception e) {
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 06c0052..abb933a 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
@@ -164,7 +164,7 @@
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_FFFFFFFF, null));
+ viewBinding.toolbarTopFragmentMeRl.topBarView.setBackgroundColor(getResources().getColor(R.color.text_FFECECEC, null));
viewBinding.personalDataUserPortraitIl.sllLlRlNameTv.setText(R.string.me_personal_data_portrait);
viewBinding.personalDataUserNameIl.sllLlRlNameTv.setText(R.string.me_personal_data_user_name);
viewBinding.personalDataMailIl.sllLlRlNameTv.setText(R.string.home_login_email);
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 bf8ad57..3c53264 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
@@ -64,7 +64,7 @@
}
private void initEvent() {
- viewBinding.toolbarTopFragmentHouseListRl.topBackLl.setOnClickListener(new View.OnClickListener() {
+ viewBinding.toolbarTopRl.topBackLl.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
finish();
@@ -113,11 +113,11 @@
}
private void initView() {
- viewBinding.toolbarTopFragmentHouseListRl.topTitleTv.setText(R.string.contact_us);
- viewBinding.toolbarTopFragmentHouseListRl.topTitleTv.setTextColor(getResources().getColor(R.color.text_030D1C, null));
- viewBinding.toolbarTopFragmentHouseListRl.topBackLl.setVisibility(View.VISIBLE);
- viewBinding.toolbarTopFragmentHouseListRl.topLeftIv.setImageResource(R.drawable.back_c);
- viewBinding.toolbarTopFragmentHouseListRl.topBarView.setBackgroundColor(getResources().getColor(R.color.text_FFFFFFFF, null));
+ viewBinding.toolbarTopRl.topTitleTv.setText(R.string.contact_us);
+ 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));
}
}
\ No newline at end of file
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 c693283..7f0c976 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
@@ -51,7 +51,7 @@
* 鍒濆鍖栫晫闈㈢洃鍚櫒
*/
private void initEvent() {
- viewBinding.toolbarTopFragmentHouseListRl.topBackLl.setOnClickListener(new View.OnClickListener() {
+ viewBinding.toolbarTopRl.topBackLl.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
finish();
@@ -163,11 +163,11 @@
* 鍒濆鍖�
*/
private void initView() {
- viewBinding.toolbarTopFragmentHouseListRl.topBarView.setBackgroundColor(getResources().getColor(R.color.text_FFFFFFFF, null));
- viewBinding.toolbarTopFragmentHouseListRl.topTitleTv.setText(R.string.home_login_change_password);
- viewBinding.toolbarTopFragmentHouseListRl.topTitleTv.setTextColor(getResources().getColor(R.color.text_030D1C, null));
- viewBinding.toolbarTopFragmentHouseListRl.topBackLl.setVisibility(View.VISIBLE);
- viewBinding.toolbarTopFragmentHouseListRl.topLeftIv.setImageResource(R.drawable.back_c);
+ 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);
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/me/QrCodeMainActivity.java b/app/src/main/java/com/hdl/photovoltaic/ui/me/QrCodeMainActivity.java
index 78d99cb..225b07b 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/me/QrCodeMainActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/me/QrCodeMainActivity.java
@@ -93,7 +93,7 @@
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_FFFFFFFF, null));
+ viewBinding.toolbarTopQrCodeRl.topBarView.setBackgroundColor(getResources().getColor(R.color.text_FFECECEC, null));
viewBinding.toolbarTopQrCodeRl.topMoreBtn.setVisibility(View.VISIBLE);
viewBinding.toolbarTopQrCodeRl.topMoreIv.setImageDrawable(AppCompatResources.getDrawable(_mActivity, R.drawable.save_image));
if (!TextUtils.isEmpty(UserConfigManage.getInstance().getUserName())) {
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 256c0d7..49db2bd 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
@@ -42,7 +42,7 @@
}
private void initEvent() {
- viewBinding.toolbarTopFragmentHouseListRl.topBackLl.setOnClickListener(new View.OnClickListener() {
+ viewBinding.toolbarTopRl.topBackLl.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
finish();
@@ -87,11 +87,11 @@
}
private void initView() {
- viewBinding.toolbarTopFragmentHouseListRl.topTitleTv.setText(R.string.me_set);
- viewBinding.toolbarTopFragmentHouseListRl.topTitleTv.setTextColor(getResources().getColor(R.color.text_030D1C, null));
- viewBinding.toolbarTopFragmentHouseListRl.topBackLl.setVisibility(View.VISIBLE);
- viewBinding.toolbarTopFragmentHouseListRl.topLeftIv.setImageResource(R.drawable.back_c);
- viewBinding.toolbarTopFragmentHouseListRl.topBarView.setBackgroundColor(getResources().getColor(R.color.text_FFFFFFFF, null));
+ 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);
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 5a13871..b13bb09 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
@@ -78,7 +78,7 @@
private void initEvent() {
- viewBinding.toolbarTopFragmentHouseListRl.topBackLl.setOnClickListener(new View.OnClickListener() {
+ viewBinding.toolbarTopRl.topBackLl.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
backPressedData();
@@ -111,11 +111,11 @@
private void initView() {
- viewBinding.toolbarTopFragmentHouseListRl.topTitleTv.setText(R.string.set_temperature_unit);
- viewBinding.toolbarTopFragmentHouseListRl.topTitleTv.setTextColor(getResources().getColor(R.color.text_030D1C, null));
- viewBinding.toolbarTopFragmentHouseListRl.topBackLl.setVisibility(View.VISIBLE);
- viewBinding.toolbarTopFragmentHouseListRl.topLeftIv.setImageResource(R.drawable.back_c);
- viewBinding.toolbarTopFragmentHouseListRl.topBarView.setBackgroundColor(getResources().getColor(R.color.text_FFFFFFFF, null));
+ 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);
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 03b6e9c..6c159fc 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
@@ -45,7 +45,7 @@
}
private void initEvent() {
- viewBinding.toolbarTopFragmentHouseListRl.topBackLl.setOnClickListener(new View.OnClickListener() {
+ viewBinding.toolbarTopRl.topBackLl.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
finish();
@@ -55,14 +55,14 @@
private void initView() {
if (this.typeIntValue == 0) {
- viewBinding.toolbarTopFragmentHouseListRl.topTitleTv.setText(R.string.app_service_agreement);
+ viewBinding.toolbarTopRl.topTitleTv.setText(R.string.app_service_agreement);
} else {
- viewBinding.toolbarTopFragmentHouseListRl.topTitleTv.setText(R.string.app_privacy_policy);
+ viewBinding.toolbarTopRl.topTitleTv.setText(R.string.app_privacy_policy);
}
- viewBinding.toolbarTopFragmentHouseListRl.topTitleTv.setTextColor(getResources().getColor(R.color.text_030D1C, null));
- viewBinding.toolbarTopFragmentHouseListRl.topBackLl.setVisibility(View.VISIBLE);
- viewBinding.toolbarTopFragmentHouseListRl.topLeftIv.setImageResource(R.drawable.back_c);
- viewBinding.toolbarTopFragmentHouseListRl.topBarView.setBackgroundColor(getResources().getColor(R.color.text_FFFFFFFF, null));
+ 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().getCurrentAppLanguage().equals(LocalManageUtil.zh)) {
//涓枃
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 b7f971a..cda1b23 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
@@ -68,7 +68,7 @@
private void initEvent() {
- viewBinding.toolbarTopFragmentHouseListRl.topBackLl.setOnClickListener(new View.OnClickListener() {
+ viewBinding.toolbarTopRl.topBackLl.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
setResult(30);
@@ -181,11 +181,11 @@
}
private void initView() {
- viewBinding.toolbarTopFragmentHouseListRl.topTitleTv.setText(R.string.set_language_choice);
- viewBinding.toolbarTopFragmentHouseListRl.topTitleTv.setTextColor(getResources().getColor(R.color.text_030D1C, null));
- viewBinding.toolbarTopFragmentHouseListRl.topBackLl.setVisibility(View.VISIBLE);
- viewBinding.toolbarTopFragmentHouseListRl.topLeftIv.setImageResource(R.drawable.back_c);
- viewBinding.toolbarTopFragmentHouseListRl.topBarView.setBackgroundColor(getResources().getColor(R.color.text_FFFFFFFF, null));
+ 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);
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 5235162..0476fca 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
@@ -325,7 +325,7 @@
}
private void initView() {
- viewBinding.toolbarTopMessageCenterListRl.getRoot().setBackgroundColor(getColor(R.color.text_FFFFFFFF));
+ viewBinding.toolbarTopMessageCenterListRl.getRoot().setBackgroundColor(getColor(R.color.text_FFECECEC));
viewBinding.toolbarTopMessageCenterListRl.topBackLl.setVisibility(View.VISIBLE);
viewBinding.toolbarTopMessageCenterListRl.topLeftIv.setImageResource(R.drawable.back_c);
viewBinding.toolbarTopMessageCenterListRl.topTitleTv.setText(R.string.set_message_center);
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 6493916..5e492c8 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
@@ -74,7 +74,7 @@
private void initEvent() {
//杩斿洖鎸夐挳
- viewBinding.toolbarTopFragmentHouseListRl.topBackLl.setOnClickListener(new View.OnClickListener() {
+ viewBinding.toolbarTopRl.topBackLl.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
if (!is_edit) {
@@ -84,14 +84,14 @@
is_edit = false;
viewBinding.addPowerStationRl.setVisibility(View.VISIBLE);//娣诲姞鐢电珯缁勪欢
- viewBinding.toolbarTopFragmentHouseListRl.topMoreBtn.setVisibility(View.VISIBLE);
+ viewBinding.toolbarTopRl.topMoreBtn.setVisibility(View.VISIBLE);
initData();//鍒濆鍖栫紦瀛樻暟鎹�
setAllItemEdit(false);
houseListAdapter.setList(houseListBeanIDList);//閲嶆柊鍒锋柊鍒楄〃
}
});
//缂栬緫鎸夐挳
- viewBinding.toolbarTopFragmentHouseListRl.topMoreBtn.setOnClickListener(new View.OnClickListener() {
+ viewBinding.toolbarTopRl.topMoreBtn.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
if (is_edit) {
@@ -100,7 +100,7 @@
is_edit = true;
viewBinding.addPowerStationRl.setVisibility(View.GONE);//娣诲姞鐢电珯缁勪欢
- viewBinding.toolbarTopFragmentHouseListRl.topMoreBtn.setVisibility(View.GONE);
+ viewBinding.toolbarTopRl.topMoreBtn.setVisibility(View.GONE);
initData();//鍒濆鍖栫紦瀛樻暟鎹�
setAllItemEdit(true);
houseListAdapter.setList(houseListBeanIDList);//閲嶆柊鍒锋柊鍒楄〃
@@ -193,12 +193,12 @@
}
private void initView() {
- viewBinding.toolbarTopFragmentHouseListRl.getRoot().setBackgroundColor(getColor(R.color.text_FFFFFFFF));
- viewBinding.toolbarTopFragmentHouseListRl.topBackLl.setVisibility(View.VISIBLE);
- viewBinding.toolbarTopFragmentHouseListRl.topLeftIv.setImageResource(R.drawable.back_c);
- viewBinding.toolbarTopFragmentHouseListRl.topTitleTv.setText(R.string.power_station_selection);
- viewBinding.toolbarTopFragmentHouseListRl.topMoreBtn.setVisibility(View.VISIBLE);
- viewBinding.toolbarTopFragmentHouseListRl.topMoreIv.setImageResource(R.drawable.editor_house);
+ viewBinding.toolbarTopRl.getRoot().setBackgroundColor(getColor(R.color.text_FFECECEC));
+ viewBinding.toolbarTopRl.topBackLl.setVisibility(View.VISIBLE);
+ viewBinding.toolbarTopRl.topLeftIv.setImageResource(R.drawable.back_c);
+ viewBinding.toolbarTopRl.topTitleTv.setText(R.string.power_station_selection);
+ viewBinding.toolbarTopRl.topMoreBtn.setVisibility(View.VISIBLE);
+ viewBinding.toolbarTopRl.topMoreIv.setImageResource(R.drawable.editor_house);
LinearLayoutManager linearLayout = new LinearLayoutManager(_mActivity);
houseListAdapter = new HouseListAdapter(_mActivity);
viewBinding.fragmentHouseSrlListRc.setLayoutManager(linearLayout);
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseListEditActivity.java b/app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseListEditActivity.java
index d649953..d240831 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseListEditActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseListEditActivity.java
@@ -93,7 +93,7 @@
private void initEvent() {
//杩斿洖鎸夐挳
- viewBinding.toolbarTopFragmentHouseListRl.topBackLl.setOnClickListener(new View.OnClickListener() {
+ viewBinding.toolbarTopRl.topBackLl.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
sendEventBus();
@@ -199,10 +199,10 @@
}
private void initView() {
- viewBinding.toolbarTopFragmentHouseListRl.getRoot().setBackgroundColor(getColor(R.color.text_FFFFFFFF));
- viewBinding.toolbarTopFragmentHouseListRl.topBackLl.setVisibility(View.VISIBLE);
- viewBinding.toolbarTopFragmentHouseListRl.topLeftIv.setImageResource(R.drawable.back_c);
- viewBinding.toolbarTopFragmentHouseListRl.topTitleTv.setText(R.string.power_station_editing);
+ viewBinding.toolbarTopRl.getRoot().setBackgroundColor(getColor(R.color.text_FFFFFFFF));
+ viewBinding.toolbarTopRl.topBackLl.setVisibility(View.VISIBLE);
+ viewBinding.toolbarTopRl.topLeftIv.setImageResource(R.drawable.back_c);
+ viewBinding.toolbarTopRl.topTitleTv.setText(R.string.power_station_editing);
LinearLayoutManager linearLayout = new LinearLayoutManager(_mActivity);
houseListAdapter = new HouseListAdapter(_mActivity);
viewBinding.fragmentHouseSrlListRc.setLayoutManager(linearLayout);
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 c4d0f3f..e8c4206 100644
--- a/app/src/main/res/layout/activity_account_and_security.xml
+++ b/app/src/main/res/layout/activity_account_and_security.xml
@@ -4,11 +4,11 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:background="@color/text_F5F7FA"
+ android:background="@color/text_FFECECEC"
tools:context=".ui.me.AccountAndSecurityActivity">
<include
- android:id="@+id/toolbar_top_fragment_house_list_rl"
+ android:id="@+id/toolbar_top_rl"
layout="@layout/toolbar_top_view_44" />
@@ -21,7 +21,7 @@
android:layout_marginTop="@dimen/dp_12"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@+id/toolbar_top_fragment_house_list_rl" />
+ app:layout_constraintTop_toBottomOf="@+id/toolbar_top_rl" />
<include
android:id="@+id/set_account_mail_il"
diff --git a/app/src/main/res/layout/activity_as_regards.xml b/app/src/main/res/layout/activity_as_regards.xml
index 01e0c7d..a334785 100644
--- a/app/src/main/res/layout/activity_as_regards.xml
+++ b/app/src/main/res/layout/activity_as_regards.xml
@@ -4,11 +4,11 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:background="@color/text_F5F7FA"
+ android:background="@color/text_FFECECEC"
tools:context=".ui.me.AsRegardsActivity">
<include
- android:id="@+id/toolbar_top_fragment_house_list_rl"
+ android:id="@+id/toolbar_top_rl"
layout="@layout/toolbar_top_view_44" />
<ImageView
@@ -19,7 +19,7 @@
android:src="@drawable/logo"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@+id/toolbar_top_fragment_house_list_rl" />
+ app:layout_constraintTop_toBottomOf="@+id/toolbar_top_rl" />
<TextView
android:id="@+id/as_regards_icon_versions_tv"
diff --git a/app/src/main/res/layout/activity_bind_mail.xml b/app/src/main/res/layout/activity_bind_mail.xml
index 586242a..be48d38 100644
--- a/app/src/main/res/layout/activity_bind_mail.xml
+++ b/app/src/main/res/layout/activity_bind_mail.xml
@@ -4,11 +4,11 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:background="@color/text_F5F7FA"
+ android:background="@color/text_FFECECEC"
tools:context=".ui.me.BindMailActivity">
<include
- android:id="@+id/toolbar_top_fragment_house_list_rl"
+ android:id="@+id/toolbar_top_rl"
layout="@layout/toolbar_top_view_44" />
<RelativeLayout
@@ -18,7 +18,7 @@
android:layout_marginTop="@dimen/dp_20"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@+id/toolbar_top_fragment_house_list_rl">
+ app:layout_constraintTop_toBottomOf="@+id/toolbar_top_rl">
<TextView
android:id="@+id/bind_mail_title_tv"
diff --git a/app/src/main/res/layout/activity_bind_phone.xml b/app/src/main/res/layout/activity_bind_phone.xml
index 9220f5f..a27bbd9 100644
--- a/app/src/main/res/layout/activity_bind_phone.xml
+++ b/app/src/main/res/layout/activity_bind_phone.xml
@@ -4,11 +4,11 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:background="@color/text_F5F7FA"
+ android:background="@color/text_FFECECEC"
tools:context=".ui.me.BindPhoneActivity">
<include
- android:id="@+id/toolbar_top_fragment_house_list_rl"
+ android:id="@+id/toolbar_top_rl"
layout="@layout/toolbar_top_view_44" />
<RelativeLayout
@@ -17,7 +17,7 @@
android:layout_height="@dimen/dp_100"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@+id/toolbar_top_fragment_house_list_rl">
+ app:layout_constraintTop_toBottomOf="@+id/toolbar_top_rl">
<TextView
android:id="@+id/bind_area_title_tv"
diff --git a/app/src/main/res/layout/activity_bpersonal_data.xml b/app/src/main/res/layout/activity_bpersonal_data.xml
index f8d3e65..41d67ea 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_F5F7FA"
+ android:background="@color/text_FFECECEC"
tools:context=".ui.me.BPersonalDataActivity">
<include
diff --git a/app/src/main/res/layout/activity_contact_us.xml b/app/src/main/res/layout/activity_contact_us.xml
index a55e3d1..c1e6a4f 100644
--- a/app/src/main/res/layout/activity_contact_us.xml
+++ b/app/src/main/res/layout/activity_contact_us.xml
@@ -4,11 +4,11 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:background="@color/text_F5F7FA"
+ android:background="@color/text_FFECECEC"
tools:context=".ui.me.ContactUsActivity">
<include
- android:id="@+id/toolbar_top_fragment_house_list_rl"
+ android:id="@+id/toolbar_top_rl"
layout="@layout/toolbar_top_view_44" />
<RelativeLayout
@@ -19,7 +19,7 @@
android:background="@color/text_FFFFFFFF"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@+id/toolbar_top_fragment_house_list_rl">
+ app:layout_constraintTop_toBottomOf="@+id/toolbar_top_rl">
<TextView
android:id="@+id/wechat_id_tv"
diff --git a/app/src/main/res/layout/activity_house_list_edit.xml b/app/src/main/res/layout/activity_house_list_edit.xml
index d16924d..fb9f804 100644
--- a/app/src/main/res/layout/activity_house_list_edit.xml
+++ b/app/src/main/res/layout/activity_house_list_edit.xml
@@ -8,7 +8,7 @@
tools:context=".ui.powerstation.HouseListEditActivity">
<include
- android:id="@+id/toolbar_top_fragment_house_list_rl"
+ android:id="@+id/toolbar_top_rl"
layout="@layout/toolbar_top_view_44" />
<androidx.swiperefreshlayout.widget.SwipeRefreshLayout
@@ -19,7 +19,7 @@
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@+id/toolbar_top_fragment_house_list_rl">
+ app:layout_constraintTop_toBottomOf="@+id/toolbar_top_rl">
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/fragment_house_srl_list_rc"
diff --git a/app/src/main/res/layout/activity_language_selection.xml b/app/src/main/res/layout/activity_language_selection.xml
index b625e22..83f9f34 100644
--- a/app/src/main/res/layout/activity_language_selection.xml
+++ b/app/src/main/res/layout/activity_language_selection.xml
@@ -4,10 +4,10 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:background="@color/text_F5F7FA"
+ android:background="@color/text_FFECECEC"
tools:context=".ui.me.languageSelectionActivity">
<include
- android:id="@+id/toolbar_top_fragment_house_list_rl"
+ android:id="@+id/toolbar_top_rl"
layout="@layout/toolbar_top_view_44" />
<!-- <include-->
@@ -22,7 +22,7 @@
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@+id/toolbar_top_fragment_house_list_rl">
+ app:layout_constraintTop_toBottomOf="@+id/toolbar_top_rl">
</androidx.recyclerview.widget.RecyclerView>
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 af1f41c..dc828b1 100644
--- a/app/src/main/res/layout/activity_me_change_password.xml
+++ b/app/src/main/res/layout/activity_me_change_password.xml
@@ -4,11 +4,11 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:background="@color/text_F5F7FA"
+ android:background="@color/text_FFECECEC"
tools:context=".ui.me.MeChangePasswordActivity">
<include
- android:id="@+id/toolbar_top_fragment_house_list_rl"
+ android:id="@+id/toolbar_top_rl"
layout="@layout/toolbar_top_view_44" />
<LinearLayout
@@ -18,7 +18,7 @@
android:orientation="vertical"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@+id/toolbar_top_fragment_house_list_rl">
+ app:layout_constraintTop_toBottomOf="@+id/toolbar_top_rl">
<include
android:id="@+id/me_change_password_old_ic"
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 49427e2..60520a6 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_EDEFF2"
+ android:background="@color/text_FFECECEC"
tools:context=".ui.newC.MessageCenterList">
<include
diff --git a/app/src/main/res/layout/activity_personal_data.xml b/app/src/main/res/layout/activity_personal_data.xml
index a4c7f66..6e14df8 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_F5F7FA"
+ android:background="@color/text_FFECECEC"
tools:context=".ui.me.CPersonalDataActivity">
<include
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 f2bbc0a..e0024c7 100644
--- a/app/src/main/res/layout/activity_power_stations_list.xml
+++ b/app/src/main/res/layout/activity_power_stations_list.xml
@@ -4,11 +4,11 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:background="@color/text_F5F7FA"
+ android:background="@color/text_FFECECEC"
tools:context=".ui.newC.PowerStationsListEdit">
<include
- android:id="@+id/toolbar_top_fragment_house_list_rl"
+ android:id="@+id/toolbar_top_rl"
layout="@layout/toolbar_top_view_44" />
<androidx.swiperefreshlayout.widget.SwipeRefreshLayout
@@ -19,7 +19,7 @@
app:layout_constraintBottom_toTopOf="@+id/add_power_station_rl"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@+id/toolbar_top_fragment_house_list_rl">
+ app:layout_constraintTop_toBottomOf="@+id/toolbar_top_rl">
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/fragment_house_srl_list_rc"
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 24e3cd4..f3d0f78 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_F5F7FA"
+ android:background="@color/text_FFECECEC"
tools:context=".ui.me.QrCodeMainActivity">
<include
diff --git a/app/src/main/res/layout/activity_set.xml b/app/src/main/res/layout/activity_set.xml
index 42465c8..b842069 100644
--- a/app/src/main/res/layout/activity_set.xml
+++ b/app/src/main/res/layout/activity_set.xml
@@ -4,11 +4,11 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:background="@color/text_F5F7FA"
+ android:background="@color/text_FFECECEC"
tools:context=".ui.me.SetActivity">
<include
- android:id="@+id/toolbar_top_fragment_house_list_rl"
+ android:id="@+id/toolbar_top_rl"
layout="@layout/toolbar_top_view_44" />
<ScrollView
@@ -20,7 +20,7 @@
app:layout_constraintBottom_toTopOf="@+id/out_tv"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@+id/toolbar_top_fragment_house_list_rl">
+ app:layout_constraintTop_toBottomOf="@+id/toolbar_top_rl">
<LinearLayout
android:id="@+id/sll_ll"
diff --git a/app/src/main/res/layout/activity_temperature_unit.xml b/app/src/main/res/layout/activity_temperature_unit.xml
index e225775..7813b87 100644
--- a/app/src/main/res/layout/activity_temperature_unit.xml
+++ b/app/src/main/res/layout/activity_temperature_unit.xml
@@ -4,11 +4,11 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:background="@color/text_F5F7FA"
+ android:background="@color/text_FFECECEC"
tools:context=".ui.me.TemperatureUnitActivity">
<include
- android:id="@+id/toolbar_top_fragment_house_list_rl"
+ android:id="@+id/toolbar_top_rl"
layout="@layout/toolbar_top_view_44" />
<androidx.recyclerview.widget.RecyclerView
@@ -19,7 +19,7 @@
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@+id/toolbar_top_fragment_house_list_rl">
+ app:layout_constraintTop_toBottomOf="@+id/toolbar_top_rl">
</androidx.recyclerview.widget.RecyclerView>
diff --git a/app/src/main/res/layout/activity_web.xml b/app/src/main/res/layout/activity_web.xml
index 5fa969d..6ec132a 100644
--- a/app/src/main/res/layout/activity_web.xml
+++ b/app/src/main/res/layout/activity_web.xml
@@ -4,20 +4,20 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:background="@color/text_F5F7FA"
+ android:background="@color/text_FFECECEC"
tools:context=".ui.me.WebActivity">
<include
- android:id="@+id/toolbar_top_fragment_house_list_rl"
+ android:id="@+id/toolbar_top_rl"
layout="@layout/toolbar_top_view_44" />
<WebView
android:id="@+id/content_view"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:layout_marginTop="@dimen/dp_44"
+ android:layout_width="0dp"
+ android:layout_height="0dp"
+ app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@+id/toolbar_top_fragment_house_list_rl" />
+ app:layout_constraintTop_toBottomOf="@+id/toolbar_top_rl" />
</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
--
Gitblit v1.8.0