pull/144/head
21561 1 year ago
parent 5262fffa30
commit bebaad75d1
  1. 8
      app/src/main/java/com/github/tvbox/osc/ui/adapter/HistoryAdapter.java
  2. 2
      app/src/main/java/com/github/tvbox/osc/ui/adapter/HomeHotVodAdapter.java
  3. 2
      app/src/main/java/com/github/tvbox/osc/ui/fragment/GridFragment.java
  4. 6
      app/src/main/java/com/github/tvbox/osc/viewmodel/SourceViewModel.java

@ -15,6 +15,7 @@ import com.github.tvbox.osc.bean.VodInfo;
import com.github.tvbox.osc.picasso.RoundTransformation;
import com.github.tvbox.osc.util.DefaultConfig;
import com.github.tvbox.osc.util.HawkConfig;
import com.github.tvbox.osc.util.ImgUtil;
import com.github.tvbox.osc.util.MD5;
import com.squareup.picasso.Picasso;
@ -53,7 +54,8 @@ public class HistoryAdapter extends BaseQuickAdapter<VodInfo, BaseViewHolder> {
if(bean!=null){
tvYear.setText(bean.getName());
}else {
tvYear.setVisibility(View.GONE);
tvYear.setText("搜");
// tvYear.setVisibility(View.GONE);
}
/*TextView tvLang = helper.getView(R.id.tvLang);
if (TextUtils.isEmpty(item.lang)) {
@ -97,10 +99,10 @@ public class HistoryAdapter extends BaseQuickAdapter<VodInfo, BaseViewHolder> {
.roundRadius(AutoSizeUtils.mm2px(mContext, 10), RoundTransformation.RoundType.ALL))
.placeholder(R.drawable.img_loading_placeholder)
.noFade()
.error(R.drawable.img_loading_placeholder)
.error(ImgUtil.createTextDrawable(item.name))
.into(ivThumb);
} else {
ivThumb.setImageResource(R.drawable.img_loading_placeholder);
ivThumb.setImageDrawable(ImgUtil.createTextDrawable(item.name));
}
}
}

@ -46,7 +46,7 @@ public class HomeHotVodAdapter extends BaseQuickAdapter<Movie.Video, BaseViewHol
if(bean!=null){
tvRate.setText(bean.getName());
}else {
tvRate.setVisibility(View.GONE);
tvRate.setText("搜");
}
}else if(Hawk.get(HawkConfig.HOME_REC, 0) == 0){
tvRate.setText("豆瓣热播");

@ -307,7 +307,7 @@ public class GridFragment extends BaseLazyFragment {
}
private void toggleFilterColor() {
if (sortData.filters != null && !sortData.filters.isEmpty()) {
if (sortData!=null && sortData.filters != null && !sortData.filters.isEmpty()) {
int count = sortData.filterSelectCount();
EventBus.getDefault().post(new RefreshEvent(RefreshEvent.TYPE_FILTER_CHANGE, count));
}

@ -95,7 +95,7 @@ public class SourceViewModel extends ViewModel {
return;
}
SourceBean sourceBean = ApiConfig.get().getSource(sourceKey);
if(sourceBean.getName().contains("搜")){
if(sourceBean.getName().length()<=3 && sourceBean.getName().endsWith("搜")){
sortResult.postValue(null);
return;
}
@ -296,7 +296,9 @@ public class SourceViewModel extends ViewModel {
public void run() {
try {
Spider sp = ApiConfig.get().getCSP(homeSourceBean);
json(listResult, sp.categoryContent(sortData.id, page + "", true, sortData.filterSelect), homeSourceBean.getKey());
String json = sp.categoryContent(sortData.id, page + "", true, sortData.filterSelect);
LOG.i("categoryContent:"+json);
json(listResult, json,homeSourceBean.getKey());
} catch (Throwable th) {
th.printStackTrace();
}

Loading…
Cancel
Save