opt

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

@@ -21,14 +21,10 @@ import com.mogo.map.navi.MogoTraffic;
 import com.mogo.map.uicontroller.EnumMapUI;
 import com.mogo.module.main.registercenter.MogoRegisterCenterHandler;
 import com.mogo.service.adas.IMogoADASControlStatusChangedListener;
-import com.mogo.service.obu.IMogoObuDataChangedListener;
 import com.mogo.utils.logger.Logger;
 import com.zhidao.adasconfig.common.config.EnumCarChatIncognitoMode;
 import com.zhidao.adasconfig.listener.IAdasSettingUIListener;
 import com.zhidao.adasconfig.listener.IAdasSkinStyleListener;
-import com.zhidao.smartv2x.model.obu.CarEventInfo;
-import com.zhidao.smartv2x.model.obu.CarLocationInfo;
-import com.zhidao.smartv2x.model.obu.TrafficLightInfo;
 
 import java.util.Iterator;
 
@@ -46,7 +42,6 @@ public class EventDispatchCenter implements
         IMogoMapListener,
         IMogoNaviListener2,
         IMogoLocationListener,
-        IMogoObuDataChangedListener,
         IAdasSettingUIListener,
         IAdasSkinStyleListener {
 
@@ -162,8 +157,14 @@ public class EventDispatchCenter implements
         this.mMapLoadedCallback = callback;
     }
 
+    private boolean mIsMapLoaded = false;
+
     @Override
     public void onMapLoaded() {
+        if ( mIsMapLoaded ) {
+            return;
+        }
+        mIsMapLoaded = true;
         if ( mMapLoadedCallback != null ) {
             mMapLoadedCallback.run();
             mMapLoadedCallback = null;
@@ -484,50 +485,6 @@ public class EventDispatchCenter implements
         }
     }
 
-    @Override
-    public void showCarLocationInfo( CarLocationInfo info ) {
-        Iterator< IMogoObuDataChangedListener > iterator = MogoRegisterCenterHandler.getInstance().getObuDataChangedListeners();
-        if ( iterator == null ) {
-            return;
-        }
-        while ( iterator.hasNext() ) {
-            iterator.next().showCarLocationInfo( info );
-        }
-    }
-
-    @Override
-    public void showOtherInfo( String info ) {
-        Iterator< IMogoObuDataChangedListener > iterator = MogoRegisterCenterHandler.getInstance().getObuDataChangedListeners();
-        if ( iterator == null ) {
-            return;
-        }
-        while ( iterator.hasNext() ) {
-            iterator.next().showOtherInfo( info );
-        }
-    }
-
-    @Override
-    public void showTrafficLightInfo( TrafficLightInfo info ) {
-        Iterator< IMogoObuDataChangedListener > iterator = MogoRegisterCenterHandler.getInstance().getObuDataChangedListeners();
-        if ( iterator == null ) {
-            return;
-        }
-        while ( iterator.hasNext() ) {
-            iterator.next().showTrafficLightInfo( info );
-        }
-    }
-
-    @Override
-    public void showCarEventInfo( CarEventInfo info ) {
-        Iterator< IMogoObuDataChangedListener > iterator = MogoRegisterCenterHandler.getInstance().getObuDataChangedListeners();
-        if ( iterator == null ) {
-            return;
-        }
-        while ( iterator.hasNext() ) {
-            iterator.next().showCarEventInfo( info );
-        }
-    }
-
     @Override
     public void northModel() {
         Iterator< IMogoADASControlStatusChangedListener > iterator = MogoRegisterCenterHandler.getInstance().getAdasControlStatusChangedListeners();

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

@@ -7,6 +7,7 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.widget.FrameLayout;
 
+import com.alibaba.android.arouter.launcher.ARouter;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.core.view.LayoutInflaterCompat;
@@ -41,6 +42,9 @@ import com.zhidao.autopilot.support.api.AutopilotServiceManage;
 
 import java.util.List;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
 /**
  * @author congtaowang
  * @since 2019-12-23
@@ -134,7 +138,7 @@ public class MainActivity extends MvpActivity< MainView, MainPresenter > impleme
     @Override
     protected void onCreate( @Nullable Bundle savedInstanceState ) {
         super.onCreate( savedInstanceState );
-        ContextHolderUtil.holdContext( this );
+        ContextHolderUtil.holdContext(this);
         mPresenter.postLoadModuleMsg();
     }
 

modules/mogo-module-main/src/main/java/com/mogo/module/main/registercenter/MogoRegisterCenter.java

@@ -13,7 +13,6 @@ import com.mogo.service.MogoServicePaths;
 import com.mogo.service.adas.IMogoADASControlStatusChangedListener;
 import com.mogo.service.module.IMogoModuleLifecycle;
 import com.mogo.service.module.IMogoRegisterCenter;
-import com.mogo.service.obu.IMogoObuDataChangedListener;
 
 import java.util.Iterator;
 
@@ -101,16 +100,6 @@ public class MogoRegisterCenter implements IMogoRegisterCenter {
         MogoRegisterCenterHandler.getInstance().unregisterCarLocationChangedListener( tag, listener );
     }
 
-    @Override
-    public void registerObuDataListener( String tag, IMogoObuDataChangedListener listener ) {
-        MogoRegisterCenterHandler.getInstance().registerObuDataListener( tag, listener );
-    }
-
-    @Override
-    public void unregisterObuDataListener( String tag ) {
-        MogoRegisterCenterHandler.getInstance().unregisterObuDataListener( tag );
-    }
-
     @Override
     public void registerADASControlStatusChangedListener( String tag, IMogoADASControlStatusChangedListener listener ) {
         MogoRegisterCenterHandler.getInstance().registerADASControlStatusChangedListener( tag, listener );

modules/mogo-module-main/src/main/java/com/mogo/module/main/registercenter/MogoRegisterCenterHandler.java

@@ -11,7 +11,6 @@ import com.mogo.map.navi.IMogoNaviListener;
 import com.mogo.service.adas.IMogoADASControlStatusChangedListener;
 import com.mogo.service.module.IMogoModuleLifecycle;
 import com.mogo.service.module.IMogoRegisterCenter;
-import com.mogo.service.obu.IMogoObuDataChangedListener;
 
 import java.util.HashMap;
 import java.util.Iterator;
@@ -35,7 +34,6 @@ public class MogoRegisterCenterHandler implements IMogoRegisterCenter {
     private Map< String, IMogoMarkerClickListener > mMarker = new HashMap<>();
     private Map< String, IMogoAimlessModeListener > mAimless = new HashMap<>();
     private Map< String, IMogoCarLocationChangedListener > mCarLocations = new HashMap<>();
-    private Map< String, IMogoObuDataChangedListener > mObus = new HashMap<>();
     private Map< String, IMogoADASControlStatusChangedListener > mADAS = new HashMap<>();
 
     private MogoRegisterCenterHandler() {
@@ -127,16 +125,6 @@ public class MogoRegisterCenterHandler implements IMogoRegisterCenter {
         mCarLocations.remove( tag );
     }
 
-    @Override
-    public void registerObuDataListener( String tag, IMogoObuDataChangedListener listener ) {
-        mObus.put( tag, listener );
-    }
-
-    @Override
-    public void unregisterObuDataListener( String tag ) {
-        mObus.remove( tag );
-    }
-
     @Override
     public void registerADASControlStatusChangedListener( String tag, IMogoADASControlStatusChangedListener listener ) {
         mADAS.put( tag, listener );
@@ -183,10 +171,6 @@ public class MogoRegisterCenterHandler implements IMogoRegisterCenter {
         return mNavi.values().iterator();
     }
 
-    public Iterator< IMogoObuDataChangedListener > getObuDataChangedListeners() {
-        return mObus.values().iterator();
-    }
-
     @Override
     public Iterator< IMogoLocationListener > getLocationListeners() {
         return mLocation.values().iterator();

modules/mogo-module-main/src/main/res/values/dimens.xml

@@ -26,7 +26,6 @@
     <dimen name="module_main_entrance_fragment_container_padding_top">16px</dimen>
     <dimen name="module_main_entrance_fragment_container_width">658px</dimen>
     <dimen name="module_event_fragment_container_padding">8px</dimen>
-    <dimen name="module_main_apps_fragment_container_paddingTop">8px</dimen>
     <dimen name="module_main_apps_fragment_container_paddingBottom">2px</dimen>
     <dimen name="module_ext_top_view_max_width">1920px</dimen>
     <dimen name="module_main_panel_margin_right">0px</dimen>
@@ -35,4 +34,6 @@
     <dimen name="module_main_event_panel_fragment_paddingBottom">2px</dimen>
     <dimen name="module_main_event_panel_fragment_paddingLeft">2px</dimen>
     <dimen name="module_main_event_panel_fragment_paddingRight">4px</dimen>
+    <dimen name="module_main_apps_fragment_container_paddingTop">8px</dimen>
+
 </resources>