From 3d4140d6d9d1a740a9923be5fa89c3cdeda780ee Mon Sep 17 00:00:00 2001
From: FongMi <b8892778@gmail.com>
Date: Thu, 28 Jul 2022 15:19:40 +0800
Subject: [PATCH] Fix spider has md5 problem

---
 app/src/main/AndroidManifest.xml              |  6 +++-
 .../main/java/com/fongmi/bear/ApiConfig.java  |  1 +
 .../com/fongmi/bear/impl/KeyDownImpl.java     | 12 -------
 .../bear/ui/activity/DetailActivity.java      |  3 +-
 .../java/com/fongmi/bear/utils/KeyDown.java   | 31 ++++++++++++-------
 5 files changed, 27 insertions(+), 26 deletions(-)
 delete mode 100644 app/src/main/java/com/fongmi/bear/impl/KeyDownImpl.java

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index fc3720d29..f004d6f31 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -4,10 +4,14 @@
     package="com.fongmi.bear">
 
     <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
-    <uses-permission android:name="android.permission.MANAGE_EXTERNAL_STORAGE" tools:ignore="ScopedStorage" />
+
+    <uses-permission
+        android:name="android.permission.MANAGE_EXTERNAL_STORAGE"
+        tools:ignore="ScopedStorage" />
 
     <uses-feature
         android:name="android.hardware.touchscreen"
diff --git a/app/src/main/java/com/fongmi/bear/ApiConfig.java b/app/src/main/java/com/fongmi/bear/ApiConfig.java
index e0edfc777..f3ad1df44 100644
--- a/app/src/main/java/com/fongmi/bear/ApiConfig.java
+++ b/app/src/main/java/com/fongmi/bear/ApiConfig.java
@@ -131,6 +131,7 @@ public class ApiConfig {
     }
 
     private void parseJar(String spider) throws Exception {
+        if (spider.contains(";md5")) spider = spider.split(";md5")[0];
         if (spider.startsWith("file://")) {
             loader.load(FileUtil.getLocal(spider));
         } else if (Patterns.WEB_URL.matcher(spider).matches()) {
diff --git a/app/src/main/java/com/fongmi/bear/impl/KeyDownImpl.java b/app/src/main/java/com/fongmi/bear/impl/KeyDownImpl.java
deleted file mode 100644
index 84c319131..000000000
--- a/app/src/main/java/com/fongmi/bear/impl/KeyDownImpl.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.fongmi.bear.impl;
-
-public interface KeyDownImpl {
-
-    void onSeeking(int time);
-
-    void onSeekTo(int time);
-
-    void onKeyDown();
-
-    void onKeyCenter();
-}
diff --git a/app/src/main/java/com/fongmi/bear/ui/activity/DetailActivity.java b/app/src/main/java/com/fongmi/bear/ui/activity/DetailActivity.java
index 014ffeca8..1c45e9ddc 100644
--- a/app/src/main/java/com/fongmi/bear/ui/activity/DetailActivity.java
+++ b/app/src/main/java/com/fongmi/bear/ui/activity/DetailActivity.java
@@ -25,7 +25,6 @@ import com.fongmi.bear.bean.Vod;
 import com.fongmi.bear.databinding.ActivityDetailBinding;
 import com.fongmi.bear.databinding.ViewControllerBottomBinding;
 import com.fongmi.bear.event.PlayerEvent;
-import com.fongmi.bear.impl.KeyDownImpl;
 import com.fongmi.bear.model.SiteViewModel;
 import com.fongmi.bear.player.Players;
 import com.fongmi.bear.ui.presenter.EpisodePresenter;
@@ -44,7 +43,7 @@ import org.greenrobot.eventbus.ThreadMode;
 import java.util.ArrayList;
 import java.util.List;
 
-public class DetailActivity extends BaseActivity implements KeyDownImpl {
+public class DetailActivity extends BaseActivity implements KeyDown.Listener {
 
     private ViewControllerBottomBinding mControl;
     private ViewGroup.LayoutParams mFrameParams;
diff --git a/app/src/main/java/com/fongmi/bear/utils/KeyDown.java b/app/src/main/java/com/fongmi/bear/utils/KeyDown.java
index ec1c89ab7..20a908577 100644
--- a/app/src/main/java/com/fongmi/bear/utils/KeyDown.java
+++ b/app/src/main/java/com/fongmi/bear/utils/KeyDown.java
@@ -2,32 +2,30 @@ package com.fongmi.bear.utils;
 
 import android.view.KeyEvent;
 
-import com.fongmi.bear.impl.KeyDownImpl;
-
 public class KeyDown {
 
-    private final KeyDownImpl mKeyDown;
+    private final Listener mListener;
     private int mHoldTime;
 
-    public static KeyDown create(KeyDownImpl keyDown) {
-        return new KeyDown(keyDown);
+    public static KeyDown create(Listener listener) {
+        return new KeyDown(listener);
     }
 
-    private KeyDown(KeyDownImpl keyDown) {
-        this.mKeyDown = keyDown;
+    private KeyDown(Listener listener) {
+        this.mListener = listener;
     }
 
     public boolean onKeyDown(KeyEvent event) {
         boolean isLeft = isLeftKey(event);
         boolean isRight = isRightKey(event);
         if (event.getAction() == KeyEvent.ACTION_DOWN && (isLeft || isRight)) {
-            mKeyDown.onSeeking(isRight ? addTime() : subTime());
+            mListener.onSeeking(isRight ? addTime() : subTime());
         } else if (event.getAction() == KeyEvent.ACTION_UP && (isLeft || isRight)) {
-            mKeyDown.onSeekTo(mHoldTime);
+            mListener.onSeekTo(mHoldTime);
         } else if (event.getAction() == KeyEvent.ACTION_UP && isDownKey(event)) {
-            mKeyDown.onKeyDown();
+            mListener.onKeyDown();
         } else if (event.getAction() == KeyEvent.ACTION_UP && isEnterKey(event)) {
-            mKeyDown.onKeyCenter();
+            mListener.onKeyCenter();
         }
         return true;
     }
@@ -67,4 +65,15 @@ public class KeyDown {
     private boolean isRightKey(KeyEvent event) {
         return event.getKeyCode() == KeyEvent.KEYCODE_DPAD_RIGHT;
     }
+
+    public interface Listener {
+
+        void onSeeking(int time);
+
+        void onSeekTo(int time);
+
+        void onKeyDown();
+
+        void onKeyCenter();
+    }
 }