~wjc/HDLPhotovoltaicDebugAPP.git

			@@ -53,8 +53,7 @@
			android:singleLine="true"
			android:text="@string/power_station"
			android:textColor="@color/text_E6FFFFFF"
			android:textSize="@dimen/text_14"
			/>
			android:textSize="@dimen/text_14" />

			<TextView
			android:id="@+id/device_details_sn_tv"
			@@ -74,8 +73,8 @@
			android:layout_height="wrap_content"
			android:layout_below="@+id/device_details_name_tv"
			android:layout_marginStart="3dp"
			android:layout_toEndOf="@+id/device_details_sn_tv"
			android:layout_marginTop="1.5dp"
			android:layout_toEndOf="@+id/device_details_sn_tv"
			android:text="0.00"
			android:textColor="@color/text_E6FFFFFF"
			android:textSize="@dimen/text_14" />
			@@ -110,14 +109,29 @@
			android:layout_weight="1"
			android:orientation="vertical">

			<TextView
			android:id="@+id/power_value_tv"
			<LinearLayout
			android:layout_width="match_parent"
			android:layout_height="@dimen/dp_18"
			android:gravity="center_vertical\|start"
			android:text="0"
			android:textColor="@color/text_E6000000"
			android:textSize="@dimen/text_15" />
			android:layout_height="wrap_content">

			<TextView
			android:id="@+id/power_value_tv"
			android:layout_width="wrap_content"
			android:layout_height="match_parent"
			android:gravity="center_vertical\|start"
			android:text="0"
			android:textColor="@color/text_E6FFFFFF"
			android:textSize="@dimen/text_14" />

			<TextView
			android:id="@+id/power_kwp_unit"
			android:layout_width="wrap_content"
			android:layout_height="match_parent"
			android:layout_marginStart="3dp"
			android:gravity="bottom"
			android:text="kW"
			android:textColor="@color/text_66FFFFFF"
			android:textSize="@dimen/text_10" />
			</LinearLayout>

			<TextView
			android:id="@+id/power_type_tv"
			@@ -126,10 +140,16 @@
			android:layout_marginTop="3dp"
			android:gravity="center_vertical\|start"
			android:text="@string/generated_power"
			android:textColor="@color/text_66000000"
			android:textColor="@color/text_66FFFFFF"
			android:textSize="@dimen/text_12" />

			</LinearLayout>

			<View
			android:layout_width="0.5dp"
			android:layout_height="17.5dp"
			android:layout_gravity="center"
			android:background="@color/text_1AFFFFFF" />

			<LinearLayout
			android:id="@+id/day_ll"
			@@ -138,14 +158,32 @@
			android:layout_weight="1"
			android:orientation="vertical">

			<TextView
			android:id="@+id/day_value_tv"
			<LinearLayout
			android:layout_width="match_parent"
			android:layout_height="@dimen/dp_18"
			android:gravity="center"
			android:text="0"
			android:textColor="@color/text_E6000000"
			android:textSize="@dimen/text_15" />
			android:gravity="center">

			<TextView
			android:id="@+id/day_value_tv"
			android:layout_width="wrap_content"
			android:layout_height="match_parent"
			android:layout_gravity="center_horizontal"
			android:text="0"
			android:textColor="@color/text_E6FFFFFF"
			android:textSize="@dimen/text_14" />


			<TextView
			android:id="@+id/day_kwp_unit"
			android:layout_width="wrap_content"
			android:layout_height="match_parent"
			android:layout_marginStart="3dp"
			android:gravity="bottom"
			android:text="kW"
			android:textColor="@color/text_66FFFFFF"
			android:textSize="@dimen/text_10" />
			</LinearLayout>


			<TextView
			android:id="@+id/day_type_tv"
			@@ -154,10 +192,16 @@
			android:layout_marginTop="3dp"
			android:gravity="center"
			android:text="@string/day_power_generation"
			android:textColor="@color/text_66000000"
			android:textColor="@color/text_66FFFFFF"
			android:textSize="@dimen/text_12" />

			</LinearLayout>

			<View
			android:layout_width="0.5dp"
			android:layout_height="17.5dp"
			android:layout_gravity="center"
			android:background="@color/text_1AFFFFFF" />

			<LinearLayout
			android:id="@+id/month_ll"
			@@ -166,14 +210,31 @@
			android:layout_weight="1"
			android:orientation="vertical">

			<TextView
			android:id="@+id/month_value_tv"
			<LinearLayout
			android:layout_width="match_parent"
			android:layout_height="@dimen/dp_18"
			android:gravity="center_vertical\|end"
			android:text="0"
			android:textColor="@color/text_E6000000"
			android:textSize="@dimen/text_15" />
			android:layout_height="@dimen/dp_18">

			<TextView
			android:id="@+id/month_value_tv"
			android:layout_width="0dp"
			android:layout_height="match_parent"
			android:layout_weight="1"
			android:gravity="center_vertical\|end"
			android:text="0"
			android:textColor="@color/text_E6FFFFFF"
			android:textSize="@dimen/text_14" />

			<TextView
			android:id="@+id/month_kwp_unit"
			android:layout_width="wrap_content"
			android:layout_height="match_parent"
			android:layout_marginStart="3dp"
			android:gravity="bottom"
			android:text="kW"
			android:textColor="@color/text_66FFFFFF"
			android:textSize="@dimen/text_10" />
			</LinearLayout>


			<TextView
			android:id="@+id/month_type_tv"
			@@ -182,7 +243,7 @@
			android:layout_marginTop="3dp"
			android:gravity="center_vertical\|end"
			android:text="@string/month_power_generation"
			android:textColor="@color/text_66000000"
			android:textColor="@color/text_66FFFFFF"
			android:textSize="@dimen/text_12" />

			</LinearLayout>
			@@ -193,12 +254,12 @@
			<View
			android:id="@+id/line"
			android:layout_width="match_parent"
			android:layout_height="1dp"
			android:layout_height="0.5dp"
			android:layout_below="@+id/screening_condition_ll"
			android:layout_alignStart="@+id/device_details_image_iv"
			android:layout_marginTop="@dimen/dp_7"
			android:layout_marginEnd="@dimen/dp_16"
			android:background="@color/text_E1E1E1" />
			android:background="@color/text_1AFFFFFF" />
			<!--电站地址-->
			<RelativeLayout
			android:layout_width="match_parent"
			@@ -223,7 +284,7 @@
			android:gravity="center_vertical\|start"
			android:singleLine="true"
			android:text="@string/power_station"
			android:textColor="@color/text_66000000"
			android:textColor="@color/text_66FFFFFF"
			android:textSize="@dimen/text_12" />
			</RelativeLayout>