PowerOFFのクラス名を調整。

diff --git a/app/src/main/java/net/osdn/gokigen/gr2control/camera/fuji_x/operation/CameraPowerOffFujiX.java b/app/src/main/java/net/osdn/gokigen/gr2control/camera/fuji_x/operation/FujiXCameraPowerOff.java
similarity index 93%
rename from app/src/main/java/net/osdn/gokigen/gr2control/camera/fuji_x/operation/CameraPowerOffFujiX.java
rename to app/src/main/java/net/osdn/gokigen/gr2control/camera/fuji_x/operation/FujiXCameraPowerOff.java
index c2f185a..14ecb79 100644 (file)
--- a/app/src/main/java/net/osdn/gokigen/gr2control/camera/fuji_x/operation/CameraPowerOffFujiX.java
+++ b/app/src/main/java/net/osdn/gokigen/gr2control/camera/fuji_x/operation/FujiXCameraPowerOff.java
@@ -9,7 +9,7 @@ import net.osdn.gokigen.gr2control.scene.IChangeScene;
 
 import androidx.preference.Preference;
 
-public class CameraPowerOffFujiX implements Preference.OnPreferenceClickListener, ConfirmationDialog.Callback
+public class FujiXCameraPowerOff implements Preference.OnPreferenceClickListener, ConfirmationDialog.Callback
 {
 
     private final Context context;
@@ -20,7 +20,7 @@ public class CameraPowerOffFujiX implements Preference.OnPreferenceClickListener
      *   コンストラクタ
      *
      */
-    public CameraPowerOffFujiX(Context context, IChangeScene changeScene)
+    public FujiXCameraPowerOff(Context context, IChangeScene changeScene)
     {
         this.context = context;
         this.changeScene = changeScene;

diff --git a/app/src/main/java/net/osdn/gokigen/gr2control/camera/fuji_x/wrapper/FujiXLiveViewControl.java b/app/src/main/java/net/osdn/gokigen/gr2control/camera/fuji_x/wrapper/FujiXLiveViewControl.java
index 92e6fed..a9cc9f7 100644 (file)
--- a/app/src/main/java/net/osdn/gokigen/gr2control/camera/fuji_x/wrapper/FujiXLiveViewControl.java
+++ b/app/src/main/java/net/osdn/gokigen/gr2control/camera/fuji_x/wrapper/FujiXLiveViewControl.java
@@ -30,7 +30,7 @@ public class FujiXLiveViewControl implements ILiveViewControl, IFujiXCommunicati
     private static final int BUFFER_SIZE = 2048 * 1280;
     private static final int ERROR_LIMIT = 30;
     private boolean isStart = false;
-    private boolean logcat = false;
+    private boolean logcat = true;
 
     FujiXLiveViewControl(@NonNull Activity activity, String ip, int portNumber)
     {

diff --git a/app/src/main/java/net/osdn/gokigen/gr2control/camera/ricohgr2/operation/CameraPowerOffRicohGr2.java b/app/src/main/java/net/osdn/gokigen/gr2control/camera/ricohgr2/operation/RicohGr2CameraPowerOff.java
similarity index 93%
rename from app/src/main/java/net/osdn/gokigen/gr2control/camera/ricohgr2/operation/CameraPowerOffRicohGr2.java
rename to app/src/main/java/net/osdn/gokigen/gr2control/camera/ricohgr2/operation/RicohGr2CameraPowerOff.java
index 732d1a8..01ac048 100644 (file)
--- a/app/src/main/java/net/osdn/gokigen/gr2control/camera/ricohgr2/operation/CameraPowerOffRicohGr2.java
+++ b/app/src/main/java/net/osdn/gokigen/gr2control/camera/ricohgr2/operation/RicohGr2CameraPowerOff.java
@@ -9,7 +9,7 @@ import net.osdn.gokigen.gr2control.scene.IChangeScene;
 
 import androidx.preference.Preference;
 
-public class CameraPowerOffRicohGr2 implements Preference.OnPreferenceClickListener, ConfirmationDialog.Callback
+public class RicohGr2CameraPowerOff implements Preference.OnPreferenceClickListener, ConfirmationDialog.Callback
 {
 
     private final Context context;
@@ -20,7 +20,7 @@ public class CameraPowerOffRicohGr2 implements Preference.OnPreferenceClickListe
      *   コンストラクタ
      *
      */
-    public CameraPowerOffRicohGr2(Context context, IChangeScene changeScene)
+    public RicohGr2CameraPowerOff(Context context, IChangeScene changeScene)
     {
         this.context = context;
         this.changeScene = changeScene;

diff --git a/app/src/main/java/net/osdn/gokigen/gr2control/preference/fuji_x/FujiXPreferenceFragment.java b/app/src/main/java/net/osdn/gokigen/gr2control/preference/fuji_x/FujiXPreferenceFragment.java
index d3f0300..a4915cf 100644 (file)
--- a/app/src/main/java/net/osdn/gokigen/gr2control/preference/fuji_x/FujiXPreferenceFragment.java
+++ b/app/src/main/java/net/osdn/gokigen/gr2control/preference/fuji_x/FujiXPreferenceFragment.java
@@ -8,7 +8,7 @@ import android.provider.Settings;
 import android.util.Log;
 
 import net.osdn.gokigen.gr2control.R;
-import net.osdn.gokigen.gr2control.camera.fuji_x.operation.CameraPowerOffFujiX;
+import net.osdn.gokigen.gr2control.camera.fuji_x.operation.FujiXCameraPowerOff;
 import net.osdn.gokigen.gr2control.logcat.LogCatViewer;
 import net.osdn.gokigen.gr2control.preference.IPreferencePropertyAccessor;
 import net.osdn.gokigen.gr2control.scene.IChangeScene;
@@ -29,7 +29,7 @@ public class FujiXPreferenceFragment  extends PreferenceFragmentCompat implement
     private final String TAG = toString();
     private AppCompatActivity context = null;
     private SharedPreferences preferences = null;
-    private CameraPowerOffFujiX powerOffController = null;
+    private FujiXCameraPowerOff powerOffController = null;
     private LogCatViewer logCatViewer = null;
 
     /**
@@ -58,7 +58,7 @@ public class FujiXPreferenceFragment  extends PreferenceFragmentCompat implement
     {
         try
         {
-            powerOffController = new CameraPowerOffFujiX(context, changeScene);
+            powerOffController = new FujiXCameraPowerOff(context, changeScene);
             powerOffController.prepare();
 
             logCatViewer = new LogCatViewer(changeScene);

diff --git a/app/src/main/java/net/osdn/gokigen/gr2control/preference/ricohgr2/RicohGr2PreferenceFragment.java b/app/src/main/java/net/osdn/gokigen/gr2control/preference/ricohgr2/RicohGr2PreferenceFragment.java
index 0a43269..66fcaab 100644 (file)
--- a/app/src/main/java/net/osdn/gokigen/gr2control/preference/ricohgr2/RicohGr2PreferenceFragment.java
+++ b/app/src/main/java/net/osdn/gokigen/gr2control/preference/ricohgr2/RicohGr2PreferenceFragment.java
@@ -8,7 +8,7 @@ import android.provider.Settings;
 import android.util.Log;
 
 import net.osdn.gokigen.gr2control.R;
-import net.osdn.gokigen.gr2control.camera.ricohgr2.operation.CameraPowerOffRicohGr2;
+import net.osdn.gokigen.gr2control.camera.ricohgr2.operation.RicohGr2CameraPowerOff;
 import net.osdn.gokigen.gr2control.logcat.LogCatViewer;
 import net.osdn.gokigen.gr2control.preference.IPreferencePropertyAccessor;
 import net.osdn.gokigen.gr2control.scene.IChangeScene;
@@ -29,7 +29,7 @@ public class RicohGr2PreferenceFragment  extends PreferenceFragmentCompat implem
     private final String TAG = toString();
     private AppCompatActivity context = null;
     private SharedPreferences preferences = null;
-    private CameraPowerOffRicohGr2 powerOffController = null;
+    private RicohGr2CameraPowerOff powerOffController = null;
     private LogCatViewer logCatViewer = null;
 
     /**
@@ -58,7 +58,7 @@ public class RicohGr2PreferenceFragment  extends PreferenceFragmentCompat implem
     {
         try
         {
-            powerOffController = new CameraPowerOffRicohGr2(context, changeScene);
+            powerOffController = new RicohGr2CameraPowerOff(context, changeScene);
             powerOffController.prepare();
 
             logCatViewer = new LogCatViewer(changeScene);