From d6613dea7b03ba3a08a8a1762b0aa3e897469612 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Mon, 3 Aug 2020 15:46:21 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BA=86=E4=BA=8B=E4=BB=B6?= =?UTF-8?q?=E9=9D=A2=E6=9D=BFprovider?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/mogo/launcher/MogoApplication.java | 1 + .../module/v2x/EventPanelModuleProvider.java | 95 +++++++++++++++++++ .../java/com/mogo/module/v2x/V2XConst.java | 18 +++- .../mogo/module/v2x/V2XModuleProvider.java | 7 +- .../v2x/adapter/ScenarioHistoryAdapter.java | 18 +--- .../holder/ScenarioHistoryRoadEventVH.java | 2 +- .../v2x/fragment/ScenarioHistoryFragment.java | 2 - ..._event_panel_fragment_scenario_history.xml | 14 +-- 8 files changed, 118 insertions(+), 39 deletions(-) create mode 100644 modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/EventPanelModuleProvider.java diff --git a/app/src/main/java/com/mogo/launcher/MogoApplication.java b/app/src/main/java/com/mogo/launcher/MogoApplication.java index 1bb920237d..208412c15e 100644 --- a/app/src/main/java/com/mogo/launcher/MogoApplication.java +++ b/app/src/main/java/com/mogo/launcher/MogoApplication.java @@ -70,6 +70,7 @@ public class MogoApplication extends AbsMogoApplication { MogoModulePaths.addBaseModule( new MogoModule( ServiceConst.PATH_REFRESH_STRATEGY, ServiceConst.PATH_REFRESH_STRATEGY ) ); MogoModulePaths.addBaseModule( new MogoModule( V2XConst.PATH_V2X_UI, V2XConst.MODULE_NAME ) ); + MogoModulePaths.addModule( new MogoModule( V2XConst.PATH_EVENT_PANEL, V2XConst.MODULE_NAME_EVENT_PANEL ) ); MogoModulePaths.addModule( new MogoModule( PushUIConstants.PATH, PushUIConstants.NAME ) ); MogoModulePaths.addModule(new MogoModule(MogoServicePaths.PATH_LOG_LIB, "LogLib")); diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/EventPanelModuleProvider.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/EventPanelModuleProvider.java new file mode 100644 index 0000000000..0d8b3a9d36 --- /dev/null +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/EventPanelModuleProvider.java @@ -0,0 +1,95 @@ +package com.mogo.module.v2x; + +import android.content.Context; +import android.os.Bundle; +import android.view.View; + +import androidx.annotation.NonNull; +import androidx.fragment.app.Fragment; + +import com.alibaba.android.arouter.facade.annotation.Route; +import com.mogo.map.listener.IMogoMapListener; +import com.mogo.map.location.IMogoLocationListener; +import com.mogo.map.marker.IMogoMarkerClickListener; +import com.mogo.map.navi.IMogoNaviListener; +import com.mogo.module.v2x.fragment.EventPanelFragment; +import com.mogo.service.module.IMogoModuleLifecycle; +import com.mogo.service.module.IMogoModuleProvider; +import com.mogo.service.module.ModuleType; +import com.mogo.utils.logger.Logger; + +import static com.mogo.module.v2x.V2XConst.MODULE_NAME; + +/** + * author : donghongyu + * e-mail : 1358506549@qq.com + * date : 2020-01-2114:03 + * desc : V2X的管理 + * version: 2.0 + */ +@Route(path = V2XConst.PATH_EVENT_PANEL) +public class EventPanelModuleProvider implements + IMogoModuleProvider { + private final String TAG = "EventPanelModuleProvider"; + + @Override + public Fragment createFragment(Context context, Bundle data) { + return EventPanelFragment.Companion.getInstance(); + } + + @Override + public View createView(Context context) { + return null; + } + + @NonNull + @Override + public String getModuleName() { + return V2XConst.MODULE_NAME_EVENT_PANEL; + } + + @Override + public IMogoModuleLifecycle getCardLifecycle() { + return null; + } + + @Override + public IMogoMapListener getMapListener() { + return null; + } + + @Override + public int getType() { + return ModuleType.TYPE_CARD_FRAGMENT; + } + + @Override + public IMogoNaviListener getNaviListener() { + return null; + } + + @Override + public IMogoLocationListener getLocationListener() { + return null; + } + + @Override + public IMogoMarkerClickListener getMarkerClickListener() { + return null; + } + + @Override + public String getAppPackage() { + return null; + } + + @Override + public String getAppName() { + return null; + } + + @Override + public void init(Context context) { + Logger.e(MODULE_NAME, "事件模版 模块初始化。。。。"); + } +} diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XConst.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XConst.java index 90b0cddc96..4c85d75e0c 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XConst.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XConst.java @@ -9,14 +9,22 @@ package com.mogo.module.v2x; */ public class V2XConst { /** - * 类型 + * V2X面板名称 */ - public static final String MODULE_NAME = "MODULE_EVENT_PANEL"; + public static final String MODULE_NAME = "V2X_UI"; /** * V2X模块地址 */ - public static final String PATH_V2X_UI = "/event/panel"; - public static final String SEEK_HELP_TIME = "seek_help_time"; + public static final String PATH_V2X_UI = "/v2x/ui"; + + /** + * 事件面板名称 + */ + public static final String MODULE_NAME_EVENT_PANEL = "MODULE_EVENT_PANEL"; + /** + * 事件面板路径 + */ + public static final String PATH_EVENT_PANEL = "/event/panel"; /** * V2X 场景广播 Action @@ -25,7 +33,7 @@ public class V2XConst { public static final String BROADCAST_SCENE_EXTRA_KEY = "V2XMessageEntity"; public static final String BROADCAST_SCENE_ACTION = "com.v2x.scene_local_broadcast"; - + public static final String SEEK_HELP_TIME = "seek_help_time"; public static final String V2X_ACC_ON_TIME_STR = "v2x_acc_on_time_str"; public static final String V2X_ACC_OFF_TIME_STR = "v2x_acc_off_time_str"; public static final String V2X_STRATEGY_PUSH = "v2x_strategy_push"; diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XModuleProvider.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XModuleProvider.java index 40ef86a7ae..162f5d6713 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XModuleProvider.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XModuleProvider.java @@ -24,7 +24,6 @@ import com.mogo.module.common.entity.MarkerShowEntity; import com.mogo.module.common.entity.V2XMessageEntity; import com.mogo.module.v2x.entity.net.V2XSeekHelpRes; import com.mogo.module.v2x.entity.net.V2XStrategyPushRes; -import com.mogo.module.v2x.fragment.EventPanelFragment; import com.mogo.module.v2x.network.V2XRefreshCallback; import com.mogo.module.v2x.receiver.SceneBroadcastReceiver; import com.mogo.module.v2x.scenario.impl.V2XScenarioManager; @@ -65,7 +64,7 @@ public class V2XModuleProvider implements @Override public Fragment createFragment(Context context, Bundle data) { - return EventPanelFragment.Companion.getInstance(); + return null; } @Override @@ -91,7 +90,7 @@ public class V2XModuleProvider implements @Override public int getType() { - return ModuleType.TYPE_CARD_FRAGMENT; + return ModuleType.TYPE_SERVICE; } @Override @@ -121,7 +120,7 @@ public class V2XModuleProvider implements @Override public void init(Context context) { - Logger.e(MODULE_NAME, "V2X模块初始化。。。。"); + Logger.e(MODULE_NAME, "V2X 模块初始化。。。。"); mContext = context; V2XUtils.init(context); diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/ScenarioHistoryAdapter.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/ScenarioHistoryAdapter.java index 09119e6e51..fe62859808 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/ScenarioHistoryAdapter.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/ScenarioHistoryAdapter.java @@ -37,24 +37,8 @@ public class ScenarioHistoryAdapter extends RecyclerView.Adapter { public ScenarioHistoryRoadEventVH(@NonNull ViewGroup viewGroup) { super(LayoutInflater.from(viewGroup.getContext()) - .inflate(R.layout.item_v2x_event_detail, viewGroup, false)); + .inflate(R.layout.module_v2x_event_share_item, viewGroup, false)); } @Override diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/ScenarioHistoryFragment.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/ScenarioHistoryFragment.java index a8d22597a6..3887272da7 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/ScenarioHistoryFragment.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/ScenarioHistoryFragment.java @@ -43,8 +43,6 @@ public class ScenarioHistoryFragment mRecyclerView = (RecyclerView) findViewById(R.id.recyclerView); mScenarioHistoryAdapter = new ScenarioHistoryAdapter(mV2XHistoryScenarioData); mRecyclerView.setAdapter(mScenarioHistoryAdapter); - // 设置切换样式 - new PagerSnapHelper().attachToRecyclerView(mRecyclerView); // 配置列表朝向 LinearLayoutManager layoutManager = new LinearLayoutManager(getActivity(), LinearLayoutManager.VERTICAL, false); mRecyclerView.setLayoutManager(layoutManager); diff --git a/modules/mogo-module-v2x/src/main/res/layout/module_event_panel_fragment_scenario_history.xml b/modules/mogo-module-v2x/src/main/res/layout/module_event_panel_fragment_scenario_history.xml index e6d6e4c4ad..b8fab665b7 100644 --- a/modules/mogo-module-v2x/src/main/res/layout/module_event_panel_fragment_scenario_history.xml +++ b/modules/mogo-module-v2x/src/main/res/layout/module_event_panel_fragment_scenario_history.xml @@ -1,14 +1,8 @@ - - - - - \ No newline at end of file + android:background="#FFF" + tools:listitem="@layout/module_v2x_event_share_item" />