制御可能なカメラ数の拡張ができるよう、仕込みを入れておく。

diff --git a/app/src/main/java/jp/osdn/gokigen/gokigenassets/liveview/LiveImageViewFragment.kt b/app/src/main/java/jp/osdn/gokigen/gokigenassets/liveview/LiveImageViewFragment.kt
index df5e597..c939ff7 100644 (file)
--- a/app/src/main/java/jp/osdn/gokigen/gokigenassets/liveview/LiveImageViewFragment.kt
+++ b/app/src/main/java/jp/osdn/gokigen/gokigenassets/liveview/LiveImageViewFragment.kt
@@ -72,10 +72,15 @@ class LiveImageViewFragment(private val contentLayoutId: Int = ID_LIVE_VIEW_LAYO
         return (isActive)
     }
 
-    fun setCameraControl(informationReceiver: IInformationReceiver, isCameraControl0 : Boolean, cameraControl0 : ICameraControl, isCameraControl1 : Boolean, cameraControl1 : ICameraControl, isCameraControl2 : Boolean, cameraControl2 : ICameraControl, isCameraControl3 : Boolean, cameraControl3 : ICameraControl)
+    fun setCameraControlFinished(informationReceiver: IInformationReceiver)
     {
         this.informationReceiver = informationReceiver
+        updateCameraLayout()
+    }
 
+    fun setCameraControl(index: Int, isCameraControl0 : Boolean, cameraControl0 : ICameraControl, isCameraControl1 : Boolean, cameraControl1 : ICameraControl, isCameraControl2 : Boolean, cameraControl2 : ICameraControl, isCameraControl3 : Boolean, cameraControl3 : ICameraControl)
+    {
+        Log.v(TAG, "setCameraControl($index) => $isCameraControl0, $isCameraControl1, $isCameraControl2, $isCameraControl3")
         this.isCameraControl0 = isCameraControl0
         this.cameraControl0 = cameraControl0
 
@@ -100,7 +105,6 @@ class LiveImageViewFragment(private val contentLayoutId: Int = ID_LIVE_VIEW_LAYO
         cameraControl3.setNeighborCameraControl(0, cameraControl0, cameraControl1, cameraControl2, cameraControl3)
         cameraControl3.setNeighborCameraControlFinished()
 
-        updateCameraLayout()
     }
 
     @SuppressLint("ClickableViewAccessibility")

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 d5823ad..b5e7794 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
@@ -84,7 +84,8 @@ class SceneChanger(private val activity: AppCompatActivity, private val informat
             val isEnableCamera4 = cameraControl4.getConnectionMethod() != "NONE"
 
             liveviewFragment = LiveImageViewFragment.newInstance()
-            liveviewFragment.setCameraControl(informationNotify, isEnableCamera1, cameraControl1, isEnableCamera2, cameraControl2, isEnableCamera3, cameraControl3, isEnableCamera4, cameraControl4)
+            liveviewFragment.setCameraControl(0, isEnableCamera1, cameraControl1, isEnableCamera2, cameraControl2, isEnableCamera3, cameraControl3, isEnableCamera4, cameraControl4)
+            liveviewFragment.setCameraControlFinished(informationNotify)
         }
         setDefaultFragment(liveviewFragment)
 
@@ -139,12 +140,13 @@ class SceneChanger(private val activity: AppCompatActivity, private val informat
             val isEnableCamera4 = cameraControl4.getConnectionMethod() != "NONE"
             liveviewFragment = LiveImageViewFragment.newInstance()
             liveviewFragment.setCameraControl(
-                informationNotify,
+                0,
                 isEnableCamera1, cameraControl1,
                 isEnableCamera2, cameraControl2,
                 isEnableCamera3, cameraControl3,
                 isEnableCamera4, cameraControl4
             )
+            liveviewFragment.setCameraControlFinished(informationNotify)
         }
         changeFragment(liveviewFragment)
     }