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

修改poi录像和道路录像的bug,抽屉滑动的bug

Browse Source
This commit is contained in:
wds
2021-08-11 11:04:52 +08:00
parent 74956539a7
commit 2ebe3377fb
16 changed files with 201 additions and 149 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4,17 +4,20 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent">
<include
android:id="@+id/charging_pile_header"
layout="@layout/charging_pile_header"
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">
android:layout_height="match_parent"
>
<include
android:id="@+id/charging_pile_header"
layout="@layout/charging_pile_header"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">
</include>
</include>
<TextView
android:id="@+id/tv_01"
android:layout_width="wrap_content"
@@ -199,56 +202,56 @@
</LinearLayout>
<!-- <RadioGroup
android:id="@+id/radio_group"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_margin="10dp"
android:padding="2dp"
android:background="@drawable/underline"
app:layout_constraintTop_toBottomOf="@id/text"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent">
<RadioButton
android:id="@+id/radio_button1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="对所有车辆开放"
/>
<RadioButton
android:id="@+id/radio_button2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="对环卫车开放"
/>
<!-- <RadioGroup
android:id="@+id/radio_group"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_margin="10dp"
android:padding="2dp"
android:background="@drawable/underline"
app:layout_constraintTop_toBottomOf="@id/text"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent">
<RadioButton
android:id="@+id/radio_button1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="对所有车辆开放"
/>
<RadioButton
android:id="@+id/radio_button2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="对环卫车开放"
/>
<RadioButton
android:id="@+id/radio_button3"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="对公交车开放"
/>
<RadioButton
android:id="@+id/radio_button4"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="对出租车开放"
/>
<RadioButton
android:id="@+id/radio_button3"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="对公交车开放"
/>
<RadioButton
android:id="@+id/radio_button4"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="对出租车开放"
/>
<RadioButton
android:id="@+id/radio_button5"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="对除环卫,公交,出租,品牌,之外的其他 特种车辆开放"
/>
<RadioButton
android:id="@+id/radio_button6"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="对某品牌汽车开放"
/>
<RadioButton
android:id="@+id/radio_button5"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="对除环卫,公交,出租,品牌,之外的其他 特种车辆开放"
/>
<RadioButton
android:id="@+id/radio_button6"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="对某品牌汽车开放"
/>
</RadioGroup>-->
</RadioGroup>-->
<RelativeLayout
android:id="@+id/linear_type"
android:layout_width="match_parent"
@@ -828,4 +831,6 @@
android:text="保存并返回"
android:textColor="@color/white" />
</LinearLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -1,21 +1,25 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout
<androidx.core.widget.NestedScrollView
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent">
<include
android:id="@+id/charging_station_header"
layout="@layout/charging_station_header"
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">
android:layout_height="match_parent"
>
<include
android:id="@+id/charging_station_header"
layout="@layout/charging_station_header"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">
</include>
</include>
<TextView
android:id="@+id/tv_01"
android:layout_width="wrap_content"
@@ -527,7 +531,7 @@
android:padding="3dp"
android:background="@drawable/selector_red_radius_bg"
android:orientation="horizontal"
app:layout_constraintTop_toTopOf="@+id/tv_03"
app:layout_constraintTop_toTopOf="@+id/tv_03"
app:layout_constraintBottom_toBottomOf="@+id/tv_03"
app:layout_constraintRight_toRightOf="parent"
>
@@ -618,4 +622,6 @@
android:background="@drawable/shape_transparent_pink_radius_bg"
android:text="上传" />
</LinearLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.core.widget.NestedScrollView>

1
app/src/main/res/layout/fragment_filter.xml
View File

@@ -10,7 +10,6 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
>
</include>
<LinearLayout
android:id="@+id/ll_filter"

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

@@ -1,20 +1,24 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout
<androidx.core.widget.NestedScrollView
android:id="@+id/nested_scroll_view"
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<include
android:id="@+id/poi_header"
layout="@layout/poi_header"
android:layout_height="match_parent">
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">
android:layout_height="match_parent"
>
<include
android:id="@+id/poi_header"
layout="@layout/poi_header"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">
</include>
</include>
<TextView
@@ -25,7 +29,7 @@
android:textColor="@color/black"
android:layout_margin="10dp"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/poi_header"/>
app:layout_constraintTop_toBottomOf="@id/poi_header"/>
<RelativeLayout
android:id="@+id/linear_pot"
@@ -118,7 +122,7 @@
android:layout_toStartOf="@id/tv_examine"
android:textSize="15sp"
android:textColor="@color/test_color_selector" />
<!-- android:textColor="#333" -->
<!-- android:textColor="#333" -->
<TextView
android:id="@+id/tv_examine"
android:layout_width="wrap_content"
@@ -165,7 +169,7 @@
android:background="@color/white"
android:hint="poi地址"
android:textSize="15sp"
/>
/>
</RelativeLayout>
<RelativeLayout
android:id="@+id/linear_phone"
@@ -176,13 +180,13 @@
app:layout_constraintTop_toBottomOf="@id/linear_site"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent">
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/recycler_phone"
android:layout_width="match_parent"
android:visibility="gone"
android:layout_height="match_parent"
android:layout_centerInParent="true"
/>
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/recycler_phone"
android:layout_width="match_parent"
android:visibility="gone"
android:layout_height="match_parent"
android:layout_centerInParent="true"
/>
<LinearLayout
android:id="@+id/linear_contact"
android:layout_width="match_parent"
@@ -534,4 +538,6 @@
android:background="@drawable/shape_transparent_pink_radius_bg"
android:text="上传" />
</LinearLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.core.widget.NestedScrollView>

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

@@ -10,7 +10,6 @@
sothree:umanoDragView="@id/dragView"
sothree:umanoOverlay="false"
sothree:umanoPanelHeight="0dp"
sothree:umanoScrollableView="@id/scroll_parent_view"
sothree:umanoShadowHeight="0dp">
<FrameLayout
android:layout_width="match_parent"
@@ -140,11 +139,12 @@
android:focusable="true"
android:orientation="vertical">
<ScrollView
android:id="@+id/scroll_parent_view"
<!-- <ScrollView
android:layout_width="match_parent"
android:layout_height="wrap_content">
android:layout_height="wrap_content"> </ScrollView>-->
<LinearLayout
android:id="@+id/scroll_parent_view"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
@@ -153,7 +153,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"></FrameLayout>
</LinearLayout>
</ScrollView>
</LinearLayout>
</com.sothree.slidinguppanel.SlidingUpPanelLayout>