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

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,21 +1,17 @@
-/**
- * Copyright (c) 2023 Beijing Volcano Engine Technology Ltd. All rights
- * reserved. Licensed under the MIT License (the "License"); you may not use
- * this file except in compliance with the License. You may obtain a copy of the
- * License at http://opensource.org/licenses/MIT Unless required by applicable
- * law or agreed to in writing, software distributed under the License is
- * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the specific language
- * governing permissions and limitations under the License.
- */
 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;
 import android.view.Gravity;
 import android.view.LayoutInflater;
@@ -29,13 +25,16 @@ import com.volcengine.velive.rn.pull.R;
 
 public class FloatingWindowService extends Service {
   private static final String TAG = FloatingWindowService.class.getSimpleName();
-  private static final int LONGER_SIDE_MAX_LEN = 800;
+  private static final int LONGER_SIDE_MAX_LEN = 1000;
 
   private WindowManager mWindowManager;
   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";
@@ -61,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();
   }
@@ -86,16 +91,29 @@ public class FloatingWindowService extends Service {
     mLayoutParams.flags = WindowManager.LayoutParams.FLAG_NOT_TOUCH_MODAL |
                           WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE;
 
+    // Get screen dimensions
+    DisplayMetrics displayMetrics = new DisplayMetrics();
+    mWindowManager.getDefaultDisplay().getMetrics(displayMetrics);
+    int screenWidth = displayMetrics.widthPixels;
+    int screenHeight = displayMetrics.heightPixels;
+
+    // Calculate the minimum screen dimension
+    int minScreenDim = Math.min(screenWidth, screenHeight);
+
+    // Determine the maximum length based on the smaller of 1000 and
+    // minScreenDim
+    int maxLen = Math.min(LONGER_SIDE_MAX_LEN, minScreenDim);
+
     // Limit the floating window size to prevent it from being too large or too
-    // small, control the longer side to LONGER_SIDE_MAX_LEN, scale the shorter
+    // small, control the longer side to maxLen, scale the shorter
     // side proportionally
     int width, height;
     if (aspectRatio >= 1) {
-      height = (int)(LONGER_SIDE_MAX_LEN / aspectRatio);
-      width = LONGER_SIDE_MAX_LEN;
+      height = (int)(maxLen / aspectRatio);
+      width = maxLen;
     } else {
-      width = (int)(LONGER_SIDE_MAX_LEN * aspectRatio);
-      height = LONGER_SIDE_MAX_LEN;
+      width = (int)(maxLen * aspectRatio);
+      height = maxLen;
     }
     mLayoutParams.width = width;
     mLayoutParams.height = height;
@@ -114,9 +132,73 @@ public class FloatingWindowService extends Service {
         mSurfaceView = mSmallWindowView.findViewById(R.id.surface_view);
         mSmallWindowView.findViewById(R.id.surface_close_btn)
             .setOnClickListener(v -> {
-              FloatingWindowHelper.getInstance().performClose(
-                  FloatingWindowService.this);
+              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();
+                Intent launchIntent =
+                    this.getPackageManager().getLaunchIntentForPackage(
+                        packageName);
+
+                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: " +
+                                 packageName);
+                }
+              } catch (Exception e) {
+                Log.e(TAG, "Error launching app: " + e.getMessage(), e);
+              }
+            });
+      }
+    }
+  }
+
+  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
       }
     }
   }

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

@@ -187,29 +187,6 @@ public class PictureInPictureManager {
             if (mListener != null) {
               mListener.onClickPictureInPicture();
             }
-            Log.d(TAG, "PIP window clicked");
-
-            try {
-              // Get the package manager and launch the app's main activity
-              String packageName = context.getPackageName();
-              Intent launchIntent =
-                  context.getPackageManager().getLaunchIntentForPackage(
-                      packageName);
-
-              if (launchIntent != null) {
-                Log.d(TAG, "Launching app with intent: " + launchIntent);
-                launchIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-                context.startActivity(launchIntent);
-              } else {
-                Log.e(TAG, "Could not create launch intent for package: " +
-                               packageName);
-              }
-            } catch (Exception e) {
-              Log.e(TAG, "Error launching app: " + e.getMessage(), e);
-            }
-
-            // Close the floating window
-            mFloatingWindowHelper.closeFloatingWindow(context);
           }
 
           @Override

package/android/src/main/res/drawable/button_close.xml

@@ -1,14 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-  android:width="24dp"
-  android:height="24dp"
-  android:autoMirrored="true"
-  android:viewportWidth="612"
-  android:viewportHeight="612">
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
   <path
-    android:fillColor="#FF000000"
-    android:pathData="M612,306C612,137.004 474.995,0 306,0C137.004,0 0,137.004 0,
-                        306c0,168.995 137.004,306 306,306C474.995,612 612,474.995 612,
-                        306zM168.3,424.032L286.333,306L168.3,187.967l19.667,-19.667L306,
-                        286.333L424.032,168.3l19.668,19.667L325.667,306L443.7,424.032L424.032,
-                        443.7L306,325.667L187.967,443.7L168.3,424.032z" />
+      android:fillColor="#FFFFFF"
+      android:pathData="M19,6.41L17.59,5 12,10.59 6.41,5 5,6.41 10.59,12 5,17.59 6.41,19 12,13.41 17.59,19 19,17.59 13.41,12z"/>
 </vector>

package/android/src/main/res/drawable/new_window.xml

@@ -0,0 +1,16 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="48dp"
+    android:height="48dp"
+    android:viewportWidth="48.0"
+    android:viewportHeight="48.0">
+  <path
+      android:fillColor="#FFFFFF"
+      android:pathData="M6,4H22V8H8V40H40V26H44V42C44,43.1046 43.1046,44 42,44H6C4.89543,44 4,43.1046 4,42V6C4,4.89543 4.89543,4 6,4Z"/>
+  <path
+      android:fillColor="#FFFFFF"
+      android:pathData="M44,20V6C44,4.89543 43.1046,4 42,4H28V8H40V20H44Z"/>
+  <path
+      android:fillColor="#FFFFFF"
+      android:fillType="evenOdd"
+      android:pathData="M42.0711,4C43.1756,4 44.0711,4.89543 44.0711,6V20H40.0711V10.828L28.1213,22.7782C27.7308,23.1687 27.0976,23.1687 26.7071,22.7782L25.2929,21.364C24.9024,20.9734 24.9024,20.3403 25.2929,19.9497L37.2421,7.999L28.0711,8V4L42.0711,4Z"/>
+</vector>

package/android/src/main/res/layout/floating_window_layout.xml

@@ -2,13 +2,14 @@
 <RelativeLayout
   xmlns:android="http://schemas.android.com/apk/res/android"
   android:layout_width="match_parent"
-  android:layout_height="match_parent">
+  android:layout_height="match_parent"
+  >
 
   <SurfaceView
     android:id="@+id/surface_view"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
-  </SurfaceView>
+    android:layout_height="match_parent"
+    ></SurfaceView>
   <Button
     android:id="@+id/surface_close_btn"
     android:background="@drawable/button_close"
@@ -16,4 +17,13 @@
     android:layout_height="20dp"
     android:layout_marginTop="4dp"
     android:layout_marginStart="4dp" />
+  <Button
+    android:id="@+id/new_window_btn"
+    android:background="@drawable/new_window"
+    android:layout_width="16dp"
+    android:layout_height="16dp"
+    android:layout_marginTop="4dp"
+    android:layout_marginEnd="4dp"
+    android:layout_alignParentTop="true"
+    android:layout_alignParentEnd="true" />
 </RelativeLayout>