すこし修正。

diff --git a/app/src/main/java/net/osdn/gokigen/pkremote/camera/vendor/sony/wrapper/playback/QX10actEnableMethods.java b/app/src/main/java/net/osdn/gokigen/pkremote/camera/vendor/sony/wrapper/playback/QX10actEnableMethods.java
index 22a0257..97653cf 100644 (file)
--- a/app/src/main/java/net/osdn/gokigen/pkremote/camera/vendor/sony/wrapper/playback/QX10actEnableMethods.java
+++ b/app/src/main/java/net/osdn/gokigen/pkremote/camera/vendor/sony/wrapper/playback/QX10actEnableMethods.java
@@ -14,6 +14,7 @@ import java.security.MessageDigest;
 
 /**
  *   QX10actEnableMethods : QX10を Contents Transferモードに切り替えるための処理...
+ *      (処理はこれでよさそうだが...このキーはファームアップ後に変わっていそう...)
  *
  *    [参考サイト]
  *      - https://github.com/erik-smit/sony-camera-api/blob/master/actEnableMethods.sh
@@ -45,8 +46,6 @@ class QX10actEnableMethods
             e.printStackTrace();
         }
         return (digest);
-        //return ("AqcqkTusNzFKhoXm");
-        //return ("GiigWEMzm1MoEmMu");
     }
 
     private String decideSignature()
@@ -72,7 +71,7 @@ class QX10actEnableMethods
         boolean response = false;
         try
         {
-            // 現物合わせ...
+            // ここは現物合わせ...
             String methods =
                     "camera\\/setFlashMode:camera\\/getFlashMode:camera\\/getSupportedFlashMode:camera\\/getAvailableFlashMode:" +
                     "camera\\/setExposureCompensation:camera\\/getExposureCompensation:camera\\/getSupportedExposureCompensation:camera\\/getAvailableExposureCompensation:" +

diff --git a/app/src/main/java/net/osdn/gokigen/pkremote/camera/vendor/sony/wrapper/playback/SonyImageContentInfo.java b/app/src/main/java/net/osdn/gokigen/pkremote/camera/vendor/sony/wrapper/playback/SonyImageContentInfo.java
index 1c1de25..3acdb6a 100644 (file)
--- a/app/src/main/java/net/osdn/gokigen/pkremote/camera/vendor/sony/wrapper/playback/SonyImageContentInfo.java
+++ b/app/src/main/java/net/osdn/gokigen/pkremote/camera/vendor/sony/wrapper/playback/SonyImageContentInfo.java
@@ -159,7 +159,6 @@ public class SonyImageContentInfo implements ICameraContent
         return ("");
     }
 
-
     @Override
     public boolean isDateValid()
     {
@@ -237,7 +236,6 @@ public class SonyImageContentInfo implements ICameraContent
     }
 */
 
-
     String getOriginalUrl()
     {
         if (contentObject != null)

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 368a117..d53007a 100644 (file)
--- 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
@@ -367,10 +367,17 @@ public class SonyPlaybackControl implements IPlaybackControl
                 if (!ret)
                 {
                     // actEnableMethods がうまく動かなかった場合... ここで処理を止める
+
+                    // カメラのモードチェンジ
+                   setCameraFunction(false);
+
                     getContentDirectorySoapAction();   //  ← やっても動かないはず
                     return (false);
                 }
 
+                // カメラのモードチェンジ
+                setCameraFunction(false);
+
                 //  DLNAで画像取得に入る...。
                 informationReceiver.updateMessage(activity.getString(R.string.image_checking), false, false, Color.BLACK);
                 getContentDirectorySoapAction();