OSDN Git Service

カメラプロパティの用意ひととおり。
authorMRSa <mrsa@myad.jp>
Sat, 18 May 2019 15:20:02 +0000 (00:20 +0900)
committerMRSa <mrsa@myad.jp>
Sat, 18 May 2019 15:20:02 +0000 (00:20 +0900)
app/src/main/java/net/osdn/gokigen/cameratest/camtest/InformationView.java
app/src/main/java/net/osdn/gokigen/cameratest/fuji/PropertyValues.java [deleted file]
app/src/main/java/net/osdn/gokigen/cameratest/fuji/statuses/FujiStatusHolder.java
app/src/main/java/net/osdn/gokigen/cameratest/fuji/statuses/IFujiCameraProperties.java [new file with mode: 0644]
app/src/main/java/net/osdn/gokigen/cameratest/fuji/statuses/IFujiCameraPropertyValues.java [new file with mode: 0644]
app/src/main/java/net/osdn/gokigen/cameratest/fuji/statuses/IFujiStatus.java
app/src/main/java/net/osdn/gokigen/cameratest/fuji/statuses/Properties.java [deleted file]

index 3bcc00d..843fb8e 100644 (file)
@@ -10,7 +10,6 @@ import android.util.Log;
 
 import androidx.appcompat.widget.AppCompatImageView;
 
-import net.osdn.gokigen.cameratest.fuji.statuses.Properties;
 import net.osdn.gokigen.cameratest.fuji.statuses.IFujiStatus;
 
 public class InformationView extends AppCompatImageView
@@ -22,7 +21,17 @@ public class InformationView extends AppCompatImageView
     private boolean focus_lock;
     private boolean isDeviceError;
     private int battery_level;
-    private int iso;
+    private int iso = 0;
+    private String shutter_speed = "";
+    private String aperture = "";
+    private String expRev = "";
+    private String whiteBalance = "";
+    private String focusControlMode = "";
+    private String imageAspect = "";
+    private String imageFormat = "";
+    private String filmSimulation = "";
+    private int f_ss_Control = -1;
+
 
     public InformationView(Context context) {
         super(context);
@@ -74,13 +83,15 @@ public class InformationView extends AppCompatImageView
             {
                 message = message + battery_level + "% ";
             }
+            message = message + " " + shutter_speed + " " + aperture + "  " + expRev + " : cnt:" + f_ss_Control;
             canvas.drawText(message, centerX, centerY - 50, framePaint);
             Log.v(TAG, message);
 
 
+            message = "WB: " + whiteBalance + " ";
             if (focusPoint != null)
             {
-                message = "FOCUS : [" + focusPoint.x + "," + focusPoint.y + "] ";
+                message = message + "FOCUS : [" + focusPoint.x + "," + focusPoint.y + "] ";
             }
             if (focus_lock)
             {
@@ -90,8 +101,15 @@ public class InformationView extends AppCompatImageView
             {
                 message = message + " ERROR";
             }
+            message = message + " [" + focusControlMode + "] ";
             canvas.drawText(message, centerX, centerY, framePaint);
             Log.v(TAG, message);
+
+
+            message = imageAspect + " " + imageFormat + " " + "[" + filmSimulation + "]" + " ";
+            canvas.drawText(message, centerX, centerY + 50, framePaint);
+            Log.v(TAG, message);
+
         }
         catch (Exception e)
         {
@@ -112,7 +130,16 @@ public class InformationView extends AppCompatImageView
         focus_lock = cameraStatus.isFocusLocked();
         battery_level = cameraStatus.getBatteryLevel();
         isDeviceError = cameraStatus.isDeviceError();
-        iso = cameraStatus.getValue(Properties.ISO);
+        iso = cameraStatus.getIsoSensitivity();
+        shutter_speed = cameraStatus.getShutterSpeed();
+        aperture = cameraStatus.getAperture();
+        expRev = cameraStatus.getExpRev();
+        whiteBalance = cameraStatus.getWhiteBalance();
+        f_ss_Control = cameraStatus.getF_SS_Control();
+        focusControlMode = cameraStatus.getFocusControlMode();
+        imageAspect = cameraStatus.getImageAspect();
+        imageFormat = cameraStatus.getImageFormat();
+        filmSimulation = cameraStatus.getFilmSimulation();
     }
 
 }
diff --git a/app/src/main/java/net/osdn/gokigen/cameratest/fuji/PropertyValues.java b/app/src/main/java/net/osdn/gokigen/cameratest/fuji/PropertyValues.java
deleted file mode 100644 (file)
index d165e83..0000000
+++ /dev/null
@@ -1,96 +0,0 @@
-package net.osdn.gokigen.cameratest.fuji;
-
-public class PropertyValues
-{
-    public static final int SHOOTING_MANUAL  =1;
-    public static final int SHOOTING_PROGRAM  =2;
-    public static final int SHOOTING_APERTURE  =3;
-    public static final int SHOOTING_SHUTTER  =4;
-    public static final int SHOOTING_CUSTOM  =5;
-    public static final int SHOOTING_AUTO  =6;
-
-
-    static final int IMAGE_FORMAT_FINE =2;
-    static final int IMAGE_FORMAT_NORMAL =3;
-    static final int IMAGE_FORMAT_FINE_RAW  =4;
-    static final int IMAGE_FORMAT_NORMAL_RAW  =5;
-    static final int IMAGE_ASPECT_S_3x2  =2;
-    static final int IMAGE_ASPECT_S_16x9  =3;
-    static final int IMAGE_ASPECT_S_1x1  =4;
-    static final int IMAGE_ASPECT_M_3x2  =6;
-    static final int IMAGE_ASPECT_M_16x9  =7;
-    static final int IMAGE_ASPECT_M_1x1  =8;
-    static final int IMAGE_ASPECT_L_3x2  =10;
-    static final int IMAGE_ASPECT_L_16x9  =11;
-    static final int IMAGE_ASPECT_L_1x1  =12;
-    static final int FOCUS_MANUAL  =1;
-    static final int FOCUS_SINGLE_AUTO  =32769;
-    static final int FOCUS_CONTINUOUS_AUTO  =32770;
-    static final int TIMER_OFF  =0;
-    static final int TIMER_1SEC  =1;
-    static final int TIMER_2SEC  =2;
-    static final int TIMER_5SEC  =3;
-    static final int TIMER_10SEC  =4;
-    static final int FILM_SIMULATION_PROVIA  =1;
-    static final int FILM_SIMULATION_VELVIA  =2;
-    static final int FILM_SIMULATION_ASTIA  =3;
-    static final int FILM_SIMULATION_MONOCHROME  =4;
-    static final int FILM_SIMULATION_SEPIA  =5;
-    static final int FILM_SIMULATION_PRO_NEG_HI  =6;
-    static final int FILM_SIMULATION_PRO_NEG_STD  =7;
-    static final int FILM_SIMULATION_MONOCHROME_Y_FILTER  =8;
-    static final int FILM_SIMULATION_MONOCHROME_R_FILTER  =9;
-    static final int FILM_SIMULATION_MONOCHROME_G_FILTER  =10;
-    static final int FILM_SIMULATION_CLASSIC_CHROME  =11;
-    static final int FILM_SIMULATION_ACROS  =12;
-    static final int FILM_SIMULATION_ACROS_Y  =13;
-    static final int FILM_SIMULATION_ACROS_R  =14;
-    static final int FILM_SIMULATION_ACROS_G  =15;
-    static final int FILM_SIMULATION_ETERNA  =16;
-    static final int WHITE_BALANCE_AUTO  =2;
-    static final int WHITE_BALANCE_FINE  =4;
-    static final int WHITE_BALANCE_INCANDESCENT  =6;
-    static final int WHITE_BALANCE_FLUORESCENT_1  =0X8001;
-    static final int WHITE_BALANCE_FLUORESCENT_2  =0X8002;
-    static final int WHITE_BALANCE_FLUORESCENT_3  =0X8003;
-    static final int WHITE_BALANCE_SHADE  =0X8006;
-    static final int WHITE_BALANCE_UNDERWATER  =0X800a;
-    static final int WHITE_BALANCE_TEMPERATURE  =0X800b;
-    static final int WHITE_BALANCE_CUSTOM  =0X800c;
-    static final int MOVIE_BUTTON_UNAVAILABLE  =0;
-    static final int MOVIE_BUTTON_AVAILABLE  =1;
-    static final int BATTERY_CRITICAL  =1;
-    static final int BATTERY_ONE_BAR  =2;
-    static final int BATTERY_TWO_BAR  =3;
-    static final int BATTERY_FULL  =4;
-    static final int BATTERY_126S_CRITICAL  =6;
-    static final int BATTERY_126S_ONE_BAR  =7;
-    static final int BATTERY_126S_TWO_BAR  =8;
-    static final int BATTERY_126S_THREE_BAR  =9;
-    static final int BATTERY_126S_FOUR_BAR  =10;
-    static final int BATTERY_126S_FULL  =11;
-    static final int FLASH_AUTO  =1;
-    static final int FLASH_OFF  =2;
-    static final int FLASH_FILL  =3;
-    static final int FLASH_REDEYE_AUTO  =4;
-    static final int FLASH_REDEYE_FILL  =5;
-    static final int FLASH_EXTERNAL_SYNC  =6;
-    static final int FLASH_ON  =32769;
-    static final int FLASH_REDEYE  =32770;
-    static final int FLASH_REDEYE_ON  =32771;
-    static final int FLASH_REDEYE_SYNC  =32772;
-    static final int FLASH_REDEYE_REAR  =32773;
-    static final int FLASH_SLOW_SYNC  =32774;
-    static final int FLASH_REAR_SYNC  =32775;
-    static final int FLASH_COMMANDER  =32776;
-    static final int FLASH_DISABLE  =32777;
-    static final int FLASH_ENABLE  =32778;
-    static final int F_SS_CTRL_BOTH  =0;
-    static final int F_SS_CTRL_F  =1;
-    static final int F_SS_CTRL_SS  =2;
-    static final int F_SS_CTRL_NONE  =3;
-    static final int FOCUS_LOCK_OFF  =0;
-    static final int FOCUS_LOCK_ON  =1;
-    static final int DEVICE_ERROR_NONE =0;
-
-}
index f620df0..5ef749d 100644 (file)
@@ -1,27 +1,11 @@
 package net.osdn.gokigen.cameratest.fuji.statuses;
 
 import android.graphics.Point;
-import android.graphics.PointF;
 import android.util.SparseIntArray;
 
-import static net.osdn.gokigen.cameratest.fuji.PropertyValues.SHOOTING_APERTURE;
-import static net.osdn.gokigen.cameratest.fuji.PropertyValues.SHOOTING_AUTO;
-import static net.osdn.gokigen.cameratest.fuji.PropertyValues.SHOOTING_CUSTOM;
-import static net.osdn.gokigen.cameratest.fuji.PropertyValues.SHOOTING_MANUAL;
-import static net.osdn.gokigen.cameratest.fuji.PropertyValues.SHOOTING_PROGRAM;
-import static net.osdn.gokigen.cameratest.fuji.PropertyValues.SHOOTING_SHUTTER;
-import static net.osdn.gokigen.cameratest.fuji.statuses.Properties.BATTERY_LEVEL;
-import static net.osdn.gokigen.cameratest.fuji.statuses.Properties.BATTERY_LEVEL_2;
-import static net.osdn.gokigen.cameratest.fuji.statuses.Properties.DEVICE_ERROR;
-import static net.osdn.gokigen.cameratest.fuji.statuses.Properties.FLASH;
-import static net.osdn.gokigen.cameratest.fuji.statuses.Properties.FOCUS_LOCK;
-import static net.osdn.gokigen.cameratest.fuji.statuses.Properties.FOCUS_POINT;
-import static net.osdn.gokigen.cameratest.fuji.statuses.Properties.MOVIE_REMAINING_TIME;
-import static net.osdn.gokigen.cameratest.fuji.statuses.Properties.SDCARD_REMAIN_SIZE;
-import static net.osdn.gokigen.cameratest.fuji.statuses.Properties.SELF_TIMER;
-import static net.osdn.gokigen.cameratest.fuji.statuses.Properties.SHOOTING_MODE;
-
-class FujiStatusHolder implements IFujiStatus
+import java.util.Locale;
+
+class FujiStatusHolder implements IFujiStatus, IFujiCameraProperties, IFujiCameraPropertyValues
 {
     private final String TAG = toString();
     private SparseIntArray statusHolder;
@@ -82,17 +66,17 @@ class FujiStatusHolder implements IFujiStatus
                 e.printStackTrace();
             }
         }
-        if ((status == 1) || (status == 6)) {
+        if ((status == BATTERY_CRITICAL) || (status == BATTERY_126S_CRITICAL)) {
             level = 0;
-        } else if (status == 7) {
+        } else if (status == BATTERY_126S_ONE_BAR) {
             level = 20;
-        } else if ((status == 2) || (status == 8)) {
+        } else if ((status == BATTERY_ONE_BAR) || (status == BATTERY_126S_TWO_BAR)) {
             level = 40;
-        } else if (status == 9) {
+        } else if (status == BATTERY_126S_THREE_BAR) {
             level = 60;
-        } else if ((status == 3) || (status == 10)) {
+        } else if ((status == BATTERY_TWO_BAR) || (status == BATTERY_126S_FOUR_BAR)) {
             level = 80;
-        } else if ((status == 4) || (status == 11)) {
+        } else if ((status == BATTERY_FULL) || (status == BATTERY_126S_FULL)) {
             level = 100;
         }
         return (level);
@@ -126,12 +110,33 @@ class FujiStatusHolder implements IFujiStatus
     @Override
     public int getSelfTimerMode()
     {
+        int value = -1;
         try {
-            return (statusHolder.get(SELF_TIMER));
+            int status = statusHolder.get(SELF_TIMER);
+            switch (status)
+            {
+                case TIMER_OFF:
+                    value = 0;
+                    break;
+                case TIMER_1SEC:
+                    value = 1;
+                    break;
+                case TIMER_2SEC:
+                    value = 2;
+                    break;
+                case TIMER_5SEC:
+                    value = 5;
+                    break;
+                case TIMER_10SEC:
+                    value = 10;
+                    break;
+                default:
+                    break;
+            }
         } catch (Exception e) {
             e.printStackTrace();
         }
-        return (-1);
+        return (value);
     }
 
 
@@ -207,4 +212,339 @@ class FujiStatusHolder implements IFujiStatus
         }
         return (new Point());
     }
+
+    @Override
+    public int getIsoSensitivity()
+    {
+        try {
+            int status = statusHolder.get(ISO);
+            return ((0x0000ffff & status));
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return (0);
+    }
+
+    @Override
+    public String getShutterSpeed()
+    {
+        try
+        {
+            int status = statusHolder.get(SHUTTER_SPEED);
+            if ((0x80000000 & status) != 0)
+            {
+                int value = 0x0fffffff & status;
+                return ("1/" + (value / 1000));
+            }
+            else
+            {
+                return (status + "");
+            }
+        }
+        catch (Exception e)
+        {
+            e.printStackTrace();
+        }
+        return ("--");
+    }
+
+    @Override
+    public String getExpRev()
+    {
+        try {
+            int status = statusHolder.get(EXPOSURE_COMPENSATION);
+            float value = ((float) status / 1000.0f);
+            return (String.format(Locale.ENGLISH, "%+1.1f", value));
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return ("");
+    }
+
+    @Override
+    public String getAperture()
+    {
+        try {
+            int status = statusHolder.get(APERTURE);
+            float value = ((float) status / 100.0f);
+            return (String.format(Locale.ENGLISH, "F%1.1f", value));
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return ("F--");
+    }
+
+    @Override
+    public String getWhiteBalance()
+    {
+        String value = "";
+        try {
+            int status = statusHolder.get(WHITE_BALANCE);
+            if (status == WHITE_BALANCE_AUTO)
+            {
+                value = "Auto";
+            }
+            else if (status == WHITE_BALANCE_FINE)
+            {
+                value = "Fine";
+            }
+            else if (status == WHITE_BALANCE_INCANDESCENT)
+            {
+                value = "Incandescent";
+            }
+            else if (status == WHITE_BALANCE_FLUORESCENT_1)
+            {
+                value = "Fluorescent 1";
+            }
+            else if (status == WHITE_BALANCE_FLUORESCENT_2)
+            {
+                value = "Fluorescent 2";
+            }
+            else if (status == WHITE_BALANCE_FLUORESCENT_3)
+            {
+                value = "Fluorescent 3";
+            }
+            else if (status == WHITE_BALANCE_SHADE)
+            {
+                value = "Shade";
+            }
+            else if (status == WHITE_BALANCE_UNDERWATER)
+            {
+                value = "Underwater";
+            }
+            else if (status == WHITE_BALANCE_TEMPERATURE)
+            {
+                value = "Kelvin";
+            }
+            else if (status == WHITE_BALANCE_CUSTOM)
+            {
+                value = "Custom";
+            }
+            else
+            {
+                value = "Unknown";
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return (value);
+    }
+
+
+    @Override
+    public int getF_SS_Control()
+    {
+        try {
+            return (statusHolder.get(F_SS_CONTROL));
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return (-1);
+    }
+
+    @Override
+    public String getFocusControlMode()
+    {
+        String value = "";
+        try {
+            int status = statusHolder.get(FOCUS_MODE);
+            if (status == FOCUS_MANUAL)
+            {
+                value = "M";
+            }
+            else if (status == FOCUS_SINGLE_AUTO)
+            {
+                value = "S";
+            }
+            else if (status == FOCUS_CONTINUOUS_AUTO)
+            {
+                value = "C";
+            }
+            else
+            {
+                value = "?";
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return (value);
+    }
+
+    @Override
+    public String getImageAspect()
+    {
+        String value = "";
+        try {
+            int status = statusHolder.get(IMAGE_ASPECT);
+            if (status == IMAGE_ASPECT_S_3x2)
+            {
+                value = "S:3x2";
+            }
+            else if (status == IMAGE_ASPECT_S_16x9)
+            {
+                value = "S:16x9";
+            }
+            else if (status == IMAGE_ASPECT_S_1x1)
+            {
+                value = "S:1x1";
+            }
+            else if (status == IMAGE_ASPECT_M_3x2)
+            {
+                value = "M:3x2";
+            }
+            else if (status == IMAGE_ASPECT_M_16x9)
+            {
+                value = "M:16x9";
+            }
+            else if (status == IMAGE_ASPECT_M_1x1)
+            {
+                value = "M:1x1";
+            }
+            else if (status == IMAGE_ASPECT_L_3x2)
+            {
+                value = "L:3x2";
+            }
+            else if (status == IMAGE_ASPECT_L_16x9)
+            {
+                value = "L:16x9";
+            }
+            else if (status == IMAGE_ASPECT_L_1x1)
+            {
+                value = "L:1x1";
+            }
+            else
+            {
+                value = "?";
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return (value);
+    }
+
+    @Override
+    public String getImageFormat()
+    {
+        String value = "";
+        try {
+            int status = statusHolder.get(IMAGE_FORMAT);
+            if (status == IMAGE_FORMAT_FINE)
+            {
+                value = "JPG[F]";
+            }
+            else if (status == IMAGE_FORMAT_NORMAL)
+            {
+                value = "JPG[N]";
+            }
+            else if (status == IMAGE_FORMAT_FINE_RAW)
+            {
+                value = "JPG[F]+RAW";
+            }
+            else if (status == IMAGE_FORMAT_NORMAL_RAW)
+            {
+                value = "JPG[N]+RAW";
+            }
+            else
+            {
+                value = "???";
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return (value);
+    }
+
+    @Override
+    public String getFilmSimulation()
+    {
+        String value = "";
+        try {
+            int status = statusHolder.get(FILM_SIMULATION);
+            switch (status)
+            {
+                case FILM_SIMULATION_PROVIA:
+                    value = "PROVIA";
+                    break;
+                case FILM_SIMULATION_VELVIA:
+                    value = "VELVIA";
+                    break;
+                case FILM_SIMULATION_ASTIA:
+                    value = "ASTIA";
+                    break;
+                case FILM_SIMULATION_MONOCHROME:
+                    value = "MONO";
+                    break;
+                case FILM_SIMULATION_SEPIA:
+                    value = "SEPIA";
+                    break;
+                case FILM_SIMULATION_PRO_NEG_HI:
+                    value = "NEG_HI";
+                    break;
+                case FILM_SIMULATION_PRO_NEG_STD:
+                    value = "NEG_STD";
+                    break;
+                case FILM_SIMULATION_MONOCHROME_Y_FILTER:
+                    value = "MONO_Y";
+                    break;
+                case FILM_SIMULATION_MONOCHROME_R_FILTER:
+                    value = "MONO_R";
+                    break;
+                case FILM_SIMULATION_MONOCHROME_G_FILTER:
+                    value = "MONO_G";
+                    break;
+                case FILM_SIMULATION_CLASSIC_CHROME:
+                    value = "CLASSIC CHROME";
+                    break;
+                case FILM_SIMULATION_ACROS:
+                    value = "ACROS";
+                    break;
+                case FILM_SIMULATION_ACROS_Y:
+                    value = "ACROS_Y";
+                    break;
+                case FILM_SIMULATION_ACROS_R:
+                    value = "ACROS_R";
+                    break;
+                case FILM_SIMULATION_ACROS_G:
+                    value = "ACROS_G";
+                    break;
+                case FILM_SIMULATION_ETERNA:
+                    value = "ETERNA";
+                    break;
+                default:
+                    value = "???";
+                    break;
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return (value);
+    }
+
+    @Override
+    public boolean isRecModeEnable()
+    {
+        try {
+            int status = statusHolder.get(RECMODE_ENABLE);
+            if (status == 1)
+            {
+                return (true);
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return (false);
+    }
+
+    @Override
+    public int getMovieIsoSensitivity()
+    {
+        try {
+            return (statusHolder.get(MOVIE_ISO));
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return (-1);
+    }
+
+
 }
diff --git a/app/src/main/java/net/osdn/gokigen/cameratest/fuji/statuses/IFujiCameraProperties.java b/app/src/main/java/net/osdn/gokigen/cameratest/fuji/statuses/IFujiCameraProperties.java
new file mode 100644 (file)
index 0000000..eeae8b0
--- /dev/null
@@ -0,0 +1,27 @@
+package net.osdn.gokigen.cameratest.fuji.statuses;
+
+interface IFujiCameraProperties
+{
+    int BATTERY_LEVEL         = 0x5001;
+    int WHITE_BALANCE         = 0x5005;
+    int APERTURE               = 0x5007;
+    int FOCUS_MODE            = 0x500a;
+    int SHOOTING_MODE         = 0x500e;
+    int FLASH                 = 0x500c;
+    int EXPOSURE_COMPENSATION = 0x5010;
+    int SELF_TIMER            = 0x5012;
+    int FILM_SIMULATION       = 0xd001;
+    int IMAGE_FORMAT          = 0xd018;
+    int RECMODE_ENABLE        = 0xd019;
+    int F_SS_CONTROL          = 0xd028;
+    int ISO                   = 0xd02a;
+    int MOVIE_ISO             = 0xd02b;
+    int FOCUS_POINT           = 0xd17c;
+    int FOCUS_LOCK            = 0xd209;
+    int DEVICE_ERROR          = 0xd21b;
+    int SDCARD_REMAIN_SIZE    = 0xd229;
+    int MOVIE_REMAINING_TIME  = 0xd22a;
+    int SHUTTER_SPEED         = 0xd240;
+    int IMAGE_ASPECT          = 0xd241;
+    int BATTERY_LEVEL_2       = 0xd242;
+}
diff --git a/app/src/main/java/net/osdn/gokigen/cameratest/fuji/statuses/IFujiCameraPropertyValues.java b/app/src/main/java/net/osdn/gokigen/cameratest/fuji/statuses/IFujiCameraPropertyValues.java
new file mode 100644 (file)
index 0000000..d601c00
--- /dev/null
@@ -0,0 +1,97 @@
+package net.osdn.gokigen.cameratest.fuji.statuses;
+
+public interface IFujiCameraPropertyValues
+{
+    int SHOOTING_MANUAL  = 1;
+    int SHOOTING_PROGRAM  = 2;
+    int SHOOTING_APERTURE  = 3;
+    int SHOOTING_SHUTTER  = 4;
+    int SHOOTING_CUSTOM  = 5;
+    int SHOOTING_AUTO  = 6;
+
+    int WHITE_BALANCE_AUTO  = 2;
+    int WHITE_BALANCE_FINE  = 4;
+    int WHITE_BALANCE_INCANDESCENT  = 6;
+    int WHITE_BALANCE_FLUORESCENT_1  = 0x8001;
+    int WHITE_BALANCE_FLUORESCENT_2  = 0x8002;
+    int WHITE_BALANCE_FLUORESCENT_3  = 0x8003;
+    int WHITE_BALANCE_SHADE  = 0x8006;
+    int WHITE_BALANCE_UNDERWATER  = 0x800a;
+    int WHITE_BALANCE_TEMPERATURE  = 0x800b;
+    int WHITE_BALANCE_CUSTOM  =0X800c;
+
+    int F_SS_CTRL_BOTH  = 0;
+    int F_SS_CTRL_F  = 1;
+    int F_SS_CTRL_SS  = 2;
+    int F_SS_CTRL_NONE  = 3;
+
+    int FOCUS_MANUAL  = 1;
+    int FOCUS_SINGLE_AUTO  = 0x8001;
+    int FOCUS_CONTINUOUS_AUTO  = 0x8002;
+
+    int IMAGE_ASPECT_S_3x2  = 2;
+    int IMAGE_ASPECT_S_16x9  = 3;
+    int IMAGE_ASPECT_S_1x1  = 4;
+    int IMAGE_ASPECT_M_3x2  = 6;
+    int IMAGE_ASPECT_M_16x9  = 7;
+    int IMAGE_ASPECT_M_1x1  = 8;
+    int IMAGE_ASPECT_L_3x2  = 10;
+    int IMAGE_ASPECT_L_16x9  = 11;
+    int IMAGE_ASPECT_L_1x1  = 12;
+
+    int IMAGE_FORMAT_FINE = 2;
+    int IMAGE_FORMAT_NORMAL = 3;
+    int IMAGE_FORMAT_FINE_RAW  = 4;
+    int IMAGE_FORMAT_NORMAL_RAW  = 5;
+
+    int FILM_SIMULATION_PROVIA  =1;
+    int FILM_SIMULATION_VELVIA  =2;
+    int FILM_SIMULATION_ASTIA  =3;
+    int FILM_SIMULATION_MONOCHROME  =4;
+    int FILM_SIMULATION_SEPIA  =5;
+    int FILM_SIMULATION_PRO_NEG_HI  =6;
+    int FILM_SIMULATION_PRO_NEG_STD  =7;
+    int FILM_SIMULATION_MONOCHROME_Y_FILTER  =8;
+    int FILM_SIMULATION_MONOCHROME_R_FILTER  =9;
+    int FILM_SIMULATION_MONOCHROME_G_FILTER  =10;
+    int FILM_SIMULATION_CLASSIC_CHROME  =11;
+    int FILM_SIMULATION_ACROS  =12;
+    int FILM_SIMULATION_ACROS_Y  =13;
+    int FILM_SIMULATION_ACROS_R  =14;
+    int FILM_SIMULATION_ACROS_G  =15;
+    int FILM_SIMULATION_ETERNA  =16;
+
+    int BATTERY_CRITICAL  =1;
+    int BATTERY_ONE_BAR  =2;
+    int BATTERY_TWO_BAR  =3;
+    int BATTERY_FULL  =4;
+    int BATTERY_126S_CRITICAL  =6;
+    int BATTERY_126S_ONE_BAR  =7;
+    int BATTERY_126S_TWO_BAR  =8;
+    int BATTERY_126S_THREE_BAR  =9;
+    int BATTERY_126S_FOUR_BAR  =10;
+    int BATTERY_126S_FULL  =11;
+
+    int TIMER_OFF  =0;
+    int TIMER_1SEC  =1;
+    int TIMER_2SEC  =2;
+    int TIMER_5SEC  =3;
+    int TIMER_10SEC  =4;
+
+    int FLASH_AUTO  =1;
+    int FLASH_OFF  =2;
+    int FLASH_FILL  =3;
+    int FLASH_REDEYE_AUTO  =4;
+    int FLASH_REDEYE_FILL  =5;
+    int FLASH_EXTERNAL_SYNC  =6;
+    int FLASH_ON  =0x8001;
+    int FLASH_REDEYE  =0x8002;
+    int FLASH_REDEYE_ON  =0x8003;
+    int FLASH_REDEYE_SYNC  =0x8004;
+    int FLASH_REDEYE_REAR  =0x8005;
+    int FLASH_SLOW_SYNC  =0x8006;
+    int FLASH_REAR_SYNC  =0x8007;
+    int FLASH_COMMANDER  =0x8008;
+    int FLASH_DISABLE  =0x8009;
+    int FLASH_ENABLE  =0x800a;
+}
index 9cc5f1f..61ceaf0 100644 (file)
@@ -13,6 +13,19 @@ public interface IFujiStatus
     int getSelfTimerMode();
     int getRemainImageSpace();
     int getMovieImageSpace();
+    int getIsoSensitivity();
+    int getF_SS_Control();
     String getShootingMode();
     Point getFocusPoint();
+    String getShutterSpeed();
+    String getAperture();
+    String getExpRev();
+    String getWhiteBalance();
+    String getFocusControlMode();
+    String getImageAspect();
+    String getImageFormat();
+    String getFilmSimulation();
+    boolean isRecModeEnable();
+    int getMovieIsoSensitivity();
+
 }
diff --git a/app/src/main/java/net/osdn/gokigen/cameratest/fuji/statuses/Properties.java b/app/src/main/java/net/osdn/gokigen/cameratest/fuji/statuses/Properties.java
deleted file mode 100644 (file)
index 777a6a1..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
-package net.osdn.gokigen.cameratest.fuji.statuses;
-
-public class Properties
-{
-    public static final int BATTERY_LEVEL         = 0x5001;
-    public static final int WHITE_BALANCE = 0x5005;
-    public static final int APERTURE = 0x5007;
-    public static final int FOCUS_MODE            = 0x500a;
-    public static final int SHOOTING_MODE         = 0x500e;
-    public static final int FLASH                 = 0x500c;
-    public static final int EXPOSURE_COMPENSATION = 0x5010;
-    public static final int SELF_TIMER            = 0x5012;
-    public static final int FILM_SIMULATION       = 0xd001;
-    public static final int IMAGE_FORMAT          = 0xd018;
-    public static final int RECMODE_ENABLE        = 0xd019;
-    public static final int F_SS_CONTROL          = 0xd028;
-    public static final int ISO                   = 0xd02a;
-    public static final int MOVIE_ISO             = 0xd02b;
-    public static final int FOCUS_POINT           = 0xd17c;
-    public static final int FOCUS_LOCK            = 0xd209;
-    public static final int DEVICE_ERROR          = 0xd21b;
-    public static final int SDCARD_REMAIN_SIZE        = 0xd229;
-    public static final int MOVIE_REMAINING_TIME  = 0xd22a;
-    public static final int SHUTTER_SPEED         = 0xd240;
-    public static final int IMAGE_ASPECT          = 0xd241;
-    public static final int BATTERY_LEVEL_2       = 0xd242;
-    public static final int UNKNOWN  = 0xffff;
-
-}