Merge branch 'feature/PSDK-1173/end' into 'develop'

PSDK-1173 - Завершение видео

See merge request mobile/Flutter/nut_player!104

nut_player/example/lib/src/features/player_screen/domain/bloc/playerview_bloc.dart

@@ -40,7 +40,7 @@ class PlayerViewBloc extends Bloc<PlayerViewEvent, PlayerViewState> {
     on<DismissEvent>(_onDismissEvent);
     on<PlayEvent>(_onPlayEvent);
     on<PauseEvent>(_onPauseEvent);
-    on<StopEvent>(_onStopEvent);
+    on<EndEvent>(_onEndEvent);
     on<SeekEvent>(_onSeekEvent);
     on<SpeedChangedEvent>(_onSpeedChangedEvent);
     on<VolumeChangedEvent>(_onVolumeChangedEvent);
@@ -107,8 +107,8 @@ class PlayerViewBloc extends Bloc<PlayerViewEvent, PlayerViewState> {
     controller.pause();
   }
 
-  _onStopEvent(StopEvent event, Emitter<PlayerViewState> emit) {
-    controller.dispose();
+  _onEndEvent(EndEvent event, Emitter<PlayerViewState> emit) {
+    controller.end();
   }
 
   _onSeekEvent(SeekEvent event, Emitter<PlayerViewState> emit) async {

nut_player/example/lib/src/features/player_screen/domain/bloc/playerview_event.dart

@@ -17,8 +17,8 @@ class PauseEvent extends PlayerViewEvent {
   const PauseEvent();
 }
 
-class StopEvent extends PlayerViewEvent {
-  const StopEvent();
+class EndEvent extends PlayerViewEvent {
+  const EndEvent();
 }
 
 class SeekEvent extends PlayerViewEvent {

nut_player/example/lib/src/features/player_screen/presentation/player_view.dart

@@ -171,7 +171,7 @@ class _PlayerViewState extends State<PlayerView> {
                       }),
                       const SizedBox(width: 10),
                       PlayerButton('Завершить', () {
-                        _bloc.add(const StopEvent());
+                        _bloc.add(const EndEvent());
                       })
                     ],
                   ),

nut_player/lib/src/controller/video_player_controller.dart

@@ -240,6 +240,15 @@ class VideoPlayerController extends ValueNotifier<VideoPlayerValue> {
     await _applyPlayPause();
   }
 
+  /// Завершение видео.
+  Future<void> end() async {
+    final playerId = _playerId;
+    if (_isDisposedOrNotInitialized || playerId == null) {
+      return;
+    }
+    await nutPlayerPlatform.end(playerId);
+  }
+
   /// Seek video.
   Future<void> seek(Duration position) async {
     final playerId = _playerId;

nut_player_ios/ios/Classes/NutPlayerIosPlugin.swift

@@ -70,6 +70,8 @@ public class NutPlayerIosPlugin: NSObject, FlutterPlugin, NutPlayerViewFactoryDe
             self.pluginPlay(arguments, result: result)
         case "pluginPause": 
             self.pluginPause(arguments, result: result)
+        case "pluginEnd":
+            self.pluginEnd(arguments, result: result)
         case "pluginSetVolume": 
             self.pluginSetVolume(arguments, result: result)
         case "pluginGetVolume": 
@@ -172,6 +174,17 @@ public class NutPlayerIosPlugin: NSObject, FlutterPlugin, NutPlayerViewFactoryDe
         result(nil)
     }
     
+    private func pluginEnd(_ arguments: [Any], result: @escaping FlutterResult) {
+        guard let playerId = arguments.first as? Int64,
+              let record = self.players[playerId] else {
+            result(FlutterMethodNotImplemented)
+            return
+        }
+        
+        record.platform.end()
+        result(nil)
+    }
+    
     private func pluginPause(_ arguments: [Any], result: @escaping FlutterResult) {
         guard let playerId = arguments.first as? Int64,
               let record = self.players[playerId] else {

nut_player_ios/ios/Classes/PlayerFlutterPlatform.swift

@@ -259,6 +259,8 @@ final class PlayerFlutterPlatform: NSObject, FlutterStreamHandler {
     
     func play() { self.nutPlayer?.play() }
     
+    func end() { self.nutPlayer?.end() }
+    
     func pause() { 
         guard let player = self.nutPlayer,
               player.state.value != .completed else {

nut_player_ios/lib/src/nut_player_ios.dart

@@ -132,6 +132,11 @@ class NutPlayerIosPlatform extends NutPlayerPlatform {
     return _pluginChannel.invokeMethod("pluginPause", [playerId]);
   }
 
+  @override
+  Future<void> end(PlayerId playerID) {
+    return _pluginChannel.invokeMethod("pluginEnd", [playerID]);
+  }
+
   @override
   Future<int> state(PlayerId playerId) async {
     final result = await _pluginChannel.invokeMethod("pluginGetState", [playerId]);

nut_player_platform_interface/lib/src/nut_player_platform.dart

@@ -67,6 +67,11 @@ abstract class NutPlayerPlatform extends PlatformInterface {
     throw UnimplementedError('pause() has not been implemented.');
   }
 
+  /// Завершает видео.
+  Future<void> end(PlayerId playerId) {
+    throw UnimplementedError('end() has not been implemented.');
+  }
+
   Future<double> volume(PlayerId playerId) async {
     throw UnimplementedError('volume() has not been implemented.');
   }