@byteplus/react-native-live-pull 1.1.1-rc.1 → 1.1.2-rc.0

package/android/src/main/java/com/volcengine/velive/rn/pull/pictureInpicture/FloatingWindowHelper.java

@@ -174,6 +174,7 @@ public class FloatingWindowHelper implements IFloatingWindowHelper {
 
     mConfig = null;
     mExtraDataMap = null;
+    isRunning = false;
   }
 
   public static class AssistantActivity extends Activity {

package/android/src/main/java/com/volcengine/velive/rn/pull/pictureInpicture/FloatingWindowService.java

@@ -1,10 +1,15 @@
 package com.volcengine.velive.rn.pull.pictureInpicture;
 
 import android.app.Service;
+import android.content.BroadcastReceiver;
+import android.content.Context;
 import android.content.Intent;
+import android.content.IntentFilter;
 import android.graphics.PixelFormat;
 import android.os.Build;
+import android.os.Handler;
 import android.os.IBinder;
+import android.os.Looper;
 import android.provider.Settings;
 import android.util.DisplayMetrics; // Import DisplayMetrics
 import android.util.Log;
@@ -26,7 +31,10 @@ public class FloatingWindowService extends Service {
   private WindowManager.LayoutParams mLayoutParams;
   private SurfaceView mSurfaceView;
   private View mSmallWindowView;
+  private ActivityLaunchReceiver mActivityLaunchReceiver;
 
+  public static final String ACTION_STOP_PIP_SERVICE =
+      "com.volcengine.velive.rn.pull.STOP_PIP_SERVICE";
   public static final String INTENT_EXTRA_KEY_ASPECT_RATIO = "aspect_ratio";
   public static final String INTENT_EXTRA_KEY_X_POS = "x_pos";
   public static final String INTENT_EXTRA_KEY_Y_POS = "y_pos";
@@ -52,8 +60,14 @@ public class FloatingWindowService extends Service {
   public void onDestroy() {
     Log.d(TAG, "onDestroy");
     super.onDestroy();
+    unregisterActivityLaunchReceiver(); // Ensure receiver is unregistered on
+                                        // destroy
     if (mSmallWindowView != null) {
-      mWindowManager.removeView(mSmallWindowView);
+      try {
+        mWindowManager.removeView(mSmallWindowView);
+      } catch (Exception e) {
+        Log.e(TAG, "Error removing view: " + e.getMessage());
+      }
     }
     FloatingWindowHelper.getInstance().onStopService();
   }
@@ -117,12 +131,15 @@ public class FloatingWindowService extends Service {
         mWindowManager.addView(mSmallWindowView, mLayoutParams);
         mSurfaceView = mSmallWindowView.findViewById(R.id.surface_view);
         mSmallWindowView.findViewById(R.id.surface_close_btn)
-            .setOnClickListener(v -> { stopSelf(); });
+            .setOnClickListener(v -> {
+              unregisterActivityLaunchReceiver();
+              stopSelf();
+            });
 
         mSmallWindowView.findViewById(R.id.new_window_btn)
             .setOnClickListener(v -> {
               Log.d(TAG, "PIP window clicked");
-              
+
               try {
                 // Get the pacain activity
                 String packageName = this.getPackageName();
@@ -133,6 +150,8 @@ public class FloatingWindowService extends Service {
                 if (launchIntent != null) {
                   Log.d(TAG, "Launching app with intent: " + launchIntent);
                   launchIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+                  // Register receiver to stop service when activity is launched
+                  registerActivityLaunchReceiver();
                   this.startActivity(launchIntent);
                 } else {
                   Log.e(TAG, "Could not create launch intent for package: " +
@@ -141,13 +160,49 @@ public class FloatingWindowService extends Service {
               } catch (Exception e) {
                 Log.e(TAG, "Error launching app: " + e.getMessage(), e);
               }
-
-              stopSelf();
             });
       }
     }
   }
 
+  private void registerActivityLaunchReceiver() {
+    if (mActivityLaunchReceiver == null) {
+      mActivityLaunchReceiver = new ActivityLaunchReceiver();
+      IntentFilter filter = new IntentFilter(ACTION_STOP_PIP_SERVICE);
+      if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+        registerReceiver(mActivityLaunchReceiver, filter,
+                         Context.RECEIVER_EXPORTED);
+      } else {
+        registerReceiver(mActivityLaunchReceiver, filter);
+      }
+      Log.d(TAG, "ActivityLaunchReceiver registered");
+    }
+  }
+
+  private void unregisterActivityLaunchReceiver() {
+    if (mActivityLaunchReceiver != null) {
+      try {
+        unregisterReceiver(mActivityLaunchReceiver);
+        mActivityLaunchReceiver = null;
+        Log.d(TAG, "ActivityLaunchReceiver unregistered");
+      } catch (IllegalArgumentException e) {
+        Log.e(TAG, "Receiver not registered: " + e.getMessage());
+      }
+    }
+  }
+
+  // BroadcastReceiver to listen for activity launch confirmation
+  private class ActivityLaunchReceiver extends BroadcastReceiver {
+    @Override
+    public void onReceive(Context context, Intent intent) {
+      Log.d(TAG, "Received broadcast to stop PIP service");
+      if (ACTION_STOP_PIP_SERVICE.equals(intent.getAction())) {
+        stopSelf();                         // Stop the service
+        unregisterActivityLaunchReceiver(); // Unregister receiver
+      }
+    }
+  }
+
   private class FloatingOnTouchListener implements View.OnTouchListener {
     private final int touchSlop =
         ViewConfiguration