merge

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

@@ -125,7 +125,7 @@ public class MainActivity extends MvpActivity< MainView, MainPresenter > impleme
         mLocationClient.addLocationListener( this );
         mLocationClient.start();
 
-        mMogoModuleHandler.loadPushService();
+        mMogoModuleHandler.loadService();
 
         mMogoModuleHandler.loadAppsList( R.id.module_main_id_fragment_container );
     }

modules/mogo-module-main/src/main/java/com/mogo/module/main/cards/MogoModulesHandler.java

@@ -67,9 +67,9 @@ public interface MogoModulesHandler extends IMogoMapListener,
     void setEnable( String module );
 
     /**
-     * 加载 push 服务
+     * 加载服务
      */
-    void loadPushService();
+    void loadService();
 
     /**
      * 销毁

modules/mogo-module-main/src/main/java/com/mogo/module/main/cards/MogoModulesManager.java

@@ -22,6 +22,7 @@ import com.mogo.module.common.MogoModule;
 import com.mogo.module.common.MogoModulePaths;
 import com.mogo.module.main.MainActivity;
 import com.mogo.module.main.receiver.MogoReceiver;
+import com.mogo.module.service.ServiceConst;
 import com.mogo.service.module.IMogoModuleLifecycle;
 import com.mogo.service.module.IMogoModuleProvider;
 import com.mogo.utils.ResourcesHelper;
@@ -47,9 +48,13 @@ public class MogoModulesManager implements MogoModulesHandler,
     private static final String TAG = "MogoModulesManager";
 
     private MainActivity mActivity;
+
     private final Map< String, IMogoModuleProvider > mCardProviders = new HashMap<>();
     private IMogoModuleProvider mMapProvider;
     private IMogoModuleProvider mAppsListProvider;
+    private IMogoModuleProvider mPushProvider;
+    private IMogoModuleProvider mRefreshStrategyProvider;
+
     private String mEnableModuleName = null;
     private Runnable mMapLoadedCallback;
 
@@ -136,13 +141,9 @@ public class MogoModulesManager implements MogoModulesHandler,
     }
 
     @Override
-    public void loadPushService() {
-        IMogoModuleProvider provider = ( IMogoModuleProvider ) ARouter.getInstance().build( "/push/ui" ).navigation( mActivity.getApplicationContext() );
-        if ( provider != null ) {
-            if ( provider.getType() == IMogoModuleProvider.TYPE_SERVICE ) {
-
-            }
-        }
+    public void loadService() {
+        mPushProvider = ( IMogoModuleProvider ) ARouter.getInstance().build( "/push/ui" ).navigation( mActivity.getApplicationContext() );
+        mRefreshStrategyProvider = ( IMogoModuleProvider ) ARouter.getInstance().build( ServiceConst.PATH_REFRESH_STRATEGY ).navigation( mActivity.getApplicationContext() );
     }
 
     @Override
@@ -180,6 +181,12 @@ public class MogoModulesManager implements MogoModulesHandler,
                 provider.getMapListener().onMapLoaded();
             }
         }
+
+        if ( mRefreshStrategyProvider != null ) {
+            if ( mRefreshStrategyProvider.getMapListener() != null ) {
+                mRefreshStrategyProvider.getMapListener().onMapLoaded();
+            }
+        }
     }
 
     @Override
@@ -190,6 +197,11 @@ public class MogoModulesManager implements MogoModulesHandler,
                 provider.getMapListener().onTouch( motionEvent );
             }
         }
+        if ( mRefreshStrategyProvider != null ) {
+            if ( mRefreshStrategyProvider.getMapListener() != null ) {
+                mRefreshStrategyProvider.getMapListener().onTouch( motionEvent );
+            }
+        }
     }
 
     @Override
@@ -200,6 +212,12 @@ public class MogoModulesManager implements MogoModulesHandler,
                 provider.getMapListener().onPOIClick( poi );
             }
         }
+
+        if ( mRefreshStrategyProvider != null ) {
+            if ( mRefreshStrategyProvider.getMapListener() != null ) {
+                mRefreshStrategyProvider.getMapListener().onPOIClick( poi );
+            }
+        }
     }
 
     @Override
@@ -210,6 +228,12 @@ public class MogoModulesManager implements MogoModulesHandler,
                 provider.getMapListener().onMapClick( latLng );
             }
         }
+
+        if ( mRefreshStrategyProvider != null ) {
+            if ( mRefreshStrategyProvider.getMapListener() != null ) {
+                mRefreshStrategyProvider.getMapListener().onMapClick( latLng );
+            }
+        }
     }
 
     @Override
@@ -220,6 +244,12 @@ public class MogoModulesManager implements MogoModulesHandler,
                 provider.getMapListener().onLockMap( isLock );
             }
         }
+
+        if ( mRefreshStrategyProvider != null ) {
+            if ( mRefreshStrategyProvider.getMapListener() != null ) {
+                mRefreshStrategyProvider.getMapListener().onLockMap( isLock );
+            }
+        }
     }
 
     @Override
@@ -230,6 +260,21 @@ public class MogoModulesManager implements MogoModulesHandler,
                 provider.getMapListener().onMapModeChanged( ui );
             }
         }
+
+        if ( mRefreshStrategyProvider != null ) {
+            if ( mRefreshStrategyProvider.getMapListener() != null ) {
+                mRefreshStrategyProvider.getMapListener().onMapModeChanged( ui );
+            }
+        }
+    }
+
+    @Override
+    public void onMapChanged( MogoLatLng location, float zoom, float tilt, float bearing ) {
+        if ( mRefreshStrategyProvider != null ) {
+            if ( mRefreshStrategyProvider.getMapListener() != null ) {
+                mRefreshStrategyProvider.getMapListener().onMapChanged( location, zoom, tilt, bearing );
+            }
+        }
     }
 
     @Override
@@ -240,6 +285,12 @@ public class MogoModulesManager implements MogoModulesHandler,
                 provider.getNaviListener().onInitNaviFailure();
             }
         }
+
+        if ( mRefreshStrategyProvider != null ) {
+            if ( mRefreshStrategyProvider.getNaviListener() != null ) {
+                mRefreshStrategyProvider.getNaviListener().onInitNaviFailure();
+            }
+        }
     }
 
     @Override
@@ -250,6 +301,12 @@ public class MogoModulesManager implements MogoModulesHandler,
                 provider.getNaviListener().onInitNaviSuccess();
             }
         }
+
+        if ( mRefreshStrategyProvider != null ) {
+            if ( mRefreshStrategyProvider.getNaviListener() != null ) {
+                mRefreshStrategyProvider.getNaviListener().onInitNaviSuccess();
+            }
+        }
     }
 
     @Override
@@ -260,6 +317,12 @@ public class MogoModulesManager implements MogoModulesHandler,
                 provider.getNaviListener().onNaviInfoUpdate( naviinfo );
             }
         }
+
+        if ( mRefreshStrategyProvider != null ) {
+            if ( mRefreshStrategyProvider.getNaviListener() != null ) {
+                mRefreshStrategyProvider.getNaviListener().onNaviInfoUpdate( naviinfo );
+            }
+        }
     }
 
     @Override
@@ -271,6 +334,12 @@ public class MogoModulesManager implements MogoModulesHandler,
                 provider.getNaviListener().onStartNavi();
             }
         }
+
+        if ( mRefreshStrategyProvider != null ) {
+            if ( mRefreshStrategyProvider.getNaviListener() != null ) {
+                mRefreshStrategyProvider.getNaviListener().onStartNavi();
+            }
+        }
     }
 
     @Override
@@ -282,6 +351,12 @@ public class MogoModulesManager implements MogoModulesHandler,
                 provider.getNaviListener().onStopNavi();
             }
         }
+
+        if ( mRefreshStrategyProvider != null ) {
+            if ( mRefreshStrategyProvider.getNaviListener() != null ) {
+                mRefreshStrategyProvider.getNaviListener().onStopNavi();
+            }
+        }
     }
 
     @Override
@@ -292,6 +367,12 @@ public class MogoModulesManager implements MogoModulesHandler,
                 provider.getLocationListener().onLocationChanged( location );
             }
         }
+
+        if ( mRefreshStrategyProvider != null ) {
+            if ( mRefreshStrategyProvider.getLocationListener() != null ) {
+                mRefreshStrategyProvider.getLocationListener().onLocationChanged( location );
+            }
+        }
     }
 
     public void registerReceiver() {