From d552828493a1efb8144b0b4256377a7c16df89a1 Mon Sep 17 00:00:00 2001
From: wangcongtao <wangcongtao@zhidaoauto.com>
Date: Fri, 25 Sep 2020 21:14:03 +0800
Subject: [PATCH] 1. opt

---
 .../src/main/java/com/mogo/module/main/SchemeIntent.java       | 3 +++
 .../res/layout/module_services_fragment_online_car_panel.xml   | 1 +
 .../mogo-module-service/src/main/res/values-ldpi/dimens.xml    | 2 +-
 .../mogo-module-service/src/main/res/values-mdpi/dimens.xml    | 2 +-
 modules/mogo-module-service/src/main/res/values/dimens.xml     | 2 +-
 5 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/modules/mogo-module-main/src/main/java/com/mogo/module/main/SchemeIntent.java b/modules/mogo-module-main/src/main/java/com/mogo/module/main/SchemeIntent.java
index dfb17641d0..10f1d86738 100644
--- a/modules/mogo-module-main/src/main/java/com/mogo/module/main/SchemeIntent.java
+++ b/modules/mogo-module-main/src/main/java/com/mogo/module/main/SchemeIntent.java
@@ -213,6 +213,9 @@ public class SchemeIntent implements IMogoStatusChangedListener {
             if ( isTrue ) {
                 // 保证回到桌面后在开始该规划路线。
                 UiThreadHandler.postDelayed( () -> {
+                    if ( mNextIntent == null ) {
+                        return;
+                    }
                     handle( mNextIntent.mIntent );
                 }, mNextIntent.mDelay );
             }
diff --git a/modules/mogo-module-service/src/main/res/layout/module_services_fragment_online_car_panel.xml b/modules/mogo-module-service/src/main/res/layout/module_services_fragment_online_car_panel.xml
index b3c027a149..04abbaae72 100644
--- a/modules/mogo-module-service/src/main/res/layout/module_services_fragment_online_car_panel.xml
+++ b/modules/mogo-module-service/src/main/res/layout/module_services_fragment_online_car_panel.xml
@@ -4,6 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:layout_marginLeft="@dimen/module_services_online_car_panel_marginRight"
     android:layout_marginTop="@dimen/module_services_online_car_panel_marginTop"
     android:layout_marginRight="@dimen/module_services_online_car_panel_marginRight"
     android:layout_marginBottom="@dimen/module_services_online_car_panel_marginBottom"
diff --git a/modules/mogo-module-service/src/main/res/values-ldpi/dimens.xml b/modules/mogo-module-service/src/main/res/values-ldpi/dimens.xml
index 98ffc07076..0c1ef99605 100644
--- a/modules/mogo-module-service/src/main/res/values-ldpi/dimens.xml
+++ b/modules/mogo-module-service/src/main/res/values-ldpi/dimens.xml
@@ -25,7 +25,7 @@
 
     <dimen name="module_services_online_car_panel_marginTop">2px</dimen>
     <dimen name="module_services_online_car_panel_marginBottom">2px</dimen>
-    <dimen name="module_services_online_car_panel_marginRight">8px</dimen>
+    <dimen name="module_services_online_car_panel_marginRight">0px</dimen>
     <dimen name="module_services_online_car_panel_paddingLeft">28px</dimen>
     <dimen name="module_services_online_car_panel_paddingBottom">16px</dimen>
 
diff --git a/modules/mogo-module-service/src/main/res/values-mdpi/dimens.xml b/modules/mogo-module-service/src/main/res/values-mdpi/dimens.xml
index e0ef017da6..9a63e6ddca 100644
--- a/modules/mogo-module-service/src/main/res/values-mdpi/dimens.xml
+++ b/modules/mogo-module-service/src/main/res/values-mdpi/dimens.xml
@@ -25,7 +25,7 @@
 
     <dimen name="module_services_online_car_panel_marginTop">2px</dimen>
     <dimen name="module_services_online_car_panel_marginBottom">2px</dimen>
-    <dimen name="module_services_online_car_panel_marginRight">8px</dimen>
+    <dimen name="module_services_online_car_panel_marginRight">6px</dimen>
     <dimen name="module_services_online_car_panel_paddingLeft">28px</dimen>
     <dimen name="module_services_online_car_panel_paddingBottom">16px</dimen>
 
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 3364dbceac..066fdbc538 100644
--- a/modules/mogo-module-service/src/main/res/values/dimens.xml
+++ b/modules/mogo-module-service/src/main/res/values/dimens.xml
@@ -25,7 +25,7 @@
 
     <dimen name="module_services_online_car_panel_marginTop">2px</dimen>
     <dimen name="module_services_online_car_panel_marginBottom">2px</dimen>
-    <dimen name="module_services_online_car_panel_marginRight">8px</dimen>
+    <dimen name="module_services_online_car_panel_marginRight">0px</dimen>
     <dimen name="module_services_online_car_panel_paddingLeft">28px</dimen>
     <dimen name="module_services_online_car_panel_paddingBottom">16px</dimen>