fix download error & fix ios pip open failed % fix other known issue

Flutter/android/src/main/java/com/tencent/vod/flutter/FTXDownloadManager.java

@@ -144,6 +144,25 @@ public class FTXDownloadManager implements MethodChannel.MethodCallHandler, ITXV
                 deleteResult = TXVodDownloadManager.getInstance().deleteDownloadMediaInfo(mediaInfo);
             }
             result.success(deleteResult);
+        } else if (call.method.equals("resumeDownload")) {
+            Integer quality = call.argument("quality");
+            String videoUrl = call.argument("url");
+            Integer appId = call.argument("appId");
+            String fileId = call.argument("fileId");
+            String pSign = call.argument("pSign");
+            String userName = call.argument("userName");
+            TXVodDownloadMediaInfo mediaInfo = parseMediaInfoFromInfo(quality, videoUrl, appId, fileId, userName);
+            boolean resumeResult = false;
+            if (null != mediaInfo) {
+                TXVodDownloadDataSource dataSource = mediaInfo.getDataSource();
+                if (dataSource != null) {
+                    TXVodDownloadManager.getInstance().startDownload(dataSource);
+                } else {
+                    TXVodDownloadManager.getInstance().startDownloadUrl(mediaInfo.getUrl(), mediaInfo.getUserName());
+                }
+                resumeResult = true;
+            }
+            result.success(resumeResult);
         }
     }
 

Flutter/android/src/main/java/com/tencent/vod/flutter/FTXVodPlayer.java

@@ -6,6 +6,7 @@ import android.graphics.Bitmap;
 import android.graphics.SurfaceTexture;
 import android.os.Bundle;
 import android.text.TextUtils;
+import android.util.Log;
 import android.view.Surface;
 import androidx.annotation.NonNull;
 import com.tencent.rtmp.ITXVodPlayListener;
@@ -34,6 +35,8 @@ import java.util.Map;
  */
 public class FTXVodPlayer extends FTXBasePlayer implements MethodChannel.MethodCallHandler, ITXVodPlayListener {
 
+    private static final String TAG = "FTXVodPlayer";
+
     private FlutterPlugin.FlutterPluginBinding mFlutterPluginBinding;
 
     private final MethodChannel mMethodChannel;
@@ -143,6 +146,7 @@ public class FTXVodPlayer extends FTXBasePlayer implements MethodChannel.MethodC
         mMethodChannel.setMethodCallHandler(null);
         mEventChannel.setStreamHandler(null);
         mNetChannel.setStreamHandler(null);
+        releaseTXImageSprite();
         if (null != mPipManager) {
             mPipManager.releaseCallback(getPlayerId());
         }
@@ -352,10 +356,20 @@ public class FTXVodPlayer extends FTXBasePlayer implements MethodChannel.MethodC
         } else if (call.method.equals("initImageSprite")) {
             String vvtUrl = call.argument("vvtUrl");
             List<String> imageUrls = call.argument("imageUrls");
-            mTxImageSprite.setVTTUrlAndImageUrls(vvtUrl,imageUrls);
+            releaseTXImageSprite();
+            mTxImageSprite = new TXImageSprite(mFlutterPluginBinding.getApplicationContext());
+            mTxImageSprite.setVTTUrlAndImageUrls(vvtUrl, imageUrls);
             result.success(null);
         } else if (call.method.equals("getImageSprite")) {
             final Double time = call.argument("time");
+            getImageSprite(time, result);
+        } else {
+            result.notImplemented();
+        }
+    }
+
+    private void getImageSprite(final Double time, final MethodChannel.Result result) {
+        if (mTxImageSprite != null && null != time) {
             new Thread(new Runnable() {
                 @Override
                 public void run() {
@@ -371,7 +385,15 @@ public class FTXVodPlayer extends FTXBasePlayer implements MethodChannel.MethodC
                 }
             }).start();
         } else {
-            result.notImplemented();
+            Log.e(TAG, "getImageSprite failed, time is null or initImageSprite not invoke");
+            result.success(null);
+        }
+    }
+
+    private void releaseTXImageSprite() {
+        if (mTxImageSprite != null) {
+            mTxImageSprite.release();
+            mTxImageSprite = null;
         }
     }
 
@@ -380,7 +402,6 @@ public class FTXVodPlayer extends FTXBasePlayer implements MethodChannel.MethodC
             mVodPlayer = new TXVodPlayer(mFlutterPluginBinding.getApplicationContext());
             mVodPlayer.setVodListener(this);
             setPlayer(onlyAudio);
-            mTxImageSprite = new TXImageSprite(mFlutterPluginBinding.getApplicationContext());
         }
         return mSurfaceTextureEntry == null ? -1 : mSurfaceTextureEntry.id();
     }
@@ -427,6 +448,7 @@ public class FTXVodPlayer extends FTXBasePlayer implements MethodChannel.MethodC
         if (mVodPlayer != null) {
             return mVodPlayer.stopPlay(isNeedClearLastImg);
         }
+        releaseTXImageSprite();
         mHardwareDecodeFail = false;
         return Uninitialized;
     }

Flutter/docs/集成指引.md

@@ -225,6 +225,28 @@ uses-sdk:minSdkVersion 16 cannot be smaller than version 19 declared in library
      static const LOG_LEVEL_NULL = 6; // 不输出任何sdk log
    }
    ```
+9. 项目使用过程中，出现原生相关报错，例如`错误: 不兼容的类型`、`error: initializing 'BOOL' (aka 'bool') with an expression of incompatible type 'void'`等错误，是由于SDK更新，导致SDK与flutter端原生代码不兼容。此时只需要更新SDK版本即可。
+
+**解决方法**：在项目目录下，打开终端，依次输入如下命令
+```shell
+flutter pub cache clean
+flutter clean
+flutter pub upgrade
+flutter pub get
+```
+
+确保命令执行成功，更新本地flutter依赖。
+
+然后在ios目录下，打开终端，输入如下命令，更新IOS依赖
+
+```shell
+rm -rf Pods
+rm -rf Podfile.lock
+pod update
+```
+
+如果问题依然存在，可以尝试删除项目build文件夹，并且手动删除你电脑中的flutter依赖缓存文件夹`.pubcache`。然后重新刷新flutter pub依赖再进行编译运行。
+
 
 ## 更多功能
 

Flutter/example/lib/demo_download_list.dart

@@ -32,10 +32,11 @@ class _DemoDownloadListState extends State<StatefulWidget> {
   void registerListener() {
     DownloadHelper.instance.addDownloadListener(listener = FTXDownloadListener((event, info) {
       List<DownloadModel> tempModels = models;
-      for (DownloadModel downloadModel in tempModels) {
+      for (int i = 0; i < models.length; i++) {
+        DownloadModel downloadModel = models[i];
         if (_compareMediaInfo(downloadModel.mediaInfo, info)) {
-          tempModels.remove(downloadModel);
-          tempModels.add(DownloadModel(downloadModel.videoModel, info));
+          tempModels.removeAt(i);
+          tempModels.insert(i, DownloadModel(downloadModel.videoModel, info));
         }
       }
       setState(() {
@@ -43,10 +44,11 @@ class _DemoDownloadListState extends State<StatefulWidget> {
       });
     }, (errorCode, errorMsg, info) {
       List<DownloadModel> tempModels = models;
-      for (DownloadModel downloadModel in tempModels) {
+      for (int i = 0; i < models.length; i++) {
+        DownloadModel downloadModel = models[i];
         if (_compareMediaInfo(downloadModel.mediaInfo, info)) {
-          tempModels.remove(downloadModel);
-          tempModels.add(DownloadModel(downloadModel.videoModel, info));
+          tempModels.removeAt(i);
+          tempModels.insert(i, DownloadModel(downloadModel.videoModel, info));
         }
       }
       setState(() {
@@ -147,8 +149,8 @@ class _DemoDownloadListState extends State<StatefulWidget> {
     SuperPlayerModel playModel = downloadModel.videoModel;
     TXVodDownloadMediaInfo mediaInfo = downloadModel.mediaInfo;
     int duration = 0;
-    if (mediaInfo.duration != null) {
-      if(Platform.isIOS) {
+    if (mediaInfo.duration != null && mediaInfo.duration != 0) {
+      if (Platform.isIOS) {
         duration = mediaInfo.duration!;
       } else {
         duration = mediaInfo.duration! ~/ 1000;
@@ -247,7 +249,7 @@ class _DemoDownloadListState extends State<StatefulWidget> {
       stateText = AppLocalizations.of(context).playerCacheError;
     } else if (mediaInfo.downloadState == TXVodPlayEvent.EVENT_DOWNLOAD_STOP) {
       stateColor = ColorResource.COLOR_DOWNLOAD_COMPELETE;
-      stateText = AppLocalizations.of(context).playerCacheError;
+      stateText = AppLocalizations.of(context).playerCacheInterrupt;
     } else if (mediaInfo.downloadState == TXVodPlayEvent.EVENT_DOWNLOAD_FINISH) {
       stateColor = ColorResource.COLOR_DOWNLOAD_COMPELETE;
       stateText = AppLocalizations.of(context).playerCacheComplete;
@@ -304,10 +306,12 @@ class _DemoDownloadListState extends State<StatefulWidget> {
       playerModel.videoURL = downloadModel.mediaInfo.playPath!;
       // 置空videoId，避免播放器组件对url进行额外的参数拼接
       playerModel.videoId = null;
+      // 置空multiVideoURLs，避免播放器组件有限对多码率url进行播放
+      playerModel.multiVideoURLs = [];
       Navigator.of(context).pop(playerModel);
     } else if (mediaInfo.downloadState == TXVodPlayEvent.EVENT_DOWNLOAD_STOP ||
         mediaInfo.downloadState == TXVodPlayEvent.EVENT_DOWNLOAD_ERROR) {
-      DownloadHelper.instance.startDownloadOrg(downloadModel.mediaInfo);
+      DownloadHelper.instance.resumeDownloadOrg(downloadModel.mediaInfo);
       refreshDownloadList();
     } else if (mediaInfo.downloadState == TXVodPlayEvent.EVENT_DOWNLOAD_PROGRESS ||
         mediaInfo.downloadState == TXVodPlayEvent.EVENT_DOWNLOAD_START) {

Flutter/example/lib/demo_superplayer.dart

@@ -20,6 +20,7 @@ class DemoSuperPlayer extends StatefulWidget {
 }
 
 class _DemoSuperPlayerState extends State<DemoSuperPlayer> with TXPipPlayerRestorePage {
+  static const TAG = "_DemoSuperPlayerState";
   static const DEFAULT_PLACE_HOLDER = "http://xiaozhibo-10055601.file.myqcloud.com/coverImg.jpg";
 
   static const ARGUMENT_TYPE_POS = "arg_type_pos";
@@ -125,11 +126,17 @@ class _DemoSuperPlayerState extends State<DemoSuperPlayer> with TXPipPlayerResto
   }
 
   void _jumpToDownloadList() async {
+    bool needResume = false;
+    if (_controller.playerState == SuperPlayerState.PLAYING) {
+      _controller.pause();
+      needResume = true;
+    }
     dynamic result = await Navigator.push(context, MaterialPageRoute(builder: (context) => DemoDownloadList()));
-    if(result is SuperPlayerModel) {
+    if (result is SuperPlayerModel) {
       playVideo(result);
-    } else {
-      print("download list return result is not a videoModel, result is :$result");
+    } else if (needResume) {
+      _controller.resume();
+      LogUtils.v(TAG, "download list return result is not a videoModel, result is :$result");
     }
   }
 
@@ -231,9 +238,10 @@ class _DemoSuperPlayerState extends State<DemoSuperPlayer> with TXPipPlayerResto
             "",
             0,
             "",
-            (String url, int appId, String fileId, String pSign) {
+            (String url, int appId, String fileId, String pSign, bool enableDownload) {
               SuperPlayerModel model = new SuperPlayerModel();
               model.appId = appId;
+              model.isEnableDownload = enableDownload;
               if (url.isNotEmpty) {
                 model.videoURL = url;
                 model.coverUrl = DEFAULT_PLACE_HOLDER;
@@ -255,6 +263,7 @@ class _DemoSuperPlayerState extends State<DemoSuperPlayer> with TXPipPlayerResto
             },
             needPisgn: !isLive,
             showFileEdited: !isLive,
+            needDownload: !isLive,
           );
         });
   }
@@ -388,13 +397,16 @@ class _DemoSuperPlayerState extends State<DemoSuperPlayer> with TXPipPlayerResto
     await Future.wait(requestList);
     videoModels.clear();
     videoModels.addAll(models);
-    setState(() {
-      if (videoModels.isNotEmpty) {
-        playVideo(videoModels[0]);
-      } else {
-        EasyLoading.showError("video list request error");
-      }
-    });
+
+    if(mounted) {
+      setState(() {
+        if (videoModels.isNotEmpty) {
+          playVideo(videoModels[0]);
+        } else {
+          EasyLoading.showError("video list request error");
+        }
+      });
+    }
   }
 
   @override

Flutter/example/lib/demo_txLiveplayer.dart

@@ -307,7 +307,7 @@ class _DemoTXLivelayerState extends State<DemoTXLivePlayer> with WidgetsBindingO
     showDialog(
         context: context,
         builder: (context) {
-          return DemoInputDialog("", 0, "", (String url, int appId, String fileId, String pSign) {
+          return DemoInputDialog("", 0, "", (String url, int appId, String fileId, String pSign, bool enableDownload) {
             _url = url;
             _controller.stop();
             if (url.isNotEmpty) {

Flutter/example/lib/demo_txvodplayer.dart

@@ -389,7 +389,7 @@ class _DemoTXVodPlayerState extends State<DemoTXVodPlayer>
         context: context,
         builder: (context) {
           return DemoInputDialog("", 0, "",
-                  (String url, int appId, String fileId,String pSign) {
+                  (String url, int appId, String fileId,String pSign, bool enableDownload) {
                 _url = url;
                 _appId = appId;
                 _fileId = fileId;

Flutter/ios/Classes/FTXDownloadManager.m

@@ -125,7 +125,27 @@
         TXVodDownloadMediaInfo *mediaInfo = [self parseMediaInfoFromInfo:quality url:videoUrl appId:appIdNum fileId:fileId name:userName];
         BOOL deleteResult = [[TXVodDownloadManager shareInstance] deleteDownloadMediaInfo:mediaInfo];
         result(@(deleteResult));
+    } else if([@"resumeDownload" isEqualToString:call.method]) {
+        NSNumber *quality = args[@"quality"];
+        NSString *videoUrl = args[@"url"];
+        NSNumber *appIdNum = args[@"appId"];
+        NSString *fileId = args[@"fileId"];
+        NSString *pSign = args[@"pSign"];
+        NSString *userName = args[@"userName"];
+        TXVodDownloadMediaInfo *mediaInfo = [self parseMediaInfoFromInfo:quality url:videoUrl appId:appIdNum fileId:fileId name:userName];
+        BOOL deleteResult = NO;
+        if (nil != mediaInfo) {
+            TXVodDownloadDataSource *dataSource = mediaInfo.dataSource;
+            if (nil != dataSource) {
+                [[TXVodDownloadManager shareInstance] startDownload:dataSource];
+            } else {
+                [[TXVodDownloadManager shareInstance] startDownload:mediaInfo.userName url:mediaInfo.url];
+            }
+            deleteResult = YES;
+        }
+        result(@(deleteResult));
     }
+    
 }
 
 

Flutter/ios/Classes/FTXVodPlayer.m

@@ -132,6 +132,7 @@ static const int CODE_ON_RECEIVE_FIRST_FRAME   = 2003;
     
     [_netStatusChannel setStreamHandler:nil];
     _netStatusChannel = nil;
+    [self releaseImageSprite];
 }
 
 - (void)setupPlayerWithBool:(BOOL)onlyAudio
@@ -158,7 +159,6 @@ static const int CODE_ON_RECEIVE_FIRST_FRAME   = 2003;
         _txVodPlayer.vodDelegate = self;
         [self setupPlayerWithBool:onlyAudio];
     }
-    _txImageSprite = [[TXImageSprite alloc] init];
     return [NSNumber numberWithLongLong:_textureId];
 }
 
@@ -198,6 +198,7 @@ static const int CODE_ON_RECEIVE_FIRST_FRAME   = 2003;
     if (_txVodPlayer != nil) {
         return [_txVodPlayer stopPlay];
     }
+    [self releaseImageSprite];
     return NO;
 }
 
@@ -299,6 +300,48 @@ static const int CODE_ON_RECEIVE_FIRST_FRAME   = 2003;
     }
 }
 
+- (void)releaseImageSprite
+{
+    if(_txImageSprite) {
+        _txImageSprite = nil;
+    }
+}
+
+- (void)setImageSprite:(NSString*)urlStr withImgArray:(NSArray*)imgStrArray result:(FlutterResult)result {
+    [self releaseImageSprite];
+    _txImageSprite = [[TXImageSprite alloc] init];
+    NSMutableArray *imageUrls = @[].mutableCopy;
+    NSURL *vvtUrl = nil;
+    if(imgStrArray && [NSNull null] != (NSNull *)imgStrArray) {
+        for(NSString *url in imgStrArray) {
+            NSURL *nsurl = [NSURL URLWithString:url];
+            if (nsurl) {
+                [imageUrls addObject:nsurl];
+            }
+        }
+    }
+    if(urlStr && [NSNull null] != (NSNull *)urlStr) {
+        vvtUrl =  [NSURL URLWithString:urlStr];
+    }
+    [_txImageSprite setVTTUrl:vvtUrl imageUrls:imageUrls];
+    result(nil);
+}
+
+- (void)getImageSprite:(NSNumber*)time result:(FlutterResult)result {
+    if(_txImageSprite && [NSNull null] != (NSNull*)time) {
+        UIImage *imageSprite = [_txImageSprite getThumbnail:time.floatValue];
+        if(nil != imageSprite) {
+            NSData *data = UIImagePNGRepresentation(imageSprite);
+            result(data);
+        } else {
+            result(nil);
+        }
+    } else {
+        NSLog(@"getImageSprite failed, time is null or initImageSprite not invoke");
+        result(nil);
+    }
+}
+
 #pragma mark -
 
 - (void)handleMethodCall:(FlutterMethodCall*)call result:(FlutterResult)result
@@ -439,27 +482,12 @@ static const int CODE_ON_RECEIVE_FIRST_FRAME   = 2003;
         NSDictionary *args = call.arguments;
         NSString *vvtStr = args[@"vvtUrl"];
         NSArray *imageStrs = args[@"imageUrls"];
-        
-        NSMutableArray *imageUrls = @[].mutableCopy;
-        for(NSString *url in imageStrs) {
-            NSURL *nsurl = [NSURL URLWithString:url];
-            if (nsurl) {
-                [imageUrls addObject:nsurl];
-            }
-        }
-        [_txImageSprite setVTTUrl: [NSURL URLWithString:vvtStr] imageUrls:imageUrls];
-        result(nil);
+        [self setImageSprite:vvtStr withImgArray:imageStrs result:result];
     }
     else if ([@"getImageSprite" isEqualToString:call.method]) {
         NSDictionary *args = call.arguments;
-        NSInteger time = [args[@"time"] intValue];
-        UIImage *imageSprite = [_txImageSprite getThumbnail:time];
-        if(nil != imageSprite) {
-            NSData *data = UIImagePNGRepresentation(imageSprite);
-            result(data);
-        } else {
-            result(nil);
-        }
+        NSNumber *time = args[@"time"];
+        [self getImageSprite:time result:result];
     }
     else if ([@"exitPictureInPictureMode" isEqualToString:call.method]) {
         if(_txVodPlayer != nil) {
@@ -760,7 +788,8 @@ static const int CODE_ON_RECEIVE_FIRST_FRAME   = 2003;
 
 - (UIView *)txPipView {
     if (!_txPipView) {
-        _txPipView = [[UIView alloc] initWithFrame:CGRectZero];
+        // 给定1像素的大小，使得画中画正常显示
+        _txPipView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, 1, 1)];
         _txPipView.hidden = YES;
     }
     return _txPipView;

Flutter/lib/Core/txvoddownload_controller.dart

@@ -66,11 +66,17 @@ class TXVodDownloadController {
 
   /// 开始下载
   /// videoDownloadModel: 下载构造体 [TXVodDownloadMediaInfo]
-  /// userName: 下载用户，用来区分不同用户的下载，可不传，不传则使用默认值
   Future<void> startDownload(TXVodDownloadMediaInfo mediaInfo) async {
     await _methodChannel.invokeMethod("startDownload", mediaInfo.toJson());
   }
 
+  /// 继续下载，与开始下载接口有区别，该接口会寻找对应的缓存，复用之前的缓存来续点下载，
+  /// 而开始下载接口会启动一个全新的下载
+  /// videoDownloadModel: 下载构造体 [TXVodDownloadMediaInfo]
+  Future<void> resumeDownload(TXVodDownloadMediaInfo mediaInfo) async {
+    await _methodChannel.invokeMethod("resumeDownload", mediaInfo.toJson());
+  }
+
   /// 停止下载
   /// videoDownloadModel: 下载构造体 [TXVodDownloadMediaInfo]
   Future<void> stopDownload(TXVodDownloadMediaInfo mediaInfo) async {

Flutter/lib/Core/txvodplayer_controller.dart

@@ -412,7 +412,7 @@ class TXVodPlayerController extends ChangeNotifier implements ValueListenable<TX
     }
   }
 
-  Future<void> initImageSprite(String vvtUrl, List<String> imageUrls) async {
+  Future<void> initImageSprite(String? vvtUrl, List<String>? imageUrls) async {
     if (_isNeedDisposed) return;
     await _initPlayer.future;
     await _channel.invokeMethod("initImageSprite", {"vvtUrl":vvtUrl, "imageUrls":imageUrls});

Flutter/superplayer_widget/lib/extra/download_helper.dart

@@ -82,6 +82,10 @@ class DownloadHelper {
     return TXVodDownloadController.instance.startDownload(mediaInfo);
   }
 
+  Future<void> resumeDownloadOrg(TXVodDownloadMediaInfo mediaInfo) async {
+    return TXVodDownloadController.instance.resumeDownload(mediaInfo);
+  }
+
   Future<bool> deleteDownload(TXVodDownloadMediaInfo mediaInfo) async {
     return TXVodDownloadController.instance.deleteDownloadMediaInfo(mediaInfo);
   }

Flutter/superplayer_widget/lib/superplayer_controller.dart

@@ -329,6 +329,8 @@ class SuperPlayerController {
     _observer?.onVideoImageSpriteAndKeyFrameChanged(spriteInfo, keyFrameInfo);
     if (null != spriteInfo) {
       _vodPlayerController.initImageSprite(spriteInfo.webVttUrl, spriteInfo.imageUrls);
+    } else {
+      _vodPlayerController.initImageSprite(null, null);
     }
     this.spriteInfo = spriteInfo;
     this.keyFrameInfo = keyFrameInfo;

Flutter/superplayer_widget/lib/tools/txpip_controller.dart

@@ -79,9 +79,7 @@ class TXPipController {
 
   Future<void> exitAndReleaseCurrentPip() async {
     if (null != _playerData && _playerData?._playerController != null) {
-      if (Platform.isAndroid) {
-        await _playerData?._playerController.exitPictureInPictureMode();
-      }
+      await _playerData?._playerController.exitPictureInPictureMode();
       await _playerData?._playerController.stop();
       _playerData?._playerController.dispose();
     }

Flutter/superplayer_widget/lib/ui/superplayer_widget.dart

@@ -149,6 +149,8 @@ class SuperPlayerViewState extends State<SuperPlayerView> with WidgetsBindingObs
     _playController._observer = _SuperPlayerObserver(() {
       // preparePlayVideo
       setState(() {
+        _currentSprite = null;
+        _isShowSprite = false;
         _isShowControlView = false;
         _isLoading = _playController.videoModel!.playAction == SuperPlayerModel.PLAY_ACTION_AUTO_PLAY;
       });
@@ -334,7 +336,8 @@ class SuperPlayerViewState extends State<SuperPlayerView> with WidgetsBindingObs
   }
 
   void _calculateSize(double videoWidth, double videoHeight) {
-    if ((0 != videoWidth && 0 != videoHeight) && (_videoWidth != videoWidth && _videoHeight != videoHeight)) {
+    if (mounted && (0 != videoWidth && 0 != videoHeight) &&
+        (_videoWidth != videoWidth && _videoHeight != videoHeight)) {
       _videoWidth = videoWidth;
       _videoHeight = videoHeight;
       _resizeVideo();