撮影日時の有効・無効を取得できるようにした。

[gokigen/PKRemote.git] / app / src / main / java / net / osdn / gokigen / pkremote / camera / vendor / ricoh / wrapper / RicohGr2PlaybackControl.java

diff --git a/app/src/main/java/net/osdn/gokigen/pkremote/camera/vendor/ricoh/wrapper/RicohGr2PlaybackControl.java b/app/src/main/java/net/osdn/gokigen/pkremote/camera/vendor/ricoh/wrapper/RicohGr2PlaybackControl.java
index 2223973..5e81b77 100644 (file)
--- a/app/src/main/java/net/osdn/gokigen/pkremote/camera/vendor/ricoh/wrapper/RicohGr2PlaybackControl.java
+++ b/app/src/main/java/net/osdn/gokigen/pkremote/camera/vendor/ricoh/wrapper/RicohGr2PlaybackControl.java
@@ -288,7 +288,8 @@ public class RicohGr2PlaybackControl implements IPlaybackControl
      */
     private Date getCameraContentDate(@NonNull ICameraContent cameraContent)
     {
-/**/
+        // 各ファイルを個別に撮影時刻をとると、反応が悪すぎるので処理を抑止。
+/*
         String fileInfo;
         try
         {
@@ -307,8 +308,9 @@ public class RicohGr2PlaybackControl implements IPlaybackControl
         {
             e.printStackTrace();
         }
-/**/
         return (cameraContent.getCapturedDate());
+*/
+        return (null);
     }
 
 
@@ -415,31 +417,41 @@ public class RicohGr2PlaybackControl implements IPlaybackControl
         }
         try
         {
+            Log.v(TAG, "PHOTO LIST RECV: [" + contentList.length() + "]");
             String cameraId = statusChecker.getCameraId();
             JSONArray dirsArray = new JSONObject(contentList).getJSONArray("dirs");
             if (dirsArray != null)
             {
                 int size = dirsArray.length();
+                Log.v(TAG, "DIRECTORIES : " + size);
                 for (int index = 0; index < size; index++)
                 {
                     JSONObject object = dirsArray.getJSONObject(index);
                     String dirName = object.getString("name");
                     JSONArray filesArray = object.getJSONArray("files");
                     int nofFiles = filesArray.length();
+                    Log.v(TAG, "FILES : [" + dirName + "] " + nofFiles);
                     for (int fileIndex = 0; fileIndex < nofFiles; fileIndex++)
                     {
                         String fileName = filesArray.getString(fileIndex);
-                        ICameraContent cameraContent = new CameraContentInfo(cameraId, "sd1", dirName, fileName, new Date(2001, 1, 1));
-                        cameraContent.setCapturedDate(getCameraContentDate(cameraContent));
+                        //Log.v(TAG, "FILE : " + fileName);
+                        ICameraContent cameraContent = new CameraContentInfo(cameraId, "sd1", dirName, fileName, null);
+                        Date capturedDate = getCameraContentDate(cameraContent);
+                        if (capturedDate != null)
+                        {
+                            cameraContent.setCapturedDate(capturedDate);
+                        }
                         fileList.add(cameraContent);
                     }
                 }
             }
+            else
+            {
+                Log.v(TAG, "NOT FOUND dirs array.");
+            }
         }
         catch (Exception e)
         {
-            //callback.onErrorOccurred(e);
-            //return;
             e.printStackTrace();
             try {
                 fileList.clear();