diff --git a/.idea/misc.xml b/.idea/misc.xml
index 707ee6e613..2dc54c489f 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="JDK" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
 </project>
\ No newline at end of file
diff --git a/foudations/mogo-commons/src/main/java/com/mogo/commons/AbsMogoApplication.java b/foudations/mogo-commons/src/main/java/com/mogo/commons/AbsMogoApplication.java
index b1e7afd023..53d2b568cc 100644
--- a/foudations/mogo-commons/src/main/java/com/mogo/commons/AbsMogoApplication.java
+++ b/foudations/mogo-commons/src/main/java/com/mogo/commons/AbsMogoApplication.java
@@ -133,9 +133,9 @@ public class AbsMogoApplication extends Application {
         } );
     }
 
-    private static void getTicket(TicketInfoCallback callback){
+    private static void getTicket( TicketInfoCallback callback ) {
         if ( DebugConfig.isLauncher() ) {
-            AccountClientManager.getTicket(callback);
+            AccountClientManager.getTicket( callback );
         } else {
             AccountClientManager.getAppTicket( callback );
         }
diff --git a/modules/mogo-module-apps/src/main/res/values-xhdpi/dimens.xml b/modules/mogo-module-apps/src/main/res/values-xhdpi/dimens.xml
index e4753b0f9d..a9ba5a2fef 100644
--- a/modules/mogo-module-apps/src/main/res/values-xhdpi/dimens.xml
+++ b/modules/mogo-module-apps/src/main/res/values-xhdpi/dimens.xml
@@ -24,6 +24,6 @@
     <dimen name="module_apps_navigator_icon_width">140px</dimen>
     <dimen name="module_apps_navigator_icon_height">140px</dimen>
     <dimen name="module_apps_navigator_icon_divider">30px</dimen>
-    <dimen name="module_apps_voice_icon_width">110px</dimen>
-    <dimen name="module_apps_voice_icon_height">110px</dimen>
+    <dimen name="module_apps_voice_icon_width">100px</dimen>
+    <dimen name="module_apps_voice_icon_height">100px</dimen>
 </resources>
\ No newline at end of file
diff --git a/modules/mogo-module-apps/src/main/res/values/dimens.xml b/modules/mogo-module-apps/src/main/res/values/dimens.xml
index c9efac23e8..679816b821 100644
--- a/modules/mogo-module-apps/src/main/res/values/dimens.xml
+++ b/modules/mogo-module-apps/src/main/res/values/dimens.xml
@@ -24,6 +24,6 @@
     <dimen name="module_apps_navigator_icon_width">78px</dimen>
     <dimen name="module_apps_navigator_icon_height">78px</dimen>
     <dimen name="module_apps_navigator_icon_divider">17px</dimen>
-    <dimen name="module_apps_voice_icon_width">70px</dimen>
-    <dimen name="module_apps_voice_icon_height">70px</dimen>
+    <dimen name="module_apps_voice_icon_width">60px</dimen>
+    <dimen name="module_apps_voice_icon_height">60px</dimen>
 </resources>
\ No newline at end of file
diff --git a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/utils/TopViewAnimHelper.java b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/utils/TopViewAnimHelper.java
index 0b6ebc03de..f52b467232 100644
--- a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/utils/TopViewAnimHelper.java
+++ b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/utils/TopViewAnimHelper.java
@@ -473,9 +473,9 @@ public class TopViewAnimHelper {
         arriveTimeGroup.setVisibility(View.GONE);
         int scene = 0;
         if (isTopViewOut) {
-            scene = Scene.AIMLESS_WITH_ROAD_EVENT;
-        } else {
             scene = Scene.AIMLESS;
+        } else {
+            scene = Scene.AIMLESS_WITH_ROAD_EVENT;
         }
         Logger.d(TAG, "hide navi setMapCenterPointByScene: " + scene);
         MapCenterPointStrategy.setMapCenterPointByScene(mogoMapUIController, scene);
diff --git a/modules/mogo-module-main/src/main/res/layout/module_main_activity_main.xml b/modules/mogo-module-main/src/main/res/layout/module_main_activity_main.xml
index 96f61eca7b..25994bb014 100644
--- a/modules/mogo-module-main/src/main/res/layout/module_main_activity_main.xml
+++ b/modules/mogo-module-main/src/main/res/layout/module_main_activity_main.xml
@@ -9,13 +9,7 @@
     <FrameLayout
         android:id="@+id/module_main_id_map_fragment_container"
         android:layout_width="match_parent"
-        android:layout_height="match_parent" >
-
-        <FrameLayout
-            android:id="@+id/module_main_id_search_fragment"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent" />
-    </FrameLayout>
+        android:layout_height="match_parent"/>
 
     <FrameLayout
         android:id="@+id/module_main_id_map_left_shadow_frame"
@@ -54,6 +48,11 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent" />
 
+    <FrameLayout
+        android:id="@+id/module_main_id_search_fragment"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
+
     <FrameLayout
         android:id="@+id/module_main_id_cover_up"
         android:layout_width="match_parent"
diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerManager.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerManager.java
index b37af341fb..559d7c301f 100644
--- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerManager.java
+++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerManager.java
@@ -864,7 +864,7 @@ public class MapMarkerManager implements IMogoMarkerClickListener,
                 float distance = Utils.calculateLineDistance( lastLon, lastLat, lng, lat );
                 lastLon = lng;
                 lastLat = lat;
-                if ( distance < 0.5f ) {// 距离过短，认为静止不动
+                if ( distance < 0.2f ) {// 距离过短，认为静止不动
                     continue;
                 }
 
diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerView.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerView.java
index 9b7153b574..6d2d7affe2 100644
--- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerView.java
+++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerView.java
@@ -24,8 +24,6 @@ import com.mogo.module.service.ServiceConst;
 public class MapMarkerView extends MapMarkerBaseView {
     private String TAG = "MapMarkerView";
 
-    private ImageView ivBg;
-
     public MapMarkerView( Context context ) {
         super( context );
     }
@@ -48,7 +46,6 @@ public class MapMarkerView extends MapMarkerBaseView {
         LayoutInflater.from( context ).inflate( R.layout.view_map_marker, this );
         ivIcon = findViewById( R.id.ivIcon );
         ivCar = findViewById( R.id.ivCar );
-        ivBg = findViewById( R.id.ivBg );
     }
 
     public void updateView( MarkerShowEntity markerShowEntity ) {
diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/module_service_ic_call.png b/modules/mogo-module-service/src/main/res/drawable-xhdpi/module_service_ic_call.png
index 89680bd182..9a9321b3a6 100644
Binary files a/modules/mogo-module-service/src/main/res/drawable-xhdpi/module_service_ic_call.png and b/modules/mogo-module-service/src/main/res/drawable-xhdpi/module_service_ic_call.png differ
diff --git a/modules/mogo-module-service/src/main/res/drawable/module_service_ic_call.png b/modules/mogo-module-service/src/main/res/drawable/module_service_ic_call.png
index 3f90fd4af5..a66ed29d09 100644
Binary files a/modules/mogo-module-service/src/main/res/drawable/module_service_ic_call.png and b/modules/mogo-module-service/src/main/res/drawable/module_service_ic_call.png differ
diff --git a/modules/mogo-module-service/src/main/res/layout/view_map_data_user_info_window.xml b/modules/mogo-module-service/src/main/res/layout/view_map_data_user_info_window.xml
index 5028bcbe89..0967298a46 100644
--- a/modules/mogo-module-service/src/main/res/layout/view_map_data_user_info_window.xml
+++ b/modules/mogo-module-service/src/main/res/layout/view_map_data_user_info_window.xml
@@ -7,14 +7,12 @@
     android:background="@android:color/transparent"
     android:gravity="center"
     android:orientation="vertical"
-    android:paddingStart="@dimen/dp_5"
-    android:paddingEnd="@dimen/dp_5"
     tools:parentTag="androidx.constraintlayout.widget.ConstraintLayout">
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/module_service_id_marker_content"
         android:layout_width="wrap_content"
-        android:layout_height="@dimen/dp_90"
+        android:layout_height="@dimen/module_services_info_window_height"
         android:background="@drawable/module_services_driver_blue_info"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
@@ -22,8 +20,9 @@
 
         <com.mogo.service.imageloader.MogoImageView
             android:id="@+id/module_service_id_user_header"
-            android:layout_width="@dimen/dp_76"
-            android:layout_height="@dimen/dp_76"
+            android:layout_width="@dimen/module_service_user_header_width"
+            android:layout_height="@dimen/module_service_user_header_height"
+            android:layout_marginLeft="2.5px"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"
@@ -38,10 +37,10 @@
             android:layout_height="wrap_content"
             android:layout_marginLeft="@dimen/dp_10"
             android:ellipsize="end"
+            android:minWidth="@dimen/module_service_content_minWidth"
             android:singleLine="true"
-            android:minWidth="@dimen/dp_100"
             android:textColor="#ffffff"
-            android:textSize="@dimen/sp_32"
+            android:textSize="@dimen/module_service_content_textSize"
             app:layout_constraintStart_toEndOf="@+id/module_service_id_user_header"
             app:layout_constraintTop_toTopOf="@+id/module_service_id_user_header"
             app:layout_goneMarginRight="@dimen/dp_30"
@@ -51,19 +50,21 @@
             android:id="@+id/module_service_id_tag"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:layout_marginTop="5px"
             android:background="@drawable/module_services_driver_type_blue_info"
             android:textColor="#ffffff"
-            android:textSize="@dimen/sp_20"
+            android:textSize="@dimen/module_service_tag_textSize"
             app:layout_constraintStart_toStartOf="@+id/module_service_id_content"
             app:layout_constraintTop_toBottomOf="@+id/module_service_id_content"
             tools:text="老司机" />
 
         <ImageView
             android:id="@+id/module_service_id_call"
-            android:layout_width="@dimen/dp_85"
-            android:layout_height="@dimen/dp_85"
+            android:layout_width="@dimen/module_service_user_header_width"
+            android:layout_height="@dimen/module_service_user_header_height"
             android:layout_gravity="center"
             android:layout_marginLeft="@dimen/dp_10"
+            android:layout_marginRight="2.5px"
             android:scaleType="fitXY"
             android:src="@drawable/module_service_ic_call"
             app:layout_constraintBottom_toBottomOf="parent"
diff --git a/modules/mogo-module-service/src/main/res/layout/view_map_marker.xml b/modules/mogo-module-service/src/main/res/layout/view_map_marker.xml
index cb9fef8112..3ba8e4a5cf 100644
--- a/modules/mogo-module-service/src/main/res/layout/view_map_marker.xml
+++ b/modules/mogo-module-service/src/main/res/layout/view_map_marker.xml
@@ -12,22 +12,16 @@
     <FrameLayout
         android:id="@+id/clMarkerTopView"
         android:layout_width="@dimen/module_service_marker_bubble_width"
+        android:background="@drawable/bg_map_marker_dark"
         android:layout_height="@dimen/module_service_marker_bubble_height">
 
         <ImageView
-            android:id="@+id/ivBg"
+            android:id="@+id/ivIcon"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
-            android:src="@drawable/bg_map_marker_dark" />
-
-        <ImageView
-            android:id="@+id/ivIcon"
-            android:layout_width="@dimen/module_service_marker_bubble_icon_width"
-            android:layout_height="@dimen/module_service_marker_bubble_icon_height"
-            android:layout_marginTop="@dimen/module_service_marker_bubble_icon_marginTop"
-            android:layout_gravity="center_horizontal"
-            tools:src="@drawable/icon_map_marker_road_block_up"/>
+            android:layout_marginBottom="@dimen/module_service_marker_bubble_icon_marginBottom"
+            tools:src="@drawable/icon_map_marker_road_block_up" />
 
     </FrameLayout>
 
diff --git a/modules/mogo-module-service/src/main/res/layout/view_map_marker_info.xml b/modules/mogo-module-service/src/main/res/layout/view_map_marker_info.xml
index 1917bf59ae..028892962e 100644
--- a/modules/mogo-module-service/src/main/res/layout/view_map_marker_info.xml
+++ b/modules/mogo-module-service/src/main/res/layout/view_map_marker_info.xml
@@ -7,8 +7,6 @@
     android:gravity="center"
     android:orientation="vertical"
     android:padding="1px"
-    android:paddingStart="@dimen/dp_5"
-    android:paddingEnd="@dimen/dp_5"
     tools:parentTag="androidx.constraintlayout.widget.ConstraintLayout">
 
     <androidx.constraintlayout.widget.ConstraintLayout
@@ -34,8 +32,8 @@
 
         <ImageView
             android:id="@+id/ivIcon"
-            android:layout_width="@dimen/dp_60"
-            android:layout_height="@dimen/dp_60"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
             android:layout_gravity="center"
             android:layout_marginLeft="@dimen/dp_15"
             android:visibility="invisible"
diff --git a/modules/mogo-module-service/src/main/res/values-xhdpi/dimens.xml b/modules/mogo-module-service/src/main/res/values-xhdpi/dimens.xml
index 8c98cbda76..28ce0219a0 100644
--- a/modules/mogo-module-service/src/main/res/values-xhdpi/dimens.xml
+++ b/modules/mogo-module-service/src/main/res/values-xhdpi/dimens.xml
@@ -6,11 +6,19 @@
     <dimen name="module_service_marker_bubble_height">117px</dimen>
     <dimen name="module_service_marker_bubble_icon_width">50px</dimen>
     <dimen name="module_service_marker_bubble_icon_height">50px</dimen>
-    <dimen name="module_service_marker_bubble_icon_marginTop">24px</dimen>
+    <dimen name="module_service_marker_bubble_icon_marginBottom">8px</dimen>
 
     <!-- 导航查看全程显示范围-->
     <dimen name="module_service_marker_bounds_leftMargin">1000px</dimen>
     <dimen name="module_service_marker_bounds_topMargin">390px</dimen>
     <dimen name="module_service_marker_bounds_bottomMargin">200px</dimen>
     <dimen name="module_service_marker_bounds_rightMargin">200px</dimen>
+    <dimen name="module_services_info_window_paddingStart">10px</dimen>
+    <dimen name="module_services_info_window_paddingEnd">10px</dimen>
+    <dimen name="module_services_info_window_height">100px</dimen>
+    <dimen name="module_service_user_header_width">80px</dimen>
+    <dimen name="module_service_user_header_height">80px</dimen>
+    <dimen name="module_service_content_textSize">24px</dimen>
+    <dimen name="module_service_tag_textSize">20px</dimen>
+    <dimen name="module_service_content_minWidth">120px</dimen>
 </resources>
\ No newline at end of file
diff --git a/modules/mogo-module-service/src/main/res/values/dimens.xml b/modules/mogo-module-service/src/main/res/values/dimens.xml
index 451d9a661b..03b1e6650a 100644
--- a/modules/mogo-module-service/src/main/res/values/dimens.xml
+++ b/modules/mogo-module-service/src/main/res/values/dimens.xml
@@ -1,15 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <dimen name="module_service_marker_anchor_size">16dp</dimen>
-    <dimen name="module_service_marker_dot_marginTop">8dp</dimen>
+    <dimen name="module_service_marker_dot_marginTop">4dp</dimen>
     <dimen name="module_service_marker_bubble_width">56px</dimen>
     <dimen name="module_service_marker_bubble_height">65px</dimen>
     <dimen name="module_service_marker_bubble_icon_width">27px</dimen>
     <dimen name="module_service_marker_bubble_icon_height">27px</dimen>
-    <dimen name="module_service_marker_bubble_icon_marginTop">14px</dimen>
+    <dimen name="module_service_marker_bubble_icon_marginBottom">4px</dimen>
 
     <dimen name="module_service_marker_bounds_leftMargin">550px</dimen>
     <dimen name="module_service_marker_bounds_topMargin">208px</dimen>
     <dimen name="module_service_marker_bounds_bottomMargin">100px</dimen>
     <dimen name="module_service_marker_bounds_rightMargin">100px</dimen>
+    <dimen name="module_services_info_window_paddingStart">100px</dimen>
+    <dimen name="module_services_info_window_paddingEnd">10px</dimen>
+    <dimen name="module_services_info_window_height">54px</dimen>
+    <dimen name="module_service_user_header_width">44px</dimen>
+    <dimen name="module_service_user_header_height">44px</dimen>
+    <dimen name="module_service_content_textSize">14px</dimen>
+    <dimen name="module_service_tag_textSize">12px</dimen>
+    <dimen name="module_service_content_minWidth">64px</dimen>
 </resources>
\ No newline at end of file