From 162ca0f6633f3aa246a40e8ba3d3e9a54f3a4cb5 Mon Sep 17 00:00:00 2001
From: hxb <hxb@hdlchina.com.cn>
Date: 星期六, 11 五月 2024 14:45:21 +0800
Subject: [PATCH] 依赖1.0.21 sdk，解决数据乱的问题
---
app/src/main/res/layout/frgment_house_list_line.xml | 144 +++++++++++++++++++++++++++---------------------
1 files changed, 81 insertions(+), 63 deletions(-)
diff --git a/app/src/main/res/layout/frgment_house_list_line.xml b/app/src/main/res/layout/frgment_house_list_line.xml
index e554529..b238670 100644
--- a/app/src/main/res/layout/frgment_house_list_line.xml
+++ b/app/src/main/res/layout/frgment_house_list_line.xml
@@ -1,75 +1,93 @@
<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+
+<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="142dp"
- android:background="@color/text_F9FAFB">
+ android:layout_height="wrap_content">
+
+ <include
+ android:id="@+id/swipe_layout_il"
+ layout="@layout/swipe_right_layout" />
<RelativeLayout
- android:id="@+id/fragment_house_list_line_parent_rl"
- android:layout_width="0dp"
- android:layout_height="130dp"
- android:layout_alignParentStart="true"
- android:layout_alignParentEnd="true"
- android:layout_marginStart="@dimen/dp_20"
- android:layout_marginEnd="@dimen/dp_20"
- android:background="@drawable/house_list_line_parent_bg">
+ android:id="@+id/item_parent_rl"
+ android:layout_width="match_parent"
+ android:layout_height="142dp"
+ android:background="@color/text_F9FAFB">
- <ImageView
- android:id="@+id/fragment_house_list_line_left_iv"
- android:layout_width="113dp"
+ <RelativeLayout
+ android:id="@+id/fragment_house_list_line_parent_rl"
+ android:layout_width="0dp"
android:layout_height="130dp"
- android:background="@color/text_245EC3" />
-
- <TextView
- android:id="@+id/fragment_house_list_line_name_tv"
- android:layout_width="wrap_content"
- android:layout_height="@dimen/dp_23"
- android:layout_marginStart="@dimen/dp_15"
- android:layout_marginTop="@dimen/dp_28"
- android:layout_toEndOf="@+id/fragment_house_list_line_left_iv"
- android:gravity="center_vertical"
- android:text="@string/my_power_station_鐢电珯"
- android:textColor="@color/text_90000000"
- android:textSize="@dimen/text_16" />
-
- <TextView
- android:id="@+id/fragment_house_list_line_capacity_tv"
- android:layout_width="wrap_content"
- android:layout_height="@dimen/dp_17"
- android:layout_below="@+id/fragment_house_list_line_name_tv"
- android:layout_alignStart="@+id/fragment_house_list_line_name_tv"
- android:layout_marginTop="@dimen/dp_13"
- android:gravity="center_vertical"
- android:text="@string/my_power_station_瑁呮満瀹归噺"
- android:textColor="@color/text_40000000"
- android:textSize="@dimen/text_12" />
-
- <TextView
- android:id="@+id/fragment_house_list_line_power_tv"
- android:layout_width="wrap_content"
- android:layout_height="@dimen/dp_17"
- android:layout_below="@+id/fragment_house_list_line_capacity_tv"
- android:layout_alignStart="@+id/fragment_house_list_line_capacity_tv"
- android:layout_marginTop="@dimen/dp_13"
- android:gravity="center_vertical"
- android:text="@string/my_power_station_鍙戠數鍔熺巼"
- android:textColor="@color/text_40000000"
- android:textSize="@dimen/text_12" />
-
- <TextView
- android:id="@+id/fragment_house_list_line_state_tv"
- android:layout_width="@dimen/dp_48"
- android:layout_height="@dimen/dp_33"
- android:layout_alignParentTop="true"
+ android:layout_alignParentStart="true"
android:layout_alignParentEnd="true"
- android:background="@drawable/state_ffb300"
- android:gravity="center"
- android:text="@string/my_power_station_杩炴帴涓�"
- android:textColor="@color/text_FFFFFFFF"
- android:textSize="@dimen/text_12" />
+ android:layout_marginStart="@dimen/dp_20"
+ android:layout_marginTop="@dimen/dp_12"
+ android:layout_marginEnd="@dimen/dp_20"
+ android:background="@drawable/house_list_line_parent_bg">
+
+ <ImageView
+ android:id="@+id/fragment_house_list_line_left_iv"
+ android:layout_width="113dp"
+ android:layout_height="130dp"
+ android:background="@drawable/default_user"
+ android:scaleType="centerCrop" />
+
+ <TextView
+ android:id="@+id/fragment_house_list_line_name_tv"
+ android:layout_width="170dp"
+ android:layout_height="@dimen/dp_23"
+ android:layout_marginStart="@dimen/dp_15"
+ android:layout_marginTop="@dimen/dp_28"
+ android:layout_toEndOf="@+id/fragment_house_list_line_left_iv"
+ android:ellipsize="end"
+ android:gravity="center_vertical|start"
+ android:singleLine="true"
+ android:text="@string/power_station"
+ android:textColor="@color/text_90000000"
+ android:textSize="@dimen/text_16" />
+
+ <TextView
+ android:id="@+id/fragment_house_list_line_capacity_tv"
+ android:layout_width="wrap_content"
+ android:layout_height="@dimen/dp_17"
+ android:layout_below="@+id/fragment_house_list_line_name_tv"
+ android:layout_alignStart="@+id/fragment_house_list_line_name_tv"
+ android:layout_marginTop="@dimen/dp_13"
+ android:gravity="center_vertical"
+ android:text="@string/my_power_station_installed_capacity"
+ android:textColor="@color/text_40000000"
+ android:textSize="@dimen/text_12" />
+
+ <TextView
+ android:id="@+id/fragment_house_list_line_power_tv"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_below="@+id/fragment_house_list_line_capacity_tv"
+ android:layout_alignStart="@+id/fragment_house_list_line_capacity_tv"
+ android:layout_marginTop="@dimen/dp_13"
+ android:gravity="center_vertical"
+ android:text="@string/power_station_generated_power"
+ android:textColor="@color/text_40000000"
+ android:textSize="@dimen/text_12" />
+
+ <TextView
+ android:id="@+id/fragment_house_list_line_state_tv"
+ android:layout_width="@dimen/dp_48"
+ android:layout_height="@dimen/dp_33"
+ android:layout_alignParentTop="true"
+ android:layout_alignParentEnd="true"
+ android:background="@drawable/state_ffb300"
+ android:gravity="center"
+ android:text="@string/my_power_station_connecting"
+ android:textColor="@color/text_FFFFFFFF"
+ android:textSize="@dimen/text_12" />
+
+
+ </RelativeLayout>
</RelativeLayout>
+</com.hdl.photovoltaic.widget.SwipeLayout>
-</RelativeLayout>
\ No newline at end of file
--
Gitblit v1.8.0