1. Avoid the problem that some functions in the SDK cannot be used normally after a cold start on some models.

kongdywang · kongdywang · commit ce5f329a8a6b · 2024-12-25T15:24:51.000+08:00
2. After the plugin executes onDetachedFromEngine, Picture-in-Picture will be forcibly closed to prevent problems caused by inconsistent variables.
diff --git a/Flutter/android/src/main/java/com/tencent/vod/flutter/FTXPIPManager.java b/Flutter/android/src/main/java/com/tencent/vod/flutter/FTXPIPManager.java
@@ -145,27 +145,32 @@ public void exitPip() {
     public int isSupportDevice() {
         int pipResult = FTXEvent.NO_ERROR;
         Activity activity = TXFlutterEngineHolder.getInstance().getCurActivity();
-        if (!activity.isDestroyed()) {
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
-                // check permission
-                boolean isSuccess =
-                        activity.getPackageManager().hasSystemFeature(PackageManager.FEATURE_PICTURE_IN_PICTURE);
-                if (!isSuccess) {
-                    pipResult = FTXEvent.ERROR_PIP_FEATURE_NOT_SUPPORT;
-                    LiteavLog.e(TAG, "enterPip failed,because PIP feature is disabled");
-                } else if (!hasPipPermission(activity)) {
-                    pipResult = FTXEvent.ERROR_PIP_DENIED_PERMISSION;
-                    LiteavLog.e(TAG, "enterPip failed,because PIP has no permission");
+        if (null != activity) {
+            if (!activity.isDestroyed()) {
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+                    // check permission
+                    boolean isSuccess =
+                            activity.getPackageManager().hasSystemFeature(PackageManager.FEATURE_PICTURE_IN_PICTURE);
+                    if (!isSuccess) {
+                        pipResult = FTXEvent.ERROR_PIP_FEATURE_NOT_SUPPORT;
+                        LiteavLog.e(TAG, "enterPip failed,because PIP feature is disabled");
+                    } else if (!hasPipPermission(activity)) {
+                        pipResult = FTXEvent.ERROR_PIP_DENIED_PERMISSION;
+                        LiteavLog.e(TAG, "enterPip failed,because PIP has no permission");
+                    }
+                } else {
+                    pipResult = FTXEvent.ERROR_PIP_LOWER_VERSION;
+                    LiteavLog.e(TAG, "enterPip failed,because android version is too low,"
+                            + "Minimum supported version is android 24,but current is "
+                            + Build.VERSION.SDK_INT);
                 }
             } else {
-                pipResult = FTXEvent.ERROR_PIP_LOWER_VERSION;
-                LiteavLog.e(TAG, "enterPip failed,because android version is too low,"
-                        + "Minimum supported version is android 24,but current is "
-                        + Build.VERSION.SDK_INT);
+                pipResult = FTXEvent.ERROR_PIP_ACTIVITY_DESTROYED;
+                LiteavLog.e(TAG, "enterPip failed,because activity is destroyed");
             }
         } else {
             pipResult = FTXEvent.ERROR_PIP_ACTIVITY_DESTROYED;
-            LiteavLog.e(TAG, "enterPip failed,because activity is destroyed");
+            LiteavLog.e(TAG, "current activity is null, please check cur act status!");
         }
         return pipResult;
     }
diff --git a/Flutter/android/src/main/java/com/tencent/vod/flutter/SuperPlayerPlugin.java b/Flutter/android/src/main/java/com/tencent/vod/flutter/SuperPlayerPlugin.java
@@ -465,12 +465,12 @@ private FTXPIPManager getPipManager() {
     public void onDetachedFromEngine(@NonNull FlutterPluginBinding binding) {
         LiteavLog.i(TAG, "onDetachedFromEngine");
         mFTXDownloadManager.destroy();
-        mFlutterPluginBinding = null;
         if (null != mOrientationManager) {
             mOrientationManager.disable();
         }
         if (null != mTxPipManager) {
             mTxPipManager.releaseActivityListener();
+            mTxPipManager.exitPip();
         }
         // Close the solution to the problem of the picture-in-picture click restore
         // failure on some versions of Android 12.
@@ -480,6 +480,7 @@ public void onDetachedFromEngine(@NonNull FlutterPluginBinding binding) {
         unregisterReceiver();
         TXFlutterEngineHolder.getInstance().destroy(binding);
         TXLiveBase.setListener(null);
+        mFlutterPluginBinding = null;
     }
 
     @Override
diff --git a/Flutter/android/src/main/java/com/tencent/vod/flutter/tools/TXFlutterEngineHolder.java b/Flutter/android/src/main/java/com/tencent/vod/flutter/tools/TXFlutterEngineHolder.java
@@ -36,7 +36,7 @@ public static TXFlutterEngineHolder getInstance() {
 
     public void attachBindLife(FlutterPlugin.FlutterPluginBinding binding) {
         if (mLifeCallback != null) {
-            LiteavLog.w(TAG, "TXFlutterEngineHolder is already attach");
+            LiteavLog.w(TAG, "TXFlutterEngineHolder is already attached");
             return;
         }
         if (null == binding) {
@@ -52,6 +52,7 @@ public void onActivityCreated(@NonNull Activity activity, @Nullable Bundle saved
             @Override
             public void onActivityStarted(@NonNull Activity activity) {
                 mFrontContextCount++;
+                LiteavLog.i(TAG, "activity is started:" + activity);
                 if (mIsEnterBack && mFrontContextCount > 0) {
                     mIsEnterBack = false;
                     notifyResume();
@@ -61,6 +62,7 @@ public void onActivityStarted(@NonNull Activity activity) {
             @Override
             public void onActivityResumed(@NonNull Activity activity) {
                 synchronized (mActivityList) {
+                    LiteavLog.i(TAG, "activity is resumed:" + activity);
                     int index = findIndexByAct(activity);
                     if (index >= 0) {
                         // refresh index
@@ -78,6 +80,7 @@ public void onActivityPaused(@NonNull Activity activity) {
             @Override
             public void onActivityStopped(@NonNull Activity activity) {
                 mFrontContextCount--;
+                LiteavLog.i(TAG, "activity is stopped:" + activity);
                 if (!mIsEnterBack && mFrontContextCount <= 0) {
                     mIsEnterBack = true;
                     notifyEnterBack();
@@ -92,6 +95,7 @@ public void onActivitySaveInstanceState(@NonNull Activity activity, @NonNull Bun
             @Override
             public void onActivityDestroyed(@NonNull Activity activity) {
                 synchronized (mActivityList) {
+                    LiteavLog.i(TAG, "activity is destroyed:" + activity);
                     int index = findIndexByAct(activity);
                     if (index >= 0) {
                         mActivityList.remove(index);
@@ -146,13 +150,15 @@ public Activity getCurActivity() {
     }
 
     public void destroy(FlutterPlugin.FlutterPluginBinding binding) {
+        LiteavLog.i(TAG, "called engine holder destroy");
         if (null == mLifeCallback) {
             return;
         }
         if (null == binding) {
             return;
         }
         ((Application)binding.getApplicationContext()).unregisterActivityLifecycleCallbacks(mLifeCallback);
+        mLifeCallback = null;
     }
 
     public void addAppLifeListener(TXAppStatusListener listener) {
