修正部分源历史记录图片不显示的问题;

fix style;
main
jun 11 months ago
parent ccc54c91eb
commit 47628bfef4
  1. 1
      app/src/main/java/com/github/tvbox/osc/ui/activity/CollectActivity.java
  2. 5
      app/src/main/java/com/github/tvbox/osc/ui/activity/DetailActivity.java
  3. 1
      app/src/main/java/com/github/tvbox/osc/ui/activity/HistoryActivity.java
  4. 5
      app/src/main/java/com/github/tvbox/osc/ui/fragment/GridFragment.java
  5. 1
      app/src/main/java/com/github/tvbox/osc/ui/fragment/UserFragment.java

@ -119,6 +119,7 @@ public class CollectActivity extends BaseActivity {
Bundle bundle = new Bundle();
bundle.putString("id", vodInfo.vodId);
bundle.putString("sourceKey", vodInfo.sourceKey);
bundle.putString("picture", vodInfo.pic);
jumpActivity(DetailActivity.class, bundle);
} else {
Intent newIntent = new Intent(mContext, SearchActivity.class);

@ -683,6 +683,9 @@ public class DetailActivity extends BaseActivity {
mVideo.id = vodId;
if (TextUtils.isEmpty(mVideo.name))mVideo.name = "TVBox";
vodInfo = new VodInfo();
if((mVideo.pic==null || mVideo.pic.isEmpty()) && !vod_picture.isEmpty()){
mVideo.pic=vod_picture;
}
vodInfo.setVideo(mVideo);
vodInfo.sourceKey = mVideo.sourceKey;
sourceKey = mVideo.sourceKey;
@ -787,10 +790,12 @@ public class DetailActivity extends BaseActivity {
return label + "<font color=\"#FFFFFF\">" + content + "</font>";
}
private String vod_picture="";
private void initData() {
Intent intent = getIntent();
if (intent != null && intent.getExtras() != null) {
Bundle bundle = intent.getExtras();
vod_picture=bundle.getString("picture", "");
loadDetail(bundle.getString("id", null), bundle.getString("sourceKey", ""));
}
}

@ -128,6 +128,7 @@ public class HistoryActivity extends BaseActivity {
bundle.putString("sourceKey", vodInfo.sourceKey);
SourceBean sourceBean = ApiConfig.get().getSource(vodInfo.sourceKey);
if(sourceBean!=null){
bundle.putString("picture", vodInfo.pic);
jumpActivity(DetailActivity.class, bundle);
}else {
bundle.putString("title", vodInfo.name);

@ -111,7 +111,7 @@ public class GridFragment extends BaseLazyFragment {
public boolean isFolederMode(){ return (getUITag() =='1'); }
// 获取当前页面UI的显示模式 ‘0’ 正常模式 '1' 文件夹模式 '2' 显示缩略图的文件夹模式
public char getUITag(){
return (sortData == null || sortData.flag == null || sortData.flag.length() ==0 ) ? '0' : sortData.flag.charAt(0);
return (sortData == null || sortData.flag == null || sortData.flag.length() ==0 || style!=null) ? '0' : sortData.flag.charAt(0);
}
// 是否允许聚合搜索 sortData.flag的第二个字符为‘1’时允许聚搜
public boolean enableFastSearch(){ return sortData.flag == null || sortData.flag.length() < 2 || (sortData.flag.charAt(1) == '1'); }
@ -232,7 +232,7 @@ public class GridFragment extends BaseLazyFragment {
bundle.putString("title", video.name);
if( video.tag !=null && (video.tag.equals("folder") || video.tag.equals("cover"))){
focusedView = view;
if(("12".indexOf(getUITag()) != -1) && style == null){
if(("12".indexOf(getUITag()) != -1)){
changeView(video.id,video.tag.equals("folder"));
}else {
changeView(video.id,false);
@ -246,6 +246,7 @@ public class GridFragment extends BaseLazyFragment {
jumpActivity(SearchActivity.class, bundle);
}
}else {
bundle.putString("picture", video.pic);
jumpActivity(DetailActivity.class, bundle);
}
}

@ -187,6 +187,7 @@ public class UserFragment extends BaseLazyFragment implements View.OnClickListen
bundle.putString("sourceKey", vod.sourceKey);
SourceBean sourceBean = ApiConfig.get().getSource(vod.sourceKey);
if(sourceBean!=null){
bundle.putString("picture", vod.pic);
jumpActivity(DetailActivity.class, bundle);
}else {
jumpSearch(vod);

Loading…
Cancel
Save