コマンド送信ダイアログの呼び出しを各機種別に追加。

diff --git a/app/src/main/java/net/osdn/gokigen/a01d/A01dMain.java b/app/src/main/java/net/osdn/gokigen/a01d/A01dMain.java
index 27cb336..38440f9 100644 (file)
--- a/app/src/main/java/net/osdn/gokigen/a01d/A01dMain.java
+++ b/app/src/main/java/net/osdn/gokigen/a01d/A01dMain.java
@@ -236,6 +236,7 @@ public class A01dMain extends AppCompatActivity implements ICameraStatusReceiver
         }
     }
 
+
     /**
      * カメラのプロパティ一覧画面を開く
      * （カメラと接続中のときのみ、接続方式が Olympusのときのみ）
@@ -246,8 +247,24 @@ public class A01dMain extends AppCompatActivity implements ICameraStatusReceiver
         try
         {
             ICameraConnection.CameraConnectionMethod method = interfaceProvider.getCammeraConnectionMethod();
-            ICameraConnection connection = getCameraConnection(method);
-            if (method == ICameraConnection.CameraConnectionMethod.RICOH_GR2)
+
+        }
+        catch (Exception e)
+        {
+            e.printStackTrace();
+        }
+    }
+
+    /**
+     * カメラのプロパティ一覧画面を開く
+     * （カメラと接続中のときのみ、接続方式が Olympusのときのみ）
+     */
+    @Override
+    public void changeSceneToCameraPropertyList(ICameraConnection.CameraConnectionMethod connectionMethod)
+    {
+        try
+        {
+            if (connectionMethod == ICameraConnection.CameraConnectionMethod.RICOH_GR2)
             {
                 try
                 {
@@ -259,12 +276,12 @@ public class A01dMain extends AppCompatActivity implements ICameraStatusReceiver
                     e.printStackTrace();
                 }
             }
-            else if (method == ICameraConnection.CameraConnectionMethod.SONY)
+            else if (connectionMethod == ICameraConnection.CameraConnectionMethod.SONY)
             {
                 // SONYの場合は、API一覧画面へ遷移させる
                 changeSceneToApiList();
             }
-            else if (method == ICameraConnection.CameraConnectionMethod.PANASONIC)
+            else if (connectionMethod == ICameraConnection.CameraConnectionMethod.PANASONIC)
             {
                 try
                 {
@@ -276,7 +293,7 @@ public class A01dMain extends AppCompatActivity implements ICameraStatusReceiver
                     e.printStackTrace();
                 }
             }
-            else if (method == ICameraConnection.CameraConnectionMethod.FUJI_X)
+            else if (connectionMethod == ICameraConnection.CameraConnectionMethod.FUJI_X)
             {
                 try
                 {
@@ -288,7 +305,7 @@ public class A01dMain extends AppCompatActivity implements ICameraStatusReceiver
                     e.printStackTrace();
                 }
             }
-            else if (method == ICameraConnection.CameraConnectionMethod.OLYMPUS)
+            else if (connectionMethod == ICameraConnection.CameraConnectionMethod.OLYMPUS)
             {
                 try
                 {
@@ -304,7 +321,7 @@ public class A01dMain extends AppCompatActivity implements ICameraStatusReceiver
                     e.printStackTrace();
                 }
             }
-            else if (method == ICameraConnection.CameraConnectionMethod.THETA)
+            else if (connectionMethod == ICameraConnection.CameraConnectionMethod.THETA)
             {
                 try
                 {
@@ -316,7 +333,7 @@ public class A01dMain extends AppCompatActivity implements ICameraStatusReceiver
                     e.printStackTrace();
                 }
             }
-            else if (method == ICameraConnection.CameraConnectionMethod.CANON)
+            else if (connectionMethod == ICameraConnection.CameraConnectionMethod.CANON)
             {
                 try
                 {
@@ -328,7 +345,7 @@ public class A01dMain extends AppCompatActivity implements ICameraStatusReceiver
                     e.printStackTrace();
                 }
             }
-            else if (method == ICameraConnection.CameraConnectionMethod.NIKON)
+            else if (connectionMethod == ICameraConnection.CameraConnectionMethod.NIKON)
             {
                 try
                 {
@@ -343,6 +360,7 @@ public class A01dMain extends AppCompatActivity implements ICameraStatusReceiver
             else
             {
                 // OPC カメラの場合...
+                ICameraConnection connection = getCameraConnection(connectionMethod);
                 if (connection != null)
                 {
                     ICameraConnection.CameraConnectionStatus status = connection.getConnectionStatus();

diff --git a/app/src/main/java/net/osdn/gokigen/a01d/IChangeScene.java b/app/src/main/java/net/osdn/gokigen/a01d/IChangeScene.java
index b5fac5e..b2cf6fe 100644 (file)
--- a/app/src/main/java/net/osdn/gokigen/a01d/IChangeScene.java
+++ b/app/src/main/java/net/osdn/gokigen/a01d/IChangeScene.java
@@ -8,6 +8,7 @@ import net.osdn.gokigen.a01d.camera.ICameraConnection;
 public interface IChangeScene
 {
     void changeSceneToCameraPropertyList();
+    void changeSceneToCameraPropertyList(ICameraConnection.CameraConnectionMethod connectionMethod);
     void changeSceneToConfiguration();
     void changeSceneToConfiguration(ICameraConnection.CameraConnectionMethod connectionMethod);
     void changeCameraConnection();

diff --git a/app/src/main/java/net/osdn/gokigen/a01d/preference/canon/CanonPreferenceFragment.java b/app/src/main/java/net/osdn/gokigen/a01d/preference/canon/CanonPreferenceFragment.java
index b14660d..cbf14ce 100644 (file)
--- a/app/src/main/java/net/osdn/gokigen/a01d/preference/canon/CanonPreferenceFragment.java
+++ b/app/src/main/java/net/osdn/gokigen/a01d/preference/canon/CanonPreferenceFragment.java
@@ -18,6 +18,7 @@ import androidx.preference.PreferenceManager;
 
 import net.osdn.gokigen.a01d.IChangeScene;
 import net.osdn.gokigen.a01d.R;
+import net.osdn.gokigen.a01d.camera.ICameraConnection;
 import net.osdn.gokigen.a01d.camera.ptpip.operation.PtpIpCameraPowerOff;
 import net.osdn.gokigen.a01d.preference.IPreferencePropertyAccessor;
 
@@ -357,7 +358,7 @@ public class CanonPreferenceFragment extends PreferenceFragmentCompat implements
                 // コマンド送信ダイアログを表示する
                 if (changeScene != null)
                 {
-                    changeScene.changeSceneToCameraPropertyList();
+                    changeScene.changeSceneToCameraPropertyList(ICameraConnection.CameraConnectionMethod.CANON);
                 }
             }
             return (true);

diff --git a/app/src/main/java/net/osdn/gokigen/a01d/preference/fujix/FujiXPreferenceFragment.java b/app/src/main/java/net/osdn/gokigen/a01d/preference/fujix/FujiXPreferenceFragment.java
index 6a80351..c89685c 100644 (file)
--- a/app/src/main/java/net/osdn/gokigen/a01d/preference/fujix/FujiXPreferenceFragment.java
+++ b/app/src/main/java/net/osdn/gokigen/a01d/preference/fujix/FujiXPreferenceFragment.java
@@ -9,6 +9,7 @@ import android.util.Log;
 
 import net.osdn.gokigen.a01d.IChangeScene;
 import net.osdn.gokigen.a01d.R;
+import net.osdn.gokigen.a01d.camera.ICameraConnection;
 import net.osdn.gokigen.a01d.camera.fujix.operation.CameraPowerOffFujiX;
 import net.osdn.gokigen.a01d.preference.IPreferencePropertyAccessor;
 
@@ -374,7 +375,7 @@ public class FujiXPreferenceFragment  extends PreferenceFragmentCompat implement
                 // コマンド送信ダイアログを表示する
                 if (changeScene != null)
                 {
-                    changeScene.changeSceneToCameraPropertyList();
+                    changeScene.changeSceneToCameraPropertyList(ICameraConnection.CameraConnectionMethod.FUJI_X);
                 }
             }
             return (true);

diff --git a/app/src/main/java/net/osdn/gokigen/a01d/preference/nikon/NikonPreferenceFragment.java b/app/src/main/java/net/osdn/gokigen/a01d/preference/nikon/NikonPreferenceFragment.java
index e4ce75a..6deaa98 100644 (file)
--- a/app/src/main/java/net/osdn/gokigen/a01d/preference/nikon/NikonPreferenceFragment.java
+++ b/app/src/main/java/net/osdn/gokigen/a01d/preference/nikon/NikonPreferenceFragment.java
@@ -18,6 +18,7 @@ import androidx.preference.PreferenceManager;
 
 import net.osdn.gokigen.a01d.IChangeScene;
 import net.osdn.gokigen.a01d.R;
+import net.osdn.gokigen.a01d.camera.ICameraConnection;
 import net.osdn.gokigen.a01d.camera.ptpip.operation.PtpIpCameraPowerOff;
 import net.osdn.gokigen.a01d.preference.IPreferencePropertyAccessor;
 
@@ -357,7 +358,7 @@ public class NikonPreferenceFragment extends PreferenceFragmentCompat implements
                 // コマンド送信ダイアログを表示する
                 if (changeScene != null)
                 {
-                    changeScene.changeSceneToCameraPropertyList();
+                    changeScene.changeSceneToCameraPropertyList(ICameraConnection.CameraConnectionMethod.NIKON);
                 }
             }
             return (true);

diff --git a/app/src/main/java/net/osdn/gokigen/a01d/preference/olympuspen/OlympusPreferenceFragment.java b/app/src/main/java/net/osdn/gokigen/a01d/preference/olympuspen/OlympusPreferenceFragment.java
index cde6a3a..59b947a 100644 (file)
--- a/app/src/main/java/net/osdn/gokigen/a01d/preference/olympuspen/OlympusPreferenceFragment.java
+++ b/app/src/main/java/net/osdn/gokigen/a01d/preference/olympuspen/OlympusPreferenceFragment.java
@@ -18,6 +18,7 @@ import androidx.preference.PreferenceManager;
 
 import net.osdn.gokigen.a01d.IChangeScene;
 import net.osdn.gokigen.a01d.R;
+import net.osdn.gokigen.a01d.camera.ICameraConnection;
 import net.osdn.gokigen.a01d.camera.olympuspen.operation.OlympusPenCameraPowerOff;
 import net.osdn.gokigen.a01d.preference.IPreferencePropertyAccessor;
 
@@ -350,7 +351,7 @@ public class OlympusPreferenceFragment extends PreferenceFragmentCompat implemen
                 // HTTP送信ダイアログを表示する
                 if (changeScene != null)
                 {
-                    changeScene.changeSceneToCameraPropertyList();
+                    changeScene.changeSceneToCameraPropertyList(ICameraConnection.CameraConnectionMethod.OLYMPUS);
                 }
             }
             return (true);

diff --git a/app/src/main/java/net/osdn/gokigen/a01d/preference/panasonic/PanasonicPreferenceFragment.java b/app/src/main/java/net/osdn/gokigen/a01d/preference/panasonic/PanasonicPreferenceFragment.java
index 6087feb..6d88657 100644 (file)
--- a/app/src/main/java/net/osdn/gokigen/a01d/preference/panasonic/PanasonicPreferenceFragment.java
+++ b/app/src/main/java/net/osdn/gokigen/a01d/preference/panasonic/PanasonicPreferenceFragment.java
@@ -9,6 +9,7 @@ import android.util.Log;
 
 import net.osdn.gokigen.a01d.IChangeScene;
 import net.osdn.gokigen.a01d.R;
+import net.osdn.gokigen.a01d.camera.ICameraConnection;
 import net.osdn.gokigen.a01d.camera.panasonic.operation.CameraPowerOffPanasonic;
 import net.osdn.gokigen.a01d.preference.IPreferencePropertyAccessor;
 
@@ -346,7 +347,7 @@ public class PanasonicPreferenceFragment  extends PreferenceFragmentCompat imple
                 // コマンド送信ダイアログを表示する
                 if (changeScene != null)
                 {
-                    changeScene.changeSceneToCameraPropertyList();
+                    changeScene.changeSceneToCameraPropertyList(ICameraConnection.CameraConnectionMethod.PANASONIC);
                 }
             }
             return (true);

diff --git a/app/src/main/java/net/osdn/gokigen/a01d/preference/ricohgr2/RicohGr2PreferenceFragment.java b/app/src/main/java/net/osdn/gokigen/a01d/preference/ricohgr2/RicohGr2PreferenceFragment.java
index cfb7d11..3e79cc6 100644 (file)
--- a/app/src/main/java/net/osdn/gokigen/a01d/preference/ricohgr2/RicohGr2PreferenceFragment.java
+++ b/app/src/main/java/net/osdn/gokigen/a01d/preference/ricohgr2/RicohGr2PreferenceFragment.java
@@ -10,6 +10,7 @@ import android.util.Log;
 
 import net.osdn.gokigen.a01d.IChangeScene;
 import net.osdn.gokigen.a01d.R;
+import net.osdn.gokigen.a01d.camera.ICameraConnection;
 import net.osdn.gokigen.a01d.camera.ricohgr2.operation.CameraPowerOffRicohGr2;
 import net.osdn.gokigen.a01d.preference.IPreferencePropertyAccessor;
 
@@ -396,7 +397,7 @@ public class RicohGr2PreferenceFragment  extends PreferenceFragmentCompat implem
                 // HTTP送信ダイアログを表示する
                 if (changeScene != null)
                 {
-                    changeScene.changeSceneToCameraPropertyList();
+                    changeScene.changeSceneToCameraPropertyList(ICameraConnection.CameraConnectionMethod.RICOH_GR2);
                 }
             }
             return (true);

diff --git a/app/src/main/java/net/osdn/gokigen/a01d/preference/theta/ThetaPreferenceFragment.java b/app/src/main/java/net/osdn/gokigen/a01d/preference/theta/ThetaPreferenceFragment.java
index 1aedfe9..1fd6968 100644 (file)
--- a/app/src/main/java/net/osdn/gokigen/a01d/preference/theta/ThetaPreferenceFragment.java
+++ b/app/src/main/java/net/osdn/gokigen/a01d/preference/theta/ThetaPreferenceFragment.java
@@ -18,6 +18,7 @@ import androidx.preference.PreferenceManager;
 
 import net.osdn.gokigen.a01d.IChangeScene;
 import net.osdn.gokigen.a01d.R;
+import net.osdn.gokigen.a01d.camera.ICameraConnection;
 import net.osdn.gokigen.a01d.camera.ptpip.operation.PtpIpCameraPowerOff;
 import net.osdn.gokigen.a01d.preference.IPreferencePropertyAccessor;
 
@@ -357,7 +358,7 @@ public class ThetaPreferenceFragment extends PreferenceFragmentCompat implements
                 // HTTP送信ダイアログを表示する
                 if (changeScene != null)
                 {
-                    changeScene.changeSceneToCameraPropertyList();
+                    changeScene.changeSceneToCameraPropertyList(ICameraConnection.CameraConnectionMethod.THETA);
                 }
             }
             return (true);