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 b1c5716b73..99d1a45e48 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 @@ -15,7 +15,6 @@ import com.mogo.module.v2x.adapter.ScenarioHistoryAdapter; import com.mogo.module.v2x.manager.IMoGoV2XStatusChangedListener; import com.mogo.module.v2x.manager.V2XStatusDescriptor; import com.mogo.module.v2x.presenter.ScenarioHistoryPresenter; -import com.mogo.module.v2x.utils.V2XSQLiteUtils; import com.mogo.utils.logger.Logger; import com.mogo.utils.network.utils.GsonUtil; @@ -43,6 +42,19 @@ public class ScenarioHistoryFragment @Override protected void initViews() { Log.d(TAG, "initViews --------> "); + mRecyclerView = (RecyclerView) findViewById(R.id.recyclerView); + mScenarioHistoryAdapter = new ScenarioHistoryAdapter(mV2XHistoryScenarioData); + mRecyclerView.setAdapter(mScenarioHistoryAdapter); + // 配置列表朝向 + LinearLayoutManager layoutManager = new LinearLayoutManager(getActivity(), LinearLayoutManager.VERTICAL, false); + mRecyclerView.setLayoutManager(layoutManager); + initListener(); + } + + /** + * 初始化页面用到得监听 + */ + private void initListener() { V2XServiceManager.getMoGoV2XStatusManager() .registerStatusChangedListener( TAG, @@ -52,7 +64,7 @@ public class ScenarioHistoryFragment public void onStatusChanged(V2XStatusDescriptor descriptor, boolean isTrue) { Logger.d(TAG, descriptor + " initViews --------> " + isTrue); if (descriptor == V2XStatusDescriptor.EventPanelWindow_UI) { - onResume(); + mPresenter.loadHistory(); } } @@ -61,15 +73,14 @@ public class ScenarioHistoryFragment Logger.d(TAG, "init --------> "); } }); + } - mRecyclerView = (RecyclerView) findViewById(R.id.recyclerView); - mScenarioHistoryAdapter = new ScenarioHistoryAdapter(mV2XHistoryScenarioData); - mRecyclerView.setAdapter(mScenarioHistoryAdapter); - // 配置列表朝向 - LinearLayoutManager layoutManager = new LinearLayoutManager(getActivity(), LinearLayoutManager.VERTICAL, false); - mRecyclerView.setLayoutManager(layoutManager); - - List v2XHistoryScenarioData = V2XSQLiteUtils.getScenarioHistoryData(); + /** + * 列表加载数据 + * + * @param v2XHistoryScenarioData 最新数据 + */ + public void loadHistory(List v2XHistoryScenarioData) { Logger.d(TAG, "查询到历史消息:" + GsonUtil.jsonFromObject(v2XHistoryScenarioData)); mV2XHistoryScenarioData.clear(); mV2XHistoryScenarioData.addAll(v2XHistoryScenarioData); @@ -79,11 +90,7 @@ public class ScenarioHistoryFragment @Override public void onResume() { super.onResume(); - List v2XHistoryScenarioData = V2XSQLiteUtils.getScenarioHistoryData(); - Logger.d(TAG, "查询到历史消息:" + v2XHistoryScenarioData); - mV2XHistoryScenarioData.clear(); - mV2XHistoryScenarioData.addAll(v2XHistoryScenarioData); - mScenarioHistoryAdapter.notifyDataSetChanged(); + mPresenter.loadHistory(); } @NonNull diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/listener/AdapterCallback.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/listener/AdapterCallback.java index ac6f96ed01..ced68b8aae 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/listener/AdapterCallback.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/listener/AdapterCallback.java @@ -1,6 +1,9 @@ package com.mogo.module.v2x.listener; +/** + * @author liujing + */ public interface AdapterCallback { //分享列表加载更多 - public void loadMoreShareEventList(); + void loadMoreShareEventList(); } diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/listener/CarStatusListener.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/listener/CarStatusListener.java index f147a94a7c..ca613c8c6a 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/listener/CarStatusListener.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/listener/CarStatusListener.java @@ -3,7 +3,7 @@ package com.mogo.module.v2x.listener; import com.mogo.map.location.MogoLocation; /** - * author : donghongyu + * @author : donghongyu * e-mail : 1358506549@qq.com * date : 2020/4/13 11:02 AM * desc : 车辆速度状态回调 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 6983b65b86..0f398717a2 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 @@ -2,7 +2,11 @@ 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.utils.V2XSQLiteUtils; + +import java.util.List; /** * @author donghongyu @@ -13,4 +17,8 @@ public class ScenarioHistoryPresenter extends Presenter super(view); } + public void loadHistory() { + List v2XHistoryScenarioData = V2XSQLiteUtils.getScenarioHistoryData(); + mView.loadHistory(v2XHistoryScenarioData); + } }