~wjc/HDLPhotovoltaicDebugAPP.git

			@@ -3,7 +3,7 @@
			<com.hdl.photovoltaic.widget.SwipeLayout xmlns:android="http://schemas.android.com/apk/res/android"
			android:id="@+id/item_parent_swipeLayout"
			android:layout_width="match_parent"
			android:layout_height="@dimen/dp_164">
			android:layout_height="wrap_content">

			<include
			android:id="@+id/swipe_layout_il"
			@@ -12,15 +12,15 @@
			<RelativeLayout
			android:id="@+id/item_parent_rl"
			android:layout_width="match_parent"
			android:layout_height="164dp">
			android:layout_height="160.5dp">

			<RelativeLayout
			android:id="@+id/device_details_info_rl"
			android:layout_width="match_parent"
			android:layout_height="@dimen/dp_148"
			android:layout_height="150.5dp"
			android:layout_marginStart="@dimen/dp_16"
			android:layout_marginEnd="@dimen/dp_16"
			android:background="@drawable/bj_ff333738">
			android:background="@drawable/bj_ff1c1c1e">

			<ImageView
			android:id="@+id/device_details_image_iv"
			@@ -28,7 +28,6 @@
			android:layout_height="42dp"
			android:layout_marginStart="@dimen/dp_16"
			android:layout_marginTop="@dimen/dp_13"
			android:background="@drawable/default_user"
			android:scaleType="centerCrop" />


			@@ -37,7 +36,7 @@
			android:layout_width="match_parent"
			android:layout_height="@dimen/dp_20"
			android:layout_marginStart="@dimen/dp_11"
			android:layout_marginTop="@dimen/dp_15"
			android:layout_marginTop="14.5dp"
			android:layout_toEndOf="@+id/device_details_image_iv"
			android:gravity="center_vertical"
			android:orientation="horizontal">
			@@ -68,7 +67,7 @@
			android:layout_height="wrap_content"
			android:layout_below="@+id/home_name_ll"
			android:layout_alignStart="@+id/home_name_ll"
			android:layout_marginTop="@dimen/dp_3"
			android:layout_marginTop="2.5dp"
			android:gravity="center_vertical"
			android:text="@string/string_capacity"
			android:textColor="@color/text_66FFFFFF"
			@@ -105,15 +104,14 @@
			android:layout_height="@dimen/dp_37"
			android:layout_below="@+id/device_details_image_iv"
			android:layout_alignStart="@+id/device_details_image_iv"
			android:layout_marginTop="@dimen/dp_17"
			android:layout_marginEnd="@dimen/dp_16"
			android:layout_marginTop="@dimen/dp_16"
			android:layout_marginEnd="@dimen/dp_32"
			android:orientation="horizontal">

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

			<LinearLayout
			@@ -130,7 +128,7 @@
			android:textSize="@dimen/text_14" />

			<TextView
			android:id="@+id/power_kwp_unit"
			android:id="@+id/power_kw_unit"
			android:layout_width="wrap_content"
			android:layout_height="match_parent"
			android:layout_marginStart="3dp"
			@@ -152,17 +150,24 @@

			</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/day_ll"
			android:layout_width="0dp"
			android:layout_width="wrap_content"
			android:layout_height="match_parent"
			android:layout_weight="1"
			android:orientation="vertical">

			<LinearLayout
			@@ -174,8 +179,6 @@
			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:gravity="start\|center_horizontal"
			android:text="0"
			android:textColor="@color/text_E6FFFFFF"
			@@ -183,12 +186,12 @@


			<TextView
			android:id="@+id/day_kwp_unit"
			android:id="@+id/day_kwh_unit"
			android:layout_width="wrap_content"
			android:layout_height="match_parent"
			android:layout_marginStart="3dp"
			android:gravity="bottom"
			android:text="kW"
			android:text="kWh"
			android:textColor="@color/text_66FFFFFF"
			android:textSize="@dimen/text_10" />
			</LinearLayout>
			@@ -198,8 +201,6 @@
			android:id="@+id/day_type_tv"
			android:layout_width="match_parent"
			android:layout_height="@dimen/dp_15"
			android:paddingStart="@dimen/dp_26"
			android:paddingEnd="@dimen/dp_0"
			android:layout_marginTop="3dp"
			android:gravity="start\|center_horizontal"
			android:text="@string/day_power_generation"
			@@ -208,17 +209,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/month_ll"
			android:layout_width="0dp"
			android:layout_width="wrap_content"
			android:layout_height="match_parent"
			android:layout_weight="1"
			android:orientation="vertical">

			<LinearLayout
			@@ -227,23 +234,20 @@

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

			<TextView
			android:id="@+id/month_kwp_unit"
			android:id="@+id/month_kwh_unit"
			android:layout_width="wrap_content"
			android:layout_height="match_parent"
			android:layout_marginStart="3dp"
			android:gravity="bottom"
			android:paddingStart="@dimen/dp_0"
			android:paddingEnd="@dimen/dp_15"
			android:text="kW"
			android:text="kWh"
			android:textColor="@color/text_66FFFFFF"
			android:textSize="@dimen/text_10" />
			</LinearLayout>
			@@ -254,10 +258,8 @@
			android:layout_width="match_parent"
			android:layout_height="@dimen/dp_15"
			android:layout_marginTop="3dp"
			android:gravity="center_vertical\|end"
			android:paddingStart="@dimen/dp_0"
			android:paddingEnd="@dimen/dp_15"
			android:text="@string/month_power_generation"
			android:gravity="center_vertical\|start"
			android:text="@string/battery_capacity_indicator"
			android:textColor="@color/text_66FFFFFF"
			android:textSize="@dimen/text_12" />

			@@ -278,7 +280,7 @@
			<!--电站地址-->
			<RelativeLayout
			android:layout_width="match_parent"
			android:layout_height="@dimen/dp_33"
			android:layout_height="@dimen/dp_35"
			android:layout_below="@+id/line"
			android:layout_marginStart="11dp">

			@@ -309,5 +311,4 @@

			</RelativeLayout>

			</com.hdl.photovoltaic.widget.SwipeLayout>

			</com.hdl.photovoltaic.widget.SwipeLayout>