Merge branch 'dev' into release

2 years ago · 9d1fbca5cd
parent cf04b1451a 1ef686a468
commit 9d1fbca5cd
2 changed files with 4 additions and 2 deletions
--- a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/KeepActivity.java
+++ b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/KeepActivity.java
@ -77,7 +77,8 @@ public class KeepActivity extends BaseActivity implements KeepAdapter.OnClickLis
    @Override
    public void onItemClick(Keep item) {
        Config config = Config.find(item.getCid());
-        if (item.getCid() != VodConfig.getCid()) loadConfig(config, item);
+        if (config == null) CollectActivity.start(this, item.getVodName());
+        else if (item.getCid() != VodConfig.getCid()) loadConfig(config, item);
        else VideoActivity.start(this, item.getSiteKey(), item.getVodId(), item.getVodName(), item.getVodPic());
    }

--- a/app/src/mobile/java/com/fongmi/android/tv/ui/activity/KeepActivity.java
+++ b/app/src/mobile/java/com/fongmi/android/tv/ui/activity/KeepActivity.java
@ -102,7 +102,8 @@ public class KeepActivity extends BaseActivity implements KeepAdapter.OnClickLis
    @Override
    public void onItemClick(Keep item) {
        Config config = Config.find(item.getCid());
-        if (item.getCid() != VodConfig.getCid()) loadConfig(config, item);
+        if (config == null) CollectActivity.start(this, item.getVodName());
+        else if (item.getCid() != VodConfig.getCid()) loadConfig(config, item);
        else VideoActivity.start(this, item.getSiteKey(), item.getVodId(), item.getVodName(), item.getVodPic());
    }