操作パネルのTheta用操作の追加。

diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml
new file mode 100644 (file)
index 0000000..b795df0
--- /dev/null
+++ b/.idea/deploymentTargetDropDown.xml
@@ -0,0 +1,17 @@
+<?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-03T13:46:12.807438300Z" />
+  </component>
+</project>
\ No newline at end of file

diff --git a/.idea/dictionaries/MRSa.xml b/.idea/dictionaries/MRSa.xml
index 662859a..3e9f4b7 100644 (file)
--- a/.idea/dictionaries/MRSa.xml
+++ b/.idea/dictionaries/MRSa.xml
@@ -2,6 +2,7 @@
   <dictionary name="MRSa">
     <words>
       <w>acclock</w>
+      <w>batt</w>
       <w>equirectangular</w>
       <w>liveview</w>
       <w>mpget</w>

diff --git a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/theta/status/ThetaCameraStatusListHolder.kt b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/theta/status/ThetaCameraStatusListHolder.kt
new file mode 100644 (file)
index 0000000..4974a2d
--- /dev/null
+++ b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/theta/status/ThetaCameraStatusListHolder.kt
@@ -0,0 +1,308 @@
+package jp.osdn.gokigen.gokigenassets.camera.theta.status
+
+import jp.osdn.gokigen.gokigenassets.camera.theta.operation.ThetaOptionGetControl
+import jp.osdn.gokigen.gokigenassets.camera.theta.operation.ThetaOptionSetControl
+
+class ThetaCameraStatusListHolder(private val sessionIdProvider: IThetaSessionIdProvider, executeUrl : String = "http://192.168.1.1")
+{
+    private val optionGet = ThetaOptionGetControl(sessionIdProvider, executeUrl)
+    private val optionSet = ThetaOptionSetControl(sessionIdProvider, executeUrl)
+
+    fun getAvailableTakeModeList(): List<String?>
+    {
+        return (listOf("Manual", "Normal", "Aperture", "Shutter", "ISO"))
+    }
+
+    fun getAvailableShutterSpeedList(): List<String?>
+    {
+        return (listOf("1/25000",
+            "1/20000",
+            "1/16000",
+            "1/12500",
+            "1/10000",
+            "1/8000",
+            "1/6400",
+            "1/5000",
+            "1/4000",
+            "1/3200",
+            "1/2500",
+            "1/2000",
+            "1/1600",
+            "1/1250",
+            "1/1000",
+            "1/800",
+            "1/640",
+            "1/500",
+            "1/400",
+            "1/320",
+            "1/250",
+            "1/200",
+            "1/160",
+            "1/125",
+            "1/100",
+            "1/80",
+            "1/60",
+            "1/50",
+            "1/40",
+            "1/30",
+            "1/25",
+            "1/20",
+            "1/15",
+            "1/13",
+            "1/10",
+            "1/8",
+            "1/6",
+            "1/5",
+            "1/4",
+            "1/3",
+            "1/2.5",
+            "1/2",
+            "1/1.6",
+            "1/1.3",
+            "1",
+            "1.3",
+            "1.6",
+            "2",
+            "2.5",
+            "3.2",
+            "4",
+            "5",
+            "6",
+            "8",
+            "10",
+            "13",
+            "15",
+            "20",
+            "25",
+            "30",
+            "60"))
+    }
+
+    fun getAvailableApertureList(): List<String?>
+    {
+        return (ArrayList())
+    }
+
+    fun getAvailableExpRevList(): List<String?>
+    {
+        return (ArrayList())
+    }
+
+    fun getAvailableCaptureModeStringList(): List<String?>
+    {
+        return (listOf("image", "video"))
+    }
+
+    fun getAvailableIsoSensitivityList(): List<String?>
+    {
+        return (listOf("AUTO", "64", "80", "100", "125", "160", "200", "250", "320", "400", "500", "640", "800", "1000", "1250", "1600", "2000", "2500", "3200", "4000", "5000", "6000"))
+    }
+
+    fun getAvailableWhiteBalanceList(): List<String?>
+    {
+        return (listOf("auto","daylight","shade","cloudy-daylight","incandescent","_warmWhiteFluorescent","_dayLightFluorescent","_dayWhiteFluorescent","fluorescent","_bulbFluorescent","_colorTemperature","_underwater"))
+    }
+
+    fun getAvailableMeteringModeList(): List<String?>
+    {
+        return (ArrayList())
+    }
+
+    fun getAvailablePictureEffectList(): List<String?>
+    {
+        return (ArrayList())
+    }
+
+    fun setTakeMode(value: String)
+    {
+        try
+        {
+            val useOSCv2 = sessionIdProvider.sessionId.isEmpty()
+            val setValue = when (value)
+            {
+                "Manual" -> 1
+                "Normal" -> 2
+                "Aperture" -> 3
+                "Shutter" -> 4
+                "ISO" -> 9
+                else -> return
+            }
+            optionSet.setOptions(" \"exposureProgram\": $setValue", useOSCv2)
+        }
+        catch (e: Exception)
+        {
+            e.printStackTrace()
+        }
+    }
+
+    fun setShutterSpeed(value: String)
+    {
+        try
+        {
+            val setValue = when (value) {
+                "1/25000" -> 0.00004
+                "1/20000" -> 0.00005
+                "1/16000" -> 0.0000625
+                "1/12500" -> 0.00008
+                "1/10000" -> 0.0001
+                "1/8000" -> 0.000125
+                "1/6400" -> 0.00015625
+                "1/5000" -> 0.0002
+                "1/4000" -> 0.00025
+                "1/3200" -> 0.0003125
+                "1/2500" -> 0.0004
+                "1/2000" -> 0.0005
+                "1/1600" -> 0.000625
+                "1/1250" -> 0.0008
+                "1/1000" -> 0.001
+                "1/800" -> 0.00125
+                "1/640" -> 0.0015625
+                "1/500" -> 0.002
+                "1/400" -> 0.0025
+                "1/320" -> 0.003125
+                "1/250" -> 0.004
+                "1/200" -> 0.005
+                "1/160" -> 0.00625
+                "1/125" -> 0.008
+                "1/100" -> 0.01
+                "1/80" -> 0.0125
+                "1/60" -> 0.01666666
+                "1/50" -> 0.02
+                "1/40" -> 0.025
+                "1/30" -> 0.03333333
+                "1/25" -> 0.04
+                "1/20" -> 0.05
+                "1/15" -> 0.06666666
+                "1/13" -> 0.07692307
+                "1/10" -> 0.1
+                "1/8" ->  0.125
+                "1/6" -> 0.16666666
+                "1/5" -> 0.2
+                "1/4" -> 0.25
+                "1/3" -> 0.33333333
+                "1/2.5" -> 0.4
+                "1/2" -> 0.5
+                "1/1.6" -> 0.625
+                "1/1.3" -> 0.76923076
+                "1" -> 1
+                "1.3" -> 1.3
+                "1.6" -> 1.6
+                "2" -> 2
+                "2.5" -> 2.5
+                "3.2" -> 3.2
+                "4" -> 4
+                "5" -> 5
+                "6" -> 6
+                "8" -> 8
+                "10" -> 10
+                "13" -> 13
+                "15" -> 15
+                "20" -> 20
+                "25" -> 25
+                "30" -> 30
+                "60" -> 60
+                else -> return
+            }
+            val useOSCv2 = sessionIdProvider.sessionId.isEmpty()
+            optionSet.setOptions(" \"shutterSpeed\": $setValue", useOSCv2)
+        }
+        catch (e: Exception)
+        {
+            e.printStackTrace()
+        }
+    }
+
+
+    fun setAperture(value: String)
+    {
+        try
+        {
+
+        }
+        catch (e: Exception)
+        {
+            e.printStackTrace()
+        }
+    }
+
+
+
+    fun setExpRev(value: String)
+    {
+        try
+        {
+
+        }
+        catch (e: Exception)
+        {
+            e.printStackTrace()
+        }
+    }
+
+
+    fun setCaptureMode(value: String)
+    {
+        try
+        {
+            val useOSCv2 = sessionIdProvider.sessionId.isEmpty()
+            val setValue = if ((!useOSCv2)&&(value == "video")) { "_video" } else { value }
+            optionSet.setOptions(" \"captureMode\": \"$setValue\"", useOSCv2)
+        }
+        catch (e: Exception)
+        {
+            e.printStackTrace()
+        }
+    }
+
+    fun setIsoSensitivity(value: String)
+    {
+        try
+        {
+            val useOSCv2 = sessionIdProvider.sessionId.isEmpty()
+            val setValue = if (value == "AUTO") { "0" } else { value }
+            optionSet.setOptions(" \"iso\": $setValue", useOSCv2)
+        }
+        catch (e: Exception)
+        {
+            e.printStackTrace()
+        }
+    }
+
+    fun setWhiteBalance(value: String)
+    {
+        try
+        {
+            val useOSCv2 = sessionIdProvider.sessionId.isEmpty()
+            optionSet.setOptions(" \"whiteBalance\": \"$value\"", useOSCv2)
+        }
+        catch (e: Exception)
+        {
+            e.printStackTrace()
+        }
+    }
+
+    fun setMeteringMode(value: String)
+    {
+        try
+        {
+
+        }
+        catch (e: Exception)
+        {
+            e.printStackTrace()
+        }
+    }
+
+    fun setPictureEffect(value: String)
+    {
+        try
+        {
+
+        }
+        catch (e: Exception)
+        {
+            e.printStackTrace()
+        }
+    }
+
+}
\ No newline at end of file

diff --git a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/theta/status/ThetaCameraStatusWatcher.kt b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/theta/status/ThetaCameraStatusWatcher.kt
index 6c2abac..f0bab5e 100644 (file)
--- a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/theta/status/ThetaCameraStatusWatcher.kt
+++ b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/theta/status/ThetaCameraStatusWatcher.kt
@@ -12,6 +12,7 @@ import org.json.JSONObject
 class ThetaCameraStatusWatcher(private val sessionIdProvider: IThetaSessionIdProvider, private val captureModeReceiver : ICaptureModeReceiver, private val executeUrl : String = "http://192.168.1.1") : ICameraStatusWatcher, IThetaStatusHolder, ICameraStatus
 {
     private val httpClient = SimpleHttpClient()
+    private val statusListHolder = ThetaCameraStatusListHolder(sessionIdProvider, executeUrl)
     private var whileFetching = false
     private var currentIsoSensitivity : Int = 0
     private var currentBatteryLevel : Double = 0.0
@@ -467,6 +468,27 @@ class ThetaCameraStatusWatcher(private val sessionIdProvider: IThetaSessionIdPro
 
     override fun getStatusList(key: String): List<String?>
     {
+        try
+        {
+            return (when (key) {
+                ICameraStatus.TAKE_MODE -> statusListHolder.getAvailableTakeModeList()
+                ICameraStatus.SHUTTER_SPEED -> statusListHolder.getAvailableShutterSpeedList()
+                ICameraStatus.APERTURE -> statusListHolder.getAvailableApertureList()
+                ICameraStatus.EXPREV -> statusListHolder.getAvailableExpRevList()
+                ICameraStatus.CAPTURE_MODE -> statusListHolder.getAvailableCaptureModeStringList()
+                ICameraStatus.ISO_SENSITIVITY -> statusListHolder.getAvailableIsoSensitivityList()
+                ICameraStatus.WHITE_BALANCE -> statusListHolder.getAvailableWhiteBalanceList()
+                ICameraStatus.AE -> statusListHolder.getAvailableMeteringModeList()
+                ICameraStatus.EFFECT -> statusListHolder.getAvailablePictureEffectList()
+                //ICameraStatus.BATTERY -> // 設定不可
+                //ICameraStatus.TORCH_MODE -> // 設定不可
+                else -> ArrayList<String>()
+            })
+        }
+        catch (e: Exception)
+        {
+            e.printStackTrace()
+        }
         return (ArrayList<String>())
     }
 
@@ -498,7 +520,27 @@ class ThetaCameraStatusWatcher(private val sessionIdProvider: IThetaSessionIdPro
 
     override fun setStatus(key: String, value: String)
     {
-
+        try
+        {
+            when (key) {
+                ICameraStatus.TAKE_MODE -> statusListHolder.setTakeMode(value)
+                ICameraStatus.SHUTTER_SPEED -> statusListHolder.setShutterSpeed(value)
+                ICameraStatus.APERTURE -> statusListHolder.setAperture(value)
+                ICameraStatus.EXPREV -> statusListHolder.setExpRev(value)
+                ICameraStatus.CAPTURE_MODE -> statusListHolder.setCaptureMode(value)
+                ICameraStatus.ISO_SENSITIVITY -> statusListHolder.setIsoSensitivity(value)
+                ICameraStatus.WHITE_BALANCE -> statusListHolder.setWhiteBalance(value)
+                ICameraStatus.AE -> statusListHolder.setMeteringMode(value)
+                ICameraStatus.EFFECT -> statusListHolder.setPictureEffect(value)
+                //ICameraStatus.BATTERY -> // 設定不可
+                //ICameraStatus.TORCH_MODE -> // 設定不可
+                else -> Log.v(TAG, "  ----- setStatus($key, $value) : Unknown -----")
+            }
+        }
+        catch (e: Exception)
+        {
+            e.printStackTrace()
+        }
     }
 
     private fun getTakeMode() : String