From 89534cde4f740e36068d47b781a16eb647a64152 Mon Sep 17 00:00:00 2001
From: FongMi <b8892778@gmail.com>
Date: Sat, 17 Jun 2023 20:42:22 +0800
Subject: [PATCH] Fix bug

---
 .../com/fongmi/android/tv/event/ErrorEvent.java  |  2 +-
 .../fongmi/android/tv/player/parse/ParseJob.java | 16 ++++++----------
 2 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/app/src/main/java/com/fongmi/android/tv/event/ErrorEvent.java b/app/src/main/java/com/fongmi/android/tv/event/ErrorEvent.java
index 7508db780..64e356e49 100644
--- a/app/src/main/java/com/fongmi/android/tv/event/ErrorEvent.java
+++ b/app/src/main/java/com/fongmi/android/tv/event/ErrorEvent.java
@@ -53,7 +53,7 @@ public class ErrorEvent {
     }
 
     public boolean isFormat() {
-        return getType() == Type.FORMAT;
+        return Type.FORMAT.equals(getType());
     }
 
     public String getMsg() {
diff --git a/app/src/main/java/com/fongmi/android/tv/player/parse/ParseJob.java b/app/src/main/java/com/fongmi/android/tv/player/parse/ParseJob.java
index d54422700..30e7217b9 100644
--- a/app/src/main/java/com/fongmi/android/tv/player/parse/ParseJob.java
+++ b/app/src/main/java/com/fongmi/android/tv/player/parse/ParseJob.java
@@ -97,13 +97,13 @@ public class ParseJob implements ParseCallback {
         }
     }
 
-    private void jsonParse(Parse item, String webUrl, boolean error) throws Exception {
+    private void jsonParse(Parse item, String webUrl, boolean simple) throws Exception {
         String body = OkHttp.newCall(item.getUrl() + webUrl, Headers.of(item.getHeaders())).execute().body().string();
         JsonObject object = JsonParser.parseString(body).getAsJsonObject();
         object = object.has("data") ? object.getAsJsonObject("data") : object;
         boolean illegal = body.contains("不存在") || body.contains("已过期");
         String url = illegal ? "" : Json.safeString(object, "url");
-        checkResult(getHeader(object), url, item.getName(), error);
+        checkResult(getHeader(object), url, item.getName(), simple);
     }
 
     private void jsonExtend(String webUrl) throws Exception {
@@ -138,12 +138,8 @@ public class ParseJob implements ParseCallback {
         }
     }
 
-    private void checkResult(Map<String, String> headers, String url, String from, boolean error) {
-        if (isPass(headers, url)) {
-            onParseSuccess(headers, url, from);
-        } else if (error) {
-            onParseError();
-        }
+    private void checkResult(Map<String, String> headers, String url, String from, boolean simple) {
+        if (simple || isPass(headers, url)) onParseSuccess(headers, url, from);
     }
 
     private void checkResult(Result result) {
@@ -154,8 +150,8 @@ public class ParseJob implements ParseCallback {
 
     private boolean isPass(Map<String, String> headers, String url) {
         try {
-            int code = OkHttp.newCall(url, Headers.of(headers)).execute().code();
-            return code == 200 && url.length() >= 40;
+            if (url.length() < 40) return false;
+            return OkHttp.newCall(url, Headers.of(headers)).execute().code() == 200;
         } catch (Exception e) {
             return false;
         }