fix: ci issues

AgoraIO-Extensions · Feb 8, 2025 · 38f12f8 · 38f12f8
1 parent c80ae2f
commit 38f12f8
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 15 deletions.
diff --git a/example/lib/examples/advanced/picture_in_picture/picture_in_picture.dart b/example/lib/examples/advanced/picture_in_picture/picture_in_picture.dart
@@ -1,6 +1,5 @@
 // ignore_for_file: avoid_print
 
-import 'dart:ffi';
 import 'dart:io';
 import 'package:agora_rtc_engine/agora_rtc_engine.dart';
 import 'package:agora_rtc_engine_example/config/agora.config.dart' as config;
@@ -255,8 +254,8 @@ class _State extends State<PictureInPicture> with WidgetsBindingObserver {
     await _engine.enableVideo();
     await _engine.startPreview();
 
-    var isPipSupported = await _engine.isPipSupported();
-    var isPipAutoEnterSupported = await _engine.isPipAutoEnterSupported();
+    var isPipSupported = await _engine.pipIsSupported();
+    var isPipAutoEnterSupported = await _engine.pipIsAutoEnterSupported();
 
     setState(() {
       _isPipSupported = isPipSupported;

diff --git a/lib/src/agora_rtc_engine_ext.dart b/lib/src/agora_rtc_engine_ext.dart
@@ -2,15 +2,11 @@ import 'package:agora_rtc_engine/src/agora_media_player.dart';
 import 'package:agora_rtc_engine/src/agora_rtc_engine.dart';
 import 'package:agora_rtc_engine/src/agora_rtc_engine_ex.dart';
 import 'package:agora_rtc_engine/src/impl/agora_rtc_engine_impl.dart';
+import 'package:agora_rtc_engine/src/agora_base.dart';
 import 'package:flutter/foundation.dart';
-import 'agora_base.dart';
 import 'impl/agora_rtc_engine_impl.dart' as impl;
 import 'impl/media_player_impl.dart';
 
-export 'dart:convert';
-export 'dart:typed_data';
-export 'package:json_annotation/json_annotation.dart';
-
 /// @nodoc
 class AgoraPipOptions {
   /// @nodoc
@@ -158,18 +154,18 @@ extension RtcEngineExt on RtcEngine {
   ///
   /// Returns
   /// Whether Picture in Picture is supported.
-  Future<bool> isPipSupported() async {
+  Future<bool> pipIsSupported() async {
     final impl = this as RtcEngineImpl;
-    return impl.isPipSupported();
+    return impl.pipIsSupported();
   }
 
   /// Check if Picture in Picture can auto enter.
   ///
   /// Returns
   /// Whether Picture in Picture can auto enter.
-  Future<bool> isPipAutoEnterSupported() async {
+  Future<bool> pipIsAutoEnterSupported() async {
     final impl = this as RtcEngineImpl;
-    return impl.isPipAutoEnterSupported();
+    return impl.pipIsAutoEnterSupported();
   }
 
   /// Check if Picture in Picture is active.

diff --git a/lib/src/impl/agora_rtc_engine_impl.dart b/lib/src/impl/agora_rtc_engine_impl.dart
@@ -1,4 +1,6 @@
 import 'dart:async';
+import 'dart:convert';
+import 'dart:typed_data';
 
 import 'package:agora_rtc_engine/src/agora_base.dart';
 import 'package:agora_rtc_engine/src/agora_h265_transcoder.dart';
@@ -1060,14 +1062,13 @@ class RtcEngineImpl extends rtc_engine_ex_binding.RtcEngineExImpl
     _pipStateChangedObserver = null;
   }
 
-  @override
-  Future<bool> isPipSupported() async {
+  Future<bool> pipIsSupported() async {
     final result =
         await engineMethodChannel.invokeMethod<bool>('pipIsSupported', null);
     return result ?? false;
   }
 
-  Future<bool> isPipAutoEnterSupported() async {
+  Future<bool> pipIsAutoEnterSupported() async {
     final result = await engineMethodChannel.invokeMethod<bool>(
         'pipIsAutoEnterSupported', null);
     return result ?? false;

diff --git a/lib/src/impl/video_view_controller_impl.dart b/lib/src/impl/video_view_controller_impl.dart
@@ -156,9 +156,11 @@ mixin VideoViewControllerBaseMixin implements VideoViewControllerBase {
 }
 
 /// Implementation of [PIPVideoViewController]
+@Deprecated('This class is deprecated')
 class PIPVideoViewControllerImpl extends VideoViewController
     implements PIPVideoViewController {
   /// @nodoc
+  @Deprecated('This constructor is deprecated')
   // ignore: use_super_parameters
   PIPVideoViewControllerImpl(
       {required RtcEngine rtcEngine,
@@ -172,6 +174,7 @@ class PIPVideoViewControllerImpl extends VideoViewController
         );
 
   /// @nodoc
+  @Deprecated('This constructor is deprecated')
   // ignore: use_super_parameters
   PIPVideoViewControllerImpl.remote(
       {required RtcEngine rtcEngine,
@@ -192,6 +195,7 @@ class PIPVideoViewControllerImpl extends VideoViewController
   bool _isDisposedRender = false;
 
   @override
+  @Deprecated('This method is deprecated')
   Future<void> setupView(int nativeViewPtr) async {
     await super.setupView(nativeViewPtr);
 
@@ -201,6 +205,7 @@ class PIPVideoViewControllerImpl extends VideoViewController
   }
 
   @override
+  @Deprecated('This method is deprecated')
   Future<void> disposeRender() async {
     _isDisposedRender = true;
     _nativeViewPtr = 0;
@@ -209,17 +214,20 @@ class PIPVideoViewControllerImpl extends VideoViewController
   }
 
   @override
+  @Deprecated('This method is deprecated')
   Future<void> dispose() async {
     await stopPictureInPicture();
     await destroyPictureInPicture();
   }
 
   @override
+  @Deprecated('This method is deprecated')
   Future<bool> isPipSupported() {
     return rtcEngine.isPipSupported();
   }
 
   @override
+  @Deprecated('This method is deprecated')
   Future<void> destroyPictureInPicture() async {
     // On android, there's no stop pip function
     if (defaultTargetPlatform == TargetPlatform.iOS) {
@@ -235,6 +243,7 @@ class PIPVideoViewControllerImpl extends VideoViewController
   }
 
   @override
+  @Deprecated('This method is deprecated')
   Future<void> setupPictureInPicture(PipOptions options) async {
     assert(!kIsWeb, 'PIP feature is not supported on web.');
     assert(
@@ -278,6 +287,7 @@ class PIPVideoViewControllerImpl extends VideoViewController
   }
 
   @override
+  @Deprecated('This method is deprecated')
   Future<void> startPictureInPicture() async {
     if (_isDisposedRender) {
       return;
@@ -287,6 +297,7 @@ class PIPVideoViewControllerImpl extends VideoViewController
   }
 
   @override
+  @Deprecated('This method is deprecated')
   Future<void> stopPictureInPicture() async {
     // On android, there's no stop pip function
     if (defaultTargetPlatform == TargetPlatform.iOS) {
@@ -295,5 +306,6 @@ class PIPVideoViewControllerImpl extends VideoViewController
   }
 
   @override
+  @Deprecated('This getter is deprecated')
   bool get isInPictureInPictureMode => _isPipSetuped;
 }
diff --git a/lib/src/render/video_view_controller.dart b/lib/src/render/video_view_controller.dart
@@ -107,8 +107,10 @@ class VideoViewController
 }
 
 /// @nodoc
+@Deprecated('This class is deprecated')
 abstract class PIPVideoViewController extends VideoViewControllerBase {
   /// @nodoc
+  @Deprecated('This factory is deprecated')
   factory PIPVideoViewController(
           {required RtcEngine rtcEngine,
           required VideoCanvas canvas,
@@ -120,6 +122,7 @@ abstract class PIPVideoViewController extends VideoViewControllerBase {
       );
 
   /// @nodoc
+  @Deprecated('This factory is deprecated')
   factory PIPVideoViewController.remote(
           {required RtcEngine rtcEngine,
           required VideoCanvas canvas,
@@ -133,20 +136,26 @@ abstract class PIPVideoViewController extends VideoViewControllerBase {
       );
 
   /// @nodoc
+  @Deprecated('This method is deprecated')
   Future<bool> isPipSupported();
 
   /// @nodoc
+  @Deprecated('This method is deprecated')
   Future<void> setupPictureInPicture(PipOptions options);
 
   /// @nodoc
+  @Deprecated('This method is deprecated')
   Future<void> destroyPictureInPicture();
 
   /// @nodoc
+  @Deprecated('This method is deprecated')
   Future<void> startPictureInPicture();
 
   /// @nodoc
+  @Deprecated('This method is deprecated')
   Future<void> stopPictureInPicture();
 
   /// @nodoc
+  @Deprecated('This getter is deprecated')
   bool get isInPictureInPictureMode;
 }