操作パネルの、内蔵カメラの制御はこれで終わる。

diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml
deleted file mode 100644 (file)
index c99d997..0000000
--- a/.idea/deploymentTargetDropDown.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="deploymentTargetDropDown">
-    <runningDeviceTargetSelectedWithDropDown>
-      <Target>
-        <type value="RUNNING_DEVICE_TARGET" />
-        <deviceKey>
-          <Key>
-            <type value="SERIAL_NUMBER" />
-            <value value="AHG771417877" />
-          </Key>
-        </deviceKey>
-      </Target>
-    </runningDeviceTargetSelectedWithDropDown>
-    <timeTargetWasSelectedWithDropDown value="2021-08-01T07:54:59.709013100Z" />
-  </component>
-</project>
\ No newline at end of file

diff --git a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/camerax/operation/CameraXCameraStatusHolder.kt b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/camerax/operation/CameraXCameraStatusHolder.kt
index 1d382d8..28d484b 100644 (file)
--- a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/camerax/operation/CameraXCameraStatusHolder.kt
+++ b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/camerax/operation/CameraXCameraStatusHolder.kt
@@ -211,10 +211,7 @@ class CameraXCameraStatusHolder(private val cameraXCameraControl: CameraXCameraC
                 val index = exposureState.exposureCompensationIndex
                 val step = exposureState.exposureCompensationStep
                 val value = index.toDouble() * step.toDouble()
-                if (value != 0.0)
-                {
-                    return (String.format("%+1.1f", value))
-                }
+                return (String.format("%+1.1f", value))
             }
         }
         catch (e : Exception)
@@ -287,7 +284,7 @@ class CameraXCameraStatusHolder(private val cameraXCameraControl: CameraXCameraC
                 val awbMode = captureOptions.getCaptureRequestOption(CaptureRequest.CONTROL_AWB_MODE) ?: 0
                 val colorCorrection = captureOptions.getCaptureRequestOption(CaptureRequest.COLOR_CORRECTION_MODE) ?: 0
                 wb = when (awbMode) {
-                    CameraCharacteristics.CONTROL_AWB_MODE_OFF -> ""
+                    CameraCharacteristics.CONTROL_AWB_MODE_OFF -> "WB:OFF"
                     CameraCharacteristics.CONTROL_AWB_MODE_AUTO -> "WB:AUTO"
                     CameraCharacteristics.CONTROL_AWB_MODE_INCANDESCENT -> "WB:INCANDESCENT"
                     CameraCharacteristics.CONTROL_AWB_MODE_FLUORESCENT -> "WB:FLUORESCENT"
@@ -410,7 +407,8 @@ class CameraXCameraStatusHolder(private val cameraXCameraControl: CameraXCameraC
                     CaptureRequest.FLASH_MODE_OFF -> "FLASH: OFF"
                     CaptureRequest.FLASH_MODE_SINGLE -> "FLASH: SINGLE"
                     CaptureRequest.FLASH_MODE_TORCH -> "FLASH: TORCH"
-                    else -> ""
+                    -1 -> ""
+                    else -> "FLASH: $flashState"
                 }
             }
         }

diff --git a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/camerax/operation/CameraXCameraStatusListHolder.kt b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/camerax/operation/CameraXCameraStatusListHolder.kt
index cdfa829..a81a89b 100644 (file)
--- a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/camerax/operation/CameraXCameraStatusListHolder.kt
+++ b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/camerax/operation/CameraXCameraStatusListHolder.kt
@@ -83,7 +83,7 @@ class CameraXCameraStatusListHolder(private val cameraXCameraControl: CameraXCam
                 val range = exposureState.exposureCompensationRange
                 for (count in range.lower .. range.upper)
                 {
-                    valueList.add(String.format("%+1.1f", (count.toDouble() * step.toDouble())))
+                    valueList.add(String.format("%+1.2f", (count.toDouble() * step.toDouble())))
                 }
                 return (valueList)
             }
@@ -103,6 +103,8 @@ class CameraXCameraStatusListHolder(private val cameraXCameraControl: CameraXCam
     @SuppressLint("UnsafeOptInUsageError")
     private fun getAvailableIsoSensitivity() : List<String>
     {
+        return (ArrayList()) // ISO 設定は有効にならない様子なので設定できないようにする
+/*
         try
         {
             val sensitivityList = ArrayList<String>()
@@ -135,6 +137,7 @@ class CameraXCameraStatusListHolder(private val cameraXCameraControl: CameraXCam
         }
         //return (ArrayList())
         return (listOf("100", "200", "400", "800"))
+*/
     }
 
     private fun getAvailableWhiteBalance() : List<String>
@@ -167,7 +170,7 @@ class CameraXCameraStatusListHolder(private val cameraXCameraControl: CameraXCam
 
     private fun getAvailablePictureEffect() : List<String>
     {
-        return (listOf("OFF", "AE-L/AWB-L", "AE-L", "AWB-L"))
+        return (listOf("OFF", "AE-L and AWB-L", "AE-L", "AWB-L"))
     }
 
     private fun getAvailableTorchMode() : List<String>
@@ -294,7 +297,7 @@ class CameraXCameraStatusListHolder(private val cameraXCameraControl: CameraXCam
     {
         return (when (value)
         {
-            "AE-L/AWB-L" -> true
+            "AE-L and AWB-L" -> true
             "AE-L" -> true
             else -> false
         })
@@ -304,7 +307,7 @@ class CameraXCameraStatusListHolder(private val cameraXCameraControl: CameraXCam
     {
         return (when (value)
         {
-            "AE-L/AWB-L" -> true
+            "AE-L and AWB-L" -> true
             "AWB-L" -> true
             else -> false
         })