Fix Bug: SuperPlayer

SuperPlayer在 iOS 上无法播放 rtmp，换用 fijkplayer
2022-04-30 19:40:11 +08:00
parent fc8f56e491
commit 078447dc58
8 changed files with 107 additions and 167 deletions
@@ -2145,7 +2145,6 @@ Future getDwspUrlNew(
  print('判断_dwspUrl是否是视频地址？');
  print('_dwspUrl ： ${_dwspUrl}');
  if (!isVideoUrl(_dwspUrl)) {
-    print('_dwspUrl非视频地址？');
    Fluttertoast.showToast(
      msg: '获取 $getingDwmc 点位视频地址失败，请稍后重试。',
      toastLength: Toast.LENGTH_SHORT,
@@ -2154,7 +2153,6 @@ Future getDwspUrlNew(
    //正在获取点位视频标志，禁止重入
    getingDwVideo = false;
  } else {
-    print('_dwspUrl非视频地址？');
    print('开始播放视频地址');
    playUrl(index: indexRecord, url: _dwspUrl, context: context);
  }
@@ -44,11 +44,11 @@ EXTERNAL SOURCES:

 SPEC CHECKSUMS:
  AFNetworking: 7864c38297c79aaca1500c33288e429c3451fdce
-  Flutter: 434fef37c0980e73bb6479ef766c45957d4b510c
+  Flutter: 0e3d915762c693b495b44d77113d4970485de6ec
  flutter_superplayer: 50d64a438d4e917295d7c8d8124bcc239f323dad
  Masonry: 678fab65091a9290e40e2832a55e7ab731aad201
  TXLiteAVSDK_Professional: 165018e2f0570d2608d7ea2b785fc273558f9920

 PODFILE CHECKSUM: b1f7a399522c118a74b177b13c01eca692aa7e6d

-COCOAPODS: 1.10.1
+COCOAPODS: 1.11.2
@@ -151,6 +151,7 @@
 				9705A1C41CF9048500538489 /* Embed Frameworks */,
 				3B06AD1E1E4923F5004D2608 /* Thin Binary */,
 				EFF62BD560582B20FF73FC03 /* [CP] Copy Pods Resources */,
+				BF68C3AC7529D977444CE650 /* [CP] Embed Pods Frameworks */,
 			);
 			buildRules = (
 			);
@@ -258,6 +259,23 @@
 			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
 			showEnvVarsInLog = 0;
 		};
+		BF68C3AC7529D977444CE650 /* [CP] Embed Pods Frameworks */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputFileListPaths = (
+				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist",
+			);
+			name = "[CP] Embed Pods Frameworks";
+			outputFileListPaths = (
+				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist",
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n";
+			showEnvVarsInLog = 0;
+		};
 		EFF62BD560582B20FF73FC03 /* [CP] Copy Pods Resources */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
@@ -1,6 +1,7 @@
 import 'dart:async';
 import 'dart:convert';
 import 'dart:ui';
+import 'dart:io';

 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
@@ -12,12 +13,11 @@ import 'package:hyzp_ybqx/components/dioFun.dart';
 import 'package:hyzp_ybqx/provider/player_ratio.dart';
 import 'package:hyzp_ybqx/provider/player_region.dart';
 import 'package:provider/provider.dart';
+import 'package:fijkplayer/fijkplayer.dart';

 import '../components/commonFun.dart';
 import '../services/Storage.dart';

-const _kControlViewTypes = [kControlViewTypeDefault, kControlViewTypeWithout];
-
 class SuperPlayerPage extends StatefulWidget {
  SuperPlayerPage(
      {@required this.url,
@@ -38,31 +38,28 @@ class SuperPlayerPage extends StatefulWidget {
 }

 class _SuperPlayerPageState extends State<SuperPlayerPage> with SuperPlayerListener {
-  SuperPlayerController _playerController = SuperPlayerController();
+  final SuperPlayerController _playerController = SuperPlayerController();
+  final FijkPlayer _ijkPlayer = FijkPlayer();

  String _sdkVersion = 'Unknown';
  List<String> _logs = [];
  bool bFullScreen = false;

-  String _controlViewType = _kControlViewTypes.first;
-
  @override
  void dispose() {
    Playing = false;
    // 云台控制代码：1：停止动作、3：启动雨刷、11：焦距变大、12：焦距变小
    setSphericalCameraDio(id: widget.id, dwip: widget.dwip, cmdCode: 1);
    super.dispose();
+    _ijkPlayer.release();
+    _playerController.resetPlayer();
+    _playerController.release();
+    SystemChrome.setPreferredOrientations([DeviceOrientation.portraitUp]);
  }

  @override
  void initState() {
    super.initState();
-    //initPlatformState();
-    // Future.delayed(const Duration(milliseconds: 1000), () {
-    //   _playerController.playWithModel(SuperPlayerModel(url: widget.url));
-    //   setState(() {
-    //   });
-    // });
    init();
  }

@@ -70,38 +67,26 @@ class _SuperPlayerPageState extends State<SuperPlayerPage> with SuperPlayerListe
    await _playerController.addListener(this);
    await initPlatformState();
    if (!mounted) return;
-    print('mounted = ${mounted}');
-    // 开启调试日志
-    //await FTXPlayerController.setConsoleEnabled(true);
-    // 初始化播放器
-    //await _controller.initialize(onlyAudio: true);

-    await _playerController.uiHideDanmu(); // 隐藏弹幕
-    //设置播放循环，默认播放器的循环次数是1， 即不循环播放。如果设置循环次数0，表示无限循环。
-    if (0 == widget.loop) {
-      await _playerController.setLoop(true);
+    if (_useIJKPlayer) {
+      await _playerController.removeListener(this);
+      _ijkPlayer.addListener(_fijkValueListener);
+      _ijkPlayer.setDataSource(widget.url, autoPlay: true);
+    } else {
+      await _playerController.uiHideDanmu();
+      if (0 == widget.loop) {
+        await _playerController.setLoop(true);
+      }
+      await _playerController.playWithModel(testSuperPlayerModel);
    }
+  }

-    await _playerController.playWithModel(testSuperPlayerModel);
-    //_controller.play("http://clips.vorwaerts-gmbh.de/big_buck_bunny.mp4");
-    // _controller
-    //     .play('rtmp://125.64.218.67:9901/rtp/gb_play_34020000001320003016_34020000001320003016');
-    // 设置循环播放
-    //await _controller.setLoop(true);
-    // 开始播放
-    //await _controller.play("http://125.64.218.67:9908/video/2_6063_20210409_140608_川Q31715.mp4");
+  bool get _useIJKPlayer {
+    return Platform.isIOS && widget.url.startsWith("rtmp");
  }

  SuperPlayerModel get testSuperPlayerModel {
-    // int appId = 1252463788;
-    // String fileId = "5285890781763144364";
-
-    SuperPlayerModel superPlayerModel = SuperPlayerModel(
-      url: widget.url,
-      // appId: appId,
-      // videoId: SuperPlayerVideoId(fileId: fileId),
-    );
-    return superPlayerModel;
+    return SuperPlayerModel(url: widget.url);
  }

  // Platform messages are asynchronous, so we initialize in an async method.
@@ -157,7 +142,6 @@ class _SuperPlayerPageState extends State<SuperPlayerPage> with SuperPlayerListe
    double _outerRadius = 270;
    double _innerRadius = _outerRadius / 2;

-    //double barHeight = bFullScreen ? 0 : MediaQueryData.fromWindow(window).padding.top;
    return Scaffold(
      appBar: bFullScreen
          ? null
@@ -168,13 +152,9 @@ class _SuperPlayerPageState extends State<SuperPlayerPage> with SuperPlayerListe
                automaticallyImplyLeading: false,
                centerTitle: true,
                titleSpacing: 0.0,
-                //设置title的左边距
                flexibleSpace: Container(
-                  //SizedBox(height: ScreenUtil().statusBarHeight), //显示顶部状态栏
-                  // SizedBox(height: ScreenUtil().setHeight(10)), //显示顶部状态栏
                  padding: EdgeInsets.only(top: ScreenUtil().statusBarHeight), //留出顶部状态栏高度
                  child: Container(
-                    //height: ScreenUtil().setHeight(173),
                    decoration: BoxDecoration(
                      gradient: LinearGradient(
                        begin: Alignment.centerLeft,
@@ -185,12 +165,6 @@ class _SuperPlayerPageState extends State<SuperPlayerPage> with SuperPlayerListe
                        ],
                      ),
                    ),
-                    // decoration: BoxDecoration(
-                    //   gradient: LinearGradient(colors: [
-                    //     Color(0xFF0018EB),
-                    //     Color(0xFF01C1D9),
-                    //   ], begin: Alignment.bottomCenter, end: Alignment.topCenter),
-                    // ),
                  ),
                ),
                title: Padding(
@@ -203,7 +177,7 @@ class _SuperPlayerPageState extends State<SuperPlayerPage> with SuperPlayerListe
                        iconData: Icons.chevron_left_outlined,
                        onPress: () {
                          getingDwVideo = false;
-                          Navigator.pop(context);
+                          pop();
                        },
                      ),
                      Expanded(
@@ -220,16 +194,12 @@ class _SuperPlayerPageState extends State<SuperPlayerPage> with SuperPlayerListe
            ),
      body: WillPopScope(
        child: Container(
-          // height: ScreenUtil().screenHeight -
-          //     ScreenUtil().statusBarHeight -
-          //     ScreenUtil().bottomBarHeight,
          color: Color.fromRGBO(224, 224, 224, 1),
          child: Column(
            children: <Widget>[
              //第2行组件，视频播放区
              Center(
                child: Container(
-                  //padding: EdgeInsets.only(top: barHeight),
                  alignment: Alignment(0, -1),
                  width: MediaQuery.of(context).size.width,
                  height: MediaQuery.of(context).size.width * (9 / 16),
@@ -237,11 +207,7 @@ class _SuperPlayerPageState extends State<SuperPlayerPage> with SuperPlayerListe
                  child: Stack(
                    children: [
                      _playState <= 2 ? getMoreWidget(strokeWidth: 3.0) : SizedBox.shrink(),
-                      SuperPlayerView(
-                        controller: _playerController,
-                        controlViewType: _kControlViewTypes[0],
-                      ),
-                      //_playState < 3 ? SizedBox.shrink() : getMoreWidget(strokeWidth: 3.0),
+                      _useIJKPlayer ? FijkView(player: _ijkPlayer) : SuperPlayerView(controller: _playerController)
                    ],
                  ),
                ),
@@ -254,7 +220,6 @@ class _SuperPlayerPageState extends State<SuperPlayerPage> with SuperPlayerListe
                      children: [
                        SizedBox(width: ScreenUtil().setWidth(btn_left)),
                        getRoundButton(
-                          //(bPlaying) ? '暂停' : '播放',
                          text: playerRegionProvide.playerText,
                          icon: playerRegionProvide.playerIcon,
                          diameter: 130,
@@ -407,41 +372,27 @@ class _SuperPlayerPageState extends State<SuperPlayerPage> with SuperPlayerListe
                                }
                              },
                      ),
-                      // child: GridView.custom(
-                      //     // padding: EdgeInsets.only(
-                      //     //     left: ScreenUtil().setWidth(35), right: ScreenUtil().setWidth(35)),
-                      //     gridDelegate: SliverGridDelegateWithFixedCrossAxisCount(
-                      //       crossAxisCount: btnCount3,
-                      //       mainAxisSpacing: 0,
-                      //       crossAxisSpacing: 1,
-                      //       childAspectRatio: ratio3,
-                      //     ),
-                      //     childrenDelegate: SliverChildBuilderDelegate((context, position) {
-                      //       return getItemContainer(listData[position]);
-                      //     }, childCount: btnCount3)),
                    ),
-              //SizedBox(height: ScreenUtil().setHeight(49)),
-              //Divider(color: Colors.blue),
-              //第4行组件，分隔栏
-              // Container(
-              //   //height: 11,
-              //   height: ScreenUtil().setHeight(28),
-              //   color: Color.fromRGBO(224, 224, 224, 1),
-              // ),
            ],
          ),
        ),
        onWillPop: () {
-          Playing = false;
-          getingDwVideo = false;
          // 云台控制代码：1：停止动作、3：启动雨刷、11：焦距变大、12：焦距变小
          setSphericalCameraDio(id: widget.id, dwip: widget.dwip, cmdCode: 1);
-          Navigator.pop(context); //关闭弹框，播放输入视频地址
+          pop();
        },
      ),
    );
  }

+  pop() async {
+    Playing = false;
+    getingDwVideo = false;
+    _ijkPlayer.removeListener(() {});
+    await _playerController.removeListener(this);
+    Navigator.pop(context);
+  }
+
  @override
  void onClickFloatCloseBtn() {
    _addLog('onClickFloatCloseBtn', {});
@@ -450,7 +401,7 @@ class _SuperPlayerPageState extends State<SuperPlayerPage> with SuperPlayerListe
  @override
  void onClickSmallReturnBtn() {
    _addLog('onClickSmallReturnBtn', {});
-    Navigator.maybePop(context);
+    pop();
  }

  @override
@@ -496,6 +447,12 @@ class _SuperPlayerPageState extends State<SuperPlayerPage> with SuperPlayerListe
    _addLog('onStartFloatWindowPlay', {});
  }

+  void _fijkValueListener() {
+    FijkValue value = _ijkPlayer.value;
+    onPlayStateChange(value.state == FijkState.started ? 1 : 2);
+    onFullScreenChange(value.fullScreen);
+}
+
  //生成圆形按钮部件，基于图标
  Widget getRoundButton(
      {double diameter = 144,
@@ -554,13 +511,7 @@ class _SuperPlayerPageState extends State<SuperPlayerPage> with SuperPlayerListe
            child: Image.asset(image_path,
                fit: BoxFit.fitWidth,
                width: ScreenUtil().setWidth(imageSize),
-                //height: ScreenUtil().setWidth(iconSize),
                color: Color.fromRGBO(52, 157, 237, 1)),
-            // child: Icon(
-            //   icon,
-            //   size: ScreenUtil().setWidth(iconSize),
-            //   color: Color.fromRGBO(52, 157, 237, 1),
-            // ),
            decoration: BoxDecoration(
              color: color_bkg,
              borderRadius: BorderRadius.all(Radius.circular(200)),
@@ -576,44 +527,37 @@ class _SuperPlayerPageState extends State<SuperPlayerPage> with SuperPlayerListe

  bool bPlaying = true;

-  void playOrPause() {
+  Future<void> playOrPause() async {
    //state : 1 播放状态，2 暂停状态
-    _playerController.getPlayState().then((state) {
-      print('state = $state');
-      if (1 == state) {
-        bPlaying = false;
-        _playerController.pause();
-      } else {
-        bPlaying = true;
-        _playerController.resume();
-      }
-      playerRegionProvide.changePlayerState(bPlaying);
-      Storage.setString('bPlaying', bPlaying ? 'true' : 'false');
-      setState(() {});
-    });
+    int state;
+    if (_useIJKPlayer) {
+      state = _ijkPlayer.state == FijkState.started ? 1 : 2;
+    } else {
+      state = await _playerController.getPlayState();
+    }
+    
+    if (1 == state) {
+      bPlaying = false;
+      _useIJKPlayer ? _ijkPlayer.pause() : _playerController.pause();
+    } else {
+      bPlaying = true;
+      _useIJKPlayer ? _ijkPlayer.start() : _playerController.resume();
+    }
+    playerRegionProvide.changePlayerState(bPlaying);
+    Storage.setString('bPlaying', bPlaying ? 'true' : 'false');
+    setState(() {});
  }

  void restartPlay(String url) async {
    _playState = 4;
    bPlaying = true;
-    _playerController.resetPlayer();
-    _playerController.resume();
-    // //writeCurrentPosFile();
-    // await player.stop();
-    // await player.reset();
-    // await player.setOption(FijkOption.playerCategory, "mediacodec-all-videos", 1);
-    // await player.setOption(FijkOption.hostCategory, "enable-snapshot", 1);
-    // await player.setOption(FijkOption.hostCategory, "request-screen-on", 1);
-    // await player.setOption(FijkOption.hostCategory, "request-audio-focus", 1);
-    // await player.setOption(FijkOption.hostCategory, "enable-accurate-seek", 1);
-    // await player.setOption(FijkOption.hostCategory, "max-buffer-size", 500 * 1024);
-    // await player.setDataSource(url, autoPlay: true).catchError((e) {
-    //   print("setDataSource error: $e");
-    // });
-    // await player.setLoop(widget.loop); //设置播放循环，默认播放器的循环次数是1， 即不循环播放。如果设置循环次数0，表示无限循环。
-    // bPlaying = true;
-    // setState(() {});
-    // playerRegionProvide.changePlayerState(bPlaying);
+    if (_useIJKPlayer) {
+      await _ijkPlayer.reset();
+      _ijkPlayer.setDataSource(widget.url, autoPlay: true);
+    } else {
+      _playerController.resetPlayer();
+      _playerController.resume();
+    }
  }

  //生成播放控制区第2行按钮List
@@ -624,24 +568,6 @@ class _SuperPlayerPageState extends State<SuperPlayerPage> with SuperPlayerListe
    double _marginVer = 8;

    List<Widget> list = [
-      // getRoundButton(
-      //   diameter: _diameter,
-      //   iconSize: _iconSize,
-      //   text: '快退',
-      //   icon: Icons.fast_rewind,
-      //   onPress: () {
-      //     fastSeek(false);
-      //   },
-      // ),
-      // getRoundButton(
-      //   diameter: _diameter,
-      //   iconSize: _iconSize,
-      //   text: '快进',
-      //   icon: Icons.fast_forward,
-      //   onPress: () {
-      //     fastSeek(true);
-      //   },
-      // ),
      getRoundButton(
        diameter: _diameter,
        iconSize: _iconSize,
@@ -650,8 +576,6 @@ class _SuperPlayerPageState extends State<SuperPlayerPage> with SuperPlayerListe
        text: '放大',
        icon: Icons.zoom_in,
        onPress: () {
-          //print('Icons.videocam');
-          //_inputDialog(context2);
          if (10 >= playerRatioProvide.scale) {
            playerRatioProvide.changeScale(playerRatioProvide.scale + 0.5);
          }
@@ -665,27 +589,11 @@ class _SuperPlayerPageState extends State<SuperPlayerPage> with SuperPlayerListe
        text: '缩小',
        icon: Icons.zoom_out,
        onPress: () {
-          //print('Icons.videocam');
-          //_getFileDialog(context2);
          if (1 < playerRatioProvide.scale) {
            playerRatioProvide.changeScale(playerRatioProvide.scale - 0.5);
          }
        },
      ),
-//      _getIconAndTextButton(
-//        '还原',
-//        Icons.reply,
-//        Colors.orange,
-//        () {
-//          //print('Icons.videocam');
-//          //_getFileDialog(context2);
-//          // 更新当前位置
-//          playerRatioProvide.changeScale(1.0);
-//          playerRatioProvide.changeOffset(Offset(0, 0));
-//          playerRatioProvide.changeDeltaX(0.0);
-//          playerRatioProvide.changeDeltaY(0.0);
-//        },
-//      ),
      getRoundButton(
        diameter: _diameter,
        iconSize: _iconSize,
@@ -694,9 +602,6 @@ class _SuperPlayerPageState extends State<SuperPlayerPage> with SuperPlayerListe
        text: '截图',
        icon: Icons.camera_alt,
        onPress: () {
-          //通过上面定义的key，才能准确调用该类型的该对象的方法
-          //_myFijkPanelWidgetBuilderStateKey.currentState.takeSnapshot();
-          //_fijkPanelWidgetBuilder.currentState..takeSnapshot();
          takeSnapshot();
        },
      ),
@@ -708,8 +613,7 @@ class _SuperPlayerPageState extends State<SuperPlayerPage> with SuperPlayerListe
        text: '全屏',
        icon: Icons.fullscreen,
        onPress: () {
-          //player.enterFullScreen();
-          _playerController.toFullScreen();
+          _useIJKPlayer ? _ijkPlayer.enterFullScreen() : _playerController.toFullScreen();
        },
      ),
    ];