Leaf-WAI/assistant-android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' of gitlab.ghzs.com:halo/assistant-android into dev

Browse Source
This commit is contained in:
张玉久
2020-05-26 14:27:09 +08:00
parent 36156cddc4 2b98702ceb
commit 728b663c7a
4 changed files with 13 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/src/main/java/com/gh/gamecenter/baselist/ListAdapter.java
View File

@ -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;
}

9
app/src/main/java/com/gh/gamecenter/category/NewCategoryListFragment.kt
View File

@ -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()

9
app/src/main/java/com/gh/gamecenter/message/MessageFragment.java
View File

@ -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;