~wjc/HDLPhotovoltaicDebugAPP.git

			@@ -45,7 +45,7 @@

			<LinearLayout
			android:id="@+id/home_page_station_ll"
			android:layout_width="0dp"
			android:layout_width="375dp"
			android:layout_height="@dimen/dp_56"
			android:orientation="horizontal"
			app:layout_constraintEnd_toEndOf="parent"
			@@ -107,7 +107,7 @@
			android:background="@drawable/disc">

			<TextView
			android:id="@+id/home_page_station_info_rl1_f_text1_tv"
			android:id="@+id/info_rl1_f_text1_tv"
			android:layout_width="56dp"
			android:layout_height="wrap_content"
			android:layout_centerVertical="true"
			@@ -120,10 +120,10 @@
			android:id="@+id/home_page_station_info_rl1_f_text2_tv"
			android:layout_width="9dp"
			android:layout_height="14.5dp"
			android:layout_alignBottom="@+id/home_page_station_info_rl1_f_text1_tv"
			android:layout_alignBottom="@+id/info_rl1_f_text1_tv"
			android:layout_marginStart="2.5dp"
			android:layout_marginBottom="4.5dp"
			android:layout_toEndOf="@+id/home_page_station_info_rl1_f_text1_tv"
			android:layout_toEndOf="@+id/info_rl1_f_text1_tv"
			android:text="%"
			android:textColor="@color/text_191919"
			android:textSize="@dimen/text_12" />
			@@ -131,7 +131,7 @@


			<TextView
			android:id="@+id/home_page_station_info_rl1_text1_tv"
			android:id="@+id/info_rl1_text1_tv"
			style="@style/Text20Style"
			android:layout_width="wrap_content"
			android:layout_height="@dimen/dp_24"
			@@ -141,34 +141,34 @@
			android:text="33333333" />

			<TextView
			android:id="@+id/home_page_station_info_rl1_text2_tv"
			android:id="@+id/info_rl1_text2_tv"
			style="@style/Text14Style"
			android:layout_width="wrap_content"
			android:layout_height="@dimen/dp_17"
			android:layout_below="@+id/home_page_station_info_rl1_text1_tv"
			android:layout_alignStart="@+id/home_page_station_info_rl1_text1_tv"
			android:layout_below="@+id/info_rl1_text1_tv"
			android:layout_alignStart="@+id/info_rl1_text1_tv"
			android:layout_marginTop="3dp"
			android:text="kw.h" />
			android:text="@string/installed_capacity" />

			<TextView
			android:id="@+id/home_page_station_info_rl1_text3_tv"
			android:id="@+id/info_rl1_text3_tv"
			style="@style/Text20Style"
			android:layout_width="wrap_content"
			android:layout_height="@dimen/dp_24"
			android:layout_below="@+id/home_page_station_info_rl1_text2_tv"
			android:layout_alignStart="@+id/home_page_station_info_rl1_text1_tv"
			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" />

			<TextView
			android:id="@+id/home_page_station_info_rl1_text4_tv"
			android:id="@+id/info_rl1_text4_tv"
			style="@style/Text14Style"
			android:layout_width="wrap_content"
			android:layout_height="@dimen/dp_17"
			android:layout_below="@+id/home_page_station_info_rl1_text3_tv"
			android:layout_alignStart="@+id/home_page_station_info_rl1_text1_tv"
			android:layout_below="@+id/info_rl1_text3_tv"
			android:layout_alignStart="@+id/info_rl1_text1_tv"
			android:layout_marginTop="3dp"
			android:text="kw.h" />
			android:text="@string/generated_power" />

			</RelativeLayout>

			@@ -194,7 +194,7 @@
			android:layout_height="14.5dp"
			android:layout_marginStart="@dimen/dp_47"
			android:layout_marginTop="17dp"
			android:text="Electricity /kw.h"
			android:text="@string/generation"
			android:textColor="@color/text_191919"
			android:textSize="@dimen/text_12" />

			@@ -260,7 +260,7 @@
			android:layout_width="wrap_content"
			android:layout_height="18dp"
			android:layout_marginTop="@dimen/dp_25"
			android:text="点击测试"
			android:text="@string/energy_generation_statistics"
			android:textColor="@color/text_90000000"
			android:textSize="@dimen/text_14"
			android:textStyle="bold"
			@@ -284,7 +284,7 @@
			android:layout_width="86dp"
			android:layout_height="match_parent"
			android:gravity="center"
			android:text="Day" />
			android:text="@string/day" />

			<View
			android:id="@+id/v_1"
			@@ -298,7 +298,7 @@
			android:layout_width="86dp"
			android:layout_height="match_parent"
			android:gravity="center"
			android:text="Month" />
			android:text="@string/month" />

			<View
			android:id="@+id/v_2"
			@@ -312,7 +312,7 @@
			android:layout_width="86dp"
			android:layout_height="match_parent"
			android:gravity="center"
			android:text="Year" />
			android:text="@string/year" />

			<View
			android:id="@+id/v_3"
			@@ -326,7 +326,7 @@
			android:layout_width="86dp"
			android:layout_height="match_parent"
			android:gravity="center"
			android:text="LifeCycle" />
			android:text="@string/life_cycle" />

			</LinearLayout>
			<!--时间切换控件-->
			@@ -340,16 +340,31 @@
			app:layout_constraintEnd_toEndOf="parent"
			app:layout_constraintStart_toStartOf="parent"
			app:layout_constraintTop_toBottomOf="@+id/home_page_station_select_time_type_ll">
			<!--加大点击热区-->
			<LinearLayout
			android:id="@+id/last_step_click_ll"
			android:layout_width="wrap_content"
			android:layout_height="wrap_content"
			android:orientation="horizontal">

			<ImageView
			android:id="@+id/last_step_iv"
			android:layout_width="9dp"
			android:layout_height="15dp"
			android:scaleType="fitCenter"
			android:src="@drawable/last_step" />
			<View
			android:layout_width="@dimen/dp_16"
			android:layout_height="match_parent" />

			<ImageView
			android:id="@+id/last_step_iv"
			android:layout_width="9dp"
			android:layout_height="15dp"
			android:scaleType="fitCenter"
			android:src="@drawable/last_step" />

			<View
			android:layout_width="@dimen/dp_16"
			android:layout_height="match_parent" />
			</LinearLayout>

			<View
			android:layout_width="@dimen/dp_32"
			android:layout_width="@dimen/dp_16"
			android:layout_height="match_parent" />


			@@ -364,15 +379,31 @@
			android:textStyle="bold" />

			<View
			android:layout_width="@dimen/dp_32"
			android:layout_width="@dimen/dp_16"
			android:layout_height="match_parent" />
			<!--加大点击热区-->
			<LinearLayout
			android:id="@+id/next_step_click_ll"
			android:layout_width="wrap_content"
			android:layout_height="wrap_content"
			android:orientation="horizontal">

			<ImageView
			android:id="@+id/next_step_iv"
			android:layout_width="9dp"
			android:layout_height="15dp"
			android:scaleType="fitCenter"
			android:src="@drawable/next_step" />
			<View
			android:layout_width="@dimen/dp_16"
			android:layout_height="match_parent" />

			<ImageView
			android:id="@+id/next_step_iv"
			android:layout_width="9dp"
			android:layout_height="15dp"
			android:scaleType="fitCenter"
			android:src="@drawable/next_step" />

			<View
			android:layout_width="@dimen/dp_16"
			android:layout_height="match_parent" />

			</LinearLayout>

			</LinearLayout>

			@@ -390,7 +421,6 @@
			android:layout_width="wrap_content"
			android:layout_height="match_parent"
			android:layout_alignParentStart="true"
			android:text="kW"
			android:textColor="@color/text_40000000"
			android:textSize="@dimen/text_12" />

			@@ -437,7 +467,7 @@
			android:id="@+id/social_contribution_title_tv"
			android:layout_width="wrap_content"
			android:layout_height="17dp"
			android:text="Social Contribution"
			android:text="@string/social_contribution"
			android:textColor="@color/text_90000000"
			android:textSize="@dimen/text_14"
			android:textStyle="bold"
			@@ -461,27 +491,27 @@
			<TextView
			android:id="@+id/social_contribution_data_1_tv"
			android:layout_width="wrap_content"
			android:layout_height="13dp"
			android:layout_height="22dp"
			android:layout_alignParentStart="true"
			android:layout_alignParentTop="true"
			android:layout_marginStart="@dimen/dp_10"
			android:layout_marginTop="@dimen/dp_16"
			android:text="13.14"
			android:textColor="@color/text_90000000"
			android:textSize="@dimen/text_14"
			android:textSize="@dimen/text_18"
			android:textStyle="bold" />

			<TextView
			android:id="@+id/social_contribution_unit_1_tv"
			android:layout_width="wrap_content"
			android:layout_height="9dp"
			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="(T)"
			android:textColor="@color/text_90000000"
			android:textSize="@dimen/text_14"
			android:textStyle="bold"
			android:textSize="@dimen/text_12"


			/>

			@@ -495,7 +525,7 @@
			android:layout_marginTop="@dimen/dp_35"
			android:text="ssss"
			android:textColor="@color/text_40000000"
			android:textSize="@dimen/text_14" />
			android:textSize="@dimen/text_12" />


			</RelativeLayout>
			@@ -518,27 +548,26 @@
			<TextView
			android:id="@+id/social_contribution_data_2_tv"
			android:layout_width="wrap_content"
			android:layout_height="13dp"
			android:layout_height="22dp"
			android:layout_alignParentStart="true"
			android:layout_alignParentTop="true"
			android:layout_marginStart="@dimen/dp_10"
			android:layout_marginTop="@dimen/dp_16"
			android:text="13.14"
			android:textColor="@color/text_90000000"
			android:textSize="@dimen/text_14"
			android:textSize="@dimen/text_18"
			android:textStyle="bold" />

			<TextView
			android:id="@+id/social_contribution_unit_2_tv"
			android:layout_width="wrap_content"
			android:layout_height="9dp"
			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="(T)"
			android:textColor="@color/text_90000000"
			android:textSize="@dimen/text_14"
			android:textStyle="bold"
			android:textSize="@dimen/text_12"

			/>

			@@ -552,7 +581,7 @@
			android:layout_marginTop="@dimen/dp_35"
			android:text="ssss"
			android:textColor="@color/text_40000000"
			android:textSize="@dimen/text_14" />
			android:textSize="@dimen/text_12" />


			</RelativeLayout>
			@@ -575,27 +604,25 @@
			<TextView
			android:id="@+id/social_contribution_data_3_tv"
			android:layout_width="wrap_content"
			android:layout_height="13dp"
			android:layout_alignParentStart="true"
			android:layout_height="22dp"
			android:layout_alignParentTop="true"
			android:layout_marginStart="@dimen/dp_10"
			android:layout_marginTop="@dimen/dp_16"
			android:text="13.14"
			android:textColor="@color/text_90000000"
			android:textSize="@dimen/text_14"
			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="9dp"
			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="(T)"
			android:textColor="@color/text_90000000"
			android:textSize="@dimen/text_14"
			android:textStyle="bold"
			android:textSize="@dimen/text_12"

			/>

			@@ -609,22 +636,14 @@
			android:layout_marginTop="@dimen/dp_35"
			android:text="ssss"
			android:textColor="@color/text_40000000"
			android:textSize="@dimen/text_14" />
			android:textSize="@dimen/text_12" />


			</RelativeLayout>

			</androidx.constraintlayout.widget.ConstraintLayout>

			<LinearLayout
			android:id="@+id/wwwwww"
			android:layout_width="match_parent"
			android:layout_height="323dp"
			app:layout_constraintEnd_toEndOf="parent"
			app:layout_constraintStart_toStartOf="parent"
			app:layout_constraintTop_toBottomOf="@+id/home_page_station_statistics_cl">

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