Merge pull request #573 from TakayukiHoshi1984/modify_external_camera

外部カメラ対応

Author: TakayukiHoshi1984

dConnectDevicePlugin/dConnectDeviceHost/app/src/main/java/org/deviceconnect/android/deviceplugin/host/activity/recorder/settings/SettingsAudioFragment.java

@@ -17,7 +17,7 @@ public class SettingsAudioFragment extends SettingsParameterFragment {
 
     @Override
     public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
-        getPreferenceManager().setSharedPreferencesName(getRecorderId());
+        getPreferenceManager().setSharedPreferencesName(getRecorderId().replaceAll("/", "_"));
         setPreferencesFromResource(R.xml.settings_host_recorder_audio, rootKey);
     }
 

dConnectDevicePlugin/dConnectDeviceHost/app/src/main/java/org/deviceconnect/android/deviceplugin/host/activity/recorder/settings/SettingsBroadcastFragment.java

@@ -8,7 +8,7 @@ public class SettingsBroadcastFragment extends SettingsBaseFragment {
 
     @Override
     public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
-        getPreferenceManager().setSharedPreferencesName(getRecorderId());
+        getPreferenceManager().setSharedPreferencesName(getRecorderId().replaceAll("/", "_"));
         setPreferencesFromResource(R.xml.settings_host_recorder_broadcast, rootKey);
     }
 

dConnectDevicePlugin/dConnectDeviceHost/app/src/main/java/org/deviceconnect/android/deviceplugin/host/activity/recorder/settings/SettingsPortFragment.java

@@ -7,7 +7,7 @@
 public class SettingsPortFragment extends SettingsBaseFragment {
     @Override
     public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
-        getPreferenceManager().setSharedPreferencesName(getRecorderId());
+        getPreferenceManager().setSharedPreferencesName(getRecorderId().replaceAll("/", "_"));
         setPreferencesFromResource(R.xml.settings_host_recorder_port, rootKey);
     }
 

dConnectDevicePlugin/dConnectDeviceHost/app/src/main/java/org/deviceconnect/android/deviceplugin/host/activity/recorder/settings/SettingsVideoFragment.java

@@ -35,7 +35,7 @@ public class SettingsVideoFragment extends SettingsParameterFragment {
 
     @Override
     public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
-        getPreferenceManager().setSharedPreferencesName(getRecorderId());
+        getPreferenceManager().setSharedPreferencesName(getRecorderId().replaceAll("/", "_"));
         setPreferencesFromResource(R.xml.settings_host_recorder_video, rootKey);
     }
 

dConnectDevicePlugin/dConnectDeviceHost/app/src/main/java/org/deviceconnect/android/deviceplugin/host/camera/Camera2Helper.java

@@ -115,7 +115,7 @@ private static boolean availableCapability(final CameraManager cameraManager, fi
                     }
                 }
             }
-        } catch (CameraAccessException e) {
+        } catch (IllegalArgumentException | CameraAccessException e) {
             // ignore.
         }
         return false;

dConnectDevicePlugin/dConnectDeviceHost/app/src/main/java/org/deviceconnect/android/deviceplugin/host/recorder/HostMediaRecorder.java

@@ -463,7 +463,7 @@ abstract class Settings {
         private final PropertyUtil mPref;
 
         public Settings(Context context, HostMediaRecorder recorder) {
-            mPref = new PropertyUtil(context, recorder.getId());
+            mPref = new PropertyUtil(context, recorder.getId().replaceAll("/", "_"));
         }
 
         /**

dConnectDevicePlugin/dConnectDeviceHost/app/src/main/java/org/deviceconnect/android/deviceplugin/host/recorder/HostMediaRecorderManager.java

@@ -318,6 +318,14 @@ public void destroy() {
         mCameraWrapperManager.destroy();
     }
 
+    /**
+     * 端末が対応しているレコーダを読み込みし直す
+     */
+    public void reloadRecorders() {
+        destroy();
+        mRecorders.clear();
+        initRecorders();
+    }
     /**
      * 指定されたレコーダが使用できるか確認します.
      *

dConnectDevicePlugin/dConnectDeviceHost/app/src/main/java/org/deviceconnect/android/deviceplugin/host/recorder/screen/ScreenCastRecorder.java

@@ -11,6 +11,7 @@
 import android.annotation.TargetApi;
 import android.content.Context;
 import android.graphics.Bitmap;
+import android.graphics.Insets;
 import android.graphics.PixelFormat;
 import android.media.ImageReader;
 import android.os.Build;
@@ -19,8 +20,11 @@
 import android.util.DisplayMetrics;
 import android.util.Range;
 import android.util.Size;
+import android.view.Display;
 import android.view.Surface;
+import android.view.WindowInsets;
 import android.view.WindowManager;
+import android.view.WindowMetrics;
 
 import androidx.annotation.NonNull;
 
@@ -96,7 +100,6 @@ private void initSupportedSettings() {
         Size maxSize = CapabilityUtil.getSupportedMaxSize("video/avc");
 
         Size originalSize = getDisplaySize();
-
         List<Size> supportPictureSizes = new ArrayList<>();
         List<Size> supportPreviewSizes = new ArrayList<>();
         final int num = 4;
@@ -171,10 +174,40 @@ private Size getDisplaySize() {
                 isSwap = true;
                 break;
         }
-        // 画面が回転している場合には、縦横をスワップしておく。
-        int width = isSwap ? metrics.heightPixels : metrics.widthPixels;
-        int height = isSwap ? metrics.widthPixels : metrics.heightPixels;
-        return new Size(width, height);
+        int insetsWidth = 0;
+        int insetsHeight = 0;
+        Size displaySize;
+        if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.R) {
+            WindowMetrics windowMetrics = wm.getCurrentWindowMetrics();
+            final WindowInsets windowInsets = windowMetrics.getWindowInsets();
+            Insets insets = windowInsets.getInsetsIgnoringVisibility(WindowInsets.Type.navigationBars()
+                    | WindowInsets.Type.displayCutout());
+
+            int width = isSwap ? windowMetrics.getBounds().height() :windowMetrics.getBounds().width();
+            int height = isSwap ? windowMetrics.getBounds().width() :windowMetrics.getBounds().height();
+            insetsWidth = insets.right + insets.left;
+            insetsHeight = insets.top + insets.bottom;
+
+            // Legacy size that Display#getSize reports
+            displaySize = new Size(width - insetsWidth,
+                    height - insetsHeight);
+        } else {
+            // 画面が回転している場合には、縦横をスワップしておく。
+            int width = isSwap ? metrics.heightPixels : metrics.widthPixels;
+            int height = isSwap ? metrics.widthPixels : metrics.heightPixels;
+            displaySize =  new Size(width, height);
+        }
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+            Display.Mode[] modes = wm.getDefaultDisplay().getSupportedModes();
+            if(modes.length > 0){
+                Display.Mode mode = modes[modes.length - 1];
+                int width = isSwap ? mode.getPhysicalHeight() : mode.getPhysicalWidth();
+                int height = isSwap ? mode.getPhysicalWidth() : mode.getPhysicalHeight();
+                // 4Kサイズの解像度がある場合はそちらを優先する
+                displaySize  = new Size(width - insetsWidth, height - insetsHeight);
+            }
+        }
+        return displaySize;
     }
 
     @Override