🐛 修复节目单未刷新

manxb · May 27, 2024 · 59fef0e · 59fef0e
1 parent 9a5d488
commit 59fef0e
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 37 deletions.
diff --git a/.idea/other.xml b/.idea/other.xml
diff --git a/app/src/main/java/top/yogiczy/mytv/data/repositories/epg/EpgRepository.kt b/app/src/main/java/top/yogiczy/mytv/data/repositories/epg/EpgRepository.kt
@@ -96,20 +96,17 @@ class EpgRepository : FileCacheRepository("epg.json") {
         refreshTimeThreshold: Int,
     ) = withContext(Dispatchers.Default) {
         try {
-            val xmlJson = getOrRefresh({ lastModified, cacheData ->
-                if (epgXmlRepository.cacheFileLastModified() > lastModified)
-                    return@getOrRefresh true
-
-//                if (!cacheData.isNullOrBlank()) {
-//                    val epgList = Json.decodeFromString<List<Epg>>(cacheData)
-//                    val oldHashCode = epgList.map { it.channel }.hashCode()
-//                    return@getOrRefresh oldHashCode != filteredChannels.hashCode()
-//                }
-
-//                true
-                false
+            if (Calendar.getInstance().get(Calendar.HOUR_OF_DAY) < refreshTimeThreshold) {
+                log.d("未到时间点，不刷新节目单")
+                return@withContext EpgList()
+            }
+
+            val dateFormat = SimpleDateFormat("yyyy-MM-dd", Locale.getDefault())
+
+            val xmlJson = getOrRefresh({ lastModified, _ ->
+                dateFormat.format(System.currentTimeMillis()) != dateFormat.format(lastModified)
             }) {
-                val xmlString = epgXmlRepository.getEpgXml(xmlUrl, refreshTimeThreshold)
+                val xmlString = epgXmlRepository.getEpgXml(xmlUrl)
                 Json.encodeToString(parseFromXml(xmlString, filteredChannels).value)
             }
 
@@ -154,20 +151,9 @@ private class EpgXmlRepository : FileCacheRepository("epg.xml") {
     /**
      * 获取xml
      */
-    suspend fun getEpgXml(url: String, refreshTimeThreshold: Int): String {
-        if (Calendar.getInstance().get(Calendar.HOUR_OF_DAY) < refreshTimeThreshold) {
-            log.d("未到时间点，不刷新节目单")
-            return "<?xml version=\"1.0\" encoding=\"UTF-8\"?>"
-        }
-
-        val dateFormat = SimpleDateFormat("yyyy-MM-dd", Locale.getDefault())
-
-        return getOrRefresh({ lastModified, _ ->
-            dateFormat.format(System.currentTimeMillis()) != dateFormat.format(lastModified)
-        }) {
+    suspend fun getEpgXml(url: String): String {
+        return getOrRefresh(0) {
             fetchXml(url)
         }
     }
-
-    fun cacheFileLastModified() = getCacheFile().lastModified()
 }