From 3a63d049dce888f2a7aa74a36e22f08907bbcaf6 Mon Sep 17 00:00:00 2001 From: chenjuntao Date: Tue, 17 Sep 2019 11:01:57 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B0=86=E5=88=97=E8=A1=A8=E7=9A=84=20skeleton?= =?UTF-8?q?=20=E7=9B=B8=E5=85=B3=E4=BB=A3=E7=A0=81=E7=A7=BB=E5=8A=A8?= =?UTF-8?q?=E5=88=B0=E5=9F=BA=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gh/gamecenter/baselist/ListFragment.java | 37 ++++++++++++++----- .../category/CategoryDirectoryFragment.kt | 24 +----------- .../category/NewCategoryListFragment.kt | 20 +--------- .../history/HistoryGameListFragment.kt | 25 +------------ .../qa/entity/QuestionsDetailEntity.kt | 2 + .../detail/QuestionsDetailFragment.java | 28 -------------- .../gamecenter/subject/SubjectListFragment.kt | 25 +------------ .../com/gh/gamecenter/tag/TagsListFragment.kt | 20 +--------- 8 files changed, 35 insertions(+), 146 deletions(-) diff --git a/app/src/main/java/com/gh/gamecenter/baselist/ListFragment.java b/app/src/main/java/com/gh/gamecenter/baselist/ListFragment.java index 2a931cda6d..4e5c3466be 100644 --- a/app/src/main/java/com/gh/gamecenter/baselist/ListFragment.java +++ b/app/src/main/java/com/gh/gamecenter/baselist/ListFragment.java @@ -4,15 +4,6 @@ import android.os.Bundle; import android.view.View; import android.widget.LinearLayout; -import com.gh.common.view.VerticalItemDecoration; -import com.gh.gamecenter.R; -import com.gh.gamecenter.normal.NormalFragment; -import com.halo.assistant.HaloApp; - -import java.lang.reflect.ParameterizedType; -import java.lang.reflect.Type; -import java.util.List; - import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.lifecycle.Observer; @@ -21,6 +12,17 @@ import androidx.recyclerview.widget.DefaultItemAnimator; import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; + +import com.ethanhua.skeleton.SkeletonScreen; +import com.gh.common.view.VerticalItemDecoration; +import com.gh.gamecenter.R; +import com.gh.gamecenter.normal.NormalFragment; +import com.halo.assistant.HaloApp; + +import java.lang.reflect.ParameterizedType; +import java.lang.reflect.Type; +import java.util.List; + import butterknife.BindView; import io.reactivex.Observable; import io.reactivex.Single; @@ -50,6 +52,9 @@ public abstract class ListFragment { diff --git a/app/src/main/java/com/gh/gamecenter/category/NewCategoryListFragment.kt b/app/src/main/java/com/gh/gamecenter/category/NewCategoryListFragment.kt index 088ef1c561..184f177d3d 100644 --- a/app/src/main/java/com/gh/gamecenter/category/NewCategoryListFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/category/NewCategoryListFragment.kt @@ -6,7 +6,6 @@ import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import butterknife.BindView import com.ethanhua.skeleton.Skeleton -import com.ethanhua.skeleton.ViewSkeletonScreen import com.gh.common.constant.Constants import com.gh.common.exposure.ExposureListener import com.gh.common.util.EntranceUtils @@ -47,7 +46,6 @@ class NewCategoryListFragment : ListFragment(R.id.list_skeleton) - private lateinit var mSkeleton: ViewSkeletonScreen - private var mAdapter: HistoryGameListAdapter? = null override fun getLayoutId(): Int { @@ -36,27 +33,7 @@ open class HistoryGameListFragment : ListFragment implements TagsSelectFragment.OnModeratorPatchTagsCallback { - public static final String TAG = "ask.questionsdetail.QuestionsDetailFragment"; - public static final int QUESTIONS_DETAIL_ANSWER_REQUEST = 110; public static final int QUESTIONS_EDIT_REQUEST = 111; public static final int QUESTIONS_MODERATOR_HISTORY_REQUEST = 112; @@ -116,7 +113,6 @@ public class QuestionsDetailFragment private String mPath; private TimeElapsedHelper mElapsedHelper; - private SkeletonScreen mSkeletonScreen; public static QuestionsDetailFragment getInstance(String questionsId) { QuestionsDetailFragment fragment = new QuestionsDetailFragment(); @@ -282,30 +278,6 @@ public class QuestionsDetailFragment } } - @Override - public void onLoadDone() { - super.onLoadDone(); - mSkeletonScreen.hide(); - } - - @Override - public void onLoadError() { - super.onLoadError(); - mSkeletonScreen.hide(); - } - - @Override - public void onLoadRefresh() { - super.onLoadRefresh(); - mSkeletonScreen.show(); - } - - @Override - public void onLoadEmpty() { - super.onLoadEmpty(); - mSkeletonScreen.hide(); - } - @Override public Observable> provideDataObservable(int page) { return RetrofitManager.getInstance(getContext()).getApi() diff --git a/app/src/main/java/com/gh/gamecenter/subject/SubjectListFragment.kt b/app/src/main/java/com/gh/gamecenter/subject/SubjectListFragment.kt index 78d99c92c4..fc8ee9bc23 100644 --- a/app/src/main/java/com/gh/gamecenter/subject/SubjectListFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/subject/SubjectListFragment.kt @@ -5,7 +5,6 @@ import android.view.View import androidx.lifecycle.ViewModelProviders import androidx.recyclerview.widget.RecyclerView import com.ethanhua.skeleton.Skeleton -import com.ethanhua.skeleton.ViewSkeletonScreen import com.gh.common.exposure.ExposureListener import com.gh.common.util.EntranceUtils import com.gh.download.DownloadManager @@ -24,8 +23,6 @@ import org.greenrobot.eventbus.ThreadMode class SubjectListFragment : ListFragment(), OnTitleClickListener { - private lateinit var mSkeleton: ViewSkeletonScreen - private lateinit var mExposureListener: ExposureListener private var mAdapter: SubjectAdapter? = null @@ -57,7 +54,7 @@ class SubjectListFragment : ListFragment(), On override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) - mSkeleton = Skeleton + mSkeletonScreen = Skeleton .bind(mCachedView.findViewById(R.id.list_skeleton)) .shimmer(false) .load(R.layout.fragment_subject_skeleton).show() @@ -108,26 +105,6 @@ class SubjectListFragment : ListFragment(), On DownloadManager.getInstance(context).removeObserver(dataWatcher) } - override fun onLoadDone() { - super.onLoadDone() - mSkeleton.hide() - } - - override fun onLoadEmpty() { - super.onLoadEmpty() - mSkeleton.hide() - } - - override fun onLoadError() { - super.onLoadError() - mSkeleton.hide() - } - - override fun onRefresh() { - mSkeleton.show() - super.onRefresh() - } - // 下载被删除事件 @Subscribe(threadMode = ThreadMode.MAIN) fun onEventMainThread(status: EBDownloadStatus) { diff --git a/app/src/main/java/com/gh/gamecenter/tag/TagsListFragment.kt b/app/src/main/java/com/gh/gamecenter/tag/TagsListFragment.kt index 8ec59804d2..5e10718507 100644 --- a/app/src/main/java/com/gh/gamecenter/tag/TagsListFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/tag/TagsListFragment.kt @@ -6,7 +6,6 @@ import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import butterknife.BindView import com.ethanhua.skeleton.Skeleton -import com.ethanhua.skeleton.ViewSkeletonScreen import com.gh.common.util.observeNonNull import com.gh.common.util.viewModelProvider import com.gh.common.view.ConfigFilterView @@ -42,7 +41,6 @@ class TagsListFragment : ListFragment() { } } - private lateinit var mSkeleton: ViewSkeletonScreen private lateinit var mViewModel: TagsListViewModel override fun onCreate(savedInstanceState: Bundle?) { @@ -83,7 +81,7 @@ class TagsListFragment : ListFragment() { } }) - mSkeleton = Skeleton.bind(skeletonView).shimmer(false).load(R.layout.fragment_subject_skeleton).show() + mSkeletonScreen = Skeleton.bind(skeletonView).shimmer(false).load(R.layout.fragment_subject_skeleton).show() } override fun onResume() { @@ -122,21 +120,6 @@ class TagsListFragment : ListFragment() { } } - override fun onLoadDone() { - super.onLoadDone() - mSkeleton.hide() - } - - override fun onLoadEmpty() { - super.onLoadEmpty() - mSkeleton.hide() - } - - override fun onLoadError() { - super.onLoadError() - mSkeleton.hide() - } - override fun onLoadRefresh() { if (mReuseNoConn.visibility == View.VISIBLE && (tagsRecyclerView.adapter == null || tagsRecyclerView.adapter?.itemCount == 0)) { @@ -152,7 +135,6 @@ class TagsListFragment : ListFragment() { } override fun onRefresh() { - mSkeleton.show() mAdapter?.clearPositionAndPackageMap() super.onRefresh() }