diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainActivity.java b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainActivity.java index 308d8e4361..487e3ebff9 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainActivity.java +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainActivity.java @@ -359,7 +359,6 @@ public class MainActivity extends MvpActivity implement listenerRegister.unregisterMarkerClickListener(); listenerRegister.unregisterHostMapListener(); } - mServiceApis.getRegisterCenterApi().unregisterADASControlStatusChangedListener(TAG); mMogoStatusManager.setMainPageLaunchedStatus(TAG, false); mMogoStatusManager.setMainPageIsBackgroundStatus(TAG, false); if (mMogoFragmentManager != null) { diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainLauncherActivity.java b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainLauncherActivity.java index e8423db102..26207841ee 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainLauncherActivity.java +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainLauncherActivity.java @@ -103,20 +103,6 @@ public class MainLauncherActivity extends MainActivity implements IMogoIntentLis } } - @Override - public void onMapUiModeChanged(EnumMapUI mapUI) { - super.onMapUiModeChanged(mapUI); - Intent intent = new Intent("com.mogo.style.SKIN_CHANGED"); - intent.putExtra("type", -1); - if (mapUI == EnumMapUI.Type_Light) { - intent.putExtra("type", 1); - } else if (mapUI == EnumMapUI.Type_Night) { - intent.putExtra("type", 0); - } - sendBroadcast(intent); - CallerLogger.INSTANCE.d(M_MAIN + TAG, "send msg to AI Voice"); - } - private void stopCountDown() { if (runnableV2XEvent != null) { diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/registercenter/MogoRegisterCenter.java b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/registercenter/MogoRegisterCenter.java index 57b7c6fc20..aaa358cd14 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/registercenter/MogoRegisterCenter.java +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/registercenter/MogoRegisterCenter.java @@ -9,7 +9,6 @@ import com.mogo.map.location.IMogoLocationListener; import com.mogo.map.marker.IMogoMarkerClickListener; import com.mogo.map.navi.IMogoCarLocationChangedListener; import com.mogo.map.navi.IMogoNaviListener; -import com.mogo.service.adas.IMogoADASControlStatusChangedListener; import com.mogo.service.module.IMogoModuleLifecycle; import com.mogo.service.module.IMogoRegisterCenter; @@ -85,7 +84,7 @@ public class MogoRegisterCenter implements IMogoRegisterCenter { } @Override - public void unregisterMogoStaticMarkerClickListener(String tag, IMogoMarkerClickListener listener ) { + public void unregisterMogoStaticMarkerClickListener(String tag, IMogoMarkerClickListener listener) { MogoRegisterCenterHandler.getInstance().unregisterMogoStaticMarkerClickListener(tag, listener); } @@ -99,21 +98,6 @@ public class MogoRegisterCenter implements IMogoRegisterCenter { MogoRegisterCenterHandler.getInstance().unregisterCarLocationChangedListener(tag, listener); } - @Override - public void registerADASControlStatusChangedListener(String tag, IMogoADASControlStatusChangedListener listener) { - MogoRegisterCenterHandler.getInstance().registerADASControlStatusChangedListener(tag, listener); - } - - @Override - public void unregisterADASControlStatusChangedListener(String tag) { - MogoRegisterCenterHandler.getInstance().unregisterADASControlStatusChangedListener(tag); - } - - @Override - public Iterator getAdasControlStatusChangedListeners() { - return MogoRegisterCenterHandler.getInstance().getAdasControlStatusChangedListeners(); - } - @Override public void init(Context context) { } diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/registercenter/MogoRegisterCenterHandler.java b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/registercenter/MogoRegisterCenterHandler.java index ed1e8259d5..f87b9edca7 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/registercenter/MogoRegisterCenterHandler.java +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/registercenter/MogoRegisterCenterHandler.java @@ -7,7 +7,6 @@ import com.mogo.map.location.IMogoLocationListener; import com.mogo.map.marker.IMogoMarkerClickListener; import com.mogo.map.navi.IMogoCarLocationChangedListener; import com.mogo.map.navi.IMogoNaviListener; -import com.mogo.service.adas.IMogoADASControlStatusChangedListener; import com.mogo.service.module.IMogoModuleLifecycle; import com.mogo.service.module.IMogoRegisterCenter; @@ -34,7 +33,6 @@ public class MogoRegisterCenterHandler implements IMogoRegisterCenter { private final Map mMarker = new HashMap<>(); private final Map> mStaticMarker = new HashMap<>(); private final Map mCarLocations = new ConcurrentHashMap<>(); - private final Map mADAS = new HashMap<>(); private MogoRegisterCenterHandler() { } @@ -136,16 +134,6 @@ public class MogoRegisterCenterHandler implements IMogoRegisterCenter { mCarLocations.remove(tag); } - @Override - public void registerADASControlStatusChangedListener(String tag, IMogoADASControlStatusChangedListener listener) { - mADAS.put(tag, listener); - } - - @Override - public void unregisterADASControlStatusChangedListener(String tag) { - mADAS.remove(tag); - } - @Override public void init(Context context) { } @@ -154,7 +142,7 @@ public class MogoRegisterCenterHandler implements IMogoRegisterCenter { return mMarker.get(tag); } - public ArrayList getStaticMarkerListener(String tag){ + public ArrayList getStaticMarkerListener(String tag) { return mStaticMarker.get(tag); } @@ -175,8 +163,4 @@ public class MogoRegisterCenterHandler implements IMogoRegisterCenter { return mCarLocations.values().iterator(); } - @Override - public Iterator getAdasControlStatusChangedListeners() { - return mADAS.values().iterator(); - } } 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 73937cc07f..923fd42c15 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 @@ -737,7 +737,6 @@ public class MogoServices implements IMogoMapListener, if (ui == EnumMapUI.Type_VR) { if (!mLastStatusIsVr) { MogoApisHandler.getInstance().getApis().getStatusManagerApi().setVrMode(TAG, true); - MapMarkerManager.getInstance().redrawMarkerByStyleChanged(); if (DebugConfig.getCarMachineType() != DebugConfig.CAR_MACHINE_TYPE_LENOVO) { AIAssist.getInstance(mContext).speakTTSVoice("已开启鹰眼模式"); } @@ -747,7 +746,6 @@ public class MogoServices implements IMogoMapListener, if (mLastStatusIsVr) { mLastStatusIsVr = false; MogoApisHandler.getInstance().getApis().getStatusManagerApi().setVrMode(TAG, false); - MapMarkerManager.getInstance().redrawMarkerByStyleChanged(); if (DebugConfig.getCarMachineType() != DebugConfig.CAR_MACHINE_TYPE_LENOVO) { AIAssist.getInstance(mContext).speakTTSVoice("已退出鹰眼模式"); } 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 ee3b101742..a84d1d20bd 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 @@ -15,7 +15,6 @@ import com.mogo.map.MogoMapUIController; import com.mogo.map.MogoMarkerManager; import com.mogo.map.marker.IMogoMarker; import com.mogo.map.marker.IMogoMarkerClickListener; -import com.mogo.map.uicontroller.EnumMapUI; import com.mogo.module.common.ModuleNames; import com.mogo.module.common.drawer.MarkerDrawer; import com.mogo.module.common.drawer.RoadConditionDrawer; @@ -33,7 +32,6 @@ import com.mogo.module.service.R; import com.mogo.module.service.ServiceConst; import com.mogo.module.service.network.RefreshCallback; import com.mogo.module.service.network.RefreshModel; -import com.mogo.service.adas.IMogoADASControlStatusChangedListener; import org.json.JSONArray; import org.json.JSONException; @@ -51,8 +49,7 @@ import java.util.Map; * desc : 大而全的Marker管理 * version: 1.0 */ -public class MapMarkerManager implements IMogoMarkerClickListener, - IMogoADASControlStatusChangedListener { +public class MapMarkerManager implements IMogoMarkerClickListener { private static final String TAG = "MapMarkerManager"; private Context mContext; @@ -97,7 +94,6 @@ public class MapMarkerManager implements IMogoMarkerClickListener, mContext = context.getApplicationContext(); mRefreshModel = new RefreshModel(mContext); CloudPoiManager.getInstance().updateFromConfig(context); - MarkerServiceHandler.getApis().getRegisterCenterApi().registerADASControlStatusChangedListener(TAG, this); } /** @@ -485,29 +481,6 @@ public class MapMarkerManager implements IMogoMarkerClickListener, ThreadPoolService.execute(runnable); } - @Override - public void onMapUiModeChanged(EnumMapUI mapUI) { - switch (mapUI) { - case Type_Light: - case Type_Night: - redrawMarkerByStyleChanged(); - break; - } - } - - /** - * 重绘内容 - */ - public void redrawMarkerByStyleChanged() { - if (mLastDataResult != null) { - runOnTargetThread(() -> { - MogoMarkerManager.getInstance(mContext).removeMarkers(ModuleNames.CARD_TYPE_ROAD_CONDITION); - drawMarkerByCurrentType(mLastDataResult); - mLastCheckMarker = null; - }); - } - } - /** * 关闭当前点击过的 marker */ diff --git a/services/mogo-service-api/src/main/java/com/mogo/service/adas/IMogoADASControlStatusChangedListener.java b/services/mogo-service-api/src/main/java/com/mogo/service/adas/IMogoADASControlStatusChangedListener.java deleted file mode 100644 index ea1b53422c..0000000000 --- a/services/mogo-service-api/src/main/java/com/mogo/service/adas/IMogoADASControlStatusChangedListener.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.mogo.service.adas; - -import com.mogo.map.uicontroller.EnumMapUI; - -/** - * @author congtaowang - * @since 2020/8/31 - * - * adas 控制状态变化监听 - */ -public interface IMogoADASControlStatusChangedListener { - - /** - * 地图模式切换 - * - * @param mapUI - */ - default void onMapUiModeChanged( EnumMapUI mapUI ) { - } - - /** - * 隐身模式设置 - * - * @param visible true 可见、false 不可见 - */ - default void onCarStatusChanged( boolean visible ) { - } -} diff --git a/services/mogo-service-api/src/main/java/com/mogo/service/module/IMogoRegisterCenter.java b/services/mogo-service-api/src/main/java/com/mogo/service/module/IMogoRegisterCenter.java index a86d86dfc5..bd628e0512 100644 --- a/services/mogo-service-api/src/main/java/com/mogo/service/module/IMogoRegisterCenter.java +++ b/services/mogo-service-api/src/main/java/com/mogo/service/module/IMogoRegisterCenter.java @@ -6,7 +6,6 @@ import com.mogo.map.location.IMogoLocationListener; import com.mogo.map.marker.IMogoMarkerClickListener; import com.mogo.map.navi.IMogoCarLocationChangedListener; import com.mogo.map.navi.IMogoNaviListener; -import com.mogo.service.adas.IMogoADASControlStatusChangedListener; import java.util.Iterator; @@ -137,24 +136,4 @@ public interface IMogoRegisterCenter extends IProvider { */ void unregisterCarLocationChangedListener( String tag, IMogoCarLocationChangedListener listener ); - /** - * adas 控制状态变更监听 - * @param tag - * @param listener - */ - void registerADASControlStatusChangedListener( String tag, IMogoADASControlStatusChangedListener listener ); - - - /** - * 注销 adas 控制状态变更监听 - * @param tag - */ - void unregisterADASControlStatusChangedListener( String tag ); - - /** - * 获取adas控制状态监听 - * @return - */ - Iterator getAdasControlStatusChangedListeners(); - }