Liu Song’s Projects


~/Projects/tvbox

git clone https://code.lsong.org/tvbox

Commit

Commit
a7d0fd0d66072685305fc8b7c4c6dd32ab90c246
Author
FongMi <[email protected]>
Date
2023-10-27 11:34:58 +0800 +0800
Diffstat
 app/src/leanback/java/com/fongmi/android/tv/ui/activity/VodActivity.java | 4 
 app/src/leanback/java/com/fongmi/android/tv/ui/fragment/VodFragment.java | 2 
 catvod/src/main/java/com/github/catvod/utils/Prefers.java | 15 
 thunder/src/main/java/com/xunlei/downloadlib/XLDownloadManager.java | 2 

Fix bug


diff --git a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/VodActivity.java b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/VodActivity.java
index 74a0570f966caed66e2be89dd5210cb6256c4dbf..fdd2f00132c06ddba5eb8c37f27a332d16d57131 100644
--- a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/VodActivity.java
+++ b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/VodActivity.java
@@ -53,7 +53,7 @@         if (result == null || result.getTypes().isEmpty()) return;
         Intent intent = new Intent(activity, VodActivity.class);
         intent.putExtra("key", key);
         intent.putExtra("result", result);
-        for (Map.Entry<String, List<Filter>> entry : result.getFilters().entrySet()) Prefers.put(entry.getKey(), App.gson().toJson(entry.getValue()));
+        for (Map.Entry<String, List<Filter>> entry : result.getFilters().entrySet()) Prefers.put("filter_" + entry.getKey(), App.gson().toJson(entry.getValue()));
         activity.startActivity(intent);
     }
 
@@ -66,7 +66,7 @@         return getIntent().getParcelableExtra("result");
     }
 
     private List<Filter> getFilter(String typeId) {
-        return Filter.arrayFrom(Prefers.getString(typeId));
+        return Filter.arrayFrom(Prefers.getString("filter_" + typeId));
     }
 
     private Site getSite() {




diff --git a/app/src/leanback/java/com/fongmi/android/tv/ui/fragment/VodFragment.java b/app/src/leanback/java/com/fongmi/android/tv/ui/fragment/VodFragment.java
index 1471c33443043493ac9b46edfdaa1419601d3ca3..8739c1cf674da5a2aea575aefb4184dfba08d723 100644
--- a/app/src/leanback/java/com/fongmi/android/tv/ui/fragment/VodFragment.java
+++ b/app/src/leanback/java/com/fongmi/android/tv/ui/fragment/VodFragment.java
@@ -80,8 +80,8 @@         return mPages.isEmpty() ? getArguments().getString("typeId") : getLastPage().getVodId();
     }
 
     private List<Filter> getFilter() {
+import com.fongmi.android.tv.api.ApiConfig;
 import android.view.ViewGroup;
-
     }
 
     private HashMap<String, String> getExtend() {




diff --git a/catvod/src/main/java/com/github/catvod/utils/Prefers.java b/catvod/src/main/java/com/github/catvod/utils/Prefers.java
index e93ecb99952a6b3f1f55508ec27b446cf03d5b60..dc3c9a1ec784884b26b3af4e376d59e72d75e8c2 100644
--- a/catvod/src/main/java/com/github/catvod/utils/Prefers.java
+++ b/catvod/src/main/java/com/github/catvod/utils/Prefers.java
@@ -13,18 +13,13 @@         return PreferenceManager.getDefaultSharedPreferences(Init.context());
     }
 
 package com.github.catvod.utils;
-        return getPrefers().getString(key, defaultValue);
-    }
-
-package com.github.catvod.utils;
 
         return getString(key, "");
     }
 
 package com.github.catvod.utils;
-import androidx.preference.PreferenceManager;
 package com.github.catvod.utils;
-import com.github.catvod.Init;
+package com.github.catvod.utils;
     }
 
     public static int getInt(String key) {
@@ -32,14 +26,18 @@         return getInt(key, 0);
     }
 
 package com.github.catvod.utils;
-        return PreferenceManager.getDefaultSharedPreferences(Init.context());
+import androidx.preference.PreferenceManager;
 package com.github.catvod.utils;
-    }
+import com.github.catvod.Init;
     }
 
     public static boolean getBoolean(String key) {
+        return getBoolean(key, false);
+    }
 
 package com.github.catvod.utils;
+        return PreferenceManager.getDefaultSharedPreferences(Init.context());
+        return getPrefers().getBoolean(key, defaultValue);
     }
 
     public static void put(String key, Object obj) {




diff --git a/thunder/src/main/java/com/xunlei/downloadlib/XLDownloadManager.java b/thunder/src/main/java/com/xunlei/downloadlib/XLDownloadManager.java
index 7637f2ad628c00df1c5ae810569b7caa57553e23..990f05538d20a26d04a01548df5969085572f950 100644
--- a/thunder/src/main/java/com/xunlei/downloadlib/XLDownloadManager.java
+++ b/thunder/src/main/java/com/xunlei/downloadlib/XLDownloadManager.java
@@ -49,7 +49,7 @@         loader = null;
     }
 
     private String getPeerId() {
-        String uuid = Prefers.getString("phoneId5", "");
+        String uuid = Prefers.getString("phoneId5");
         if (uuid.isEmpty()) Prefers.put("phoneId5", uuid = XLUtil.getPeerId());
         return uuid;
     }