解决冲突

2021-08-10 14:50:29 +08:00
parent 9a4917d3ec 450815c05c
commit c03b3cb597
18 changed files with 248 additions and 162 deletions
--- a/app/src/main/res/layout/poi_fragment.xml
+++ b/app/src/main/res/layout/poi_fragment.xml
@@ -316,7 +316,7 @@
                        android:layout_height="20dp"
                        />
                    <TextView
-                        android:id="@+id/tv_name"
+                        android:id="@+id/tv_poi_name_pic"
                        android:layout_width="wrap_content"
                        android:layout_height="wrap_content"
                        android:layout_centerHorizontal="true"