From 6a369d17dff944680f0e0190411d5604188ea277 Mon Sep 17 00:00:00 2001
From: wangcongtao <wangcongtao@zhidaoauto.com>
Date: Fri, 31 Jul 2020 15:08:04 +0800
Subject: [PATCH 1/2] =?UTF-8?q?1.=20=E5=AE=9A=E4=BD=8D=E6=8C=89=E9=92=AE?=
 =?UTF-8?q?=E5=8A=A0=E5=85=A5=E8=AE=BE=E7=BD=AE=E5=9C=B0=E5=9B=BE=E4=B8=AD?=
 =?UTF-8?q?=E5=BF=83=E7=82=B9=E7=9A=84=E5=8A=9F=E8=83=BD=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/map/MapCenterPointStrategy.java    | 33 +++++++++++++------
 .../extensions/entrance/EntranceFragment.java |  1 +
 2 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/modules/mogo-module-common/src/main/java/com/mogo/module/common/map/MapCenterPointStrategy.java b/modules/mogo-module-common/src/main/java/com/mogo/module/common/map/MapCenterPointStrategy.java
index b2065a807c..1d4cdb1e0b 100644
--- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/map/MapCenterPointStrategy.java
+++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/map/MapCenterPointStrategy.java
@@ -22,16 +22,9 @@ public class MapCenterPointStrategy {
 
     public static final MapCenterPoint DEFAULT = new MapCenterPoint( 0.677734D, 0.5733333D );
 
-    public static void init()  {
-        // 普通场景，使用高德内部值
-        {
-            Map< Integer, MapCenterPoint > common = new HashMap<>();
-            common.put( CarSeries.CAR_SERIES_D80X, new MapCenterPoint( 0.5D, 0.666666666D ) );
-            common.put( CarSeries.CAR_SERIES_E84X, new MapCenterPoint( 0.5D, 0.666666666D ) );
-            common.put( CarSeries.CAR_SERIES_E84XCD, new MapCenterPoint( 0.5D, 0.666666666D ) );
-            common.put( CarSeries.CAR_SERIES_F80X, new MapCenterPoint( 0.5D, 0.666666666D ) );
-            sStrategies.put( Scene.COMMON, common );
-        }
+    private static MapCenterPoint sLastPoint = DEFAULT;
+
+    public static void init() {
 
         {
             // 选点场景，定位中心点
@@ -112,6 +105,22 @@ public class MapCenterPointStrategy {
             categoryV2XEvent.put( CarSeries.CAR_SERIES_F80X, new MapCenterPoint( 0.6963541D, 0.65D ) );
             sStrategies.put( Scene.CATEGORY_V2X_EVENT, categoryV2XEvent );
         }
+
+        try {
+            sLastPoint = sStrategies.get( Scene.AIMLESS ).get( CarSeries.getSeries() );
+        } catch ( Exception e ) {
+            sLastPoint = DEFAULT;
+        }
+    }
+
+    public static void restoreLastScene( IMogoMapUIController controller ) {
+        if ( sLastPoint == null ) {
+            return;
+        }
+        if ( controller == null ) {
+            return;
+        }
+        controller.setPointToCenter( sLastPoint.x, sLastPoint.y );
     }
 
     public static void addScene( int scene, Map< Integer, MapCenterPoint > config ) {
@@ -138,6 +147,7 @@ public class MapCenterPointStrategy {
         if ( !sStrategies.containsKey( scene ) ) {
             Logger.w( TAG, "no strategy for scene: %s, use DEFAULT", scene );
             controller.setPointToCenter( DEFAULT.x, DEFAULT.y );
+            sLastPoint = DEFAULT;
             return;
         }
         Map< Integer, MapCenterPoint > points = sStrategies.get( scene );
@@ -145,14 +155,17 @@ public class MapCenterPointStrategy {
         if ( !points.containsKey( car ) ) {
             Logger.w( TAG, "no strategy for series: %s, use DEFAULT", scene );
             controller.setPointToCenter( DEFAULT.x, DEFAULT.y );
+            sLastPoint = DEFAULT;
             return;
         }
         MapCenterPoint point = points.get( car );
         if ( point == null ) {
             Logger.w( TAG, "no strategy config for series: %s, use DEFAULT", scene );
             controller.setPointToCenter( DEFAULT.x, DEFAULT.y );
+            sLastPoint = DEFAULT;
             return;
         }
+        sLastPoint = point;
         controller.setPointToCenter( point.x, point.y );
     }
 
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 f977a83e41..bffb7e3d7b 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
@@ -192,6 +192,7 @@ public class EntranceFragment extends MvpFragment<EntranceView, EntrancePresente
                     UiThreadHandler.removeCallbacks(mLockCarRunnable);
                 }
                 mStatusManager.setUserInteractionStatus(TAG, true, false);
+                MapCenterPointStrategy.restoreLastScene( mMApUIController );
                 mMApUIController.recoverLockMode();
             }
         });

From a77a8db0d8a17c71e99bea66cf6e11b52ddde56c Mon Sep 17 00:00:00 2001
From: tongchenfei <tongchenfei@zhidaoauto.com>
Date: Fri, 31 Jul 2020 15:13:58 +0800
Subject: [PATCH 2/2] opt

---
 .../module/extensions/entrance/EntranceFragment.java |  4 +---
 .../mogo/module/extensions/utils/TopViewManager.java | 12 ------------
 2 files changed, 1 insertion(+), 15 deletions(-)

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 bffb7e3d7b..a15d148a4b 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
@@ -294,9 +294,6 @@ public class EntranceFragment extends MvpFragment<EntranceView, EntrancePresente
         });
         mMsgCounter = findViewById(R.id.module_ext_id_msg_counter);
         mUserHeadImg.setOnClickListener(view -> {
-            // todo 测试代码
-//            mApis.getEventPanelManager().showPanel();
-            // 原始逻辑
             try {
                 LaunchUtils.launchByPkg(getContext(), "com.zhidao.auto.personal");
                 // 埋点
@@ -355,6 +352,7 @@ public class EntranceFragment extends MvpFragment<EntranceView, EntrancePresente
     public void onDestroyView() {
         super.onDestroyView();
         isClickShare = false;
+        TopViewAnimHelper.getInstance().removeAllView();
     }
 
     @Override
diff --git a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/utils/TopViewManager.java b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/utils/TopViewManager.java
index c5f4d77e80..29a161821c 100644
--- a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/utils/TopViewManager.java
+++ b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/utils/TopViewManager.java
@@ -6,12 +6,8 @@ import android.view.ViewGroup;
 import android.view.ViewGroup.LayoutParams;
 
 import com.alibaba.android.arouter.facade.annotation.Route;
-import com.alibaba.android.arouter.launcher.ARouter;
 import com.mogo.module.extensions.R;
-import com.mogo.service.IMogoServiceApis;
 import com.mogo.service.MogoServicePaths;
-import com.mogo.service.statusmanager.IMogoStatusChangedListener;
-import com.mogo.service.statusmanager.StatusDescriptor;
 import com.mogo.service.windowview.IMogoTopViewManager;
 import com.mogo.service.windowview.IMogoTopViewStatusListener;
 
@@ -25,18 +21,10 @@ public class TopViewManager implements IMogoTopViewManager {
 
     private Context context;
     private LayoutParams parentParams;
-    private IMogoServiceApis serviceApis;
 
     @Override
     public void init(Context context) {
         this.context = context;
-        serviceApis =
-                (IMogoServiceApis) ARouter.getInstance().build(MogoServicePaths.PATH_SERVICE_APIS).navigation(context);
-        serviceApis.getStatusManagerApi().registerStatusChangedListener(MogoServicePaths.PATH_EXTENSIONS_TOP_VIEW_MANAGER, StatusDescriptor.MAIN_PAGE_RESUME, (descriptor, isTrue) -> {
-            if (!isTrue) {
-                TopViewAnimHelper.getInstance().removeAllView();
-            }
-        });
     }
 
     @Override