From fee117dc40a5169534d9ca8fb774d1478223c739 Mon Sep 17 00:00:00 2001 From: QianLiang Date: Thu, 17 Oct 2024 14:59:15 +0800 Subject: [PATCH 1/4] feat: add namespace and update compileSdkVersion to 35 --- android/build.gradle | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/android/build.gradle b/android/build.gradle index aca8e7f4..d003767e 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -4,10 +4,11 @@ version '0.11.0' apply plugin: 'com.android.library' android { - compileSdkVersion 30 + namespace 'com.befovy.fijkplayer' + compileSdkVersion 35 defaultConfig { - minSdkVersion 16 + minSdkVersion 21 testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" } lintOptions { From ebf018a8acdc9d6040e6a13c8344662a7f7118cb Mon Sep 17 00:00:00 2001 From: Kanata Date: Fri, 11 Apr 2025 01:19:01 +0800 Subject: [PATCH 2/4] Remove legacy Registrar code and update plugin registration for new embedding --- .../com/befovy/fijkplayer/FijkPlugin.java | 28 +++---------------- 1 file changed, 4 insertions(+), 24 deletions(-) diff --git a/android/src/main/java/com/befovy/fijkplayer/FijkPlugin.java b/android/src/main/java/com/befovy/fijkplayer/FijkPlugin.java index fdff7ea0..5294d86d 100644 --- a/android/src/main/java/com/befovy/fijkplayer/FijkPlugin.java +++ b/android/src/main/java/com/befovy/fijkplayer/FijkPlugin.java @@ -54,7 +54,6 @@ import io.flutter.plugin.common.MethodChannel; import io.flutter.plugin.common.MethodChannel.MethodCallHandler; import io.flutter.plugin.common.MethodChannel.Result; -import io.flutter.plugin.common.PluginRegistry.Registrar; import io.flutter.view.TextureRegistry; import tv.danmaku.ijk.media.player.IjkMediaPlayer; @@ -81,7 +80,6 @@ public class FijkPlugin implements MethodCallHandler, FlutterPlugin, ActivityAwa private WeakReference mActivity; private WeakReference mContext; - private Registrar mRegistrar; private FlutterPluginBinding mBinding; // Count of playable players @@ -101,10 +99,10 @@ public class FijkPlugin implements MethodCallHandler, FlutterPlugin, ActivityAwa * Plugin registration. */ @SuppressWarnings("unused") - public static void registerWith(Registrar registrar) { - final MethodChannel channel = new MethodChannel(registrar.messenger(), "befovy.com/fijk"); + public static void registerWith(@NonNull FlutterPluginBinding binding) { + final MethodChannel channel = new MethodChannel(binding.getBinaryMessenger(), "befovy.com/fijk"); FijkPlugin plugin = new FijkPlugin(); - plugin.initWithRegistrar(registrar); + plugin.initWithBinding(binding); channel.setMethodCallHandler(plugin); final FijkPlayer player = new FijkPlayer(plugin, true); @@ -167,8 +165,6 @@ public void onDetachedFromActivity() { public TextureRegistry.SurfaceTextureEntry createSurfaceEntry() { if (mBinding != null) { return mBinding.getTextureRegistry().createSurfaceTexture(); - } else if (mRegistrar != null) { - return mRegistrar.textures().createSurfaceTexture(); } return null; } @@ -178,8 +174,6 @@ public TextureRegistry.SurfaceTextureEntry createSurfaceEntry() { public BinaryMessenger messenger() { if (mBinding != null) { return mBinding.getBinaryMessenger(); - } else if (mRegistrar != null) { - return mRegistrar.messenger(); } return null; } @@ -195,9 +189,7 @@ public Context context() { @Nullable private Activity activity() { - if (mRegistrar != null) { - return mRegistrar.activity(); - } else if (mActivity != null) { + if (mActivity != null) { return mActivity.get(); } else { return null; @@ -215,23 +207,11 @@ public String lookupKeyForAsset(@NonNull String asset, @Nullable String packageN //noinspection ConstantConditions path = mBinding.getFlutterAssets().getAssetFilePathByName(asset, packageName); } - } else if (mRegistrar != null) { - if (TextUtils.isEmpty(packageName)) { - path = mRegistrar.lookupKeyForAsset(asset); - } else { - path = mRegistrar.lookupKeyForAsset(asset, packageName); - } } return path; } - private void initWithRegistrar(@NonNull Registrar registrar) { - mRegistrar = registrar; - mContext = new WeakReference<>(registrar.activeContext()); - init(registrar.messenger()); - } - private void initWithBinding(@NonNull FlutterPluginBinding binding) { mBinding = binding; mContext = new WeakReference<>(binding.getApplicationContext()); From 76f206d6676a7cfe52c5d3cac1b7b01b52224197 Mon Sep 17 00:00:00 2001 From: QianLiang Date: Fri, 11 Apr 2025 15:04:37 +0800 Subject: [PATCH 3/4] refactor: remove legacy plugin registration method --- .../java/com/befovy/fijkplayer/FijkPlugin.java | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/android/src/main/java/com/befovy/fijkplayer/FijkPlugin.java b/android/src/main/java/com/befovy/fijkplayer/FijkPlugin.java index 5294d86d..bf41a1f6 100644 --- a/android/src/main/java/com/befovy/fijkplayer/FijkPlugin.java +++ b/android/src/main/java/com/befovy/fijkplayer/FijkPlugin.java @@ -94,22 +94,6 @@ public class FijkPlugin implements MethodCallHandler, FlutterPlugin, ActivityAwa private Object mAudioFocusRequest; private boolean mAudioFocusRequested = false; - - /** - * Plugin registration. - */ - @SuppressWarnings("unused") - public static void registerWith(@NonNull FlutterPluginBinding binding) { - final MethodChannel channel = new MethodChannel(binding.getBinaryMessenger(), "befovy.com/fijk"); - FijkPlugin plugin = new FijkPlugin(); - plugin.initWithBinding(binding); - channel.setMethodCallHandler(plugin); - - final FijkPlayer player = new FijkPlayer(plugin, true); - player.setupSurface(); - player.release(); - } - @Override public void onAttachedToEngine(@NonNull FlutterPluginBinding binding) { final MethodChannel channel = new MethodChannel(binding.getBinaryMessenger(), "befovy.com/fijk"); From 33e41d1482fca4120b52de4c787d5fc81db7c0b3 Mon Sep 17 00:00:00 2001 From: QianLiang Date: Fri, 11 Apr 2025 15:04:43 +0800 Subject: [PATCH 4/4] chore: update environment SDK and Flutter version requirements --- pubspec.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pubspec.yaml b/pubspec.yaml index 19c99b7c..8c9a57ec 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -6,8 +6,8 @@ repository: https://github.com/befovy/fijkplayer issue_tracker: https://github.com/befovy/fijkplayer/issues environment: - sdk: ">=2.14.0 <4.0.0" - flutter: ">=1.12.0" + sdk: ">=3.3.0 <4.0.0" + flutter: ">=3.3.0" dependencies: flutter: