From 8bc424f3cf70a2906c0ecfc6e2f37996a0f33ff2 Mon Sep 17 00:00:00 2001
From: FongMi <b8892778@gmail.com>
Date: Wed, 11 Sep 2024 12:40:10 +0800
Subject: [PATCH] Revert zlive

---
 app/build.gradle                                          | 1 +
 .../main/java/com/fongmi/android/tv/player/Source.java    | 2 ++
 .../com/fongmi/android/tv/player/extractor/ZLive.java     | 8 ++++----
 zlive/build.gradle                                        | 4 +++-
 4 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index e91acd72b..311bddf10 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -99,6 +99,7 @@ android {
 dependencies {
     implementation project(':hook')
     implementation project(':tvbus')
+    implementation project(':zlive')
     implementation project(':catvod')
     implementation project(':quickjs')
     implementation project(':thunder')
diff --git a/app/src/main/java/com/fongmi/android/tv/player/Source.java b/app/src/main/java/com/fongmi/android/tv/player/Source.java
index fe7094f38..4cf9f41c9 100644
--- a/app/src/main/java/com/fongmi/android/tv/player/Source.java
+++ b/app/src/main/java/com/fongmi/android/tv/player/Source.java
@@ -13,6 +13,7 @@ import com.fongmi.android.tv.player.extractor.TVBus;
 import com.fongmi.android.tv.player.extractor.Thunder;
 import com.fongmi.android.tv.player.extractor.Video;
 import com.fongmi.android.tv.player.extractor.Youtube;
+import com.fongmi.android.tv.player.extractor.ZLive;
 import com.fongmi.android.tv.utils.UrlUtil;
 
 import java.util.ArrayList;
@@ -46,6 +47,7 @@ public class Source {
         extractors.add(new TVBus());
         extractors.add(new Video());
         extractors.add(new Youtube());
+        extractors.add(new ZLive());
     }
 
     private Extractor getExtractor(String url) {
diff --git a/app/src/main/java/com/fongmi/android/tv/player/extractor/ZLive.java b/app/src/main/java/com/fongmi/android/tv/player/extractor/ZLive.java
index dc5cc6c73..3abffd321 100644
--- a/app/src/main/java/com/fongmi/android/tv/player/extractor/ZLive.java
+++ b/app/src/main/java/com/fongmi/android/tv/player/extractor/ZLive.java
@@ -10,8 +10,8 @@ public class ZLive implements Source.Extractor {
     private boolean init;
 
     public void init() {
-        //com.east.android.zlive.ZLive.INSTANCE.OnLiveStart(6677);
-        //init = true;
+        com.east.android.zlive.ZLive.INSTANCE.OnLiveStart(6677);
+        init = true;
     }
 
     private String getLive(String uuid) {
@@ -42,8 +42,8 @@ public class ZLive implements Source.Extractor {
     @Override
     public void stop() {
         try {
-            //if (init) com.east.android.zlive.ZLive.INSTANCE.OnLiveStop();
-            //init = false;
+            if (init) com.east.android.zlive.ZLive.INSTANCE.OnLiveStop();
+            init = false;
         } catch (Throwable e) {
             e.printStackTrace();
         }
diff --git a/zlive/build.gradle b/zlive/build.gradle
index 86f0d017d..88110a3d4 100644
--- a/zlive/build.gradle
+++ b/zlive/build.gradle
@@ -3,6 +3,8 @@ plugins {
 }
 
 android {
+    namespace 'com.east.android.zlive'
+
     compileSdk 35
 
     defaultConfig {
@@ -13,5 +15,5 @@ android {
 }
 
 dependencies {
-    implementation 'net.java.dev.jna:jna:5.12.1'
+    implementation 'net.java.dev.jna:jna:5.14.0'
 }
\ No newline at end of file