From 6f0c69fc3c61a4d5ea5a04741bc93599eb8ba8f8 Mon Sep 17 00:00:00 2001 From: liujing Date: Mon, 3 Aug 2020 11:06:58 +0800 Subject: [PATCH] =?UTF-8?q?rename,=E5=8A=A8=E7=94=BB=E9=9A=90=E8=97=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...Adapter.java => V2XShareEventAdapter.java} | 12 +++++----- .../holder/ScenarioHistoryIllegalParkVH.java | 2 +- .../module/v2x/fragment/EventPanelFragment.kt | 2 +- .../module/v2x/fragment/MyShareFragment.kt | 2 +- ...gment.java => V2XShareEventsFragment.java} | 22 +++++++++---------- .../v2x/presenter/ShareEventsPresenter.java | 6 ++--- ...nManager.java => V2XAnimationManager.java} | 6 ++++- ..._event_panel_fragment_scenario_history.xml | 2 +- ...=> module_v2x_event_share_description.xml} | 0 ...y.xml => module_v2x_event_share_empty.xml} | 0 ...em.xml => module_v2x_event_share_item.xml} | 0 ...=> module_v2x_event_share_load_status.xml} | 0 ...=> module_v2x_event_share_recylerview.xml} | 2 +- 13 files changed, 30 insertions(+), 26 deletions(-) rename modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/{ShareEventAdapter.java => V2XShareEventAdapter.java} (96%) rename modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/{ShareEventsFragment.java => V2XShareEventsFragment.java} (92%) rename modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/utils/animation/{AnimationManager.java => V2XAnimationManager.java} (85%) rename modules/mogo-module-v2x/src/main/res/layout/{module_event_panel_share_description.xml => module_v2x_event_share_description.xml} (100%) rename modules/mogo-module-v2x/src/main/res/layout/{module_event_panel_share_empty.xml => module_v2x_event_share_empty.xml} (100%) rename modules/mogo-module-v2x/src/main/res/layout/{module_event_panel_share_item.xml => module_v2x_event_share_item.xml} (100%) rename modules/mogo-module-v2x/src/main/res/layout/{module_event_panel_share_load_status.xml => module_v2x_event_share_load_status.xml} (100%) rename modules/mogo-module-v2x/src/main/res/layout/{module_event_panel_share_recylerview.xml => module_v2x_event_share_recylerview.xml} (93%) diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/ShareEventAdapter.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/V2XShareEventAdapter.java similarity index 96% rename from modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/ShareEventAdapter.java rename to modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/V2XShareEventAdapter.java index 9057df5af1..cfbf81e933 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/ShareEventAdapter.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/V2XShareEventAdapter.java @@ -25,14 +25,14 @@ import com.mogo.utils.DateTimeUtils; import java.util.ArrayList; -public class ShareEventAdapter extends RecyclerView.Adapter { +public class V2XShareEventAdapter extends RecyclerView.Adapter { private Context context; private ArrayList dataArrayList; private final LayoutInflater shareLayoutInflater; private IMogoServiceApis mApis; private AdapterCallback callback; - public ShareEventAdapter(Context context, ArrayList dataArrayList, AdapterCallback callback) { + public V2XShareEventAdapter(Context context, ArrayList dataArrayList, AdapterCallback callback) { this.context = context; this.dataArrayList = dataArrayList; this.callback = callback; @@ -45,22 +45,22 @@ public class ShareEventAdapter extends RecyclerView.Adapter { public ScenarioHistoryIllegalParkVH(@NonNull ViewGroup viewGroup) { super(LayoutInflater.from(viewGroup.getContext()) - .inflate(R.layout.module_event_panel_share_item, 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/EventPanelFragment.kt b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/EventPanelFragment.kt index ef399efbd7..41534fccf3 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/EventPanelFragment.kt @@ -56,7 +56,7 @@ class EventPanelFragment : MvpFragment( fragments = arrayOf( ScenarioHistoryFragment(), SurroundingEventFragment(), - ShareEventsFragment() + V2XShareEventsFragment() ) //禁用预加载 vpEventPanel.offscreenPageLimit = ViewPager2.OFFSCREEN_PAGE_LIMIT_DEFAULT diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/MyShareFragment.kt b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/MyShareFragment.kt index c6f50e62fd..da29f01194 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/MyShareFragment.kt +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/MyShareFragment.kt @@ -10,7 +10,7 @@ class MyShareFragment : MvpFragment() { * * @return */ - override fun getLayoutId(): Int = R.layout.module_event_panel_share_item + override fun getLayoutId(): Int = R.layout.module_v2x_event_share_item /** * 初始化控件，必须在初始化完成之后才可以实例化presenter，避免 diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/ShareEventsFragment.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XShareEventsFragment.java similarity index 92% rename from modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/ShareEventsFragment.java rename to modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XShareEventsFragment.java index 1f9c11dcd8..238bb841a2 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/ShareEventsFragment.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XShareEventsFragment.java @@ -16,7 +16,7 @@ import com.alibaba.android.arouter.launcher.ARouter; import com.mogo.commons.mvp.MvpFragment; import com.mogo.commons.network.SubscribeImpl; import com.mogo.module.v2x.R; -import com.mogo.module.v2x.adapter.ShareEventAdapter; +import com.mogo.module.v2x.adapter.V2XShareEventAdapter; import com.mogo.module.v2x.entity.panel.ShareEventDescription; import com.mogo.module.v2x.entity.panel.ShareEventItem; import com.mogo.module.v2x.entity.panel.ShareEventItemEnum; @@ -26,7 +26,7 @@ import com.mogo.module.v2x.network.EventApiService; import com.mogo.module.v2x.network.HttpConstant; import com.mogo.module.v2x.network.ShareEventParameter; import com.mogo.module.v2x.presenter.ShareEventsPresenter; -import com.mogo.module.v2x.utils.animation.AnimationManager; +import com.mogo.module.v2x.utils.animation.V2XAnimationManager; import com.mogo.module.v2x.utils.animation.AnimationResources; import com.mogo.service.MogoServicePaths; import com.mogo.service.network.IMogoNetwork; @@ -40,11 +40,11 @@ import java.util.concurrent.CountDownLatch; import io.reactivex.android.schedulers.AndroidSchedulers; import io.reactivex.schedulers.Schedulers; -public class ShareEventsFragment extends MvpFragment implements AdapterCallback { +public class V2XShareEventsFragment extends MvpFragment implements AdapterCallback { private static final String TAG = "ShareEventsFragment"; private RecyclerView recyclerView; - private ShareEventAdapter adapter; + private V2XShareEventAdapter adapter; private ArrayList dataArrayList = new ArrayList(); private EventApiService eventApiService; private int pageNum = 1; @@ -53,18 +53,18 @@ public class ShareEventsFragment extends MvpFragment implements AdapterCallback //动画 private ImageView loadingImageView; - private AnimationManager animationHandler; + private V2XAnimationManager v2XAnimationManager; @Override protected int getLayoutId() { - return R.layout.module_event_panel_share_recylerview; + return R.layout.module_v2x_event_share_recylerview; } @Override protected void initViews() { network = (IMogoNetwork) ARouter.getInstance().build(MogoServicePaths.PATH_SERVICES_NETWORK).navigation(getContext()); eventApiService = network.create(EventApiService.class, HttpConstant.Companion.getNetHost()); - animationHandler = new AnimationManager(); + v2XAnimationManager = new V2XAnimationManager(); initRecyclerView(); initData(); } @@ -78,7 +78,7 @@ public class ShareEventsFragment extends MvpFragment implements AdapterCallback private void initRecyclerView() { recyclerView = mRootView.findViewById(R.id.road_case_share_list); - adapter = new ShareEventAdapter(getActivity(), dataArrayList, this); + adapter = new V2XShareEventAdapter(getActivity(), dataArrayList, this); recyclerView.setAdapter(adapter); LinearLayoutManager linearLayoutManager = new LinearLayoutManager(getActivity(), LinearLayoutManager.VERTICAL, false); @@ -87,7 +87,7 @@ public class ShareEventsFragment extends MvpFragment implements AdapterCallback private void initData() { loadingImageView = mRootView.findViewById(R.id.loading_imageview); - animationHandler.animationWithTarget(loadingImageView, AnimationResources.loadingRes,300); + v2XAnimationManager.animationWithTarget(loadingImageView, AnimationResources.loadingRes,100); getShareEventDescription(); getShareEventList(pageNum, 10); } @@ -131,7 +131,7 @@ public class ShareEventsFragment extends MvpFragment implements AdapterCallback ShareEventParameter parameter = new ShareEventParameter("ZD802B1932L00622", page, 10); HashMap parameters = new HashMap<>(); parameters.put("data", GsonUtil.jsonFromObject(parameter)); - + v2XAnimationManager.start(); eventApiService.getShareEventList(parameters) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) @@ -174,7 +174,7 @@ public class ShareEventsFragment extends MvpFragment implements AdapterCallback } adapter.notifyDataSetChanged(); countDownLatch.countDown(); - animationHandler.stop(); + v2XAnimationManager.stop(); } @Override diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/presenter/ShareEventsPresenter.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/presenter/ShareEventsPresenter.java index 2516a98f9b..c1e6c48b71 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/presenter/ShareEventsPresenter.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/presenter/ShareEventsPresenter.java @@ -2,10 +2,10 @@ package com.mogo.module.v2x.presenter; import com.mogo.commons.mvp.IView; import com.mogo.commons.mvp.Presenter; -import com.mogo.module.v2x.fragment.ShareEventsFragment; +import com.mogo.module.v2x.fragment.V2XShareEventsFragment; -public class ShareEventsPresenter extends Presenter { +public class ShareEventsPresenter extends Presenter { public ShareEventsPresenter(IView view) { - super((ShareEventsFragment) view); + super((V2XShareEventsFragment) view); } } diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/utils/animation/AnimationManager.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/utils/animation/V2XAnimationManager.java similarity index 85% rename from modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/utils/animation/AnimationManager.java rename to modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/utils/animation/V2XAnimationManager.java index bec61ececb..0a4d3e69d0 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/utils/animation/AnimationManager.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/utils/animation/V2XAnimationManager.java @@ -1,12 +1,13 @@ package com.mogo.module.v2x.utils.animation; import android.graphics.drawable.AnimationDrawable; +import android.view.View; import android.widget.ImageView; import com.mogo.utils.ThreadPoolService; import com.mogo.utils.UiThreadHandler; -public class AnimationManager implements Animation { +public class V2XAnimationManager implements Animation { private ImageView targetImageView; private Animation delegate; @@ -22,6 +23,7 @@ public class AnimationManager implements Animation { UiThreadHandler.post(() -> { targetImageView.setBackground(drawable); delegate = new DelegateDrawable(drawable); + start(); }); }); @@ -30,6 +32,7 @@ public class AnimationManager implements Animation { @Override synchronized public void start() { if (delegate != null && !isStarted) { + targetImageView.setVisibility(View.VISIBLE); isStarted = true; delegate.start(); } @@ -40,6 +43,7 @@ public class AnimationManager implements Animation { if (delegate != null && isStarted) { isStarted = false; delegate.stop(); + targetImageView.setVisibility(View.INVISIBLE); } } 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 4e449b632e..e6d6e4c4ad 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 @@ -9,6 +9,6 @@ android:id="@+id/recyclerView" android:layout_width="match_parent" android:layout_height="match_parent" - tools:listitem="@layout/module_event_panel_share_item" /> + tools:listitem="@layout/module_v2x_event_share_item" /> \ No newline at end of file diff --git a/modules/mogo-module-v2x/src/main/res/layout/module_event_panel_share_description.xml b/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_description.xml similarity index 100% rename from modules/mogo-module-v2x/src/main/res/layout/module_event_panel_share_description.xml rename to modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_description.xml diff --git a/modules/mogo-module-v2x/src/main/res/layout/module_event_panel_share_empty.xml b/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_empty.xml similarity index 100% rename from modules/mogo-module-v2x/src/main/res/layout/module_event_panel_share_empty.xml rename to modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_empty.xml diff --git a/modules/mogo-module-v2x/src/main/res/layout/module_event_panel_share_item.xml b/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_item.xml similarity index 100% rename from modules/mogo-module-v2x/src/main/res/layout/module_event_panel_share_item.xml rename to modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_item.xml diff --git a/modules/mogo-module-v2x/src/main/res/layout/module_event_panel_share_load_status.xml b/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_load_status.xml similarity index 100% rename from modules/mogo-module-v2x/src/main/res/layout/module_event_panel_share_load_status.xml rename to modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_load_status.xml diff --git a/modules/mogo-module-v2x/src/main/res/layout/module_event_panel_share_recylerview.xml b/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_recylerview.xml similarity index 93% rename from modules/mogo-module-v2x/src/main/res/layout/module_event_panel_share_recylerview.xml rename to modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_recylerview.xml index d005968276..ee0f345718 100644 --- a/modules/mogo-module-v2x/src/main/res/layout/module_event_panel_share_recylerview.xml +++ b/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_recylerview.xml @@ -13,7 +13,7 @@ android:overScrollMode="never" android:background="#000000" tools:itemCount="1" - tools:listitem="@layout/module_event_panel_share_description" + tools:listitem="@layout/module_v2x_event_share_description" app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" >