~wjc/HDLPhotovoltaicDebugAPP.git

			@@ -25,7 +25,7 @@
			android:layout_height="wrap_content"
			android:layout_centerVertical="true"
			android:text="@string/power_home_page"
			android:textColor="@color/text_E6FFFFFF"
			android:textColor="@color/text_FFACACAC"
			android:textSize="@dimen/text_18" />

			<ImageView
			@@ -37,8 +37,8 @@
			android:src="@drawable/add" />
			</RelativeLayout>

			<androidx.swiperefreshlayout.widget.SwipeRefreshLayout
			android:id="@+id/srl"
			<com.hdl.photovoltaic.widget.refreshlayout.BGARefreshLayout
			android:id="@+id/rsl"
			android:layout_width="match_parent"
			android:layout_height="0dp"
			android:layout_marginTop="@dimen/dp_10"
			@@ -51,7 +51,7 @@
			android:id="@+id/sl"
			android:layout_width="match_parent"
			android:layout_height="match_parent"
			android:layout_marginTop="@dimen/dp_26">
			android:layout_marginTop="@dimen/dp_10">

			<androidx.constraintlayout.widget.ConstraintLayout
			android:layout_width="match_parent"
			@@ -87,7 +87,7 @@
			android:layout_height="wrap_content"
			android:gravity="center"
			android:text="0"
			android:textColor="@color/text_E6FFFFFF"
			android:textColor="@color/text_FFACACAC"
			android:textSize="@dimen/text_16" />

			<TextView
			@@ -96,7 +96,7 @@
			android:layout_height="wrap_content"
			android:gravity="center"
			android:text="@string/message_all"
			android:textColor="@color/text_66FFFFFF"
			android:textColor="@color/text_FF5B5B5B"
			android:textSize="@dimen/text_12" />
			</LinearLayout>
			<!--故障-->
			@@ -114,7 +114,7 @@
			android:layout_height="wrap_content"
			android:gravity="center"
			android:text="0"
			android:textColor="@color/text_E6FFFFFF"
			android:textColor="@color/text_FFACACAC"
			android:textSize="@dimen/text_16" />

			<TextView
			@@ -123,7 +123,7 @@
			android:layout_height="wrap_content"
			android:gravity="center"
			android:text="@string/my_power_station_malfunction"
			android:textColor="@color/text_66FFFFFF"
			android:textColor="@color/text_FF5B5B5B"
			android:textSize="@dimen/text_12" />
			</LinearLayout>
			<!--离线-->
			@@ -141,7 +141,7 @@
			android:layout_height="wrap_content"
			android:gravity="center"
			android:text="0"
			android:textColor="@color/text_E6FFFFFF"
			android:textColor="@color/text_FFACACAC"
			android:textSize="@dimen/text_16" />

			<TextView
			@@ -150,7 +150,7 @@
			android:layout_height="wrap_content"
			android:gravity="center"
			android:text="@string/my_power_station_off_line"
			android:textColor="@color/text_66FFFFFF"
			android:textColor="@color/text_FF5B5B5B"
			android:textSize="@dimen/text_12" />
			</LinearLayout>
			<!--待接入-->
			@@ -168,7 +168,7 @@
			android:layout_height="wrap_content"
			android:gravity="center"
			android:text="0"
			android:textColor="@color/text_E6FFFFFF"
			android:textColor="@color/text_FFACACAC"
			android:textSize="@dimen/text_16" />

			<TextView
			@@ -177,7 +177,7 @@
			android:layout_height="wrap_content"
			android:gravity="center"
			android:text="@string/to_be_added"
			android:textColor="@color/text_66FFFFFF"
			android:textColor="@color/text_FF5B5B5B"
			android:textSize="@dimen/text_12" />
			</LinearLayout>

			@@ -216,7 +216,7 @@
			android:layout_marginStart="@dimen/dp_41"
			android:layout_marginTop="@dimen/dp_32"
			android:text="0"
			android:textColor="@color/text_E6FFFFFF"
			android:textColor="@color/text_FFACACAC"
			android:textSize="@dimen/text_26" />
			<!--先隐藏-->
			<TextView
			@@ -228,7 +228,7 @@
			android:layout_marginBottom="6.5dp"
			android:layout_toEndOf="@+id/info_rl1_f_text1_tv"
			android:text="%"
			android:textColor="@color/text_66FFFFFF"
			android:textColor="@color/text_FF5B5B5B"
			android:textSize="@dimen/text_12"
			android:visibility="visible" />

			@@ -251,7 +251,7 @@
			android:layout_alignStart="@+id/info_rl1_f_text1_tv"
			android:layout_marginTop="@dimen/dp_8"
			android:text="@string/radio"
			android:textColor="@color/text_66FFFFFF"
			android:textColor="@color/text_FF5B5B5B"
			android:textSize="@dimen/text_12" />

			</RelativeLayout>
			@@ -274,7 +274,7 @@
			android:layout_marginStart="42.5dp"
			android:layout_marginTop="16.5dp"
			android:text="0.00"
			android:textColor="@color/text_E6FFFFFF"
			android:textColor="@color/text_FFACACAC"
			android:textSize="@dimen/text_16" />

			<TextView
			@@ -286,7 +286,7 @@
			android:layout_marginBottom="2dp"
			android:layout_toEndOf="@+id/info_rl1_text1_tv"
			android:text="kWp"
			android:textColor="@color/text_66FFFFFF"
			android:textColor="@color/text_FF5B5B5B"
			android:textSize="@dimen/text_10" />

			<TextView
			@@ -296,7 +296,7 @@
			android:layout_below="@+id/info_rl1_text1_tv"
			android:layout_alignStart="@+id/info_rl1_text1_tv"
			android:text="@string/string_capacity"
			android:textColor="@color/text_66FFFFFF"
			android:textColor="@color/text_FF5B5B5B"
			android:textSize="@dimen/text_12" />

			<TextView
			@@ -307,7 +307,7 @@
			android:layout_alignStart="@+id/info_rl1_text1_tv"
			android:layout_marginTop="@dimen/dp_18"
			android:text="0.00"
			android:textColor="@color/text_E6FFFFFF"
			android:textColor="@color/text_FFACACAC"
			android:textSize="@dimen/text_16" />

			<TextView
			@@ -319,7 +319,7 @@
			android:layout_marginBottom="2dp"
			android:layout_toEndOf="@+id/info_rl1_text3_tv"
			android:text="kW"
			android:textColor="@color/text_66FFFFFF"
			android:textColor="@color/text_FF5B5B5B"
			android:textSize="@dimen/text_10" />

			<TextView
			@@ -329,7 +329,7 @@
			android:layout_below="@+id/info_rl1_text3_tv"
			android:layout_alignStart="@+id/info_rl1_text1_tv"
			android:text="@string/generated_power"
			android:textColor="@color/text_66FFFFFF"
			android:textColor="@color/text_FF5B5B5B"
			android:textSize="@dimen/text_12" />

			</RelativeLayout>
			@@ -359,7 +359,7 @@
			android:layout_marginStart="40.5dp"
			android:layout_marginTop="18dp"
			android:text="0.00"
			android:textColor="@color/text_E6FFFFFF"
			android:textColor="@color/text_FFACACAC"
			android:textSize="@dimen/text_16" />

			<TextView
			@@ -371,7 +371,7 @@
			android:layout_marginBottom="2dp"
			android:layout_toEndOf="@+id/day"
			android:text="kWh"
			android:textColor="@color/text_66FFFFFF"
			android:textColor="@color/text_FF5B5B5B"
			android:textSize="@dimen/text_10" />

			<TextView
			@@ -381,7 +381,7 @@
			android:layout_below="@+id/day_unit"
			android:layout_alignStart="@+id/day"
			android:text="@string/day_power_generation"
			android:textColor="@color/text_66FFFFFF"
			android:textColor="@color/text_FF5B5B5B"
			android:textSize="@dimen/text_12" />

			<!--年-->
			@@ -393,7 +393,7 @@
			android:layout_marginStart="40.5dp"
			android:layout_marginTop="20dp"
			android:text="0.00"
			android:textColor="@color/text_E6FFFFFF"
			android:textColor="@color/text_FFACACAC"
			android:textSize="@dimen/text_16" />

			<TextView
			@@ -405,7 +405,7 @@
			android:layout_marginBottom="2dp"
			android:layout_toEndOf="@+id/year"
			android:text="kWh"
			android:textColor="@color/text_66FFFFFF"
			android:textColor="@color/text_FF5B5B5B"
			android:textSize="@dimen/text_10" />

			<TextView
			@@ -415,7 +415,7 @@
			android:layout_below="@+id/year_unit"
			android:layout_alignStart="@+id/year"
			android:text="@string/year_power_generation"
			android:textColor="@color/text_66FFFFFF"
			android:textColor="@color/text_FF5B5B5B"
			android:textSize="@dimen/text_12" />


			@@ -452,7 +452,7 @@
			android:layout_marginStart="40.5dp"
			android:layout_marginTop="18dp"
			android:text="0.00"
			android:textColor="@color/text_E6FFFFFF"
			android:textColor="@color/text_FFACACAC"
			android:textSize="@dimen/text_16" />

			<TextView
			@@ -464,7 +464,7 @@
			android:layout_marginBottom="2dp"
			android:layout_toEndOf="@+id/month"
			android:text="kWh"
			android:textColor="@color/text_66FFFFFF"
			android:textColor="@color/text_FF5B5B5B"
			android:textSize="@dimen/text_10" />

			<TextView
			@@ -474,7 +474,7 @@
			android:layout_below="@+id/month_unit"
			android:layout_alignStart="@+id/month"
			android:text="@string/month_power_generation"
			android:textColor="@color/text_66FFFFFF"
			android:textColor="@color/text_FF5B5B5B"
			android:textSize="@dimen/text_12" />

			<!--累计发电量-->
			@@ -486,7 +486,7 @@
			android:layout_marginStart="40.5dp"
			android:layout_marginTop="20dp"
			android:text="0.00"
			android:textColor="@color/text_E6FFFFFF"
			android:textColor="@color/text_FFACACAC"
			android:textSize="@dimen/text_16" />

			<TextView
			@@ -498,7 +498,7 @@
			android:layout_marginBottom="2dp"
			android:layout_toEndOf="@+id/Total"
			android:text="kWh"
			android:textColor="@color/text_66FFFFFF"
			android:textColor="@color/text_FF5B5B5B"
			android:textSize="@dimen/text_10" />

			<TextView
			@@ -508,7 +508,7 @@
			android:layout_below="@+id/Total_unit"
			android:layout_alignStart="@+id/month"
			android:text="@string/cumulative_power_generation"
			android:textColor="@color/text_66FFFFFF"
			android:textColor="@color/text_FF5B5B5B"
			android:textSize="@dimen/text_12" />


			@@ -539,7 +539,7 @@
			android:layout_marginStart="@dimen/dp_16"
			android:layout_marginTop="@dimen/dp_16"
			android:text="@string/energy_generation_statistics"
			android:textColor="@color/text_E6FFFFFF"
			android:textColor="@color/text_FFACACAC"
			android:textSize="@dimen/text_14"
			app:layout_constraintStart_toStartOf="parent"
			app:layout_constraintTop_toTopOf="parent" />
			@@ -564,7 +564,8 @@
			android:layout_height="match_parent"
			android:layout_weight="1"
			android:gravity="center"
			android:text="@string/day" />
			android:text="@string/day"
			android:textStyle="bold" />

			<View
			android:id="@+id/v_1"
			@@ -579,7 +580,8 @@
			android:layout_height="match_parent"
			android:layout_weight="1"
			android:gravity="center"
			android:text="@string/month" />
			android:text="@string/month"
			android:textStyle="bold" />

			<View
			android:id="@+id/v_2"
			@@ -594,7 +596,8 @@
			android:layout_height="match_parent"
			android:layout_weight="1"
			android:gravity="center"
			android:text="@string/year" />
			android:text="@string/year"
			android:textStyle="bold" />

			<View
			android:id="@+id/v_3"
			@@ -609,7 +612,8 @@
			android:layout_height="match_parent"
			android:layout_weight="1"
			android:gravity="center"
			android:text="@string/life_cycle" />
			android:text="@string/life_cycle"
			android:textStyle="bold" />

			</LinearLayout>
			<!--时间切换控件-->
			@@ -657,7 +661,7 @@
			android:layout_height="match_parent"
			android:gravity="center"
			android:text="2024/03/07"
			android:textColor="@color/text_E6FFFFFF"
			android:textColor="@color/text_FFACACAC"
			android:textSize="@dimen/text_14" />

			<View
			@@ -704,7 +708,7 @@
			android:layout_height="match_parent"
			android:layout_alignParentStart="true"
			android:layout_marginStart="18.5dp"
			android:textColor="@color/text_66FFFFFF"
			android:textColor="@color/text_FF5B5B5B"
			android:textSize="@dimen/text_12" />

			<TextView
			@@ -723,7 +727,7 @@
			android:layout_alignParentEnd="true"
			android:layout_marginEnd="@dimen/dp_16"
			android:text="@string/pv_power"
			android:textColor="@color/text_E6FFFFFF"
			android:textColor="@color/text_FFACACAC"
			android:textSize="@dimen/text_12" />

			</RelativeLayout>
			@@ -767,7 +771,7 @@
			android:layout_marginStart="@dimen/dp_16"
			android:layout_marginTop="@dimen/dp_16"
			android:text="@string/social_contribution"
			android:textColor="@color/text_E6FFFFFF"
			android:textColor="@color/text_FFACACAC"
			android:textSize="@dimen/text_14"
			app:layout_constraintStart_toStartOf="parent"
			app:layout_constraintTop_toTopOf="parent" />
			@@ -804,7 +808,7 @@
			android:layout_marginStart="@dimen/dp_8"
			android:layout_marginTop="@dimen/dp_8"
			android:text="13.14"
			android:textColor="@color/text_E6FFFFFF"
			android:textColor="@color/text_FFACACAC"
			android:textSize="@dimen/text_16" />

			<TextView
			@@ -815,7 +819,7 @@
			android:layout_marginStart="2.5dp"
			android:layout_toEndOf="@+id/social_contribution_data_1_tv"
			android:text="@string/t"
			android:textColor="@color/text_66FFFFFF"
			android:textColor="@color/text_FF5B5B5B"
			android:textSize="@dimen/text_12" />

			<TextView
			@@ -826,7 +830,7 @@
			android:layout_alignParentStart="true"
			android:layout_marginStart="@dimen/dp_8"
			android:text="@string/saving_standard_coal"
			android:textColor="@color/text_66FFFFFF"
			android:textColor="@color/text_FF5B5B5B"
			android:textSize="@dimen/text_10" />


			@@ -857,7 +861,7 @@
			android:layout_marginStart="@dimen/dp_8"
			android:layout_marginTop="@dimen/dp_8"
			android:text="13.14"
			android:textColor="@color/text_E6FFFFFF"
			android:textColor="@color/text_FFACACAC"
			android:textSize="@dimen/text_16" />

			<TextView
			@@ -868,7 +872,7 @@
			android:layout_marginStart="2.5dp"
			android:layout_toEndOf="@+id/social_contribution_data_2_tv"
			android:text="@string/t"
			android:textColor="@color/text_66FFFFFF"
			android:textColor="@color/text_FF5B5B5B"
			android:textSize="@dimen/text_12"

			/>
			@@ -881,7 +885,7 @@
			android:layout_alignParentStart="true"
			android:layout_marginStart="@dimen/dp_8"
			android:text="@string/co_reduction_rate"
			android:textColor="@color/text_66FFFFFF"
			android:textColor="@color/text_FF5B5B5B"
			android:textSize="@dimen/text_10" />


			@@ -912,7 +916,7 @@
			android:layout_marginStart="@dimen/dp_8"
			android:layout_marginTop="@dimen/dp_8"
			android:text="13.14"
			android:textColor="@color/text_E6FFFFFF"
			android:textColor="@color/text_FFACACAC"
			android:textSize="@dimen/text_16" />

			<TextView
			@@ -923,7 +927,7 @@
			android:layout_marginStart="2.5dp"
			android:layout_toEndOf="@+id/social_contribution_data_3_tv"
			android:text="@string/number"
			android:textColor="@color/text_66FFFFFF"
			android:textColor="@color/text_FF5B5B5B"
			android:textSize="@dimen/text_12" />

			<TextView
			@@ -934,7 +938,7 @@
			android:layout_alignParentStart="true"
			android:layout_marginStart="@dimen/dp_8"
			android:text="@string/quantity_of_equivalent_values"
			android:textColor="@color/text_66FFFFFF"
			android:textColor="@color/text_FF5B5B5B"
			android:textSize="@dimen/text_10" />


			@@ -948,7 +952,21 @@


			</ScrollView>
			</androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
			</com.hdl.photovoltaic.widget.refreshlayout.BGARefreshLayout>

			<!-- <androidx.constraintlayout.widget.Guideline-->
			<!-- android:id="@+id/guideline2"-->
			<!-- android:layout_width="wrap_content"-->
			<!-- android:layout_height="wrap_content"-->
			<!-- android:orientation="horizontal"-->
			<!-- app:layout_constraintGuide_begin="20dp" />-->

			<!-- <androidx.constraintlayout.widget.Guideline-->
			<!-- android:id="@+id/guideline3"-->
			<!-- android:layout_width="wrap_content"-->
			<!-- android:layout_height="wrap_content"-->
			<!-- android:orientation="vertical"-->
			<!-- app:layout_constraintGuide_begin="20dp" />-->


			</androidx.constraintlayout.widget.ConstraintLayout>