+ios端的配置修改
This commit is contained in:
@@ -7,6 +7,8 @@ import 'package:flutter/foundation.dart';
|
||||
import 'package:flutter/widgets.dart';
|
||||
import 'package:flutter_bloc/flutter_bloc.dart';
|
||||
import 'package:video_player/video_player.dart';
|
||||
import 'package:media_kit/media_kit.dart';
|
||||
import 'package:media_kit_video/media_kit_video.dart';
|
||||
import 'package:shared_preferences/shared_preferences.dart';
|
||||
|
||||
import '../../data/onvif_client.dart';
|
||||
@@ -53,6 +55,31 @@ class LocalCameraCubit extends Cubit<LocalCameraState>
|
||||
/// 供页面渲染视频用;未就绪时为 null。
|
||||
VideoPlayerController? get videoController => _videoController;
|
||||
|
||||
// ===== iOS 专用:media_kit 播放器(Android 恒为 null)=====
|
||||
// iOS 的 video_player 后端是 AVPlayer,不支持 rtsp://;故 iOS 单独用 media_kit(libmpv)
|
||||
// 拉流,Android 保留 video_player(ExoPlayer) 低延迟链路,两条路按平台互不干扰。
|
||||
static final bool _usesMediaKit = !kIsWeb && Platform.isIOS;
|
||||
bool get usesMediaKit => _usesMediaKit;
|
||||
|
||||
Player? _mkPlayer;
|
||||
VideoController? _mkVideoController;
|
||||
bool _mkReady = false;
|
||||
StreamSubscription<String>? _mkErrorSub;
|
||||
StreamSubscription<bool>? _mkBufferingSub;
|
||||
|
||||
/// iOS:供页面渲染 media_kit `Video` 用;未就绪时为 null。
|
||||
VideoController? get videoControllerIOS => _mkVideoController;
|
||||
bool get iosVideoReady => _mkReady && _mkVideoController != null;
|
||||
|
||||
/// iOS:当前视频尺寸(拿不到时 0×0,渲染侧回退 16:9)。
|
||||
Size get iosVideoSize {
|
||||
final Player? p = _mkPlayer;
|
||||
if (p == null) return Size.zero;
|
||||
final int w = p.state.width ?? 0;
|
||||
final int h = p.state.height ?? 0;
|
||||
return Size(w.toDouble(), h.toDouble());
|
||||
}
|
||||
|
||||
static const String _prefsKeyLastList = 'local_camera_last_list';
|
||||
|
||||
// ===== 提示语常量(本功能为以太网「一对一」直连,不依赖 WiFi/移动数据)=====
|
||||
@@ -117,12 +144,15 @@ class LocalCameraCubit extends Cubit<LocalCameraState>
|
||||
final ok = await _isEthernetConnected();
|
||||
if (!ok) {
|
||||
final detail = await _describeNetworks();
|
||||
final header = Platform.isIOS
|
||||
? '未检测到局域网连接。请让 iPhone/iPad 与摄像头连入同一 WiFi 后重试'
|
||||
: msgNoNetworkEntry;
|
||||
emit(
|
||||
state.copyWith(
|
||||
phase: LocalCameraPhase.noNetwork,
|
||||
networkStep: ChainStatus.failed,
|
||||
discoveryStep: ChainStatus.idle,
|
||||
message: '$msgNoNetworkEntry\n\n当前网卡:$detail',
|
||||
message: '$header\n\n当前网卡:$detail',
|
||||
clearSelected: true,
|
||||
clearRtsp: true,
|
||||
showReconnect: false,
|
||||
@@ -314,6 +344,8 @@ class LocalCameraCubit extends Cubit<LocalCameraState>
|
||||
/// 打开单个候选 URL,[timeout] 内完成 initialize() 且首帧就绪即视为成功。
|
||||
/// 失败/超时则 dispose 后返回 false。传输方式(UDP/TCP)与缓冲水位在此刻由原生侧读调参配置决定。
|
||||
Future<bool> _tryPlay(String url, {required Duration timeout}) async {
|
||||
// iOS:AVPlayer 不支持 RTSP,改走 media_kit(libmpv)。
|
||||
if (_usesMediaKit) return _tryPlayMediaKit(url, timeout: timeout);
|
||||
VideoPlayerController? c;
|
||||
try {
|
||||
// 调参必须在 initialize 之前下发:LoadControl 与 RtspMediaSource.Factory 都是
|
||||
@@ -381,6 +413,10 @@ class LocalCameraCubit extends Cubit<LocalCameraState>
|
||||
_stopLagWatchdog();
|
||||
_stallTimer?.cancel();
|
||||
_stallTimer = null;
|
||||
if (_usesMediaKit) {
|
||||
await _disposeMediaKit();
|
||||
return;
|
||||
}
|
||||
final c = _videoController;
|
||||
_videoController = null;
|
||||
if (c != null) {
|
||||
@@ -396,6 +432,139 @@ class LocalCameraCubit extends Cubit<LocalCameraState>
|
||||
}
|
||||
}
|
||||
|
||||
// ===== iOS:media_kit(libmpv) 拉流实现 =====
|
||||
Future<bool> _tryPlayMediaKit(String url, {required Duration timeout}) async {
|
||||
try {
|
||||
// 每次拉流重建 Player,避免旧会话残留(对齐 Android 的 dispose+新建)。
|
||||
await _disposeMediaKit();
|
||||
final player = Player(
|
||||
configuration: PlayerConfiguration(
|
||||
// 减小解耦缓存,压低直播延迟(对应 Android 侧紧水位策略)。
|
||||
bufferSize: 1 * 1024 * 1024,
|
||||
// 关键:media_kit 默认协议白名单不含 rtsp/sdp,必须显式放行(并保留其余默认值),
|
||||
// 否则 RTSP 直接被判「协议不允许」放不出画面。
|
||||
protocolWhitelist: const <String>[
|
||||
'udp', 'rtp', 'tcp', 'tls', 'data', 'file',
|
||||
'http', 'https', 'crypto', 'rtsp', 'sdp',
|
||||
],
|
||||
),
|
||||
);
|
||||
final vc = VideoController(player);
|
||||
_mkPlayer = player;
|
||||
_mkVideoController = vc;
|
||||
_mkReady = false;
|
||||
|
||||
// 低延迟 + 抗花屏参数下发(对齐项目已验证的 media_kit RTSP 调优):
|
||||
// 必须在 open(loadfile) 之前、播放器空闲时下发;mpv 原生命令只暴露在 NativePlayer 上,
|
||||
// 每条 try/catch 静默忽略,避免不支持的属性破坏已能播放的路径。
|
||||
final Object? native = player.platform;
|
||||
Future<void> tryCmd(List<String> args) async {
|
||||
if (native is! NativePlayer) return;
|
||||
try {
|
||||
await native.command(args);
|
||||
} catch (e) {
|
||||
debugPrint('🎬 [iOS拉流] 忽略命令 $args:${e.runtimeType}');
|
||||
}
|
||||
}
|
||||
|
||||
// RTSP 走 TCP 交错(rtsp_transport 属 lavf 解封装选项,必须经 demuxer-lavf-o):
|
||||
// 局域网/图传 UDP 丢包会花屏,TCP 重传补全画面。注意同时保留 media_kit 默认白名单。
|
||||
await tryCmd([
|
||||
'set_property',
|
||||
'demuxer-lavf-o',
|
||||
'rtsp_transport=tcp,seg_max_retry=5,strict=experimental,'
|
||||
'allowed_extensions=ALL,'
|
||||
'protocol_whitelist=[udp,rtp,tcp,tls,data,file,http,https,crypto,rtsp,sdp]',
|
||||
]);
|
||||
// 关缓存 + 紧读前缓冲,压低直播延迟。
|
||||
await tryCmd(['set_property', 'cache', 'no']);
|
||||
await tryCmd(['set_property', 'demuxer-readahead-secs', '0.3']);
|
||||
|
||||
// 断流判定:error 非空 或 缓冲卡死超 12s → 触发自动重连(与 Android 语义一致)。
|
||||
_mkErrorSub = player.stream.error.listen((e) {
|
||||
if (e.isNotEmpty &&
|
||||
state.phase == LocalCameraPhase.playing &&
|
||||
!_userStopped) {
|
||||
debugPrint('🎬 [iOS拉流] 运行错误:$e');
|
||||
_handleDisconnected();
|
||||
}
|
||||
});
|
||||
_mkBufferingSub = player.stream.buffering.listen((b) {
|
||||
if (state.phase != LocalCameraPhase.playing || _userStopped) return;
|
||||
_stallTimer?.cancel();
|
||||
if (b) {
|
||||
_stallTimer = Timer(const Duration(seconds: 12), _handleDisconnected);
|
||||
} else {
|
||||
_stallTimer = null;
|
||||
}
|
||||
});
|
||||
|
||||
// 首帧就绪判据:拿到宽度(>0)即认为流已连上并可渲染。
|
||||
final completer = Completer<bool>();
|
||||
late StreamSubscription<int?> wSub;
|
||||
wSub = player.stream.width.listen((w) {
|
||||
if ((w ?? 0) > 0 && !completer.isCompleted) completer.complete(true);
|
||||
});
|
||||
unawaited(
|
||||
player.open(Media(url), play: true).catchError((Object e) {
|
||||
debugPrint('🎬 [iOS拉流] open 抛错:$e');
|
||||
if (!completer.isCompleted) completer.complete(false);
|
||||
}),
|
||||
);
|
||||
|
||||
final bool ok =
|
||||
await completer.future.timeout(timeout, onTimeout: () => false);
|
||||
await wSub.cancel();
|
||||
if (!ok) {
|
||||
await _disposeMediaKit();
|
||||
return false;
|
||||
}
|
||||
_mkReady = true;
|
||||
debugPrint('🎬 [iOS拉流] 成功:$url');
|
||||
return true;
|
||||
} catch (e) {
|
||||
debugPrint('🎬 [iOS拉流] 异常:$e');
|
||||
await _disposeMediaKit();
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
Future<void> _disposeMediaKit() async {
|
||||
await _mkErrorSub?.cancel();
|
||||
_mkErrorSub = null;
|
||||
await _mkBufferingSub?.cancel();
|
||||
_mkBufferingSub = null;
|
||||
_stallTimer?.cancel();
|
||||
_stallTimer = null;
|
||||
final p = _mkPlayer;
|
||||
_mkPlayer = null;
|
||||
_mkVideoController = null;
|
||||
_mkReady = false;
|
||||
if (p != null) {
|
||||
try {
|
||||
await p.dispose();
|
||||
} catch (e) {
|
||||
debugPrint('🧹 [iOS释放] player.dispose 失败(RTSP 会话可能未 TEARDOWN):$e');
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// iOS:局域网连通判据——走同一 WiFi(或以太网),不要求 USB 以太网卡存在。
|
||||
Future<bool> _isLanConnectedForIOS() async {
|
||||
try {
|
||||
final results = await Connectivity().checkConnectivity();
|
||||
final bool lan = results.contains(ConnectivityResult.wifi) ||
|
||||
results.contains(ConnectivityResult.ethernet);
|
||||
debugPrint(
|
||||
'🌐 [网络检查-iOS] ${lan ? "已连接 WiFi/以太网 LAN ✔" : "未见 LAN"}:$results',
|
||||
);
|
||||
return lan;
|
||||
} catch (e) {
|
||||
debugPrint('🌐 [网络检查-iOS] connectivity 失败:$e(保守放行,交给后续探测)');
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
void _cancelWatchdog() {
|
||||
_openWatchdog?.cancel();
|
||||
_openWatchdog = null;
|
||||
@@ -416,6 +585,10 @@ class LocalCameraCubit extends Cubit<LocalCameraState>
|
||||
@override
|
||||
void didChangeAppLifecycleState(AppLifecycleState state) {
|
||||
// 参数必须叫 state(重写方法不得改名),所以下面访问 Cubit 自己的状态时必须带 this.。
|
||||
if (_usesMediaKit) {
|
||||
_handleLifecycleMediaKit(state);
|
||||
return;
|
||||
}
|
||||
final VideoPlayerController? c = _videoController;
|
||||
if (state == AppLifecycleState.paused ||
|
||||
state == AppLifecycleState.hidden) {
|
||||
@@ -447,8 +620,36 @@ class LocalCameraCubit extends Cubit<LocalCameraState>
|
||||
// 据此重拉流只会把正常观看打断。
|
||||
}
|
||||
|
||||
/// iOS(media_kit) 的生命周期处理:退后台只 pause(media_kit 无 video_player 的 seekTo(0)
|
||||
/// 棘轮问题),回前台直接重拉流以回到实时边缘。
|
||||
void _handleLifecycleMediaKit(AppLifecycleState lifecycle) {
|
||||
final p = _mkPlayer;
|
||||
if (lifecycle == AppLifecycleState.paused ||
|
||||
lifecycle == AppLifecycleState.hidden) {
|
||||
if (p != null &&
|
||||
state.phase == LocalCameraPhase.playing &&
|
||||
p.state.playing) {
|
||||
_resumeOnForeground = true;
|
||||
unawaited(p.pause());
|
||||
_stallTimer?.cancel();
|
||||
_stallTimer = null;
|
||||
debugPrint('🧊 [生命周期-iOS] 退后台:已暂停(回前台重拉流)');
|
||||
}
|
||||
return;
|
||||
}
|
||||
if (lifecycle == AppLifecycleState.resumed && _resumeOnForeground) {
|
||||
_resumeOnForeground = false;
|
||||
if (_userStopped || isClosed) return;
|
||||
if (state.phase == LocalCameraPhase.connecting) return;
|
||||
debugPrint('🔥 [生命周期-iOS] 回前台:重拉流以回到实时边缘');
|
||||
unawaited(reapplyAndReplay());
|
||||
}
|
||||
}
|
||||
|
||||
// ===== 延迟水位观测 =====
|
||||
void _startLagWatchdog() {
|
||||
// 该探针依赖 video_player 的 buffered/position 语义;iOS(media_kit) 无对应读数,跳过。
|
||||
if (_usesMediaKit) return;
|
||||
_lagTimer?.cancel();
|
||||
_prevPosMs = -1;
|
||||
_prevBufMs = -1;
|
||||
@@ -536,7 +737,9 @@ class LocalCameraCubit extends Cubit<LocalCameraState>
|
||||
state.copyWith(
|
||||
phase: LocalCameraPhase.disconnected,
|
||||
playStep: ChainStatus.failed,
|
||||
message: msgDisconnected,
|
||||
message: _usesMediaKit
|
||||
? '局域网连接已断开,请检查 WiFi 与摄像头是否在线'
|
||||
: msgDisconnected,
|
||||
showReconnect: true,
|
||||
),
|
||||
);
|
||||
@@ -690,6 +893,11 @@ class LocalCameraCubit extends Cubit<LocalCameraState>
|
||||
/// 1) `connectivity_plus` 直接报 `ConnectivityResult.ethernet`;
|
||||
/// 2) 本机网卡里存在“名字像以太网 或 非 WiFi/移动”的 IPv4 接口。
|
||||
Future<bool> _isEthernetConnected() async {
|
||||
// iOS 无「USB-C 转以太网直连摄像头」这条链路,本功能改走同一 WiFi 局域网,
|
||||
// 判据放宽为「连上 WiFi/以太网 LAN」,不再要求以太网卡存在。
|
||||
if (Platform.isIOS) {
|
||||
return _isLanConnectedForIOS();
|
||||
}
|
||||
// 信号 1
|
||||
try {
|
||||
final results = await Connectivity().checkConnectivity();
|
||||
|
||||
Reference in New Issue
Block a user