Merge branch 'dev' into 1.4.4

wjc

8 天以前 89d140a2ca1b27edad1c561347a00ce6561e12bd

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

@@ -129,7 +129,7 @@

                <LinearLayout
                    android:layout_width="match_parent"
                    android:layout_height="37.5dp"
                    android:layout_height="39dp"
                    android:orientation="horizontal">

                    <LinearLayout
@@ -254,7 +254,7 @@

                <LinearLayout
                    android:layout_width="match_parent"
                    android:layout_height="37.5dp"
                    android:layout_height="39dp"
                    android:orientation="horizontal">

                    <LinearLayout
@@ -375,5 +375,4 @@

    </RelativeLayout>

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

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