parent: f21dcea3 | 补丁 | 提交 | ignore whitespace
wjc
2024-12-11 2859902a782139b2dee7fa97dee66da6db3bd5d5 
2024年12月11日13:11:51
2个文件已修改
102 ■■■■■ 已修改文件
app/src/main/res/layout/item_device_details.xml 51 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/res/layout/item_plant_details.xml 51 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 
 app/src/main/res/layout/item_device_details.xml


@@ -103,9 +103,8 @@




                <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


@@ -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,8 +157,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:text="0"


                            android:textColor="@color/text_E6FFFFFF"


                            android:textSize="@dimen/text_14" />


@@ -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,8 +212,6 @@


                            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" />


@@ -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" />




 app/src/main/res/layout/item_plant_details.xml


@@ -110,9 +110,8 @@




                <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


@@ -151,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 +180,6 @@


                            android:layout_height="match_parent"


                            android:layout_gravity="center_horizontal"


                            android:gravity="start|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" />


@@ -199,23 +203,28 @@


                        android:layout_height="@dimen/dp_15"


                        android:layout_marginTop="3dp"


                        android:gravity="start|center_horizontal"


                        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" />




                </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">


@@ -229,8 +238,6 @@


                            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" />


@@ -253,8 +260,6 @@


                        android:layout_height="@dimen/dp_15"


                        android:layout_marginTop="3dp"


                        android:gravity="center_vertical|start"


                        android:paddingStart="@dimen/dp_26"


                        android:paddingEnd="@dimen/dp_0"


                        android:text="@string/month_power_generation"


                        android:textColor="@color/text_66FFFFFF"


                        android:textSize="@dimen/text_12" />