~wjc/HDLPhotovoltaicDebugAPP.git

			@@ -42,6 +42,14 @@

			/>

			<ImageView
			android:id="@+id/edit_iv"
			android:layout_width="@dimen/dp_31"
			android:layout_height="@dimen/dp_31"
			android:layout_marginEnd="@dimen/dp_13"
			android:layout_toStartOf="@+id/add_iv"
			android:src="@drawable/edit"
			android:visibility="gone" />

			<ImageView
			android:id="@+id/add_iv"
			@@ -119,7 +127,7 @@
			android:layout_height="@dimen/dp_31"
			android:layout_alignParentEnd="true"
			android:layout_centerVertical="true"
			android:src="@drawable/default_condition" />
			android:src="@drawable/condition_screening" />


			</RelativeLayout>
			@@ -305,7 +313,7 @@
			android:id="@+id/station_name_tv"
			android:layout_width="wrap_content"
			android:layout_height="match_parent"
			android:text="@string/pv"
			android:text="@string/station_name"
			android:textColor="@color/text_E6FFFFFF"
			android:textSize="@dimen/text_14"

			@@ -338,7 +346,7 @@
			android:id="@+id/station_power_tv"
			android:layout_width="wrap_content"
			android:layout_height="match_parent"
			android:text="@string/output"
			android:text="@string/generated_power"
			android:textColor="@color/text_E6FFFFFF"
			android:textSize="@dimen/text_14" />

			@@ -348,6 +356,36 @@
			android:layout_height="@dimen/dp_18"
			android:layout_toEndOf="@+id/station_power_tv"
			android:background="@drawable/ascending_descending_order_select" />

			</RelativeLayout>

			<View
			android:layout_width="0dp"
			android:layout_height="match_parent"
			android:layout_weight="1" />

			<RelativeLayout
			android:id="@+id/station_day_rl"
			android:layout_width="wrap_content"
			android:layout_height="match_parent"
			android:layout_gravity="center_horizontal"
			android:orientation="horizontal">

			<TextView
			android:id="@+id/station_day_tv"
			android:layout_width="wrap_content"
			android:layout_height="match_parent"
			android:text="@string/day_power_generation"
			android:textColor="@color/text_E6FFFFFF"
			android:textSize="@dimen/text_14" />

			<ImageView
			android:id="@+id/station_day_iv"
			android:layout_width="@dimen/dp_18"
			android:layout_height="@dimen/dp_18"
			android:layout_toEndOf="@+id/station_day_tv"
			android:background="@drawable/ascending_descending_order_select" />


			</RelativeLayout>

			@@ -379,46 +417,15 @@
			android:background="@drawable/ascending_descending_order_select" />
			</RelativeLayout>

			<View
			android:layout_width="0dp"
			android:layout_height="match_parent"
			android:layout_weight="1" />

			<RelativeLayout
			android:id="@+id/station_day_rl"
			android:layout_width="wrap_content"
			android:layout_height="match_parent"
			android:layout_gravity="center_horizontal"
			android:orientation="horizontal">

			<TextView
			android:id="@+id/station_day_tv"
			android:layout_width="wrap_content"
			android:layout_height="match_parent"
			android:text="@string/day_generation"
			android:textColor="@color/text_E6FFFFFF"
			android:textSize="@dimen/text_14" />

			<ImageView
			android:id="@+id/station_day_iv"
			android:layout_width="@dimen/dp_18"
			android:layout_height="@dimen/dp_18"
			android:layout_toEndOf="@+id/station_day_tv"
			android:background="@drawable/ascending_descending_order_select" />


			</RelativeLayout>


			</LinearLayout>

			</androidx.constraintlayout.widget.ConstraintLayout>

			<androidx.swiperefreshlayout.widget.SwipeRefreshLayout
			<com.hdl.photovoltaic.widget.refreshlayout.BGARefreshLayout
			android:id="@+id/fragment_house_srl"
			android:layout_width="match_parent"
			android:layout_height="0dp"
			android:layout_marginTop="18.5dp"
			android:layout_marginTop="10dp"
			app:layout_constraintBottom_toBottomOf="parent"
			app:layout_constraintEnd_toEndOf="parent"
			app:layout_constraintStart_toStartOf="parent"
			@@ -427,8 +434,10 @@
			<androidx.recyclerview.widget.RecyclerView
			android:id="@+id/fragment_house_srl_list_rc"
			android:layout_width="match_parent"
			android:layout_height="match_parent" />
			</androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
			android:layout_height="match_parent"
			android:clipToPadding="false"
			android:paddingBottom="@dimen/dp_10" />
			</com.hdl.photovoltaic.widget.refreshlayout.BGARefreshLayout>
			<!--没有数据显示样式-->
			<include
			android:id="@+id/home_null_data_ic"
			@@ -500,7 +509,7 @@

			</androidx.constraintlayout.widget.ConstraintLayout>

			<androidx.swiperefreshlayout.widget.SwipeRefreshLayout
			<com.hdl.photovoltaic.widget.refreshlayout.BGARefreshLayout
			android:id="@+id/fragment_device_srl"
			android:layout_width="match_parent"
			android:layout_height="0dp"
			@@ -515,7 +524,7 @@
			android:layout_height="match_parent"
			android:clipToPadding="false"
			android:paddingBottom="@dimen/dp_10" />
			</androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
			</com.hdl.photovoltaic.widget.refreshlayout.BGARefreshLayout>

			<!--没有数据显示样式-->
			<include
			@@ -534,9 +543,4 @@
			</androidx.constraintlayout.widget.ConstraintLayout>


			</androidx.constraintlayout.widget.ConstraintLayout>





			</androidx.constraintlayout.widget.ConstraintLayout>