From 70e07b633b9c1851f372f6589d4035b83a3ddae1 Mon Sep 17 00:00:00 2001
From: zhongchao <zhongchao@zhidaoauto.com>
Date: Mon, 12 Apr 2021 16:33:09 +0800
Subject: [PATCH] open queryOnLineCarWithRoute

---
 .../com/mogo/module/main/MainActivity.java    |  2 +-
 .../com/mogo/module/service/MogoServices.java | 29 ++++++++++---------
 .../service/marker/MapMarkerManager.java      |  8 ++---
 3 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java b/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java
index f9feb2a41c..02f4ca2e39 100644
--- a/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java
+++ b/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java
@@ -53,7 +53,7 @@ public class MainActivity extends MvpActivity<MainView, MainPresenter> implement
         IMogoADASControlStatusChangedListener,
         FragmentStackTransactionListener {
 
-    protected static final String TAG = MainActivity.class.getSimpleName();
+    protected static final String TAG = "MainActivity";
 
     protected IMogoServiceApis mServiceApis;
     protected IMogoFragmentManager mMogoFragmentManager;
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 e7f8271915..9a0d9d421c 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
@@ -119,7 +119,12 @@ public class MogoServices implements IMogoMapListener,
     /**
      * 自动刷新策略
      */
-    private AutoRefreshStrategy mAutoRefreshStrategy = new AutoRefreshStrategy();
+    private final AutoRefreshStrategy mAutoRefreshStrategy = new AutoRefreshStrategy();
+    /**
+     * 手动刷新策略
+     */
+    private final CustomRefreshStrategy mCustomRefreshStrategy = new CustomRefreshStrategy();
+
     private MogoLatLng mLastAutoRefreshLocation = null;
 
     private IMogoMapUIController mUiController;
@@ -135,13 +140,9 @@ public class MogoServices implements IMogoMapListener,
     private boolean mIsVertical = false;
 
     private MogoReceiver mAIAssistReceiver;
-
-    /**
-     * 手动刷新策略
-     */
-    private CustomRefreshStrategy mCustomRefreshStrategy = new CustomRefreshStrategy();
-    private float mLastZoomLevel = 0;
     private RefreshModel mRefreshModel;
+
+    private float mLastZoomLevel = 0;
     private TtsConfigModleData mTtsModle;
     private long mRefreshRemainingTime = Long.MAX_VALUE;
     // 上次手动操作的中心点坐标
@@ -169,7 +170,7 @@ public class MogoServices implements IMogoMapListener,
      */
     private boolean mLoopRequest = false;
 
-    private Handler mHandler = new MainLooperHandler( Looper.getMainLooper() ) {
+    private final Handler mHandler = new MainLooperHandler( Looper.getMainLooper() ) {
 
         @Override
         protected void handleRefreshDecrease( Message msg ) {
@@ -255,7 +256,7 @@ public class MogoServices implements IMogoMapListener,
     /**
      * 自动刷新回调
      */
-    private RefreshCallback mAutoRefreshCallback = new RefreshCallback< MarkerResponse >() {
+    private final RefreshCallback mAutoRefreshCallback = new RefreshCallback< MarkerResponse >() {
         @Override
         public void onSuccess( MarkerResponse o ) {
             MapMarkerManager.getInstance().onSyncMarkerResponse( o );
@@ -285,7 +286,7 @@ public class MogoServices implements IMogoMapListener,
      */
     private int mCurrentLimit = -1;
 
-    private IMogoStatusChangedListener statusChangedListener = new StatusChangedAdapter() {
+    private final IMogoStatusChangedListener statusChangedListener = new StatusChangedAdapter() {
 
         @Override
         public void onSearchUIShow( boolean visible ) {
@@ -433,10 +434,10 @@ public class MogoServices implements IMogoMapListener,
                         return;
                     }
                     mRefreshModel.refreshExplorerWayData( ro.mLonLat, ro.mRadius, ro.mAmount, ro.mCallback );
-                    if ( !DebugConfig.
-                            isNeedUploadCoordinatesDurationInTime() ) {
-                        MapMarkerManager.getInstance().getOnlineCarDataByAutoRefreshStrategy( ro.mLonLat );
-                    }
+//                    if ( !DebugConfig.
+//                            isNeedUploadCoordinatesDurationInTime() ) {  //todo 实时在线车辆需要注释，否则在2D模式下不能展示
+//                    }
+                    MapMarkerManager.getInstance().getOnlineCarDataByAutoRefreshStrategy( ro.mLonLat );
 
                     Logger.i( TAG, "刷新半径 = %s, 点 = %s, zoomLevel = %s, amount = %s", ro.mRadius, ro.mLonLat, mLastZoomLevel, ro.mAmount );
                 }
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 cddffedaab..4190d57534 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
@@ -547,7 +547,7 @@ public class MapMarkerManager implements IMogoMarkerClickListener,
         getOnlineCarDataImpl( latLng, onlyFocus, onlySameCity, limit, radius, true );
     }
 
-    private Runnable runnable = new Runnable() {
+    private final Runnable runnable = new Runnable() {
         @Override
         public void run() {
             getOnlineCarDataImpl( mCarLatLng, false, false, ServiceConst.ONLINE_SEARCH_LIMIT, ServiceConst.ONLINE_SEARCH_RADIUS, false );
@@ -579,9 +579,9 @@ public class MapMarkerManager implements IMogoMarkerClickListener,
             int radius,
             boolean fitBounds ) {
 
-        if ( DebugConfig.isNeedUploadCoordinatesDurationInTime() ) {
-            return;
-        }
+//        if ( DebugConfig.isNeedUploadCoordinatesDurationInTime() ) {//todo 实时在线车辆需要注释，否则在2D模式下不能展示
+//            return;
+//        }
 
         if ( DebugConfig.isDebug() ) {
             if ( !DebugConfig.isRequestOnlineCarData() ) {