diff --git a/app/build.gradle b/app/build.gradle index a0380eea58..4e226e5ce8 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -205,7 +205,6 @@ dependencies { implementation rootProject.ext.dependencies.mogomodulewidgets implementation rootProject.ext.dependencies.moduleADAS implementation rootProject.ext.dependencies.mogomoduleback - implementation rootProject.ext.dependencies.moduleapps implementation rootProject.ext.dependencies.modulepushbase implementation rootProject.ext.dependencies.modulepush implementation rootProject.ext.dependencies.callchat @@ -239,7 +238,6 @@ dependencies { implementation project(':modules:mogo-module-widgets') implementation project(':modules:mogo-module-adas') implementation project(':modules:mogo-module-back') - implementation project(':modules:mogo-module-apps') implementation project(":modules:mogo-module-push-base") implementation project(":modules:mogo-module-push") implementation project(':modules:mogo-module-carchatting') diff --git a/core/function-impl/mogo-core-function-main/build.gradle b/core/function-impl/mogo-core-function-main/build.gradle index 51d230b66e..a837ca48f4 100644 --- a/core/function-impl/mogo-core-function-main/build.gradle +++ b/core/function-impl/mogo-core-function-main/build.gradle @@ -76,7 +76,6 @@ dependencies { implementation rootProject.ext.dependencies.mogomodulewidgets implementation rootProject.ext.dependencies.moduleADAS implementation rootProject.ext.dependencies.mogomoduleback - implementation rootProject.ext.dependencies.moduleapps implementation rootProject.ext.dependencies.modulepushbase implementation rootProject.ext.dependencies.modulepush implementation rootProject.ext.dependencies.callchat @@ -113,7 +112,6 @@ dependencies { implementation project(':modules:mogo-module-widgets') implementation project(':modules:mogo-module-adas') implementation project(':modules:mogo-module-back') - implementation project(':modules:mogo-module-apps') implementation project(":modules:mogo-module-push-base") implementation project(":modules:mogo-module-push") implementation project(':modules:mogo-module-carchatting') diff --git a/core/function-impl/mogo-core-function-main/src/main/java/com/mogo/eagle/core/function/main/MainLauncherActivity.java b/core/function-impl/mogo-core-function-main/src/main/java/com/mogo/eagle/core/function/main/MainLauncherActivity.java index 323ff3e325..9f11607b0b 100644 --- a/core/function-impl/mogo-core-function-main/src/main/java/com/mogo/eagle/core/function/main/MainLauncherActivity.java +++ b/core/function-impl/mogo-core-function-main/src/main/java/com/mogo/eagle/core/function/main/MainLauncherActivity.java @@ -23,9 +23,7 @@ import com.alibaba.android.arouter.launcher.ARouter; import com.mogo.commons.debug.DebugConfig; import com.mogo.eagle.core.function.api.base.IMoGoFunctionProvider; import com.mogo.map.uicontroller.EnumMapUI; -import com.mogo.module.common.MogoApisHandler; import com.mogo.module.main.MainActivity; -import com.mogo.module.main.cards.MogoModulesManager; import com.mogo.module.service.receiver.MogoReceiver; import com.mogo.service.intent.IMogoIntentListener; import com.mogo.service.statusmanager.StatusDescriptor; @@ -55,37 +53,12 @@ public class MainLauncherActivity extends MainActivity implements IMogoIntentLis mServiceApis.getV2XListenerManager().registerIntentListener(MogoReceiver.ACTION_V2X_FRONT_WARNING, this); } - @Override - protected void loadContainerModules() { - super.loadContainerModules(); - // 显示左边遮罩 - if (MogoApisHandler.getInstance().getApis().getStatusManagerApi().isVrMode()) { - mLeftShadowFrame.setVisibility(View.GONE); - } else { - mLeftShadowFrame.setVisibility(View.VISIBLE); - } - MogoModulesManager.getInstance().loadAppsListModule(com.mogo.module.main.R.id.module_main_id_apps_fragment_container); - } @Override protected void initViews() { super.initViews(); } - @Override - protected void hideLayout() { - super.hideLayout(); - mApps.setVisibility(View.GONE); - mLeftShadowFrame.setVisibility(View.GONE); - } - - @Override - protected void showLayout() { - super.showLayout(); - mApps.setVisibility(View.VISIBLE); - mLeftShadowFrame.setVisibility(View.VISIBLE); - } - @Override protected void onStart() { super.onStart(); @@ -257,16 +230,4 @@ public class MainLauncherActivity extends MainActivity implements IMogoIntentLis } } - @Override - public void onStatusChanged(StatusDescriptor descriptor, boolean isTrue) { - super.onStatusChanged(descriptor, isTrue); - if (isTrue) { - mLeftShadowFrame.setVisibility(View.GONE); - mApps.setVisibility(View.GONE); - } else { - mLeftShadowFrame.setVisibility(View.VISIBLE); - mApps.setVisibility(View.VISIBLE); - } - } - } diff --git a/modules.txt b/modules.txt index 4074c01866..d4f027fb03 100644 --- a/modules.txt +++ b/modules.txt @@ -33,7 +33,6 @@ :services:mogo-service :modules:mogo-module-map :core:function-impl:mogo-core-function-smp -:modules:mogo-module-apps :modules:mogo-module-share :modules:mogo-module-extensions :modules:mogo-module-v2x 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 79d0e2993c..efcb8d179a 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 @@ -73,13 +73,11 @@ public class MainActivity extends MvpActivity implement protected IMogoFragmentManager mMogoFragmentManager; protected IMogoStatusManager mMogoStatusManager; - protected View mApps; protected View mEntrance; protected View mEventPanel; protected View mHistoryMessagePanel; protected FrameLayout mFloatingLayout; protected View mCoverUpLayout; - protected View mLeftShadowFrame; protected ImageView mWarningTop; protected ImageView mWarningLeft; @@ -92,9 +90,6 @@ public class MainActivity extends MvpActivity implement @Override protected int getLayoutId() { - if (!DebugConfig.isMapBased()) { - return R.layout.module_main_activity_main_no_map; - } return R.layout.module_main_activity_main; } @@ -107,11 +102,9 @@ public class MainActivity extends MvpActivity implement protected void initViews() { getWindow().setBackgroundDrawable(null); - mApps = findViewById(R.id.module_main_id_apps_fragment_container); mEntrance = findViewById(R.id.module_main_id_entrance_fragment_container); mEventPanel = findViewById(R.id.module_main_id_event_panel_fragment_container); mFloatingLayout = findViewById(R.id.module_main_id_floating_view); - mLeftShadowFrame = findViewById(R.id.module_main_id_map_left_shadow_frame); mCoverUpLayout = findViewById(R.id.module_main_id_cover_up); mHistoryMessagePanel = findViewById(R.id.module_main_id_message_history_fragment_container); @@ -122,9 +115,6 @@ public class MainActivity extends MvpActivity implement clSpecialEffect = findViewById(R.id.cl_special_effect); - // 避免事件穿透导致地图被滑动 - mLeftShadowFrame.setOnClickListener(view -> { - }); FloatingViewHandler.init(mFloatingLayout); mServiceApis.getOnlineCarPanelApi().initContainer(R.id.module_main_id_message_history_fragment_container, this); diff --git a/modules/mogo-module-main/src/main/java/com/mogo/module/main/cards/MogoModulesHandler.java b/modules/mogo-module-main/src/main/java/com/mogo/module/main/cards/MogoModulesHandler.java index d045388074..1afec48929 100644 --- a/modules/mogo-module-main/src/main/java/com/mogo/module/main/cards/MogoModulesHandler.java +++ b/modules/mogo-module-main/src/main/java/com/mogo/module/main/cards/MogoModulesHandler.java @@ -27,12 +27,6 @@ public interface MogoModulesHandler { */ void loadFunctionModulesServer(); - /** - * 加载所有应用 - * - * @param containerId 容器id - */ - void loadAppsListModule(int containerId); /** * 加载快捷操作 diff --git a/modules/mogo-module-main/src/main/java/com/mogo/module/main/cards/MogoModulesManager.java b/modules/mogo-module-main/src/main/java/com/mogo/module/main/cards/MogoModulesManager.java index 1f0e05417f..a9290a3b4e 100644 --- a/modules/mogo-module-main/src/main/java/com/mogo/module/main/cards/MogoModulesManager.java +++ b/modules/mogo-module-main/src/main/java/com/mogo/module/main/cards/MogoModulesManager.java @@ -129,14 +129,6 @@ public class MogoModulesManager implements MogoModulesHandler { } - @Override - public void loadAppsListModule( int containerId ) { - IMogoModuleProvider provider = ( IMogoModuleProvider ) ARouter.getInstance() - .build( MogoModulePaths.PATH_MODULE_APPS ) - .navigation( getContext() ); - addFragment( provider, containerId ); - } - @Override public void loadEntrancesModule( int containerId ) { IMogoModuleProvider provider = ( IMogoModuleProvider ) ARouter.getInstance() diff --git a/modules/mogo-module-main/src/main/res/layout/module_main_activity_main.xml b/modules/mogo-module-main/src/main/res/layout/module_main_activity_main.xml index 5a42cbfcd4..1914ac1a8c 100644 --- a/modules/mogo-module-main/src/main/res/layout/module_main_activity_main.xml +++ b/modules/mogo-module-main/src/main/res/layout/module_main_activity_main.xml @@ -55,7 +55,8 @@ android:id="@+id/cl_special_effect" android:layout_width="match_parent" android:layout_height="match_parent" - android:visibility="gone"> + android:visibility="gone" + tools:visibility="visible"> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/settings.gradle b/settings.gradle index bd2e3043f2..c3ced9607e 100644 --- a/settings.gradle +++ b/settings.gradle @@ -65,7 +65,6 @@ include ':modules:mogo-module-main' include ':modules:mogo-module-share' include ':modules:mogo-module-service' include ':modules:mogo-module-back' -include ':modules:mogo-module-apps' include ':modules:mogo-module-extensions' include ':modules:mogo-module-v2x' include ':modules:mogo-module-push'