升级版本

q215613905 · Dec 26, 2023 · cec5155 · cec5155
1 parent 7f3efe6
commit cec5155
Show file tree

Hide file tree

Showing 81 changed files with 11 additions and 9,806 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -28,16 +28,17 @@ android {
             minifyEnabled false
 
             ndk {
-                abiFilters 'armeabi-v7a'
+                abiFilters 'arm64-v8a'
             }
         }
         release {
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
             minifyEnabled true
 
             ndk {
-                abiFilters 'armeabi-v7a'
+                abiFilters 'arm64-v8a'
             }
+            signingConfig signingConfigs.debug
         }
     }
 
@@ -87,7 +88,12 @@ dependencies {
     implementation 'org.greenrobot:eventbus:3.2.0'
     implementation 'com.orhanobut:hawk:2.0.1'
 
-    implementation project(":player")
+    implementation 'xyz.doikki.android.dkplayer:dkplayer-java:3.3.7'
+    implementation 'xyz.doikki.android.dkplayer:dkplayer-ui:3.3.7'
+    implementation 'xyz.doikki.android.dkplayer:player-exo:3.3.7'
+    implementation 'xyz.doikki.android.dkplayer:player-ijk:3.3.7'
+    implementation 'xyz.doikki.android.dkplayer:videocache:3.3.7'
+
     //implementation project(":quickjs")
 
     implementation 'net.sourceforge.streamsupport:android-retrofuture:1.7.4'

diff --git a/app/src/main/java/com/github/tvbox/osc/server/ControlManager.java b/app/src/main/java/com/github/tvbox/osc/server/ControlManager.java
@@ -8,16 +8,10 @@
 
 import com.github.tvbox.osc.event.RefreshEvent;
 import com.github.tvbox.osc.receiver.SearchReceiver;
-import com.github.tvbox.osc.util.HawkConfig;
-import com.orhanobut.hawk.Hawk;
 
 import org.greenrobot.eventbus.EventBus;
 
 import java.io.IOException;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import tv.danmaku.ijk.media.player.IjkMediaPlayer;
 
 /**
  * @author pj567
@@ -85,7 +79,6 @@ public void onPushReceived(String url) {
             });
             try {
                 mServer.start();
-                IjkMediaPlayer.setDotPort(Hawk.get(HawkConfig.DOH_URL, 0) > 0, RemoteServer.serverPort);
                 break;
             } catch (IOException ex) {
                 RemoteServer.serverPort++;

diff --git a/app/src/main/java/com/github/tvbox/osc/ui/activity/PlayActivity.java b/app/src/main/java/com/github/tvbox/osc/ui/activity/PlayActivity.java
@@ -535,7 +535,6 @@ public void run() {
                         } else {
                             PlayerHelper.updateCfg(mVideoView, mVodPlayerCfg);
                         }
-                        mVideoView.setProgressKey(progressKey);
                         if (headers != null) {
                             mVideoView.setUrl(url, headers);
                         } else {

diff --git a/app/src/main/java/com/github/tvbox/osc/ui/dialog/BaseDialog.java b/app/src/main/java/com/github/tvbox/osc/ui/dialog/BaseDialog.java
@@ -24,7 +24,7 @@ public BaseDialog(Context context, int customDialogStyle) {
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
-        CutoutUtil.adaptCutoutAboveAndroidP(this, true);//设置刘海
+        CutoutUtil.adaptCutoutAboveAndroidP(this.getContext(), true);//设置刘海
         super.onCreate(savedInstanceState);
     }
 

diff --git a/app/src/main/java/com/github/tvbox/osc/ui/fragment/ModelSettingFragment.java b/app/src/main/java/com/github/tvbox/osc/ui/fragment/ModelSettingFragment.java
@@ -31,7 +31,6 @@
 import com.github.tvbox.osc.util.FileUtils;
 import com.github.tvbox.osc.util.HawkConfig;
 import com.github.tvbox.osc.util.HistoryHelper;
-import com.github.tvbox.osc.util.LOG;
 import com.github.tvbox.osc.util.OkGoHelper;
 import com.github.tvbox.osc.util.PlayerHelper;
 import com.lzy.okgo.OkGo;
@@ -48,7 +47,6 @@
 import java.util.List;
 
 import okhttp3.HttpUrl;
-import tv.danmaku.ijk.media.player.IjkMediaPlayer;
 
 /**
  * @author pj567
@@ -253,7 +251,6 @@ public void click(String value, int pos) {
                         Hawk.put(HawkConfig.DOH_URL, pos);
                         String url = OkGoHelper.getDohUrl(pos);
                         OkGoHelper.dnsOverHttps.setUrl(url.isEmpty() ? null : HttpUrl.get(url));
-                        IjkMediaPlayer.toggleDotPort(pos > 0);
                     }
 
                     @Override

diff --git a/app/src/main/java/com/github/tvbox/osc/ui/fragment/PlayFragment.java b/app/src/main/java/com/github/tvbox/osc/ui/fragment/PlayFragment.java
@@ -548,7 +548,6 @@ public void run() {
                         } else {
                             PlayerHelper.updateCfg(mVideoView, mVodPlayerCfg);
                         }
-                        mVideoView.setProgressKey(progressKey);
                         if (headers != null) {
                             mVideoView.setUrl(url, headers);
                         } else {

diff --git a/app/src/main/java/com/github/tvbox/osc/util/OkGoHelper.java b/app/src/main/java/com/github/tvbox/osc/util/OkGoHelper.java
@@ -31,10 +31,8 @@
 import okhttp3.HttpUrl;
 import okhttp3.OkHttpClient;
 import okhttp3.dnsoverhttps.DnsOverHttps;
-
 import okhttp3.internal.Util;
 import okhttp3.internal.Version;
-import xyz.doikki.videoplayer.exo.ExoMediaSourceHelper;
 
 public class OkGoHelper {
     public static final long DEFAULT_MILLISECONDS = 10000;      //默认的超时时间
@@ -63,7 +61,6 @@ static void initExoOkHttpClient() {
         }
         builder.dns(dnsOverHttps);
 
-        ExoMediaSourceHelper.getInstance(App.getInstance()).setOkClient(builder.build());
     }
 
     public static DnsOverHttps dnsOverHttps = null;

diff --git a/player/.gitignore b/player/.gitignore
diff --git a/player/build.gradle b/player/build.gradle
diff --git a/player/proguard-rules.pro b/player/proguard-rules.pro
diff --git a/player/src/main/AndroidManifest.xml b/player/src/main/AndroidManifest.xml
diff --git a/player/src/main/java/tv/danmaku/ijk/media/player/AbstractMediaPlayer.java b/player/src/main/java/tv/danmaku/ijk/media/player/AbstractMediaPlayer.java