[Android]update .h

Author: alienzh

.gitignore

@@ -2,3 +2,4 @@ xcuserdata
 .DS_Store
 AgoraRtcKit.framework
 */libs
+/sdk

Android/APIExample/agora-simple-filter/src/main/cpp/AgoraRtcKit/AgoraBase.h

@@ -427,6 +427,10 @@ enum WARN_CODE_TYPE {
    * 1053: Audio Device Module: The settings are improper.
    */
   WARN_ADM_IMPROPER_SETTINGS = 1053,
+  /**
+   * 1055: Audio Device Module: The audio device is in a pop state.
+   */
+  WARN_ADM_POP_STATE = 1055,
   /**
    * 1322: No recording device.
    */
@@ -2701,9 +2705,17 @@ enum AUDIO_SCENARIO_TYPE {
    */
   AUDIO_SCENARIO_MEETING = 8,
   /**
-   * 9: The number of enumerations.
+   * 9: AI Server.
+   */
+  AUDIO_SCENARIO_AI_SERVER = 9,
+  /**
+   * 10: AI Client.
+   */
+  AUDIO_SCENARIO_AI_CLIENT = 10,
+  /**
+   * 11: The number of enumerations.
    */
-  AUDIO_SCENARIO_NUM = 9,
+  AUDIO_SCENARIO_NUM = 11,
 };
 
 /**

Android/APIExample/agora-stream-encrypt/src/main/cpp/include/agora/AgoraBase.h

@@ -427,6 +427,10 @@ enum WARN_CODE_TYPE {
    * 1053: Audio Device Module: The settings are improper.
    */
   WARN_ADM_IMPROPER_SETTINGS = 1053,
+  /**
+   * 1055: Audio Device Module: The audio device is in a pop state.
+   */
+  WARN_ADM_POP_STATE = 1055,
   /**
    * 1322: No recording device.
    */
@@ -2701,9 +2705,17 @@ enum AUDIO_SCENARIO_TYPE {
    */
   AUDIO_SCENARIO_MEETING = 8,
   /**
-   * 9: The number of enumerations.
+   * 9: AI Server.
+   */
+  AUDIO_SCENARIO_AI_SERVER = 9,
+  /**
+   * 10: AI Client.
+   */
+  AUDIO_SCENARIO_AI_CLIENT = 10,
+  /**
+   * 11: The number of enumerations.
    */
-  AUDIO_SCENARIO_NUM = 9,
+  AUDIO_SCENARIO_NUM = 11,
 };
 
 /**

Android/APIExample/app/src/main/java/io/agora/api/example/examples/advanced/PictureInPicture.java

@@ -210,6 +210,10 @@ public void onPermissionsResult(boolean allPermissionsGranted, String[] permissi
                 fl_remote3.removeAllViews();
             }
         } else if (v.getId() == switch_float_window.getId()) {
+            if (Build.VERSION.SDK_INT >= 26 && requireActivity().isInPictureInPictureMode()) {
+                showLongToast("Please exit Picture-in-Picture mode first");
+                return;
+            }
             showFloatWindow();
         } else if (v.getId() == R.id.btn_pip) {
             if (checkPipSupported()) {
@@ -500,7 +504,7 @@ private VideoReportLayout getRemoteView(int uid) {
     private void showFloatWindow() {
         FragmentActivity context = requireActivity();
         if (FloatWindowHelper.checkPermission(context)) {
-            if (isFloatWindowShowing()) {
+            if (isFloatWindowShowing() || (Build.VERSION.SDK_INT >= 26 && requireActivity().isInPictureInPictureMode())) {
                 return;
             }
             floatWindowView = FloatWindowHelper.createFloatView(context, 50, 50);
@@ -563,6 +567,11 @@ private void enterPip() {
         if (android.os.Build.VERSION.SDK_INT < 26) {
             return;
         }
+        
+        if(isFloatWindowShowing()) {
+            dismissFloatWindow();
+        }
+        
         requireActivity().enterPictureInPictureMode(pictureInPictureParamsBuilder
                 .setAspectRatio(new Rational(video_layout_container.getWidth(), video_layout_container.getHeight()))
                 .build());