From 19ec14f83e2b0d16e45eb3ac274031c75096c5a1 Mon Sep 17 00:00:00 2001
From: wangcongtao <wangcongtao@zhidaoauto.com>
Date: Tue, 20 Oct 2020 15:08:40 +0800
Subject: [PATCH] =?UTF-8?q?1.1.7=E4=B8=9A=E5=8A=A1=E5=BC=80=E5=8F=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../extensions/entrance/EntranceFragment.java       |  5 ++++-
 .../java/com/mogo/module/service/MogoServices.java  | 13 +++++++++++++
 .../mogo/module/service/StatusChangedAdapter.java   |  5 +++++
 .../module/service/marker/MapMarkerManager.java     |  6 ++++++
 .../strategy/MogoRefreshStrategyController.java     | 13 +++++++++++--
 .../strategy/IMogoRefreshStrategyController.java    |  2 +-
 6 files changed, 40 insertions(+), 4 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 9540586d25..2afba379f1 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
@@ -233,7 +233,10 @@ public class EntranceFragment extends MvpFragment<EntranceView, EntrancePresente
                     mStatusManager.setDisplayOverview(TAG, false);
                     UiThreadHandler.removeCallbacks(mLockCarRunnable);
                 }
-                mApis.getRefreshStrategyControllerApi().restartAutoRefreshAtTime( 0 );
+                if ( !mApis.getRefreshStrategyControllerApi().restartAutoRefreshAtTime( 0 ) ) {
+                    mStatusManager.setUserInteractionStatus(TAG, true, false);
+                    mMApUIController.recoverLockMode();
+                }
             }
         } );
 
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 1c13513b05..c5e83d5523 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
@@ -359,6 +359,18 @@ public class MogoServices implements IMogoMapListener,
                 MarkerServiceHandler.getApis().getMapServiceApi().getMarkerManager( mContext ).removeMarkers();
             }
         }
+
+        @Override
+        public void onTopViewStatusChanged( boolean visible ) {
+            if ( visible ) {
+                return;
+            }
+            try {
+                MapMarkerManager.getInstance().onCloseCurrentSelectedMarker();
+            } catch ( Exception e ) {
+                Logger.e( TAG, e, "onTopViewStatusChanged" );
+            }
+        }
     };
 
     public void init( Context context ) {
@@ -376,6 +388,7 @@ public class MogoServices implements IMogoMapListener,
         mStatusManager.registerStatusChangedListener( ServiceConst.TYPE, StatusDescriptor.MAIN_PAGE_RESUME, statusChangedListener );
         mStatusManager.registerStatusChangedListener( ServiceConst.TYPE, StatusDescriptor.SEEK_HELPING, statusChangedListener );
         mStatusManager.registerStatusChangedListener( ServiceConst.TYPE, StatusDescriptor.ACC_STATUS, statusChangedListener );
+        mStatusManager.registerStatusChangedListener( ServiceConst.TYPE, StatusDescriptor.TOP_VIEW, statusChangedListener );
         mStatusManager.setAIAssistReady( TAG, AIAssist.getInstance( mContext ).hasFlush() );
 
         registerMogoReceiver( context );
diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/StatusChangedAdapter.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/StatusChangedAdapter.java
index f78e32f048..b452702a33 100644
--- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/StatusChangedAdapter.java
+++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/StatusChangedAdapter.java
@@ -30,6 +30,9 @@ abstract class StatusChangedAdapter implements IMogoStatusChangedListener {
             case ACC_STATUS:
                 onAccStatusChanged( isTrue );
                 break;
+            case TOP_VIEW:
+                onTopViewStatusChanged( isTrue );
+                break;
         }
     }
 
@@ -42,4 +45,6 @@ abstract class StatusChangedAdapter implements IMogoStatusChangedListener {
     public abstract void onSeekHelpingStatusChanged( boolean isSeekingHelping );
 
     public abstract void onAccStatusChanged( boolean accOn );
+
+    public abstract void onTopViewStatusChanged( boolean visible );
 }
diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerManager.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerManager.java
index 2d071a7dfa..3087516e18 100644
--- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerManager.java
+++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerManager.java
@@ -1018,4 +1018,10 @@ public class MapMarkerManager implements IMogoMarkerClickListener,
                 break;
         }
     }
+
+    public void onCloseCurrentSelectedMarker(){
+        if ( mLastCheckMarker != null && !mLastCheckMarker.isDestroyed()) {
+            closeMarker( mLastCheckMarker );
+        }
+    }
 }
diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/strategy/MogoRefreshStrategyController.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/strategy/MogoRefreshStrategyController.java
index 9d09334d74..f13e5642e9 100644
--- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/strategy/MogoRefreshStrategyController.java
+++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/strategy/MogoRefreshStrategyController.java
@@ -6,6 +6,7 @@ import com.alibaba.android.arouter.facade.annotation.Route;
 import com.mogo.module.service.MogoServices;
 import com.mogo.service.MogoServicePaths;
 import com.mogo.service.strategy.IMogoRefreshStrategyController;
+import com.mogo.utils.logger.Logger;
 
 /**
  * @author congtaowang
@@ -16,9 +17,17 @@ import com.mogo.service.strategy.IMogoRefreshStrategyController;
 @Route( path = MogoServicePaths.PATH_REFRESH_STRATEGY_API )
 public class MogoRefreshStrategyController implements IMogoRefreshStrategyController {
 
+    private static final String TAG = "MogoRefreshStrategyController";
+
     @Override
-    public void restartAutoRefreshAtTime( int delay ) {
-        MogoServices.getInstance().restartAutoRefreshAtTime( delay );
+    public boolean restartAutoRefreshAtTime( int delay ) {
+        try {
+            MogoServices.getInstance().restartAutoRefreshAtTime( delay );
+            return true;
+        } catch ( Exception e ) {
+            Logger.e( TAG, e, "restartAutoRefreshAtTime" );
+            return false;
+        }
     }
 
     @Override
diff --git a/services/mogo-service-api/src/main/java/com/mogo/service/strategy/IMogoRefreshStrategyController.java b/services/mogo-service-api/src/main/java/com/mogo/service/strategy/IMogoRefreshStrategyController.java
index fe0ef29d05..719b12b8ea 100644
--- a/services/mogo-service-api/src/main/java/com/mogo/service/strategy/IMogoRefreshStrategyController.java
+++ b/services/mogo-service-api/src/main/java/com/mogo/service/strategy/IMogoRefreshStrategyController.java
@@ -15,7 +15,7 @@ public interface IMogoRefreshStrategyController extends IProvider {
      *
      * @param delay 单位（ms） 0 为则立即刷新，为负值则忽略
      */
-    void restartAutoRefreshAtTime( int delay );
+    boolean restartAutoRefreshAtTime( int delay );
 
     /**
      * 清除所有数据