From 8f9bcb909891be23af79b19ea70088a148d19a6c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= <martindhy@gmail.com>
Date: Wed, 13 Oct 2021 18:58:46 +0800
Subject: [PATCH] =?UTF-8?q?=E9=81=97=E7=95=99=E5=9C=B0=E5=9B=BE=E6=A8=A1?=
 =?UTF-8?q?=E5=BC=8F=E4=BF=AE=E6=94=B9=E6=B2=A1=E5=88=87=E6=8D=A22D?=
 =?UTF-8?q?=E5=B7=A6=E4=BE=A7UI?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: 董宏宇 <martindhy@gmail.com>
---
 .idea/misc.xml                                         |  2 ++
 .../module/extensions/entrance/EntranceFragment.java   |  3 +++
 .../java/com/mogo/module/service/MogoServices.java     | 10 +++++++++-
 3 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/.idea/misc.xml b/.idea/misc.xml
index 1b3cdd5e62..af14fc0eb5 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -20,7 +20,9 @@
         <entry key="core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_traffic_light_vr.xml" value="1.0" />
         <entry key="modules/mogo-module-adas/src/main/res/drawable/module_adas_left_corner_bg.xml" value="0.22125" />
         <entry key="modules/mogo-module-adas/src/main/res/layout/dialog_adas_dispatch_remind.xml" value="0.22658490296325878" />
+        <entry key="modules/mogo-module-apps/src/main/res/layout/module_apps_fragment_apps.xml" value="0.28125" />
         <entry key="modules/mogo-module-apps/src/main/res/layout/module_apps_fragment_apps_navigator.xml" value="0.27395833333333336" />
+        <entry key="modules/mogo-module-apps/src/main/res/layout/module_apps_item_app.xml" value="0.28125" />
         <entry key="modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_entrance.xml" value="0.375" />
         <entry key="modules/mogo-module-hmi/src/main/res/layout/fragment_warning.xml" value="0.34427083333333336" />
         <entry key="modules/mogo-module-hmi/src/main/res/layout/module_hmi_warning_v2x.xml" value="0.246875" />
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 c4bf28bcfc..0b13f480b9 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
@@ -52,6 +52,7 @@ import com.mogo.eagle.core.data.map.MogoLatLng;
 import com.mogo.eagle.core.function.api.check.IMogoCheckListener;
 import com.mogo.eagle.core.function.call.check.CallerCheckManager;
 import com.mogo.map.listener.IMogoMapListener;
+import com.mogo.map.listener.MogoMapListenerHandler;
 import com.mogo.map.location.IMogoLocationClient;
 import com.mogo.map.marker.IMogoMarkerManager;
 import com.mogo.map.navi.IMogoAimlessModeListener;
@@ -715,6 +716,7 @@ public class EntranceFragment extends MvpFragment<EntranceView, EntrancePresente
         Logger.d(TAG, "进入vr模式");
         mMApUIController.changeMapMode(EnumMapUI.Type_VR);
         MogoApisHandler.getInstance().getApis().getStatusManagerApi().setVrMode(TAG, true);
+        MogoMapListenerHandler.getInstance().onMapModeChanged(EnumMapUI.Type_VR);
 
     }
 
@@ -850,6 +852,7 @@ public class EntranceFragment extends MvpFragment<EntranceView, EntrancePresente
 
     @Override
     public void onStatusChanged(StatusDescriptor descriptor, boolean isTrue) {
+        Logger.d(TAG, "descriptor=" + descriptor + " isTrue=" + isTrue);
         if (mUploadRoadCondition == null) {
             return;
         }
diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/MogoServices.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/MogoServices.java
index e8a1953100..2dbccdebd1 100644
--- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/MogoServices.java
+++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/MogoServices.java
@@ -934,9 +934,17 @@ public class MogoServices implements IMogoMapListener,
 
     private boolean mLastStatusIsVr = false;
 
+    public boolean isLastStatusIsVr() {
+        return mLastStatusIsVr;
+    }
+
+    public void setLastStatusIsVr(boolean lastStatusIsVr) {
+        this.mLastStatusIsVr = lastStatusIsVr;
+    }
+
     @Override
     public void onMapModeChanged( EnumMapUI ui ) {
-        Log.i(TAG, "onMapModeChanged:" + ui);
+        Log.i(TAG, "onMapModeChanged:" + ui + " mLastStatusIsVr：" + mLastStatusIsVr);
         clearAllData();
         if ( ui == EnumMapUI.Type_VR ) {
             if ( !mLastStatusIsVr ) {