From 3e8a241aaa562a16f2c31e1dcd35ae9f67d30c4a Mon Sep 17 00:00:00 2001
From: wangcongtao <wangcongtao@zhidaoauto.com>
Date: Thu, 28 Jan 2021 09:44:45 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E6=96=B0=E8=81=94=E7=BD=91=E6=97=B6?=
 =?UTF-8?q?=E5=88=B7=E6=96=B0=E8=AE=A2=E5=8D=95=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/gradle.xml                              |  1 -
 .../extensions/entrance/EntranceFragment.java | 29 ++++++++++++++-----
 2 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 740794bd48..771c1f74d7 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -89,7 +89,6 @@
           </set>
         </option>
         <option name="resolveModulePerSourceSet" value="false" />
-        <option name="useQualifiedModuleNames" value="true" />
       </GradleProjectSettings>
     </option>
   </component>
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 3eab4ed285..67ee7f5c4d 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
@@ -2,6 +2,7 @@ package com.mogo.module.extensions.entrance;
 
 import android.content.Intent;
 import android.graphics.Rect;
+import android.location.Location;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.SystemClock;
@@ -38,6 +39,7 @@ import com.mogo.map.location.IMogoLocationListener;
 import com.mogo.map.location.MogoLocation;
 import com.mogo.map.marker.IMogoMarkerManager;
 import com.mogo.map.navi.IMogoAimlessModeListener;
+import com.mogo.map.navi.IMogoCarLocationChangedListener2;
 import com.mogo.map.navi.IMogoNavi;
 import com.mogo.map.navi.IMogoNaviListener;
 import com.mogo.map.navi.MogoNaviInfo;
@@ -119,7 +121,8 @@ public class EntranceFragment extends MvpFragment<EntranceView, EntrancePresente
         IMogoAimlessModeListener,
         IMogoStatusChangedListener,
         IMogoIntentListener,
-        IMogoLocationListener {
+//        IMogoLocationListener,
+        IMogoCarLocationChangedListener2 {
 
     private static final String TAG = "EntranceFragment";
 
@@ -371,7 +374,10 @@ public class EntranceFragment extends MvpFragment<EntranceView, EntrancePresente
             adasNoticeHelper.enterVrMode();
             mCameraLiveNoticeHelper.enterVrMode();
 
-            MogoApisHandler.getInstance().getApis().getRegisterCenterApi().registerMogoLocationListener(TAG, this);
+            MogoApisHandler.getInstance().getApis().getRegisterCenterApi()
+                    .registerCarLocationChangedListener( TAG, this );
+
+//            MogoApisHandler.getInstance().getApis().getRegisterCenterApi().registerMogoLocationListener(TAG, this);
 
             localIsVrMode = true;
         }
@@ -707,6 +713,9 @@ public class EntranceFragment extends MvpFragment<EntranceView, EntrancePresente
         TopViewNoLinkageAnimHelper.getInstance().clear();
         NoMapTopViewShaderHelper.getInstance().release();
         EntranceViewHolder.getInstance().release();
+        mCameraLiveNoticeHelper.release();
+        MogoApisHandler.getInstance().getApis().getRegisterCenterApi()
+                .unregisterCarLocationChangedListener( TAG, this );
     }
 
     @Override
@@ -1106,12 +1115,6 @@ public class EntranceFragment extends MvpFragment<EntranceView, EntrancePresente
 
     }
 
-    @Override
-    public void onLocationChanged(MogoLocation location) {
-        vrModeNavInfoView.refreshCurrentSpeed((int) (location.getSpeed() * 3.6F));
-    }
-
-
     private Group debugPanelGroup;
 
     private void initDebugPanel() {
@@ -1302,4 +1305,14 @@ public class EntranceFragment extends MvpFragment<EntranceView, EntrancePresente
 
         }
     };
+
+    @Override
+    public void onCarLocationChanged2( Location location ) {
+        vrModeNavInfoView.refreshCurrentSpeed((int) (location.getSpeed() * 3.6F));
+    }
+
+    @Override
+    public void onCarLocationChanged( MogoLatLng latLng ) {
+
+    }
 }