ちょっとプロパティを用意してみた。

[gokigen/FujiCam.git] / app / src / main / java / net / osdn / gokigen / cameratest / fuji / statuses / FujiStatusHolder.java

diff --git a/app/src/main/java/net/osdn/gokigen/cameratest/fuji/statuses/FujiStatusHolder.java b/app/src/main/java/net/osdn/gokigen/cameratest/fuji/statuses/FujiStatusHolder.java
index f06d805..d9291fe 100644 (file)
--- a/app/src/main/java/net/osdn/gokigen/cameratest/fuji/statuses/FujiStatusHolder.java
+++ b/app/src/main/java/net/osdn/gokigen/cameratest/fuji/statuses/FujiStatusHolder.java
@@ -1,8 +1,11 @@
 package net.osdn.gokigen.cameratest.fuji.statuses;
 
-import android.util.Log;
+
 import android.util.SparseIntArray;
 
+import static net.osdn.gokigen.cameratest.fuji.statuses.Properties.BATTERY_LEVEL;
+import static net.osdn.gokigen.cameratest.fuji.statuses.Properties.FOCUS_LOCK;
+
 class FujiStatusHolder implements IFujiStatus
 {
     private final String TAG = toString();
@@ -38,4 +41,63 @@ class FujiStatusHolder implements IFujiStatus
         }
         return (0);
     }
+
+    @Override
+    public boolean isFocusLocked()
+    {
+        try
+        {
+            int status = statusHolder.get(FOCUS_LOCK);
+            if (status == 1)
+            {
+                return (true);
+            }
+        }
+        catch (Exception e)
+        {
+            e.printStackTrace();
+        }
+        return (false);
+    }
+
+    @Override
+    public int getBatteryLevel()
+    {
+        int level = -1;
+        try
+        {
+            int status = statusHolder.get(BATTERY_LEVEL);
+            if ((status == 1)||(status == 6))
+            {
+                level = 0;
+            }
+            else if (status == 7)
+            {
+                level = 20;
+            }
+            else if ((status == 2)||(status == 8))
+            {
+                level = 40;
+            }
+            else if (status == 9)
+            {
+                level = 60;
+            }
+            else if ((status == 3)||(status == 10))
+            {
+                level = 80;
+            }
+            else if ((status == 4)||(status == 11))
+            {
+                level = 100;
+            }
+        }
+        catch (Exception e)
+        {
+            e.printStackTrace();
+        }
+        return (level);
+    }
+
+
 }