From 379f1b5b7f8189c88ab5dc79af08d232f64668e0 Mon Sep 17 00:00:00 2001 From: MRSa Date: Mon, 20 Sep 2021 20:26:40 +0900 Subject: [PATCH] =?utf8?q?Ricoh=20=E3=81=A8=20OMDS=20=E3=81=AE=E3=82=A2?= =?utf8?q?=E3=83=97=E3=83=AA=E7=B5=82=E4=BA=86=E6=99=82=E3=81=AB=E3=82=AB?= =?utf8?q?=E3=83=A1=E3=83=A9=E3=81=AE=E9=9B=BB=E6=BA=90=E3=82=92=E3=82=AA?= =?utf8?q?=E3=83=95=E3=81=AB=E3=81=99=E3=82=8B=E3=82=B3=E3=83=9E=E3=83=B3?= =?utf8?q?=E3=83=89=E3=82=92=E9=80=81=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB?= =?utf8?q?=E3=81=97=E3=81=9F=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- .../osdn/gokigen/gokigenassets/camera/vendor/omds/OmdsCameraControl.kt | 2 +- .../gokigenassets/camera/vendor/ricohpentax/RicohPentaxCameraControl.kt | 2 +- app/src/main/java/jp/osdn/gokigen/mangle/scene/SceneChanger.kt | 2 ++ 3 files changed, 4 insertions(+), 2 deletions(-) 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 --- 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 --- 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 --- 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() -- 2.11.0