diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/DevaToolsProvider.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/DevaToolsProvider.kt
index 4229be3ef9..073f2b300c 100644
--- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/DevaToolsProvider.kt
+++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/DevaToolsProvider.kt
@@ -35,8 +35,8 @@ class DevaToolsProvider : IDevaToolsProvider {
     }
 
     override fun initBiz() {
-        bizConfigCenter.init(mContext!!)
-        FuncConfigImpl.init()
+//        bizConfigCenter.init(mContext!!)
+//        FuncConfigImpl.init()
         traceManager.init(mContext!!)
         MogoLogCatchManager.init(mContext!!)
     }
diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/status/flow/gps/GpsImpl.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/status/flow/gps/GpsImpl.kt
index 01b5a2ff9f..43c94c86b5 100644
--- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/status/flow/gps/GpsImpl.kt
+++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/status/flow/gps/GpsImpl.kt
@@ -49,9 +49,19 @@ internal class GpsImpl(ctx: Context): IFlow<GpsStatus>(ctx) {
         false
     }
 
+    private val onStateListener = object : IAppStateListener {
+
+        override fun onAppStateChanged(isForeground: Boolean) {
+            if (isForeground) {
+                send(isLocationEnabled(), isGrandFineLocation())
+            }
+        }
+    }
+
 
     override fun onCreate() {
         val isGranted = isGrandFineLocation()
+        AppStateManager.registerAppStateListener(onStateListener)
         send(isLocationEnabled(), isGranted)
         if (!isGranted) {
             PermissionUtils.requestAccessFineLocation(object : SimpleCallback {
@@ -88,6 +98,7 @@ internal class GpsImpl(ctx: Context): IFlow<GpsStatus>(ctx) {
         } catch (t: Throwable) {
             t.printStackTrace()
         }
+        AppStateManager.unRegisterAppStateListener(onStateListener)
 
     }
 }
\ No newline at end of file
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/VipIdentificationView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/VipIdentificationView.kt
index 3692ba8b97..70c1dbd01c 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/VipIdentificationView.kt
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/VipIdentificationView.kt
@@ -26,12 +26,17 @@ class VipIdentificationView @JvmOverloads constructor(
     override fun onAttachedToWindow() {
         super.onAttachedToWindow()
         val lp = this.layoutParams as LayoutParams
-        if (AppIdentityModeUtils.isBus(FunctionBuildConfig.appIdentityMode)) {
-            lp.marginStart = resources.getDimension(R.dimen.module_vip_margin_left_bus).toInt()
-            lp.topMargin = resources.getDimension(R.dimen.module_vip_margin_top_bus).toInt()
+        if (AppIdentityModeUtils.isBus(FunctionBuildConfig.appIdentityMode)
+            && AppIdentityModeUtils.isPassenger(FunctionBuildConfig.appIdentityMode)) {
+            lp.marginStart = resources.getDimension(R.dimen.module_vip_margin_left_bus_passenger).toInt()
+            lp.topMargin = resources.getDimension(R.dimen.module_vip_margin_top_passenger).toInt()
+        } else if (AppIdentityModeUtils.isTaxi(FunctionBuildConfig.appIdentityMode)
+            && AppIdentityModeUtils.isPassenger(FunctionBuildConfig.appIdentityMode)) {
+            lp.marginStart = resources.getDimension(R.dimen.module_vip_margin_left_taxi_passenger).toInt()
+            lp.topMargin = resources.getDimension(R.dimen.module_vip_margin_top_passenger).toInt()
         } else {
-            lp.marginStart = resources.getDimension(R.dimen.module_vip_margin_left_taxi).toInt()
-            lp.topMargin = resources.getDimension(R.dimen.module_vip_margin_top_taxi).toInt()
+            lp.marginStart = resources.getDimension(R.dimen.module_vip_margin_left).toInt()
+            lp.topMargin = resources.getDimension(R.dimen.module_vip_margin_top).toInt()
         }
         this.layoutParams = lp
         invalidate()
diff --git a/core/mogo-core-res/src/main/res/values-xhdpi-2560x1440/dimens.xml b/core/mogo-core-res/src/main/res/values-xhdpi-2560x1440/dimens.xml
index 82d3e800dc..6de53bb489 100644
--- a/core/mogo-core-res/src/main/res/values-xhdpi-2560x1440/dimens.xml
+++ b/core/mogo-core-res/src/main/res/values-xhdpi-2560x1440/dimens.xml
@@ -6,11 +6,12 @@
 
     <dimen name="module_vip_width">104px</dimen>
     <dimen name="module_vip_height">104px</dimen>
-    <dimen name="module_vip_margin_left_bus">540px</dimen>
-    <dimen name="module_vip_margin_top_bus">40px</dimen>
 
-    <dimen name="module_vip_margin_left_taxi">640px</dimen>
-    <dimen name="module_vip_margin_top_taxi">80px</dimen>
+    <dimen name="module_vip_margin_left">640px</dimen>
+    <dimen name="module_vip_margin_top">80px</dimen>
+    <dimen name="module_vip_margin_left_taxi_passenger">540px</dimen>
+    <dimen name="module_vip_margin_left_bus_passenger">640px</dimen>
+    <dimen name="module_vip_margin_top_passenger">40px</dimen>
 
     <dimen name="module_ext_speed_width_sm_radius">30px</dimen>
     <dimen name="module_ext_speed_width_big_radius">130px</dimen>
diff --git a/core/mogo-core-res/src/main/res/values/dimens.xml b/core/mogo-core-res/src/main/res/values/dimens.xml
index d7bbdd0449..dfc124ac5d 100644
--- a/core/mogo-core-res/src/main/res/values/dimens.xml
+++ b/core/mogo-core-res/src/main/res/values/dimens.xml
@@ -14,11 +14,12 @@
 
     <dimen name="module_vip_width">104px</dimen>
     <dimen name="module_vip_height">104px</dimen>
-    <dimen name="module_vip_margin_left_bus">380px</dimen>
-    <dimen name="module_vip_margin_top_bus">40px</dimen>
 
-    <dimen name="module_vip_margin_left_taxi">380px</dimen>
-    <dimen name="module_vip_margin_top_taxi">40px</dimen>
+    <dimen name="module_vip_margin_left">380px</dimen>
+    <dimen name="module_vip_margin_top">40px</dimen>
+    <dimen name="module_vip_margin_left_taxi_passenger">380px</dimen>
+    <dimen name="module_vip_margin_left_bus_passenger">380px</dimen>
+    <dimen name="module_vip_margin_top_passenger">40px</dimen>
 
     <dimen name="module_ext_speed_width_sm_radius">20px</dimen>
     <dimen name="module_ext_speed_width_big_radius">110px</dimen>
diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/routeoverlay/MogoRouteOverlayManager.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/routeoverlay/MogoRouteOverlayManager.java
index efc8f13177..9a1e99a46e 100644
--- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/routeoverlay/MogoRouteOverlayManager.java
+++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/routeoverlay/MogoRouteOverlayManager.java
@@ -74,14 +74,12 @@ public class MogoRouteOverlayManager implements
         if (from != 1 || location == null) {
             return;
         }
-        if (isArriveAtStation.get()) {
-            Logger.d(TAG, "--- onLocationChanged 1 -- [isDemo1: " + FunctionBuildConfig.isIgnoreConditionsDrawAutopilotTrajectoryData + ",isDemo2:" +FunctionBuildConfig.isDemoMode + ",isGps:" + isGps + ",mode:" + autopilotMode.get() + ",lon:" + location.getLongitude() + ",lat:" + location.getLatitude() + ",angle:" + location.getBearing() + "]");
+        if (isArriveAtStation.get() && autopilotMode.get() != 1) {
             RouteOverlayDrawer.getInstance().clearMogoRouteOverlay();
             return;
         }
         boolean force = FunctionBuildConfig.isIgnoreConditionsDrawAutopilotTrajectoryData;
         if (!force && autopilotMode.get() != 1) {
-            Logger.d(TAG, "--- onLocationChanged 2 -- [isDemo1: " + FunctionBuildConfig.isIgnoreConditionsDrawAutopilotTrajectoryData + ",isDemo2:" +FunctionBuildConfig.isDemoMode + ",isGps:" + isGps + ",mode:" + autopilotMode.get() + ",lon:" + location.getLongitude() + ",lat:" + location.getLatitude() + ",angle:" + location.getBearing() + "]");
             RouteOverlayDrawer.getInstance().clearMogoRouteOverlay();
             return;
         }
@@ -89,7 +87,6 @@ public class MogoRouteOverlayManager implements
             if (!queue.isEmpty()) {
                 List<MessagePad.TrajectoryPoint> items = queue.pollLast();
                 if (items != null && !items.isEmpty()) {
-                    Logger.d(TAG, "--- onLocationChanged -- [isDemo1: " + FunctionBuildConfig.isIgnoreConditionsDrawAutopilotTrajectoryData + ",isDemo2:" +FunctionBuildConfig.isDemoMode + ",isGps:" + isGps + ",mode:" + autopilotMode.get() + ",lon:" + location.getLongitude() + ",lat:" + location.getLatitude() + ",angle:" + location.getBearing() + "]");
                     RouteOverlayDrawer.getInstance().drawTrajectoryList(items, location.getBearing());
                 }
             }
diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/routeoverlay/RouteOverlayDrawer.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/routeoverlay/RouteOverlayDrawer.java
index e8e827f4e4..01076f6084 100644
--- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/routeoverlay/RouteOverlayDrawer.java
+++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/routeoverlay/RouteOverlayDrawer.java
@@ -100,7 +100,6 @@ public class RouteOverlayDrawer {
                 pps.clear();
                 List<MessagePad.TrajectoryPoint> routes = this.routeList;
                 if (routes == null || (total = routes.size()) < 2) {
-                    Log.d("Route", "--- 2 ---");
                     isExcept = true;
                     return;
                 }
@@ -135,9 +134,6 @@ public class RouteOverlayDrawer {
                 }
                 double lon = CallerAutoPilotStatusListenerManager.INSTANCE.getCurWgs84Lon();
                 double lat = CallerAutoPilotStatusListenerManager.INSTANCE.getCurWgs84Lat();
-                StringBuilder sb = new StringBuilder();
-                sb.append(lon).append(",").append(lat).append(",");
-                int removeCount = 0;
                 if (points.size() > 0) {
                     MogoLatLng top = null;
                     while (points.size() != 0) {
@@ -155,13 +151,11 @@ public class RouteOverlayDrawer {
                             RouteStrategy.INSTANCE.remove(first.acc);
                             pools.release(first);
                             points.poll();
-                            removeCount++;
                         }
                         top = first;
                     }
                     if (points.size() == 0) {
                         isExcept = true;
-                        Log.d("Route", "--- 3 ---");
                         return;
                     }
                     MogoLatLng self = pools.acquire();
@@ -203,19 +197,12 @@ public class RouteOverlayDrawer {
                         mMoGoPolyline.setVisible(true);
                     }
                 } else {
-                    Log.d("Route", "--- 4 ---");
                     isExcept = true;
                 }
-                for (MogoLatLng p : points) {
-                    sb.append(p.lon).append(",").append(p.lat);
-                }
-                Log.d("Route", "--- draw: removeCount:" + removeCount + ", data:" + sb);
             } catch (Throwable t) {
-                Log.d("Route", "--- draw error ---: error:" + t.getMessage());
                 t.printStackTrace();
             } finally {
                 if (isExcept) {
-                    Log.d("Route", "--- 5 ---");
                     setVisible(false);
                 }
                 if (points.size() > 0) {