From d7a1b536af2c06cd3b1f2958fbb29e717876ef6c Mon Sep 17 00:00:00 2001 From: MRSa Date: Sat, 5 Feb 2022 00:34:58 +0900 Subject: [PATCH] =?utf8?q?=E5=88=B6=E5=BE=A1=E5=8F=AF=E8=83=BD=E3=81=AA?= =?utf8?q?=E3=82=AB=E3=83=A1=E3=83=A9=E6=95=B0=E3=81=AE=E6=8B=A1=E5=BC=B5?= =?utf8?q?=E3=81=8C=E3=81=A7=E3=81=8D=E3=82=8B=E3=82=88=E3=81=86=E3=80=81?= =?utf8?q?=E4=BB=95=E8=BE=BC=E3=81=BF=E3=82=92=E5=85=A5=E3=82=8C=E3=81=A6?= =?utf8?q?=E3=81=8A=E3=81=8F=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- .../osdn/gokigen/gokigenassets/liveview/LiveImageViewFragment.kt | 8 ++++++-- app/src/main/java/jp/osdn/gokigen/mangle/scene/SceneChanger.kt | 6 ++++-- 2 files changed, 10 insertions(+), 4 deletions(-) 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 --- 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 --- 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) } -- 2.11.0