diff --git a/app/src/main/java/com/gh/gamecenter/GameDeatilsNewsActivity.java b/app/src/main/java/com/gh/gamecenter/GameDeatilsNewsActivity.java index 015566f5d8..bf0e2f2d8c 100644 --- a/app/src/main/java/com/gh/gamecenter/GameDeatilsNewsActivity.java +++ b/app/src/main/java/com/gh/gamecenter/GameDeatilsNewsActivity.java @@ -209,12 +209,17 @@ public class GameDeatilsNewsActivity extends BaseActivity{ selectI = finalI; selectJ = finalJ; radioButton.setSelected(true); - page = 1; initNewsType(); + + newsEntities.clear(); + newsAdapter.notifyDataSetChanged(); + + cardView.setVisibility(View.GONE); + llLoading.setVisibility(View.VISIBLE); + new Thread(new Runnable() { @Override public void run() { - newsEntities.clear(); page = 1; isRemove = false; LoadNewsData(page); diff --git a/app/src/main/java/com/gh/gamecenter/news/NewNews4Fragment.java b/app/src/main/java/com/gh/gamecenter/news/NewNews4Fragment.java index 8dccc8837e..284b338495 100644 --- a/app/src/main/java/com/gh/gamecenter/news/NewNews4Fragment.java +++ b/app/src/main/java/com/gh/gamecenter/news/NewNews4Fragment.java @@ -140,6 +140,8 @@ public class NewNews4Fragment extends Fragment implements NewNews4FragmentAdapte mSwipeRefreshLayout.setOnRefreshListener(new SwipeRefreshLayout.OnRefreshListener() { @Override public void onRefresh() { + page = 1; + isRemove = false; LoadConcernGameId(); } }); @@ -148,7 +150,13 @@ public class NewNews4Fragment extends Fragment implements NewNews4FragmentAdapte public void onClick(View v) { noConnection.setVisibility(View.GONE); mProgressBar.setVisibility(View.VISIBLE); - LoadConcernGameId(); + handler.postDelayed(new Runnable() { + @Override + public void run() { + isNetworkError = false; + LoadConcernGameId(); + } + },1000); } }); } @@ -162,19 +170,11 @@ public class NewNews4Fragment extends Fragment implements NewNews4FragmentAdapte } updateGameId = jsonArray.toString(); - if (jsonArray.toString().length()> 3){ - Message message = new Message(); - message.obj = jsonArray.toString(); - message.what = 0; - handler.sendMessage(message); - noConcern.setVisibility(View.GONE); - }else { - mNews4FragmentAdapter.LoadJosnData(999); - if (mSwipeRefreshLayout.isRefreshing()){ - mSwipeRefreshLayout.setRefreshing(false); - } - noConcern.setVisibility(View.VISIBLE); - } + Message message = new Message(); + message.obj = jsonArray.toString(); + message.what = 0; + handler.sendMessage(message); + noConcern.setVisibility(View.GONE); } @Nullable @@ -230,4 +230,14 @@ public class NewNews4Fragment extends Fragment implements NewNews4FragmentAdapte }); } + @Override + public void concernNewsData(boolean noDate) { + if (noDate){ + if (mSwipeRefreshLayout.isRefreshing()){ + mSwipeRefreshLayout.setRefreshing(false); + } + noConcern.setVisibility(View.VISIBLE); + } + } + } diff --git a/app/src/main/java/com/gh/gamecenter/news/NewNews4FragmentAdapter.java b/app/src/main/java/com/gh/gamecenter/news/NewNews4FragmentAdapter.java index 4d8622dce7..a81b8c3fa2 100644 --- a/app/src/main/java/com/gh/gamecenter/news/NewNews4FragmentAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/news/NewNews4FragmentAdapter.java @@ -64,8 +64,9 @@ public class NewNews4FragmentAdapter extends RecyclerView.Adapter