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

修改新手引导bug和8.27提出的bug

Browse Source
This commit is contained in:
md
2021-08-27 16:02:26 +08:00
parent 97f4db7efe
commit 72dd2af310
12 changed files with 127 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/src/main/res/layout/charging_pile_fragment.xml
View File

@@ -314,6 +314,16 @@
android:layout_margin="10dp"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/linear_type" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="长按图片可删除"
android:textSize="16sp"
android:layout_marginLeft="10dp"
app:layout_constraintTop_toTopOf="@+id/tv_02"
app:layout_constraintLeft_toRightOf="@+id/tv_02"
app:layout_constraintBottom_toBottomOf="@+id/tv_02"
/>
<LinearLayout
android:id="@+id/linear_photograph"
android:layout_width="match_parent"

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

@@ -26,6 +26,7 @@
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="match_parent">
<TextView
android:id="@+id/tv_01"
android:layout_width="wrap_content"
@@ -36,7 +37,50 @@
android:textSize="15sp"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<RelativeLayout
android:id="@+id/linear_exist"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="10dp"
android:background="@drawable/underline"
android:padding="2dp"
android:visibility="gone"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tv_01">
<TextView
android:id="@+id/tv_exist"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_centerVertical="true"
android:layout_marginLeft="18dp"
android:layout_marginTop="10dp"
android:layout_marginBottom="10dp"
android:text="是否存在*"
android:textColor="#333" />
<Spinner
android:id="@+id/spinner_exist"
android:layout_width="match_parent"
android:layout_height="40dp"
android:layout_centerVertical="true"
android:layout_marginLeft="18dp"
android:layout_marginRight="10dp"
android:layout_toEndOf="@id/tv_exist"
android:layout_toRightOf="@id/tv_exist"
android:background="@color/white"
android:textColor="#333"
android:textSize="15sp" />
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:background="@drawable/ic_baseline_arrow_drop" />
</RelativeLayout>
<RelativeLayout
android:id="@+id/linear_pot"
android:layout_width="match_parent"
@@ -47,7 +91,7 @@
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="1.0"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tv_01">
app:layout_constraintTop_toBottomOf="@id/linear_exist">
<TextView
android:id="@+id/tv_pot"
@@ -244,50 +288,7 @@
android:background="@drawable/ic_baseline_arrow_drop" />
</RelativeLayout>
<RelativeLayout
android:id="@+id/linear_exist"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="10dp"
android:background="@drawable/underline"
android:padding="2dp"
android:visibility="gone"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/linear_type">
<TextView
android:id="@+id/tv_exist"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_centerVertical="true"
android:layout_marginLeft="18dp"
android:layout_marginTop="10dp"
android:layout_marginBottom="10dp"
android:text="是否存在*"
android:textColor="#333" />
<Spinner
android:id="@+id/spinner_exist"
android:layout_width="match_parent"
android:layout_height="40dp"
android:layout_centerVertical="true"
android:layout_marginLeft="18dp"
android:layout_marginRight="10dp"
android:layout_toEndOf="@id/tv_exist"
android:layout_toRightOf="@id/tv_exist"
android:background="@color/white"
android:textColor="#333"
android:textSize="15sp" />
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:background="@drawable/ic_baseline_arrow_drop" />
</RelativeLayout>
<TextView
android:id="@+id/tv_02"
@@ -298,8 +299,17 @@
android:textColor="@color/black"
android:textSize="15sp"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/linear_exist" />
app:layout_constraintTop_toBottomOf="@id/linear_type" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="长按图片可删除"
android:textSize="16sp"
android:layout_marginLeft="10dp"
app:layout_constraintTop_toTopOf="@+id/tv_02"
app:layout_constraintLeft_toRightOf="@+id/tv_02"
app:layout_constraintBottom_toBottomOf="@+id/tv_02"
/>
<LinearLayout
android:id="@+id/linear_photograph"
android:layout_width="match_parent"

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

@@ -8,9 +8,9 @@
<Button
android:id="@+id/btn_delete"
android:layout_width="25dp"
android:layout_height="25dp"
android:padding="5dp"
android:layout_width="15dp"
android:layout_height="15dp"
android:padding="10dp"
android:layout_marginEnd="20dp"
android:layout_marginTop="10dp"
android:background="@drawable/icon_delete"

11
app/src/main/res/layout/fragment_other.xml
View File

@@ -180,7 +180,16 @@
android:textStyle="bold"
app:layout_constraintLeft_toLeftOf="@id/ll_data"
app:layout_constraintTop_toBottomOf="@id/ll_data" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="长按图片可删除"
android:textSize="16sp"
android:layout_marginLeft="10dp"
app:layout_constraintTop_toTopOf="@+id/tv_other_picture"
app:layout_constraintLeft_toRightOf="@+id/tv_other_picture"
app:layout_constraintBottom_toBottomOf="@+id/tv_other_picture"
/>
<LinearLayout
android:id="@+id/ll_image_picture"
android:layout_width="match_parent"

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

@@ -154,9 +154,10 @@
android:layout_height="wrap_content"
android:layout_marginLeft="5dp"
android:gravity="center"
android:text="录像"
android:text="点击录像"
android:textColor="@color/white"
android:textSize="15sp" />
</LinearLayout>
<FrameLayout
@@ -167,11 +168,18 @@
app:layout_constraintLeft_toLeftOf="@id/ll_pictures"
app:layout_constraintTop_toBottomOf="@id/ll_pictures">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="长按录像可删除"
android:textSize="16sp"
android:layout_marginLeft="10dp"
/>
<ImageView
android:id="@+id/iv_road_picture"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="20dp"
android:maxWidth="200dp"
android:maxHeight="100dp"
android:minWidth="140dp"

9
app/src/main/res/layout/mine_fragment.xml
View File

@@ -11,13 +11,16 @@
android:paddingTop="@dimen/top_pind_sp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent">
<TextView
android:id="@+id/tv_mine"
style="@style/text_style_toolbar_title"
android:layout_width="wrap_content"
android:layout_height="45dp"
android:layout_marginLeft="15dp"
android:gravity="center"
android:text="我的"
android:textColor="#000" />
android:textColor="#000"
android:textSize="20sp"
android:textStyle="bold" />
</RelativeLayout>
<androidx.constraintlayout.widget.ConstraintLayout

11
app/src/main/res/layout/poi_fragment.xml
View File

@@ -254,7 +254,16 @@
android:textColor="@color/black"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/linear_exist" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="长按图片可删除"
android:textSize="16sp"
android:layout_marginLeft="10dp"
app:layout_constraintTop_toTopOf="@+id/tv_02"
app:layout_constraintLeft_toRightOf="@+id/tv_02"
app:layout_constraintBottom_toBottomOf="@+id/tv_02"
/>
<LinearLayout
android:id="@+id/linear_photograph"
android:layout_width="match_parent"

17
app/src/main/res/layout/poi_video_fragment.xml
View File

@@ -172,16 +172,10 @@
android:layout_height="wrap_content"
android:layout_marginLeft="5dp"
android:gravity="center"
android:text="拍照"
android:text="点击拍照"
android:textColor="@color/white"
android:textSize="15sp" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="长按图片或者录像可删除"
android:textSize="16sp"
android:layout_gravity="center"
android:layout_marginLeft="5dp"/>
</LinearLayout>
@@ -192,11 +186,18 @@
android:layout_marginTop="10dp"
app:layout_constraintLeft_toLeftOf="@id/ll_pictures"
app:layout_constraintTop_toBottomOf="@id/ll_pictures">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="长按图片或者录像可删除"
android:textSize="16sp"
android:layout_marginLeft="10dp"/>
<ImageView
android:id="@+id/iv_poi_video_picture"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="25dp"
android:maxWidth="200dp"
android:maxHeight="100dp"
android:minWidth="140dp"