X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fosdn%2Fgokigen%2Fcameratest%2Ffuji%2FConnection.java;h=aa884975a4d84a41efb55d9e9a8e431d4e67a45f;hb=772a4dbd7cbc404ee82d1d939717555bda3cb295;hp=209a68bcec0f564cc7df74c6577e86cb0985ef48;hpb=7188a32697e2ce7b2498a75d1cd9515f3986c969;p=gokigen%2FFujiCam.git

diff --git a/app/src/main/java/net/osdn/gokigen/cameratest/fuji/Connection.java b/app/src/main/java/net/osdn/gokigen/cameratest/fuji/Connection.java
index 209a68b..aa88497 100644
--- a/app/src/main/java/net/osdn/gokigen/cameratest/fuji/Connection.java
+++ b/app/src/main/java/net/osdn/gokigen/cameratest/fuji/Connection.java
@@ -1,114 +1,154 @@
 package net.osdn.gokigen.cameratest.fuji;
 
+import android.app.Activity;
+import android.graphics.PointF;
 import android.util.Log;
 
 import androidx.annotation.NonNull;
 
-public class Connection
+import net.osdn.gokigen.cameratest.fuji.statuses.FujiStatusChecker;
+import net.osdn.gokigen.cameratest.fuji.statuses.IFujiStatusNotify;
+import net.osdn.gokigen.cameratest.fuji.statuses.IFujiStatusRequest;
+
+import static net.osdn.gokigen.cameratest.fuji.statuses.IFujiCameraProperties.FILM_SIMULATION;
+import static net.osdn.gokigen.cameratest.fuji.statuses.IFujiCameraProperties.IMAGE_ASPECT;
+import static net.osdn.gokigen.cameratest.fuji.statuses.IFujiCameraPropertyValues.FILM_SIMULATION_MAX;
+import static net.osdn.gokigen.cameratest.fuji.statuses.IFujiCameraPropertyValues.FILM_SIMULATION_MIN;
+import static net.osdn.gokigen.cameratest.fuji.statuses.IFujiCameraPropertyValues.IMAGE_ASPECT_MAX;
+import static net.osdn.gokigen.cameratest.fuji.statuses.IFujiCameraPropertyValues.IMAGE_ASPECT_MIN;
+
+public class Connection implements IFujiStatusRequest
 {
     private final String TAG = toString();
     private final MessageSequence sequence;
     private final Communication comm;
+    private final FujiStatusChecker statusChecker;
+    private boolean pauseRequestStatus = false;
 
-    public Connection(@NonNull ILiveViewImage imageViewer)
+    public Connection(@NonNull Activity activity, @NonNull ILiveViewImage imageViewer, @NonNull IFujiStatusNotify notify)
     {
-        this.comm = new Communication(imageViewer);
+        this.comm = new Communication(activity, imageViewer);
         this.sequence = new MessageSequence();
+        this.statusChecker = new FujiStatusChecker(this, notify);
     }
 
-    public boolean start_connect()
+    public boolean start_connect(boolean isBothLiveView)
     {
         boolean ret = false;
 
-        if (connect_to_camera())
+        if (connect_to_camera(isBothLiveView))
         {
-            ret = get_current_settings();
+            ret = requestStatus();
+            if (ret)
+            {
+                // 定期監視の開始
+                statusChecker.start();
+            }
         }
         return (ret);
     }
 
-    private boolean connect_to_camera()
+    private boolean connect_to_camera(boolean isBothLiveView)
     {
         try
         {
             ReceivedDataHolder rx_bytes;
             comm.connect_socket();
 
-            comm.send_to_camera(sequence.registration_message());
+            comm.send_to_camera(sequence.registration_message(), false, false);
             rx_bytes = comm.receive_from_camera();
-            dump_bytes(0, rx_bytes);
-            Thread.sleep(50);
+            dump_bytes("Connect", 0, rx_bytes);
 
-            // 応答エラーの場合は この値が返ってくるはず  = {0x05, 0x00, 0x00, 0x00, 0x19, 0x20, 0x00, 0x00};
+            // 応答エラーかどうかをチェックする
+            if (rx_bytes.getData().length == 8)
+            {
+                byte[] receiveData = rx_bytes.getData();
+                if ((receiveData[0] == 0x05)&&(receiveData[1] == 0x00)&&(receiveData[2] == 0x00)&&(receiveData[3] == 0x00)&&
+                    (receiveData[4] == 0x19)&&(receiveData[5] == 0x20)&&(receiveData[6] == 0x00)&&(receiveData[7] == 0x00))
+                {
+                    // 応答エラー...
+                    return (false);
+                }
+                return (false);
+            }
 
             // start_messageを送信
-            comm.send_to_camera(sequence.start_message());
+            comm.send_to_camera(sequence.start_message(), true, true);
             rx_bytes = comm.receive_from_camera();
-            dump_bytes(1, rx_bytes);
-            Thread.sleep(50);
+            dump_bytes("Connect", 1, rx_bytes);
 
             //  なんだろう？？ (送信が必要なようだが）
-            comm.send_to_camera(sequence.start_message2());
+            comm.send_to_camera(sequence.start_message2(), true, true);
             rx_bytes = comm.receive_from_camera();
-            dump_bytes(2, rx_bytes);
-            Thread.sleep(50);
+            dump_bytes("Connect", 2, rx_bytes);
+            byte[] rx_data1 = rx_bytes.getData();
+            if (rx_data1.length == (int)rx_data1[0])
+            {
+                //// もう一度受信する...
+                rx_bytes = comm.receive_from_camera();
+                dump_bytes("Connect",99, rx_bytes);
+            }
 
-            // two_part messageを発行 (その１)
-            comm.send_to_camera(sequence.start_message3_1());
-            rx_bytes = comm.receive_from_camera();
-            dump_bytes(3, rx_bytes);
-            Thread.sleep(50);
+            // two_part messageを発行
+            comm.send_to_camera(sequence.start_message3_1(), true, false);
+            comm.send_to_camera(sequence.start_message3_2(), true, true);
 
-            // two_part messageを発行 (その２)
-            comm.send_to_camera(sequence.start_message3_2());
             rx_bytes = comm.receive_from_camera();
-            dump_bytes(4, rx_bytes);
-            Thread.sleep(50);
+            dump_bytes("Connect", 3, rx_bytes);
 
             // remote mode
-            comm.send_to_camera(sequence.start_message4());
+            comm.send_to_camera(sequence.start_message4(), true, true);
             rx_bytes = comm.receive_from_camera();
-            dump_bytes(5, rx_bytes);
-            Thread.sleep(50);
-
-            // two_part messageを発行 (その１)
-            comm.send_to_camera(sequence.start_message5_1());
-            rx_bytes = comm.receive_from_camera();
-            dump_bytes(6, rx_bytes);
-            Thread.sleep(50);
-
-            // two_part messageを発行 (その２)
-            comm.send_to_camera(sequence.start_message5_2());
-            rx_bytes = comm.receive_from_camera();
-            dump_bytes(7, rx_bytes);
-            Thread.sleep(50);
-
-            // ????
-            comm.send_to_camera(sequence.start_message6());
-            rx_bytes = comm.receive_from_camera();
-            dump_bytes(8, rx_bytes);
-            Thread.sleep(50);
-
-            // ????
-            comm.send_to_camera(sequence.start_message7());
-            rx_bytes = comm.receive_from_camera();
-            dump_bytes(9, rx_bytes);
-            Thread.sleep(50);
+/*
+            dump_bytes("Connect", 4, rx_bytes);
+            rx_data1 = rx_bytes.getData();
+            if (rx_data1[4] == (byte) 0x02)
+            {
+                //// 受信データが分割されている、、もう一度受信する
+                rx_bytes = comm.receive_from_camera();
+                dump_bytes("Connect", 98, rx_bytes);
+            }
+*/
 
-            // ????
-            comm.send_to_camera(sequence.start_message8());
-            rx_bytes = comm.receive_from_camera();
-            dump_bytes(10, rx_bytes);
-            Thread.sleep(50);
+            if (!isBothLiveView)
+            {
+                // two_part messageを発行
+                comm.send_to_camera(sequence.start_message5_1(), true, false);
+                comm.send_to_camera(sequence.start_message5_2(), true, true);
+                rx_bytes = comm.receive_from_camera();
+                dump_bytes("Connect", 5, rx_bytes);
+
+                // ????
+                comm.send_to_camera(sequence.status_request_message(), true, true);
+                rx_bytes = comm.receive_from_camera();
+                dump_bytes("Connect", 6, rx_bytes);
+                rx_data1 = rx_bytes.getData();
+                if (rx_data1[4] == (byte) 0x02)
+                {
+                    //// 受信データが分割されている場合、、もう一度受信する
+                    rx_bytes = comm.receive_from_camera();
+                    dump_bytes("Connect", 97, rx_bytes);
+                }
+
+                // ????
+                comm.send_to_camera(sequence.query_camera_capabilities(), true, true);
+                rx_bytes = comm.receive_from_camera();
+                dump_bytes("Connect", 7, rx_bytes);
+
+                /*
+                // ????
+                comm.send_to_camera(sequence.status_request_message(), true, true);
+                rx_bytes = comm.receive_from_camera();
+                dump_bytes("Connect", 8, rx_bytes);
+*/
+            }
 
-            // ????
-            comm.send_to_camera(sequence.start_message9());
+            // リモート制御の開始！
+            comm.send_to_camera(sequence.camera_remote_message(), true, true);
 
             // 応答OKの場合は、8バイト ({0x03, 0x00, 0x01, 0x20} + {0x10, 0x02, 0x00, 0x00} )が応答されるはず
             rx_bytes = comm.receive_from_camera();
-            dump_bytes(11, rx_bytes);
-            Thread.sleep(50);
-
+            dump_bytes("Connect", 9, rx_bytes);
 
             // 別のポートもオープンして動作を行う。 (1500ms程度待つといけるみたいだ...)
             Thread.sleep(1500);
@@ -125,19 +165,91 @@ public class Connection
         return (false);
     }
 
-    private boolean get_current_settings()
+    public void reset_to_camera()
     {
         try
         {
-            comm.send_to_camera(sequence.status_request_message());
-
+            comm.send_to_camera(sequence.reset_message(), true, true);
             ReceivedDataHolder rx_bytes = comm.receive_from_camera();
-            dump_bytes(12, rx_bytes);
+            dump_bytes("Reset", -1, rx_bytes);
+            statusChecker.stop();
+        }
+        catch (Exception e)
+        {
+            e.printStackTrace();
+        }
+    }
 
-            // なんで２回...　でもやってみる
-            rx_bytes = comm.receive_from_camera();
-            dump_bytes(13, rx_bytes);
+    public void disconnect()
+    {
+        try
+        {
+            statusChecker.stop();
+        }
+        catch (Exception e)
+        {
+            e.printStackTrace();
+        }
+        try
+        {
+            comm.stop_stream();
+        }
+        catch (Exception e)
+        {
+            e.printStackTrace();
+        }
+        try
+        {
+            comm.stop_response();
+        }
+        catch (Exception e)
+        {
+            e.printStackTrace();
+        }
+        try
+        {
+            comm.disconnect_socket();
+        }
+        catch (Exception e)
+        {
+            e.printStackTrace();
+        }
+    }
 
+    @Override
+    public boolean requestStatus()
+    {
+        if (pauseRequestStatus)
+        {
+            // ステータス更新を一時停止する。
+            Log.v(TAG, "STATUS REQUEST IS PAUSED...");
+            return (false);
+        }
+        try
+        {
+            comm.send_to_camera(sequence.status_request_message(), true, true);
+            ReceivedDataHolder rx_bytes = comm.receive_from_camera();
+            if (rx_bytes.getData().length > 0)
+            {
+                // 受信したステータス情報を渡す
+                statusChecker.statusReceived(rx_bytes);
+            }
+            dump_bytes("Status", 1, rx_bytes);
+/*
+            byte[] rx_data1 = rx_bytes.getData();
+            if (rx_data1[4] == (byte) 0x02)
+            {
+                //// 受信データが分割されている、、もう一度受信する
+                rx_bytes = comm.receive_from_camera();
+                dump_bytes("Status", 2, rx_bytes);
+                if (rx_bytes.getData().length > 0)
+                {
+                    // 受信したステータス情報を渡す
+                    statusChecker.statusReceived(rx_bytes);
+                }
+            }
+*/
+            return (true);
         }
         catch (Exception e)
         {
@@ -146,9 +258,13 @@ public class Connection
         return (false);
     }
 
-    private void dump_bytes(int indexNumber, ReceivedDataHolder data)
+    private boolean dump_bytes(String header, int indexNumber, ReceivedDataHolder data)
     {
         int index = 0;
+        byte[] targetData = data.getData();
+        int receivedDataLength = targetData[0] + (targetData[1] << 8) + (targetData[2] << 16) + (targetData[3] << 24);
+        boolean checkLength = receivedDataLength <= targetData.length;
+        String logHead = (indexNumber < 0) ? header : header + " " + indexNumber;
         StringBuffer message;
         message = new StringBuffer();
         for (byte item : data.getData())
@@ -157,36 +273,155 @@ public class Connection
             message.append(String.format("%02x ", item));
             if (index >= 8)
             {
-                Log.v(TAG, " RX [" + indexNumber + "] " + message);
+                Log.v(TAG, " RX [" + logHead + "] " + message);
                 index = 0;
                 message = new StringBuffer();
             }
         }
         if (index != 0)
         {
-            Log.v(TAG, " RX [" + indexNumber + "] "  + message);
+            Log.v(TAG, " RX [" + logHead + "] "  + message);
         }
-        System.gc();
+        //System.gc();
+        return (checkLength);
     }
 
-    public boolean execute_shutter()
+    public boolean execute_focus_point(PointF point)
     {
+        pauseRequestStatus = false;
         try
         {
-            comm.send_to_camera(sequence.execute_shutter_message());
+            byte x = (byte) (0x000000ff & Math.round(point.x));
+            byte y = (byte) (0x000000ff & Math.round(point.y));
+            Log.v(TAG, "DRIVE AF (" + x + "," + y + ")");
+            comm.send_to_camera(sequence.execute_focus_lock(x, y), true, true);
+            ReceivedDataHolder rx_bytes = comm.receive_from_camera();
+            dump_bytes("Focus Point", -1, rx_bytes);
+        }
+        catch (Exception e)
+        {
+            e.printStackTrace();
+        }
+        pauseRequestStatus = false;
+        return (false);
+    }
+
+    public boolean execute_change_film_simulation()
+    {
+        try
+        {
+            // 現在の値を入手
+            int currentValue = statusChecker.getValue(FILM_SIMULATION);
+            currentValue++;
+            if (currentValue > FILM_SIMULATION_MAX)
+            {
+                currentValue = FILM_SIMULATION_MIN;
+            }
+            return (updateProperty(FILM_SIMULATION, currentValue, true));
+        }
+        catch (Exception e)
+        {
+            e.printStackTrace();
+        }
+        return (false);
+    }
+
+    public boolean execute_change_image_aspect()
+    {
+        try
+        {
+            // 現在の値を入手
+            int currentValue = statusChecker.getValue(IMAGE_ASPECT);
+            currentValue++;
+            if (currentValue > IMAGE_ASPECT_MAX)
+            {
+                currentValue = IMAGE_ASPECT_MIN;
+            }
+            return (updateProperty(IMAGE_ASPECT, currentValue, true));
+        }
+        catch (Exception e)
+        {
+            e.printStackTrace();
+        }
+        return (false);
+    }
+
+    public boolean execute_query_camera_capability()
+    {
+        pauseRequestStatus = true;
+        try
+        {
+            comm.send_to_camera(sequence.query_camera_capabilities(), true, true);
+            ReceivedDataHolder rx_bytes = comm.receive_from_camera();
+            dump_bytes("Capability", -1, rx_bytes);
+        }
+        catch (Exception e)
+        {
+            e.printStackTrace();
+        }
+        pauseRequestStatus = false;
+        return (false);
+    }
+
+
+    public boolean execute_unlock_focus()
+    {
+        pauseRequestStatus = true;
+        try
+        {
+            comm.send_to_camera(sequence.execute_focus_unlock(), true, true);
+            ReceivedDataHolder rx_bytes = comm.receive_from_camera();
+            dump_bytes("Unlock Focus", -1, rx_bytes);
+        }
+        catch (Exception e)
+        {
+            e.printStackTrace();
+        }
+        pauseRequestStatus = false;
+        return (false);
+    }
 
+    public boolean execute_shutter()
+    {
+        pauseRequestStatus = true;
+        try
+        {
+            comm.send_to_camera(sequence.execute_shutter_message(), true, true);
             ReceivedDataHolder rx_bytes = comm.receive_from_camera();
-            dump_bytes(14, rx_bytes);
+            dump_bytes("Shutter", -1, rx_bytes);
+        }
+        catch (Exception e)
+        {
+            e.printStackTrace();
+        }
+        pauseRequestStatus = false;
+        return (false);
+    }
 
-            // なんで２回受信...　でもやってみる
+    private boolean updateProperty(int commandCode, int setValue, boolean isShort)
+    {
+        pauseRequestStatus = true;
+        ReceivedDataHolder rx_bytes;
+        try {
+            byte high = (byte) ((0x0000ff00 & commandCode) >> 8);
+            byte low = (byte) (0x000000ff & commandCode);
+
+            byte data0 = (byte)((0xff000000 & setValue) >> 24);
+            byte data1 = (byte)((0x00ff0000 & setValue) >> 16);
+            byte data2 = (byte)((0x0000ff00 & setValue) >> 8);
+            byte data3 = (byte)((0x000000ff & setValue));
+
+            // two_part messageを発行
+            comm.send_to_camera(sequence.update_property_1(high, low), true, false);
+            comm.send_to_camera((isShort) ? sequence.update_property_2(data2, data3) : sequence.update_property_2(data0, data1, data2, data3), true, true);
             rx_bytes = comm.receive_from_camera();
-            dump_bytes(15, rx_bytes);
-
+            dump_bytes("Prop", -1, rx_bytes);
         }
         catch (Exception e)
         {
             e.printStackTrace();
         }
+        pauseRequestStatus = false;
         return (false);
     }
 }