From c30c942e05c7ceba2839f06fe4b8b7868ada5224 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BA=8E=E4=BF=8A?= <215613905@qq.com>
Date: Tue, 1 Apr 2025 15:09:17 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B0=9D=E8=AF=95=E8=A7=A3=E5=86=B3jar?=
=?UTF-8?q?=E9=A2=91=E7=B9=81=E6=8F=90=E7=A4=BA=E5=8A=A0=E8=BD=BD=E5=A4=B1?=
=?UTF-8?q?=E8=B4=A5;=20fix=E6=90=9C=E7=B4=A2=E7=95=8C=E9=9D=A2=E8=BD=AF?=
=?UTF-8?q?=E9=94=AE=E7=9B=98=E7=9A=84=E9=97=AE=E9=A2=98;?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/src/main/AndroidManifest.xml | 1 +
.../com/github/catvod/crawler/JarLoader.java | 12 ++++++++----
.../com/github/tvbox/osc/api/ApiConfig.java | 13 ++++++-------
.../tvbox/osc/ui/activity/HomeActivity.java | 9 ++++-----
.../tvbox/osc/ui/activity/SearchActivity.java | 19 ++++++++++---------
5 files changed, 29 insertions(+), 25 deletions(-)
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index a5062866..291fb3a5 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -59,6 +59,7 @@
android:screenOrientation="sensorLandscape" />
() {
@Override
- public File convertResponse(okhttp3.Response response) throws Throwable {
+ public File convertResponse(okhttp3.Response response){
File cacheDir = cache.getParentFile();
assert cacheDir != null;
if (!cacheDir.exists()) cacheDir.mkdirs();
@@ -355,7 +353,8 @@ public class ApiConfig {
LOG.i("echo---jar Response: " + respData);
byte[] imgJar = getImgJar(respData);
if (imgJar == null || imgJar.length == 0) {
- throw new IOException("Generated JAR data is empty");
+ LOG.e("echo---Generated JAR data is empty");
+ callback.error("JAR data is empty");
}
fos.write(imgJar);
} else {
@@ -388,11 +387,11 @@ public class ApiConfig {
}
} catch (Exception e) {
LOG.e("echo---jar Loader threw exception: " + e.getMessage());
- callback.error("加载异常: " + e.getMessage());
+ callback.error("JAR加载异常: " + e.getMessage());
}
} else {
LOG.e("echo---jar File not found");
- callback.error("文件不存在");
+ callback.error("JAR文件不存在");
}
}
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 60e19bd9..b9b95d15 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
@@ -320,8 +320,7 @@ public class HomeActivity extends BaseActivity {
mHandler.postDelayed(new Runnable() {
@Override
public void run() {
-// if (!useCacheConfig)
-// Toast.makeText(HomeActivity.this, "自定义jar加载成功", Toast.LENGTH_SHORT).show();
+// if (!useCacheConfig) Toast.makeText(HomeActivity.this, "自定义jar加载成功", Toast.LENGTH_SHORT).show();
initData();
}
}, 50);
@@ -340,13 +339,13 @@ public class HomeActivity extends BaseActivity {
@Override
public void error(String msg) {
jarInitOk = true;
- mHandler.post(new Runnable() {
+ mHandler.postDelayed(new Runnable() {
@Override
public void run() {
- Toast.makeText(HomeActivity.this, "jar加载失败;尝试加载上一次缓存", Toast.LENGTH_SHORT).show();
+ Toast.makeText(HomeActivity.this, msg+"; 尝试加载最近一次的jar", Toast.LENGTH_SHORT).show();
initData();
}
- });
+ },50);
}
});
}
diff --git a/app/src/main/java/com/github/tvbox/osc/ui/activity/SearchActivity.java b/app/src/main/java/com/github/tvbox/osc/ui/activity/SearchActivity.java
index 704f8541..802e8761 100644
--- a/app/src/main/java/com/github/tvbox/osc/ui/activity/SearchActivity.java
+++ b/app/src/main/java/com/github/tvbox/osc/ui/activity/SearchActivity.java
@@ -103,11 +103,6 @@ public class SearchActivity extends BaseActivity {
isSearchBack = false;
}
- public void openSystemKeyBoard() {
- InputMethodManager imm = (InputMethodManager) this.getSystemService(Context.INPUT_METHOD_SERVICE);
- imm.showSoftInput(this.getCurrentFocus(), InputMethodManager.SHOW_FORCED);
- }
-
private List pauseRunnable = null;
@Override
@@ -255,10 +250,7 @@ public class SearchActivity extends BaseActivity {
bundle.putString("title", wd);
jumpActivity(FastSearchActivity.class, bundle);
} else {
- InputMethodManager imm = (InputMethodManager) mContext.getSystemService(Context.INPUT_METHOD_SERVICE);
- if (imm != null) {
- imm.hideSoftInputFromWindow(etSearch.getWindowToken(), 0);
- }
+ hiddenImm();
search(wd);
}
} else {
@@ -282,6 +274,7 @@ public class SearchActivity extends BaseActivity {
bundle.putString("title", wd);
jumpActivity(FastSearchActivity.class, bundle);
} else {
+ hiddenImm();
search(wd);
}
} else {
@@ -602,4 +595,12 @@ public class SearchActivity extends BaseActivity {
}
EventBus.getDefault().unregister(this);
}
+
+ private void hiddenImm()
+ {
+ InputMethodManager imm = (InputMethodManager) mContext.getSystemService(Context.INPUT_METHOD_SERVICE);
+ if (imm != null) {
+ imm.hideSoftInputFromWindow(etSearch.getWindowToken(), 0);
+ }
+ }
}
\ No newline at end of file