From e41599038ddb54fff1c770122ca05168bb024c9a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BA=8E=E4=BF=8A?= <215613905@qq.com>
Date: Thu, 3 Apr 2025 14:44:43 +0800
Subject: [PATCH] fix bug

---
 .../main/java/com/github/tvbox/osc/api/ApiConfig.java    | 9 +++++----
 .../com/github/tvbox/osc/ui/activity/HomeActivity.java   | 2 +-
 gradle.properties                                        | 2 +-
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/com/github/tvbox/osc/api/ApiConfig.java b/app/src/main/java/com/github/tvbox/osc/api/ApiConfig.java
index 64f9aa00..aeac3a5a 100644
--- a/app/src/main/java/com/github/tvbox/osc/api/ApiConfig.java
+++ b/app/src/main/java/com/github/tvbox/osc/api/ApiConfig.java
@@ -181,6 +181,7 @@ public class ApiConfig {
                 parseLiveJson(liveApiUrl,defaultLiveObjString);
             }else {
                 File live_cache = new File(App.getInstance().getFilesDir().getAbsolutePath() + "/" + MD5.encode(liveApiUrl));
+                LOG.i("echo-加载独立直播");
                 if (useCache && live_cache.exists()) {
                     try {
                         parseLiveJson(liveApiUrl, live_cache);
@@ -334,6 +335,7 @@ public class ApiConfig {
 
         boolean isJarInImg = jarUrl.startsWith("img+");
         jarUrl = jarUrl.replace("img+", "");
+        LOG.i("echo-load jar start:"+jarUrl);
         OkGo.<File>get(jarUrl)
                 .headers("User-Agent", userAgent)
                 .headers("Accept", requestAccept)
@@ -354,7 +356,7 @@ public class ApiConfig {
                                 byte[] imgJar = getImgJar(respData);
                                 if (imgJar == null || imgJar.length == 0) {
                                     LOG.e("echo---Generated JAR data is empty");
-                                    callback.error("JAR data is empty");
+                                    callback.error("JAR 是空的");
                                 }
                                 fos.write(imgJar);
                             } else {
@@ -387,7 +389,7 @@ public class ApiConfig {
                                 }
                             } catch (Exception e) {
                                 LOG.e("echo---jar Loader threw exception: " + e.getMessage());
-                                callback.error("JAR加载异常: " + e.getMessage());
+                                callback.error("JAR加载异常: ");
                             }
                         } else {
                             LOG.e("echo---jar File not found");
@@ -401,7 +403,7 @@ public class ApiConfig {
                         if (ex != null) {
                             LOG.i("echo---jar Request failed: " + ex.getMessage());
                         }
-                        callback.error(ex != null ? ex.getMessage() : "未知网络错误");
+                        callback.error("网络错误");
                     }
                 });
     }
@@ -847,7 +849,6 @@ public class ApiConfig {
                             jarLoader.loadLiveJar(liveSpider);
                         }
                     }
-                    LOG.i("echo-live-proxy-url:"+url);
                 }else {
                     liveChannelGroupList.clear();
                     return;
diff --git a/app/src/main/java/com/github/tvbox/osc/ui/activity/HomeActivity.java b/app/src/main/java/com/github/tvbox/osc/ui/activity/HomeActivity.java
index 88ca2eb3..0e375cb5 100644
--- a/app/src/main/java/com/github/tvbox/osc/ui/activity/HomeActivity.java
+++ b/app/src/main/java/com/github/tvbox/osc/ui/activity/HomeActivity.java
@@ -345,7 +345,7 @@ public class HomeActivity extends BaseActivity {
                         mHandler.postDelayed(new Runnable() {
                             @Override
                             public void run() {
-                                Toast.makeText(HomeActivity.this, "jar加载失败; 尝试加载最近一次的jar", Toast.LENGTH_SHORT).show();
+                                Toast.makeText(HomeActivity.this, msg+"; 尝试加载最近一次的jar", Toast.LENGTH_SHORT).show();
                                 refreshHome();
                             }
                         },50);
diff --git a/gradle.properties b/gradle.properties
index 8b1a2183..e86424f0 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -17,4 +17,4 @@ android.useAndroidX=true
 # Automatically convert third-party libraries to use AndroidX
 android.enableJetifier=true
 IsDebug=true
-#org.gradle.jvmargs=-Xmx2048m --add-opens java.base/java.io=ALL-UNNAMED
+org.gradle.jvmargs=-Xmx2048m --add-opens java.base/java.io=ALL-UNNAMED