From 2c2ab02398e36234c1222b53105b0de1456dd492 Mon Sep 17 00:00:00 2001
From: kehaoyuan <kehaoyuan@ghzhushou.com>
Date: Tue, 26 May 2020 14:15:36 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=89=E7=8E=AF=E5=8A=A9=E6=89=8BV4.0.1-?=
 =?UTF-8?q?=E4=B8=8B=E6=8B=89=E5=88=B7=E6=96=B0loading=E4=BC=98=E5=8C=96(2?=
 =?UTF-8?q?0200525=E6=B5=8B=E8=AF=95)=20https://gitlab.ghzs.com/pm/halo-ap?=
 =?UTF-8?q?p-issues/-/issues/850?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/gh/gamecenter/baselist/ListAdapter.java |  5 ++++-
 .../gamecenter/category/NewCategoryListFragment.kt   |  9 ---------
 .../com/gh/gamecenter/message/MessageFragment.java   |  9 +++------
 app/src/main/res/layout/fragment_tags.xml            | 12 ++++++------
 4 files changed, 13 insertions(+), 22 deletions(-)

diff --git a/app/src/main/java/com/gh/gamecenter/baselist/ListAdapter.java b/app/src/main/java/com/gh/gamecenter/baselist/ListAdapter.java
index 4bbe6c2d78..778225c3e8 100644
--- a/app/src/main/java/com/gh/gamecenter/baselist/ListAdapter.java
+++ b/app/src/main/java/com/gh/gamecenter/baselist/ListAdapter.java
@@ -6,6 +6,7 @@ import android.os.AsyncTask;
 import androidx.recyclerview.widget.DiffUtil;
 
 import com.lightgame.adapter.BaseRecyclerAdapter;
+import com.lightgame.utils.Utils;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -102,6 +103,8 @@ public abstract class ListAdapter<DataType> extends BaseRecyclerAdapter {
     }
 
     public void loadChange(LoadStatus status) {
+
+        Utils.log("=====>>>" + status.name());
         switch (status) {
             case INIT_OVER:
             case LIST_OVER:
@@ -128,7 +131,7 @@ public abstract class ListAdapter<DataType> extends BaseRecyclerAdapter {
                 if (mEntityList != null) mEntityList.clear();
                 mIsNetworkError = false;
                 mIsOver = false;
-                mIsLoading = false;
+                mIsLoading = true;
                 notifyDataSetChanged();
                 return;
         }
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 184f177d3d..5def9c049d 100644
--- a/app/src/main/java/com/gh/gamecenter/category/NewCategoryListFragment.kt
+++ b/app/src/main/java/com/gh/gamecenter/category/NewCategoryListFragment.kt
@@ -135,15 +135,6 @@ class NewCategoryListFragment : ListFragment<GameEntity, NewCategoryListViewMode
         }
     }
 
-    override fun onLoadRefresh() {
-        mBaseHandler.postDelayed({ mListViewModel.load(LoadType.REFRESH) }, 200)
-
-        mReuseNoConn.visibility = View.GONE
-        mReuseNoData.visibility = View.GONE
-        mListLoading.visibility = View.VISIBLE
-        mListRv.visibility = View.GONE
-    }
-
     override fun onRefresh() {
         mAdapter?.clearPositionAndPackageMap()
 
diff --git a/app/src/main/java/com/gh/gamecenter/message/MessageFragment.java b/app/src/main/java/com/gh/gamecenter/message/MessageFragment.java
index 25c8c0f69c..3193aa7731 100644
--- a/app/src/main/java/com/gh/gamecenter/message/MessageFragment.java
+++ b/app/src/main/java/com/gh/gamecenter/message/MessageFragment.java
@@ -1,14 +1,11 @@
 package com.gh.gamecenter.message;
 
-import androidx.lifecycle.ViewModelProviders;
-
 import android.os.Bundle;
-
-import androidx.annotation.Nullable;
-
 import android.view.View;
 
-import com.gh.common.util.DialogUtils;
+import androidx.annotation.Nullable;
+import androidx.lifecycle.ViewModelProviders;
+
 import com.gh.common.util.MtaHelper;
 import com.gh.gamecenter.MessageInviteActivity;
 import com.gh.gamecenter.MessageKeFuActivity;
diff --git a/app/src/main/res/layout/fragment_tags.xml b/app/src/main/res/layout/fragment_tags.xml
index c478ceaaf1..0562803dfb 100644
--- a/app/src/main/res/layout/fragment_tags.xml
+++ b/app/src/main/res/layout/fragment_tags.xml
@@ -20,6 +20,12 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
+        <FrameLayout
+            android:id="@+id/list_skeleton"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_below="@id/config_container" />
+
         <com.gh.common.view.ConfigFilterView
             android:id="@+id/config_container"
             android:layout_width="match_parent"
@@ -38,12 +44,6 @@
                 android:layout_height="wrap_content" />
         </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
 
-        <FrameLayout
-            android:id="@+id/list_skeleton"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_below="@id/config_container" />
-
         <include
             layout="@layout/reuse_loading"
             android:layout_width="wrap_content"