1.update version

Flutter/CHANGELOG.md

@@ -115,3 +115,11 @@ Professional 分支：Android & iOS 端集成TXLiteAVSDK_Professional lastest版
 
 - set Android TXLiteAVSDK_Professional to 11.1.0.13141，tag：release_pro_v11.1.1
 - set iOS TXLiteAVSDK_Professional to 11.1.14143， tag：release_pro_v11.1.1
+
+
+#### Version: 11.2.0 2023.06.05
+
+##### 版本特性：
+
+- set Android TXLiteAVSDK_Professional to 11.2.0.13154，tag：release_pro_v11.2.0
+- set iOS TXLiteAVSDK_Professional to 11.2.14217， tag：release_pro_v11.2.0
\ No newline at end of file

Flutter/android/config.gradle

@@ -4,7 +4,7 @@ rootProject.ext {
     supportSdkVersion = "26.0.1"
     minSdkVersion = 19
     targetSdkVersion = 28
-    playerVersion = '11.1.1'
+    playerVersion = '11.2.0'
     /*
     在此处可以更换需要的SDK版本，替换为专业版为 com.tencent.liteav:LiteAVSDK_Professional:latest.release
     其中 latest.release 可指定为自己需要的版本号，例如 "com.tencent.liteav:LiteAVSDK_Player:9.5.29035" ，写成 latest.release 则默认使用最新版本

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

@@ -19,6 +19,8 @@ import com.tencent.vod.flutter.messages.FtxMessages.PreLoadMsg;
 import com.tencent.vod.flutter.messages.FtxMessages.TXDownloadListMsg;
 import com.tencent.vod.flutter.messages.FtxMessages.TXFlutterDownloadApi;
 import com.tencent.vod.flutter.messages.FtxMessages.TXVodDownloadMediaMsg;
+import com.tencent.vod.flutter.tools.CommonUtil;
+
 import io.flutter.embedding.engine.plugins.FlutterPlugin;
 import io.flutter.plugin.common.EventChannel;
 import java.math.BigDecimal;
@@ -115,6 +117,8 @@ public class FTXDownloadManager implements ITXVodDownloadListener, TXFlutterDown
                 msg.setQuality((long) dataSource.getQuality());
                 msg.setToken(dataSource.getToken());
             }
+            msg.setSpeed((long)mediaInfo.getSpeed());
+            msg.setIsResourceBroken(mediaInfo.isResourceBroken());
         }
         return msg;
     }
@@ -150,6 +154,8 @@ public class FTXDownloadManager implements ITXVodDownloadListener, TXFlutterDown
             bundle.putInt("quality", dataSource.getQuality());
             bundle.putString("token", dataSource.getToken());
         }
+        bundle.putInt("speed", mediaInfo.getSpeed());
+        bundle.putBoolean("isResourceBroken", mediaInfo.isResourceBroken());
         return bundle;
     }
 

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

@@ -25,6 +25,8 @@ import com.tencent.vod.flutter.messages.FtxMessages.StringPlayerMsg;
 import com.tencent.vod.flutter.messages.FtxMessages.TXFlutterLivePlayerApi;
 import com.tencent.vod.flutter.model.PipResult;
 import com.tencent.vod.flutter.model.VideoModel;
+import com.tencent.vod.flutter.tools.CommonUtil;
+
 import io.flutter.embedding.engine.plugins.FlutterPlugin;
 import io.flutter.plugin.common.EventChannel;
 import io.flutter.view.TextureRegistry;

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

@@ -26,6 +26,7 @@ import android.util.Log;
 import androidx.annotation.RequiresApi;
 import com.tencent.vod.flutter.model.PipResult;
 import com.tencent.vod.flutter.model.VideoModel;
+import com.tencent.vod.flutter.tools.CommonUtil;
 import com.tencent.vod.flutter.ui.FlutterPipImplActivity;
 import io.flutter.embedding.engine.plugins.FlutterPlugin;
 import io.flutter.embedding.engine.plugins.FlutterPlugin.FlutterPluginBinding;

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

@@ -33,6 +33,8 @@ import com.tencent.vod.flutter.messages.FtxMessages.TXPlayInfoParamsPlayerMsg;
 import com.tencent.vod.flutter.messages.FtxMessages.UInt8ListMsg;
 import com.tencent.vod.flutter.model.PipResult;
 import com.tencent.vod.flutter.model.VideoModel;
+import com.tencent.vod.flutter.tools.CommonUtil;
+
 import io.flutter.embedding.engine.plugins.FlutterPlugin;
 import io.flutter.plugin.common.EventChannel;
 import io.flutter.view.TextureRegistry;

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

@@ -11,6 +11,7 @@ import android.content.res.Resources;
 import android.database.ContentObserver;
 import android.media.AudioManager;
 import android.net.Uri;
+import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Looper;
@@ -22,7 +23,9 @@ import android.util.SparseArray;
 import android.view.OrientationEventListener;
 import android.view.Window;
 import android.view.WindowManager;
+
 import androidx.annotation.NonNull;
+
 import com.tencent.rtmp.TXLiveBase;
 import com.tencent.rtmp.TXPlayerGlobalSetting;
 import com.tencent.vod.flutter.messages.FTXLivePlayerDispatcher;
@@ -37,11 +40,9 @@ import com.tencent.vod.flutter.messages.FtxMessages.TXFlutterLivePlayerApi;
 import com.tencent.vod.flutter.messages.FtxMessages.TXFlutterNativeAPI;
 import com.tencent.vod.flutter.messages.FtxMessages.TXFlutterSuperPlayerPluginAPI;
 import com.tencent.vod.flutter.messages.FtxMessages.TXFlutterVodPlayerApi;
+import com.tencent.vod.flutter.tools.CommonUtil;
 import com.tencent.vod.flutter.ui.Android12BridgeService;
-import io.flutter.embedding.engine.plugins.FlutterPlugin;
-import io.flutter.embedding.engine.plugins.activity.ActivityAware;
-import io.flutter.embedding.engine.plugins.activity.ActivityPluginBinding;
-import io.flutter.plugin.common.EventChannel;
+
 import java.io.File;
 import java.math.BigDecimal;
 import java.util.Collection;
@@ -49,6 +50,11 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.Set;
 
+import io.flutter.embedding.engine.plugins.FlutterPlugin;
+import io.flutter.embedding.engine.plugins.activity.ActivityAware;
+import io.flutter.embedding.engine.plugins.activity.ActivityPluginBinding;
+import io.flutter.plugin.common.EventChannel;
+
 /**
  * SuperPlayerPlugin
  * <p>
@@ -337,11 +343,14 @@ public class SuperPlayerPlugin implements FlutterPlugin, ActivityAware,
     }
 
     /**
-     * 获取最大亮度,兼容部分系统亮度最大值不是255的情况，例如MIUI上最大值被改为了上千
+     * 获取最大亮度,兼容MIUI部分系统亮度最大值不是255的情况.
+     * MIUI在android 13以后，系统最大亮度与配置不符，变为128
      *
      * @return max
      */
     private float getBrightnessMax() {
+        if (CommonUtil.isMIUI()) {
+            if (Build.VERSION.SDK_INT < 33) {
                 try {
                     Resources system = Resources.getSystem();
                     int resId = system.getIdentifier("config_screenBrightnessSettingMaximum", "integer", "android");
@@ -351,6 +360,10 @@ public class SuperPlayerPlugin implements FlutterPlugin, ActivityAware,
                 } catch (Exception e) {
                     Log.getStackTraceString(e);
                 }
+            } else {
+                return 128;
+            }
+        }
         return 255F;
     }
 

Flutter/android/src/main/java/com/tencent/vod/flutter/CommonUtil.java → Flutter/android/src/main/java/com/tencent/vod/flutter/tools/CommonUtil.java

 // Copyright (c) 2022 Tencent. All rights reserved.
 
-package com.tencent.vod.flutter;
+package com.tencent.vod.flutter.tools;
 
 import android.os.Bundle;
+import android.os.Environment;
+import android.text.TextUtils;
+import android.util.Log;
+
 import com.tencent.rtmp.downloader.TXVodDownloadMediaInfo;
+import com.tencent.vod.flutter.FTXEvent;
 import com.tencent.vod.flutter.messages.FtxMessages.BoolMsg;
 import com.tencent.vod.flutter.messages.FtxMessages.DoubleMsg;
 import com.tencent.vod.flutter.messages.FtxMessages.IntMsg;
@@ -11,9 +16,16 @@ import com.tencent.vod.flutter.messages.FtxMessages.ListMsg;
 import com.tencent.vod.flutter.messages.FtxMessages.PlayerMsg;
 import com.tencent.vod.flutter.messages.FtxMessages.StringMsg;
 import com.tencent.vod.flutter.messages.FtxMessages.UInt8ListMsg;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStreamReader;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Properties;
 import java.util.Set;
 
 /**
@@ -21,6 +33,10 @@ import java.util.Set;
  */
 public class CommonUtil {
 
+    private static final String TAG = "CommonUtil";
+
+    private static final String KEY_MIUI_VERSION_NAME = "ro.miui.ui.version.name";
+
     static final Map<Integer, Integer> DOWNLOAD_STATE_MAP = new HashMap<Integer, Integer>() {{
         put(TXVodDownloadMediaInfo.STATE_INIT, FTXEvent.EVENT_DOWNLOAD_START);
         put(TXVodDownloadMediaInfo.STATE_START, FTXEvent.EVENT_DOWNLOAD_PROGRESS);
@@ -29,6 +45,36 @@ public class CommonUtil {
         put(TXVodDownloadMediaInfo.STATE_ERROR, FTXEvent.EVENT_DOWNLOAD_ERROR);
     }};
 
+    public static boolean isMIUI() {
+        String pro = getProp(KEY_MIUI_VERSION_NAME);
+        return !TextUtils.equals(pro,"MIUI");
+    }
+
+    public static String getProp(String name) {
+        String line = null;
+        BufferedReader input = null;
+        try {
+            Process p = Runtime.getRuntime().exec("getprop " + name);
+            input = new BufferedReader(new InputStreamReader(p.getInputStream()), 1024);
+            line = input.readLine();
+            input.close();
+        } catch (IOException ex) {
+            Log.e(TAG, "Unable to read prop " + name, ex);
+            return null;
+        } finally {
+            if (input != null) {
+                try {
+                    input.close();
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
+            }
+        }
+
+        return line;
+
+    }
+
     public static Map<String, Object> getParams(int event, Bundle bundle) {
         Map<String, Object> param = new HashMap<>();
         if (event != 0) {

Flutter/docs/API文档.md

@@ -1732,6 +1732,8 @@ Future<void> startDownload(TXVodDownloadMediaInfo mediaInfo) async
 | downloadSize | int? | 文件已下载的大小，单位：byte，获得到的视频缓存会有该值，启动下载可以不赋值|
 | url | String? | 需要下载的视频url，url下载必填,不支持嵌套m3u8和mp4下载|
 | dataSource | TXVodDownloadDataSource? | 需要下载的视频fileId信息，url与该参数可只使用一个|
+| speed | int? | 下载速度，单位：KByte/秒 |
+| isResourceBroken | bool? | 资源是否已损坏, 如：资源被删除了 |
 
 **TXVodDownloadDataSource**
 

Flutter/docs/example运行指引.md

 ## 环境准备
 
-- Flutter 2.0 及以上版本。
+- Flutter 3.0 及以上版本。
 - Android 端开发：
     - Android Studio 3.5及以上版本。
     - App 要求 Android 4.1及以上版本设备。
+    - SDK 最低要求 19 以上
 - iOS 端开发：
     - Xcode 11.0及以上版本。
     - osx 系统版本要求 10.11 及以上版本
     - 请确保您的项目已设置有效的开发者签名。
+    - IOS 系统最低要求取决于您的flutter环境
     
 
 ## example下载

Flutter/docs/集成指引.md

@@ -4,10 +4,12 @@
 - Android 端开发：
   - Android Studio 3.5及以上版本。
   - App 要求 Android 4.1及以上版本设备。
+  - SDK 最低要求 19 以上  
 - iOS 端开发：
   - Xcode 11.0及以上版本。
   - osx 系统版本要求 10.11 及以上版本
   - 请确保您的项目已设置有效的开发者签名。
+  - IOS 系统最低要求取决于您的flutter环境
 
 ## SDK 下载
 
@@ -282,6 +284,9 @@ pod update
 
 如果问题依然存在，可以尝试删除项目build文件夹，并且手动删除你电脑中的flutter依赖缓存文件夹`.pubcache`。然后重新刷新flutter pub依赖再进行编译运行。
 
+10. 执行`pod install`或者运行项目的时候，出现错误 `CocoaPods could not find compatible versions for pod "Flutter"`
+
+**解决方法**：该问题是因为CocoaPods找不到对应flutter版本的插件，flutter在某些比较低或者最新的IOS系统版本可能不支持，需要修改`Minimum Deployments`的iOS最低版本。
 
 ## 更多功能
 

Flutter/ios/Classes/FTXDownloadManager.m

@@ -152,6 +152,8 @@
             [dict setValue:@(dataSource.quality) forKey:@"quality"];
             [dict setValue:dataSource.token forKey:@"token"];
         }
+        [dict setValue:@(info.speed) forKey:@"speed"];
+        [dict setValue:@(info.isResourceBroken) forKey:@"isResourceBroken"];
     }
     return dict;
 }
@@ -262,15 +264,19 @@
 }
 
 - (void)startDownloadMsg:(nonnull TXVodDownloadMediaMsg *)msg error:(FlutterError * _Nullable __autoreleasing * _Nonnull)error {
-    if(nil != msg.url) {
+    if(nil != msg.url && ![msg.url isEqual:[NSNull null]]) {
         [[TXVodDownloadManager shareInstance] startDownload:msg.userName url:msg.url];
-    } else if(nil != msg.appId && nil != msg.fileId) {
+    } else if(nil != msg.appId && nil != msg.fileId && ![msg.fileId isEqual:[NSNull null]]) {
         TXVodDownloadDataSource *dataSource = [[TXVodDownloadDataSource alloc] init];
         dataSource.appId = [msg.appId intValue];
         dataSource.fileId = msg.fileId;
         dataSource.userName = msg.userName;
         dataSource.quality = [self optQuality:msg.quality];
+        if(msg.pSign != nil && [msg.pSign isEqual:[NSNull null]]) {
+            dataSource.pSign = nil;
+        } else {
             dataSource.pSign = msg.pSign;
+        }
         [[TXVodDownloadManager shareInstance] startDownload:dataSource];
     }
 }

Flutter/ios/Classes/messages/FtxMessages.h

 // // Copyright (c) 2022 Tencent. All rights reserved.
-// Autogenerated from Pigeon (v9.1.0), do not edit directly.
+// Autogenerated from Pigeon (v9.0.7), do not edit directly.
 // See also: https://pub.dev/packages/pigeon
 
 #import <Foundation/Foundation.h>
@@ -202,7 +202,9 @@ NS_ASSUME_NONNULL_BEGIN
     fileId:(nullable NSString *)fileId
     pSign:(nullable NSString *)pSign
     quality:(nullable NSNumber *)quality
-    token:(nullable NSString *)token;
+    token:(nullable NSString *)token
+    speed:(nullable NSNumber *)speed
+    isResourceBroken:(nullable NSNumber *)isResourceBroken;
 /// 缓存地址
 @property(nonatomic, copy, nullable) NSString * playPath;
 /// 下载进度
@@ -234,6 +236,10 @@ NS_ASSUME_NONNULL_BEGIN
 @property(nonatomic, strong, nullable) NSNumber * quality;
 /// 加密token
 @property(nonatomic, copy, nullable) NSString * token;
+/// 下载速度，单位：KByte/秒
+@property(nonatomic, strong, nullable) NSNumber * speed;
+/// 资源是否已损坏, 如：资源被删除了
+@property(nonatomic, strong, nullable) NSNumber * isResourceBroken;
 @end
 
 @interface TXDownloadListMsg : NSObject

Flutter/ios/Classes/messages/FtxMessages.m

 // // Copyright (c) 2022 Tencent. All rights reserved.
-// Autogenerated from Pigeon (v9.1.0), do not edit directly.
+// Autogenerated from Pigeon (v9.0.7), do not edit directly.
 // See also: https://pub.dev/packages/pigeon
 
 #import "FtxMessages.h"
@@ -604,7 +604,9 @@ static id GetNullableObjectAtIndex(NSArray *array, NSInteger key) {
     fileId:(nullable NSString *)fileId
     pSign:(nullable NSString *)pSign
     quality:(nullable NSNumber *)quality
-    token:(nullable NSString *)token {
+    token:(nullable NSString *)token
+    speed:(nullable NSNumber *)speed
+    isResourceBroken:(nullable NSNumber *)isResourceBroken {
   TXVodDownloadMediaMsg* pigeonResult = [[TXVodDownloadMediaMsg alloc] init];
   pigeonResult.playPath = playPath;
   pigeonResult.progress = progress;
@@ -620,6 +622,8 @@ static id GetNullableObjectAtIndex(NSArray *array, NSInteger key) {
   pigeonResult.pSign = pSign;
   pigeonResult.quality = quality;
   pigeonResult.token = token;
+  pigeonResult.speed = speed;
+  pigeonResult.isResourceBroken = isResourceBroken;
   return pigeonResult;
 }
 + (TXVodDownloadMediaMsg *)fromList:(NSArray *)list {
@@ -638,6 +642,8 @@ static id GetNullableObjectAtIndex(NSArray *array, NSInteger key) {
   pigeonResult.pSign = GetNullableObjectAtIndex(list, 11);
   pigeonResult.quality = GetNullableObjectAtIndex(list, 12);
   pigeonResult.token = GetNullableObjectAtIndex(list, 13);
+  pigeonResult.speed = GetNullableObjectAtIndex(list, 14);
+  pigeonResult.isResourceBroken = GetNullableObjectAtIndex(list, 15);
   return pigeonResult;
 }
 + (nullable TXVodDownloadMediaMsg *)nullableFromList:(NSArray *)list {
@@ -659,6 +665,8 @@ static id GetNullableObjectAtIndex(NSArray *array, NSInteger key) {
     (self.pSign ?: [NSNull null]),
     (self.quality ?: [NSNull null]),
     (self.token ?: [NSNull null]),
+    (self.speed ?: [NSNull null]),
+    (self.isResourceBroken ?: [NSNull null]),
   ];
 }
 @end

Flutter/ios/super_player.podspec

@@ -4,7 +4,7 @@
 #
 Pod::Spec.new do |s|
   s.name             = 'super_player'
-  s.version          = '11.1.1'
+  s.version          = '11.2.0'
   s.summary          = 'player plugin.'
   s.description      = <<-DESC
 player plugin.

Flutter/lib/Core/common/common_config.dart

@@ -2,5 +2,5 @@
 part of SuperPlayer;
 
 abstract class FPlayerPckInfo {
-  static const String PLAYER_VERSION = "11.1.1";
+  static const String PLAYER_VERSION = "11.2.0";
 }
\ No newline at end of file

Flutter/lib/Core/pigeons/txplayer_message.dart

@@ -222,6 +222,10 @@ class TXVodDownloadMediaMsg {
   int? quality;
   /// 加密token
   String? token;
+  /// 下载速度，单位：KByte/秒
+  int? speed;
+  /// 资源是否已损坏, 如：资源被删除了
+  bool? isResourceBroken;
 }
 
 class TXDownloadListMsg {

Flutter/lib/Core/txplayer_define.dart

@@ -308,6 +308,12 @@ class TXVodDownloadMediaInfo {
   /// </h1>
   String? url;
 
+  /// 下载速度，单位：KByte/秒
+  int? speed;
+
+  /// 资源是否已损坏, 如：资源被删除了
+  bool? isResourceBroken;
+
   /// fileId 存储
   TXVodDownloadDataSource? dataSource;
 
@@ -325,6 +331,8 @@ class TXVodDownloadMediaInfo {
     json["playableDuration"] = playableDuration;
     json["size"] = size;
     json["downloadSize"] = downloadSize;
+    json["speed"] = speed;
+    json["isResourceBroken"] = isResourceBroken;
     return json;
   }
 
@@ -336,17 +344,19 @@ class TXVodDownloadMediaInfo {
       msg.pSign = dataSource!.pSign;
       msg.quality = dataSource!.quality;
       msg.token = dataSource!.token;
-      msg.userName = dataSource!.userName;
+      msg.userName = dataSource!.userName ?? "default";
     }
     msg.url = url;
     msg.downloadState = downloadState;
     msg.progress = progress;
     msg.playPath = playPath;
-    msg.userName = userName;
+    msg.userName = userName ?? "default";
     msg.duration = duration;
     msg.playableDuration = playableDuration;
     msg.size = size;
     msg.downloadSize = downloadSize;
+    msg.speed = speed;
+    msg.isResourceBroken = isResourceBroken;
     return msg;
   }
 }

Flutter/lib/Core/txplayer_messages.dart

@@ -502,6 +502,8 @@ class TXVodDownloadMediaMsg {
     this.pSign,
     this.quality,
     this.token,
+    this.speed,
+    this.isResourceBroken,
   });
 
   /// 缓存地址
@@ -549,6 +551,12 @@ class TXVodDownloadMediaMsg {
   /// 加密token
   String? token;
 
+  /// 下载速度，单位：KByte/秒
+  int? speed;
+
+  /// 资源是否已损坏, 如：资源被删除了
+  bool? isResourceBroken;
+
   Object encode() {
     return <Object?>[
       playPath,
@@ -565,6 +573,8 @@ class TXVodDownloadMediaMsg {
       pSign,
       quality,
       token,
+      speed,
+      isResourceBroken,
     ];
   }
 
@@ -585,6 +595,8 @@ class TXVodDownloadMediaMsg {
       pSign: result[11] as String?,
       quality: result[12] as int?,
       token: result[13] as String?,
+      speed: result[14] as int?,
+      isResourceBroken: result[15] as bool?,
     );
   }
 }

Flutter/lib/Core/txvoddownload_controller.dart

@@ -146,6 +146,9 @@ class TXVodDownloadController {
       dataSource.quality = map["quality"];
       medialnfo.dataSource = dataSource;
     }
+    medialnfo.speed = map["speed"];
+    medialnfo.isResourceBroken = map["isResourceBroken"];
+
     return medialnfo;
   }
 

Flutter/pubspec.yaml

 name: super_player
 description: player plugin.
-version: 11.1.1
+version: 11.2.0
 author:
 homepage:
 

Flutter/superplayer_widget/pubspec.yaml

 name: superplayer_widget
 description: superplayer,base on vodplayer
-version: "11.1.1"
+version: "11.2.0"
 
 environment:
   sdk: '>=2.17.0 <4.0.0'