From 5a37ea267f83ccec0eee934b7ec44afc7996ce79 Mon Sep 17 00:00:00 2001
From: MRSa <mrsa@myad.jp>
Date: Sun, 19 Sep 2021 00:33:27 +0900
Subject: [PATCH] =?utf8?q?OPC=E3=81=A7=E3=82=82=E3=83=A9=E3=82=A4=E3=83=96?=
 =?utf8?q?=E3=83=93=E3=83=A5=E3=83=BC=E3=81=8C=E3=81=86=E3=81=A4=E3=82=8B?=
 =?utf8?q?=E3=81=93=E3=81=A8=E3=82=92=E7=A2=BA=E8=AA=8D=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 .../camera/vendor/omds/connection/OmdsCameraConnectSequence.kt     | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/omds/connection/OmdsCameraConnectSequence.kt b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/omds/connection/OmdsCameraConnectSequence.kt
index 634bd69..7734a24 100644
--- a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/omds/connection/OmdsCameraConnectSequence.kt
+++ b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/omds/connection/OmdsCameraConnectSequence.kt
@@ -24,6 +24,7 @@ class OmdsCameraConnectSequence(private val context: AppCompatActivity, private
             val getCommandListUrl = "$executeUrl/get_commandlist.cgi"
             val getConnectModeUrl = "$executeUrl/get_connectmode.cgi"
             val switchCameraModeUrl = "$executeUrl/switch_cammode.cgi"
+            val switchOpcCameraModeUrl = "$executeUrl/switch_cameramode.cgi"
             //val getCameraStatusUrl = "$executeUrl/get_activate.cgi"
 
             val response: String = http.httpGetWithHeader(getConnectModeUrl, headerMap, null, TIMEOUT_MS) ?: ""
@@ -41,6 +42,12 @@ class OmdsCameraConnectSequence(private val context: AppCompatActivity, private
                 val lvUrl = "$switchCameraModeUrl?mode=rec&lvqty=$liveViewQuality"
                 val response4: String = http.httpGetWithHeader(lvUrl, headerMap, null, TIMEOUT_MS) ?: ""
                 Log.v(TAG, " $lvUrl $response4")
+                if (response4.isEmpty())
+                {
+                    // エラーになった場合は、OPCのコマンドを発行する
+                    val response5: String = http.httpGetWithHeader("$switchOpcCameraModeUrl?mode=rec", headerMap, null, TIMEOUT_MS) ?: ""
+                    Log.v(TAG, " $switchOpcCameraModeUrl?mode=rec $response5")
+                }
 
                 //// カメラのステータス取得
                 //String response5 = SimpleHttpClient.httpGetWithHeader(getCameraStatusUrl, headerMap, null, TIMEOUT_MS);
-- 
2.11.0