From 3cff4e2dc2bf58d07ca30a67970d9a8e0505f0ca Mon Sep 17 00:00:00 2001
From: dlgt7 <102397160+dlgt7@users.noreply.github.com>
Date: Wed, 31 Dec 2025 10:38:57 +0800
Subject: [PATCH] =?UTF-8?q?Update=20=E8=9C=82=E8=9C=9C=E5=86=85=E7=BD=AE?=
 =?UTF-8?q?=E6=BA=90=E4=BF=AE=E6=94=B9.txt?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 蜂蜜TV自己打包/蜂蜜内置源修改.txt | 34 ++++++++++---------------------
 1 file changed, 11 insertions(+), 23 deletions(-)

diff --git a/蜂蜜TV自己打包/蜂蜜内置源修改.txt b/蜂蜜TV自己打包/蜂蜜内置源修改.txt
index f73ce4b..087e377 100644
--- a/蜂蜜TV自己打包/蜂蜜内置源修改.txt
+++ b/蜂蜜TV自己打包/蜂蜜内置源修改.txt
@@ -1,33 +1,21 @@
- 路径：app/src/main/java/com/fongmi/android/tv/api/ApiConfig.java
-126行：蜂蜜源代码如下：
-   private void loadConfig(Callback callback) {
+ 路径：app/src/main/java/com/fongmi/android/tv/api/config/VodConfig.java
+113-131行：蜂蜜源代码如下：只修改了124-126行
+   private void loadConfig(int id, Config config, Callback callback) {
         try {
-            checkJson(JsonParser.parseString(Decoder.getJson(config.getUrl())).getAsJsonObject(), callback);
+            OkHttp.cancel(TAG);
+            Server.get().start();
+            String json = Decoder.getJson(UrlUtil.convert(config.getUrl()), TAG);
+            checkJson(id, config, callback, Json.parse(json).getAsJsonObject());
+            if (taskId.get() == id && config.equals(this.config)) config.update();
         } catch (Throwable e) {
-            if (TextUtils.isEmpty(config.getUrl())) App.post(() -> callback.error(""));
-            else loadCache(callback, e);
             e.printStackTrace();
-        }
-    }
-
-替换成一下代码：
-    private void loadConfig(Callback callback) {
-        try {
-            App.post(() -> callback.error("本软件为免费开源项目, 以学习交流为目的"));
-            checkJson(JsonParser.parseString(Decoder.getJson(getUrl())).getAsJsonObject(), callback);
-        } catch (Throwable e) {
+            if (isCanceled(e)) return;
+            if (taskId.get() != id) return;
             if (TextUtils.isEmpty(config.getUrl())) {
-                App.post(() -> callback.error("本app为github上的免费更新app"));
-                App.post(() -> callback.error("未配置源地址，默认添加内置源，您可在设置中启用"));
                 String url = "添加你自己的源地址";
                 config.setUrl(url);
-            } else {
-                loadCache(callback, e);
             }
             if (TextUtils.isEmpty(config.getUrl())) App.post(() -> callback.error(""));
-            else loadCache(callback, e);
-            e.printStackTrace();
+            else App.post(() -> callback.error(Notify.getError(R.string.error_config_get, e)));
         }
     }
-
-