Fix the issue of abnormal display when restoring picture-in-picture

kongdywang · kongdywang · commit f39de64a4181 · 2025-08-04T15:35:25.000+08:00
diff --git a/Flutter/android/src/main/java/com/tencent/vod/flutter/player/FTXLivePlayer.java b/Flutter/android/src/main/java/com/tencent/vod/flutter/player/FTXLivePlayer.java
@@ -161,6 +161,9 @@ protected long init(boolean onlyAudio) {
     int startPlayerLivePlay(String url) {
         LiteavLog.d(TAG, "startLivePlay:");
         if (null != mLivePlayer) {
+            if (null != mCurRenderView) {
+                mCurRenderView.setPlayer(this);
+            }
             mLivePlayer.resumeVideo();
             if (!mIsMute) {
                 mLivePlayer.resumeAudio();
@@ -186,7 +189,6 @@ int stopPlay(boolean isNeedClearLastImg) {
         if (isNeedClearLastImg && null != mCurRenderView) {
             LiteavLog.i(TAG, "stopPlay target clear last img, player:" + hashCode());
             mCurRenderView.clearTexture();
-            mCurRenderView.setPlayer(this);
         }
         return result;
     }
diff --git a/Flutter/android/src/main/java/com/tencent/vod/flutter/player/FTXVodPlayer.java b/Flutter/android/src/main/java/com/tencent/vod/flutter/player/FTXVodPlayer.java
@@ -317,6 +317,9 @@ int startPlayerVodPlay(String url) {
 
     void startPlayerVodPlayWithParams(int appId, String fileId, String psign) {
         if (mVodPlayer != null) {
+            if (null != mCurRenderView) {
+                mCurRenderView.setPlayer(this);
+            }
             TXPlayInfoParams playInfoParams = new TXPlayInfoParams(appId, fileId, psign);
             mVodPlayer.startVodPlay(playInfoParams);
         }
diff --git a/Flutter/android/src/main/java/com/tencent/vod/flutter/tools/FTXVersionAdapter.java b/Flutter/android/src/main/java/com/tencent/vod/flutter/tools/FTXVersionAdapter.java
@@ -1,7 +1,5 @@
 package com.tencent.vod.flutter.tools;
 
-import android.text.TextUtils;
-
 import com.tencent.liteav.base.util.LiteavLog;
 import com.tencent.rtmp.TXVodConstants;
 import com.tencent.rtmp.TXVodPlayConfig;
diff --git a/Flutter/android/src/main/java/com/tencent/vod/flutter/ui/FlutterPipImplActivity.java b/Flutter/android/src/main/java/com/tencent/vod/flutter/ui/FlutterPipImplActivity.java
@@ -20,6 +20,7 @@
 import android.os.Handler;
 import android.os.IBinder;
 import android.text.TextUtils;
+import android.view.SurfaceView;
 import android.view.TextureView;
 import android.view.View;
 import android.view.Window;
@@ -319,10 +320,12 @@ private void handlePipExitEvent() {
         }
         if (null != mPlayerHolder.getVodPlayer()) {
             mPlayerHolder.getVodPlayer().setSurface(null);
+            mPlayerHolder.getVodPlayer().setPlayerView((TXCloudVideoView) null);
             mPlayerHolder.getVodPlayer().setVodListener(null);
         }
         if (null != mPlayerHolder.getLivePlayer()) {
             mPlayerHolder.getLivePlayer().setRenderView((TextureView) null);
+            mPlayerHolder.getLivePlayer().setRenderView((SurfaceView) null);
             mPlayerHolder.getLivePlayer().setObserver(null);
         }
         mPlayerHolder.pause();
diff --git a/Flutter/example/lib/demo_txvodplayer.dart b/Flutter/example/lib/demo_txvodplayer.dart
@@ -74,8 +74,6 @@ class _DemoTXVodPlayerState extends State<DemoTXVodPlayer> with WidgetsBindingOb
       }
     });
 
-    await _controller.setLoop(true);
-    await _controller.enableHardwareDecode(enableHardware);
     await _controller.setConfig(FTXVodPlayConfig());
     await _controller.setRenderMode(_renderMode);
     if (!isLicenseSuc.isCompleted) {
diff --git a/Flutter/ios/Classes/player/FTXLivePlayer.m b/Flutter/ios/Classes/player/FTXLivePlayer.m
@@ -535,7 +535,8 @@ - (nullable BoolMsg *)startLivePlayPlayerMsg:(nonnull StringPlayerMsg *)playerMs
     return [TXCommonUtil boolMsgWith:r];
 }
 
-- (void)setPlayerViewRenderViewId:(NSInteger)renderViewId error:(FlutterError * _Nullable __autoreleasing * _Nonnull)error { 
+- (void)setPlayerViewRenderViewId:(NSInteger)renderViewId error:(FlutterError * _Nullable __autoreleasing * _Nonnull)error {
+    FTXLOGI(@"setPlayerView, renderViewId:%ld", renderViewId);
     FTXRenderView *renderView = [self.renderViewFactory findViewById:renderViewId];
     if (nil != renderView) {
         self.curRenderView = renderView;
diff --git a/Flutter/ios/Classes/player/FTXVodPlayer.m b/Flutter/ios/Classes/player/FTXVodPlayer.m
@@ -1035,7 +1035,8 @@ - (void)setStringOptionPlayerMsg:(StringOptionPlayerMsg *)playerMsg error:(Flutt
     }
 }
 
-- (void)setPlayerViewRenderViewId:(NSInteger)renderViewId error:(FlutterError * _Nullable __autoreleasing * _Nonnull)error { 
+- (void)setPlayerViewRenderViewId:(NSInteger)renderViewId error:(FlutterError * _Nullable __autoreleasing * _Nonnull)error {
+    FTXLOGI(@"setPlayerView, renderViewId:%ld", renderViewId);
     FTXRenderView *renderView = [self.renderViewFactory findViewById:renderViewId];
     if (nil != renderView) {
         self.curRenderView = renderView;

Original file line number	Diff line number	Diff line change
`@@ -317,6 +317,9 @@ int startPlayerVodPlay(String url) {`
`317`	`317`
`318`	`318`	`void startPlayerVodPlayWithParams(int appId, String fileId, String psign) {`
`319`	`319`	`if (mVodPlayer != null) {`
	`320`	`+ if (null != mCurRenderView) {`
	`321`	`+ mCurRenderView.setPlayer(this);`
	`322`	`+ }`
`320`	`323`	`TXPlayInfoParams playInfoParams = new TXPlayInfoParams(appId, fileId, psign);`
`321`	`324`	`mVodPlayer.startVodPlay(playInfoParams);`
`322`	`325`	`}`
Original file line number	Diff line number	Diff line change
`@@ -74,8 +74,6 @@ class _DemoTXVodPlayerState extends State<DemoTXVodPlayer> with WidgetsBindingOb`
`74`	`74`	`}`
`75`	`75`	`});`
`76`	`76`
`77`		`- await _controller.setLoop(true);`
`78`		`- await _controller.enableHardwareDecode(enableHardware);`
`79`	`77`	`await _controller.setConfig(FTXVodPlayConfig());`
`80`	`78`	`await _controller.setRenderMode(_renderMode);`
`81`	`79`	`if (!isLicenseSuc.isCompleted) {`
Original file line number	Diff line number	Diff line change
`@@ -535,7 +535,8 @@ - (nullable BoolMsg )startLivePlayPlayerMsg:(nonnull StringPlayerMsg )playerMs`
`535`	`535`	`return [TXCommonUtil boolMsgWith:r];`
`536`	`536`	`}`
`537`	`537`
`538`		`-- (void)setPlayerViewRenderViewId:(NSInteger)renderViewId error:(FlutterError * _Nullable __autoreleasing * _Nonnull)error {`
	`538`	`+- (void)setPlayerViewRenderViewId:(NSInteger)renderViewId error:(FlutterError * _Nullable __autoreleasing * _Nonnull)error {`
	`539`	`+ FTXLOGI(@"setPlayerView, renderViewId:%ld", renderViewId);`
`539`	`540`	`FTXRenderView *renderView = [self.renderViewFactory findViewById:renderViewId];`
`540`	`541`	`if (nil != renderView) {`
`541`	`542`	`self.curRenderView = renderView;`
Original file line number	Diff line number	Diff line change
`@@ -1035,7 +1035,8 @@ - (void)setStringOptionPlayerMsg:(StringOptionPlayerMsg *)playerMsg error:(Flutt`
`1035`	`1035`	`}`
`1036`	`1036`	`}`
`1037`	`1037`
`1038`		`-- (void)setPlayerViewRenderViewId:(NSInteger)renderViewId error:(FlutterError * _Nullable __autoreleasing * _Nonnull)error {`
	`1038`	`+- (void)setPlayerViewRenderViewId:(NSInteger)renderViewId error:(FlutterError * _Nullable __autoreleasing * _Nonnull)error {`
	`1039`	`+ FTXLOGI(@"setPlayerView, renderViewId:%ld", renderViewId);`
`1039`	`1040`	`FTXRenderView *renderView = [self.renderViewFactory findViewById:renderViewId];`
`1040`	`1041`	`if (nil != renderView) {`
`1041`	`1042`	`self.curRenderView = renderView;`