Skip to content

fix: flutter version 3.24.3 adaptation #639

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
andfaraway wants to merge 3 commits into
base: master
Choose a base branch
from
Open

fix: flutter version 3.24.3 adaptation #639

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
86ffb6c
fix: flutter version 3.24.3 adaptation
Oct 23, 2024
06ef6f8
feat: 适配
Dec 31, 2025
6f80a59
codes commit
Dec 31, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion android/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,11 @@ version '0.11.0'
apply plugin: 'com.android.library'

android {
compileSdkVersion 30
if (project.android.hasProperty("namespace")) {
namespace("com.befovy.fijkplayer")
}

compileSdkVersion 34

defaultConfig {
minSdkVersion 16
Expand Down
154 changes: 38 additions & 116 deletions android/src/main/java/com/befovy/fijkplayer/FijkPlugin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand All @@ -63,64 +62,49 @@
*/
public class FijkPlugin implements MethodCallHandler, FlutterPlugin, ActivityAware, FijkEngine, FijkVolume.VolumeKeyListener, AudioManager.OnAudioFocusChangeListener {

// show system volume changed UI if no playable player
// hide system volume changed UI if some players are in playable state
private static final int NO_UI_IF_PLAYABLE = 0;
// show system volume changed UI if no start state player
// hide system volume changed UI if some players are in start state
private static final int NO_UI_IF_PLAYING = 1;
// never show system volume changed UI
@SuppressWarnings("unused")
private static final int NEVER_SHOW_UI = 2;
// always show system volume changed UI
private static final int ALWAYS_SHOW_UI = 3;

final private SparseArray<FijkPlayer> fijkPlayers = new SparseArray<>();

private final QueuingEventSink mEventSink = new QueuingEventSink();

private WeakReference<Activity> mActivity;
private WeakReference<Context> mContext;
private Registrar mRegistrar;
private Context mContext;
private FlutterPluginBinding mBinding;
private MethodChannel mMethodChannel;

// Count of playable players
private int playableCnt = 0;
// Count of playing players
private int playingCnt = 0;
private int volumeUIMode = ALWAYS_SHOW_UI;
private float volStep = 1.0f / 16.0f;
private boolean eventListening = false;
// non-local field prevent GC
private EventChannel mEventChannel;
private Object mAudioFocusRequest;
private boolean mAudioFocusRequested = false;


/**
* Plugin registration.
*/
@SuppressWarnings("unused")
public static void registerWith(Registrar registrar) {
final MethodChannel channel = new MethodChannel(registrar.messenger(), "befovy.com/fijk");
FijkPlugin plugin = new FijkPlugin();
plugin.initWithRegistrar(registrar);
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");
initWithBinding(binding);
channel.setMethodCallHandler(this);
mBinding = binding;
mContext = binding.getApplicationContext();
mMethodChannel = new MethodChannel(binding.getBinaryMessenger(), "befovy.com/fijk");
mMethodChannel.setMethodCallHandler(this);

final FijkPlayer player = new FijkPlayer(this, true);
player.setupSurface();
player.release();
// init event channel
mEventChannel = new EventChannel(binding.getBinaryMessenger(), "befovy.com/fijk/event");
mEventChannel.setStreamHandler(new EventChannel.StreamHandler() {
@Override
public void onListen(Object o, EventChannel.EventSink eventSink) {
mEventSink.setDelegate(eventSink);
}

@Override
public void onCancel(Object o) {
mEventSink.setDelegate(null);
}
});

AudioManager audioManager = audioManager();
if (audioManager != null) {
Expand All @@ -131,15 +115,18 @@ public void onAttachedToEngine(@NonNull FlutterPluginBinding binding) {

@Override
public void onDetachedFromEngine(@NonNull FlutterPluginBinding binding) {
mMethodChannel.setMethodCallHandler(null);
mEventChannel.setStreamHandler(null);
mEventSink.setDelegate(null);
mContext = null;
mBinding = null;
}

@Override
public void onAttachedToActivity(ActivityPluginBinding binding) {
public void onAttachedToActivity(@NonNull ActivityPluginBinding binding) {
mActivity = new WeakReference<>(binding.getActivity());
if (mActivity.get() instanceof FijkVolume.CanListenVolumeKey) {
FijkVolume.CanListenVolumeKey canListenVolumeKey = (FijkVolume.CanListenVolumeKey) mActivity.get();
canListenVolumeKey.setVolumeKeyListener(this);
if (binding.getActivity() instanceof FijkVolume.CanListenVolumeKey) {
((FijkVolume.CanListenVolumeKey) binding.getActivity()).setVolumeKeyListener(this);
}
}

Expand All @@ -149,11 +136,10 @@ public void onDetachedFromActivityForConfigChanges() {
}

@Override
public void onReattachedToActivityForConfigChanges(ActivityPluginBinding binding) {
public void onReattachedToActivityForConfigChanges(@NonNull ActivityPluginBinding binding) {
mActivity = new WeakReference<>(binding.getActivity());
if (mActivity.get() instanceof FijkVolume.CanListenVolumeKey) {
FijkVolume.CanListenVolumeKey canListenVolumeKey = (FijkVolume.CanListenVolumeKey) mActivity.get();
canListenVolumeKey.setVolumeKeyListener(this);
if (binding.getActivity() instanceof FijkVolume.CanListenVolumeKey) {
((FijkVolume.CanListenVolumeKey) binding.getActivity()).setVolumeKeyListener(this);
}
}

Expand All @@ -167,8 +153,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;
}
Expand All @@ -178,97 +162,35 @@ public TextureRegistry.SurfaceTextureEntry createSurfaceEntry() {
public BinaryMessenger messenger() {
if (mBinding != null) {
return mBinding.getBinaryMessenger();
} else if (mRegistrar != null) {
return mRegistrar.messenger();
}
return null;
}

@Override
@Nullable
public Context context() {
if (mContext != null)
return mContext.get();
else
return null;
return mContext;
}

@Nullable
private Activity activity() {
if (mRegistrar != null) {
return mRegistrar.activity();
} else if (mActivity != null) {
if (mActivity != null) {
return mActivity.get();
} else {
return null;
}
return null;
}

@Override
@Nullable
public String lookupKeyForAsset(@NonNull String asset, @Nullable String packageName) {
String path = null;
if (mBinding != null) {
if (TextUtils.isEmpty(packageName)) {
path = mBinding.getFlutterAssets().getAssetFilePathByName(asset);
} else {
//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());
init(binding.getBinaryMessenger());
}

/**
* Maybe call init more than once
*
* @param messenger BinaryMessenger from flutter engine
*/
private void init(BinaryMessenger messenger) {
if (mEventChannel != null) {
mEventChannel.setStreamHandler(null);
mEventSink.setDelegate(null);
}
mEventChannel = new EventChannel(messenger, "befovy.com/fijk/event");
mEventChannel.setStreamHandler(new EventChannel.StreamHandler() {
@Override
public void onListen(Object o, EventChannel.EventSink eventSink) {
mEventSink.setDelegate(eventSink);
}

@Override
public void onCancel(Object o) {
mEventSink.setDelegate(null);
}
});

AudioManager audioManager = audioManager();
if (audioManager != null) {
int max = audioManager.getStreamMaxVolume(AudioManager.STREAM_MUSIC);
volStep = Math.max(1.0f / (float) max, volStep);
if (mBinding == null) return null;
if (TextUtils.isEmpty(packageName)) {
return mBinding.getFlutterAssets().getAssetFilePathByName(asset);
} else {
return mBinding.getFlutterAssets().getAssetFilePathByName(asset, packageName);
}
}


@Override
public void onMethodCall(@NonNull MethodCall call, @NonNull Result result) {
Activity activity;
Expand Down Expand Up @@ -592,7 +514,7 @@ private AudioManager audioManager() {
if (context != null) {
return (AudioManager) context.getSystemService(Context.AUDIO_SERVICE);
} else {
Log.e("FIJKPLAYER", "context null, can't get AudioManager");
Log.e("FIJKPLAYER", "context null, can\'t get AudioManager");
return null;
}
}
Expand Down