fix brightness performance & add brightness change event

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

@@ -6,6 +6,7 @@ package com.tencent.vod.flutter;
  * 通用事件码
  */
 public class FTXEvent {
+
     /*
     音量变化
      */
@@ -18,6 +19,10 @@ public class FTXEvent {
     获得音量输出焦点
      */
     public static final int EVENT_AUDIO_FOCUS_PLAY = 3;
+    /*
+    亮度发生变化
+     */
+    public static final int EVENT_BRIGHTNESS_CHANGED = 4;
 
     // 视频预下载完成
     public static final int EVENT_PREDOWNLOAD_ON_COMPLETE = 200;

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

@@ -3,12 +3,18 @@
 package com.tencent.vod.flutter;
 
 import android.content.BroadcastReceiver;
+import android.content.ContentResolver;
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
+import android.database.ContentObserver;
 import android.media.AudioManager;
+import android.net.Uri;
 import android.os.Bundle;
+import android.os.Handler;
+import android.os.Looper;
 import android.provider.Settings;
+import android.provider.Settings.SettingNotFoundException;
 import android.text.TextUtils;
 import android.util.Log;
 import android.util.SparseArray;
@@ -28,6 +34,8 @@ import io.flutter.plugin.common.MethodChannel;
 import io.flutter.plugin.common.MethodChannel.MethodCallHandler;
 import io.flutter.plugin.common.MethodChannel.Result;
 import java.io.File;
+import java.math.BigDecimal;
+import java.util.Collection;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Set;
@@ -56,7 +64,6 @@ public class SuperPlayerPlugin implements FlutterPlugin, MethodCallHandler, Acti
     private SparseArray<FTXBasePlayer> mPlayers;
 
     private FTXDownloadManager mFTXDownloadManager;
-
     private FTXAudioManager mTxAudioManager;
     private FTXPIPManager mTxPipManager;
 
@@ -76,6 +83,15 @@ public class SuperPlayerPlugin implements FlutterPlugin, MethodCallHandler, Acti
                 }
             };
 
+    private final ContentObserver brightnessObserver = new ContentObserver(new Handler(Looper.getMainLooper())) {
+        @Override
+        public void onChange(boolean selfChange, @NonNull Collection<Uri> uris, int flags) {
+            super.onChange(selfChange, uris, flags);
+            double systemBrightness = getSystemScreenBrightness();
+            setBrightness(systemBrightness);
+        }
+    };
+
     @Override
     public void onAttachedToEngine(@NonNull FlutterPluginBinding flutterPluginBinding) {
         mFlutterPluginBinding = flutterPluginBinding;
@@ -150,23 +166,11 @@ public class SuperPlayerPlugin implements FlutterPlugin, MethodCallHandler, Acti
             result.success(null);
         } else if (call.method.equals("setBrightness")) {
             Double brightness = call.argument("brightness");
-            if (null != brightness) {
-                Window window = mActivityPluginBinding.getActivity().getWindow();
-                WindowManager.LayoutParams params = window.getAttributes();
-                params.screenBrightness = Float.parseFloat(String.valueOf(brightness));
-                if (params.screenBrightness > 1.0f) {
-                    params.screenBrightness = 1.0f;
-                }
-                if (params.screenBrightness != -1 && params.screenBrightness < 0) {
-                    params.screenBrightness = 0.01f;
-                }
-                window.setAttributes(params);
-            }
+            setBrightness(brightness);
             result.success(null);
         } else if (call.method.equals("getBrightness")) {
-            Window window = mActivityPluginBinding.getActivity().getWindow();
-            WindowManager.LayoutParams params = window.getAttributes();
-            result.success(params.screenBrightness);
+            float screenBrightness = getBrightness();
+            result.success(screenBrightness);
         } else if (call.method.equals("getSystemVolume")) {
             result.success(mTxAudioManager.getSystemCurrentVolume());
         } else if (call.method.equals("setSystemVolume")) {
@@ -238,6 +242,57 @@ public class SuperPlayerPlugin implements FlutterPlugin, MethodCallHandler, Acti
         return true;
     }
 
+    /**
+     * 设置当前window亮度
+     */
+    private void setBrightness(Double brightness) {
+        if (null != brightness) {
+            // 保留两位小数
+            BigDecimal bigDecimal = new BigDecimal(brightness);
+            brightness = bigDecimal.setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue();
+            Window window = mActivityPluginBinding.getActivity().getWindow();
+            WindowManager.LayoutParams params = window.getAttributes();
+            params.screenBrightness = Float.parseFloat(String.valueOf(brightness));
+            if (params.screenBrightness > 1.0f) {
+                params.screenBrightness = 1.0f;
+            }
+            if (params.screenBrightness != -1 && params.screenBrightness < 0) {
+                params.screenBrightness = 0.01f;
+            }
+            window.setAttributes(params);
+            // 发送亮度变化通知
+            mEventSink.success(getParams(FTXEvent.EVENT_BRIGHTNESS_CHANGED, null));
+        }
+    }
+
+    /**
+     * 获得当前window亮度，如果当前window亮度未赋值，则返回当前系统亮度
+     */
+    private float getBrightness() {
+        Window window = mActivityPluginBinding.getActivity().getWindow();
+        WindowManager.LayoutParams params = window.getAttributes();
+        float screenBrightness = params.screenBrightness;
+        if (screenBrightness < 0) {
+            screenBrightness = getSystemScreenBrightness();
+        }
+        // 保留两位小数
+        BigDecimal bigDecimal = new BigDecimal(screenBrightness);
+        bigDecimal = bigDecimal.setScale(2, BigDecimal.ROUND_HALF_UP);
+        return bigDecimal.floatValue();
+    }
+
+    private float getSystemScreenBrightness() {
+        float screenBrightness = -1;
+        try {
+            ContentResolver resolver = mActivityPluginBinding.getActivity().getContentResolver();
+            int brightnessInt = Settings.System.getInt(resolver, Settings.System.SCREEN_BRIGHTNESS);
+            screenBrightness = brightnessInt / 255F;
+        } catch (SettingNotFoundException e) {
+            e.printStackTrace();
+        }
+        return screenBrightness;
+    }
+
     private void initAudioManagerIfNeed() {
         if (null == mTxAudioManager) {
             mTxAudioManager = new FTXAudioManager(mFlutterPluginBinding.getApplicationContext());
@@ -323,6 +378,10 @@ public class SuperPlayerPlugin implements FlutterPlugin, MethodCallHandler, Acti
         IntentFilter filter = new IntentFilter();
         filter.addAction(VOLUME_CHANGED_ACTION);
         mActivityPluginBinding.getActivity().registerReceiver(mVolumeBroadcastReceiver, filter);
+        // brightness observer
+        ContentResolver resolver = mActivityPluginBinding.getActivity().getContentResolver();
+        resolver.registerContentObserver(Settings.System.getUriFor(Settings.System.SCREEN_BRIGHTNESS),
+                true, brightnessObserver);
     }
 
     /**
@@ -332,6 +391,7 @@ public class SuperPlayerPlugin implements FlutterPlugin, MethodCallHandler, Acti
         try {
             mTxAudioManager.removeAudioFocusChangedListener(audioFocusChangeListener);
             mActivityPluginBinding.getActivity().unregisterReceiver(mVolumeBroadcastReceiver);
+            mActivityPluginBinding.getActivity().getContentResolver().unregisterContentObserver(brightnessObserver);
         } catch (Exception e) {
             e.printStackTrace();
         }

Flutter/ios/Classes/FTXEvent.h

@@ -2,10 +2,12 @@
 #ifndef SUPERPLAYER_FLUTTER_IOS_CLASSES_FTXEVENT_H_
 #define SUPERPLAYER_FLUTTER_IOS_CLASSES_FTXEVENT_H_
 
-// 音频变化事件code
+// 事件code
 #define EVENT_VOLUME_CHANGED 1
 #define EVENT_AUDIO_FOCUS_PAUSE 2
 #define EVENT_AUDIO_FOCUS_PLAY 3
+// 音量发生变化
+#define EVENT_BRIGHTNESS_CHANGED 4
 
 // 画中画事件code
 #define EVENT_PIP_MODE_ALREADY_ENTER    1

Flutter/ios/Classes/SuperPlayerPlugin.m

@@ -67,6 +67,10 @@ SuperPlayerPlugin* instance;
     [_eventChannel setStreamHandler:self];
     [_pipEventChannel setStreamHandler:self];
 
+    // brightness event
+    NSNotificationCenter *center = [NSNotificationCenter defaultCenter];
+    [center addObserver:self selector:@selector(brightnessDidChange:) name:UIScreenBrightnessDidChangeNotification object:[UIScreen mainScreen]];
+    
     [audioManager registerVolumeChangeListener:self];
      _FTXDownloadManager = [[FTXDownloadManager alloc] initWithRegistrar:registrar];
     // orientation
@@ -215,6 +219,14 @@ SuperPlayerPlugin* instance;
     [audioManager destory:self];
 }
 
+/**
+ 亮度变化
+ */
+- (void)brightnessDidChange:(NSNotification *)notification
+{
+    [_eventSink success:[SuperPlayerPlugin getParamsWithEvent:EVENT_BRIGHTNESS_CHANGED withParams:@{}]];
+}
+
 #pragma mark - FlutterStreamHandler
 - (FlutterError* _Nullable)onListenWithArguments:(id _Nullable)arguments
                                        eventSink:(FlutterEventSink)events

Flutter/lib/Core/txplayer_define.dart

@@ -98,10 +98,11 @@ abstract class TXVodPlayEvent {
   static const EVT_IMAGESPRIT_IMAGEURL_LIST = "EVT_IMAGESPRIT_IMAGEURL_LIST"; // 雪碧图图片下载URL
   static const EVT_DRM_TYPE = "EVT_DRM_TYPE"; // 加密类型
 
-  /// superplayer plugin volume event
+  /// superplayer plugin event
   static const EVENT_VOLUME_CHANGED = 1; // 音量变化
   static const EVENT_AUDIO_FOCUS_PAUSE = 2; // 失去音量输出播放焦点 only for android
   static const EVENT_AUDIO_FOCUS_PLAY = 3; // 获得音量输出焦点 only for android
+  static const EVENT_BRIGHTNESS_CHANGED = 4; // 亮度发生变化
   /// pip event
   static const    EVENT_PIP_MODE_ALREADY_ENTER    = 1; // 已经进入画中画模式
   static const    EVENT_PIP_MODE_ALREADY_EXIT     = 2; // 已经退出画中画模式

Flutter/superplayer_widget/lib/ui/superplayer_more_view.dart

@@ -3,6 +3,7 @@ part of demo_super_player_lib;
 
 typedef BoolFunction = bool Function();
 typedef DoubleFunction = double Function();
+
 /// 播放器组件更多菜单
 class SuperPlayerMoreView extends StatefulWidget {
   final MoreViewController controller;
@@ -21,30 +22,32 @@ class _SuperPlayerMoreViewState extends State<SuperPlayerMoreView> {
   bool _isVodPlay = false;
   String _currentRate = "";
   Map<String, double> playRateStr = {"1.0x": 1.0, "1.25x": 1.25, "1.5x": 1.5, "2.0x": 2.0};
-  StreamSubscription? volumeSubscription;
+  StreamSubscription? eventSubscription;
 
   @override
   void initState() {
     super.initState();
     _isVodPlay = widget.controller.getIsVodPlay();
     double playerPlayRate = widget.controller.getPlayRate();
-    for(String rateStr in playRateStr.keys) {
-      if(playerPlayRate == playRateStr[rateStr]) {
+    for (String rateStr in playRateStr.keys) {
+      if (playerPlayRate == playRateStr[rateStr]) {
         _currentRate = rateStr;
         break;
       }
     }
     // if not found in playRateStr,set 1.0
-    if(_currentRate.isEmpty) {
+    if (_currentRate.isEmpty) {
       _currentRate = playRateStr.keys.first;
     }
     _isOpenAccelerate = widget.controller.getAccelerateIsOpen();
     // regist system volume changed event
-    volumeSubscription = SuperPlayerPlugin.instance.onEventBroadcast.listen((event) {
+    eventSubscription = SuperPlayerPlugin.instance.onEventBroadcast.listen((event) {
       int code = event["event"];
-      if(mounted) {
+      if (mounted) {
         if (code == TXVodPlayEvent.EVENT_VOLUME_CHANGED) {
           refreshVolume();
+        } else if (code == TXVodPlayEvent.EVENT_BRIGHTNESS_CHANGED) {
+          refreshBrightness();
         }
       }
     });
@@ -56,6 +59,15 @@ class _SuperPlayerMoreViewState extends State<SuperPlayerMoreView> {
     setState(() {});
   }
 
+  void refreshBrightness() async {
+    double brightness = await SuperPlayerPlugin.getBrightness();
+    if (_currentBrightness != brightness) {
+      setState(() {
+        _currentBrightness = brightness;
+      });
+    }
+  }
+
   void _initData() async {
     double tempBrightness = await SuperPlayerPlugin.getBrightness();
     if (tempBrightness == -1) {
@@ -129,7 +141,9 @@ class _SuperPlayerMoreViewState extends State<SuperPlayerMoreView> {
           child: Text(
             rateStr,
             textAlign: TextAlign.center,
-            style: rateStr == _currentRate ? ThemeResource.getCheckedLabelTextStyle() : ThemeResource.getCommonLabelTextStyle(),
+            style: rateStr == _currentRate
+                ? ThemeResource.getCheckedLabelTextStyle()
+                : ThemeResource.getCommonLabelTextStyle(),
           ),
         ),
       ));
@@ -154,7 +168,10 @@ class _SuperPlayerMoreViewState extends State<SuperPlayerMoreView> {
           textAlign: TextAlign.center,
           style: ThemeResource.getCommonLabelTextStyle(),
         ),
-        const Image(width: 30, height: 30, image: AssetImage("images/superplayer_ic_light_min.png", package:StringResource.PKG_NAME)),
+        const Image(
+            width: 30,
+            height: 30,
+            image: AssetImage("images/superplayer_ic_light_min.png", package: StringResource.PKG_NAME)),
         Expanded(
           child: Theme(
               data: ThemeResource.getCommonSliderTheme(),
@@ -165,7 +182,10 @@ class _SuperPlayerMoreViewState extends State<SuperPlayerMoreView> {
                 onChanged: _onChangeBrightness,
               )),
         ),
-        const Image(width: 30, height: 30, image: AssetImage("images/superplayer_ic_light_max.png", package:StringResource.PKG_NAME)),
+        const Image(
+            width: 30,
+            height: 30,
+            image: AssetImage("images/superplayer_ic_light_max.png", package: StringResource.PKG_NAME)),
       ]),
     );
   }
@@ -180,7 +200,10 @@ class _SuperPlayerMoreViewState extends State<SuperPlayerMoreView> {
             textAlign: TextAlign.center,
             style: ThemeResource.getCommonLabelTextStyle(),
           ),
-          const Image(width: 30, height: 30, image: AssetImage("images/superplayer_ic_volume_min.png", package:StringResource.PKG_NAME)),
+          const Image(
+              width: 30,
+              height: 30,
+              image: AssetImage("images/superplayer_ic_volume_min.png", package: StringResource.PKG_NAME)),
           Expanded(
             child: Theme(
                 data: ThemeResource.getCommonSliderTheme(),
@@ -191,7 +214,10 @@ class _SuperPlayerMoreViewState extends State<SuperPlayerMoreView> {
                   onChanged: _onChangeVolume,
                 )),
           ),
-          const Image(width: 30, height: 30, image: AssetImage("images/superplayer_ic_volume_max.png", package:StringResource.PKG_NAME)),
+          const Image(
+              width: 30,
+              height: 30,
+              image: AssetImage("images/superplayer_ic_volume_max.png", package: StringResource.PKG_NAME)),
         ],
       ),
     );
@@ -250,7 +276,7 @@ class _SuperPlayerMoreViewState extends State<SuperPlayerMoreView> {
 
   void updatePlayerType(SuperPlayerType playerType) {
     bool isVodPlay = playerType == SuperPlayerType.VOD;
-    if(isVodPlay != _isVodPlay) {
+    if (isVodPlay != _isVodPlay) {
       setState(() {
         _isVodPlay = isVodPlay;
       });
@@ -260,7 +286,7 @@ class _SuperPlayerMoreViewState extends State<SuperPlayerMoreView> {
   @override
   void dispose() {
     super.dispose();
-    volumeSubscription?.cancel();
+    eventSubscription?.cancel();
   }
 }
 
@@ -271,5 +297,6 @@ class MoreViewController {
   Function(double playRate) onChangedPlayRate;
   BoolFunction getIsVodPlay;
 
-  MoreViewController(this.getAccelerateIsOpen, this.getPlayRate, this.siwtchAccelerate, this.onChangedPlayRate, this.getIsVodPlay);
+  MoreViewController(
+      this.getAccelerateIsOpen, this.getPlayRate, this.siwtchAccelerate, this.onChangedPlayRate, this.getIsVodPlay);
 }

Flutter/superplayer_widget/lib/ui/superplayer_title_view.dart

@@ -27,9 +27,11 @@ class _VideoTitleViewState extends State<_VideoTitleView> {
   @override
   Widget build(BuildContext context) {
     return Container(
-      padding: const EdgeInsets.only(left: 6, right: 6),
+      padding: const EdgeInsets.only(left: 10, right: 15),
       decoration: const BoxDecoration(
-          image: DecorationImage(image: AssetImage("images/superplayer_top_shadow.png", package:StringResource.PKG_NAME), fit: BoxFit.fill)),
+          image: DecorationImage(
+              image: AssetImage("images/superplayer_top_shadow.png", package: StringResource.PKG_NAME),
+              fit: BoxFit.fill)),
       child: Row(
         children: [
           InkWell(
@@ -37,7 +39,7 @@ class _VideoTitleViewState extends State<_VideoTitleView> {
             child: const Image(
               width: 30,
               height: 30,
-              image: AssetImage("images/superplayer_btn_back_play.png", package:StringResource.PKG_NAME),
+              image: AssetImage("images/superplayer_btn_back_play.png", package: StringResource.PKG_NAME),
             ),
           ),
           Text(
@@ -50,9 +52,9 @@ class _VideoTitleViewState extends State<_VideoTitleView> {
               child: InkWell(
                 onTap: _onTapMore,
                 child: const Image(
-                  width: 30,
-                  height: 30,
-                  image: AssetImage("images/superplayer_ic_vod_more_normal.png", package:StringResource.PKG_NAME),
+                  width: 40,
+                  height: 40,
+                  image: AssetImage("images/superplayer_ic_vod_more_normal.png", package: StringResource.PKG_NAME),
                 ),
               ))
         ],