From 14d5a53360783bac9e9c5c2767387e3d4c46a927 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期二, 26 十一月 2024 18:44:08 +0800
Subject: [PATCH] 更换主题2024年11月26日18:44:05
---
app/src/main/res/drawable/home_page_unselected.png | 0
app/src/main/res/drawable/power_station_selected.png | 0
app/src/main/res/values/styles.xml | 4
app/src/main/res/drawable/me_selected.png | 0
app/src/main/res/drawable/me_unselected.png | 0
app/src/main/res/drawable/message_selected.png | 0
app/src/main/res/layout/activity_my_power_station.xml | 2
app/src/main/res/layout/home_bottom_line.xml | 2
app/src/main/java/com/hdl/photovoltaic/ui/BPowerStationActivity.java | 32 +-
app/src/main/res/values/colors.xml | 3
app/src/main/res/drawable/bj.png | 0
app/src/main/res/drawable/message_unselected.png | 0
app/src/main/java/com/hdl/photovoltaic/ui/home/HomePageFragment.java | 75 +++--
app/src/main/res/drawable/home_page_selected.png | 0
app/src/main/res/layout/fragment_home_page.xml | 604 ++++++++++++++++++++++++++++-----------------
app/src/main/res/drawable/line_c1c1c1.xml | 4
app/src/main/res/drawable/power_station_unselected.png | 0
app/src/main/res/drawable/next_step.png | 0
app/src/main/res/drawable/last_step.png | 0
app/src/main/res/drawable/time_selected_38c494.xml | 5
app/src/main/res/drawable/linear_progress_drawable.xml | 17 +
21 files changed, 463 insertions(+), 285 deletions(-)
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/BPowerStationActivity.java b/app/src/main/java/com/hdl/photovoltaic/ui/BPowerStationActivity.java
index d0f77e6..3a36ea8 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/BPowerStationActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/BPowerStationActivity.java
@@ -387,43 +387,43 @@
if (this.currentFragmentIndex == 0) {
//姒傝鐣岄潰
viewBinding.myPowerStationBottomIl0.iconIv.setImageDrawable(AppCompatResources.getDrawable(_mActivity, R.drawable.home_page_selected));
- viewBinding.myPowerStationBottomIl0.titleTv.setTextColor(getColor(R.color.text_E6000000));
+ viewBinding.myPowerStationBottomIl0.titleTv.setTextColor(getColor(R.color.text_E6FFFFFF));
viewBinding.myPowerStationBottomIl1.iconIv.setImageDrawable(AppCompatResources.getDrawable(_mActivity, R.drawable.power_station_unselected));
- viewBinding.myPowerStationBottomIl1.titleTv.setTextColor(getColor(R.color.text_65000000));
+ viewBinding.myPowerStationBottomIl1.titleTv.setTextColor(getColor(R.color.text_66FFFFFF));
viewBinding.myMessageBottomIl2.iconIv.setImageDrawable(AppCompatResources.getDrawable(_mActivity, R.drawable.message_unselected));
- viewBinding.myMessageBottomIl2.titleTv.setTextColor(getColor(R.color.text_65000000));
+ viewBinding.myMessageBottomIl2.titleTv.setTextColor(getColor(R.color.text_66FFFFFF));
viewBinding.myMeBottomIl3.iconIv.setImageDrawable(AppCompatResources.getDrawable(_mActivity, R.drawable.me_unselected));
- viewBinding.myMeBottomIl3.titleTv.setTextColor(getColor(R.color.text_65000000));
+ viewBinding.myMeBottomIl3.titleTv.setTextColor(getColor(R.color.text_66FFFFFF));
} else if (this.currentFragmentIndex == 1) {
//鐢电珯鐣岄潰
viewBinding.myPowerStationBottomIl0.iconIv.setImageDrawable(AppCompatResources.getDrawable(_mActivity, R.drawable.home_page_unselected));
- viewBinding.myPowerStationBottomIl0.titleTv.setTextColor(getColor(R.color.text_65000000));
+ viewBinding.myPowerStationBottomIl0.titleTv.setTextColor(getColor(R.color.text_66FFFFFF));
viewBinding.myPowerStationBottomIl1.iconIv.setImageDrawable(AppCompatResources.getDrawable(_mActivity, R.drawable.power_station_selected));
- viewBinding.myPowerStationBottomIl1.titleTv.setTextColor(getColor(R.color.text_E6000000));
+ viewBinding.myPowerStationBottomIl1.titleTv.setTextColor(getColor(R.color.text_E6FFFFFF));
viewBinding.myMessageBottomIl2.iconIv.setImageDrawable(AppCompatResources.getDrawable(_mActivity, R.drawable.message_unselected));
- viewBinding.myMessageBottomIl2.titleTv.setTextColor(getColor(R.color.text_65000000));
+ viewBinding.myMessageBottomIl2.titleTv.setTextColor(getColor(R.color.text_66FFFFFF));
viewBinding.myMeBottomIl3.iconIv.setImageDrawable(AppCompatResources.getDrawable(_mActivity, R.drawable.me_unselected));
- viewBinding.myMeBottomIl3.titleTv.setTextColor(getColor(R.color.text_65000000));
+ viewBinding.myMeBottomIl3.titleTv.setTextColor(getColor(R.color.text_66FFFFFF));
} else if (this.currentFragmentIndex == 2) {
//娑堟伅鐣岄潰
viewBinding.myPowerStationBottomIl0.iconIv.setImageDrawable(AppCompatResources.getDrawable(_mActivity, R.drawable.home_page_unselected));
- viewBinding.myPowerStationBottomIl0.titleTv.setTextColor(getColor(R.color.text_65000000));
+ viewBinding.myPowerStationBottomIl0.titleTv.setTextColor(getColor(R.color.text_66FFFFFF));
viewBinding.myPowerStationBottomIl1.iconIv.setImageDrawable(AppCompatResources.getDrawable(_mActivity, R.drawable.power_station_unselected));
- viewBinding.myPowerStationBottomIl1.titleTv.setTextColor(getColor(R.color.text_65000000));
+ viewBinding.myPowerStationBottomIl1.titleTv.setTextColor(getColor(R.color.text_66FFFFFF));
viewBinding.myMessageBottomIl2.iconIv.setImageDrawable(AppCompatResources.getDrawable(_mActivity, R.drawable.message_select));
- viewBinding.myMessageBottomIl2.titleTv.setTextColor(getColor(R.color.text_E6000000));
+ viewBinding.myMessageBottomIl2.titleTv.setTextColor(getColor(R.color.text_E6FFFFFF));
viewBinding.myMeBottomIl3.iconIv.setImageDrawable(AppCompatResources.getDrawable(_mActivity, R.drawable.me_unselected));
- viewBinding.myMeBottomIl3.titleTv.setTextColor(getColor(R.color.text_65000000));
+ viewBinding.myMeBottomIl3.titleTv.setTextColor(getColor(R.color.text_66FFFFFF));
} else if (this.currentFragmentIndex == 3) {
//鎴戠殑鐣岄潰
viewBinding.myPowerStationBottomIl0.iconIv.setImageDrawable(AppCompatResources.getDrawable(_mActivity, R.drawable.home_page_unselected));
- viewBinding.myPowerStationBottomIl0.titleTv.setTextColor(getColor(R.color.text_65000000));
+ viewBinding.myPowerStationBottomIl0.titleTv.setTextColor(getColor(R.color.text_66FFFFFF));
viewBinding.myPowerStationBottomIl1.iconIv.setImageDrawable(AppCompatResources.getDrawable(_mActivity, R.drawable.power_station_unselected));
- viewBinding.myPowerStationBottomIl1.titleTv.setTextColor(getColor(R.color.text_65000000));
+ viewBinding.myPowerStationBottomIl1.titleTv.setTextColor(getColor(R.color.text_66FFFFFF));
viewBinding.myMessageBottomIl2.iconIv.setImageDrawable(AppCompatResources.getDrawable(_mActivity, R.drawable.message_unselected));
- viewBinding.myMessageBottomIl2.titleTv.setTextColor(getColor(R.color.text_65000000));
+ viewBinding.myMessageBottomIl2.titleTv.setTextColor(getColor(R.color.text_66FFFFFF));
viewBinding.myMeBottomIl3.iconIv.setImageDrawable(AppCompatResources.getDrawable(_mActivity, R.drawable.me_selected));
- viewBinding.myMeBottomIl3.titleTv.setTextColor(getColor(R.color.text_E6000000));
+ viewBinding.myMeBottomIl3.titleTv.setTextColor(getColor(R.color.text_E6FFFFFF));
}
}
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/home/HomePageFragment.java b/app/src/main/java/com/hdl/photovoltaic/ui/home/HomePageFragment.java
index f5d97de..7ac7ea1 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/home/HomePageFragment.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/home/HomePageFragment.java
@@ -173,16 +173,16 @@
viewBinding.unitTv.setText(UnitType.kW);
viewBinding.unitTextTv.setText(getString(R.string.pv_power));
viewBinding.dayTv.setBackground(AppCompatResources.getDrawable(_mActivity, R.drawable.time_selected_38c494));
- viewBinding.dayTv.setTextColor(_mActivity.getColor(R.color.text_38C494));
+ viewBinding.dayTv.setTextColor(_mActivity.getColor(R.color.text_E6FFFFFF));
viewBinding.monthTv.setBackground(AppCompatResources.getDrawable(_mActivity, R.color.text_00000000));
- viewBinding.monthTv.setTextColor(_mActivity.getColor(R.color.text_66000000));
+ viewBinding.monthTv.setTextColor(_mActivity.getColor(R.color.text_66FFFFFF));
viewBinding.yearTv.setBackground(AppCompatResources.getDrawable(_mActivity, R.color.text_00000000));
- viewBinding.yearTv.setTextColor(_mActivity.getColor(R.color.text_66000000));
+ viewBinding.yearTv.setTextColor(_mActivity.getColor(R.color.text_66FFFFFF));
viewBinding.lifeCycleTv.setBackground(AppCompatResources.getDrawable(_mActivity, R.color.text_00000000));
- viewBinding.lifeCycleTv.setTextColor(_mActivity.getColor(R.color.text_66000000));
+ viewBinding.lifeCycleTv.setTextColor(_mActivity.getColor(R.color.text_66FFFFFF));
viewBinding.v1.setVisibility(View.GONE);
viewBinding.v2.setVisibility(View.VISIBLE);
@@ -207,16 +207,16 @@
viewBinding.unitTv.setText(UnitType.kWh);
viewBinding.unitTextTv.setText(getString(R.string.generation));
viewBinding.dayTv.setBackground(AppCompatResources.getDrawable(_mActivity, R.color.text_00000000));
- viewBinding.dayTv.setTextColor(_mActivity.getColor(R.color.text_66000000));
+ viewBinding.dayTv.setTextColor(_mActivity.getColor(R.color.text_66FFFFFF));
viewBinding.monthTv.setBackground(AppCompatResources.getDrawable(_mActivity, R.drawable.time_selected_38c494));
- viewBinding.monthTv.setTextColor(_mActivity.getColor(R.color.text_38C494));
+ viewBinding.monthTv.setTextColor(_mActivity.getColor(R.color.text_E6FFFFFF));
viewBinding.yearTv.setBackground(AppCompatResources.getDrawable(_mActivity, R.color.text_00000000));
- viewBinding.yearTv.setTextColor(_mActivity.getColor(R.color.text_66000000));
+ viewBinding.yearTv.setTextColor(_mActivity.getColor(R.color.text_66FFFFFF));
viewBinding.lifeCycleTv.setBackground(AppCompatResources.getDrawable(_mActivity, R.color.text_00000000));
- viewBinding.lifeCycleTv.setTextColor(_mActivity.getColor(R.color.text_66000000));
+ viewBinding.lifeCycleTv.setTextColor(_mActivity.getColor(R.color.text_66FFFFFF));
viewBinding.v1.setVisibility(View.GONE);
viewBinding.v2.setVisibility(View.GONE);
@@ -241,16 +241,16 @@
viewBinding.unitTv.setText(UnitType.kWh);
viewBinding.unitTextTv.setText(getString(R.string.generation));
viewBinding.dayTv.setBackground(AppCompatResources.getDrawable(_mActivity, R.color.text_00000000));
- viewBinding.dayTv.setTextColor(_mActivity.getColor(R.color.text_66000000));
+ viewBinding.dayTv.setTextColor(_mActivity.getColor(R.color.text_66FFFFFF));
viewBinding.monthTv.setBackground(AppCompatResources.getDrawable(_mActivity, R.color.text_00000000));
- viewBinding.monthTv.setTextColor(_mActivity.getColor(R.color.text_66000000));
+ viewBinding.monthTv.setTextColor(_mActivity.getColor(R.color.text_66FFFFFF));
viewBinding.yearTv.setBackground(AppCompatResources.getDrawable(_mActivity, R.drawable.time_selected_38c494));
- viewBinding.yearTv.setTextColor(_mActivity.getColor(R.color.text_38C494));
+ viewBinding.yearTv.setTextColor(_mActivity.getColor(R.color.text_E6FFFFFF));
viewBinding.lifeCycleTv.setBackground(AppCompatResources.getDrawable(_mActivity, R.color.text_00000000));
- viewBinding.lifeCycleTv.setTextColor(_mActivity.getColor(R.color.text_66000000));
+ viewBinding.lifeCycleTv.setTextColor(_mActivity.getColor(R.color.text_66FFFFFF));
viewBinding.v1.setVisibility(View.VISIBLE);
viewBinding.v2.setVisibility(View.GONE);
@@ -273,16 +273,16 @@
viewBinding.unitTv.setText(UnitType.kWh);
viewBinding.unitTextTv.setText(getString(R.string.generation));
viewBinding.dayTv.setBackground(AppCompatResources.getDrawable(_mActivity, R.color.text_00000000));
- viewBinding.dayTv.setTextColor(_mActivity.getColor(R.color.text_66000000));
+ viewBinding.dayTv.setTextColor(_mActivity.getColor(R.color.text_66FFFFFF));
viewBinding.monthTv.setBackground(AppCompatResources.getDrawable(_mActivity, R.color.text_00000000));
- viewBinding.monthTv.setTextColor(_mActivity.getColor(R.color.text_66000000));
+ viewBinding.monthTv.setTextColor(_mActivity.getColor(R.color.text_66FFFFFF));
viewBinding.yearTv.setBackground(AppCompatResources.getDrawable(_mActivity, R.color.text_00000000));
- viewBinding.yearTv.setTextColor(_mActivity.getColor(R.color.text_66000000));
+ viewBinding.yearTv.setTextColor(_mActivity.getColor(R.color.text_66FFFFFF));
viewBinding.lifeCycleTv.setBackground(AppCompatResources.getDrawable(_mActivity, R.drawable.time_selected_38c494));
- viewBinding.lifeCycleTv.setTextColor(_mActivity.getColor(R.color.text_38C494));
+ viewBinding.lifeCycleTv.setTextColor(_mActivity.getColor(R.color.text_E6FFFFFF));
viewBinding.v1.setVisibility(View.VISIBLE);
viewBinding.v2.setVisibility(View.VISIBLE);
@@ -427,20 +427,22 @@
// String generation = getString(R.string.generation) + "/" + UnitType.kWh;
// viewBinding.homePageStationInfoRl1TitleTv.setText(generation);
- viewBinding.homePageStationInfoRl2DayIc.dataTypeTv.setText(R.string.day_power_generation);
- viewBinding.homePageStationInfoRl2MonIc.dataTypeTv.setText(R.string.month_power_generation);
- viewBinding.homePageStationInfoRl2YearIc.dataTypeTv.setText(R.string.year_power_generation);
- viewBinding.homePageStationInfoRl2CumulativeIc.dataTypeTv.setText(R.string.cumulative_power_generation);
+// viewBinding.day.setText(R.string.day_power_generation);
+// viewBinding.month.setText(R.string.month_power_generation);
+// viewBinding.year.setText(R.string.year_power_generation);
+// viewBinding.Total.setText(R.string.cumulative_power_generation);
+//
+// viewBinding.unitTv.setText(UnitType.kW);
- viewBinding.unitTv.setText(UnitType.kW);
+
viewBinding.dayTv.setBackground(AppCompatResources.getDrawable(_mActivity, R.drawable.time_selected_38c494));
- viewBinding.dayTv.setTextColor(_mActivity.getColor(R.color.text_38C494));
+ viewBinding.dayTv.setTextColor(_mActivity.getColor(R.color.text_E6FFFFFF));
viewBinding.monthTv.setBackground(AppCompatResources.getDrawable(_mActivity, R.color.text_00000000));
- viewBinding.monthTv.setTextColor(_mActivity.getColor(R.color.text_66000000));
+ viewBinding.monthTv.setTextColor(_mActivity.getColor(R.color.text_66FFFFFF));
viewBinding.yearTv.setBackground(AppCompatResources.getDrawable(_mActivity, R.color.text_00000000));
- viewBinding.yearTv.setTextColor(_mActivity.getColor(R.color.text_66000000));
+ viewBinding.yearTv.setTextColor(_mActivity.getColor(R.color.text_66FFFFFF));
viewBinding.lifeCycleTv.setBackground(AppCompatResources.getDrawable(_mActivity, R.color.text_00000000));
- viewBinding.lifeCycleTv.setTextColor(_mActivity.getColor(R.color.text_66000000));
+ viewBinding.lifeCycleTv.setTextColor(_mActivity.getColor(R.color.text_66FFFFFF));
viewBinding.v1.setVisibility(View.GONE);
viewBinding.v2.setVisibility(View.VISIBLE);
viewBinding.v3.setVisibility(View.VISIBLE);
@@ -529,12 +531,27 @@
// spannableString.setSpan(colorSpan, startIndex, endIndex, 0);
// viewBinding.infoRl1FText1Tv.setText(spannableString);
viewBinding.infoRl1FText1Tv.setText(dataOverBean.getPowerRatio());
+ try {
+ int progress = 0;
+ if (!TextUtils.isEmpty(dataOverBean.getPowerRatio())) {
+ progress = (int) Double.parseDouble(dataOverBean.getPowerRatio());
+ if (progress > 100) {
+ progress = 100;
+ }
+ if (progress < 0) {
+ progress = 0;
+ }
+ viewBinding.progressBar.setProgress(progress);
+ }
+ } catch (Exception ignored) {
+ }
- viewBinding.homePageStationInfoRl2DayIc.dataTv.setText(HdlCommonLogic.getConvertDoubleUnit(dataOverBean.getTodayElectricity()));
- viewBinding.homePageStationInfoRl2MonIc.dataTv.setText(HdlCommonLogic.getConvertDoubleUnit(dataOverBean.getMonthElectricity()));
- viewBinding.homePageStationInfoRl2YearIc.dataTv.setText(HdlCommonLogic.getConvertDoubleUnit(dataOverBean.getYearElectricity()));
- viewBinding.homePageStationInfoRl2CumulativeIc.dataTv.setText(HdlCommonLogic.getConvertDoubleUnit(dataOverBean.getTotalElectricity()));
+ viewBinding.day.setText(HdlCommonLogic.getConvertDoubleUnit(dataOverBean.getTodayElectricity()));
+ viewBinding.month.setText(HdlCommonLogic.getConvertDoubleUnit(dataOverBean.getMonthElectricity()));
+ viewBinding.year.setText(HdlCommonLogic.getConvertDoubleUnit(dataOverBean.getYearElectricity()));
+ viewBinding.Total.setText(HdlCommonLogic.getConvertDoubleUnit(dataOverBean.getTotalElectricity()));
+
}
});
}
diff --git a/app/src/main/res/drawable/bj.png b/app/src/main/res/drawable/bj.png
index 4b2f787..a6dc8f0 100644
--- a/app/src/main/res/drawable/bj.png
+++ b/app/src/main/res/drawable/bj.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 63c8549..5789d90 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/home_page_unselected.png b/app/src/main/res/drawable/home_page_unselected.png
index ddf808d..b773ebb 100644
--- a/app/src/main/res/drawable/home_page_unselected.png
+++ b/app/src/main/res/drawable/home_page_unselected.png
Binary files differ
diff --git a/app/src/main/res/drawable/last_step.png b/app/src/main/res/drawable/last_step.png
index 76e89c7..1554e08 100644
--- a/app/src/main/res/drawable/last_step.png
+++ b/app/src/main/res/drawable/last_step.png
Binary files differ
diff --git a/app/src/main/res/drawable/line_c1c1c1.xml b/app/src/main/res/drawable/line_c1c1c1.xml
index fab5ec0..bc7305c 100644
--- a/app/src/main/res/drawable/line_c1c1c1.xml
+++ b/app/src/main/res/drawable/line_c1c1c1.xml
@@ -1,7 +1,7 @@
<?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_C1C1C1" />
+ android:width="0.5dp"
+ android:color="@color/text_33FFFFFF" />
<corners android:radius="@dimen/dp_6" />
</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/linear_progress_drawable.xml b/app/src/main/res/drawable/linear_progress_drawable.xml
new file mode 100644
index 0000000..13f1ebf
--- /dev/null
+++ b/app/src/main/res/drawable/linear_progress_drawable.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+ <item android:id="@android:id/background">
+ <shape>
+ <solid android:color="@color/text_1AFFFFFF" /> <!-- 鑳屾櫙棰滆壊 -->
+ <corners android:radius="46.5dp" /> <!-- 杈硅鐨勫渾搴� -->
+ </shape>
+ </item>
+ <item android:id="@android:id/progress">
+ <clip>
+ <shape>
+ <solid android:color="@color/text_FF36FFBA" /> <!-- 杩涘害棰滆壊 -->
+ <corners android:radius="5dp" />
+ </shape>
+ </clip>
+ </item>
+</layer-list>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/me_selected.png b/app/src/main/res/drawable/me_selected.png
index 373d160..6079ce0 100644
--- a/app/src/main/res/drawable/me_selected.png
+++ b/app/src/main/res/drawable/me_selected.png
Binary files differ
diff --git a/app/src/main/res/drawable/me_unselected.png b/app/src/main/res/drawable/me_unselected.png
index 2832896..3fb06b3 100644
--- a/app/src/main/res/drawable/me_unselected.png
+++ b/app/src/main/res/drawable/me_unselected.png
Binary files differ
diff --git a/app/src/main/res/drawable/message_selected.png b/app/src/main/res/drawable/message_selected.png
index baabed1..b0434ab 100644
--- a/app/src/main/res/drawable/message_selected.png
+++ b/app/src/main/res/drawable/message_selected.png
Binary files differ
diff --git a/app/src/main/res/drawable/message_unselected.png b/app/src/main/res/drawable/message_unselected.png
index 773462a..196197b 100644
--- a/app/src/main/res/drawable/message_unselected.png
+++ b/app/src/main/res/drawable/message_unselected.png
Binary files differ
diff --git a/app/src/main/res/drawable/next_step.png b/app/src/main/res/drawable/next_step.png
index 62d6974..c517cac 100644
--- a/app/src/main/res/drawable/next_step.png
+++ b/app/src/main/res/drawable/next_step.png
Binary files differ
diff --git a/app/src/main/res/drawable/power_station_selected.png b/app/src/main/res/drawable/power_station_selected.png
index 4d12406..52cab10 100644
--- a/app/src/main/res/drawable/power_station_selected.png
+++ b/app/src/main/res/drawable/power_station_selected.png
Binary files differ
diff --git a/app/src/main/res/drawable/power_station_unselected.png b/app/src/main/res/drawable/power_station_unselected.png
index 3331876..fc6ae25 100644
--- a/app/src/main/res/drawable/power_station_unselected.png
+++ b/app/src/main/res/drawable/power_station_unselected.png
Binary files differ
diff --git a/app/src/main/res/drawable/time_selected_38c494.xml b/app/src/main/res/drawable/time_selected_38c494.xml
index 4d80ef2..063d3f9 100644
--- a/app/src/main/res/drawable/time_selected_38c494.xml
+++ b/app/src/main/res/drawable/time_selected_38c494.xml
@@ -3,6 +3,7 @@
<solid android:color="@color/text_1238C494" />
<corners android:radius="@dimen/dp_6" />
<stroke
- android:width="@dimen/dp_1"
- android:color="@color/text_38C494" />
+ android:width="0.5dp"
+ android:color="@color/text_33FFFFFF" />
+ <solid android:color="@color/text_FF555859"/>
</shape>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_my_power_station.xml b/app/src/main/res/layout/activity_my_power_station.xml
index 719fb3c..f07e0a6 100644
--- a/app/src/main/res/layout/activity_my_power_station.xml
+++ b/app/src/main/res/layout/activity_my_power_station.xml
@@ -22,7 +22,7 @@
android:id="@+id/my_power_station_bottom_ll"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_64"
- android:background="@drawable/ffffff_18"
+ android:background="@color/text_FF333738"
android:orientation="horizontal"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout/fragment_home_page.xml b/app/src/main/res/layout/fragment_home_page.xml
index 1178c62..5bbb558 100644
--- a/app/src/main/res/layout/fragment_home_page.xml
+++ b/app/src/main/res/layout/fragment_home_page.xml
@@ -54,7 +54,10 @@
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
- android:layout_height="wrap_content">
+ android:layout_height="wrap_content"
+ android:paddingBottom="@dimen/dp_16"
+
+ >
<!--鏉′欢绛涢��-->
<LinearLayout
@@ -181,7 +184,6 @@
</LinearLayout>
- <!--瑁呮満瀹归噺 鍙戠數鍔熺巼鏁版嵁鏄剧ず-->
<LinearLayout
android:id="@+id/home_page_station_info_cl"
android:layout_width="0dp"
@@ -194,7 +196,7 @@
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/home_page_station_ll">
-
+ <!--瑁呮満瀹归噺 鍙戠數鍔熺巼鏁版嵁鏄剧ず-->
<LinearLayout
android:id="@+id/home_page_station_info_ll"
android:layout_width="match_parent"
@@ -237,7 +239,8 @@
android:layout_below="@+id/home_page_station_info_rl1_f_text2_tv"
android:layout_alignStart="@+id/info_rl1_f_text1_tv"
android:max="100"
- android:progress="20" />
+ android:progress="0"
+ android:progressDrawable="@drawable/linear_progress_drawable" />
<TextView
android:id="@+id/info_rl1_f_title_tv"
@@ -332,69 +335,187 @@
</LinearLayout>
-
+ <!--鍒嗗壊绾�-->
<View
android:layout_width="match_parent"
android:layout_height="0.5dp"
android:background="@color/text_1AFFFFFF" />
-
- <RelativeLayout
- android:id="@+id/home_page_station_info_rl2"
+ <!--鍙戠數閲� 鏃ワ紝鏈堬紝骞�-->
+ <LinearLayout
android:layout_width="match_parent"
- android:layout_height="@dimen/dp_166"
- android:background="@drawable/page_station_generating_bj"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@+id/home_page_station_info_rl1">
+ android:layout_height="@dimen/dp_133"
+ android:orientation="horizontal">
+
+ <RelativeLayout
+ android:layout_width="@dimen/dp_0"
+ android:layout_height="match_parent"
+ android:layout_weight="1">
+ <!--鏃�-->
+ <TextView
+ android:id="@+id/day"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginStart="40.5dp"
+ android:layout_marginTop="18dp"
+ android:text="0.00"
+ android:textColor="@color/text_E6FFFFFF"
+ android:textSize="@dimen/text_16" />
+
+ <TextView
+ android:id="@+id/day_unit"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_alignBottom="@+id/day"
+ android:layout_marginStart="4dp"
+ android:layout_marginBottom="2dp"
+ android:layout_toEndOf="@+id/day"
+ android:text="kWh"
+ android:textColor="@color/text_66FFFFFF"
+ android:textSize="@dimen/text_10" />
+
+ <TextView
+ android:id="@+id/day_des"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_below="@+id/day_unit"
+ android:layout_alignStart="@+id/day"
+ android:text="@string/day_power_generation"
+ android:textColor="@color/text_66FFFFFF"
+ android:textSize="@dimen/text_12" />
+
+ <!--骞�-->
+ <TextView
+ android:id="@+id/year"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_below="@+id/day_des"
+ android:layout_marginStart="40.5dp"
+ android:layout_marginTop="20dp"
+ android:text="0.00"
+ android:textColor="@color/text_E6FFFFFF"
+ android:textSize="@dimen/text_16" />
+
+ <TextView
+ android:id="@+id/year_unit"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_alignBottom="@+id/year"
+ android:layout_marginStart="4dp"
+ android:layout_marginBottom="2dp"
+ android:layout_toEndOf="@+id/year"
+ android:text="kWh"
+ android:textColor="@color/text_66FFFFFF"
+ android:textSize="@dimen/text_10" />
+
+ <TextView
+ android:id="@+id/year_des"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_below="@+id/year_unit"
+ android:layout_alignStart="@+id/year"
+ android:text="@string/year_power_generation"
+ android:textColor="@color/text_66FFFFFF"
+ android:textSize="@dimen/text_12" />
- <include
- android:id="@+id/home_page_station_info_rl2_day_ic"
- layout="@layout/item_data"
- android:layout_width="@dimen/dp_171"
- android:layout_height="@dimen/dp_44"
- android:layout_marginTop="47.5dp" />
+ </RelativeLayout>
- <View
- android:id="@+id/line1_v"
+ <!--鍒嗗壊绾�-->
+ <LinearLayout
android:layout_width="0.5dp"
- android:layout_height="37.5dp"
- android:layout_marginTop="53dp"
- android:layout_toEndOf="@+id/home_page_station_info_rl2_day_ic"
- android:background="@color/text_E1E1E1" />
+ android:layout_height="match_parent"
+ android:orientation="vertical">
- <include
- android:id="@+id/home_page_station_info_rl2_mon_ic"
- layout="@layout/item_data"
- android:layout_width="@dimen/dp_171"
- android:layout_height="@dimen/dp_44"
- android:layout_marginTop="47.5dp"
- android:layout_toEndOf="@+id/line1_v" />
+ <View
+ android:layout_width="match_parent"
+ android:layout_height="37.5dp"
+ android:layout_marginTop="21.5dp"
+ android:background="@color/text_1AFFFFFF" />
- <include
- android:id="@+id/home_page_station_info_rl2_year_ic"
- layout="@layout/item_data"
- android:layout_width="@dimen/dp_171"
- android:layout_height="@dimen/dp_44"
- android:layout_marginTop="106dp" />
+ <View
+ android:layout_width="match_parent"
+ android:layout_height="37.5dp"
+ android:layout_marginTop="@dimen/dp_19"
+ android:background="@color/text_1AFFFFFF" />
+ </LinearLayout>
- <View
- android:id="@+id/line2_v"
- android:layout_width="0.5dp"
- android:layout_height="37.5dp"
- android:layout_marginTop="109.5dp"
- android:layout_toEndOf="@+id/home_page_station_info_rl2_year_ic"
- android:background="@color/text_E1E1E1" />
+ <RelativeLayout
+ android:layout_width="@dimen/dp_0"
+ android:layout_height="match_parent"
+ android:layout_weight="1">
+ <!--鏈�-->
+ <TextView
+ android:id="@+id/month"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginStart="40.5dp"
+ android:layout_marginTop="18dp"
+ android:text="0.00"
+ android:textColor="@color/text_E6FFFFFF"
+ android:textSize="@dimen/text_16" />
- <include
- android:id="@+id/home_page_station_info_rl2_cumulative_ic"
- layout="@layout/item_data"
- android:layout_width="@dimen/dp_171"
- android:layout_height="@dimen/dp_44"
- android:layout_marginTop="106dp"
- android:layout_toEndOf="@+id/line2_v" />
+ <TextView
+ android:id="@+id/month_unit"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_alignBottom="@+id/month"
+ android:layout_marginStart="4dp"
+ android:layout_marginBottom="2dp"
+ android:layout_toEndOf="@+id/month"
+ android:text="kWh"
+ android:textColor="@color/text_66FFFFFF"
+ android:textSize="@dimen/text_10" />
- </RelativeLayout>
+ <TextView
+ android:id="@+id/month_des"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_below="@+id/month_unit"
+ android:layout_alignStart="@+id/month"
+ android:text="@string/month_power_generation"
+ android:textColor="@color/text_66FFFFFF"
+ android:textSize="@dimen/text_12" />
+
+ <!--绱鍙戠數閲�-->
+ <TextView
+ android:id="@+id/Total"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_below="@+id/month_des"
+ android:layout_marginStart="40.5dp"
+ android:layout_marginTop="20dp"
+ android:text="0.00"
+ android:textColor="@color/text_E6FFFFFF"
+ android:textSize="@dimen/text_16" />
+
+ <TextView
+ android:id="@+id/Total_unit"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_alignBottom="@+id/Total"
+ android:layout_marginStart="4dp"
+ android:layout_marginBottom="2dp"
+ android:layout_toEndOf="@+id/Total"
+ android:text="kWh"
+ android:textColor="@color/text_66FFFFFF"
+ android:textSize="@dimen/text_10" />
+
+ <TextView
+ android:id="@+id/Total_des"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_below="@+id/Total_unit"
+ android:layout_alignStart="@+id/month"
+ android:text="@string/cumulative_power_generation"
+ android:textColor="@color/text_66FFFFFF"
+ android:textSize="@dimen/text_12" />
+
+
+ </RelativeLayout>
+
+
+ </LinearLayout>
+
</LinearLayout>
<!--鏃ユ湡-->
<androidx.constraintlayout.widget.ConstraintLayout
@@ -402,7 +523,9 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dp_16"
+ android:layout_marginTop="@dimen/dp_10"
android:layout_marginEnd="@dimen/dp_16"
+ android:background="@drawable/bj_ff333738"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/home_page_station_info_cl">
@@ -410,20 +533,22 @@
<TextView
android:id="@+id/home_page_station_data_title_tv"
android:layout_width="wrap_content"
- android:layout_height="18dp"
- android:layout_marginTop="@dimen/dp_25"
+ android:layout_height="wrap_content"
+ android:layout_marginStart="@dimen/dp_16"
+ android:layout_marginTop="@dimen/dp_16"
android:text="@string/energy_generation_statistics"
- android:textColor="@color/text_E6000000"
+ android:textColor="@color/text_E6FFFFFF"
android:textSize="@dimen/text_14"
- android:textStyle="bold"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<!--鏃堕棿绫诲瀷-->
<LinearLayout
android:id="@+id/home_page_station_select_time_type_ll"
- android:layout_width="match_parent"
+ android:layout_width="0dp"
android:layout_height="30.5dp"
- android:layout_marginTop="@dimen/dp_13"
+ android:layout_marginStart="@dimen/dp_16"
+ android:layout_marginTop="@dimen/dp_16"
+ android:layout_marginEnd="@dimen/dp_16"
android:background="@drawable/line_c1c1c1"
android:orientation="horizontal"
app:layout_constraintEnd_toEndOf="parent"
@@ -432,51 +557,55 @@
<TextView
android:id="@+id/day_tv"
- style="@style/Text14Style"
- android:layout_width="85dp"
+ style="@style/Text12Style"
+ android:layout_width="0dp"
android:layout_height="match_parent"
+ android:layout_weight="1"
android:gravity="center"
android:text="@string/day" />
<View
android:id="@+id/v_1"
- android:layout_width="1dp"
+ android:layout_width="0.5dp"
android:layout_height="match_parent"
- android:background="@color/text_C1C1C1" />
+ android:background="@color/text_33FFFFFF" />
<TextView
android:id="@+id/month_tv"
- style="@style/Text14Style"
- android:layout_width="85dp"
+ style="@style/Text12Style"
+ android:layout_width="0dp"
android:layout_height="match_parent"
+ android:layout_weight="1"
android:gravity="center"
android:text="@string/month" />
<View
android:id="@+id/v_2"
- android:layout_width="1dp"
+ android:layout_width="0.5dp"
android:layout_height="match_parent"
- android:background="@color/text_C1C1C1" />
+ android:background="@color/text_33FFFFFF" />
<TextView
android:id="@+id/year_tv"
- style="@style/Text14Style"
- android:layout_width="85dp"
+ style="@style/Text12Style"
+ android:layout_width="0dp"
android:layout_height="match_parent"
+ android:layout_weight="1"
android:gravity="center"
android:text="@string/year" />
<View
android:id="@+id/v_3"
- android:layout_width="1dp"
+ android:layout_width="0.5dp"
android:layout_height="match_parent"
- android:background="@color/text_C1C1C1" />
+ android:background="@color/text_33FFFFFF" />
<TextView
android:id="@+id/lifeCycle_tv"
- style="@style/Text14Style"
- android:layout_width="86dp"
+ style="@style/Text12Style"
+ android:layout_width="0dp"
android:layout_height="match_parent"
+ android:layout_weight="1"
android:gravity="center"
android:text="@string/life_cycle" />
@@ -486,7 +615,7 @@
android:id="@+id/home_page_station_select_time_ll"
android:layout_width="match_parent"
android:layout_height="30.5dp"
- android:layout_marginTop="@dimen/dp_23"
+ android:layout_marginTop="@dimen/dp_24"
android:gravity="center"
android:orientation="horizontal"
app:layout_constraintEnd_toEndOf="parent"
@@ -526,9 +655,8 @@
android:layout_height="match_parent"
android:gravity="center"
android:text="2024/03/07"
- android:textColor="@color/text_E6000000"
- android:textSize="@dimen/text_16"
- android:textStyle="bold" />
+ android:textColor="@color/text_E6FFFFFF"
+ android:textSize="@dimen/text_14" />
<View
android:layout_width="@dimen/dp_16"
@@ -563,7 +691,7 @@
android:id="@+id/chart_title_rl"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_15"
- android:layout_marginTop="@dimen/dp_36"
+ android:layout_marginTop="@dimen/dp_26"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/home_page_station_select_time_ll">
@@ -573,6 +701,7 @@
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_alignParentStart="true"
+ android:layout_marginStart="18.5dp"
android:textColor="@color/text_66000000"
android:textSize="@dimen/text_12" />
@@ -590,8 +719,9 @@
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_alignParentEnd="true"
+ android:layout_marginEnd="@dimen/dp_16"
android:text="@string/pv_power"
- android:textColor="@color/text_E6000000"
+ android:textColor="@color/text_E6FFFFFF"
android:textSize="@dimen/text_12" />
</RelativeLayout>
@@ -615,11 +745,14 @@
<!--绀句細璐＄尞鏄剧ず-->
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/home_page_station_statistics_cl"
- android:layout_width="match_parent"
- android:layout_height="186dp"
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dp_16"
- android:layout_marginTop="@dimen/dp_26"
+ android:layout_marginTop="@dimen/dp_10"
android:layout_marginEnd="@dimen/dp_16"
+ android:background="@drawable/bj_ff333738"
+
+ android:paddingBottom="@dimen/dp_16"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/home_page_station_data_cl">
@@ -627,178 +760,183 @@
<TextView
android:id="@+id/social_contribution_title_tv"
android:layout_width="wrap_content"
- android:layout_height="17dp"
+ android:layout_height="wrap_content"
+ android:layout_marginStart="@dimen/dp_16"
+ android:layout_marginTop="@dimen/dp_16"
android:text="@string/social_contribution"
- android:textColor="@color/text_E6000000"
+ android:textColor="@color/text_E6FFFFFF"
android:textSize="@dimen/text_14"
- android:textStyle="bold"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
- <RelativeLayout
- android:id="@+id/social_contribution_1_rl"
- android:layout_width="@dimen/dp_104"
- android:layout_height="@dimen/dp_126"
- android:layout_marginTop="@dimen/dp_13"
+ <LinearLayout
+ android:id="@+id/ll"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginStart="@dimen/dp_16"
+ android:layout_marginTop="@dimen/dp_16"
+ android:layout_marginEnd="@dimen/dp_16"
+ android:orientation="horizontal"
+ app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/social_contribution_title_tv">
- <ImageView
- android:layout_width="match_parent"
+ <RelativeLayout
+ android:id="@+id/social_contribution_1_rl"
+ android:layout_width="97dp"
+ android:layout_height="@dimen/dp_126">
+
+ <ImageView
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:scaleType="fitCenter"
+ android:src="@drawable/social_contribution_1" />
+
+ <TextView
+ android:id="@+id/social_contribution_data_1_tv"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_alignParentStart="true"
+ android:layout_alignParentTop="true"
+ android:layout_marginStart="@dimen/dp_8"
+ android:layout_marginTop="@dimen/dp_8"
+ android:text="13.14"
+ android:textColor="@color/text_E6FFFFFF"
+ android:textSize="@dimen/text_16" />
+
+ <TextView
+ android:id="@+id/social_contribution_unit_1_tv"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_alignBottom="@+id/social_contribution_data_1_tv"
+ android:layout_marginStart="2.5dp"
+ android:layout_toEndOf="@+id/social_contribution_data_1_tv"
+ android:text="@string/t"
+ android:textColor="@color/text_66FFFFFF"
+ android:textSize="@dimen/text_12" />
+
+ <TextView
+ android:id="@+id/social_contribution_des_1_tv"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_below="@+id/social_contribution_data_1_tv"
+ android:layout_alignParentStart="true"
+ android:layout_marginStart="@dimen/dp_8"
+ android:text="@string/saving_standard_coal"
+ android:textColor="@color/text_66FFFFFF"
+ android:textSize="@dimen/text_11" />
+
+
+ </RelativeLayout>
+
+ <View
+ android:layout_width="0dp"
android:layout_height="match_parent"
- android:scaleType="fitCenter"
- android:src="@drawable/social_contribution_1" />
+ android:layout_weight="1" />
- <TextView
- android:id="@+id/social_contribution_data_1_tv"
- android:layout_width="wrap_content"
- android:layout_height="22dp"
- android:layout_alignParentStart="true"
- android:layout_alignParentTop="true"
- android:layout_marginStart="@dimen/dp_10"
- android:layout_marginTop="@dimen/dp_12"
- android:text="13.14"
- android:textColor="@color/text_E6000000"
- android:textSize="@dimen/text_18"
- android:textStyle="bold" />
+ <RelativeLayout
+ android:id="@+id/social_contribution_2_rl"
+ android:layout_width="97dp"
+ android:layout_height="@dimen/dp_126">
- <TextView
- android:id="@+id/social_contribution_unit_1_tv"
- android:layout_width="wrap_content"
- android:layout_height="15dp"
- android:layout_alignBottom="@+id/social_contribution_data_1_tv"
- android:layout_marginStart="@dimen/dp_2"
- android:layout_toEndOf="@+id/social_contribution_data_1_tv"
- android:text="@string/t"
- android:textColor="@color/text_969696"
- android:textSize="@dimen/text_12"
+ <ImageView
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:scaleType="fitCenter"
+ android:src="@drawable/social_contribution_2" />
+
+ <TextView
+ android:id="@+id/social_contribution_data_2_tv"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_alignParentStart="true"
+ android:layout_alignParentTop="true"
+ android:layout_marginStart="@dimen/dp_8"
+ android:layout_marginTop="@dimen/dp_8"
+ android:text="13.14"
+ android:textColor="@color/text_E6FFFFFF"
+ android:textSize="@dimen/text_16" />
+
+ <TextView
+ android:id="@+id/social_contribution_unit_2_tv"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_alignBottom="@+id/social_contribution_data_2_tv"
+ android:layout_marginStart="2.5dp"
+ android:layout_toEndOf="@+id/social_contribution_data_2_tv"
+ android:text="@string/t"
+ android:textColor="@color/text_66FFFFFF"
+ android:textSize="@dimen/text_12"
+
+ />
+
+ <TextView
+ android:id="@+id/social_contribution_des_2_tv"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_below="@+id/social_contribution_data_2_tv"
+ android:layout_alignParentStart="true"
+ android:layout_marginStart="@dimen/dp_8"
+ android:text="@string/co_reduction_rate"
+ android:textColor="@color/text_66FFFFFF"
+ android:textSize="@dimen/text_11" />
- />
+ </RelativeLayout>
- <TextView
- android:id="@+id/social_contribution_des_1_tv"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_alignParentStart="true"
- android:layout_alignParentTop="true"
- android:layout_marginStart="@dimen/dp_10"
- android:layout_marginTop="@dimen/dp_39"
- android:text="@string/saving_standard_coal"
- android:textColor="@color/text_66000000"
- android:textSize="@dimen/text_12" />
-
-
- </RelativeLayout>
-
- <RelativeLayout
- android:id="@+id/social_contribution_2_rl"
- android:layout_width="@dimen/dp_104"
- android:layout_height="@dimen/dp_126"
- android:layout_marginStart="@dimen/dp_16"
- android:layout_marginTop="@dimen/dp_13"
- app:layout_constraintStart_toEndOf="@+id/social_contribution_1_rl"
- app:layout_constraintTop_toBottomOf="@+id/social_contribution_title_tv">
-
- <ImageView
- android:layout_width="match_parent"
+ <View
+ android:layout_width="0dp"
android:layout_height="match_parent"
- android:scaleType="fitCenter"
- android:src="@drawable/social_contribution_2" />
+ android:layout_weight="1" />
- <TextView
- android:id="@+id/social_contribution_data_2_tv"
- android:layout_width="wrap_content"
- android:layout_height="22dp"
- android:layout_alignParentStart="true"
- android:layout_alignParentTop="true"
- android:layout_marginStart="@dimen/dp_10"
- android:layout_marginTop="@dimen/dp_12"
- android:text="13.14"
- android:textColor="@color/text_E6000000"
- android:textSize="@dimen/text_18"
- android:textStyle="bold" />
+ <RelativeLayout
+ android:id="@+id/social_contribution_3_rl"
+ android:layout_width="97dp"
+ android:layout_height="@dimen/dp_126">
- <TextView
- android:id="@+id/social_contribution_unit_2_tv"
- android:layout_width="wrap_content"
- android:layout_height="15dp"
- android:layout_alignBottom="@+id/social_contribution_data_2_tv"
- android:layout_marginStart="@dimen/dp_2"
- android:layout_toEndOf="@+id/social_contribution_data_2_tv"
- android:text="@string/t"
- android:textColor="@color/text_969696"
- android:textSize="@dimen/text_12"
+ <ImageView
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:scaleType="fitCenter"
+ android:src="@drawable/social_contribution_3" />
- />
+ <TextView
+ android:id="@+id/social_contribution_data_3_tv"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_alignParentStart="true"
+ android:layout_alignParentTop="true"
+ android:layout_marginStart="@dimen/dp_8"
+ android:layout_marginTop="@dimen/dp_8"
+ android:text="13.14"
+ android:textColor="@color/text_E6FFFFFF"
+ android:textSize="@dimen/text_16" />
- <TextView
- android:id="@+id/social_contribution_des_2_tv"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_alignParentStart="true"
- android:layout_alignParentTop="true"
- android:layout_marginStart="@dimen/dp_10"
- android:layout_marginTop="@dimen/dp_39"
- android:text="@string/co_reduction_rate"
- android:textColor="@color/text_66000000"
- android:textSize="@dimen/text_12" />
+ <TextView
+ android:id="@+id/social_contribution_unit_3_tv"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_alignBottom="@+id/social_contribution_data_3_tv"
+ android:layout_marginStart="2.5dp"
+ android:layout_toEndOf="@+id/social_contribution_data_3_tv"
+ android:text="@string/number"
+ android:textColor="@color/text_66FFFFFF"
+ android:textSize="@dimen/text_12" />
+
+ <TextView
+ android:id="@+id/social_contribution_des_3_tv"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_below="@+id/social_contribution_data_3_tv"
+ android:layout_alignParentStart="true"
+ android:layout_marginStart="@dimen/dp_8"
+ android:text="@string/quantity_of_equivalent_values"
+ android:textColor="@color/text_66FFFFFF"
+ android:textSize="@dimen/text_11" />
- </RelativeLayout>
-
- <RelativeLayout
- android:id="@+id/social_contribution_3_rl"
- android:layout_width="@dimen/dp_104"
- android:layout_height="@dimen/dp_126"
- android:layout_marginStart="@dimen/dp_16"
- android:layout_marginTop="@dimen/dp_13"
- app:layout_constraintStart_toEndOf="@+id/social_contribution_2_rl"
- app:layout_constraintTop_toBottomOf="@+id/social_contribution_title_tv">
-
- <ImageView
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:scaleType="fitCenter"
- android:src="@drawable/social_contribution_3" />
-
- <TextView
- android:id="@+id/social_contribution_data_3_tv"
- android:layout_width="wrap_content"
- android:layout_height="22dp"
- android:layout_alignParentTop="true"
- android:layout_marginStart="@dimen/dp_10"
- android:layout_marginTop="@dimen/dp_12"
- android:text="13"
- android:textColor="@color/text_E6000000"
- android:textSize="@dimen/text_18"
- android:textStyle="bold" />
-
- <TextView
- android:id="@+id/social_contribution_unit_3_tv"
- android:layout_width="wrap_content"
- android:layout_height="15dp"
- android:layout_alignBottom="@+id/social_contribution_data_3_tv"
- android:layout_marginStart="@dimen/dp_2"
- android:layout_toEndOf="@+id/social_contribution_data_3_tv"
- android:text="@string/number"
- android:textColor="@color/text_969696"
- android:textSize="@dimen/text_12" />
-
- <TextView
- android:id="@+id/social_contribution_des_3_tv"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_alignParentStart="true"
- android:layout_alignParentTop="true"
- android:layout_marginStart="@dimen/dp_10"
- android:layout_marginTop="@dimen/dp_39"
- android:text="@string/quantity_of_equivalent_values"
- android:textColor="@color/text_66000000"
- android:textSize="@dimen/text_12" />
-
-
- </RelativeLayout>
+ </RelativeLayout>
+ </LinearLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/home_bottom_line.xml b/app/src/main/res/layout/home_bottom_line.xml
index f057b58..64e5360 100644
--- a/app/src/main/res/layout/home_bottom_line.xml
+++ b/app/src/main/res/layout/home_bottom_line.xml
@@ -19,7 +19,7 @@
android:layout_height="wrap_content"
android:layout_below="@+id/icon_iv"
android:layout_centerInParent="true"
- android:textColor="@color/text_E6000000"
+ android:textColor="@color/text_E6FFFFFF"
android:textSize="@dimen/text_12" />
<TextView
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 834f683..d20e4a8 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -59,6 +59,7 @@
<color name="text_1AFFFFFF">#1AFFFFFF</color>
<color name="text_E6FFFFFF">#E6FFFFFF</color>
<color name="text_FF36FFBA">#FF36FFBA</color>
-
+ <color name="text_33FFFFFF">#33FFFFFF</color>
+ <color name="text_FF555859">#FF555859</color>
</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 55df1c0..54e48cf 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -28,6 +28,10 @@
<item name="android:textSize">@dimen/text_14</item>
<item name="android:textColor">@color/text_66000000</item>
</style>
+ <style name="Text12Style">
+ <item name="android:textSize">@dimen/text_12</item>
+ <item name="android:textColor">@color/text_66FFFFFF</item>
+ </style>
<!-- 鑷畾涔夊瓧浣撴牱寮� -->
<style name="Text16Style">
<item name="android:textSize">@dimen/text_16</item>
--
Gitblit v1.8.0