~wjc/HDLPhotovoltaicDebugAPP.git

			@@ -25,7 +25,7 @@
			android:layout_marginStart="@dimen/dp_16"
			android:layout_marginTop="@dimen/dp_10"
			android:layout_marginEnd="@dimen/dp_16"
			android:background="@drawable/bj_ff333738">
			android:background="@drawable/bj_ff1c1c1e">

			<ImageView
			android:id="@+id/device_details_image_iv"
			@@ -98,14 +98,13 @@
			android:layout_below="@+id/device_details_image_iv"
			android:layout_marginStart="@dimen/dp_16"
			android:layout_marginTop="@dimen/dp_16"
			android:layout_marginEnd="@dimen/dp_16"
			android:layout_marginEnd="@dimen/dp_32"
			android:orientation="horizontal">

			<LinearLayout
			android:id="@+id/device_label_run_state_ll"
			android:layout_width="0dp"
			android:layout_width="wrap_content"
			android:layout_height="match_parent"
			android:layout_weight="1"
			android:orientation="vertical">

			<TextView
			@@ -120,7 +119,7 @@
			<TextView
			android:id="@+id/device_label_run_state_type_tv"
			android:layout_width="match_parent"
			android:layout_height="@dimen/dp_17"
			android:layout_height="wrap_content"
			android:layout_marginTop="3dp"
			android:gravity="start"
			android:text="@string/device_run_state"
			@@ -129,17 +128,23 @@

			</LinearLayout>

			<View
			android:layout_width="0.5dp"
			android:layout_height="17.5dp"
			android:layout_gravity="center"
			android:background="@color/text_1AFFFFFF" />
			<LinearLayout
			android:layout_width="@dimen/dp_0"
			android:layout_height="match_parent"
			android:layout_weight="1"
			android:gravity="center">

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

			<LinearLayout
			android:id="@+id/device_label_power_ll"
			android:layout_width="0dp"
			android:layout_width="wrap_content"
			android:layout_height="match_parent"
			android:layout_weight="1"
			android:orientation="vertical">


			@@ -152,14 +157,12 @@
			android:layout_width="wrap_content"
			android:layout_height="match_parent"
			android:layout_gravity="center_horizontal"
			android:paddingStart="@dimen/dp_26"
			android:paddingEnd="@dimen/dp_0"
			android:text="0"
			android:textColor="@color/text_E6FFFFFF"
			android:textSize="@dimen/text_14" />

			<TextView
			android:id="@+id/day_kwp_unit"
			android:id="@+id/device_label_power_unit"
			android:layout_width="wrap_content"
			android:layout_height="match_parent"
			android:layout_marginStart="3dp"
			@@ -175,25 +178,29 @@
			android:layout_height="@dimen/dp_17"
			android:layout_marginTop="3dp"
			android:gravity="start\|center_horizontal"
			android:paddingStart="@dimen/dp_26"
			android:paddingEnd="@dimen/dp_0"
			android:text="@string/active_power"
			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:layout_width="@dimen/dp_0"
			android:layout_height="match_parent"
			android:layout_weight="1"
			android:gravity="center">

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

			<LinearLayout
			android:id="@+id/device_label_day_ll"
			android:layout_width="0dp"
			android:layout_width="wrap_content"
			android:layout_height="match_parent"
			android:layout_weight="1"
			android:orientation="vertical">

			<LinearLayout
			@@ -205,14 +212,12 @@
			android:layout_width="wrap_content"
			android:layout_height="match_parent"
			android:gravity="center_vertical\|start"
			android:paddingStart="@dimen/dp_26"
			android:paddingEnd="@dimen/dp_0"
			android:text="0"
			android:textColor="@color/text_E6FFFFFF"
			android:textSize="@dimen/text_14" />

			<TextView
			android:id="@+id/month_kwp_unit"
			android:id="@+id/device_label_day_unit"
			android:layout_width="wrap_content"
			android:layout_height="match_parent"
			android:layout_marginStart="3dp"
			@@ -229,8 +234,6 @@
			android:layout_height="@dimen/dp_17"
			android:layout_marginTop="3dp"
			android:gravity="start"
			android:paddingStart="@dimen/dp_26"
			android:paddingEnd="@dimen/dp_0"
			android:text="@string/day_power_generation"
			android:textColor="@color/text_66FFFFFF"
			android:textSize="@dimen/text_12" />