From 6d116750c69ecf438f30b028f73a26ee76244599 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Thu, 6 Aug 2020 18:45:06 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=9F=E4=B8=80=E5=91=BD=E5=90=8D=E6=A0=BC?= =?UTF-8?q?=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ....java => V2XEventPanelModuleProvider.java} | 6 +-- ...agerAdapter.kt => V2XEventPagerAdapter.kt} | 4 +- ...er.java => V2XScenarioHistoryAdapter.java} | 46 +++++++++---------- .../v2x/adapter/V2XShareEventAdapter.java | 4 +- ...> V2XScenarioHistoryFatigueDrivingVH.java} | 4 +- ...a => V2XScenarioHistoryIllegalParkVH.java} | 4 +- ...=> V2XScenarioHistoryOtherSeekHelpVH.java} | 4 +- ...ava => V2XScenarioHistoryPushEventVH.java} | 4 +- ...ava => V2XScenarioHistoryRoadEventVH.java} | 4 +- ...elFragment.kt => V2XEventPanelFragment.kt} | 16 +++---- ...t.java => V2XScenarioHistoryFragment.java} | 16 +++---- .../v2x/presenter/EventPanelPresenter.kt | 4 +- .../presenter/ScenarioHistoryPresenter.java | 6 +-- ..._v2x_event_panel_fragment_event_panel.xml} | 0 ...event_panel_fragment_scenario_history.xml} | 0 15 files changed, 61 insertions(+), 61 deletions(-) rename modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/{EventPanelModuleProvider.java => V2XEventPanelModuleProvider.java} (92%) rename modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/{EventPagerAdapter.kt => V2XEventPagerAdapter.kt} (78%) rename modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/{ScenarioHistoryAdapter.java => V2XScenarioHistoryAdapter.java} (51%) rename modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/{ScenarioHistoryFatigueDrivingVH.java => V2XScenarioHistoryFatigueDrivingVH.java} (75%) rename modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/{ScenarioHistoryIllegalParkVH.java => V2XScenarioHistoryIllegalParkVH.java} (76%) rename modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/{ScenarioHistoryOtherSeekHelpVH.java => V2XScenarioHistoryOtherSeekHelpVH.java} (75%) rename modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/{ScenarioHistoryPushEventVH.java => V2XScenarioHistoryPushEventVH.java} (77%) rename modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/{ScenarioHistoryRoadEventVH.java => V2XScenarioHistoryRoadEventVH.java} (76%) rename modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/{EventPanelFragment.kt => V2XEventPanelFragment.kt} (90%) rename modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/{ScenarioHistoryFragment.java => V2XScenarioHistoryFragment.java} (85%) rename modules/mogo-module-v2x/src/main/res/layout/{module_event_panel_fragment_event_panel.xml => module_v2x_event_panel_fragment_event_panel.xml} (100%) rename modules/mogo-module-v2x/src/main/res/layout/{module_event_panel_fragment_scenario_history.xml => module_v2x_event_panel_fragment_scenario_history.xml} (100%) 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/V2XEventPanelModuleProvider.java similarity index 92% rename from modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/EventPanelModuleProvider.java rename to modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XEventPanelModuleProvider.java index 0d8b3a9d36..4b101c27e5 100644 --- 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/V2XEventPanelModuleProvider.java @@ -12,7 +12,7 @@ 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.module.v2x.fragment.V2XEventPanelFragment; import com.mogo.service.module.IMogoModuleLifecycle; import com.mogo.service.module.IMogoModuleProvider; import com.mogo.service.module.ModuleType; @@ -28,13 +28,13 @@ import static com.mogo.module.v2x.V2XConst.MODULE_NAME; * version: 2.0 */ @Route(path = V2XConst.PATH_EVENT_PANEL) -public class EventPanelModuleProvider implements +public class V2XEventPanelModuleProvider implements IMogoModuleProvider { private final String TAG = "EventPanelModuleProvider"; @Override public Fragment createFragment(Context context, Bundle data) { - return EventPanelFragment.Companion.getInstance(); + return V2XEventPanelFragment.Companion.getInstance(); } @Override diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/EventPagerAdapter.kt b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/V2XEventPagerAdapter.kt similarity index 78% rename from modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/EventPagerAdapter.kt rename to modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/V2XEventPagerAdapter.kt index 994b257e4a..716ce9734b 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/EventPagerAdapter.kt +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/V2XEventPagerAdapter.kt @@ -8,8 +8,8 @@ import androidx.viewpager2.adapter.FragmentStateAdapter * * @author tongchenfei */ -class EventPagerAdapter(fragment: Fragment, - private val fragments: Array) : +class V2XEventPagerAdapter(fragment: Fragment, + private val fragments: Array) : FragmentStateAdapter(fragment) { /** 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/V2XScenarioHistoryAdapter.java similarity index 51% rename from modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/ScenarioHistoryAdapter.java rename to modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/V2XScenarioHistoryAdapter.java index 7f14e357b2..f94e777384 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/V2XScenarioHistoryAdapter.java @@ -7,22 +7,22 @@ import androidx.recyclerview.widget.RecyclerView; import com.mogo.module.common.entity.V2XHistoryScenarioData; import com.mogo.module.common.entity.V2XMessageEntity; -import com.mogo.module.v2x.adapter.holder.ScenarioHistoryFatigueDrivingVH; -import com.mogo.module.v2x.adapter.holder.ScenarioHistoryIllegalParkVH; -import com.mogo.module.v2x.adapter.holder.ScenarioHistoryOtherSeekHelpVH; -import com.mogo.module.v2x.adapter.holder.ScenarioHistoryPushEventVH; -import com.mogo.module.v2x.adapter.holder.ScenarioHistoryRoadEventVH; +import com.mogo.module.v2x.adapter.holder.V2XScenarioHistoryFatigueDrivingVH; +import com.mogo.module.v2x.adapter.holder.V2XScenarioHistoryIllegalParkVH; +import com.mogo.module.v2x.adapter.holder.V2XScenarioHistoryOtherSeekHelpVH; +import com.mogo.module.v2x.adapter.holder.V2XScenarioHistoryPushEventVH; +import com.mogo.module.v2x.adapter.holder.V2XScenarioHistoryRoadEventVH; import java.util.ArrayList; /** * @author donghongyu */ -public class ScenarioHistoryAdapter extends RecyclerView.Adapter { +public class V2XScenarioHistoryAdapter extends RecyclerView.Adapter { private ArrayList mV2XHistoryScenarioData; - public ScenarioHistoryAdapter(ArrayList v2XHistoryScenarioData) { + public V2XScenarioHistoryAdapter(ArrayList v2XHistoryScenarioData) { if (v2XHistoryScenarioData != null) { this.mV2XHistoryScenarioData = v2XHistoryScenarioData; } @@ -35,26 +35,26 @@ public class ScenarioHistoryAdapter extends RecyclerView.Adapter { - EventPanelFragment.Companion.getInstance().hidePanel(); + V2XEventPanelFragment.Companion.getInstance().hidePanel(); mApis.getShareManager().showShareDialog(); }); } diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/ScenarioHistoryFatigueDrivingVH.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XScenarioHistoryFatigueDrivingVH.java similarity index 75% rename from modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/ScenarioHistoryFatigueDrivingVH.java rename to modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XScenarioHistoryFatigueDrivingVH.java index e88d749cd7..aed740257c 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/ScenarioHistoryFatigueDrivingVH.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XScenarioHistoryFatigueDrivingVH.java @@ -11,8 +11,8 @@ import com.mogo.module.v2x.R; /** * @author donghongyu */ -public class ScenarioHistoryFatigueDrivingVH extends V2XBaseViewHolder { - public ScenarioHistoryFatigueDrivingVH(@NonNull ViewGroup viewGroup) { +public class V2XScenarioHistoryFatigueDrivingVH extends V2XBaseViewHolder { + public V2XScenarioHistoryFatigueDrivingVH(@NonNull ViewGroup viewGroup) { super(LayoutInflater.from(viewGroup.getContext()) .inflate(R.layout.item_v2x_fatigue_driving, viewGroup, false)); } diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/ScenarioHistoryIllegalParkVH.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XScenarioHistoryIllegalParkVH.java similarity index 76% rename from modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/ScenarioHistoryIllegalParkVH.java rename to modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XScenarioHistoryIllegalParkVH.java index 01623ab3f8..22095ad319 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/ScenarioHistoryIllegalParkVH.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XScenarioHistoryIllegalParkVH.java @@ -11,8 +11,8 @@ import com.mogo.module.v2x.R; /** * @author donghongyu */ -public class ScenarioHistoryIllegalParkVH extends V2XBaseViewHolder { - public ScenarioHistoryIllegalParkVH(@NonNull ViewGroup viewGroup) { +public class V2XScenarioHistoryIllegalParkVH extends V2XBaseViewHolder { + public V2XScenarioHistoryIllegalParkVH(@NonNull ViewGroup viewGroup) { super(LayoutInflater.from(viewGroup.getContext()) .inflate(R.layout.item_v2x_illegal_parking, viewGroup, false)); } diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/ScenarioHistoryOtherSeekHelpVH.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XScenarioHistoryOtherSeekHelpVH.java similarity index 75% rename from modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/ScenarioHistoryOtherSeekHelpVH.java rename to modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XScenarioHistoryOtherSeekHelpVH.java index 7b4ecc046f..21638e8a2e 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/ScenarioHistoryOtherSeekHelpVH.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XScenarioHistoryOtherSeekHelpVH.java @@ -11,8 +11,8 @@ import com.mogo.module.v2x.R; /** * @author donghongyu */ -public class ScenarioHistoryOtherSeekHelpVH extends V2XBaseViewHolder { - public ScenarioHistoryOtherSeekHelpVH(@NonNull ViewGroup viewGroup) { +public class V2XScenarioHistoryOtherSeekHelpVH extends V2XBaseViewHolder { + public V2XScenarioHistoryOtherSeekHelpVH(@NonNull ViewGroup viewGroup) { super(LayoutInflater.from(viewGroup.getContext()) .inflate(R.layout.item_v2x_fault_help, viewGroup, false)); } diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/ScenarioHistoryPushEventVH.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XScenarioHistoryPushEventVH.java similarity index 77% rename from modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/ScenarioHistoryPushEventVH.java rename to modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XScenarioHistoryPushEventVH.java index b88e443088..897764473b 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/ScenarioHistoryPushEventVH.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XScenarioHistoryPushEventVH.java @@ -11,8 +11,8 @@ import com.mogo.module.v2x.R; /** * @author donghongyu */ -public class ScenarioHistoryPushEventVH extends V2XBaseViewHolder { - public ScenarioHistoryPushEventVH(@NonNull ViewGroup viewGroup) { +public class V2XScenarioHistoryPushEventVH extends V2XBaseViewHolder { + public V2XScenarioHistoryPushEventVH(@NonNull ViewGroup viewGroup) { super(LayoutInflater.from(viewGroup.getContext()) .inflate(R.layout.item_v2x_push_event_detail, viewGroup, false)); } diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/ScenarioHistoryRoadEventVH.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XScenarioHistoryRoadEventVH.java similarity index 76% rename from modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/ScenarioHistoryRoadEventVH.java rename to modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XScenarioHistoryRoadEventVH.java index 2392692fbc..d6dd0e022c 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/ScenarioHistoryRoadEventVH.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XScenarioHistoryRoadEventVH.java @@ -11,8 +11,8 @@ import com.mogo.module.v2x.R; /** * @author donghongyu */ -public class ScenarioHistoryRoadEventVH extends V2XBaseViewHolder { - public ScenarioHistoryRoadEventVH(@NonNull ViewGroup viewGroup) { +public class V2XScenarioHistoryRoadEventVH extends V2XBaseViewHolder { + public V2XScenarioHistoryRoadEventVH(@NonNull ViewGroup viewGroup) { super(LayoutInflater.from(viewGroup.getContext()) .inflate(R.layout.item_v2x_event_detail, viewGroup, false)); } diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/EventPanelFragment.kt b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XEventPanelFragment.kt similarity index 90% rename from modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/EventPanelFragment.kt rename to modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XEventPanelFragment.kt index 11a55d3eb7..5654dd65f0 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/EventPanelFragment.kt +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XEventPanelFragment.kt @@ -14,10 +14,10 @@ import com.mogo.commons.mvp.MvpFragment import com.mogo.module.v2x.R import com.mogo.module.v2x.V2XConst.MODULE_NAME import com.mogo.module.v2x.V2XServiceManager -import com.mogo.module.v2x.adapter.EventPagerAdapter +import com.mogo.module.v2x.adapter.V2XEventPagerAdapter import com.mogo.module.v2x.presenter.EventPanelPresenter import com.mogo.utils.logger.Logger -import kotlinx.android.synthetic.main.module_event_panel_fragment_event_panel.* +import kotlinx.android.synthetic.main.module_v2x_event_panel_fragment_event_panel.* /** @@ -25,7 +25,7 @@ import kotlinx.android.synthetic.main.module_event_panel_fragment_event_panel.* * * @author tongchenfei */ -class EventPanelFragment : MvpFragment() { +class V2XEventPanelFragment : MvpFragment() { private val TAG = "EventPanelFragment" @@ -43,26 +43,26 @@ class EventPanelFragment : MvpFragment( private var selectPosition = 0 companion object { - private val fragment = EventPanelFragment() - fun getInstance(): EventPanelFragment { + private val fragment = V2XEventPanelFragment() + fun getInstance(): V2XEventPanelFragment { return fragment } } override fun getLayoutId(): Int { - return R.layout.module_event_panel_fragment_event_panel + return R.layout.module_v2x_event_panel_fragment_event_panel } override fun initViews() { Logger.d(MODULE_NAME, "EventPanelFragment init view===") fragments = arrayOf( - ScenarioHistoryFragment(), + V2XScenarioHistoryFragment(), SurroundingEventFragment(), V2XShareEventsFragment() ) //禁用预加载 vpEventPanel.offscreenPageLimit = ViewPager2.OFFSCREEN_PAGE_LIMIT_DEFAULT - vpEventPanel.adapter = EventPagerAdapter(this, fragments!!) + vpEventPanel.adapter = V2XEventPagerAdapter(this, fragments!!) //viewPager 页面切换监听 vpEventPanel.registerOnPageChangeCallback(changeCallback) 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/V2XScenarioHistoryFragment.java similarity index 85% rename from modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/ScenarioHistoryFragment.java rename to modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XScenarioHistoryFragment.java index 99d1a45e48..692625187a 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/V2XScenarioHistoryFragment.java @@ -11,7 +11,7 @@ import com.mogo.commons.mvp.MvpFragment; import com.mogo.module.common.entity.V2XHistoryScenarioData; import com.mogo.module.v2x.R; import com.mogo.module.v2x.V2XServiceManager; -import com.mogo.module.v2x.adapter.ScenarioHistoryAdapter; +import com.mogo.module.v2x.adapter.V2XScenarioHistoryAdapter; import com.mogo.module.v2x.manager.IMoGoV2XStatusChangedListener; import com.mogo.module.v2x.manager.V2XStatusDescriptor; import com.mogo.module.v2x.presenter.ScenarioHistoryPresenter; @@ -26,25 +26,25 @@ import java.util.List; * * @author donghongyu */ -public class ScenarioHistoryFragment - extends MvpFragment { +public class V2XScenarioHistoryFragment + extends MvpFragment { private String TAG = "ScenarioHistoryFragment"; private RecyclerView mRecyclerView; - private ScenarioHistoryAdapter mScenarioHistoryAdapter; + private V2XScenarioHistoryAdapter mV2XScenarioHistoryAdapter; private ArrayList mV2XHistoryScenarioData = new ArrayList<>(); @Override protected int getLayoutId() { - return R.layout.module_event_panel_fragment_scenario_history; + return R.layout.module_v2x_event_panel_fragment_scenario_history; } @Override protected void initViews() { Log.d(TAG, "initViews --------> "); mRecyclerView = (RecyclerView) findViewById(R.id.recyclerView); - mScenarioHistoryAdapter = new ScenarioHistoryAdapter(mV2XHistoryScenarioData); - mRecyclerView.setAdapter(mScenarioHistoryAdapter); + mV2XScenarioHistoryAdapter = new V2XScenarioHistoryAdapter(mV2XHistoryScenarioData); + mRecyclerView.setAdapter(mV2XScenarioHistoryAdapter); // 配置列表朝向 LinearLayoutManager layoutManager = new LinearLayoutManager(getActivity(), LinearLayoutManager.VERTICAL, false); mRecyclerView.setLayoutManager(layoutManager); @@ -84,7 +84,7 @@ public class ScenarioHistoryFragment Logger.d(TAG, "查询到历史消息：" + GsonUtil.jsonFromObject(v2XHistoryScenarioData)); mV2XHistoryScenarioData.clear(); mV2XHistoryScenarioData.addAll(v2XHistoryScenarioData); - mScenarioHistoryAdapter.notifyDataSetChanged(); + mV2XScenarioHistoryAdapter.notifyDataSetChanged(); } @Override diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/presenter/EventPanelPresenter.kt b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/presenter/EventPanelPresenter.kt index 9aaf3b2a38..4c19739b87 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/presenter/EventPanelPresenter.kt +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/presenter/EventPanelPresenter.kt @@ -1,11 +1,11 @@ package com.mogo.module.v2x.presenter import com.mogo.commons.mvp.Presenter -import com.mogo.module.v2x.fragment.EventPanelFragment +import com.mogo.module.v2x.fragment.V2XEventPanelFragment /** * 事件面板presenter * * @author tongchenfei */ -class EventPanelPresenter(view: EventPanelFragment) : Presenter(view) \ No newline at end of file +class EventPanelPresenter(view: V2XEventPanelFragment) : Presenter(view) \ No newline at end of file diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/presenter/ScenarioHistoryPresenter.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/presenter/ScenarioHistoryPresenter.java index 0f398717a2..d3379857c7 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/presenter/ScenarioHistoryPresenter.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/presenter/ScenarioHistoryPresenter.java @@ -3,7 +3,7 @@ package com.mogo.module.v2x.presenter; import com.mogo.commons.mvp.Presenter; import com.mogo.module.common.entity.V2XHistoryScenarioData; -import com.mogo.module.v2x.fragment.ScenarioHistoryFragment; +import com.mogo.module.v2x.fragment.V2XScenarioHistoryFragment; import com.mogo.module.v2x.utils.V2XSQLiteUtils; import java.util.List; @@ -11,9 +11,9 @@ import java.util.List; /** * @author donghongyu */ -public class ScenarioHistoryPresenter extends Presenter { +public class ScenarioHistoryPresenter extends Presenter { - public ScenarioHistoryPresenter(ScenarioHistoryFragment view) { + public ScenarioHistoryPresenter(V2XScenarioHistoryFragment view) { super(view); } diff --git a/modules/mogo-module-v2x/src/main/res/layout/module_event_panel_fragment_event_panel.xml b/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_panel_fragment_event_panel.xml similarity index 100% rename from modules/mogo-module-v2x/src/main/res/layout/module_event_panel_fragment_event_panel.xml rename to modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_panel_fragment_event_panel.xml 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_v2x_event_panel_fragment_scenario_history.xml similarity index 100% rename from modules/mogo-module-v2x/src/main/res/layout/module_event_panel_fragment_scenario_history.xml rename to modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_panel_fragment_scenario_history.xml