From 19a98a3e04282ffdee234d6169cb2cce4a43a450 Mon Sep 17 00:00:00 2001 From: jhengazuki Date: Sat, 23 Aug 2025 01:24:18 +0800 Subject: [PATCH] Fix build --- .../com/fongmi/android/tv/ui/activity/VideoActivity.java | 8 ++++---- .../fongmi/android/tv/ui/presenter/HistoryPresenter.java | 3 +-- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/VideoActivity.java b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/VideoActivity.java index 7b4cdb7ae..63b3a52aa 100644 --- a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/VideoActivity.java +++ b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/VideoActivity.java @@ -456,9 +456,9 @@ public class VideoActivity extends BaseActivity implements CustomKeyDownVod.List setText(mBinding.area, R.string.detail_area, item.getVodArea()); setText(mBinding.type, R.string.detail_type, item.getTypeName()); setText(mBinding.site, R.string.detail_site, getSite().getName()); - setText(mBinding.actor, R.string.detail_actor, Html.fromHtml(item.getVodActor()).toString()); - setText(mBinding.content, R.string.detail_content, Html.fromHtml(item.getVodContent()).toString()); - setText(mBinding.director, R.string.detail_director, Html.fromHtml(item.getVodDirector()).toString()); + setText(mBinding.actor, R.string.detail_actor, item.getVodActor()); + setText(mBinding.content, R.string.detail_content, item.getVodContent()); + setText(mBinding.director, R.string.detail_director, item.getVodDirector()); mFlagAdapter.setItems(item.getVodFlags(), null); setPartAdapter(Part.get(item.getVodName())); mBinding.content.setMaxLines(getMaxLines()); @@ -527,7 +527,7 @@ public class VideoActivity extends BaseActivity implements CustomKeyDownVod.List private void setPlayer(Result result) { result.getUrl().set(mQualityAdapter.getPosition()); - if (!result.getDesc().isEmpty()) setText(mBinding.content, R.string.detail_content, Html.fromHtml(result.getDesc()).toString()); + if (!result.getDesc().isEmpty()) setText(mBinding.content, R.string.detail_content, result.getDesc()); setUseParse(VodConfig.hasParse() && ((result.getPlayUrl().isEmpty() && VodConfig.get().getFlags().contains(result.getFlag())) || result.getJx() == 1)); mPlayers.start(result, isUseParse(), getSite().isChangeable() ? getSite().getTimeout() : -1); mBinding.control.parse.setVisibility(isUseParse() ? View.VISIBLE : View.GONE); diff --git a/app/src/leanback/java/com/fongmi/android/tv/ui/presenter/HistoryPresenter.java b/app/src/leanback/java/com/fongmi/android/tv/ui/presenter/HistoryPresenter.java index ffbdbdcc9..8fb86ddf4 100644 --- a/app/src/leanback/java/com/fongmi/android/tv/ui/presenter/HistoryPresenter.java +++ b/app/src/leanback/java/com/fongmi/android/tv/ui/presenter/HistoryPresenter.java @@ -8,7 +8,6 @@ import androidx.annotation.NonNull; import androidx.leanback.widget.Presenter; import com.fongmi.android.tv.Product; -import com.fongmi.android.tv.R; import com.fongmi.android.tv.bean.History; import com.fongmi.android.tv.databinding.AdapterVodBinding; import com.fongmi.android.tv.utils.ImgUtil; @@ -64,10 +63,10 @@ public class HistoryPresenter extends Presenter { setClickListener(holder.view, item); holder.binding.name.setText(item.getVodName()); holder.binding.site.setText(item.getSiteName()); + holder.binding.remark.setText(item.getVodRemarks()); holder.binding.site.setVisibility(item.getSiteVisible()); holder.binding.remark.setVisibility(delete ? View.GONE : View.VISIBLE); holder.binding.delete.setVisibility(!delete ? View.GONE : View.VISIBLE); - holder.binding.remark.setText(ResUtil.getString(R.string.vod_last, item.getVodRemarks())); ImgUtil.loadVod(item.getVodName(), item.getVodPic(), holder.binding.image); }