diff --git a/app/src/main/java/com/navinfo/outdoor/api/Constant.java b/app/src/main/java/com/navinfo/outdoor/api/Constant.java
index 3bc6bf7..df56833 100644
--- a/app/src/main/java/com/navinfo/outdoor/api/Constant.java
+++ b/app/src/main/java/com/navinfo/outdoor/api/Constant.java
@@ -97,10 +97,10 @@ public class Constant {
     public static LatLng markerLatlng;
     //marker 图标
 
-    public static final BitmapDescriptor POI_ICON = BitmapDescriptorFactory.fromResource(R.drawable.marker_poi_bg);
-    public static BitmapDescriptor ROAD_ICON = BitmapDescriptorFactory.fromResource(R.drawable.marker_road_bg);
-    public static BitmapDescriptor STATION_ICON = BitmapDescriptorFactory.fromResource(R.drawable.marker_charge_bg);
-    public static BitmapDescriptor PLANAR_TASK_ICON = BitmapDescriptorFactory.fromResource(R.drawable.marker_other_bg);
+//    public static final BitmapDescriptor POI_ICON = BitmapDescriptorFactory.fromResource(R.drawable.marker_poi_bg);
+//    public static BitmapDescriptor ROAD_ICON = BitmapDescriptorFactory.fromResource(R.drawable.marker_road_bg);
+//    public static BitmapDescriptor STATION_ICON = BitmapDescriptorFactory.fromResource(R.drawable.marker_charge_bg);
+//    public static BitmapDescriptor PLANAR_TASK_ICON = BitmapDescriptorFactory.fromResource(R.drawable.marker_other_bg);
 
 
     public static JobSearchBean jobSearchBean;//数据
diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/GatherGetFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/GatherGetFragment.java
index 3fd3764..e35a986 100644
--- a/app/src/main/java/com/navinfo/outdoor/fragment/GatherGetFragment.java
+++ b/app/src/main/java/com/navinfo/outdoor/fragment/GatherGetFragment.java
@@ -526,10 +526,12 @@ public class GatherGetFragment extends BaseFragment implements View.OnClickListe
                                     getActivity().runOnUiThread(new Runnable() {
                                         @Override
                                         public void run() {
+//                                            onBackPressed();
 //                                            poiEntity.setTaskStatus(3);
 //                                            initViewByTaskStatus(3);
                                             btnGather.setVisibility(View.GONE);
                                             btnFinishGather.setVisibility(View.VISIBLE);
+
                                         }
                                     });
                                 }
diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/TreasureFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/TreasureFragment.java
index ac05a08..971cb6e 100644
--- a/app/src/main/java/com/navinfo/outdoor/fragment/TreasureFragment.java
+++ b/app/src/main/java/com/navinfo/outdoor/fragment/TreasureFragment.java
@@ -373,7 +373,7 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen
                             }
                             switch (Integer.valueOf(list.get(i).getType())) {
                                 case 1://poi
-                                    BitmapDescriptor poiDescriptor = BitmapDescriptorFactory.fromResource(R.drawable.marker_poi_bg);
+                                    BitmapDescriptor poiDescriptor = BitmapDescriptorFactory.fromResource(R.drawable.marker_poi_bg1);
                                     Marker poiMarker = tencentMap.addMarker(new MarkerOptions(latLng).icon(poiDescriptor).alpha(0.9f)
                                             .flat(true)
                                             .clockwise(false));
@@ -382,7 +382,7 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen
                                     poiMarker.setClickable(true);
                                     break;
                                 case 2://充电站
-                                    BitmapDescriptor chargeDescriptor = BitmapDescriptorFactory.fromResource(R.drawable.marker_charge_bg);
+                                    BitmapDescriptor chargeDescriptor = BitmapDescriptorFactory.fromResource(R.drawable.marker_charge_bg1);
                                     Marker stationMarker = tencentMap.addMarker(new MarkerOptions(latLng).icon(chargeDescriptor).alpha(0.9f)
                                             .flat(true)
                                             .clockwise(false));
@@ -391,7 +391,7 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen
                                     stationMarker.setClickable(true);
                                     break;
                                 case 3://poi录像
-                                    BitmapDescriptor poiVideoDescriptor = BitmapDescriptorFactory.fromResource(R.drawable.poi_video_bg);
+                                    BitmapDescriptor poiVideoDescriptor = BitmapDescriptorFactory.fromResource(R.drawable.marker_poi_video_bg1);
                                     Marker poiVideoMarker = tencentMap.addMarker(new MarkerOptions(latLng).icon(poiVideoDescriptor).alpha(0.9f)
                                             .flat(true)
                                             .clockwise(false));
@@ -409,7 +409,7 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen
                                     roadMarker.setClickable(true);
                                     break;
                                 case 5://其他
-                                    BitmapDescriptor otherDescriptor = BitmapDescriptorFactory.fromResource(R.drawable.marker_other_bg);
+                                    BitmapDescriptor otherDescriptor = BitmapDescriptorFactory.fromResource(R.drawable.marker_other_bg1);
                                     Marker otherMarker = tencentMap.addMarker(new MarkerOptions(latLng).icon(otherDescriptor).alpha(0.9f)
                                             .flat(true)
                                             .clockwise(false));
diff --git a/app/src/main/res/drawable/marker_charge_bg1.png b/app/src/main/res/drawable/marker_charge_bg1.png
new file mode 100644
index 0000000..44560d8
Binary files /dev/null and b/app/src/main/res/drawable/marker_charge_bg1.png differ
diff --git a/app/src/main/res/drawable/marker_other_bg1.png b/app/src/main/res/drawable/marker_other_bg1.png
new file mode 100644
index 0000000..16665b4
Binary files /dev/null and b/app/src/main/res/drawable/marker_other_bg1.png differ
diff --git a/app/src/main/res/drawable/marker_poi_bg1.png b/app/src/main/res/drawable/marker_poi_bg1.png
new file mode 100644
index 0000000..da8941e
Binary files /dev/null and b/app/src/main/res/drawable/marker_poi_bg1.png differ
diff --git a/app/src/main/res/drawable/marker_poi_video_bg1.png b/app/src/main/res/drawable/marker_poi_video_bg1.png
new file mode 100644
index 0000000..5d64b7a
Binary files /dev/null and b/app/src/main/res/drawable/marker_poi_video_bg1.png differ
diff --git a/app/src/main/res/drawable/marker_road_bg.png b/app/src/main/res/drawable/marker_road_bg.png
index b6096ff..90adc8d 100644
Binary files a/app/src/main/res/drawable/marker_road_bg.png and b/app/src/main/res/drawable/marker_road_bg.png differ
diff --git a/app/src/main/res/layout/charging_pile_header.xml b/app/src/main/res/layout/charging_pile_header.xml
index d496ff9..94af5f6 100644
--- a/app/src/main/res/layout/charging_pile_header.xml
+++ b/app/src/main/res/layout/charging_pile_header.xml
@@ -3,43 +3,26 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     xmlns:app="http://schemas.android.com/apk/res-auto">
-    <LinearLayout
-        android:id="@+id/rl_chargingStation"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:background="#1BA5F1"
-        android:orientation="horizontal"
-        android:paddingTop="@dimen/top_pind_sp"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent">
-
-        <ImageView
-            android:id="@+id/iv_charging_pile_final"
-            android:layout_width="wrap_content"
-            android:layout_height="45dp"
-            android:layout_alignParentLeft="true"
-            android:layout_marginLeft="15dp"
-            android:src="@drawable/icon_arrow" />
-
-        <TextView
-            android:id="@+id/tv_charging"
-            style="@style/text_style_toolbar_title"
-            android:layout_width="wrap_content"
-            android:layout_toRightOf="@id/iv_find_task"
-            android:text="充电桩" />
-    </LinearLayout>
     <ImageView
         android:id="@+id/road_bg"
         android:layout_width="wrap_content"
-        android:layout_height="150dp"
+        android:layout_height="100dp"
         android:background="@drawable/top_bg"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/rl_chargingStation"
+   app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintVertical_bias="1.0" />
-
+    <ImageView
+        android:id="@+id/iv_charging_pile_final"
+        android:layout_width="wrap_content"
+        android:layout_height="45dp"
+        android:layout_marginTop="10dp"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintLeft_toLeftOf="parent"
+        android:padding="10dp"
+        android:layout_marginLeft="15dp"
+        android:src="@drawable/icon_arrow" />
     <TextView
         android:id="@+id/tv1"
         android:layout_width="wrap_content"
diff --git a/app/src/main/res/layout/charging_station_header.xml b/app/src/main/res/layout/charging_station_header.xml
index c6cbb6b..238e6c7 100644
--- a/app/src/main/res/layout/charging_station_header.xml
+++ b/app/src/main/res/layout/charging_station_header.xml
@@ -3,43 +3,26 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     xmlns:app="http://schemas.android.com/apk/res-auto">
-        <LinearLayout
-            android:id="@+id/rl_chargingStation"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:background="#1BA5F1"
-            android:orientation="horizontal"
-            android:paddingTop="@dimen/top_pind_sp"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent">
-
-                <ImageView
-                    android:id="@+id/iv_charging_station_final"
-                    android:layout_width="wrap_content"
-                    android:layout_height="45dp"
-                    android:layout_alignParentLeft="true"
-                    android:layout_marginLeft="15dp"
-                    android:src="@drawable/icon_arrow" />
-
-                <TextView
-                    android:id="@+id/tv_charging"
-                    style="@style/text_style_toolbar_title"
-                    android:layout_width="wrap_content"
-                    android:layout_toRightOf="@id/iv_find_task"
-                    android:text="充电站" />
-        </LinearLayout>
         <ImageView
             android:id="@+id/road_bg"
             android:layout_width="wrap_content"
-            android:layout_height="150dp"
+            android:layout_height="100dp"
             android:background="@drawable/top_bg"
-            app:layout_constraintTop_toBottomOf="@id/rl_chargingStation"
+          app:layout_constraintTop_toTopOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintLeft_toLeftOf="parent"
 
             app:layout_constraintVertical_bias="1.0" />
-
+        <ImageView
+            android:id="@+id/iv_charging_station_final"
+            android:layout_width="wrap_content"
+            android:layout_height="45dp"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintLeft_toLeftOf="parent"
+            android:layout_marginTop="10dp"
+            android:layout_marginLeft="10dp"
+            android:padding="10dp"
+            android:src="@drawable/icon_arrow" />
         <TextView
             android:id="@+id/tv1"
             android:layout_width="wrap_content"
diff --git a/app/src/main/res/layout/poi_header.xml b/app/src/main/res/layout/poi_header.xml
index b77a9d6..e0c27df 100644
--- a/app/src/main/res/layout/poi_header.xml
+++ b/app/src/main/res/layout/poi_header.xml
@@ -4,43 +4,25 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content">
 
-    <LinearLayout
-        android:id="@+id/rl_poi"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:background="#1BA5F1"
-        android:orientation="horizontal"
-        android:paddingTop="@dimen/top_pind_sp"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent">
-
-        <ImageView
-            android:id="@+id/iv_final"
-            android:layout_width="wrap_content"
-            android:layout_height="45dp"
-            android:layout_alignParentLeft="true"
-            android:layout_marginLeft="15dp"
-            android:src="@drawable/icon_arrow" />
-
-        <TextView
-            android:id="@+id/tv_poi"
-            style="@style/text_style_toolbar_title"
-            android:layout_width="wrap_content"
-            android:layout_toRightOf="@id/iv_find_task"
-            android:text="POI" />
-    </LinearLayout>
-
     <ImageView
         android:id="@+id/road_bg"
         android:layout_width="wrap_content"
-        android:layout_height="150dp"
+        android:layout_height="100dp"
         android:background="@drawable/top_bg"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/rl_poi"
+       app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintVertical_bias="1.0" />
-
+    <ImageView
+        android:id="@+id/iv_final"
+        android:layout_width="wrap_content"
+        android:layout_height="45dp"
+        android:padding="10dp"
+        android:layout_marginTop="10dp"
+        app:layout_constraintTop_toTopOf="@id/road_bg"
+        android:layout_marginLeft="10dp"
+        app:layout_constraintLeft_toLeftOf="parent"
+        android:src="@drawable/icon_arrow" />
     <TextView
         android:id="@+id/tv1"
         android:layout_width="wrap_content"
diff --git a/app/src/main/res/layout/poi_video_header.xml b/app/src/main/res/layout/poi_video_header.xml
index 5e8cb7d..1d55b68 100644
--- a/app/src/main/res/layout/poi_video_header.xml
+++ b/app/src/main/res/layout/poi_video_header.xml
@@ -1,41 +1,27 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout 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"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
-    <LinearLayout
-        android:id="@+id/rl_poi_video"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:background="#1BA5F1"
-        android:orientation="horizontal"
-        android:paddingTop="@dimen/top_pind_sp"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent">
+    android:layout_height="wrap_content">
 
-        <ImageView
-            android:id="@+id/iv_final"
-            android:layout_width="wrap_content"
-            android:layout_height="45dp"
-            android:layout_alignParentLeft="true"
-            android:layout_marginLeft="15dp"
-            android:src="@drawable/icon_arrow" />
-
-        <TextView
-            android:id="@+id/tv_poiVideo"
-            style="@style/text_style_toolbar_title"
-            android:layout_width="wrap_content"
-            android:layout_toRightOf="@id/iv_find_task"
-            android:text="POI录像" />
-    </LinearLayout>
     <ImageView
         android:id="@+id/road_bg"
         android:layout_width="wrap_content"
-        android:layout_height="150dp"
+        android:layout_height="100dp"
         android:background="@drawable/top_bg"
         app:layout_constraintLeft_toLeftOf="parent"
-       app:layout_constraintTop_toBottomOf="@id/rl_poi_video"/>
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <ImageView
+        android:id="@+id/iv_final"
+        android:layout_width="wrap_content"
+        android:layout_height="45dp"
+        android:layout_marginLeft="15dp"
+        android:layout_marginTop="10dp"
+        android:padding="10dp"
+        android:src="@drawable/icon_arrow"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
 
     <TextView
         android:id="@+id/tv1"
diff --git a/app/src/main/res/layout/road_header.xml b/app/src/main/res/layout/road_header.xml
index 410e367..4c35e77 100644
--- a/app/src/main/res/layout/road_header.xml
+++ b/app/src/main/res/layout/road_header.xml
@@ -3,40 +3,24 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     xmlns:app="http://schemas.android.com/apk/res-auto">
-    <LinearLayout
-        android:id="@+id/rl_road"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:background="#1BA5F1"
-        android:orientation="horizontal"
-        android:paddingTop="@dimen/top_pind_sp"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent">
-
-        <ImageView
-            android:id="@+id/iv_final"
-            android:layout_width="wrap_content"
-            android:layout_height="45dp"
-            android:layout_alignParentLeft="true"
-            android:layout_marginLeft="15dp"
-            android:src="@drawable/icon_arrow" />
-
-        <TextView
-            android:id="@+id/tv_other"
-            style="@style/text_style_toolbar_title"
-            android:layout_width="wrap_content"
-            android:layout_toRightOf="@id/iv_find_task"
-            android:text="道路" />
-    </LinearLayout>
     <ImageView
         android:id="@+id/road_bg"
         android:layout_width="wrap_content"
-        android:layout_height="150dp"
+        android:layout_height="100dp"
         android:background="@drawable/top_bg"
+        app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintLeft_toLeftOf="parent"
-      app:layout_constraintTop_toBottomOf="@id/rl_road" />
-
+     />
+    <ImageView
+        android:id="@+id/iv_final"
+        android:layout_width="wrap_content"
+        android:layout_height="45dp"
+       app:layout_constraintTop_toTopOf="parent"
+        android:layout_marginTop="10dp"
+        android:padding="10dp"
+        app:layout_constraintLeft_toLeftOf="parent"
+        android:layout_marginLeft="15dp"
+        android:src="@drawable/icon_arrow" />
     <TextView
         android:id="@+id/tv1"
         android:layout_width="wrap_content"