This commit is contained in:
jinyuer
2020-09-02 15:33:38 +08:00
parent 83b075884f
commit ca565aafc6
8 changed files with 136 additions and 40 deletions

View File

@@ -73,7 +73,7 @@ public class DiscoveryFragment extends BaseFragment<FragmentDiscoveryBinding> im
private String mParam2;
BaseActivity baseActivity;
private ProgressDialog progressDialog;
private ArrayList<DiscoveryListEntity> discoveryListEntities;
private ArrayList<DiscoveryListEntity> discoveryListEntities = new ArrayList<>();
@Override
protected int getLayoutId() {
@@ -485,7 +485,7 @@ public class DiscoveryFragment extends BaseFragment<FragmentDiscoveryBinding> im
Log.e("pic", discoveryListEntity.getPic().get(0));
for (int i = 0; i < discoveryListEntity.getPic().size(); i++) {
if (discoveryListEntity.getPic().get(i).endsWith(".mp4")) {
if (discoveryListEntity.getPic().get(i).endsWith(".mp4") || discoveryListEntity.getPic().get(i).endsWith(".avi")) {
ImageInfo imageInfo = new ImageInfo();
imageInfo.setType(2);
imageInfo.setBigImageUrl(discoveryListEntity.getPic().get(i));
@@ -501,7 +501,7 @@ public class DiscoveryFragment extends BaseFragment<FragmentDiscoveryBinding> im
}
}else {
} else {
ImageInfo imageInfo = new ImageInfo();
imageInfo.setType(1);
imageInfo.setBigImageUrl(discoveryListEntity.getThumb());
@@ -520,7 +520,10 @@ public class DiscoveryFragment extends BaseFragment<FragmentDiscoveryBinding> im
private void getGankList(String myurl, Map<String, String> map, String msg, final int requstecode) {
progressDialog.setMessage(msg);
progressDialog.setCancelable(false);
// progressDialog.show();
// if (page>1){
// progressDialog.show();
// }
mGankLoader = new Loader();
Subscription subscription = mGankLoader.getMovie(myurl, map).subscribe(new Action1<Resultcode>() {
@@ -536,7 +539,7 @@ public class DiscoveryFragment extends BaseFragment<FragmentDiscoveryBinding> im
baseActivity.setToast(1, resultcode.msg);
}
if (resultcode.status == 0) {
intRecycleView();
// intRecycleView();
Gson gs = new Gson();
LinkedTreeMap adta = (LinkedTreeMap) resultcode.data;
String s = gs.toJson(adta);
@@ -555,7 +558,9 @@ public class DiscoveryFragment extends BaseFragment<FragmentDiscoveryBinding> im
.placeholder(R.mipmap.icon_default_rectangle)
.transform(new PicassoRoundTransform())
.into(mDataBinding.head);
discoveryListEntities = new Gson().fromJson(array.toString(), type);
ArrayList<DiscoveryListEntity> o = new Gson().fromJson(array.toString(), type);
discoveryListEntities.clear();
discoveryListEntities.addAll(o);
BaseRecycleViewAdapter baseRecycleViewAdapter = (BaseRecycleViewAdapter) mDataBinding.recyView.getAdapter();
baseRecycleViewAdapter.setData(discoveryListEntities);
page++;
@@ -565,10 +570,12 @@ public class DiscoveryFragment extends BaseFragment<FragmentDiscoveryBinding> im
BaseRecycleViewAdapter baseRecycleViewAdapter = (BaseRecycleViewAdapter) mDataBinding.recyView.getAdapter();
baseRecycleViewAdapter.setData(discoveryListEntities);
int count = jsonObject.getInt("count");
if (discoveryListEntities.size() == count || o.isEmpty()) {
Log.e("sizi", discoveryListEntities.size() + "");
// int count = jsonObject.getInt("count");
if (o.isEmpty()) {
mDataBinding.dw.finishLoadMoreWithNoMoreData();
} else {
page++;
}