diff --git a/android/app/src/main/kotlin/com/orz12/PiliPalaX/MainActivity.kt b/android/app/src/main/kotlin/com/orz12/PiliPalaX/MainActivity.kt index 0e9d8105d..d717a858b 100644 --- a/android/app/src/main/kotlin/com/orz12/PiliPalaX/MainActivity.kt +++ b/android/app/src/main/kotlin/com/orz12/PiliPalaX/MainActivity.kt @@ -5,6 +5,7 @@ import io.flutter.embedding.engine.FlutterEngine import io.flutter.plugin.common.MethodChannel import com.ryanheise.audioservice.AudioServiceActivity import android.content.Intent +import android.content.res.Configuration import android.os.Build import android.os.Bundle import android.view.WindowManager.LayoutParams @@ -48,4 +49,9 @@ class MainActivity : AudioServiceActivity() { companion object { private const val CHANNEL = "onUserLeaveHint" } + + override fun onPictureInPictureModeChanged(isInPictureInPictureMode: Boolean, newConfig: Configuration?) { + super.onPictureInPictureModeChanged(isInPictureInPictureMode, newConfig) + methodChannel.invokeMethod("onPipChanged", isInPictureInPictureMode) + } } diff --git a/lib/pages/video/detail/view.dart b/lib/pages/video/detail/view.dart index 7e850b733..d5c2ec3b8 100644 --- a/lib/pages/video/detail/view.dart +++ b/lib/pages/video/detail/view.dart @@ -1040,9 +1040,7 @@ class _VideoDetailPageState extends State ); Widget autoChoose(Widget childWhenDisabled) { - return childWhenDisabled; if (Platform.isAndroid) { - // temporarily remove it return PiPSwitcher( childWhenDisabled: childWhenDisabled, childWhenEnabled: childWhenEnabled, diff --git a/pubspec.lock b/pubspec.lock index 4b73388cc..d411d7905 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -570,10 +570,11 @@ packages: floating: dependency: "direct main" description: - name: floating - sha256: ddcd7f28247746dbb62997c48c89d1824118676796df47fdc6f864f8d02849bc - url: "https://pub.dev" - source: hosted + path: "." + ref: version-3 + resolved-ref: "1aa5d241e4c50ddd1b8a3bc117a99280e64f5b9c" + url: "https://github.com/bggRGjQaUbCoE/floating.git" + source: git version: "3.0.0" flutter: dependency: "direct main" diff --git a/pubspec.yaml b/pubspec.yaml index c4406593a..5c2579eb9 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -135,7 +135,11 @@ dependencies: # 代理 system_proxy: ^0.1.0 # pip - floating: ^3.0.0 + # floating: ^3.0.0 + floating: + git: + url: https://github.com/bggRGjQaUbCoE/floating.git + ref: version-3 # html解析 html: ^0.15.4 # html渲染