xiaoyan159/NavinfoOutDoor
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

解决冲突

Browse Source
This commit is contained in:
wds
2021-08-10 14:50:29 +08:00
parent 9a4917d3ec 450815c05c
commit c03b3cb597
18 changed files with 248 additions and 162 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/res/layout/charging_station_fragment.xml
View File

@@ -90,7 +90,7 @@
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent">
<TextView
android:id="@+id/tv_name"
android:id="@+id/tv_name_pic"
android:layout_alignParentLeft="true"
android:layout_centerVertical="true"
android:text="名称*"
@@ -108,11 +108,11 @@
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginLeft="18dp"
android:layout_toRightOf="@id/tv_name"
android:layout_toRightOf="@id/tv_name_pic"
android:background="@color/white"
android:hint="名称"
android:singleLine="true"
android:layout_toEndOf="@id/tv_name"
android:layout_toEndOf="@id/tv_name_pic"
android:layout_toStartOf="@id/tv_examine"
android:textSize="15sp"
android:textColor="@color/test_color_selector" />