From efc0d385749f25d3ad5c282e44fbbca208728dca Mon Sep 17 00:00:00 2001 From: FongMi Date: Fri, 12 Aug 2022 17:37:25 +0800 Subject: [PATCH] Change history key, will empty history --- .../com/fongmi/android/tv/ui/activity/DetailActivity.java | 7 ++++--- app/src/main/java/com/fongmi/android/tv/bean/History.java | 4 ++-- .../main/java/com/fongmi/android/tv/db/AppDatabase.java | 2 +- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/DetailActivity.java b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/DetailActivity.java index c37c5ae19..4a24f9502 100644 --- a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/DetailActivity.java +++ b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/DetailActivity.java @@ -5,6 +5,7 @@ import android.content.Intent; import android.os.Handler; import android.os.Looper; import android.text.Html; +import android.util.Log; import android.view.KeyEvent; import android.view.View; import android.view.ViewGroup; @@ -73,7 +74,7 @@ public class DetailActivity extends BaseActivity implements KeyDown.Listener { } private String getHistoryKey() { - return getKey().concat("_").concat(getId()); + return getKey().concat("@@@").concat(getId()); } private Vod.Flag getVodFlag() { @@ -201,10 +202,10 @@ public class DetailActivity extends BaseActivity implements KeyDown.Listener { setText(mBinding.year, R.string.detail_year, item.getVodYear()); setText(mBinding.area, R.string.detail_area, item.getVodArea()); setText(mBinding.type, R.string.detail_type, item.getTypeName()); - setText(mBinding.actor, R.string.detail_actor, item.getVodActor()); setText(mBinding.site, R.string.detail_site, ApiConfig.getSiteName(getKey())); - setText(mBinding.director, R.string.detail_director, item.getVodDirector()); + 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()); mFlagAdapter.setItems(item.getVodFlags(), null); mBinding.video.requestFocus(); checkHistory(); diff --git a/app/src/main/java/com/fongmi/android/tv/bean/History.java b/app/src/main/java/com/fongmi/android/tv/bean/History.java index 3e8d6b9a7..dd39424ce 100644 --- a/app/src/main/java/com/fongmi/android/tv/bean/History.java +++ b/app/src/main/java/com/fongmi/android/tv/bean/History.java @@ -105,11 +105,11 @@ public class History { } public String getSiteKey() { - return getKey().substring(0, getKey().lastIndexOf("_")); + return getKey().substring(0, getKey().lastIndexOf("@@@")); } public String getVodId() { - return getKey().substring(getKey().lastIndexOf("_") + 1); + return getKey().substring(getKey().lastIndexOf("@@@") + 1); } public Vod.Flag getFlag() { diff --git a/app/src/main/java/com/fongmi/android/tv/db/AppDatabase.java b/app/src/main/java/com/fongmi/android/tv/db/AppDatabase.java index 2167a164a..7a9f6512f 100644 --- a/app/src/main/java/com/fongmi/android/tv/db/AppDatabase.java +++ b/app/src/main/java/com/fongmi/android/tv/db/AppDatabase.java @@ -13,7 +13,7 @@ import com.fongmi.android.tv.db.dao.HistoryDao; @Database(entities = {History.class}, version = AppDatabase.VERSION, exportSchema = false) public abstract class AppDatabase extends RoomDatabase { - public static final int VERSION = 3; + public static final int VERSION = 4; private static volatile AppDatabase instance;