From 8367d36cb2a5c3e2af351d85b79d76fe217d0dd2 Mon Sep 17 00:00:00 2001 From: FongMi Date: Thu, 13 Apr 2023 10:51:21 +0800 Subject: [PATCH] Update history key --- .../tv/ui/activity/DetailActivity.java | 2 +- .../com/fongmi/android/tv/bean/History.java | 26 ++++++++++++++----- .../java/com/fongmi/android/tv/bean/Keep.java | 4 +-- .../tv/ui/activity/DetailActivity.java | 2 +- .../tv/ui/fragment/SettingFragment.java | 3 +++ 5 files changed, 26 insertions(+), 11 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 aaaf1696a..2ade0ecae 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 @@ -151,7 +151,7 @@ public class DetailActivity extends BaseActivity implements CustomKeyDownVod.Lis } private String getHistoryKey() { - return getKey().concat(AppDatabase.SYMBOL).concat(getId()); + return getKey().concat(AppDatabase.SYMBOL).concat(getId()).concat(AppDatabase.SYMBOL) + ApiConfig.getCid(); } private Site getSite() { 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 baa016cce..b061c5122 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 @@ -1,5 +1,8 @@ package com.fongmi.android.tv.bean; +import android.text.TextUtils; +import android.view.View; + import androidx.annotation.NonNull; import androidx.room.Entity; import androidx.room.PrimaryKey; @@ -199,12 +202,16 @@ public class History { this.cid = cid; } + public String getSiteName() { + return ApiConfig.getSiteName(getSiteKey()); + } + public String getSiteKey() { - return getKey().substring(0, getKey().lastIndexOf(AppDatabase.SYMBOL)); + return getKey().split(AppDatabase.SYMBOL)[0]; } public String getVodId() { - return getKey().substring(getKey().lastIndexOf(AppDatabase.SYMBOL) + AppDatabase.SYMBOL.length()); + return getKey().split(AppDatabase.SYMBOL)[1]; } public Vod.Flag getFlag() { @@ -215,6 +222,10 @@ public class History { return new Vod.Flag.Episode(getVodRemarks(), getEpisodeUrl()); } + public int getSiteVisible() { + return TextUtils.isEmpty(getSiteName()) ? View.GONE : View.VISIBLE; + } + public int getRevPlayText() { return isRevPlay() ? R.string.play_backward : R.string.play_forward; } @@ -254,6 +265,12 @@ public class History { update(); } + public History update(int cid) { + setCid(cid); + update(); + return this; + } + public History update() { checkMerge(AppDatabase.get().getHistoryDao().findByName(ApiConfig.getCid(), getVodName())); AppDatabase.get().getHistoryDao().insertOrUpdate(this); @@ -265,11 +282,6 @@ public class History { return this; } - public History cid(int cid) { - setCid(cid); - return update(); - } - public void findEpisode(List flags) { setVodFlag(flags.get(0).getFlag()); setVodRemarks(flags.get(0).getEpisodes().get(0).getName()); diff --git a/app/src/main/java/com/fongmi/android/tv/bean/Keep.java b/app/src/main/java/com/fongmi/android/tv/bean/Keep.java index 6ebc9253b..4f2ebb586 100644 --- a/app/src/main/java/com/fongmi/android/tv/bean/Keep.java +++ b/app/src/main/java/com/fongmi/android/tv/bean/Keep.java @@ -80,11 +80,11 @@ public class Keep { } public String getSiteKey() { - return getKey().substring(0, getKey().lastIndexOf(AppDatabase.SYMBOL)); + return getKey().split(AppDatabase.SYMBOL)[0]; } public String getVodId() { - return getKey().substring(getKey().lastIndexOf(AppDatabase.SYMBOL) + AppDatabase.SYMBOL.length()); + return getKey().split(AppDatabase.SYMBOL)[1]; } public static Keep find(String key) { diff --git a/app/src/mobile/java/com/fongmi/android/tv/ui/activity/DetailActivity.java b/app/src/mobile/java/com/fongmi/android/tv/ui/activity/DetailActivity.java index 59d6b040d..632e65166 100644 --- a/app/src/mobile/java/com/fongmi/android/tv/ui/activity/DetailActivity.java +++ b/app/src/mobile/java/com/fongmi/android/tv/ui/activity/DetailActivity.java @@ -152,7 +152,7 @@ public class DetailActivity extends BaseActivity implements CustomKeyDownVod.Lis } private String getHistoryKey() { - return getKey().concat(AppDatabase.SYMBOL).concat(getId()); + return getKey().concat(AppDatabase.SYMBOL).concat(getId()).concat(AppDatabase.SYMBOL) + ApiConfig.getCid(); } private Site getSite() { diff --git a/app/src/mobile/java/com/fongmi/android/tv/ui/fragment/SettingFragment.java b/app/src/mobile/java/com/fongmi/android/tv/ui/fragment/SettingFragment.java index fccbfcaf1..7eb6edbbd 100644 --- a/app/src/mobile/java/com/fongmi/android/tv/ui/fragment/SettingFragment.java +++ b/app/src/mobile/java/com/fongmi/android/tv/ui/fragment/SettingFragment.java @@ -222,6 +222,9 @@ public class SettingFragment extends BaseFragment implements ConfigCallback, Sit private void updateText() { if (player == null || decode == null) return; + mBinding.vodUrl.setText(ApiConfig.getDesc()); + mBinding.liveUrl.setText(LiveConfig.getDesc()); + mBinding.wallUrl.setText(WallConfig.getDesc()); mBinding.playerText.setText(player[Prefers.getPlayer()]); mBinding.decodeText.setText(decode[Prefers.getDecode()]); }