Ricoh と OMDS のアプリ終了時にカメラの電源をオフにするコマンドを送るようにした。

diff --git a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/omds/OmdsCameraControl.kt b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/omds/OmdsCameraControl.kt
index 219f526..d0fe99e 100644 (file)
--- a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/omds/OmdsCameraControl.kt
+++ b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/omds/OmdsCameraControl.kt
@@ -89,7 +89,7 @@ class OmdsCameraControl(private val context: AppCompatActivity, private val vibr
         {
             liveViewControl.stopLiveView()
             statusChecker.stopStatusWatch()
-            cameraConnection.disconnect(false)
+            cameraConnection.disconnect(true)
             cameraConnection.stopWatchWifiStatus(context)
         }
         catch (e: Exception)

diff --git a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/ricohpentax/RicohPentaxCameraControl.kt b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/ricohpentax/RicohPentaxCameraControl.kt
index 61ec7bc..d258017 100644 (file)
--- a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/ricohpentax/RicohPentaxCameraControl.kt
+++ b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/ricohpentax/RicohPentaxCameraControl.kt
@@ -141,7 +141,7 @@ class RicohPentaxCameraControl(private val context: AppCompatActivity, private v
                 statusChecker.stopStatusWatch()
                 isStatusWatch = false
             }
-            gr2Connection.disconnect(false)
+            gr2Connection.disconnect(true)
             gr2Connection.stopWatchWifiStatus(context)
         }
         catch (e : Exception)

diff --git a/app/src/main/java/jp/osdn/gokigen/mangle/scene/SceneChanger.kt b/app/src/main/java/jp/osdn/gokigen/mangle/scene/SceneChanger.kt
index d3a33d1..4051c01 100644 (file)
--- a/app/src/main/java/jp/osdn/gokigen/mangle/scene/SceneChanger.kt
+++ b/app/src/main/java/jp/osdn/gokigen/mangle/scene/SceneChanger.kt
@@ -221,6 +221,7 @@ class SceneChanger(private val activity: AppCompatActivity, private val informat
             object : ConfirmationDialog.ConfirmationCallback {
                 override fun confirm()
                 {
+                    // finish()
                     activity.finish()
                 }
             }
@@ -258,6 +259,7 @@ class SceneChanger(private val activity: AppCompatActivity, private val informat
 
     fun finish()
     {
+        Log.v(TAG, " finishCamera() ")
         cameraControl1.finishCamera()
         cameraControl2.finishCamera()
         cameraControl3.finishCamera()