From fe3426cde461f9d671660a48ba5282fea26f7ccc Mon Sep 17 00:00:00 2001
From: lixiaopeng <lixiaopeng@zhidaoauto.com>
Date: Thu, 27 May 2021 20:04:42 +0800
Subject: [PATCH] opt code

---
 .../java/com/zhidao/roadcondition/service/MainService.kt  | 8 ++++++--
 .../mogo/module/extensions/entrance/EntranceFragment.java | 2 +-
 .../com/mogo/module/v2x/fragment/V2XEventPanelFragment.kt | 7 +++++--
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/MainService.kt b/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/MainService.kt
index 46bc7c564d..3c339eba5f 100644
--- a/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/MainService.kt
+++ b/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/MainService.kt
@@ -91,8 +91,12 @@ class MainService : Service() {
         CosUploadManagerImpl.getInstance(AbsMogoApplication.getApp().applicationContext)
                 .init(BuildConfig.APPLICATION_ID, 0)
         serviceApis = ARouter.getInstance().build(MogoServicePaths.PATH_SERVICE_APIS).navigation(this) as IMogoServiceApis
-        speed = serviceApis.mapServiceApi.getSingletonLocationClient(this).lastKnowLocation.speed
-        Log.d(TAG, "onStartCommand speed = $speed")
+        if (serviceApis.mapServiceApi.getSingletonLocationClient(this) != null &&
+                serviceApis.mapServiceApi.getSingletonLocationClient(this).lastKnowLocation != null) {
+            speed = serviceApis.mapServiceApi.getSingletonLocationClient(this).lastKnowLocation.speed
+            Log.d(TAG, "onStartCommand speed = $speed")
+        }
+
         if (intent != null) {
             params = intent.getParcelableExtra("params")
             params?.let {
diff --git a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java
index 54f57fd348..eae621aebe 100644
--- a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java
+++ b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java
@@ -726,7 +726,7 @@ public class EntranceFragment extends MvpFragment<EntranceView, EntrancePresente
 
         // 进入vr模式，不可缩放地图
         if (DebugConfig.getCarMachineType() == DebugConfig.CAR_MACHINE_TYPE_LENOVO ) {
-            UiThreadHandler.postDelayed(this::stepIntoVrMode, 3_000L );
+            UiThreadHandler.postDelayed(this::stepIntoVrMode, 3_500L );
         }
 
         mClickShareVoiceStrings =
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XEventPanelFragment.kt b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XEventPanelFragment.kt
index 6928b349a0..783a7772f3 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XEventPanelFragment.kt
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XEventPanelFragment.kt
@@ -245,8 +245,11 @@ class V2XEventPanelFragment : MvpFragment<V2XEventPanelFragment, EventPanelPrese
                     R.dimen.module_v2x_event_panel_btn_x
                 })
                 val y = resources.getDimensionPixelSize(R.dimen.module_v2x_event_panel_btn_y)
-                V2XServiceManager.getMogoEntranceButtonController()
-                        .addBottomLayerView(mV2XEventPanelHistoryCountView, x, y)
+
+                if (V2XServiceManager.getMogoEntranceButtonController() != null) {
+                    V2XServiceManager.getMogoEntranceButtonController()
+                            .addBottomLayerView(mV2XEventPanelHistoryCountView, x, y)
+                }
                 mV2XEventPanelHistoryCountView?.visibility = if (MogoApisHandler.getInstance().apis.statusManagerApi.isVrMode) {
                     View.GONE
                 }else{