From decbe660df9e98c4384d7ae2ccdcfeb43e61692b Mon Sep 17 00:00:00 2001 From: MRSa Date: Sat, 5 Feb 2022 00:30:13 +0900 Subject: [PATCH] =?utf8?q?ConsolePanelControl=E3=81=A7=E6=93=8D=E4=BD=9C?= =?utf8?q?=E5=8F=AF=E8=83=BD=E3=81=AA=E3=82=AB=E3=83=A1=E3=83=A9=E5=80=8B?= =?utf8?q?=E6=95=B0=E3=82=924=E3=81=8B=E3=82=898=E3=81=AB=E6=8B=A1?= =?utf8?q?=E5=BC=B5=E3=81=A7=E3=81=8D=E3=82=8B=E3=82=88=E3=81=86=E4=BB=95?= =?utf8?q?=E8=BE=BC=E3=81=BF=E3=82=92=E5=85=A5=E3=82=8C=E3=82=8B=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- .../gokigenassets/camera/DummyCameraControl.kt | 3 +- .../camera/console/ConsolePanelControl.kt | 43 ++++++++++++++++++---- .../camera/example/ExamplePictureControl.kt | 3 +- .../camera/interfaces/ICameraControl.kt | 4 +- .../vendor/camerax/operation/CameraControl.kt | 3 +- .../camera/vendor/omds/OmdsCameraControl.kt | 3 +- .../panasonic/wrapper/PanasonicCameraControl.kt | 3 +- .../camera/vendor/pixpro/PixproCameraControl.kt | 3 +- .../vendor/ricohpentax/RicohPentaxCameraControl.kt | 3 +- .../camera/vendor/sony/SonyCameraControl.kt | 3 +- .../camera/vendor/theta/ThetaCameraControl.kt | 3 +- .../liveview/LiveImageViewFragment.kt | 15 ++++++-- 12 files changed, 68 insertions(+), 21 deletions(-) diff --git a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/DummyCameraControl.kt b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/DummyCameraControl.kt index 5a8da69..b9f3366 100644 --- a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/DummyCameraControl.kt +++ b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/DummyCameraControl.kt @@ -23,7 +23,8 @@ class DummyCameraControl(private val number : Int = 0) : ICameraControl, View.On override fun keyDownReceiver(id: Int): IKeyDown { return (this) } override fun getFocusingControl(id: Int): IFocusingControl? { return (null) } override fun getDisplayInjector(): IDisplayInjector? { return (null) } - override fun setNeighborCameraControl(camera0: ICameraControl?, camera1: ICameraControl?, camera2: ICameraControl?, camera3: ICameraControl?) { } + override fun setNeighborCameraControl(index: Int, camera0: ICameraControl?, camera1: ICameraControl?, camera2: ICameraControl?, camera3: ICameraControl?) { } + override fun setNeighborCameraControlFinished() { } override fun getCameraStatus(): ICameraStatus { return (this) } override fun getCameraNumber(): Int { return (number) } override fun onClick(v: View?) { } diff --git a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/console/ConsolePanelControl.kt b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/console/ConsolePanelControl.kt index a3001fc..71ab897 100644 --- a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/console/ConsolePanelControl.kt +++ b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/console/ConsolePanelControl.kt @@ -57,10 +57,16 @@ class ConsolePanelControl (private val context: AppCompatActivity, private val v private var isRefreshLoop = false private var currentCameraControlId : Int = -1 private var currentCameraControl : ICameraControl? = null + private var camera0: ICameraControl? = null private var camera1: ICameraControl? = null private var camera2: ICameraControl? = null private var camera3: ICameraControl? = null + private var camera4: ICameraControl? = null + private var camera5: ICameraControl? = null + private var camera6: ICameraControl? = null + private var camera7: ICameraControl? = null + private var canvasWidth : Float = 0.0f private var canvasHeight : Float = 0.0f private var touchedX : Float = -1.0f @@ -69,7 +75,7 @@ class ConsolePanelControl (private val context: AppCompatActivity, private val v companion object { private val TAG = ConsolePanelControl::class.java.simpleName - private const val MAX_CONTROL_CAMERAS = 4 + private const val MAX_CONTROL_CAMERAS = 8 private const val MARGIN = 10.0f private const val sleepMs = 1000L private const val NOF_AREA_HORIZONTAL = 3.0f @@ -112,13 +118,28 @@ class ConsolePanelControl (private val context: AppCompatActivity, private val v override fun getAnotherTouchListener(id : Int) : View.OnTouchListener { return (this) } override fun getCameraNumber(): Int { return (number) } - override fun setNeighborCameraControl(camera0: ICameraControl?, camera1: ICameraControl?, camera2: ICameraControl?, camera3: ICameraControl?) + override fun setNeighborCameraControl(index: Int, camera0: ICameraControl?, camera1: ICameraControl?, camera2: ICameraControl?, camera3: ICameraControl?) + { + Log.v(TAG, " setNeighborCameraControl($index) ") + if (index == 0) + { + this.camera0 = camera0 + this.camera1 = camera1 + this.camera2 = camera2 + this.camera3 = camera3 + } + else // if (index == 1) + { + this.camera4 = camera0 + this.camera5 = camera1 + this.camera6 = camera2 + this.camera7 = camera3 + } + } + + override fun setNeighborCameraControlFinished() { - Log.v(TAG, " setNeighborCameraControl() ") - this.camera0 = camera0 - this.camera1 = camera1 - this.camera2 = camera2 - this.camera3 = camera3 + Log.v(TAG, " setNeighborCameraControlFinished() ") decideCameraControl() } @@ -622,6 +643,10 @@ class ConsolePanelControl (private val context: AppCompatActivity, private val v 1 -> camera1 2 -> camera2 3 -> camera3 + 4 -> camera4 + 5 -> camera5 + 6 -> camera6 + 7 -> camera7 else -> null } ?: return (false) @@ -654,6 +679,10 @@ class ConsolePanelControl (private val context: AppCompatActivity, private val v 1 -> camera1 2 -> camera2 3 -> camera3 + 4 -> camera4 + 5 -> camera5 + 6 -> camera6 + 7 -> camera7 else -> null } } diff --git a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/example/ExamplePictureControl.kt b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/example/ExamplePictureControl.kt index 3f615a8..14457e5 100644 --- a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/example/ExamplePictureControl.kt +++ b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/example/ExamplePictureControl.kt @@ -82,7 +82,8 @@ class ExamplePictureControl(private val context: AppCompatActivity, private val override fun doShutter() { } override fun doShutterOff() { } override fun handleKeyDown(keyCode: Int, event: KeyEvent): Boolean { return (false) } - override fun setNeighborCameraControl(camera0: ICameraControl?, camera1: ICameraControl?, camera2: ICameraControl?, camera3: ICameraControl?) { } + override fun setNeighborCameraControl(index: Int, camera0: ICameraControl?, camera1: ICameraControl?, camera2: ICameraControl?, camera3: ICameraControl?) { } + override fun setNeighborCameraControlFinished() { } override fun getCameraStatus(): ICameraStatus { return (this) } override fun getStatusList(key: String): List { return (ArrayList()) } override fun getStatus(key: String): String { return ("") } diff --git a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/interfaces/ICameraControl.kt b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/interfaces/ICameraControl.kt index cf689fa..31e0f8f 100644 --- a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/interfaces/ICameraControl.kt +++ b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/interfaces/ICameraControl.kt @@ -25,7 +25,9 @@ interface ICameraControl fun getFocusingControl(id : Int = 0) : IFocusingControl? fun getDisplayInjector() : IDisplayInjector? fun getAnotherTouchListener(id : Int = 0) : View.OnTouchListener? = null - fun setNeighborCameraControl(camera0: ICameraControl?, camera1: ICameraControl?, camera2: ICameraControl?, camera3: ICameraControl?) fun getCameraStatus() : ICameraStatus? fun getCameraNumber() : Int + + fun setNeighborCameraControl(index: Int, camera0: ICameraControl?, camera1: ICameraControl?, camera2: ICameraControl?, camera3: ICameraControl?) + fun setNeighborCameraControlFinished() } diff --git a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/camerax/operation/CameraControl.kt b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/camerax/operation/CameraControl.kt index f8ad19b..f3815c6 100644 --- a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/camerax/operation/CameraControl.kt +++ b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/camerax/operation/CameraControl.kt @@ -356,7 +356,8 @@ class CameraControl(private val activity : AppCompatActivity, private val prefer clickKeyDownListeners[id] = listener return (listener) } - override fun setNeighborCameraControl(camera0: ICameraControl?, camera1: ICameraControl?, camera2: ICameraControl?, camera3: ICameraControl?) { } + override fun setNeighborCameraControl(index: Int, camera0: ICameraControl?, camera1: ICameraControl?, camera2: ICameraControl?, camera3: ICameraControl?) { } + override fun setNeighborCameraControlFinished() { } override fun getCameraStatus(): ICameraStatus { return (cameraXCameraStatusHolder) } companion object 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 2a7e0f4..4def635 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 @@ -159,7 +159,8 @@ class OmdsCameraControl(private val context: AppCompatActivity, private val vibr statusChecker.setIOpcFocusLockResult(focusControl.getFocusLockResult()) } - override fun setNeighborCameraControl(camera0: ICameraControl?, camera1: ICameraControl?, camera2: ICameraControl?, camera3: ICameraControl?) { } + override fun setNeighborCameraControl(index: Int, camera0: ICameraControl?, camera1: ICameraControl?, camera2: ICameraControl?, camera3: ICameraControl?) { } + override fun setNeighborCameraControlFinished() { } override fun getCameraStatus(): ICameraStatus { return (statusChecker) } override fun onClick(v: View?) diff --git a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/panasonic/wrapper/PanasonicCameraControl.kt b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/panasonic/wrapper/PanasonicCameraControl.kt index 7d5bcee..4f6c257 100644 --- a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/panasonic/wrapper/PanasonicCameraControl.kt +++ b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/panasonic/wrapper/PanasonicCameraControl.kt @@ -414,7 +414,8 @@ class PanasonicCameraControl(private val context: AppCompatActivity, private val return (false) } - override fun setNeighborCameraControl(camera0: ICameraControl?, camera1: ICameraControl?, camera2: ICameraControl?, camera3: ICameraControl?) { } + override fun setNeighborCameraControl(index: Int, camera0: ICameraControl?, camera1: ICameraControl?, camera2: ICameraControl?, camera3: ICameraControl?) { } + override fun setNeighborCameraControlFinished() { } override fun getCameraStatus(): ICameraStatus? { diff --git a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/pixpro/PixproCameraControl.kt b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/pixpro/PixproCameraControl.kt index e3642d4..f03a807 100644 --- a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/pixpro/PixproCameraControl.kt +++ b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/pixpro/PixproCameraControl.kt @@ -169,7 +169,8 @@ class PixproCameraControl(private val context: AppCompatActivity, private val vi movieControl = MovieShotControl(commandCommunicator, frameDisplayer, statusChecker) } - override fun setNeighborCameraControl(camera0: ICameraControl?, camera1: ICameraControl?, camera2: ICameraControl?, camera3: ICameraControl?) { } + override fun setNeighborCameraControl(index: Int, camera0: ICameraControl?, camera1: ICameraControl?, camera2: ICameraControl?, camera3: ICameraControl?) { } + override fun setNeighborCameraControlFinished() { } override fun getCameraStatus(): ICameraStatus { return (statusChecker) } override fun onClick(v: View?) 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 7ad49d9..9dbf1f4 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 @@ -330,7 +330,8 @@ class RicohPentaxCameraControl(private val context: AppCompatActivity, private v return (false) } - override fun setNeighborCameraControl(camera0: ICameraControl?, camera1: ICameraControl?, camera2: ICameraControl?, camera3: ICameraControl?) { } + override fun setNeighborCameraControl(index: Int, camera0: ICameraControl?, camera1: ICameraControl?, camera2: ICameraControl?, camera3: ICameraControl?) { } + override fun setNeighborCameraControlFinished() { } override fun getCameraStatus(): ICameraStatus { diff --git a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/sony/SonyCameraControl.kt b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/sony/SonyCameraControl.kt index 29bff89..dec536d 100644 --- a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/sony/SonyCameraControl.kt +++ b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/sony/SonyCameraControl.kt @@ -414,7 +414,8 @@ class SonyCameraControl(private val context: AppCompatActivity, private val vibr return (false) } - override fun setNeighborCameraControl(camera0: ICameraControl?, camera1: ICameraControl?, camera2: ICameraControl?, camera3: ICameraControl?) { } + override fun setNeighborCameraControl(index: Int, camera0: ICameraControl?, camera1: ICameraControl?, camera2: ICameraControl?, camera3: ICameraControl?) { } + override fun setNeighborCameraControlFinished() { } override fun getCameraStatus(): ICameraStatus { diff --git a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/theta/ThetaCameraControl.kt b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/theta/ThetaCameraControl.kt index 9a9cc4c..337d951 100644 --- a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/theta/ThetaCameraControl.kt +++ b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/theta/ThetaCameraControl.kt @@ -346,7 +346,8 @@ class ThetaCameraControl(private val context: AppCompatActivity, private val vib return (false) } - override fun setNeighborCameraControl(camera0: ICameraControl?, camera1: ICameraControl?, camera2: ICameraControl?, camera3: ICameraControl?) { } + override fun setNeighborCameraControl(index: Int, camera0: ICameraControl?, camera1: ICameraControl?, camera2: ICameraControl?, camera3: ICameraControl?) { } + override fun setNeighborCameraControlFinished() { } override fun getCameraStatus(): ICameraStatus { 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 a6c67b1..df5e597 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 @@ -88,10 +88,17 @@ class LiveImageViewFragment(private val contentLayoutId: Int = ID_LIVE_VIEW_LAYO this.isCameraControl3 = isCameraControl3 this.cameraControl3 = cameraControl3 - cameraControl0.setNeighborCameraControl(cameraControl0, cameraControl1, cameraControl2, cameraControl3) - cameraControl1.setNeighborCameraControl(cameraControl0, cameraControl1, cameraControl2, cameraControl3) - cameraControl2.setNeighborCameraControl(cameraControl0, cameraControl1, cameraControl2, cameraControl3) - cameraControl3.setNeighborCameraControl(cameraControl0, cameraControl1, cameraControl2, cameraControl3) + cameraControl0.setNeighborCameraControl(0, cameraControl0, cameraControl1, cameraControl2, cameraControl3) + cameraControl0.setNeighborCameraControlFinished() + + cameraControl1.setNeighborCameraControl(0, cameraControl0, cameraControl1, cameraControl2, cameraControl3) + cameraControl1.setNeighborCameraControlFinished() + + cameraControl2.setNeighborCameraControl(0, cameraControl0, cameraControl1, cameraControl2, cameraControl3) + cameraControl2.setNeighborCameraControlFinished() + + cameraControl3.setNeighborCameraControl(0, cameraControl0, cameraControl1, cameraControl2, cameraControl3) + cameraControl3.setNeighborCameraControlFinished() updateCameraLayout() } -- 2.11.0