~wjc/HDLPhotovoltaicDebugAPP.git

			@@ -10,7 +10,7 @@
			android:id="@+id/home_page_title_tv"
			style="@style/Text20Style"
			android:layout_width="wrap_content"
			android:layout_height="@dimen/dp_24"
			android:layout_height="@dimen/dp_26"
			android:layout_marginStart="@dimen/dp_16"
			android:layout_marginTop="58dp"
			android:text="@string/power_shome_page"
			@@ -29,7 +29,7 @@

			<androidx.swiperefreshlayout.widget.SwipeRefreshLayout
			android:id="@+id/srl"
			android:layout_width="0dp"
			android:layout_width="match_parent"
			android:layout_height="0dp"
			android:layout_marginTop="@dimen/dp_26"
			app:layout_constraintBottom_toBottomOf="parent"
			@@ -39,157 +39,49 @@

			<ScrollView
			android:id="@+id/sl"
			android:layout_width="0dp"
			android:layout_height="0dp"
			android:layout_marginTop="@dimen/dp_26"
			app:layout_constraintBottom_toBottomOf="parent"
			app:layout_constraintEnd_toEndOf="parent"
			app:layout_constraintStart_toStartOf="parent"
			app:layout_constraintTop_toBottomOf="@+id/home_page_title_tv">
			android:layout_width="match_parent"
			android:layout_height="match_parent"
			android:layout_marginTop="@dimen/dp_26">

			<androidx.constraintlayout.widget.ConstraintLayout
			android:layout_width="match_parent"
			android:layout_height="wrap_content"
			android:layout_marginStart="@dimen/dp_16"
			android:layout_marginEnd="@dimen/dp_16">
			android:layout_height="wrap_content">

			<RelativeLayout
			<!--条件筛选-->
			<LinearLayout
			android:id="@+id/home_page_station_ll"
			android:layout_width="0dp"
			android:layout_height="@dimen/dp_56"
			android:layout_marginStart="@dimen/dp_16"
			android:orientation="horizontal"
			app:layout_constraintEnd_toEndOf="parent"
			app:layout_constraintStart_toStartOf="parent"
			app:layout_constraintTop_toTopOf="parent">

			<RelativeLayout
			android:id="@+id/station_status_all_rl"
			android:layout_width="74dp"
			android:layout_height="match_parent"
			android:background="@drawable/station_status_no_ffffff">
			<include
			android:id="@+id/home_all_il"
			layout="@layout/item_station" />

			<TextView
			android:id="@+id/station_status_all_tv"
			android:layout_width="match_parent"
			android:layout_height="@dimen/dp_25"
			android:layout_marginTop="7dp"
			android:gravity="center"
			android:text="999"
			android:textColor="@color/text_90000000"
			android:textSize="@dimen/text_21"
			android:textStyle="bold" />
			<include
			android:id="@+id/home_faults_il"
			layout="@layout/item_station" />

			<TextView
			android:id="@+id/station_status_number_all_tv"
			android:layout_width="match_parent"
			android:layout_height="@dimen/dp_17"
			android:layout_below="@+id/station_status_all_tv"
			android:layout_marginTop="1dp"
			android:gravity="center"
			android:text="state"
			android:textColor="@color/text_40000000"
			android:textSize="@dimen/text_14" />
			</RelativeLayout>
			<include
			android:id="@+id/home_offline_il"
			layout="@layout/item_station" />

			<RelativeLayout
			android:id="@+id/station_status_faults_rl"
			android:layout_width="74dp"
			android:layout_height="match_parent"
			android:layout_marginStart="@dimen/dp_16"
			android:layout_toEndOf="@+id/station_status_all_rl"
			android:background="@drawable/station_status_no_ffffff">
			<include
			android:id="@+id/home_connected_il"
			layout="@layout/item_station" />

			<TextView
			android:id="@+id/station_status_faults_tv"
			android:layout_width="match_parent"
			android:layout_height="@dimen/dp_25"
			android:layout_marginTop="7dp"
			android:gravity="center"
			android:text="999"
			android:textColor="@color/text_90000000"
			android:textSize="@dimen/text_21"
			android:textStyle="bold" />

			<TextView
			android:id="@+id/station_status_number_faults_tv"
			android:layout_width="match_parent"
			android:layout_height="@dimen/dp_17"
			android:layout_below="@+id/station_status_faults_tv"
			android:layout_marginTop="1dp"
			android:gravity="center"
			android:text="state"
			android:textColor="@color/text_40000000"
			android:textSize="@dimen/text_14" />
			</RelativeLayout>

			<RelativeLayout
			android:id="@+id/station_status_off_rl"
			android:layout_width="74dp"
			android:layout_height="match_parent"
			android:layout_marginStart="@dimen/dp_16"
			android:layout_toEndOf="@+id/station_status_faults_rl"
			android:background="@drawable/station_status_no_ffffff">

			<TextView
			android:id="@+id/station_status_off_tv"
			android:layout_width="match_parent"
			android:layout_height="@dimen/dp_25"
			android:layout_marginTop="7dp"
			android:gravity="center"
			android:text="999"
			android:textColor="@color/text_90000000"
			android:textSize="@dimen/text_21"
			android:textStyle="bold" />

			<TextView
			android:id="@+id/station_status_number_off_tv"
			android:layout_width="match_parent"
			android:layout_height="@dimen/dp_17"
			android:layout_below="@+id/station_status_off_tv"
			android:layout_marginTop="1dp"
			android:gravity="center"
			android:text="state"
			android:textColor="@color/text_40000000"
			android:textSize="@dimen/text_14" />
			</RelativeLayout>

			<RelativeLayout
			android:id="@+id/station_status_connected_rl"
			android:layout_width="74dp"
			android:layout_height="match_parent"
			android:layout_marginStart="@dimen/dp_16"
			android:layout_toEndOf="@+id/station_status_off_rl"
			android:background="@drawable/station_status_no_ffffff">

			<TextView
			android:id="@+id/station_status_connected_tv"
			android:layout_width="match_parent"
			android:layout_height="@dimen/dp_25"
			android:layout_marginTop="7dp"
			android:gravity="center"
			android:text="999"
			android:textColor="@color/text_90000000"
			android:textSize="@dimen/text_21"
			android:textStyle="bold" />

			<TextView
			android:id="@+id/station_status_number_connected_tv"
			android:layout_width="match_parent"
			android:layout_height="@dimen/dp_17"
			android:layout_below="@+id/station_status_connected_tv"
			android:layout_marginTop="1dp"
			android:gravity="center"
			android:text="state"
			android:textColor="@color/text_40000000"
			android:textSize="@dimen/text_14" />
			</RelativeLayout>


			</RelativeLayout>

			</LinearLayout>
			<!--装机容量发电功率数据显示-->
			<androidx.constraintlayout.widget.ConstraintLayout
			android:id="@+id/home_page_station_info_cl"
			android:layout_width="0dp"
			android:layout_height="312dp"
			android:layout_marginStart="@dimen/dp_16"
			android:layout_marginEnd="@dimen/dp_16"
			app:layout_constraintEnd_toEndOf="parent"
			app:layout_constraintStart_toStartOf="parent"
			app:layout_constraintTop_toBottomOf="@+id/home_page_station_ll">
			@@ -241,7 +133,7 @@
			android:layout_marginStart="@dimen/dp_16"
			android:layout_marginTop="@dimen/dp_21"
			android:layout_toEndOf="@+id/home_page_station_info_rl1_f"
			android:text="33333333" />
			android:text="0.00kW.h" />

			<TextView
			android:id="@+id/info_rl1_text2_tv"
			@@ -261,7 +153,7 @@
			android:layout_below="@+id/info_rl1_text2_tv"
			android:layout_alignStart="@+id/info_rl1_text1_tv"
			android:layout_marginTop="@dimen/dp_16"
			android:text="33333" />
			android:text="0.00kW.h" />

			<TextView
			android:id="@+id/info_rl1_text4_tv"
			@@ -349,11 +241,13 @@

			</RelativeLayout>
			</androidx.constraintlayout.widget.ConstraintLayout>

			<!--日期-->
			<androidx.constraintlayout.widget.ConstraintLayout
			android:id="@+id/home_page_station_data_cl"
			android:layout_width="match_parent"
			android:layout_height="wrap_content"
			android:layout_marginStart="@dimen/dp_16"
			android:layout_marginEnd="@dimen/dp_16"
			app:layout_constraintEnd_toEndOf="parent"
			app:layout_constraintStart_toStartOf="parent"
			app:layout_constraintTop_toBottomOf="@+id/home_page_station_info_cl">
			@@ -364,7 +258,7 @@
			android:layout_height="18dp"
			android:layout_marginTop="@dimen/dp_25"
			android:text="@string/energy_generation_statistics"
			android:textColor="@color/text_90000000"
			android:textColor="@color/text_E6000000"
			android:textSize="@dimen/text_14"
			android:textStyle="bold"
			app:layout_constraintStart_toStartOf="parent"
			@@ -477,7 +371,7 @@
			android:layout_height="match_parent"
			android:gravity="center"
			android:text="2024/03/07"
			android:textColor="@color/text_90000000"
			android:textColor="@color/text_E6000000"
			android:textSize="@dimen/text_16"
			android:textStyle="bold" />

			@@ -524,7 +418,7 @@
			android:layout_width="wrap_content"
			android:layout_height="match_parent"
			android:layout_alignParentStart="true"
			android:textColor="@color/text_40000000"
			android:textColor="@color/text_66000000"
			android:textSize="@dimen/text_12" />

			<TextView
			@@ -542,26 +436,35 @@
			android:layout_height="match_parent"
			android:layout_alignParentEnd="true"
			android:text="PV power generation"
			android:textColor="@color/text_90000000"
			android:textColor="@color/text_E6000000"
			android:textSize="@dimen/text_12" />

			</RelativeLayout>

			<com.github.AAChartModel.AAChartCore.AAChartCreator.AAChartView
			android:id="@+id/AAChartView"
			<FrameLayout
			android:layout_width="0dp"
			android:layout_height="284dp"
			android:layout_marginTop="@dimen/dp_18"
			app:layout_constraintEnd_toEndOf="parent"
			app:layout_constraintStart_toStartOf="parent"
			app:layout_constraintTop_toBottomOf="@+id/chart_title_rl" />
			</androidx.constraintlayout.widget.ConstraintLayout>
			app:layout_constraintTop_toBottomOf="@+id/chart_title_rl">

			<com.hdl.photovoltaic.ui.home.AutoSizeMyAAChart
			android:id="@+id/autoSizeMyAAChart"
			android:layout_width="match_parent"
			android:layout_height="match_parent"

			/>
			</FrameLayout>
			</androidx.constraintlayout.widget.ConstraintLayout>
			<!--社会贡献显示-->
			<androidx.constraintlayout.widget.ConstraintLayout
			android:id="@+id/home_page_station_statistics_cl"
			android:layout_width="match_parent"
			android:layout_height="186dp"
			android:layout_marginStart="@dimen/dp_16"
			android:layout_marginTop="@dimen/dp_26"
			android:layout_marginEnd="@dimen/dp_16"
			app:layout_constraintEnd_toEndOf="parent"
			app:layout_constraintStart_toStartOf="parent"
			app:layout_constraintTop_toBottomOf="@+id/home_page_station_data_cl">
			@@ -571,7 +474,7 @@
			android:layout_width="wrap_content"
			android:layout_height="17dp"
			android:text="@string/social_contribution"
			android:textColor="@color/text_90000000"
			android:textColor="@color/text_E6000000"
			android:textSize="@dimen/text_14"
			android:textStyle="bold"
			app:layout_constraintStart_toStartOf="parent"
			@@ -600,7 +503,7 @@
			android:layout_marginStart="@dimen/dp_10"
			android:layout_marginTop="@dimen/dp_16"
			android:text="13.14"
			android:textColor="@color/text_90000000"
			android:textColor="@color/text_E6000000"
			android:textSize="@dimen/text_18"
			android:textStyle="bold" />

			@@ -612,7 +515,7 @@
			android:layout_marginStart="@dimen/dp_2"
			android:layout_toEndOf="@+id/social_contribution_data_1_tv"
			android:text="(T)"
			android:textColor="@color/text_90000000"
			android:textColor="@color/text_E6000000"
			android:textSize="@dimen/text_12"


			@@ -626,8 +529,8 @@
			android:layout_alignParentTop="true"
			android:layout_marginStart="@dimen/dp_10"
			android:layout_marginTop="@dimen/dp_35"
			android:text="ssss"
			android:textColor="@color/text_40000000"
			android:text="s"
			android:textColor="@color/text_66000000"
			android:textSize="@dimen/text_12" />


			@@ -657,7 +560,7 @@
			android:layout_marginStart="@dimen/dp_10"
			android:layout_marginTop="@dimen/dp_16"
			android:text="13.14"
			android:textColor="@color/text_90000000"
			android:textColor="@color/text_E6000000"
			android:textSize="@dimen/text_18"
			android:textStyle="bold" />

			@@ -669,7 +572,7 @@
			android:layout_marginStart="@dimen/dp_2"
			android:layout_toEndOf="@+id/social_contribution_data_2_tv"
			android:text="(T)"
			android:textColor="@color/text_90000000"
			android:textColor="@color/text_E6000000"
			android:textSize="@dimen/text_12"

			/>
			@@ -682,8 +585,8 @@
			android:layout_alignParentTop="true"
			android:layout_marginStart="@dimen/dp_10"
			android:layout_marginTop="@dimen/dp_35"
			android:text="ssss"
			android:textColor="@color/text_40000000"
			android:text="s"
			android:textColor="@color/text_66000000"
			android:textSize="@dimen/text_12" />


			@@ -712,7 +615,7 @@
			android:layout_marginStart="@dimen/dp_10"
			android:layout_marginTop="@dimen/dp_16"
			android:text="13.14"
			android:textColor="@color/text_90000000"
			android:textColor="@color/text_E6000000"
			android:textSize="@dimen/text_18"
			android:textStyle="bold" />

			@@ -724,7 +627,7 @@
			android:layout_marginStart="@dimen/dp_2"
			android:layout_toEndOf="@+id/social_contribution_data_3_tv"
			android:text="(T)"
			android:textColor="@color/text_90000000"
			android:textColor="@color/text_E6000000"
			android:textSize="@dimen/text_12"

			/>
			@@ -737,8 +640,8 @@
			android:layout_alignParentTop="true"
			android:layout_marginStart="@dimen/dp_10"
			android:layout_marginTop="@dimen/dp_35"
			android:text="ssss"
			android:textColor="@color/text_40000000"
			android:text="s"
			android:textColor="@color/text_66000000"
			android:textSize="@dimen/text_12" />