~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,13 +39,9 @@

			<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"
			@@ -53,45 +49,138 @@
			android:layout_marginStart="@dimen/dp_16"
			android:layout_marginEnd="@dimen/dp_16">

			<LinearLayout
			<RelativeLayout
			android:id="@+id/home_page_station_ll"
			android:layout_width="375dp"
			android:layout_width="0dp"
			android:layout_height="@dimen/dp_56"
			android:orientation="horizontal"
			app:layout_constraintEnd_toEndOf="parent"
			app:layout_constraintStart_toStartOf="parent"
			app:layout_constraintTop_toTopOf="parent">
			<!--全部-->
			<include
			android:id="@+id/home_page_station_all_ic"
			layout="@layout/item_station" />

			<View
			android:layout_width="15.5dp"
			android:layout_height="match_parent" />
			<!--故障-->
			<include
			android:id="@+id/home_page_station_fault_ic"
			layout="@layout/item_station" />
			<RelativeLayout
			android:id="@+id/station_status_all_rl"
			android:layout_width="74dp"
			android:layout_height="match_parent"
			android:background="@drawable/station_status_no_ffffff">

			<View
			android:layout_width="16dp"
			android:layout_height="match_parent" />
			<!--离线-->
			<include
			android:id="@+id/home_page_station_offline_ic"
			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_E6000000"
			android:textSize="@dimen/text_21"
			android:textStyle="bold" />

			<View
			android:layout_width="15.5dp"
			android:layout_height="match_parent" />
			<!--待接入-->
			<include
			android:id="@+id/home_page_station_connected_ic"
			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_66000000"
			android:textSize="@dimen/text_14" />
			</RelativeLayout>

			<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">

			<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_E6000000"
			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_66000000"
			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_E6000000"
			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_66000000"
			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_E6000000"
			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_66000000"
			android:textSize="@dimen/text_14" />
			</RelativeLayout>


			</LinearLayout>
			</RelativeLayout>

			<androidx.constraintlayout.widget.ConstraintLayout
			android:id="@+id/home_page_station_info_cl"
			@@ -256,7 +345,7 @@

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

			<!--日期-->
			<androidx.constraintlayout.widget.ConstraintLayout
			android:id="@+id/home_page_station_data_cl"
			android:layout_width="match_parent"
			@@ -271,7 +360,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"
			@@ -384,7 +473,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" />

			@@ -431,7 +520,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
			@@ -449,19 +538,26 @@
			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" />
			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
			@@ -478,7 +574,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"
			@@ -507,7 +603,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" />

			@@ -519,7 +615,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"


			@@ -534,7 +630,7 @@
			android:layout_marginStart="@dimen/dp_10"
			android:layout_marginTop="@dimen/dp_35"
			android:text="ssss"
			android:textColor="@color/text_40000000"
			android:textColor="@color/text_66000000"
			android:textSize="@dimen/text_12" />


			@@ -564,7 +660,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" />

			@@ -576,7 +672,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"

			/>
			@@ -590,7 +686,7 @@
			android:layout_marginStart="@dimen/dp_10"
			android:layout_marginTop="@dimen/dp_35"
			android:text="ssss"
			android:textColor="@color/text_40000000"
			android:textColor="@color/text_66000000"
			android:textSize="@dimen/text_12" />


			@@ -619,7 +715,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" />

			@@ -631,7 +727,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"

			/>
			@@ -645,7 +741,7 @@
			android:layout_marginStart="@dimen/dp_10"
			android:layout_marginTop="@dimen/dp_35"
			android:text="ssss"
			android:textColor="@color/text_40000000"
			android:textColor="@color/text_66000000"
			android:textSize="@dimen/text_12" />