From 2b2f43a39295a98a06f465914e18684b5f1cd183 Mon Sep 17 00:00:00 2001
From: MRSa <mrsa@myad.jp>
Date: Thu, 5 Sep 2019 00:39:05 +0900
Subject: [PATCH 1/1] =?utf8?q?=E3=83=95=E3=82=A1=E3=82=A4=E3=83=AB?=
 =?utf8?q?=E4=B8=80=E8=A6=A7=E6=83=85=E5=A0=B1=E3=82=92=E3=81=A8=E3=82=8B?=
 =?utf8?q?=E3=81=A8=E3=81=93=E3=82=8D=E3=81=BE=E3=81=A7=E3=80=82(SONY)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 .../camera/vendor/sony/wrapper/SonyCameraApi.java  |  2 +-
 .../sony/wrapper/playback/SonyPlaybackControl.java | 39 ++++++++++++++++++++++
 2 files changed, 40 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/net/osdn/gokigen/pkremote/camera/vendor/sony/wrapper/SonyCameraApi.java b/app/src/main/java/net/osdn/gokigen/pkremote/camera/vendor/sony/wrapper/SonyCameraApi.java
index 374656b..371f974 100644
--- a/app/src/main/java/net/osdn/gokigen/pkremote/camera/vendor/sony/wrapper/SonyCameraApi.java
+++ b/app/src/main/java/net/osdn/gokigen/pkremote/camera/vendor/sony/wrapper/SonyCameraApi.java
@@ -491,7 +491,7 @@ class SonyCameraApi implements ISonyCameraApi
     public JSONObject getContentList(JSONArray params)
     {
         try {
-            return (communicateJSON("avContent", "getContentList", new JSONArray().put(0, params), "1.3", -1));
+            return (communicateJSON("avContent", "getContentList", params, "1.3", -1));
         } catch (Exception e) {
             e.printStackTrace();
         }
diff --git a/app/src/main/java/net/osdn/gokigen/pkremote/camera/vendor/sony/wrapper/playback/SonyPlaybackControl.java b/app/src/main/java/net/osdn/gokigen/pkremote/camera/vendor/sony/wrapper/playback/SonyPlaybackControl.java
index cedd710..4a735e7 100644
--- a/app/src/main/java/net/osdn/gokigen/pkremote/camera/vendor/sony/wrapper/playback/SonyPlaybackControl.java
+++ b/app/src/main/java/net/osdn/gokigen/pkremote/camera/vendor/sony/wrapper/playback/SonyPlaybackControl.java
@@ -101,6 +101,45 @@ public class SonyPlaybackControl implements IPlaybackControl
             int objectCount = resultArray.getJSONObject(0).getInt("count");
             Log.v(TAG, "  OBJECT COUNT  : " + objectCount);
 
+            int index = 0;
+            // データを解析してリストを作る
+            while ((index >= 0) && (index < objectCount))
+            {
+                int remainCount = objectCount - index;
+                JSONObject paramsObj = new JSONObject();
+                paramsObj.put("uri", "storage:memoryCard1");
+                paramsObj.put("stIdx", index);
+                paramsObj.put("cnt", (remainCount > 100 ? 100 : remainCount));
+                paramsObj.put("view", "flat");
+                paramsObj.put("sort", "descending");
+                try
+                {
+                    JSONObject responseObject = cameraApi.getContentList(new JSONArray().put(paramsObj));
+                    JSONArray resultsArray = responseObject.getJSONArray("result").getJSONArray(0);
+                    int nofContents = resultsArray.length();
+                    for (int pos = 0; pos < nofContents; pos++)
+                    {
+                        JSONObject contentObject = resultsArray.getJSONObject(pos);
+                        JSONObject contents = contentObject.getJSONObject("content");
+                        JSONArray original = contents.getJSONArray("original");
+                        String fileNo = contentObject.getString("fileNo");
+                        String createdTime = contentObject.getString("createdTime");
+                        String contentKind =  contentObject.getString("contentKind");
+                        String folderNo =  contentObject.getString("folderNo");
+                        String thumbnailUrl = contents.getString("thumbnailUrl");
+                        String fileName = original.getJSONObject(0).getString("fileName");
+
+                        Log.v(TAG,  " [" + pos + "] " + "  " + fileName + " " + " " + createdTime + " " + folderNo + " " + thumbnailUrl);
+                    }
+                    index = index + nofContents;
+                    Log.v(TAG, "  COUNT : " + index);
+                }
+                catch (Exception e)
+                {
+                    e.printStackTrace();
+                    break;
+                }
+            }
         }
         catch (Exception e)
         {
-- 
2.11.0