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/layout/fragment_home_page.xml |  604 +++++++++++++++++++++++++++++++++---------------------
 1 files changed, 371 insertions(+), 233 deletions(-)

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>
 

--
Gitblit v1.8.0