Merge remote-tracking branch 'origin/dev' into dev

modules/mogo-module-gps-simulator-debug/src/main/java/com/mogo/module/gps/simulator/WebSocketManager.java

@@ -2,10 +2,8 @@ package com.mogo.module.gps.simulator;
 
 import com.alibaba.android.arouter.launcher.ARouter;
 import com.mogo.commons.AbsMogoApplication;
-import com.mogo.map.MogoLatLng;
 import com.mogo.map.location.IMogoLocationListener;
 import com.mogo.map.location.MogoLocation;
-import com.mogo.map.navi.IMogoCarLocationChangedListener;
 import com.mogo.map.navi.IMogoNavi;
 import com.mogo.service.IMogoServiceApis;
 import com.mogo.service.MogoServicePaths;

modules/mogo-module-gps-simulator/build.gradle

@@ -31,11 +31,6 @@ android {
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation rootProject.ext.dependencies.arouter
-    if (Boolean.valueOf(RELEASE)) {
-        implementation rootProject.ext.dependencies.mogomoduleauth
-    } else {
-        implementation project(':modules:mogo-module-authorize')
-    }
 }
 
 apply from: new File(rootProject.rootDir, "gradle/upload.gradle").toString()

modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java

@@ -116,6 +116,7 @@ public class MainActivity extends MvpActivity< MainView, MainPresenter > impleme
             mServiceApis = ( IMogoServiceApis ) ARouter.getInstance().build( MogoServicePaths.PATH_SERVICE_APIS ).navigation();
         }
         mMogoStatusManager = mServiceApis.getStatusManagerApi();
+        mMogoStatusManager.setMainPageLaunchedStatus( TAG, true );
         AutopilotServiceManage.getInstance().init( getContext() );
     }
 
@@ -260,6 +261,7 @@ public class MainActivity extends MvpActivity< MainView, MainPresenter > impleme
     @Override
     protected void onDestroy() {
         super.onDestroy();
+        mMogoStatusManager.setMainPageLaunchedStatus( TAG, false );
         mMogoMapService = null;
         mMogoMapUIController = null;
         mMogoFragmentManager = null;

modules/mogo-module-map/src/main/java/com/mogo/module/map/MapPresenter.java

@@ -108,7 +108,7 @@ public class MapPresenter extends Presenter< MapView > implements
                     } else if ( type == 1 ) {
                         zoomMap( opera_type == 0 );
                     } else if ( type == 2 ) {
-                        mMogoIntentManager.invoke( AUTONAVI_STANDARD_BROADCAST_RECV, intent );
+//                        mMogoIntentManager.invoke( AUTONAVI_STANDARD_BROADCAST_RECV, intent );
                         onChangeCameraMode( opera_type );
                     }
                 } else if ( key_type == 10048 ) {
@@ -372,6 +372,7 @@ public class MapPresenter extends Presenter< MapView > implements
     @Override
     public void onPause( @NonNull LifecycleOwner owner ) {
         super.onPause( owner );
+
         unregisterVoiceCmd();
     }
 

modules/mogo-module-service/src/main/java/com/mogo/module/service/MogoServices.java

@@ -577,6 +577,11 @@ public class MogoServices implements IMogoMapListener,
 
     @Override
     public void onLocationChanged( MogoLocation location ) {
+
+        if ( !mStatusManager.isMainPageLaunched() ) {
+            return;
+        }
+
         if ( mStatusManager.isV2XShow() ) {
             return;
         }
@@ -621,6 +626,10 @@ public class MogoServices implements IMogoMapListener,
      * 刷新数据
      */
     private void notifyRefreshData( MogoLatLng latLng, int radius, RefreshCallback callback ) {
+        if ( !mStatusManager.isMainPageLaunched() ) {
+            return;
+        }
+
         if ( mStatusManager.isSearchUIShow() ) {
             return;
         }