G9のネットワーク経由でRAWファイルを処理できるようにした。

diff --git a/app/src/main/java/net/osdn/gokigen/pkremote/camera/vendor/panasonic/wrapper/playback/PanasonicImageContentInfo.java b/app/src/main/java/net/osdn/gokigen/pkremote/camera/vendor/panasonic/wrapper/playback/PanasonicImageContentInfo.java
index e95402d..d86d5e6 100644 (file)
--- a/app/src/main/java/net/osdn/gokigen/pkremote/camera/vendor/panasonic/wrapper/playback/PanasonicImageContentInfo.java
+++ b/app/src/main/java/net/osdn/gokigen/pkremote/camera/vendor/panasonic/wrapper/playback/PanasonicImageContentInfo.java
@@ -55,7 +55,7 @@ public class PanasonicImageContentInfo implements ICameraContent
         try
         {
             String target = getContentName().toLowerCase();
-            return ((target.endsWith("rw2")));
+            return ((target.endsWith("rw2"))||(target.endsWith("raw")));
         }
         catch (Exception e)
         {

diff --git a/app/src/main/java/net/osdn/gokigen/pkremote/playback/ImageGridViewFragment.java b/app/src/main/java/net/osdn/gokigen/pkremote/playback/ImageGridViewFragment.java
index 956cd1e..fe44b56 100644 (file)
--- a/app/src/main/java/net/osdn/gokigen/pkremote/playback/ImageGridViewFragment.java
+++ b/app/src/main/java/net/osdn/gokigen/pkremote/playback/ImageGridViewFragment.java
@@ -62,6 +62,7 @@ public class ImageGridViewFragment extends Fragment implements AdapterView.OnIte
        private static final String OLYMPUS_RAW_SUFFIX = ".orf";
        private static final String PENTAX_RAW_PEF_SUFFIX = ".pef";
     private static final String PANASONIC_RAW_SUFFIX = ".rw2";
+    private static final String PANASONIC_RAW_SUFFIX2 = ".raw";
     private static final String SONY_RAW_SUFFIX = ".arw";
     private static final String NIKON_RAW_SUFFIX = ".nef";
     private static final String CANON_RAW_SUFFIX = ".crw";
@@ -439,7 +440,6 @@ public class ImageGridViewFragment extends Fragment implements AdapterView.OnIte
 
         // 一覧を取得する
         List<ICameraContent> contents = getContentsList();
-
         List<CameraContentEx> contentItems = new ArrayList<>();
         HashMap<String, CameraContentEx> rawItems = new HashMap<>();
 
@@ -467,6 +467,10 @@ public class ImageGridViewFragment extends Fragment implements AdapterView.OnIte
             {
                 contentItems.add(new CameraContentEx(item, true, PANASONIC_RAW_SUFFIX));
             }
+            else if (path.endsWith(PANASONIC_RAW_SUFFIX2))
+            {
+                contentItems.add(new CameraContentEx(item, true, PANASONIC_RAW_SUFFIX2));
+            }
             else if (path.endsWith(SONY_RAW_SUFFIX))
             {
                 contentItems.add(new CameraContentEx(item, true, SONY_RAW_SUFFIX));
@@ -493,6 +497,8 @@ public class ImageGridViewFragment extends Fragment implements AdapterView.OnIte
             }
         }
 
+        Log.v(TAG, " NOF CONTENT ITEMS : " + contentItems.size());
+
         for (CameraContentEx item : contentItems)
         {
             String path = item.getFileInfo().getContentName().toLowerCase(Locale.getDefault());

diff --git a/app/src/main/java/net/osdn/gokigen/pkremote/playback/MyContentDownloader.java b/app/src/main/java/net/osdn/gokigen/pkremote/playback/MyContentDownloader.java
index 99bbd1f..af2645b 100644 (file)
--- a/app/src/main/java/net/osdn/gokigen/pkremote/playback/MyContentDownloader.java
+++ b/app/src/main/java/net/osdn/gokigen/pkremote/playback/MyContentDownloader.java
@@ -51,6 +51,7 @@ public class MyContentDownloader implements IDownloadContentCallback
     private static final String RAW_SUFFIX_8 = ".CR3";  // RAW: Canon
     private static final String RAW_SUFFIX_9 = ".NEF";  // RAW: Nikon
     private static final String RAW_SUFFIX_0 = ".RAF";  // RAW: Fuji
+    private static final String RAW_SUFFIX_A = ".RAW";  // RAW: Panasonic
     private static final String MOVIE_SUFFIX = ".MOV";
     private static final String MOVIE_SUFFIX_MP4 = ".MP4";
     private static final String JPEG_SUFFIX = ".JPG";
@@ -120,6 +121,12 @@ public class MyContentDownloader implements IDownloadContentCallback
                 mimeType = "image/x-panasonic-rw2";
                 isSmallSize = false;
             }
+            else if (contentFileName.toUpperCase().contains(RAW_SUFFIX_A))
+            {
+                // Panasonic
+                mimeType = "image/x-panasonic-raw";
+                isSmallSize = false;
+            }
             else if (contentFileName.toUpperCase().contains(RAW_SUFFIX_5))
             {
                 mimeType = "image/x-sony-arw";