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

Merge branch 'master' of C:\Users\wds81\StudioProjects\NavinfoOutDoorDataCollect with conflicts.

Browse Source
This commit is contained in:
wds
2021-05-28 18:48:31 +08:00
parent e5d85ac72f
commit 3ff0d534b8
22 changed files with 411 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/src/main/res/layout/find_fragment.xml
View File

@@ -79,7 +79,8 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_margin="2dp"
android:background="@drawable/icon_task_prefecture" />
android:scaleType="centerInside"
android:src="@drawable/icon_task_prefecture" />
</LinearLayout>
<LinearLayout
@@ -94,7 +95,8 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_margin="2dp"
android:background="@drawable/icon_event_prefecture" />
android:scaleType="centerInside"
android:src="@drawable/icon_event_prefecture" />
</LinearLayout>
</LinearLayout>
</LinearLayout>
@@ -159,7 +161,8 @@
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/icon_task_specification"
android:scaleType="centerInside"
android:src="@drawable/icon_task_specification"
/>
<TextView
android:layout_width="wrap_content"
@@ -178,7 +181,8 @@
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/icon_capacity_evaluation"
android:scaleType="centerInside"
android:src="@drawable/icon_capacity_evaluation"
/>
<TextView
android:layout_width="wrap_content"