From 3d7a5d47b136635d58faa25fb5faebb25e7af88f Mon Sep 17 00:00:00 2001 From: MRSa Date: Sat, 28 Aug 2021 15:10:24 +0900 Subject: [PATCH] =?utf8?q?namespace=E3=82=92=E5=B0=91=E3=81=97=E6=95=B4?= =?utf8?q?=E7=90=86=E3=80=82=20PIXPRO=20WPZ2=E7=94=A8=E5=88=B6=E5=BE=A1?= =?utf8?q?=E3=82=B3=E3=83=BC=E3=83=89=E3=81=AE=E3=83=9E=E3=83=BC=E3=82=B8?= =?utf8?q?=EF=BC=88=E5=8B=95=E4=BD=9C=E3=81=AF=E3=81=97=E3=81=AA=E3=81=84?= =?utf8?q?=E3=80=82=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- .idea/codeStyles/Project.xml | 16 - .idea/deploymentTargetDropDown.xml | 17 - .idea/dictionaries/MRSa.xml | 1 + .../camera/console/ConsolePanelControl.kt | 4 +- .../camera/example/ExamplePictureControl.kt | 4 +- .../camera/{ => preference}/CameraPreference.kt | 5 +- .../{ => preference}/CameraPreferenceKeySet.kt | 2 +- .../{ => preference}/ICameraPreferenceProvider.kt | 2 +- .../{ => preference}/ICameraPreferenceUpdater.kt | 2 +- .../operation/CameraClickKeyDownListener.kt | 2 +- .../camerax/operation/CameraControl.kt | 4 +- .../camerax/operation/CameraXCameraControl.kt | 3 +- .../camerax/operation/CameraXCameraStatusHolder.kt | 2 +- .../operation/CameraXCameraStatusListHolder.kt | 2 +- .../camerax/preview/PreviewFragment.kt | 2 +- .../{ => vendor}/panasonic/IPanasonicApiService.kt | 2 +- .../{ => vendor}/panasonic/IPanasonicCamera.kt | 2 +- .../panasonic/IPanasonicCameraHolder.kt | 2 +- .../connection/PanasonicCameraConnectSequence.kt | 6 +- .../connection/PanasonicCameraConnection.kt | 4 +- .../PanasonicCameraDisconnectSequence.kt | 2 +- .../panasonic/connection/PanasonicSsdpClient.kt | 7 +- .../panasonic/liveview/PanasonicLiveViewControl.kt | 7 +- .../panasonic/operation/CameraPowerOffPanasonic.kt | 2 +- .../operation/PanasonicCameraCaptureControl.kt | 6 +- .../operation/PanasonicCameraFocusControl.kt | 6 +- .../operation/PanasonicCameraZoomLensControl.kt | 4 +- .../takepicture/PanasonicAutoFocusControl.kt | 4 +- .../operation/takepicture/SingleShotControl.kt | 4 +- .../panasonic/status/CameraEventObserver.kt | 4 +- .../panasonic/status/CameraStatusConvert.kt | 4 +- .../panasonic/status/CameraStatusHolder.kt | 4 +- .../panasonic/status/CameraStatusListHolder.kt | 4 +- .../panasonic/status/ICameraEventObserver.kt | 2 +- .../panasonic/wrapper/PanasonicCameraControl.kt | 20 +- .../wrapper/PanasonicCameraDeviceProvider.kt | 6 +- .../panasonic/wrapper/PanasonicCardSlotSelector.kt | 2 +- .../vendor/pixpro/IPixproInternalInterfaces.kt | 13 + .../camera/vendor/pixpro/PixproCameraControl.kt | 77 +++ .../pixpro/operation/CameraPowerOffPixpro.kt | 60 ++ .../camera/vendor/pixpro/operation/FocusControl.kt | 128 ++++ .../vendor/pixpro/operation/SingleShotControl.kt | 55 ++ .../camera/vendor/pixpro/operation/ZoomControl.kt | 42 ++ .../camera/vendor/pixpro/wrapper/IPixproCamera.kt | 11 + .../camera/vendor/pixpro/wrapper/PixproCamera.kt | 78 +++ .../wrapper/command/IPixproCommandPublisher.kt | 12 + .../pixpro/wrapper/command/IPixproCommunication.kt | 7 + .../wrapper/command/PixproCommandCommunicator.kt | 767 +++++++++++++++++++++ .../command/messages/IPixproCommandCallback.kt | 6 + .../command/messages/base/IPixproCommand.kt | 31 + .../command/messages/base/IPixproMessages.kt | 30 + .../command/messages/base/PixproCommandBase.kt | 46 ++ .../messages/base/PixproCommandOnlyCallback.kt | 22 + .../messages/base/PixproCommandReceiveOnly.kt | 22 + .../messages/connection/PixproConnectSequence01.kt | 163 +++++ .../messages/connection/PixproConnectSequence02.kt | 259 +++++++ .../messages/connection/PixproConnectSequence03.kt | 90 +++ .../messages/connection/PixproConnectSequence04.kt | 90 +++ .../messages/connection/PixproConnectSequence05.kt | 342 +++++++++ .../messages/connection/PixproConnectSequence06.kt | 91 +++ .../messages/connection/PixproConnectSequence07.kt | 124 ++++ .../messages/connection/PixproConnectSequence08.kt | 163 +++++ .../messages/connection/PixproConnectSequence09.kt | 92 +++ .../messages/connection/PixproConnectSequence10.kt | 147 ++++ .../messages/connection/PixproConnectSequence11.kt | 92 +++ .../messages/specific/PixproExecuteFocus.kt | 143 ++++ .../messages/specific/PixproExecuteShutter.kt | 292 ++++++++ .../command/messages/specific/PixproExecuteZoom.kt | 125 ++++ .../command/messages/specific/PixproFlashAuto.kt | 147 ++++ .../command/messages/specific/PixproFlashOff.kt | 147 ++++ .../command/messages/specific/PixproFlashOn.kt | 147 ++++ .../connection/PixproCameraConnectSequence.kt | 276 ++++++++ .../connection/PixproCameraDisconnectSequence.kt | 24 + .../pixpro/wrapper/connection/PixproConnection.kt | 197 ++++++ .../wrapper/connection/PixproConnectionClient.kt | 313 +++++++++ .../wrapper/liveview/PixproLiveViewControl.kt | 121 ++++ .../pixpro/wrapper/status/PixproStatusChecker.kt | 82 +++ .../pixpro/wrapper/status/PixproStatusHolder.kt | 200 ++++++ .../ricohpentax/RicohPentaxCameraControl.kt | 20 +- .../ricohpentax/connection/IUseGR2CommandNotify.kt | 2 +- .../connection/RicohGr2CameraConnectSequence.kt | 2 +- .../connection/RicohGr2CameraDisconnectSequence.kt | 2 +- .../ricohpentax/connection/RicohGr2Connection.kt | 2 +- .../liveview/RicohGr2LiveViewControl.kt | 4 +- .../operation/IRicohGr2ButtonControl.kt | 2 +- .../ricohpentax/operation/IRicohGr2CameraStatus.kt | 2 +- .../operation/RicohGr2CameraButtonControl.kt | 4 +- .../operation/RicohGr2CameraCaptureControl.kt | 6 +- .../operation/RicohGr2CameraFocusControl.kt | 4 +- .../operation/RicohGr2CameraPowerOff.kt | 2 +- .../operation/RicohGr2CameraZoomLensControl.kt | 2 +- .../operation/RicohGr2HardwareStatus.kt | 2 +- .../takepicture/RicohGr2AutoFocusControl.kt | 2 +- .../takepicture/RicohGr2MovieShotControl.kt | 2 +- .../takepicture/RicohGr2SingleShotControl.kt | 2 +- .../ricohpentax/status/RicohGr2StatusChecker.kt | 2 +- .../ricohpentax/status/RicohGr2StatusHolder.kt | 2 +- .../ricohpentax/wrapper/RicohGr2RunMode.kt | 2 +- .../ricohpentax/wrapper/playback/CameraFileInfo.kt | 2 +- .../ricohpentax/wrapper/playback/ProgressEvent.kt | 2 +- .../wrapper/playback/RicohGr2PlaybackControl.kt | 2 +- .../camera/{ => vendor}/sony/SonyCameraControl.kt | 28 +- .../sony/liveview/SonyLiveViewControl.kt | 5 +- .../sony/operation/CameraPowerOffSony.kt | 2 +- .../sony/operation/SonyCameraCaptureControl.kt | 6 +- .../sony/operation/SonyCameraFocusControl.kt | 6 +- .../sony/operation/SonyCameraZoomLensControl.kt | 4 +- .../sony/operation/takepicture/AutoFocusControl.kt | 4 +- .../operation/takepicture/SingleShotControl.kt | 4 +- .../{ => vendor}/sony/wrapper/ISonyApiService.kt | 2 +- .../{ => vendor}/sony/wrapper/ISonyCamera.kt | 2 +- .../{ => vendor}/sony/wrapper/ISonyCameraApi.kt | 2 +- .../{ => vendor}/sony/wrapper/ISonyCameraHolder.kt | 2 +- .../{ => vendor}/sony/wrapper/SonyApiService.kt | 2 +- .../{ => vendor}/sony/wrapper/SonyCameraApi.kt | 2 +- .../sony/wrapper/SonyCameraDeviceProvider.kt | 2 +- .../connection/SonyCameraConnectSequence.kt | 6 +- .../wrapper/connection/SonyCameraConnection.kt | 4 +- .../connection/SonyCameraDisconnectSequence.kt | 2 +- .../sony/wrapper/connection/SonySsdpClient.kt | 6 +- .../eventlistener/ISonyCameraEventObserver.kt | 2 +- .../wrapper/eventlistener/ISonyStatusReceiver.kt | 2 +- .../sony/wrapper/eventlistener/ReplyJsonParser.kt | 2 +- .../eventlistener/SonyCameraEventObserver.kt | 4 +- .../sony/wrapper/eventlistener/SonyStatus.kt | 5 +- .../wrapper/eventlistener/SonyStatusCandidates.kt | 4 +- .../{ => vendor}/theta/ThetaCameraControl.kt | 20 +- .../theta/connection/ThetaCameraConnectSequence.kt | 4 +- .../theta/connection/ThetaCameraConnection.kt | 10 +- .../connection/ThetaCameraDisconnectSequence.kt | 2 +- .../theta/liveview/ThetaLiveViewControl.kt | 4 +- .../theta/operation/IOperationCallback.kt | 2 +- .../theta/operation/ThetaMovieRecordingControl.kt | 6 +- .../theta/operation/ThetaOptionGetControl.kt | 4 +- .../theta/operation/ThetaOptionSetControl.kt | 4 +- .../theta/operation/ThetaSingleShotControl.kt | 6 +- .../theta/status/ICaptureModeReceiver.kt | 2 +- .../theta/status/IThetaSessionIdNotifier.kt | 2 +- .../theta/status/IThetaSessionIdProvider.kt | 2 +- .../theta/status/IThetaStatusHolder.kt | 2 +- .../theta/status/ThetaCameraStatusListHolder.kt | 4 +- .../theta/status/ThetaCameraStatusWatcher.kt | 2 +- .../theta/status/ThetaSessionHolder.kt | 2 +- .../constants/ICameraConstantConvert.kt | 2 + .../jp/osdn/gokigen/mangle/scene/CameraProvider.kt | 16 +- .../jp/osdn/gokigen/mangle/scene/SceneChanger.kt | 2 +- app/src/main/res/values-ja/strings.xml | 2 + app/src/main/res/values/strings.xml | 2 + 148 files changed, 5488 insertions(+), 244 deletions(-) delete mode 100644 .idea/deploymentTargetDropDown.xml rename app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/{ => preference}/CameraPreference.kt (94%) rename app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/{ => preference}/CameraPreferenceKeySet.kt (88%) rename app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/{ => preference}/ICameraPreferenceProvider.kt (86%) rename app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/{ => preference}/ICameraPreferenceUpdater.kt (81%) rename app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/{ => vendor}/camerax/operation/CameraClickKeyDownListener.kt (96%) rename app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/{ => vendor}/camerax/operation/CameraControl.kt (98%) rename app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/{ => vendor}/camerax/operation/CameraXCameraControl.kt (98%) rename app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/{ => vendor}/camerax/operation/CameraXCameraStatusHolder.kt (99%) rename app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/{ => vendor}/camerax/operation/CameraXCameraStatusListHolder.kt (99%) rename app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/{ => vendor}/camerax/preview/PreviewFragment.kt (95%) rename app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/{ => vendor}/panasonic/IPanasonicApiService.kt (60%) rename app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/{ => vendor}/panasonic/IPanasonicCamera.kt (85%) rename app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/{ => vendor}/panasonic/IPanasonicCameraHolder.kt (80%) rename app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/{ => vendor}/panasonic/connection/PanasonicCameraConnectSequence.kt (93%) rename app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/{ => vendor}/panasonic/connection/PanasonicCameraConnection.kt (97%) rename app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/{ => vendor}/panasonic/connection/PanasonicCameraDisconnectSequence.kt (84%) rename app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/{ => vendor}/panasonic/connection/PanasonicSsdpClient.kt (97%) rename app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/{ => vendor}/panasonic/liveview/PanasonicLiveViewControl.kt (96%) rename app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/{ => vendor}/panasonic/operation/CameraPowerOffPanasonic.kt (96%) rename app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/{ => vendor}/panasonic/operation/PanasonicCameraCaptureControl.kt (79%) rename app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/{ => vendor}/panasonic/operation/PanasonicCameraFocusControl.kt (88%) rename app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/{ => vendor}/panasonic/operation/PanasonicCameraZoomLensControl.kt (94%) rename app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/{ => vendor}/panasonic/operation/takepicture/PanasonicAutoFocusControl.kt (97%) rename app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/{ => vendor}/panasonic/operation/takepicture/SingleShotControl.kt (90%) rename app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/{ => vendor}/panasonic/status/CameraEventObserver.kt (96%) rename app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/{ => vendor}/panasonic/status/CameraStatusConvert.kt (99%) rename app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/{ => vendor}/panasonic/status/CameraStatusHolder.kt (97%) rename app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/{ => vendor}/panasonic/status/CameraStatusListHolder.kt (99%) rename app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/{ => vendor}/panasonic/status/ICameraEventObserver.kt (54%) rename app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/{ => vendor}/panasonic/wrapper/PanasonicCameraControl.kt (93%) rename app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/{ => vendor}/panasonic/wrapper/PanasonicCameraDeviceProvider.kt (96%) rename app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/{ => vendor}/panasonic/wrapper/PanasonicCardSlotSelector.kt (95%) create mode 100644 app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/pixpro/IPixproInternalInterfaces.kt create mode 100644 app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/pixpro/PixproCameraControl.kt create mode 100644 app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/pixpro/operation/CameraPowerOffPixpro.kt create mode 100644 app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/pixpro/operation/FocusControl.kt create mode 100644 app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/pixpro/operation/SingleShotControl.kt create mode 100644 app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/pixpro/operation/ZoomControl.kt create mode 100644 app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/pixpro/wrapper/IPixproCamera.kt create mode 100644 app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/pixpro/wrapper/PixproCamera.kt create mode 100644 app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/pixpro/wrapper/command/IPixproCommandPublisher.kt create mode 100644 app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/pixpro/wrapper/command/IPixproCommunication.kt create mode 100644 app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/pixpro/wrapper/command/PixproCommandCommunicator.kt create mode 100644 app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/pixpro/wrapper/command/messages/IPixproCommandCallback.kt create mode 100644 app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/pixpro/wrapper/command/messages/base/IPixproCommand.kt create mode 100644 app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/pixpro/wrapper/command/messages/base/IPixproMessages.kt create mode 100644 app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/pixpro/wrapper/command/messages/base/PixproCommandBase.kt create mode 100644 app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/pixpro/wrapper/command/messages/base/PixproCommandOnlyCallback.kt create mode 100644 app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/pixpro/wrapper/command/messages/base/PixproCommandReceiveOnly.kt create mode 100644 app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/pixpro/wrapper/command/messages/connection/PixproConnectSequence01.kt create mode 100644 app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/pixpro/wrapper/command/messages/connection/PixproConnectSequence02.kt create mode 100644 app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/pixpro/wrapper/command/messages/connection/PixproConnectSequence03.kt create mode 100644 app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/pixpro/wrapper/command/messages/connection/PixproConnectSequence04.kt create mode 100644 app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/pixpro/wrapper/command/messages/connection/PixproConnectSequence05.kt create mode 100644 app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/pixpro/wrapper/command/messages/connection/PixproConnectSequence06.kt create mode 100644 app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/pixpro/wrapper/command/messages/connection/PixproConnectSequence07.kt create mode 100644 app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/pixpro/wrapper/command/messages/connection/PixproConnectSequence08.kt create mode 100644 app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/pixpro/wrapper/command/messages/connection/PixproConnectSequence09.kt create mode 100644 app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/pixpro/wrapper/command/messages/connection/PixproConnectSequence10.kt create mode 100644 app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/pixpro/wrapper/command/messages/connection/PixproConnectSequence11.kt create mode 100644 app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/pixpro/wrapper/command/messages/specific/PixproExecuteFocus.kt create mode 100644 app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/pixpro/wrapper/command/messages/specific/PixproExecuteShutter.kt create mode 100644 app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/pixpro/wrapper/command/messages/specific/PixproExecuteZoom.kt create mode 100644 app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/pixpro/wrapper/command/messages/specific/PixproFlashAuto.kt create mode 100644 app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/pixpro/wrapper/command/messages/specific/PixproFlashOff.kt create mode 100644 app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/pixpro/wrapper/command/messages/specific/PixproFlashOn.kt create mode 100644 app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/pixpro/wrapper/connection/PixproCameraConnectSequence.kt create mode 100644 app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/pixpro/wrapper/connection/PixproCameraDisconnectSequence.kt create mode 100644 app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/pixpro/wrapper/connection/PixproConnection.kt create mode 100644 app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/pixpro/wrapper/connection/PixproConnectionClient.kt create mode 100644 app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/pixpro/wrapper/liveview/PixproLiveViewControl.kt create mode 100644 app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/pixpro/wrapper/status/PixproStatusChecker.kt create mode 100644 app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/pixpro/wrapper/status/PixproStatusHolder.kt rename app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/{ => vendor}/ricohpentax/RicohPentaxCameraControl.kt (92%) rename app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/{ => vendor}/ricohpentax/connection/IUseGR2CommandNotify.kt (59%) rename app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/{ => vendor}/ricohpentax/connection/RicohGr2CameraConnectSequence.kt (98%) rename app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/{ => vendor}/ricohpentax/connection/RicohGr2CameraDisconnectSequence.kt (95%) rename app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/{ => vendor}/ricohpentax/connection/RicohGr2Connection.kt (99%) rename app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/{ => vendor}/ricohpentax/liveview/RicohGr2LiveViewControl.kt (97%) rename app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/{ => vendor}/ricohpentax/operation/IRicohGr2ButtonControl.kt (96%) rename app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/{ => vendor}/ricohpentax/operation/IRicohGr2CameraStatus.kt (93%) rename app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/{ => vendor}/ricohpentax/operation/RicohGr2CameraButtonControl.kt (93%) rename app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/{ => vendor}/ricohpentax/operation/RicohGr2CameraCaptureControl.kt (83%) rename app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/{ => vendor}/ricohpentax/operation/RicohGr2CameraFocusControl.kt (89%) rename app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/{ => vendor}/ricohpentax/operation/RicohGr2CameraPowerOff.kt (96%) rename app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/{ => vendor}/ricohpentax/operation/RicohGr2CameraZoomLensControl.kt (93%) rename app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/{ => vendor}/ricohpentax/operation/RicohGr2HardwareStatus.kt (89%) rename app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/{ => vendor}/ricohpentax/operation/takepicture/RicohGr2AutoFocusControl.kt (98%) rename app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/{ => vendor}/ricohpentax/operation/takepicture/RicohGr2MovieShotControl.kt (94%) rename app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/{ => vendor}/ricohpentax/operation/takepicture/RicohGr2SingleShotControl.kt (95%) rename app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/{ => vendor}/ricohpentax/status/RicohGr2StatusChecker.kt (98%) rename app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/{ => vendor}/ricohpentax/status/RicohGr2StatusHolder.kt (99%) rename app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/{ => vendor}/ricohpentax/wrapper/RicohGr2RunMode.kt (88%) rename app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/{ => vendor}/ricohpentax/wrapper/playback/CameraFileInfo.kt (97%) rename app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/{ => vendor}/ricohpentax/wrapper/playback/ProgressEvent.kt (85%) rename app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/{ => vendor}/ricohpentax/wrapper/playback/RicohGr2PlaybackControl.kt (99%) rename app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/{ => vendor}/sony/SonyCameraControl.kt (91%) rename app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/{ => vendor}/sony/liveview/SonyLiveViewControl.kt (96%) rename app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/{ => vendor}/sony/operation/CameraPowerOffSony.kt (96%) rename app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/{ => vendor}/sony/operation/SonyCameraCaptureControl.kt (79%) rename app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/{ => vendor}/sony/operation/SonyCameraFocusControl.kt (89%) rename app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/{ => vendor}/sony/operation/SonyCameraZoomLensControl.kt (94%) rename app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/{ => vendor}/sony/operation/takepicture/AutoFocusControl.kt (97%) rename app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/{ => vendor}/sony/operation/takepicture/SingleShotControl.kt (91%) rename app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/{ => vendor}/sony/wrapper/ISonyApiService.kt (58%) rename app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/{ => vendor}/sony/wrapper/ISonyCamera.kt (77%) rename app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/{ => vendor}/sony/wrapper/ISonyCameraApi.kt (97%) rename app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/{ => vendor}/sony/wrapper/ISonyCameraHolder.kt (68%) rename app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/{ => vendor}/sony/wrapper/SonyApiService.kt (79%) rename app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/{ => vendor}/sony/wrapper/SonyCameraApi.kt (99%) rename app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/{ => vendor}/sony/wrapper/SonyCameraDeviceProvider.kt (95%) rename app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/{ => vendor}/sony/wrapper/connection/SonyCameraConnectSequence.kt (93%) rename app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/{ => vendor}/sony/wrapper/connection/SonyCameraConnection.kt (97%) rename app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/{ => vendor}/sony/wrapper/connection/SonyCameraDisconnectSequence.kt (83%) rename app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/{ => vendor}/sony/wrapper/connection/SonySsdpClient.kt (97%) rename app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/{ => vendor}/sony/wrapper/eventlistener/ISonyCameraEventObserver.kt (83%) rename app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/{ => vendor}/sony/wrapper/eventlistener/ISonyStatusReceiver.kt (56%) rename app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/{ => vendor}/sony/wrapper/eventlistener/ReplyJsonParser.kt (99%) rename app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/{ => vendor}/sony/wrapper/eventlistener/SonyCameraEventObserver.kt (97%) rename app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/{ => vendor}/sony/wrapper/eventlistener/SonyStatus.kt (98%) rename app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/{ => vendor}/sony/wrapper/eventlistener/SonyStatusCandidates.kt (98%) rename app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/{ => vendor}/theta/ThetaCameraControl.kt (92%) rename app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/{ => vendor}/theta/connection/ThetaCameraConnectSequence.kt (98%) rename app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/{ => vendor}/theta/connection/ThetaCameraConnection.kt (96%) rename app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/{ => vendor}/theta/connection/ThetaCameraDisconnectSequence.kt (79%) rename app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/{ => vendor}/theta/liveview/ThetaLiveViewControl.kt (96%) rename app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/{ => vendor}/theta/operation/IOperationCallback.kt (57%) rename app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/{ => vendor}/theta/operation/ThetaMovieRecordingControl.kt (95%) rename app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/{ => vendor}/theta/operation/ThetaOptionGetControl.kt (93%) rename app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/{ => vendor}/theta/operation/ThetaOptionSetControl.kt (93%) rename app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/{ => vendor}/theta/operation/ThetaSingleShotControl.kt (95%) rename app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/{ => vendor}/theta/status/ICaptureModeReceiver.kt (56%) rename app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/{ => vendor}/theta/status/IThetaSessionIdNotifier.kt (56%) rename app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/{ => vendor}/theta/status/IThetaSessionIdProvider.kt (50%) rename app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/{ => vendor}/theta/status/IThetaStatusHolder.kt (64%) rename app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/{ => vendor}/theta/status/ThetaCameraStatusListHolder.kt (98%) rename app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/{ => vendor}/theta/status/ThetaCameraStatusWatcher.kt (99%) rename app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/{ => vendor}/theta/status/ThetaSessionHolder.kt (89%) diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml index 3cc336b..88ea3aa 100644 --- a/.idea/codeStyles/Project.xml +++ b/.idea/codeStyles/Project.xml @@ -1,22 +1,6 @@ - - diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml deleted file mode 100644 index 6a7b0e7..0000000 --- a/.idea/deploymentTargetDropDown.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/dictionaries/MRSa.xml b/.idea/dictionaries/MRSa.xml index 3e9f4b7..fa7658b 100644 --- a/.idea/dictionaries/MRSa.xml +++ b/.idea/dictionaries/MRSa.xml @@ -7,6 +7,7 @@ liveview mpget mpset + pixpro ricoh 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 f9056c6..fffc908 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 @@ -13,7 +13,7 @@ import android.view.View import androidx.appcompat.app.AppCompatActivity import androidx.core.view.GestureDetectorCompat import androidx.core.view.ScaleGestureDetectorCompat -import jp.osdn.gokigen.gokigenassets.camera.ICameraPreferenceProvider +import jp.osdn.gokigen.gokigenassets.camera.preference.ICameraPreferenceProvider import jp.osdn.gokigen.gokigenassets.camera.interfaces.* import jp.osdn.gokigen.gokigenassets.camera.interfaces.ICameraStatus.Companion.AE import jp.osdn.gokigen.gokigenassets.camera.interfaces.ICameraStatus.Companion.APERTURE @@ -27,7 +27,7 @@ import jp.osdn.gokigen.gokigenassets.camera.interfaces.ICameraStatus.Companion.S import jp.osdn.gokigen.gokigenassets.camera.interfaces.ICameraStatus.Companion.TAKE_MODE import jp.osdn.gokigen.gokigenassets.camera.interfaces.ICameraStatus.Companion.TORCH_MODE import jp.osdn.gokigen.gokigenassets.camera.interfaces.ICameraStatus.Companion.WHITE_BALANCE -import jp.osdn.gokigen.gokigenassets.camera.theta.status.ICaptureModeReceiver +import jp.osdn.gokigen.gokigenassets.camera.vendor.theta.status.ICaptureModeReceiver import jp.osdn.gokigen.gokigenassets.constants.IApplicationConstantConvert.Companion.ID_PREFERENCE_ARRAY_CAMERA_METHOD import jp.osdn.gokigen.gokigenassets.constants.IApplicationConstantConvert.Companion.ID_PREFERENCE_ARRAY_CAMERA_METHOD_VALUE import jp.osdn.gokigen.gokigenassets.constants.ICameraConnectionMethods.Companion.PREFERENCE_CAMERA_METHOD_CAMERAX 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 6980d5e..1595096 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 @@ -12,9 +12,9 @@ import androidx.activity.result.ActivityResultLauncher import androidx.activity.result.contract.ActivityResultContracts.StartActivityForResult import androidx.appcompat.app.AppCompatActivity import androidx.exifinterface.media.ExifInterface -import jp.osdn.gokigen.gokigenassets.camera.ICameraPreferenceProvider +import jp.osdn.gokigen.gokigenassets.camera.preference.ICameraPreferenceProvider import jp.osdn.gokigen.gokigenassets.camera.interfaces.* -import jp.osdn.gokigen.gokigenassets.camera.theta.status.ICaptureModeReceiver +import jp.osdn.gokigen.gokigenassets.camera.vendor.theta.status.ICaptureModeReceiver import jp.osdn.gokigen.gokigenassets.liveview.ICachePositionProvider import jp.osdn.gokigen.gokigenassets.liveview.IIndicatorControl import jp.osdn.gokigen.gokigenassets.liveview.ILiveView diff --git a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/CameraPreference.kt b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/preference/CameraPreference.kt similarity index 94% rename from app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/CameraPreference.kt rename to app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/preference/CameraPreference.kt index bd54e43..b82d05e 100644 --- a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/CameraPreference.kt +++ b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/preference/CameraPreference.kt @@ -1,8 +1,9 @@ -package jp.osdn.gokigen.gokigenassets.camera +package jp.osdn.gokigen.gokigenassets.camera.preference import jp.osdn.gokigen.gokigenassets.preference.PreferenceAccessWrapper -class CameraPreference(private val id : Int, private val wrapper : PreferenceAccessWrapper, method0 : String, private val isReadonly : Boolean = false, sequence0 : String = "0", option1_ : String = "", option2_ : String = "", option3_ : String = "", option4_ : String = "", option5_ : String = "", private val keySet : CameraPreferenceKeySet? = null) : ICameraPreferenceProvider, ICameraPreferenceUpdater +class CameraPreference(private val id : Int, private val wrapper : PreferenceAccessWrapper, method0 : String, private val isReadonly : Boolean = false, sequence0 : String = "0", option1_ : String = "", option2_ : String = "", option3_ : String = "", option4_ : String = "", option5_ : String = "", private val keySet : CameraPreferenceKeySet? = null) : ICameraPreferenceProvider, + ICameraPreferenceUpdater { private var method = method0 private var sequence = sequence0 diff --git a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/CameraPreferenceKeySet.kt b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/preference/CameraPreferenceKeySet.kt similarity index 88% rename from app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/CameraPreferenceKeySet.kt rename to app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/preference/CameraPreferenceKeySet.kt index 076efce..8af4974 100644 --- a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/CameraPreferenceKeySet.kt +++ b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/preference/CameraPreferenceKeySet.kt @@ -1,4 +1,4 @@ -package jp.osdn.gokigen.gokigenassets.camera +package jp.osdn.gokigen.gokigenassets.camera.preference class CameraPreferenceKeySet(private val key1 : String, private val key2 : String, private val key3 : String, private val key4 : String, private val key5 : String) { diff --git a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/ICameraPreferenceProvider.kt b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/preference/ICameraPreferenceProvider.kt similarity index 86% rename from app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/ICameraPreferenceProvider.kt rename to app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/preference/ICameraPreferenceProvider.kt index 85c8944..61cd8e2 100644 --- a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/ICameraPreferenceProvider.kt +++ b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/preference/ICameraPreferenceProvider.kt @@ -1,4 +1,4 @@ -package jp.osdn.gokigen.gokigenassets.camera +package jp.osdn.gokigen.gokigenassets.camera.preference interface ICameraPreferenceProvider { diff --git a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/ICameraPreferenceUpdater.kt b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/preference/ICameraPreferenceUpdater.kt similarity index 81% rename from app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/ICameraPreferenceUpdater.kt rename to app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/preference/ICameraPreferenceUpdater.kt index 3ca99ee..35eb8ba 100644 --- a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/ICameraPreferenceUpdater.kt +++ b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/preference/ICameraPreferenceUpdater.kt @@ -1,4 +1,4 @@ -package jp.osdn.gokigen.gokigenassets.camera +package jp.osdn.gokigen.gokigenassets.camera.preference interface ICameraPreferenceUpdater { diff --git a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/camerax/operation/CameraClickKeyDownListener.kt b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/camerax/operation/CameraClickKeyDownListener.kt similarity index 96% rename from app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/camerax/operation/CameraClickKeyDownListener.kt rename to app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/camerax/operation/CameraClickKeyDownListener.kt index 8da7544..7ba46df 100644 --- a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/camerax/operation/CameraClickKeyDownListener.kt +++ b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/camerax/operation/CameraClickKeyDownListener.kt @@ -1,4 +1,4 @@ -package jp.osdn.gokigen.gokigenassets.camera.camerax.operation +package jp.osdn.gokigen.gokigenassets.camera.vendor.camerax.operation import android.util.Log import android.view.KeyEvent diff --git a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/camerax/operation/CameraControl.kt b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/camerax/operation/CameraControl.kt similarity index 98% rename from app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/camerax/operation/CameraControl.kt rename to app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/camerax/operation/CameraControl.kt index a0ac586..1393b8b 100644 --- a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/camerax/operation/CameraControl.kt +++ b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/camerax/operation/CameraControl.kt @@ -1,4 +1,4 @@ -package jp.osdn.gokigen.gokigenassets.camera.camerax.operation +package jp.osdn.gokigen.gokigenassets.camera.vendor.camerax.operation import android.annotation.SuppressLint import android.hardware.camera2.CameraMetadata @@ -16,7 +16,7 @@ import androidx.camera.core.ImageAnalysis import androidx.camera.core.Preview import androidx.camera.lifecycle.ProcessCameraProvider import androidx.core.content.ContextCompat -import jp.osdn.gokigen.gokigenassets.camera.ICameraPreferenceProvider +import jp.osdn.gokigen.gokigenassets.camera.preference.ICameraPreferenceProvider import jp.osdn.gokigen.gokigenassets.camera.interfaces.* import jp.osdn.gokigen.gokigenassets.constants.IApplicationConstantConvert.Companion.ID_CAMERA_X_PREVIEW_LAYOUT import jp.osdn.gokigen.gokigenassets.liveview.ILiveView diff --git a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/camerax/operation/CameraXCameraControl.kt b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/camerax/operation/CameraXCameraControl.kt similarity index 98% rename from app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/camerax/operation/CameraXCameraControl.kt rename to app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/camerax/operation/CameraXCameraControl.kt index 4dca4f1..ea8e670 100644 --- a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/camerax/operation/CameraXCameraControl.kt +++ b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/camerax/operation/CameraXCameraControl.kt @@ -1,4 +1,4 @@ -package jp.osdn.gokigen.gokigenassets.camera.camerax.operation +package jp.osdn.gokigen.gokigenassets.camera.vendor.camerax.operation import android.annotation.SuppressLint import android.graphics.PointF @@ -15,7 +15,6 @@ import jp.osdn.gokigen.gokigenassets.camera.interfaces.IFocusingControl import jp.osdn.gokigen.gokigenassets.camera.interfaces.IFocusingModeNotify import jp.osdn.gokigen.gokigenassets.liveview.IIndicatorControl import jp.osdn.gokigen.gokigenassets.liveview.focusframe.IAutoFocusFrameDisplay -import kotlin.math.exp class CameraXCameraControl : IFocusingControl, IDisplayInjector { diff --git a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/camerax/operation/CameraXCameraStatusHolder.kt b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/camerax/operation/CameraXCameraStatusHolder.kt similarity index 99% rename from app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/camerax/operation/CameraXCameraStatusHolder.kt rename to app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/camerax/operation/CameraXCameraStatusHolder.kt index 28d484b..c7a979a 100644 --- a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/camerax/operation/CameraXCameraStatusHolder.kt +++ b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/camerax/operation/CameraXCameraStatusHolder.kt @@ -1,4 +1,4 @@ -package jp.osdn.gokigen.gokigenassets.camera.camerax.operation +package jp.osdn.gokigen.gokigenassets.camera.vendor.camerax.operation import android.annotation.SuppressLint import android.graphics.Color diff --git a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/camerax/operation/CameraXCameraStatusListHolder.kt b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/camerax/operation/CameraXCameraStatusListHolder.kt similarity index 99% rename from app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/camerax/operation/CameraXCameraStatusListHolder.kt rename to app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/camerax/operation/CameraXCameraStatusListHolder.kt index a81a89b..4db25b0 100644 --- a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/camerax/operation/CameraXCameraStatusListHolder.kt +++ b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/camerax/operation/CameraXCameraStatusListHolder.kt @@ -1,4 +1,4 @@ -package jp.osdn.gokigen.gokigenassets.camera.camerax.operation +package jp.osdn.gokigen.gokigenassets.camera.vendor.camerax.operation import android.annotation.SuppressLint import android.hardware.camera2.CameraCharacteristics diff --git a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/camerax/preview/PreviewFragment.kt b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/camerax/preview/PreviewFragment.kt similarity index 95% rename from app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/camerax/preview/PreviewFragment.kt rename to app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/camerax/preview/PreviewFragment.kt index bc2e862..77cdc9a 100644 --- a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/camerax/preview/PreviewFragment.kt +++ b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/camerax/preview/PreviewFragment.kt @@ -1,4 +1,4 @@ -package jp.osdn.gokigen.gokigenassets.camera.camerax.preview +package jp.osdn.gokigen.gokigenassets.camera.vendor.camerax.preview import android.os.Bundle import android.view.LayoutInflater diff --git a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/panasonic/IPanasonicApiService.kt b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/panasonic/IPanasonicApiService.kt similarity index 60% rename from app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/panasonic/IPanasonicApiService.kt rename to app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/panasonic/IPanasonicApiService.kt index 1def531..ec9558c 100644 --- a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/panasonic/IPanasonicApiService.kt +++ b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/panasonic/IPanasonicApiService.kt @@ -1,4 +1,4 @@ -package jp.osdn.gokigen.gokigenassets.camera.panasonic +package jp.osdn.gokigen.gokigenassets.camera.vendor.panasonic interface IPanasonicApiService { diff --git a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/panasonic/IPanasonicCamera.kt b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/panasonic/IPanasonicCamera.kt similarity index 85% rename from app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/panasonic/IPanasonicCamera.kt rename to app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/panasonic/IPanasonicCamera.kt index d366ea4..e174817 100644 --- a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/panasonic/IPanasonicCamera.kt +++ b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/panasonic/IPanasonicCamera.kt @@ -1,4 +1,4 @@ -package jp.osdn.gokigen.gokigenassets.camera.panasonic +package jp.osdn.gokigen.gokigenassets.camera.vendor.panasonic interface IPanasonicCamera { diff --git a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/panasonic/IPanasonicCameraHolder.kt b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/panasonic/IPanasonicCameraHolder.kt similarity index 80% rename from app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/panasonic/IPanasonicCameraHolder.kt rename to app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/panasonic/IPanasonicCameraHolder.kt index e610664..1169761 100644 --- a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/panasonic/IPanasonicCameraHolder.kt +++ b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/panasonic/IPanasonicCameraHolder.kt @@ -1,4 +1,4 @@ -package jp.osdn.gokigen.gokigenassets.camera.panasonic +package jp.osdn.gokigen.gokigenassets.camera.vendor.panasonic import jp.osdn.gokigen.gokigenassets.camera.interfaces.ICameraChangeListener diff --git a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/panasonic/connection/PanasonicCameraConnectSequence.kt b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/panasonic/connection/PanasonicCameraConnectSequence.kt similarity index 93% rename from app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/panasonic/connection/PanasonicCameraConnectSequence.kt rename to app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/panasonic/connection/PanasonicCameraConnectSequence.kt index 2a8360b..7afc732 100644 --- a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/panasonic/connection/PanasonicCameraConnectSequence.kt +++ b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/panasonic/connection/PanasonicCameraConnectSequence.kt @@ -1,4 +1,4 @@ -package jp.osdn.gokigen.gokigenassets.camera.panasonic.connection +package jp.osdn.gokigen.gokigenassets.camera.vendor.panasonic.connection import android.util.Log import androidx.appcompat.app.AppCompatActivity @@ -6,8 +6,8 @@ import jp.osdn.gokigen.gokigenassets.camera.interfaces.ICameraConnection import jp.osdn.gokigen.gokigenassets.camera.interfaces.ICameraConnectionStatus import jp.osdn.gokigen.gokigenassets.camera.interfaces.ICameraStatusReceiver import jp.osdn.gokigen.gokigenassets.camera.interfaces.ICameraChangeListener -import jp.osdn.gokigen.gokigenassets.camera.panasonic.IPanasonicCamera -import jp.osdn.gokigen.gokigenassets.camera.panasonic.IPanasonicCameraHolder +import jp.osdn.gokigen.gokigenassets.camera.vendor.panasonic.IPanasonicCamera +import jp.osdn.gokigen.gokigenassets.camera.vendor.panasonic.IPanasonicCameraHolder import jp.osdn.gokigen.gokigenassets.constants.ICameraConstantConvert import jp.osdn.gokigen.gokigenassets.constants.ICameraConstantConvert.Companion.ID_STRING_CONNECT_CAMERA_DETECTED import jp.osdn.gokigen.gokigenassets.constants.ICameraConstantConvert.Companion.ID_STRING_CONNECT_START diff --git a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/panasonic/connection/PanasonicCameraConnection.kt b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/panasonic/connection/PanasonicCameraConnection.kt similarity index 97% rename from app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/panasonic/connection/PanasonicCameraConnection.kt rename to app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/panasonic/connection/PanasonicCameraConnection.kt index 593387e..73722ab 100644 --- a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/panasonic/connection/PanasonicCameraConnection.kt +++ b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/panasonic/connection/PanasonicCameraConnection.kt @@ -1,4 +1,4 @@ -package jp.osdn.gokigen.gokigenassets.camera.panasonic.connection +package jp.osdn.gokigen.gokigenassets.camera.vendor.panasonic.connection import android.content.* import android.net.ConnectivityManager @@ -12,7 +12,7 @@ import jp.osdn.gokigen.gokigenassets.camera.interfaces.ICameraConnectionStatus.C import jp.osdn.gokigen.gokigenassets.camera.interfaces.ICameraStatusReceiver import jp.osdn.gokigen.gokigenassets.camera.interfaces.ILiveViewController import jp.osdn.gokigen.gokigenassets.camera.interfaces.ICameraChangeListener -import jp.osdn.gokigen.gokigenassets.camera.panasonic.IPanasonicCameraHolder +import jp.osdn.gokigen.gokigenassets.camera.vendor.panasonic.IPanasonicCameraHolder import jp.osdn.gokigen.gokigenassets.constants.ICameraConstantConvert import java.util.concurrent.Executor import java.util.concurrent.Executors diff --git a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/panasonic/connection/PanasonicCameraDisconnectSequence.kt b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/panasonic/connection/PanasonicCameraDisconnectSequence.kt similarity index 84% rename from app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/panasonic/connection/PanasonicCameraDisconnectSequence.kt rename to app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/panasonic/connection/PanasonicCameraDisconnectSequence.kt index 49d40ee..558da62 100644 --- a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/panasonic/connection/PanasonicCameraDisconnectSequence.kt +++ b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/panasonic/connection/PanasonicCameraDisconnectSequence.kt @@ -1,4 +1,4 @@ -package jp.osdn.gokigen.gokigenassets.camera.panasonic.connection +package jp.osdn.gokigen.gokigenassets.camera.vendor.panasonic.connection import android.util.Log import androidx.appcompat.app.AppCompatActivity diff --git a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/panasonic/connection/PanasonicSsdpClient.kt b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/panasonic/connection/PanasonicSsdpClient.kt similarity index 97% rename from app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/panasonic/connection/PanasonicSsdpClient.kt rename to app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/panasonic/connection/PanasonicSsdpClient.kt index 4326cff..dcc2f14 100644 --- a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/panasonic/connection/PanasonicSsdpClient.kt +++ b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/panasonic/connection/PanasonicSsdpClient.kt @@ -1,10 +1,10 @@ -package jp.osdn.gokigen.gokigenassets.camera.panasonic.connection +package jp.osdn.gokigen.gokigenassets.camera.vendor.panasonic.connection import android.content.Context import android.util.Log import jp.osdn.gokigen.gokigenassets.camera.interfaces.ICameraStatusReceiver -import jp.osdn.gokigen.gokigenassets.camera.panasonic.IPanasonicCamera -import jp.osdn.gokigen.gokigenassets.camera.panasonic.wrapper.PanasonicCameraDeviceProvider +import jp.osdn.gokigen.gokigenassets.camera.vendor.panasonic.IPanasonicCamera +import jp.osdn.gokigen.gokigenassets.camera.vendor.panasonic.wrapper.PanasonicCameraDeviceProvider import jp.osdn.gokigen.gokigenassets.constants.ICameraConstantConvert.Companion.ID_STRING_CAMERA_NOT_FOUND import jp.osdn.gokigen.gokigenassets.constants.ICameraConstantConvert.Companion.ID_STRING_CONNECT_CAMERA_FOUND import jp.osdn.gokigen.gokigenassets.constants.ICameraConstantConvert.Companion.ID_STRING_CONNECT_CAMERA_RECEIVED_REPLY @@ -17,7 +17,6 @@ import java.net.DatagramPacket import java.net.DatagramSocket import java.net.InetSocketAddress import java.nio.charset.Charset -import java.util.* import kotlin.collections.ArrayList diff --git a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/panasonic/liveview/PanasonicLiveViewControl.kt b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/panasonic/liveview/PanasonicLiveViewControl.kt similarity index 96% rename from app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/panasonic/liveview/PanasonicLiveViewControl.kt rename to app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/panasonic/liveview/PanasonicLiveViewControl.kt index e31e391..635896e 100644 --- a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/panasonic/liveview/PanasonicLiveViewControl.kt +++ b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/panasonic/liveview/PanasonicLiveViewControl.kt @@ -1,11 +1,10 @@ -package jp.osdn.gokigen.gokigenassets.camera.panasonic.liveview +package jp.osdn.gokigen.gokigenassets.camera.vendor.panasonic.liveview import android.util.Log -import jp.osdn.gokigen.gokigenassets.camera.panasonic.IPanasonicCamera -import jp.osdn.gokigen.gokigenassets.camera.panasonic.status.ICameraEventObserver +import jp.osdn.gokigen.gokigenassets.camera.vendor.panasonic.IPanasonicCamera +import jp.osdn.gokigen.gokigenassets.camera.vendor.panasonic.status.ICameraEventObserver import jp.osdn.gokigen.gokigenassets.liveview.image.CameraLiveViewListenerImpl import jp.osdn.gokigen.gokigenassets.utils.communication.SimpleHttpClient -import jp.osdn.gokigen.gokigenassets.utils.communication.SimpleLogDumper import java.net.DatagramPacket import java.net.DatagramSocket import java.util.* diff --git a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/panasonic/operation/CameraPowerOffPanasonic.kt b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/panasonic/operation/CameraPowerOffPanasonic.kt similarity index 96% rename from app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/panasonic/operation/CameraPowerOffPanasonic.kt rename to app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/panasonic/operation/CameraPowerOffPanasonic.kt index 4d7e939..b86804a 100644 --- a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/panasonic/operation/CameraPowerOffPanasonic.kt +++ b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/panasonic/operation/CameraPowerOffPanasonic.kt @@ -1,4 +1,4 @@ -package jp.osdn.gokigen.gokigenassets.camera.panasonic.operation +package jp.osdn.gokigen.gokigenassets.camera.vendor.panasonic.operation import android.content.Context import androidx.preference.Preference diff --git a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/panasonic/operation/PanasonicCameraCaptureControl.kt b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/panasonic/operation/PanasonicCameraCaptureControl.kt similarity index 79% rename from app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/panasonic/operation/PanasonicCameraCaptureControl.kt rename to app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/panasonic/operation/PanasonicCameraCaptureControl.kt index b545c7e..b659cff 100644 --- a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/panasonic/operation/PanasonicCameraCaptureControl.kt +++ b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/panasonic/operation/PanasonicCameraCaptureControl.kt @@ -1,9 +1,9 @@ -package jp.osdn.gokigen.gokigenassets.camera.panasonic.operation +package jp.osdn.gokigen.gokigenassets.camera.vendor.panasonic.operation import android.util.Log import jp.osdn.gokigen.gokigenassets.camera.interfaces.ICaptureControl -import jp.osdn.gokigen.gokigenassets.camera.panasonic.IPanasonicCamera -import jp.osdn.gokigen.gokigenassets.camera.panasonic.operation.takepicture.SingleShotControl +import jp.osdn.gokigen.gokigenassets.camera.vendor.panasonic.IPanasonicCamera +import jp.osdn.gokigen.gokigenassets.camera.vendor.panasonic.operation.takepicture.SingleShotControl import jp.osdn.gokigen.gokigenassets.liveview.IIndicatorControl import jp.osdn.gokigen.gokigenassets.liveview.focusframe.IAutoFocusFrameDisplay diff --git a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/panasonic/operation/PanasonicCameraFocusControl.kt b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/panasonic/operation/PanasonicCameraFocusControl.kt similarity index 88% rename from app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/panasonic/operation/PanasonicCameraFocusControl.kt rename to app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/panasonic/operation/PanasonicCameraFocusControl.kt index cb4baec..c192f64 100644 --- a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/panasonic/operation/PanasonicCameraFocusControl.kt +++ b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/panasonic/operation/PanasonicCameraFocusControl.kt @@ -1,10 +1,10 @@ -package jp.osdn.gokigen.gokigenassets.camera.panasonic.operation +package jp.osdn.gokigen.gokigenassets.camera.vendor.panasonic.operation import android.util.Log import android.view.MotionEvent import jp.osdn.gokigen.gokigenassets.camera.interfaces.IFocusingControl -import jp.osdn.gokigen.gokigenassets.camera.panasonic.IPanasonicCamera -import jp.osdn.gokigen.gokigenassets.camera.panasonic.operation.takepicture.PanasonicAutoFocusControl +import jp.osdn.gokigen.gokigenassets.camera.vendor.panasonic.IPanasonicCamera +import jp.osdn.gokigen.gokigenassets.camera.vendor.panasonic.operation.takepicture.PanasonicAutoFocusControl import jp.osdn.gokigen.gokigenassets.liveview.IIndicatorControl import jp.osdn.gokigen.gokigenassets.liveview.focusframe.IAutoFocusFrameDisplay diff --git a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/panasonic/operation/PanasonicCameraZoomLensControl.kt b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/panasonic/operation/PanasonicCameraZoomLensControl.kt similarity index 94% rename from app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/panasonic/operation/PanasonicCameraZoomLensControl.kt rename to app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/panasonic/operation/PanasonicCameraZoomLensControl.kt index 7c8b9fc..5d07b34 100644 --- a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/panasonic/operation/PanasonicCameraZoomLensControl.kt +++ b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/panasonic/operation/PanasonicCameraZoomLensControl.kt @@ -1,8 +1,8 @@ -package jp.osdn.gokigen.gokigenassets.camera.panasonic.operation +package jp.osdn.gokigen.gokigenassets.camera.vendor.panasonic.operation import android.util.Log import jp.osdn.gokigen.gokigenassets.camera.interfaces.IZoomLensControl -import jp.osdn.gokigen.gokigenassets.camera.panasonic.IPanasonicCamera +import jp.osdn.gokigen.gokigenassets.camera.vendor.panasonic.IPanasonicCamera import jp.osdn.gokigen.gokigenassets.utils.communication.SimpleHttpClient class PanasonicCameraZoomLensControl : IZoomLensControl diff --git a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/panasonic/operation/takepicture/PanasonicAutoFocusControl.kt b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/panasonic/operation/takepicture/PanasonicAutoFocusControl.kt similarity index 97% rename from app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/panasonic/operation/takepicture/PanasonicAutoFocusControl.kt rename to app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/panasonic/operation/takepicture/PanasonicAutoFocusControl.kt index 4b4f501..94fa94b 100644 --- a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/panasonic/operation/takepicture/PanasonicAutoFocusControl.kt +++ b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/panasonic/operation/takepicture/PanasonicAutoFocusControl.kt @@ -1,9 +1,9 @@ -package jp.osdn.gokigen.gokigenassets.camera.panasonic.operation.takepicture +package jp.osdn.gokigen.gokigenassets.camera.vendor.panasonic.operation.takepicture import android.graphics.PointF import android.graphics.RectF import android.util.Log -import jp.osdn.gokigen.gokigenassets.camera.panasonic.IPanasonicCamera +import jp.osdn.gokigen.gokigenassets.camera.vendor.panasonic.IPanasonicCamera import jp.osdn.gokigen.gokigenassets.liveview.IIndicatorControl import jp.osdn.gokigen.gokigenassets.liveview.focusframe.IAutoFocusFrameDisplay import jp.osdn.gokigen.gokigenassets.liveview.focusframe.IAutoFocusFrameDisplay.FocusFrameStatus diff --git a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/panasonic/operation/takepicture/SingleShotControl.kt b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/panasonic/operation/takepicture/SingleShotControl.kt similarity index 90% rename from app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/panasonic/operation/takepicture/SingleShotControl.kt rename to app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/panasonic/operation/takepicture/SingleShotControl.kt index ee415cf..c6a7772 100644 --- a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/panasonic/operation/takepicture/SingleShotControl.kt +++ b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/panasonic/operation/takepicture/SingleShotControl.kt @@ -1,7 +1,7 @@ -package jp.osdn.gokigen.gokigenassets.camera.panasonic.operation.takepicture +package jp.osdn.gokigen.gokigenassets.camera.vendor.panasonic.operation.takepicture import android.util.Log -import jp.osdn.gokigen.gokigenassets.camera.panasonic.IPanasonicCamera +import jp.osdn.gokigen.gokigenassets.camera.vendor.panasonic.IPanasonicCamera import jp.osdn.gokigen.gokigenassets.liveview.focusframe.IAutoFocusFrameDisplay import jp.osdn.gokigen.gokigenassets.utils.communication.SimpleHttpClient diff --git a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/panasonic/status/CameraEventObserver.kt b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/panasonic/status/CameraEventObserver.kt similarity index 96% rename from app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/panasonic/status/CameraEventObserver.kt rename to app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/panasonic/status/CameraEventObserver.kt index abbd140..b9bff9e 100644 --- a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/panasonic/status/CameraEventObserver.kt +++ b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/panasonic/status/CameraEventObserver.kt @@ -1,4 +1,4 @@ -package jp.osdn.gokigen.gokigenassets.camera.panasonic.status +package jp.osdn.gokigen.gokigenassets.camera.vendor.panasonic.status import android.content.Context import android.util.Log @@ -7,7 +7,7 @@ import jp.osdn.gokigen.gokigenassets.camera.interfaces.ICameraStatusUpdateNotify import jp.osdn.gokigen.gokigenassets.camera.interfaces.ICameraStatusWatcher import jp.osdn.gokigen.gokigenassets.camera.interfaces.ICardSlotSelector import jp.osdn.gokigen.gokigenassets.camera.interfaces.ICameraChangeListener -import jp.osdn.gokigen.gokigenassets.camera.panasonic.IPanasonicCamera +import jp.osdn.gokigen.gokigenassets.camera.vendor.panasonic.IPanasonicCamera import jp.osdn.gokigen.gokigenassets.liveview.message.IMessageDrawer import jp.osdn.gokigen.gokigenassets.utils.communication.SimpleHttpClient diff --git a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/panasonic/status/CameraStatusConvert.kt b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/panasonic/status/CameraStatusConvert.kt similarity index 99% rename from app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/panasonic/status/CameraStatusConvert.kt rename to app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/panasonic/status/CameraStatusConvert.kt index 975ffc1..8d2722c 100644 --- a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/panasonic/status/CameraStatusConvert.kt +++ b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/panasonic/status/CameraStatusConvert.kt @@ -1,9 +1,9 @@ -package jp.osdn.gokigen.gokigenassets.camera.panasonic.status +package jp.osdn.gokigen.gokigenassets.camera.vendor.panasonic.status import android.graphics.Color import android.util.Log import jp.osdn.gokigen.gokigenassets.camera.interfaces.ICameraStatus -import jp.osdn.gokigen.gokigenassets.camera.panasonic.IPanasonicCamera +import jp.osdn.gokigen.gokigenassets.camera.vendor.panasonic.IPanasonicCamera import jp.osdn.gokigen.gokigenassets.utils.communication.SimpleLogDumper import java.util.ArrayList import kotlin.math.pow diff --git a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/panasonic/status/CameraStatusHolder.kt b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/panasonic/status/CameraStatusHolder.kt similarity index 97% rename from app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/panasonic/status/CameraStatusHolder.kt rename to app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/panasonic/status/CameraStatusHolder.kt index 3461f5f..b0d3d09 100644 --- a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/panasonic/status/CameraStatusHolder.kt +++ b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/panasonic/status/CameraStatusHolder.kt @@ -1,9 +1,9 @@ -package jp.osdn.gokigen.gokigenassets.camera.panasonic.status +package jp.osdn.gokigen.gokigenassets.camera.vendor.panasonic.status import android.content.Context import android.util.Log import jp.osdn.gokigen.gokigenassets.camera.interfaces.* -import jp.osdn.gokigen.gokigenassets.camera.panasonic.IPanasonicCamera +import jp.osdn.gokigen.gokigenassets.camera.vendor.panasonic.IPanasonicCamera import jp.osdn.gokigen.gokigenassets.utils.communication.SimpleHttpClient class CameraStatusHolder(private val context: Context, private val remote: IPanasonicCamera, private val cardSlotSelector: ICardSlotSelector) : ICardSlotSelectionReceiver, diff --git a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/panasonic/status/CameraStatusListHolder.kt b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/panasonic/status/CameraStatusListHolder.kt similarity index 99% rename from app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/panasonic/status/CameraStatusListHolder.kt rename to app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/panasonic/status/CameraStatusListHolder.kt index c7d6690..369286e 100644 --- a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/panasonic/status/CameraStatusListHolder.kt +++ b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/panasonic/status/CameraStatusListHolder.kt @@ -1,8 +1,8 @@ -package jp.osdn.gokigen.gokigenassets.camera.panasonic.status +package jp.osdn.gokigen.gokigenassets.camera.vendor.panasonic.status import android.util.Log import jp.osdn.gokigen.gokigenassets.camera.interfaces.ICameraStatus -import jp.osdn.gokigen.gokigenassets.camera.panasonic.IPanasonicCamera +import jp.osdn.gokigen.gokigenassets.camera.vendor.panasonic.IPanasonicCamera import jp.osdn.gokigen.gokigenassets.utils.communication.SimpleHttpClient import java.util.ArrayList diff --git a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/panasonic/status/ICameraEventObserver.kt b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/panasonic/status/ICameraEventObserver.kt similarity index 54% rename from app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/panasonic/status/ICameraEventObserver.kt rename to app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/panasonic/status/ICameraEventObserver.kt index 86fd60d..ac71df5 100644 --- a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/panasonic/status/ICameraEventObserver.kt +++ b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/panasonic/status/ICameraEventObserver.kt @@ -1,4 +1,4 @@ -package jp.osdn.gokigen.gokigenassets.camera.panasonic.status +package jp.osdn.gokigen.gokigenassets.camera.vendor.panasonic.status interface ICameraEventObserver { diff --git a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/panasonic/wrapper/PanasonicCameraControl.kt b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/panasonic/wrapper/PanasonicCameraControl.kt similarity index 93% rename from app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/panasonic/wrapper/PanasonicCameraControl.kt rename to app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/panasonic/wrapper/PanasonicCameraControl.kt index bed05d7..0fa7b14 100644 --- a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/panasonic/wrapper/PanasonicCameraControl.kt +++ b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/panasonic/wrapper/PanasonicCameraControl.kt @@ -1,20 +1,20 @@ -package jp.osdn.gokigen.gokigenassets.camera.panasonic.wrapper +package jp.osdn.gokigen.gokigenassets.camera.vendor.panasonic.wrapper import android.util.Log import android.view.KeyEvent import android.view.View import androidx.appcompat.app.AppCompatActivity -import jp.osdn.gokigen.gokigenassets.camera.ICameraPreferenceProvider +import jp.osdn.gokigen.gokigenassets.camera.preference.ICameraPreferenceProvider import jp.osdn.gokigen.gokigenassets.camera.interfaces.* import jp.osdn.gokigen.gokigenassets.camera.interfaces.ICameraChangeListener -import jp.osdn.gokigen.gokigenassets.camera.panasonic.IPanasonicCamera -import jp.osdn.gokigen.gokigenassets.camera.panasonic.IPanasonicCameraHolder -import jp.osdn.gokigen.gokigenassets.camera.panasonic.connection.PanasonicCameraConnection -import jp.osdn.gokigen.gokigenassets.camera.panasonic.liveview.PanasonicLiveViewControl -import jp.osdn.gokigen.gokigenassets.camera.panasonic.operation.PanasonicCameraCaptureControl -import jp.osdn.gokigen.gokigenassets.camera.panasonic.operation.PanasonicCameraFocusControl -import jp.osdn.gokigen.gokigenassets.camera.panasonic.operation.PanasonicCameraZoomLensControl -import jp.osdn.gokigen.gokigenassets.camera.panasonic.status.CameraEventObserver +import jp.osdn.gokigen.gokigenassets.camera.vendor.panasonic.IPanasonicCamera +import jp.osdn.gokigen.gokigenassets.camera.vendor.panasonic.IPanasonicCameraHolder +import jp.osdn.gokigen.gokigenassets.camera.vendor.panasonic.connection.PanasonicCameraConnection +import jp.osdn.gokigen.gokigenassets.camera.vendor.panasonic.liveview.PanasonicLiveViewControl +import jp.osdn.gokigen.gokigenassets.camera.vendor.panasonic.operation.PanasonicCameraCaptureControl +import jp.osdn.gokigen.gokigenassets.camera.vendor.panasonic.operation.PanasonicCameraFocusControl +import jp.osdn.gokigen.gokigenassets.camera.vendor.panasonic.operation.PanasonicCameraZoomLensControl +import jp.osdn.gokigen.gokigenassets.camera.vendor.panasonic.status.CameraEventObserver import jp.osdn.gokigen.gokigenassets.constants.IApplicationConstantConvert import jp.osdn.gokigen.gokigenassets.liveview.ICachePositionProvider import jp.osdn.gokigen.gokigenassets.liveview.IIndicatorControl diff --git a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/panasonic/wrapper/PanasonicCameraDeviceProvider.kt b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/panasonic/wrapper/PanasonicCameraDeviceProvider.kt similarity index 96% rename from app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/panasonic/wrapper/PanasonicCameraDeviceProvider.kt rename to app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/panasonic/wrapper/PanasonicCameraDeviceProvider.kt index 0e486f1..7e5ce21 100644 --- a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/panasonic/wrapper/PanasonicCameraDeviceProvider.kt +++ b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/panasonic/wrapper/PanasonicCameraDeviceProvider.kt @@ -1,8 +1,8 @@ -package jp.osdn.gokigen.gokigenassets.camera.panasonic.wrapper +package jp.osdn.gokigen.gokigenassets.camera.vendor.panasonic.wrapper import android.util.Log -import jp.osdn.gokigen.gokigenassets.camera.panasonic.IPanasonicApiService -import jp.osdn.gokigen.gokigenassets.camera.panasonic.IPanasonicCamera +import jp.osdn.gokigen.gokigenassets.camera.vendor.panasonic.IPanasonicApiService +import jp.osdn.gokigen.gokigenassets.camera.vendor.panasonic.IPanasonicCamera import jp.osdn.gokigen.gokigenassets.utils.communication.SimpleHttpClient import jp.osdn.gokigen.gokigenassets.utils.communication.XmlElement import java.util.* diff --git a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/panasonic/wrapper/PanasonicCardSlotSelector.kt b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/panasonic/wrapper/PanasonicCardSlotSelector.kt similarity index 95% rename from app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/panasonic/wrapper/PanasonicCardSlotSelector.kt rename to app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/panasonic/wrapper/PanasonicCardSlotSelector.kt index c1cf67f..fe66f71 100644 --- a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/panasonic/wrapper/PanasonicCardSlotSelector.kt +++ b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/panasonic/wrapper/PanasonicCardSlotSelector.kt @@ -1,4 +1,4 @@ -package jp.osdn.gokigen.gokigenassets.camera.panasonic.wrapper +package jp.osdn.gokigen.gokigenassets.camera.vendor.panasonic.wrapper import jp.osdn.gokigen.gokigenassets.camera.interfaces.ICardSlotSelectionReceiver import jp.osdn.gokigen.gokigenassets.camera.interfaces.ICardSlotSelector diff --git a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/pixpro/IPixproInternalInterfaces.kt b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/pixpro/IPixproInternalInterfaces.kt new file mode 100644 index 0000000..7565b34 --- /dev/null +++ b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/pixpro/IPixproInternalInterfaces.kt @@ -0,0 +1,13 @@ +package jp.osdn.gokigen.gokigenassets.camera.vendor.pixpro + +import jp.osdn.gokigen.gokigenassets.camera.vendor.pixpro.wrapper.command.IPixproCommandPublisher +import jp.osdn.gokigen.gokigenassets.camera.vendor.pixpro.wrapper.command.IPixproCommunication +import jp.osdn.gokigen.gokigenassets.scene.IInformationReceiver + +interface IPixproInternalInterfaces +{ + fun getIPixproCommunication() : IPixproCommunication + fun getIPixproCommandPublisher() : IPixproCommandPublisher + fun getInformationReceiver() : IInformationReceiver + +} \ No newline at end of file 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 new file mode 100644 index 0000000..dbbb227 --- /dev/null +++ b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/pixpro/PixproCameraControl.kt @@ -0,0 +1,77 @@ +package jp.osdn.gokigen.gokigenassets.camera.vendor.pixpro + +import android.graphics.Color +import android.view.KeyEvent +import android.view.View +import androidx.appcompat.app.AppCompatActivity +import jp.osdn.gokigen.gokigenassets.camera.interfaces.* +import jp.osdn.gokigen.gokigenassets.camera.preference.ICameraPreferenceProvider +import jp.osdn.gokigen.gokigenassets.camera.vendor.pixpro.wrapper.PixproCamera +import jp.osdn.gokigen.gokigenassets.camera.vendor.pixpro.wrapper.command.IPixproCommandPublisher +import jp.osdn.gokigen.gokigenassets.camera.vendor.pixpro.wrapper.command.IPixproCommunication +import jp.osdn.gokigen.gokigenassets.camera.vendor.pixpro.wrapper.command.PixproCommandCommunicator +import jp.osdn.gokigen.gokigenassets.liveview.ICachePositionProvider +import jp.osdn.gokigen.gokigenassets.liveview.ILiveView +import jp.osdn.gokigen.gokigenassets.liveview.ILiveViewRefresher +import jp.osdn.gokigen.gokigenassets.scene.IInformationReceiver +import jp.osdn.gokigen.gokigenassets.scene.IVibrator + + +class PixproCameraControl(private val context: AppCompatActivity, private val vibrator: IVibrator, private val informationNotify : IInformationReceiver, private val preference: ICameraPreferenceProvider, provider: ICameraStatusReceiver) : ICameraControl, View.OnClickListener, View.OnLongClickListener, IKeyDown, ICameraStatus, IPixproInternalInterfaces, PixproCommandCommunicator.ICommunicationNotify +{ + private val pixproCameraParameter = PixproCamera() + private val commandCommunicator = PixproCommandCommunicator(pixproCameraParameter, this) + + companion object + { + private val TAG = PixproCameraControl::class.java.simpleName + } + + override fun getConnectionMethod(): String { return ("PIXPRO") } + override fun initialize() { } + override fun connectToCamera() { } + override fun startCamera(isPreviewView: Boolean, cameraSequence : Int) { } + override fun finishCamera() { } + override fun changeCaptureMode(mode: String) { } + override fun needRotateImage(): Boolean { return (false) } + override fun setRefresher(id : Int, refresher: ILiveViewRefresher, imageView: ILiveView, cachePosition : ICachePositionProvider) { } + override fun captureButtonReceiver(id: Int): View.OnClickListener { return (this) } + override fun onLongClickReceiver(id: Int): View.OnLongClickListener { return (this) } + 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 getCameraStatus(): ICameraStatus { return (this) } + + override fun onClick(v: View?) { } + override fun handleKeyDown(keyCode: Int, event: KeyEvent): Boolean { return (false) } + override fun onLongClick(v: View?): Boolean { return (false) } + + override fun getStatusList(key: String): List { return (ArrayList()) } + override fun getStatus(key: String): String { return ("") } + override fun getStatusColor(key: String): Int { return (Color.WHITE) } + override fun setStatus(key: String, value: String) { } + + + override fun getIPixproCommunication(): IPixproCommunication { return (commandCommunicator) } + override fun getIPixproCommandPublisher(): IPixproCommandPublisher { return (commandCommunicator) } + override fun getInformationReceiver(): IInformationReceiver { return (informationNotify) } + + override fun detectDisconnect() + { + +/* + private fun detectDisconnect() + { + val connection: ICameraConnection = interfaceProvider.getCameraConnection() + if (connection != null) + { + // 回線状態を「切断」にしてダイアログを表示する + connection.forceUpdateConnectionStatus(ICameraConnection.CameraConnectionStatus.DISCONNECTED) + connection.alertConnectingFailed(interfaceProvider.getStringFromResource(R.string.kodak_command_line_disconnected)) + } + } + */ + //TODO("Not yet implemented") + } +} diff --git a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/pixpro/operation/CameraPowerOffPixpro.kt b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/pixpro/operation/CameraPowerOffPixpro.kt new file mode 100644 index 0000000..4a85eef --- /dev/null +++ b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/pixpro/operation/CameraPowerOffPixpro.kt @@ -0,0 +1,60 @@ +package jp.osdn.gokigen.gokigenassets.camera.vendor.pixpro.operation + +import android.content.Context +import androidx.preference.Preference +import jp.osdn.gokigen.gokigenassets.constants.IApplicationConstantConvert +import jp.osdn.gokigen.gokigenassets.scene.IChangeSceneBasic +import jp.osdn.gokigen.gokigenassets.utils.ConfirmationDialog + +class CameraPowerOffPixpro(private val context: Context, private val changeScene: IChangeSceneBasic) : Preference.OnPreferenceClickListener, ConfirmationDialog.ConfirmationCallback +{ + private var preferenceKey: String? = null + + /** + * クラスの準備 + * + */ + fun prepare() + { + // 何もしない + } + + /** + * + * + * @param preference クリックしたpreference + * @return false : ハンドルしない / true : ハンドルした + */ + override fun onPreferenceClick(preference: Preference): Boolean + { + if (!preference.hasKey()) + { + return false + } + preferenceKey = preference.key + val isContain = preferenceKey?.contains(IApplicationConstantConvert.ID_PREFERENCE_LABEL_EXIT_APPLICATION) + if ((isContain != null)&&(isContain)) + { + + // 確認ダイアログの生成と表示 + val dialog: ConfirmationDialog = ConfirmationDialog.newInstance(context) + dialog.show(IApplicationConstantConvert.ID_DIALOG_TITLE_CONFIRMATION, IApplicationConstantConvert.ID_DIALOG_EXIT_POWER_OFF, this) + return true + } + return false + } + + /** + * + * + */ + override fun confirm() + { + val isContain = preferenceKey?.contains(IApplicationConstantConvert.ID_PREFERENCE_LABEL_EXIT_APPLICATION) + if ((isContain != null)&&(isContain)) + { + // カメラの電源をOFFにしたうえで、アプリケーションを終了する。 + changeScene.exitApplication() + } + } +} diff --git a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/pixpro/operation/FocusControl.kt b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/pixpro/operation/FocusControl.kt new file mode 100644 index 0000000..07819bd --- /dev/null +++ b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/pixpro/operation/FocusControl.kt @@ -0,0 +1,128 @@ +package jp.osdn.gokigen.gokigenassets.camera.vendor.pixpro.operation + +import android.graphics.PointF +import android.util.Log +import android.view.MotionEvent +import jp.osdn.gokigen.gokigenassets.liveview.focusframe.IAutoFocusFrameDisplay +import jp.osdn.gokigen.gokigenassets.camera.interfaces.IFocusingControl +import jp.osdn.gokigen.gokigenassets.camera.vendor.pixpro.wrapper.command.IPixproCommandPublisher +import jp.osdn.gokigen.gokigenassets.camera.vendor.pixpro.wrapper.command.messages.IPixproCommandCallback +import jp.osdn.gokigen.gokigenassets.camera.vendor.pixpro.wrapper.command.messages.specific.PixproExecuteFocus +import java.lang.Exception + +class FocusControl(private val commandPublisher: IPixproCommandPublisher, private val frameDisplayer: IAutoFocusFrameDisplay?) : IFocusingControl, IPixproCommandCallback +{ + companion object + { + private val TAG = FocusControl::class.java.simpleName + } + + override fun driveAutoFocus(motionEvent: MotionEvent?): Boolean + { + if ((motionEvent == null)||(motionEvent.action != MotionEvent.ACTION_DOWN)) + { + return (false) + } + Log.v(TAG, "driveAutoFocus()") + val thread = Thread { + try + { + val point = frameDisplayer?.getPointWithEvent(motionEvent) + if (point != null) + { + // preFocusFrameRect = getPreFocusFrameRect(point); + // showFocusFrame(preFocusFrameRect, IAutoFocusFrameDisplay.FocusFrameStatus.Running, 1.0); + if (frameDisplayer?.isContainsPoint(point) == true) + { + lockAutoFocus(point) + } + } + } + catch (e: Exception) + { + e.printStackTrace() + } + } + try + { + thread.start() + } + catch (e: Exception) + { + e.printStackTrace() + } + return (false) + } + + override fun unlockAutoFocus() + { + try + { + Log.v(TAG, " Unlock AF ") + //commandPublisher.enqueueCommand(new PtpIpCommandGeneric(this, FOCUS_UNLOCK, isDumpLog, 0, 0x9206)); + } + catch (e: Exception) + { + e.printStackTrace() + } + } + + override fun halfPressShutter(isPressed: Boolean) + { + //unlockAutoFocus(); + //commandPublisher.enqueueCommand(new PtpIpCommandGeneric(this, FOCUS_MOVE, isDumpLog, 0, 0x90c1)); + lockAutoFocus(PointF(0.5f, 0.5f)) + } + + private fun lockAutoFocus(point: PointF) { + val maxPointLimitWidth = 1000000.0f + val maxPointLimitHeight = 1000000.0f + try { + val x = 0x00ffffff and Math.round(point.x * maxPointLimitWidth) + 1 + val y = 0x00ffffff and Math.round(point.y * maxPointLimitHeight) + 1 + Log.v(TAG, "Lock AF: [$x,$y]") + commandPublisher.enqueueCommand(PixproExecuteFocus(this, x, y)) + } catch (e: Exception) { + e.printStackTrace() + } + } + +/* + private RectF getPreFocusFrameRect(@NonNull PointF point) + { + float imageWidth = frameDisplayer.getContentSizeWidth(); + float imageHeight = frameDisplayer.getContentSizeHeight(); + + // Display a provisional focus frame at the touched point. + float focusWidth = 0.125f; // 0.125 is rough estimate. + float focusHeight = 0.125f; + if (imageWidth > imageHeight) + { + focusHeight *= (imageWidth / imageHeight); + } + else + { + focusHeight *= (imageHeight / imageWidth); + } + return (new RectF(point.x - focusWidth / 2.0f, point.y - focusHeight / 2.0f, + point.x + focusWidth / 2.0f, point.y + focusHeight / 2.0f)); + } + + private void showFocusFrame(RectF rect, IAutoFocusFrameDisplay.FocusFrameStatus status, double duration) + { + frameDisplayer.showFocusFrame(rect, status, duration); + indicator.onAfLockUpdate(IAutoFocusFrameDisplay.FocusFrameStatus.Focused == status); + } + + private void hideFocusFrame() + { + frameDisplayer.hideFocusFrame(); + indicator.onAfLockUpdate(false); + } +*/ + override fun receivedMessage(id: Int, rx_body: ByteArray?) + { + Log.v(TAG, " KodakFocusingControl::receivedMessage() : $id ") + } + +} diff --git a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/pixpro/operation/SingleShotControl.kt b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/pixpro/operation/SingleShotControl.kt new file mode 100644 index 0000000..21bb4a0 --- /dev/null +++ b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/pixpro/operation/SingleShotControl.kt @@ -0,0 +1,55 @@ +package jp.osdn.gokigen.gokigenassets.camera.vendor.pixpro.operation + +import android.util.Log +import jp.osdn.gokigen.gokigenassets.camera.interfaces.ICaptureControl +import jp.osdn.gokigen.gokigenassets.camera.vendor.pixpro.wrapper.command.IPixproCommandPublisher +import jp.osdn.gokigen.gokigenassets.camera.vendor.pixpro.wrapper.command.messages.IPixproCommandCallback +import jp.osdn.gokigen.gokigenassets.camera.vendor.pixpro.wrapper.command.messages.specific.PixproExecuteShutter +import jp.osdn.gokigen.gokigenassets.liveview.focusframe.IAutoFocusFrameDisplay + +class SingleShotControl(private val commandPublisher: IPixproCommandPublisher, frameDisplayer: IAutoFocusFrameDisplay?) : ICaptureControl, IPixproCommandCallback +{ + override fun doCapture(kind: Int) + { + try + { + // シャッター + Log.v(TAG, " doCapture() ") + + // シャッターを切る + commandPublisher.enqueueCommand(PixproExecuteShutter(this)) + } + catch (e: Exception) + { + e.printStackTrace() + } + } + + override fun receivedMessage(id: Int, rx_body: ByteArray?) + { + Log.v(TAG, " KodakCaptureControl::receivedMessage() : ") +/* + try + { + int responseCode = (rx_body[8] & 0xff) + ((rx_body[9] & 0xff) * 256); + if ((rx_body.length > 10) && (responseCode != 0x2001)) + { + Log.v(TAG, String.format(" RECEIVED NG REPLY ID : %d, RESPONSE CODE : 0x%04x ", id, responseCode)); + } + else + { + Log.v(TAG, String.format(" OK REPLY (ID : %d) ", id)); + } + } + catch (Exception e) + { + e.printStackTrace(); + } +*/ + } + + companion object + { + private val TAG = SingleShotControl::class.java.simpleName + } +} diff --git a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/pixpro/operation/ZoomControl.kt b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/pixpro/operation/ZoomControl.kt new file mode 100644 index 0000000..8d62a7c --- /dev/null +++ b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/pixpro/operation/ZoomControl.kt @@ -0,0 +1,42 @@ +package jp.osdn.gokigen.gokigenassets.camera.vendor.pixpro.operation + +import android.util.Log + +import jp.osdn.gokigen.gokigenassets.camera.interfaces.IZoomLensControl +import jp.osdn.gokigen.gokigenassets.camera.vendor.pixpro.wrapper.command.IPixproCommandPublisher +import jp.osdn.gokigen.gokigenassets.camera.vendor.pixpro.wrapper.command.messages.IPixproCommandCallback +import jp.osdn.gokigen.gokigenassets.camera.vendor.pixpro.wrapper.command.messages.specific.PixproExecuteZoom +import java.lang.Exception + +class ZoomControl(private val commandPublisher: IPixproCommandPublisher) : IZoomLensControl, IPixproCommandCallback +{ + override fun canZoom(): Boolean { return true } + override fun updateStatus() { } + override fun getMaximumFocalLength(): Float { return 0.0f } + override fun getMinimumFocalLength(): Float { return 0.0f } + override fun getCurrentFocalLength(): Float { return 0.0f } + override fun driveZoomLens(targetLength: Float) { } + override fun driveZoomLens(isZoomIn: Boolean) + { + try + { + Log.v(TAG, " Zoom in : $isZoomIn") + commandPublisher.enqueueCommand(PixproExecuteZoom(this, if (isZoomIn) 1 else -1)) + } + catch (e: Exception) + { + e.printStackTrace() + } + } + override fun moveInitialZoomPosition() { } + override fun isDrivingZoomLens(): Boolean { return false } + override fun receivedMessage(id: Int, rx_body: ByteArray?) + { + Log.v(TAG, " KodakFocusingControl::receivedMessage() : ") + } + + companion object + { + private val TAG = ZoomControl::class.java.simpleName + } +} diff --git a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/pixpro/wrapper/IPixproCamera.kt b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/pixpro/wrapper/IPixproCamera.kt new file mode 100644 index 0000000..8f9ab8c --- /dev/null +++ b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/pixpro/wrapper/IPixproCamera.kt @@ -0,0 +1,11 @@ +package jp.osdn.gokigen.gokigenassets.camera.vendor.pixpro.wrapper + +interface IPixproCamera +{ + fun isAvailable() : Boolean + fun getIpAddress() : String + fun getPortNumber() : Int + fun getLiveViewPortNumber() : Int + fun getTcpNoDelay() : Boolean + +} \ No newline at end of file diff --git a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/pixpro/wrapper/PixproCamera.kt b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/pixpro/wrapper/PixproCamera.kt new file mode 100644 index 0000000..6f538f1 --- /dev/null +++ b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/pixpro/wrapper/PixproCamera.kt @@ -0,0 +1,78 @@ +package jp.osdn.gokigen.gokigenassets.camera.vendor.pixpro.wrapper + +import android.util.Log + +class PixproCamera : IPixproCamera +{ + private lateinit var ipAddress: String + private var portNumber = -1 + private var liveViewPort = -1 + private var tcpNoDelay = false + private var isAvailable = false + + companion object + { + private val TAG = PixproCamera::class.java.simpleName + } + + fun setCommunicationParameter(ip: String, port: Int, lvPort: Int, tcpDelay: Boolean) + { + Log.v(TAG, "setCommunicationParameter($ip, $port, $lvPort, $tcpDelay)") + this.ipAddress = ip + this.portNumber = port + this.liveViewPort = lvPort + this.tcpNoDelay = tcpDelay + isAvailable = true + } + + fun parseCommunicationParameter(data: ByteArray) + { + // AOFREPLY:DC163,1,PIXPRO WPZ2,172.16.0.254,255.255.255.0,(mac address),9176,9175,0,(WIFI SSID),0 + try + { + isAvailable = true + } + catch (e: Exception) + { + e.printStackTrace() + isAvailable = false + } + } + + override fun isAvailable(): Boolean + { + return (isAvailable) + } + + override fun getIpAddress(): String + { + if (::ipAddress.isInitialized) + { + return (ipAddress) + } + return ("172.16.0.254") + } + + override fun getPortNumber(): Int + { + if (portNumber > 0) + { + return (portNumber) + } + return (9175) + } + + override fun getLiveViewPortNumber(): Int + { + if (liveViewPort > 0) + { + return (liveViewPort) + } + return (9176) + } + + override fun getTcpNoDelay(): Boolean + { + return (tcpNoDelay) + } +} diff --git a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/pixpro/wrapper/command/IPixproCommandPublisher.kt b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/pixpro/wrapper/command/IPixproCommandPublisher.kt new file mode 100644 index 0000000..9e28d08 --- /dev/null +++ b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/pixpro/wrapper/command/IPixproCommandPublisher.kt @@ -0,0 +1,12 @@ +package jp.osdn.gokigen.gokigenassets.camera.vendor.pixpro.wrapper.command + +import jp.osdn.gokigen.gokigenassets.camera.vendor.pixpro.wrapper.command.messages.base.IPixproCommand + +interface IPixproCommandPublisher +{ + fun isConnected(): Boolean + fun enqueueCommand(command: IPixproCommand): Boolean + + fun start() + fun stop() +} diff --git a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/pixpro/wrapper/command/IPixproCommunication.kt b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/pixpro/wrapper/command/IPixproCommunication.kt new file mode 100644 index 0000000..8779fb9 --- /dev/null +++ b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/pixpro/wrapper/command/IPixproCommunication.kt @@ -0,0 +1,7 @@ +package jp.osdn.gokigen.gokigenassets.camera.vendor.pixpro.wrapper.command + +interface IPixproCommunication +{ + fun connect(): Boolean + fun disconnect() +} diff --git a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/pixpro/wrapper/command/PixproCommandCommunicator.kt b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/pixpro/wrapper/command/PixproCommandCommunicator.kt new file mode 100644 index 0000000..80569f2 --- /dev/null +++ b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/pixpro/wrapper/command/PixproCommandCommunicator.kt @@ -0,0 +1,767 @@ +package jp.osdn.gokigen.gokigenassets.camera.vendor.pixpro.wrapper.command + +import android.util.Log +import jp.osdn.gokigen.gokigenassets.camera.vendor.pixpro.wrapper.IPixproCamera +import jp.osdn.gokigen.gokigenassets.camera.vendor.pixpro.wrapper.command.messages.IPixproCommandCallback +import jp.osdn.gokigen.gokigenassets.camera.vendor.pixpro.wrapper.command.messages.base.IPixproCommand +import jp.osdn.gokigen.gokigenassets.camera.vendor.pixpro.wrapper.command.messages.base.IPixproMessages.Companion.SEQ_RECEIVE_ONLY +import jp.osdn.gokigen.gokigenassets.camera.vendor.pixpro.wrapper.command.messages.base.PixproCommandOnlyCallback +import jp.osdn.gokigen.gokigenassets.camera.vendor.pixpro.wrapper.command.messages.base.PixproCommandReceiveOnly +import jp.osdn.gokigen.gokigenassets.utils.communication.SimpleLogDumper +import java.io.BufferedReader +import java.io.ByteArrayOutputStream +import java.io.DataOutputStream +import java.io.InputStream +import java.net.InetSocketAddress +import java.net.Socket +import java.net.SocketException +import java.util.* + +class PixproCommandCommunicator(private val pixproCamera: IPixproCamera, private val notifier: ICommunicationNotify) : IPixproCommandPublisher, IPixproCommunication +{ + private var isStart = false + private var isConnected = false + private var waitForever: Boolean = false + private val commandQueue : Queue = ArrayDeque() + + private var socket: Socket? = null + private var dataOutputStream: DataOutputStream? = null + private var bufferedReader: BufferedReader? = null + + init + { + commandQueue.clear() + } + + companion object + { + private val TAG = PixproCommandCommunicator::class.java.simpleName + private const val BUFFER_SIZE = 1024 * 1024 + 16 // 受信バッファは 1MB + private const val COMMAND_SEND_RECEIVE_DURATION_MS = 5 + private const val COMMAND_SEND_RECEIVE_DURATION_MAX = 3000 + private const val COMMAND_POLL_QUEUE_MS = 5 + } + + override fun connect(): Boolean + { + if (!pixproCamera.isAvailable()) + { + Log.v(TAG, " pixpro camera is not ready...") + return (false) + } + try + { + Log.v(TAG, " connect()") + socket = Socket() + if (pixproCamera.getTcpNoDelay()) + { + socket?.setKeepAlive(false) + socket?.setPerformancePreferences(0, 2, 0) + socket?.setOOBInline(true) + socket?.setReuseAddress(false) + socket?.setTrafficClass(0x80) + } + socket?.tcpNoDelay = pixproCamera.getTcpNoDelay() + socket?.connect(InetSocketAddress(pixproCamera.getIpAddress(), pixproCamera.getPortNumber()), 0) + isConnected = true + return (true) + } + catch (e: Exception) + { + e.printStackTrace() + socket = null + } + return (false) + } + + private fun closeOutputStream() + { + try + { + dataOutputStream?.close() + } + catch (e: Exception) + { + e.printStackTrace() + } + dataOutputStream = null + } + + private fun closeBufferedReader() + { + try + { + bufferedReader?.close() + } + catch (e: Exception) + { + e.printStackTrace() + } + bufferedReader = null + } + + private fun closeSocket() + { + try + { + socket?.close() + } + catch (e: Exception) + { + e.printStackTrace() + } + socket = null + } + + override fun disconnect() + { + try + { + // 通信関連のクローズ + closeOutputStream() + closeBufferedReader() + closeSocket() + isStart = false + isConnected = false + commandQueue.clear() + } + catch (e: Exception) + { + e.printStackTrace() + } + System.gc() + } + + override fun start() + { + if (isStart) + { + // すでにコマンドのスレッド動作中なので抜ける + return + } + isStart = true + Log.v(TAG, " start()") + val thread = Thread { + try + { + val inputStream = socket?.getInputStream() + dataOutputStream = DataOutputStream(socket?.getOutputStream()) + while (isStart) + { + try + { + val command = commandQueue.poll() + if (command != null) + { + issueCommand(command) + } + Thread.sleep(COMMAND_POLL_QUEUE_MS.toLong()) + if (inputStream != null && inputStream.available() > 0) + { + Log.v(TAG, " --- RECEIVE MSG --- ") + receiveFromCamera(PixproCommandReceiveOnly(SEQ_RECEIVE_ONLY, PixproCommandOnlyCallback())) + } + } + catch (e: Exception) + { + e.printStackTrace() + } + } + } + catch (e: Exception) + { + Log.v(TAG, "<<<<< IP : ${pixproCamera.getIpAddress()} port : ${pixproCamera.getPortNumber()} >>>>>") + e.printStackTrace() + } + } + try { + thread.start() + } catch (e: Exception) { + e.printStackTrace() + } + } + + override fun stop() + { + isStart = false + commandQueue.clear() + } + + override fun isConnected(): Boolean + { + return (isConnected) + } + + override fun enqueueCommand(command: IPixproCommand): Boolean + { + try + { + //Log.v(TAG, "Enqueue : " + command.getId()); + return commandQueue.offer(command) + } + catch (e: Exception) + { + e.printStackTrace() + } + return false + } + + private fun issueCommand(command: IPixproCommand) + { + try + { + var retryOver = true + while (retryOver) + { + //Log.v(TAG, "issueCommand : " + command.getId()); + val commandBody: ByteArray = command.commandBody() + // コマンドボディが入っていた場合には、コマンド送信（入っていない場合は受信待ち） + sendToCamera(command.dumpLog(), commandBody) + + val commandBody2: ByteArray? = command.commandBody2() + if (commandBody2 != null) + { + // コマンドボディの２つめが入っていた場合には、コマンドを連続送信する + sendToCamera(command.dumpLog(), commandBody2) + } + retryOver = receiveFromCamera(command) + if (retryOver) + { + retryOver = command.sendRetry() + } + } + } + catch (e: Exception) + { + e.printStackTrace() + } + } + + /** + * カメラにコマンドを送信する（メイン部分） + * + */ + private fun sendToCamera(isDumpReceiveLog: Boolean, byte_array: ByteArray) + { + try + { + if (dataOutputStream == null) + { + Log.v(TAG, " DataOutputStream is null.") + return + } + if (byte_array.isEmpty()) + { + // メッセージボディがない。終了する + Log.v(TAG, " SEND BODY IS NOTHING.") + return + } + if (isDumpReceiveLog) + { + // ログに送信メッセージを出力する + SimpleLogDumper.dumpBytes("SEND[" + byte_array.size + "] ", byte_array) + } + + // (データを)送信 + dataOutputStream?.write(byte_array) + dataOutputStream?.flush() + } + catch (socketException: SocketException) + { + socketException.printStackTrace() + try + { + // 回線切断を通知する + notifier.detectDisconnect() + } + catch (ee: Exception) + { + ee.printStackTrace() + } + } + catch (e: Exception) + { + e.printStackTrace() + } + } + + private fun sleep(delayMs: Int) + { + try + { + Thread.sleep(delayMs.toLong()) + } + catch (e: Exception) + { + e.printStackTrace() + } + } + + /** + * カメラからにコマンドの結果を受信する（メイン部分） + * + */ + private fun receiveFromCamera(command: IPixproCommand): Boolean + { + var delayMs: Int = command.receiveDelayMs() + if (delayMs < 0 || delayMs > COMMAND_SEND_RECEIVE_DURATION_MAX) + { + delayMs = COMMAND_SEND_RECEIVE_DURATION_MS + } + return receiveSingle(command, delayMs) + } + + private fun receiveSingle(command: IPixproCommand, delayMs: Int): Boolean + { + val isDumpReceiveLog: Boolean = command.dumpLog() + val id: Int = command.getId() + val callback: IPixproCommandCallback? = command.responseCallback() + try + { + val receiveMessageBufferSize = BUFFER_SIZE + val byteArray = ByteArray(receiveMessageBufferSize) + val inputStream: InputStream? = socket?.getInputStream() + if (inputStream == null) + { + Log.v(TAG, " InputStream is NULL... RECEIVE ABORTED.") + receivedAllMessage(isDumpReceiveLog, id, null, callback) + return (false) + } + + // 初回データが受信バッファにデータが溜まるまで待つ... + var readBytes = waitForReceive(inputStream, delayMs, command.maxRetryCount()) + if (readBytes < 0) + { + // リトライオーバー検出 + Log.v(TAG, " ----- DETECT RECEIVE RETRY OVER... -----") + return (true) + } + + // 受信したデータをバッファに突っ込む + val byteStream = ByteArrayOutputStream() + while (readBytes > 0) + { + readBytes = inputStream.read(byteArray, 0, receiveMessageBufferSize) + if (readBytes <= 0) + { + Log.v(TAG," RECEIVED MESSAGE FINISHED ($readBytes)") + break + } + byteStream.write(byteArray, 0, readBytes) + sleep(delayMs) + readBytes = inputStream.available() + } + receivedAllMessage(isDumpReceiveLog, id, byteStream.toByteArray(), callback) + System.gc() + } + catch (e: Throwable) + { + e.printStackTrace() + System.gc() + } + return (false) + } + + private fun receivedAllMessage(isDumpReceiveLog: Boolean, id: Int, body: ByteArray?, callback: IPixproCommandCallback?) + { + Log.v(TAG, " receivedAllMessage() : " + (body?.size ?: 0) + " bytes.") + if (isDumpReceiveLog && body != null) + { + // ログに受信メッセージを出力する + SimpleLogDumper.dumpBytes("RECV[" + body.size + "] ", body) + } + if (checkReceiveStatusMessage(body)) + { + sendSecondaryMessage(isDumpReceiveLog, body) + } + callback?.receivedMessage(id, body) + } + + private fun sendSecondaryMessage(isDumpReceiveLog: Boolean, received_body: ByteArray?) + { + if (received_body == null) + { + Log.v(TAG, " send_secondary_message : NULL ") + return + } + Log.v(TAG, " sendSecondaryMessage : [" + received_body[8] + "] [" + received_body[9] + "] ") + try + { + var messageToSend: ByteArray? = null + if (received_body[8] == 0xd2.toByte() && received_body[9] == 0xd7.toByte()) + { + messageToSend = byteArrayOf( + 0x2e.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0xd2.toByte(), + 0x07.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x01.toByte(), + 0x10.toByte(), + 0x00.toByte(), + 0x80.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x01.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0xff.toByte(), + 0xff.toByte(), + 0xff.toByte(), + 0xff.toByte(), 0x00.toByte(), 0x00.toByte(), 0x00.toByte(), 0x00.toByte() + ) + } + if (received_body[8] == 0xb9.toByte() && received_body[9] == 0x0b.toByte()) { + messageToSend = byteArrayOf( + 0x2e.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0xb9.toByte(), + 0x0b.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x01.toByte(), + 0x10.toByte(), + 0x00.toByte(), + 0x80.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x01.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0xff.toByte(), + 0xff.toByte(), + 0xff.toByte(), + 0xff.toByte(), 0x00.toByte(), 0x00.toByte(), 0x00.toByte(), 0x00.toByte() + ) + } + if (received_body[8] == 0xba.toByte() && received_body[9] == 0x0b.toByte()) { + messageToSend = byteArrayOf( + 0x2e.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0xba.toByte(), + 0x0b.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x01.toByte(), + 0x10.toByte(), + 0x00.toByte(), + 0x80.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x01.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0xff.toByte(), + 0xff.toByte(), + 0xff.toByte(), + 0xff.toByte(), 0x00.toByte(), 0x00.toByte(), 0x00.toByte(), 0x00.toByte() + ) + } + if (received_body[8] == 0xbb.toByte() && received_body[9] == 0x0b.toByte()) { + messageToSend = byteArrayOf( + 0x2e.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0xbb.toByte(), + 0x0b.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x01.toByte(), + 0x10.toByte(), + 0x00.toByte(), + 0x80.toByte(), + 0x1f.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x90.toByte(), + 0x01.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0xff.toByte(), + 0xff.toByte(), + 0xff.toByte(), + 0xff.toByte(), 0x00.toByte(), 0x00.toByte(), 0x00.toByte(), 0x00.toByte() + ) + } + if (isDumpReceiveLog && messageToSend != null) + { + // ログに受信メッセージを出力する + SimpleLogDumper.dumpBytes("SND2[" + messageToSend.size + "] ", messageToSend) + } + if (dataOutputStream != null && messageToSend != null) + { + // (データを)送信 + dataOutputStream?.write(messageToSend) + dataOutputStream?.flush() + } + } + catch (e: Exception) + { + e.printStackTrace() + } + } + + private fun checkReceiveStatusMessage(receive_body: ByteArray?): Boolean + { + var isReceivedStatusMessage = false + try + { + if (receive_body == null) + { + return (false) + } + if (receive_body.size < 16) + { + Log.v(TAG, " BODY SIZE IS SMALL. : " + receive_body.size) + return false + } + if (receive_body[8] == 0xd2.toByte() && receive_body[9] == 0x07.toByte() || + receive_body[8] == 0xb9.toByte() && receive_body[9] == 0x0b.toByte() || + receive_body[8] == 0xba.toByte() && receive_body[9] == 0x0b.toByte() || + receive_body[8] == 0xbb.toByte() && receive_body[9] == 0x0b.toByte() + ) + { + isReceivedStatusMessage = true + Log.v(TAG, " >>> RECEIVED HOST PRIMARY MESSAGE. <<<") + } + } + catch (e: Exception) + { + e.printStackTrace() + } + return (isReceivedStatusMessage) + } + + private fun waitForReceive(inputStream: InputStream, delayMs: Int, retry_count: Int): Int + { + var retryCount = retry_count + var isLogOutput = true + var readBytes = 0 + try + { + while (readBytes <= 0) + { + // Log.v(TAG, " --- waitForReceive : " + retry_count + " delay : " + delayMs + "ms"); + sleep(delayMs) + readBytes = inputStream.available() + if (readBytes <= 0) + { + if (isLogOutput) + { + Log.v(TAG, " waitForReceive:: is.available() WAIT... : " + delayMs + "ms") + isLogOutput = false + } + retryCount-- + if (!waitForever && retry_count < 0) + { + return (-1) + } + } + } + } + catch (e: Exception) + { + e.printStackTrace() + } + return (readBytes) + } + + interface ICommunicationNotify + { + fun detectDisconnect() + } +} diff --git a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/pixpro/wrapper/command/messages/IPixproCommandCallback.kt b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/pixpro/wrapper/command/messages/IPixproCommandCallback.kt new file mode 100644 index 0000000..7075d2e --- /dev/null +++ b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/pixpro/wrapper/command/messages/IPixproCommandCallback.kt @@ -0,0 +1,6 @@ +package jp.osdn.gokigen.gokigenassets.camera.vendor.pixpro.wrapper.command.messages + +interface IPixproCommandCallback +{ + fun receivedMessage(id: Int, rx_body: ByteArray?) +} diff --git a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/pixpro/wrapper/command/messages/base/IPixproCommand.kt b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/pixpro/wrapper/command/messages/base/IPixproCommand.kt new file mode 100644 index 0000000..83c8aa1 --- /dev/null +++ b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/pixpro/wrapper/command/messages/base/IPixproCommand.kt @@ -0,0 +1,31 @@ +package jp.osdn.gokigen.gokigenassets.camera.vendor.pixpro.wrapper.command.messages.base + +import jp.osdn.gokigen.gokigenassets.camera.vendor.pixpro.wrapper.command.messages.IPixproCommandCallback + +interface IPixproCommand +{ + // メッセージの識別子 + fun getId(): Int + + // コマンドの受信待ち時間(単位:ms) + fun receiveDelayMs(): Int + + // 送信するメッセージボディ + fun commandBody(): ByteArray + + // 送信するメッセージボディ(連続送信する場合) + fun commandBody2(): ByteArray? + + // 受信待ち再試行回数 + fun maxRetryCount(): Int + + // コマンドの受信が失敗した場合、再送する（再送する場合は true） + fun sendRetry(): Boolean + + // コマンド送信結果（応答）の通知先 + fun responseCallback(): IPixproCommandCallback? + + // デバッグ用： ログ(logcat)に通信結果を残すかどうか + fun dumpLog(): Boolean + +} diff --git a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/pixpro/wrapper/command/messages/base/IPixproMessages.kt b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/pixpro/wrapper/command/messages/base/IPixproMessages.kt new file mode 100644 index 0000000..ed04e4f --- /dev/null +++ b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/pixpro/wrapper/command/messages/base/IPixproMessages.kt @@ -0,0 +1,30 @@ +package jp.osdn.gokigen.gokigenassets.camera.vendor.pixpro.wrapper.command.messages.base + +interface IPixproMessages +{ + companion object + { + const val SEQ_DUMMY = 0 + const val SEQ_RECEIVE_ONLY = 1 + + const val SEQ_SHUTTER = 10 + const val SEQ_FOCUS = 11 + const val SEQ_ZOOM = 12 + + const val SEQ_FLASH_OFF = 20 + const val SEQ_FLASH_ON = 21 + const val SEQ_FLASH_AUTO = 22 + + const val SEQ_CONNECT_01 = 101 + const val SEQ_CONNECT_02 = 102 + const val SEQ_CONNECT_03 = 103 + const val SEQ_CONNECT_04 = 104 + const val SEQ_CONNECT_05 = 105 + const val SEQ_CONNECT_06 = 106 + const val SEQ_CONNECT_07 = 107 + const val SEQ_CONNECT_08 = 108 + const val SEQ_CONNECT_09 = 109 + const val SEQ_CONNECT_10 = 110 + const val SEQ_CONNECT_11 = 111 + } +} diff --git a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/pixpro/wrapper/command/messages/base/PixproCommandBase.kt b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/pixpro/wrapper/command/messages/base/PixproCommandBase.kt new file mode 100644 index 0000000..19ebfaa --- /dev/null +++ b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/pixpro/wrapper/command/messages/base/PixproCommandBase.kt @@ -0,0 +1,46 @@ +package jp.osdn.gokigen.gokigenassets.camera.vendor.pixpro.wrapper.command.messages.base + +import jp.osdn.gokigen.gokigenassets.camera.vendor.pixpro.wrapper.command.messages.IPixproCommandCallback + +open class PixproCommandBase: IPixproCommand +{ + override fun getId() : Int + { + return (IPixproMessages.SEQ_DUMMY) + } + + override fun receiveDelayMs(): Int + { + return 30 + } + + override fun commandBody(): ByteArray + { + return ByteArray(0) + } + + override fun commandBody2(): ByteArray? + { + return null + } + + override fun maxRetryCount(): Int + { + return 50 + } + + override fun sendRetry(): Boolean + { + return false + } + + override fun responseCallback(): IPixproCommandCallback? + { + return null + } + + override fun dumpLog(): Boolean + { + return false + } +} diff --git a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/pixpro/wrapper/command/messages/base/PixproCommandOnlyCallback.kt b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/pixpro/wrapper/command/messages/base/PixproCommandOnlyCallback.kt new file mode 100644 index 0000000..ccdc984 --- /dev/null +++ b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/pixpro/wrapper/command/messages/base/PixproCommandOnlyCallback.kt @@ -0,0 +1,22 @@ +package jp.osdn.gokigen.gokigenassets.camera.vendor.pixpro.wrapper.command.messages.base + +import android.util.Log +import jp.osdn.gokigen.gokigenassets.camera.vendor.pixpro.wrapper.command.messages.IPixproCommandCallback +import jp.osdn.gokigen.gokigenassets.utils.communication.SimpleLogDumper + +class PixproCommandOnlyCallback(private val isDumpReceiveMessage: Boolean = false) : IPixproCommandCallback +{ + companion object + { + private val TAG = PixproCommandOnlyCallback::class.java.simpleName + } + override fun receivedMessage(id: Int, rx_body: ByteArray?) + { + Log.v(TAG, " RECEIVED MESSAGE : $id (${rx_body?.size} bytes.)") + if ((isDumpReceiveMessage)&&(rx_body != null)) + { + // 受信データをログに出力する + SimpleLogDumper.dumpBytes("[${rx_body.size}]", rx_body) + } + } +} diff --git a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/pixpro/wrapper/command/messages/base/PixproCommandReceiveOnly.kt b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/pixpro/wrapper/command/messages/base/PixproCommandReceiveOnly.kt new file mode 100644 index 0000000..ce4c368 --- /dev/null +++ b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/pixpro/wrapper/command/messages/base/PixproCommandReceiveOnly.kt @@ -0,0 +1,22 @@ +package jp.osdn.gokigen.gokigenassets.camera.vendor.pixpro.wrapper.command.messages.base + +import jp.osdn.gokigen.gokigenassets.camera.vendor.pixpro.wrapper.command.messages.IPixproCommandCallback + + +class PixproCommandReceiveOnly(private val id: Int, private val callback: IPixproCommandCallback) : PixproCommandBase() +{ + override fun responseCallback(): IPixproCommandCallback + { + return (callback) + } + + override fun getId(): Int + { + return (id) + } + + override fun dumpLog(): Boolean + { + return false + } +} diff --git a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/pixpro/wrapper/command/messages/connection/PixproConnectSequence01.kt b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/pixpro/wrapper/command/messages/connection/PixproConnectSequence01.kt new file mode 100644 index 0000000..1a73274 --- /dev/null +++ b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/pixpro/wrapper/command/messages/connection/PixproConnectSequence01.kt @@ -0,0 +1,163 @@ +package jp.osdn.gokigen.gokigenassets.camera.vendor.pixpro.wrapper.command.messages.connection + +import jp.osdn.gokigen.gokigenassets.camera.vendor.pixpro.wrapper.command.messages.IPixproCommandCallback +import jp.osdn.gokigen.gokigenassets.camera.vendor.pixpro.wrapper.command.messages.base.IPixproMessages +import jp.osdn.gokigen.gokigenassets.camera.vendor.pixpro.wrapper.command.messages.base.PixproCommandBase + +class PixproConnectSequence01(private val callback: IPixproCommandCallback) : PixproCommandBase() +{ + + override fun getId() : Int + { + return (IPixproMessages.SEQ_CONNECT_01) + } + + override fun commandBody(): ByteArray { + return byteArrayOf( + 0x2e.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x30.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0xe9.toByte(), + 0x03.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x01.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x80.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x01.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x01.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x30.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x02.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x01.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0xff.toByte(), + 0xff.toByte(), + 0xff.toByte(), + 0xff.toByte(), 0x00.toByte(), 0x00.toByte(), 0x00.toByte(), 0x00.toByte() + ) + } + + override fun responseCallback(): IPixproCommandCallback { + return callback + } +} diff --git a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/pixpro/wrapper/command/messages/connection/PixproConnectSequence02.kt b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/pixpro/wrapper/command/messages/connection/PixproConnectSequence02.kt new file mode 100644 index 0000000..897a2c1 --- /dev/null +++ b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/pixpro/wrapper/command/messages/connection/PixproConnectSequence02.kt @@ -0,0 +1,259 @@ +package jp.osdn.gokigen.gokigenassets.camera.vendor.pixpro.wrapper.command.messages.connection + +import jp.osdn.gokigen.gokigenassets.camera.vendor.pixpro.wrapper.command.messages.IPixproCommandCallback +import jp.osdn.gokigen.gokigenassets.camera.vendor.pixpro.wrapper.command.messages.base.IPixproMessages +import jp.osdn.gokigen.gokigenassets.camera.vendor.pixpro.wrapper.command.messages.base.PixproCommandBase + +class PixproConnectSequence02(private val callback: IPixproCommandCallback) : PixproCommandBase() +{ + override fun getId() : Int + { + return (IPixproMessages.SEQ_CONNECT_02) + } + + override fun commandBody(): ByteArray { + return byteArrayOf( + 0x2e.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x48.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0xd1.toByte(), + 0x07.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x02.toByte(), + 0x10.toByte(), + 0x00.toByte(), + 0x80.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x01.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x01.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x48.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x47.toByte(), + 0x4F.toByte(), + 0x4B.toByte(), + 0x49.toByte(), + 0x47.toByte(), + 0x45.toByte(), + 0x4E.toByte(), + 0x5F.toByte(), + 0x61.toByte(), + 0x30.toByte(), + 0x31.toByte(), + 0x53.toByte(), + 0x65.toByte(), + 0x72.toByte(), + 0x69.toByte(), + 0x65.toByte(), + 0x73.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0xff.toByte(), + 0xff.toByte(), + 0xff.toByte(), + 0xff.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x2e.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0xea.toByte(), + 0x03.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x01.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x80.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x01.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0xff.toByte(), + 0xff.toByte(), + 0xff.toByte(), + 0xff.toByte(), 0x00.toByte(), 0x00.toByte(), 0x00.toByte(), 0x00.toByte() + ) + } + + override fun responseCallback(): IPixproCommandCallback { + return callback + } + +} diff --git a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/pixpro/wrapper/command/messages/connection/PixproConnectSequence03.kt b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/pixpro/wrapper/command/messages/connection/PixproConnectSequence03.kt new file mode 100644 index 0000000..16311f8 --- /dev/null +++ b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/pixpro/wrapper/command/messages/connection/PixproConnectSequence03.kt @@ -0,0 +1,90 @@ +package jp.osdn.gokigen.gokigenassets.camera.vendor.pixpro.wrapper.command.messages.connection + +import jp.osdn.gokigen.gokigenassets.camera.vendor.pixpro.wrapper.command.messages.IPixproCommandCallback +import jp.osdn.gokigen.gokigenassets.camera.vendor.pixpro.wrapper.command.messages.base.IPixproMessages +import jp.osdn.gokigen.gokigenassets.camera.vendor.pixpro.wrapper.command.messages.base.PixproCommandBase + +class PixproConnectSequence03(private val callback: IPixproCommandCallback) : PixproCommandBase() +{ + override fun getId() : Int + { + return (IPixproMessages.SEQ_CONNECT_03) + } + + override fun commandBody(): ByteArray { + return byteArrayOf( + 0x2e.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0xec.toByte(), + 0x03.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x01.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x80.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x01.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0xff.toByte(), + 0xff.toByte(), + 0xff.toByte(), + 0xff.toByte(), 0x00.toByte(), 0x00.toByte(), 0x00.toByte(), 0x00.toByte() + ) + } + + override fun responseCallback(): IPixproCommandCallback { + return callback + } +} diff --git a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/pixpro/wrapper/command/messages/connection/PixproConnectSequence04.kt b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/pixpro/wrapper/command/messages/connection/PixproConnectSequence04.kt new file mode 100644 index 0000000..2656fc0 --- /dev/null +++ b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/pixpro/wrapper/command/messages/connection/PixproConnectSequence04.kt @@ -0,0 +1,90 @@ +package jp.osdn.gokigen.gokigenassets.camera.vendor.pixpro.wrapper.command.messages.connection + +import jp.osdn.gokigen.gokigenassets.camera.vendor.pixpro.wrapper.command.messages.IPixproCommandCallback +import jp.osdn.gokigen.gokigenassets.camera.vendor.pixpro.wrapper.command.messages.base.IPixproMessages +import jp.osdn.gokigen.gokigenassets.camera.vendor.pixpro.wrapper.command.messages.base.PixproCommandBase + +class PixproConnectSequence04(private val callback: IPixproCommandCallback) : PixproCommandBase() +{ + override fun getId() : Int + { + return (IPixproMessages.SEQ_CONNECT_04) + } + + override fun commandBody(): ByteArray { + return byteArrayOf( + 0x2e.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0xfc.toByte(), + 0x03.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x01.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x80.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x01.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0xff.toByte(), + 0xff.toByte(), + 0xff.toByte(), + 0xff.toByte(), 0x00.toByte(), 0x00.toByte(), 0x00.toByte(), 0x00.toByte() + ) + } + + override fun responseCallback(): IPixproCommandCallback { + return callback + } +} diff --git a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/pixpro/wrapper/command/messages/connection/PixproConnectSequence05.kt b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/pixpro/wrapper/command/messages/connection/PixproConnectSequence05.kt new file mode 100644 index 0000000..6726536 --- /dev/null +++ b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/pixpro/wrapper/command/messages/connection/PixproConnectSequence05.kt @@ -0,0 +1,342 @@ +package jp.osdn.gokigen.gokigenassets.camera.vendor.pixpro.wrapper.command.messages.connection + +import jp.osdn.gokigen.gokigenassets.camera.vendor.pixpro.wrapper.command.messages.IPixproCommandCallback +import jp.osdn.gokigen.gokigenassets.camera.vendor.pixpro.wrapper.command.messages.base.IPixproMessages +import jp.osdn.gokigen.gokigenassets.camera.vendor.pixpro.wrapper.command.messages.base.PixproCommandBase + +class PixproConnectSequence05(private val callback: IPixproCommandCallback) : PixproCommandBase() +{ + override fun getId() : Int + { + return (IPixproMessages.SEQ_CONNECT_05) + } + + override fun commandBody(): ByteArray { + return byteArrayOf( + 0x2e.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0xe4.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0xfe.toByte(), + 0x03.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x01.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x80.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x01.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x01.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0xe4.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0xff.toByte(), + 0xff.toByte(), + 0xff.toByte(), + 0xff.toByte(), 0x00.toByte(), 0x00.toByte(), 0x00.toByte(), 0x00.toByte() + ) + } + + override fun responseCallback(): IPixproCommandCallback { + return callback + } +} diff --git a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/pixpro/wrapper/command/messages/connection/PixproConnectSequence06.kt b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/pixpro/wrapper/command/messages/connection/PixproConnectSequence06.kt new file mode 100644 index 0000000..2243249 --- /dev/null +++ b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/pixpro/wrapper/command/messages/connection/PixproConnectSequence06.kt @@ -0,0 +1,91 @@ +package jp.osdn.gokigen.gokigenassets.camera.vendor.pixpro.wrapper.command.messages.connection + + +import jp.osdn.gokigen.gokigenassets.camera.vendor.pixpro.wrapper.command.messages.IPixproCommandCallback +import jp.osdn.gokigen.gokigenassets.camera.vendor.pixpro.wrapper.command.messages.base.IPixproMessages +import jp.osdn.gokigen.gokigenassets.camera.vendor.pixpro.wrapper.command.messages.base.PixproCommandBase + +class PixproConnectSequence06(private val callback: IPixproCommandCallback) : PixproCommandBase() +{ + override fun getId() : Int + { + return (IPixproMessages.SEQ_CONNECT_06) + } + + override fun commandBody(): ByteArray { + return byteArrayOf( + 0x2e.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x05.toByte(), + 0x04.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x01.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x80.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x01.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0xff.toByte(), + 0xff.toByte(), + 0xff.toByte(), + 0xff.toByte(), 0x00.toByte(), 0x00.toByte(), 0x00.toByte(), 0x00.toByte() + ) + } + + override fun responseCallback(): IPixproCommandCallback { + return callback + } +} diff --git a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/pixpro/wrapper/command/messages/connection/PixproConnectSequence07.kt b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/pixpro/wrapper/command/messages/connection/PixproConnectSequence07.kt new file mode 100644 index 0000000..9496cfd --- /dev/null +++ b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/pixpro/wrapper/command/messages/connection/PixproConnectSequence07.kt @@ -0,0 +1,124 @@ +package jp.osdn.gokigen.gokigenassets.camera.vendor.pixpro.wrapper.command.messages.connection + + +import jp.osdn.gokigen.gokigenassets.camera.vendor.pixpro.wrapper.command.messages.IPixproCommandCallback +import jp.osdn.gokigen.gokigenassets.camera.vendor.pixpro.wrapper.command.messages.base.IPixproMessages +import jp.osdn.gokigen.gokigenassets.camera.vendor.pixpro.wrapper.command.messages.base.PixproCommandBase + +class PixproConnectSequence07(private val callback: IPixproCommandCallback) : PixproCommandBase() +{ + override fun getId() : Int + { + return (IPixproMessages.SEQ_CONNECT_07) + } + + + override fun commandBody(): ByteArray { + return byteArrayOf( + 0x2e.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x08.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0xeb.toByte(), + 0x03.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x01.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x80.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x01.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x01.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x08.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0xff.toByte(), + 0xff.toByte(), + 0xff.toByte(), + 0xff.toByte(), 0x00.toByte(), 0x00.toByte(), 0x00.toByte(), 0x00.toByte() + ) + } + + override fun responseCallback(): IPixproCommandCallback { + return callback + } +} diff --git a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/pixpro/wrapper/command/messages/connection/PixproConnectSequence08.kt b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/pixpro/wrapper/command/messages/connection/PixproConnectSequence08.kt new file mode 100644 index 0000000..6f3fbe3 --- /dev/null +++ b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/pixpro/wrapper/command/messages/connection/PixproConnectSequence08.kt @@ -0,0 +1,163 @@ +package jp.osdn.gokigen.gokigenassets.camera.vendor.pixpro.wrapper.command.messages.connection + +import jp.osdn.gokigen.gokigenassets.camera.vendor.pixpro.wrapper.command.messages.IPixproCommandCallback +import jp.osdn.gokigen.gokigenassets.camera.vendor.pixpro.wrapper.command.messages.base.IPixproMessages +import jp.osdn.gokigen.gokigenassets.camera.vendor.pixpro.wrapper.command.messages.base.PixproCommandBase + +class PixproConnectSequence08(private val callback: IPixproCommandCallback) : PixproCommandBase() +{ + override fun getId() : Int + { + return (IPixproMessages.SEQ_CONNECT_08) + } + + override fun commandBody(): ByteArray { + return byteArrayOf( + 0x2e.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x30.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0xe9.toByte(), + 0x03.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x01.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x80.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x01.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x01.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x30.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x08.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x03.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0xff.toByte(), + 0xff.toByte(), + 0xff.toByte(), + 0xff.toByte(), 0x00.toByte(), 0x00.toByte(), 0x00.toByte(), 0x00.toByte() + ) + } + + override fun responseCallback(): IPixproCommandCallback { + return callback + } + +} diff --git a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/pixpro/wrapper/command/messages/connection/PixproConnectSequence09.kt b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/pixpro/wrapper/command/messages/connection/PixproConnectSequence09.kt new file mode 100644 index 0000000..d3b38b5 --- /dev/null +++ b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/pixpro/wrapper/command/messages/connection/PixproConnectSequence09.kt @@ -0,0 +1,92 @@ +package jp.osdn.gokigen.gokigenassets.camera.vendor.pixpro.wrapper.command.messages.connection + + +import jp.osdn.gokigen.gokigenassets.camera.vendor.pixpro.wrapper.command.messages.IPixproCommandCallback +import jp.osdn.gokigen.gokigenassets.camera.vendor.pixpro.wrapper.command.messages.base.IPixproMessages +import jp.osdn.gokigen.gokigenassets.camera.vendor.pixpro.wrapper.command.messages.base.PixproCommandBase + +class PixproConnectSequence09(private val callback: IPixproCommandCallback) : PixproCommandBase() +{ + + override fun getId() : Int + { + return (IPixproMessages.SEQ_CONNECT_09) + } + + override fun commandBody(): ByteArray { + return byteArrayOf( + 0x2e.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0xf1.toByte(), + 0x03.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x01.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x80.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x01.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0xff.toByte(), + 0xff.toByte(), + 0xff.toByte(), + 0xff.toByte(), 0x00.toByte(), 0x00.toByte(), 0x00.toByte(), 0x00.toByte() + ) + } + + override fun responseCallback(): IPixproCommandCallback { + return callback + } +} diff --git a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/pixpro/wrapper/command/messages/connection/PixproConnectSequence10.kt b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/pixpro/wrapper/command/messages/connection/PixproConnectSequence10.kt new file mode 100644 index 0000000..987413e --- /dev/null +++ b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/pixpro/wrapper/command/messages/connection/PixproConnectSequence10.kt @@ -0,0 +1,147 @@ +package jp.osdn.gokigen.gokigenassets.camera.vendor.pixpro.wrapper.command.messages.connection + +import jp.osdn.gokigen.gokigenassets.camera.vendor.pixpro.wrapper.command.messages.IPixproCommandCallback +import jp.osdn.gokigen.gokigenassets.camera.vendor.pixpro.wrapper.command.messages.base.IPixproMessages +import jp.osdn.gokigen.gokigenassets.camera.vendor.pixpro.wrapper.command.messages.base.PixproCommandBase + +class PixproConnectSequence10(private val callback: IPixproCommandCallback) : PixproCommandBase() +{ + + override fun getId() : Int + { + return (IPixproMessages.SEQ_CONNECT_10) + } + + override fun commandBody(): ByteArray { + return byteArrayOf( + 0x2e.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x20.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0xed.toByte(), + 0x03.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x01.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x80.toByte(), + 0x12.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x01.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x01.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x20.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x12.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x69.toByte(), + 0x08.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x69.toByte(), + 0x08.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x01.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0xff.toByte(), + 0xff.toByte(), + 0xff.toByte(), + 0xff.toByte(), 0x00.toByte(), 0x00.toByte(), 0x00.toByte(), 0x00.toByte() + ) + } + + override fun responseCallback(): IPixproCommandCallback { + return callback + } +} diff --git a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/pixpro/wrapper/command/messages/connection/PixproConnectSequence11.kt b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/pixpro/wrapper/command/messages/connection/PixproConnectSequence11.kt new file mode 100644 index 0000000..6b49136 --- /dev/null +++ b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/pixpro/wrapper/command/messages/connection/PixproConnectSequence11.kt @@ -0,0 +1,92 @@ +package jp.osdn.gokigen.gokigenassets.camera.vendor.pixpro.wrapper.command.messages.connection + + +import jp.osdn.gokigen.gokigenassets.camera.vendor.pixpro.wrapper.command.messages.IPixproCommandCallback +import jp.osdn.gokigen.gokigenassets.camera.vendor.pixpro.wrapper.command.messages.base.IPixproMessages +import jp.osdn.gokigen.gokigenassets.camera.vendor.pixpro.wrapper.command.messages.base.PixproCommandBase + +class PixproConnectSequence11(private val callback: IPixproCommandCallback) : + PixproCommandBase() { + + override fun getId() : Int + { + return (IPixproMessages.SEQ_CONNECT_11) + } + + override fun commandBody(): ByteArray { + return byteArrayOf( + 0x2e.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0xec.toByte(), + 0x03.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x01.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x80.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x01.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0xff.toByte(), + 0xff.toByte(), + 0xff.toByte(), + 0xff.toByte(), 0x00.toByte(), 0x00.toByte(), 0x00.toByte(), 0x00.toByte() + ) + } + + override fun responseCallback(): IPixproCommandCallback { + return callback + } +} diff --git a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/pixpro/wrapper/command/messages/specific/PixproExecuteFocus.kt b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/pixpro/wrapper/command/messages/specific/PixproExecuteFocus.kt new file mode 100644 index 0000000..29da4dc --- /dev/null +++ b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/pixpro/wrapper/command/messages/specific/PixproExecuteFocus.kt @@ -0,0 +1,143 @@ +package jp.osdn.gokigen.gokigenassets.camera.vendor.pixpro.wrapper.command.messages.specific + +import jp.osdn.gokigen.gokigenassets.camera.vendor.pixpro.wrapper.command.messages.IPixproCommandCallback +import jp.osdn.gokigen.gokigenassets.camera.vendor.pixpro.wrapper.command.messages.base.IPixproMessages +import jp.osdn.gokigen.gokigenassets.camera.vendor.pixpro.wrapper.command.messages.base.PixproCommandBase + + +class PixproExecuteFocus(private val callback: IPixproCommandCallback, posX: Int, posY: Int) : PixproCommandBase() +{ + private val data00: Byte = (0x000000ff and posX).toByte() + private val data01: Byte = (0x0000ff00 and posX shr 8).toByte() + private val data02: Byte = (0x00ff0000 and posX shr 16).toByte() + private val data03: Byte = (-0x1000000 and posX shr 24).toByte() + private val data10: Byte = (0x000000ff and posY).toByte() + private val data11: Byte = (0x0000ff00 and posY shr 8).toByte() + private val data12: Byte = (0x00ff0000 and posY shr 16).toByte() + private val data13: Byte = (-0x1000000 and posY shr 24).toByte() + + override fun getId() : Int + { + return (IPixproMessages.SEQ_SHUTTER) + } + + override fun commandBody(): ByteArray + { + return byteArrayOf( + 0x2e.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x18.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0xf6.toByte(), + 0x03.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x01.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x80.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x01.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x01.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x18.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), data00, data01, data02, data03, data10, data11, data12, data13, + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0xff.toByte(), + 0xff.toByte(), + 0xff.toByte(), + 0xff.toByte(), 0x00.toByte(), 0x00.toByte(), 0x00.toByte(), 0x00.toByte() + ) + } + + override fun responseCallback(): IPixproCommandCallback + { + return (callback) + } + +} diff --git a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/pixpro/wrapper/command/messages/specific/PixproExecuteShutter.kt b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/pixpro/wrapper/command/messages/specific/PixproExecuteShutter.kt new file mode 100644 index 0000000..0923fa5 --- /dev/null +++ b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/pixpro/wrapper/command/messages/specific/PixproExecuteShutter.kt @@ -0,0 +1,292 @@ +package jp.osdn.gokigen.gokigenassets.camera.vendor.pixpro.wrapper.command.messages.specific + +import jp.osdn.gokigen.gokigenassets.camera.vendor.pixpro.wrapper.command.messages.IPixproCommandCallback +import jp.osdn.gokigen.gokigenassets.camera.vendor.pixpro.wrapper.command.messages.base.IPixproMessages +import jp.osdn.gokigen.gokigenassets.camera.vendor.pixpro.wrapper.command.messages.base.PixproCommandBase + +class PixproExecuteShutter(private val callback: IPixproCommandCallback) : PixproCommandBase() +{ + override fun getId() : Int + { + return (IPixproMessages.SEQ_SHUTTER) + } + override fun commandBody(): ByteArray + { + return byteArrayOf( // (byte) 0xf9, (byte) 0x03 + 0x2e.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x30.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0xf9.toByte(), + 0x03.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x03.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x80.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x01.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x02.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x08.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x08.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x28.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x01.toByte(), + 0x20.toByte(), + 0x00.toByte(), + 0x90.toByte(), + 0x01.toByte(), + 0xff.toByte(), + 0xff.toByte(), + 0xff.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x01.toByte(), + 0xff.toByte(), + 0xff.toByte(), + 0xff.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0xbf.toByte(), + 0x4d.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x01.toByte(), + 0x88.toByte(), + 0x65.toByte(), + 0xb6.toByte(), + 0xff.toByte(), + 0xff.toByte(), + 0xff.toByte(), + 0xff.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), // (byte) 0xef, (byte) 0x03 + 0x2e.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x08.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0xef.toByte(), + 0x03.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x01.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x80.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x01.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x01.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x08.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x02.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0xff.toByte(), + 0xff.toByte(), + 0xff.toByte(), + 0xff.toByte(), 0x00.toByte(), 0x00.toByte(), 0x00.toByte(), 0x00.toByte() + ) + } + + override fun responseCallback(): IPixproCommandCallback + { + return callback + } + +} \ No newline at end of file diff --git a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/pixpro/wrapper/command/messages/specific/PixproExecuteZoom.kt b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/pixpro/wrapper/command/messages/specific/PixproExecuteZoom.kt new file mode 100644 index 0000000..f8559dc --- /dev/null +++ b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/pixpro/wrapper/command/messages/specific/PixproExecuteZoom.kt @@ -0,0 +1,125 @@ +package jp.osdn.gokigen.gokigenassets.camera.vendor.pixpro.wrapper.command.messages.specific + +import jp.osdn.gokigen.gokigenassets.camera.vendor.pixpro.wrapper.command.messages.IPixproCommandCallback +import jp.osdn.gokigen.gokigenassets.camera.vendor.pixpro.wrapper.command.messages.base.IPixproMessages +import jp.osdn.gokigen.gokigenassets.camera.vendor.pixpro.wrapper.command.messages.base.PixproCommandBase + +class PixproExecuteZoom(private val callback: IPixproCommandCallback, direction: Int) : PixproCommandBase() +{ + private val data0: Byte = if (direction > 0) 0x03.toByte() else 0x04.toByte() + + override fun getId() : Int + { + return (IPixproMessages.SEQ_ZOOM) + } + + override fun commandBody(): ByteArray + { + return byteArrayOf( + 0x2e.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x08.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0xf7.toByte(), + 0x03.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x01.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x80.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x01.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x01.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x08.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), data0, + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0xff.toByte(), + 0xff.toByte(), + 0xff.toByte(), + 0xff.toByte(), 0x00.toByte(), 0x00.toByte(), 0x00.toByte(), 0x00.toByte() + ) + } + + override fun responseCallback(): IPixproCommandCallback + { + return callback + } +} diff --git a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/pixpro/wrapper/command/messages/specific/PixproFlashAuto.kt b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/pixpro/wrapper/command/messages/specific/PixproFlashAuto.kt new file mode 100644 index 0000000..fc887d7 --- /dev/null +++ b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/pixpro/wrapper/command/messages/specific/PixproFlashAuto.kt @@ -0,0 +1,147 @@ +package jp.osdn.gokigen.gokigenassets.camera.vendor.pixpro.wrapper.command.messages.specific + +import jp.osdn.gokigen.gokigenassets.camera.vendor.pixpro.wrapper.command.messages.IPixproCommandCallback +import jp.osdn.gokigen.gokigenassets.camera.vendor.pixpro.wrapper.command.messages.base.IPixproMessages +import jp.osdn.gokigen.gokigenassets.camera.vendor.pixpro.wrapper.command.messages.base.PixproCommandBase + +class PixproFlashAuto(private val callback: IPixproCommandCallback) : PixproCommandBase() +{ + override fun getId() : Int + { + return (IPixproMessages.SEQ_FLASH_AUTO) + } + + override fun commandBody(): ByteArray { + return byteArrayOf( + 0x2e.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x20.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0xed.toByte(), + 0x03.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x01.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x80.toByte(), + 0x09.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x01.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x01.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x20.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x09.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x07.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x07.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x02.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0xff.toByte(), + 0xff.toByte(), + 0xff.toByte(), + 0xff.toByte(), 0x00.toByte(), 0x00.toByte(), 0x00.toByte(), 0x00.toByte() + ) + } + + override fun responseCallback(): IPixproCommandCallback + { + return callback + } +} diff --git a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/pixpro/wrapper/command/messages/specific/PixproFlashOff.kt b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/pixpro/wrapper/command/messages/specific/PixproFlashOff.kt new file mode 100644 index 0000000..124409e --- /dev/null +++ b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/pixpro/wrapper/command/messages/specific/PixproFlashOff.kt @@ -0,0 +1,147 @@ +package jp.osdn.gokigen.gokigenassets.camera.vendor.pixpro.wrapper.command.messages.specific + +import jp.osdn.gokigen.gokigenassets.camera.vendor.pixpro.wrapper.command.messages.IPixproCommandCallback +import jp.osdn.gokigen.gokigenassets.camera.vendor.pixpro.wrapper.command.messages.base.IPixproMessages +import jp.osdn.gokigen.gokigenassets.camera.vendor.pixpro.wrapper.command.messages.base.PixproCommandBase + +class PixproFlashOff(private val callback: IPixproCommandCallback) : PixproCommandBase() +{ + override fun getId() : Int + { + return (IPixproMessages.SEQ_FLASH_OFF) + } + + override fun commandBody(): ByteArray { + return byteArrayOf( + 0x2e.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x20.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0xed.toByte(), + 0x03.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x01.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x80.toByte(), + 0x09.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x01.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x01.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x20.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x09.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x07.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x07.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x01.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0xff.toByte(), + 0xff.toByte(), + 0xff.toByte(), + 0xff.toByte(), 0x00.toByte(), 0x00.toByte(), 0x00.toByte(), 0x00.toByte() + ) + } + + override fun responseCallback(): IPixproCommandCallback + { + return callback + } +} diff --git a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/pixpro/wrapper/command/messages/specific/PixproFlashOn.kt b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/pixpro/wrapper/command/messages/specific/PixproFlashOn.kt new file mode 100644 index 0000000..d778eb7 --- /dev/null +++ b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/pixpro/wrapper/command/messages/specific/PixproFlashOn.kt @@ -0,0 +1,147 @@ +package jp.osdn.gokigen.gokigenassets.camera.vendor.pixpro.wrapper.command.messages.specific + +import jp.osdn.gokigen.gokigenassets.camera.vendor.pixpro.wrapper.command.messages.IPixproCommandCallback +import jp.osdn.gokigen.gokigenassets.camera.vendor.pixpro.wrapper.command.messages.base.IPixproMessages +import jp.osdn.gokigen.gokigenassets.camera.vendor.pixpro.wrapper.command.messages.base.PixproCommandBase + +class PixproFlashOn(private val callback: IPixproCommandCallback) : PixproCommandBase() +{ + override fun getId() : Int + { + return (IPixproMessages.SEQ_FLASH_ON) + } + + override fun commandBody(): ByteArray { + return byteArrayOf( + 0x2e.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x20.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0xed.toByte(), + 0x03.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x01.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x80.toByte(), + 0x09.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x01.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x01.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x20.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x09.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x07.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x07.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x04.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0x00.toByte(), + 0xff.toByte(), + 0xff.toByte(), + 0xff.toByte(), + 0xff.toByte(), 0x00.toByte(), 0x00.toByte(), 0x00.toByte(), 0x00.toByte() + ) + } + + override fun responseCallback(): IPixproCommandCallback + { + return callback + } +} diff --git a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/pixpro/wrapper/connection/PixproCameraConnectSequence.kt b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/pixpro/wrapper/connection/PixproCameraConnectSequence.kt new file mode 100644 index 0000000..a963ad3 --- /dev/null +++ b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/pixpro/wrapper/connection/PixproCameraConnectSequence.kt @@ -0,0 +1,276 @@ +package jp.osdn.gokigen.gokigenassets.camera.vendor.pixpro.wrapper.connection + +import android.graphics.Color +import android.util.Log +import androidx.appcompat.app.AppCompatActivity +import jp.osdn.gokigen.gokigenassets.camera.interfaces.ICameraConnection +import jp.osdn.gokigen.gokigenassets.camera.interfaces.ICameraStatusReceiver +import jp.osdn.gokigen.gokigenassets.camera.vendor.pixpro.IPixproInternalInterfaces +import jp.osdn.gokigen.gokigenassets.camera.vendor.pixpro.wrapper.command.IPixproCommandPublisher +import jp.osdn.gokigen.gokigenassets.camera.vendor.pixpro.wrapper.command.messages.IPixproCommandCallback +import jp.osdn.gokigen.gokigenassets.camera.vendor.pixpro.wrapper.command.messages.base.IPixproMessages +import jp.osdn.gokigen.gokigenassets.camera.vendor.pixpro.wrapper.command.messages.base.IPixproMessages.Companion.SEQ_CONNECT_01 +import jp.osdn.gokigen.gokigenassets.camera.vendor.pixpro.wrapper.command.messages.base.IPixproMessages.Companion.SEQ_CONNECT_02 +import jp.osdn.gokigen.gokigenassets.camera.vendor.pixpro.wrapper.command.messages.base.IPixproMessages.Companion.SEQ_CONNECT_03 +import jp.osdn.gokigen.gokigenassets.camera.vendor.pixpro.wrapper.command.messages.base.IPixproMessages.Companion.SEQ_CONNECT_04 +import jp.osdn.gokigen.gokigenassets.camera.vendor.pixpro.wrapper.command.messages.base.IPixproMessages.Companion.SEQ_CONNECT_05 +import jp.osdn.gokigen.gokigenassets.camera.vendor.pixpro.wrapper.command.messages.base.IPixproMessages.Companion.SEQ_CONNECT_06 +import jp.osdn.gokigen.gokigenassets.camera.vendor.pixpro.wrapper.command.messages.base.IPixproMessages.Companion.SEQ_CONNECT_07 +import jp.osdn.gokigen.gokigenassets.camera.vendor.pixpro.wrapper.command.messages.base.IPixproMessages.Companion.SEQ_CONNECT_08 +import jp.osdn.gokigen.gokigenassets.camera.vendor.pixpro.wrapper.command.messages.base.IPixproMessages.Companion.SEQ_CONNECT_09 +import jp.osdn.gokigen.gokigenassets.camera.vendor.pixpro.wrapper.command.messages.base.IPixproMessages.Companion.SEQ_CONNECT_10 +import jp.osdn.gokigen.gokigenassets.camera.vendor.pixpro.wrapper.command.messages.base.IPixproMessages.Companion.SEQ_CONNECT_11 +import jp.osdn.gokigen.gokigenassets.camera.vendor.pixpro.wrapper.command.messages.base.IPixproMessages.Companion.SEQ_FLASH_AUTO +import jp.osdn.gokigen.gokigenassets.camera.vendor.pixpro.wrapper.command.messages.base.IPixproMessages.Companion.SEQ_FLASH_OFF +import jp.osdn.gokigen.gokigenassets.camera.vendor.pixpro.wrapper.command.messages.base.IPixproMessages.Companion.SEQ_FLASH_ON +import jp.osdn.gokigen.gokigenassets.camera.vendor.pixpro.wrapper.command.messages.connection.* +import jp.osdn.gokigen.gokigenassets.camera.vendor.pixpro.wrapper.command.messages.specific.PixproFlashAuto +import jp.osdn.gokigen.gokigenassets.camera.vendor.pixpro.wrapper.command.messages.specific.PixproFlashOff +import jp.osdn.gokigen.gokigenassets.camera.vendor.pixpro.wrapper.command.messages.specific.PixproFlashOn +import jp.osdn.gokigen.gokigenassets.camera.vendor.pixpro.wrapper.status.PixproStatusChecker +import jp.osdn.gokigen.gokigenassets.constants.ICameraConstantConvert + + +class PixproCameraConnectSequence(private val context: AppCompatActivity, private val cameraStatusReceiver: ICameraStatusReceiver, private val cameraConnection : ICameraConnection, private val interfaceProvider : IPixproInternalInterfaces, private val statusChecker: PixproStatusChecker) : Runnable, IPixproCommandCallback, IPixproMessages +{ + private val commandIssuer: IPixproCommandPublisher + private var flashMode: String = "OFF" + + companion object + { + private val TAG = PixproCameraConnectSequence::class.java.simpleName + } + + init + { + Log.v(TAG, " PixproCameraConnectSequence") + //this.cameraConnection = cameraConnection + commandIssuer = interfaceProvider.getIPixproCommandPublisher() + } + + override fun run() + { + try + { + // カメラとTCP接続 + //val issuer: IPixproCommandPublisher = interfaceProvider.getCommandPublisher() + if (!commandIssuer.isConnected()) + { + if (!interfaceProvider.getIPixproCommunication().connect()) + { + // 接続失敗... + interfaceProvider.getInformationReceiver().updateMessage( + context.getString(ICameraConstantConvert.ID_STRING_DIALOG_TITLE_CONNECT_FAILED), + false, + true, + Color.RED + ) + onConnectError(context.getString(ICameraConstantConvert.ID_STRING_DIALOG_TITLE_CONNECT_FAILED)) + return + } + } + else + { + Log.v(TAG, "SOCKET IS ALREADY CONNECTED...") + } + // コマンドタスクの実行開始 + commandIssuer.start() + + // 接続シーケンスの開始 + startConnectSequence() + } + catch (e: Exception) + { + e.printStackTrace() + interfaceProvider.getInformationReceiver().updateMessage( + context.getString(ICameraConstantConvert.ID_STRING_DIALOG_TITLE_CONNECT_FAILED), + false, + true, + Color.RED + ) + onConnectError(e.message?: "") + } + } + + private fun onConnectError(reason: String) + { + cameraConnection.alertConnectingFailed(reason) + } + + override fun receivedMessage(id: Int, rx_body: ByteArray?) { + when (id) { + SEQ_CONNECT_01 -> { + interfaceProvider.getInformationReceiver().updateMessage( + context.getString(ICameraConstantConvert.ID_STRING_CONNECT_CONNECTING) + "1", + false, + false, + 0 + ) + commandIssuer.enqueueCommand(PixproConnectSequence02(this)) + } + SEQ_CONNECT_02 -> { + interfaceProvider.getInformationReceiver().updateMessage( + context.getString(ICameraConstantConvert.ID_STRING_CONNECT_CONNECTING) + "2", + false, + false, + 0 + ) + commandIssuer.enqueueCommand(PixproConnectSequence03(this)) + } + SEQ_CONNECT_03 -> { + interfaceProvider.getInformationReceiver().updateMessage( + context.getString(ICameraConstantConvert.ID_STRING_CONNECT_CONNECTING) + "3", + false, + false, + 0 + ) + commandIssuer.enqueueCommand(PixproConnectSequence04(this)) + } + SEQ_CONNECT_04 -> { + interfaceProvider.getInformationReceiver().updateMessage( + context.getString(ICameraConstantConvert.ID_STRING_CONNECT_CONNECTING) + "4", + false, + false, + 0 + ) + // ここで、パスワードの Base64情報を切り出す(FC 03 の応答、 0x0058 ～ 64バイトの文字列を切り出して、Base64エンコードする) + commandIssuer.enqueueCommand(PixproConnectSequence05(this)) + } + SEQ_CONNECT_05 -> { + interfaceProvider.getInformationReceiver().updateMessage( + context.getString(ICameraConstantConvert.ID_STRING_CONNECT_CONNECTING) + "5", + false, + false, + 0 + ) + // ここで、パスワードの情報を切り出す (FE 03 の応答、 0x0078 ～ 文字列を切り出す。) + commandIssuer.enqueueCommand(PixproConnectSequence06(this)) + } + SEQ_CONNECT_06 -> { + interfaceProvider.getInformationReceiver().updateMessage( + context.getString(ICameraConstantConvert.ID_STRING_CONNECT_CONNECTING) + "6", + false, + false, + 0 + ) + commandIssuer.enqueueCommand(PixproConnectSequence07(this)) + } + SEQ_CONNECT_07 -> { + interfaceProvider.getInformationReceiver().updateMessage( + context.getString(ICameraConstantConvert.ID_STRING_CONNECT_CONNECTING) + "7", + false, + false, + 0 + ) + commandIssuer.enqueueCommand(PixproConnectSequence08(this)) + } + SEQ_CONNECT_08 -> { + interfaceProvider.getInformationReceiver().updateMessage( + context.getString(ICameraConstantConvert.ID_STRING_CONNECT_CONNECTING) + "8", + false, + false, + 0 + ) + commandIssuer.enqueueCommand(PixproConnectSequence09(this)) + } + SEQ_CONNECT_09 -> { + interfaceProvider.getInformationReceiver().updateMessage( + context.getString(ICameraConstantConvert.ID_STRING_CONNECT_CONNECTING) + "9", + false, + false, + 0 + ) + commandIssuer.enqueueCommand(PixproConnectSequence10(this)) + } + SEQ_CONNECT_10 -> { + interfaceProvider.getInformationReceiver().updateMessage( + context.getString(ICameraConstantConvert.ID_STRING_CONNECT_CONNECTING) + "10", + false, + false, + 0 + ) + commandIssuer.enqueueCommand(PixproConnectSequence11(this)) + } + SEQ_CONNECT_11 -> { + interfaceProvider.getInformationReceiver().updateMessage( + context.getString(ICameraConstantConvert.ID_STRING_CONNECT_CONNECTING) + "11", + false, + false, + 0 + ) + if (flashMode.contains("AUTO")) { + commandIssuer.enqueueCommand(PixproFlashAuto(this)) + } else if (flashMode.contains("ON")) { + commandIssuer.enqueueCommand(PixproFlashOn(this)) + } else { + commandIssuer.enqueueCommand(PixproFlashOff(this)) + } + } + SEQ_FLASH_AUTO, SEQ_FLASH_OFF, SEQ_FLASH_ON -> { + interfaceProvider.getInformationReceiver().updateMessage( + context.getString(ICameraConstantConvert.ID_STRING_CONNECT_CONNECT_FINISHED), + false, + false, + 0 + ) + connectFinished() + Log.v(TAG, " CONNECT TO CAMERA : DONE.") + } + else -> { + Log.v(TAG, " RECEIVED UNKNOWN ID : $id") + onConnectError(context.getString(ICameraConstantConvert.ID_STRING_CONNECT_UNKNOWN_MESSAGE)) + } + } + } + + private fun startConnectSequence() + { + interfaceProvider.getInformationReceiver() + .updateMessage(context.getString(ICameraConstantConvert.ID_STRING_CONNECT_START), false, false, 0) + cameraStatusReceiver.onStatusNotify(context.getString(ICameraConstantConvert.ID_STRING_CONNECT_START)) + commandIssuer.enqueueCommand(PixproConnectSequence01(this)) + } + + private fun connectFinished() + { + try + { + // 接続成功のメッセージを出す + interfaceProvider.getInformationReceiver() + .updateMessage(context.getString(ICameraConstantConvert.ID_STRING_CONNECT_CONNECTED), false, false, 0) + + // ちょっと待つ + Thread.sleep(1000) + + //interfaceProvider.getAsyncEventCommunication().connect(); + //interfaceProvider.getCameraStatusWatcher().startStatusWatch(interfaceProvider.getStatusListener()); ステータスの定期確認は実施しない + + // 接続成功！のメッセージを出す + interfaceProvider.getInformationReceiver() + .updateMessage(context.getString(ICameraConstantConvert.ID_STRING_CONNECT_CONNECTED), false, false, 0) + onConnectNotify() + } + catch (e: Exception) + { + e.printStackTrace() + } + } + + private fun onConnectNotify() + { + try + { + val thread = Thread { // カメラとの接続確立を通知する + cameraStatusReceiver.onStatusNotify(context.getString(ICameraConstantConvert.ID_STRING_CONNECT_CONNECTED)) + cameraStatusReceiver.onCameraConnected() + Log.v(TAG, " onConnectNotify()") + } + thread.start() + } + catch (e: Exception) + { + e.printStackTrace() + } + } + +} diff --git a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/pixpro/wrapper/connection/PixproCameraDisconnectSequence.kt b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/pixpro/wrapper/connection/PixproCameraDisconnectSequence.kt new file mode 100644 index 0000000..38f72df --- /dev/null +++ b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/pixpro/wrapper/connection/PixproCameraDisconnectSequence.kt @@ -0,0 +1,24 @@ +package jp.osdn.gokigen.gokigenassets.camera.vendor.pixpro.wrapper.connection + +import androidx.appcompat.app.AppCompatActivity +import jp.osdn.gokigen.gokigenassets.camera.vendor.pixpro.IPixproInternalInterfaces +import jp.osdn.gokigen.gokigenassets.camera.vendor.pixpro.wrapper.command.IPixproCommunication +import jp.osdn.gokigen.gokigenassets.camera.vendor.pixpro.wrapper.status.PixproStatusChecker +import java.lang.Exception + + +class PixproCameraDisconnectSequence(private val context: AppCompatActivity, private val powerOff: Boolean, private val interfaceProvider : IPixproInternalInterfaces, private val statusChecker: PixproStatusChecker) : Runnable +{ + override fun run() + { + try + { + statusChecker.stopStatusWatch() + interfaceProvider.getIPixproCommunication().disconnect() + } + catch (e: Exception) + { + e.printStackTrace() + } + } +} diff --git a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/pixpro/wrapper/connection/PixproConnection.kt b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/pixpro/wrapper/connection/PixproConnection.kt new file mode 100644 index 0000000..d75c4b9 --- /dev/null +++ b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/pixpro/wrapper/connection/PixproConnection.kt @@ -0,0 +1,197 @@ +package jp.osdn.gokigen.gokigenassets.camera.vendor.pixpro.wrapper.connection + +import android.content.* +import android.net.ConnectivityManager +import android.net.wifi.WifiManager +import android.provider.Settings +import android.util.Log +import androidx.appcompat.app.AlertDialog +import androidx.appcompat.app.AppCompatActivity +import jp.osdn.gokigen.gokigenassets.camera.interfaces.ICameraConnection +import jp.osdn.gokigen.gokigenassets.camera.interfaces.ICameraConnectionStatus +import jp.osdn.gokigen.gokigenassets.camera.interfaces.ICameraStatusReceiver +import jp.osdn.gokigen.gokigenassets.camera.vendor.pixpro.IPixproInternalInterfaces +import jp.osdn.gokigen.gokigenassets.camera.vendor.pixpro.wrapper.status.PixproStatusChecker +import jp.osdn.gokigen.gokigenassets.constants.ICameraConstantConvert +import java.lang.Exception +import java.util.concurrent.Executor +import java.util.concurrent.Executors + +class PixproConnection(private val context: AppCompatActivity, private val statusReceiver: ICameraStatusReceiver, private val interfaceProvider : IPixproInternalInterfaces, private val statusChecker: PixproStatusChecker) : ICameraConnection +{ + companion object + { + private val TAG = PixproConnection::class.java.simpleName + } + private val connectionReceiver: BroadcastReceiver + private val cameraExecutor: Executor = Executors.newFixedThreadPool(1) + private var connectionStatus: ICameraConnectionStatus.CameraConnectionStatus = ICameraConnectionStatus.CameraConnectionStatus.UNKNOWN + init + { + Log.v(TAG, "PixproConnection()") + connectionReceiver = object : BroadcastReceiver() { + override fun onReceive(context: Context, intent: Intent) + { + onReceiveBroadcastOfConnection(context, intent) + } + } + } + + /** + * + * + */ + private fun onReceiveBroadcastOfConnection(context: Context, intent: Intent) + { + statusReceiver.onStatusNotify(context.getString(ICameraConstantConvert.ID_STRING_CONNECT_CHECK_WIFI)) + Log.v(TAG, context.getString(ICameraConstantConvert.ID_STRING_CONNECT_CHECK_WIFI)) + try + { + val action = intent.action + if (action == null) + { + Log.v(TAG, "intent.getAction() : null") + return + } + + @Suppress("DEPRECATION") + if (action == ConnectivityManager.CONNECTIVITY_ACTION) + { + Log.v(TAG, "onReceiveBroadcastOfConnection() : CONNECTIVITY_ACTION") + val wifiManager = context.applicationContext.getSystemService(Context.WIFI_SERVICE) as WifiManager + val info = wifiManager.connectionInfo + if (wifiManager.isWifiEnabled && info != null) + { + Log.v(TAG, "Network ID is " + info.networkId) + // 自動接続が指示されていた場合は、カメラとの接続処理を行う + connectToCamera() + } + else + { + if (info == null) + { + Log.v(TAG, "NETWORK INFO IS NULL.") + } + else + { + Log.v(TAG, "isWifiEnabled : " + wifiManager.isWifiEnabled + " NetworkId : " + info.networkId) + } + } + } + } + catch (e: Exception) + { + Log.w(TAG, "onReceiveBroadcastOfConnection() EXCEPTION" + e.message) + e.printStackTrace() + } + } + + fun startWatchWifiStatus(context: Context) + { + Log.v(TAG, "startWatchWifiStatus()") + statusReceiver.onStatusNotify("prepare") + val filter = IntentFilter() + filter.addAction(WifiManager.NETWORK_STATE_CHANGED_ACTION) + @Suppress("DEPRECATION") + filter.addAction(ConnectivityManager.CONNECTIVITY_ACTION) + context.registerReceiver(connectionReceiver, filter) + } + + fun stopWatchWifiStatus(context: Context) + { + Log.v(TAG, "stopWatchWifiStatus()") + context.unregisterReceiver(connectionReceiver) + disconnect(false) + } + + fun disconnect(powerOff: Boolean) + { + Log.v(TAG, "disconnect()") + disconnectFromCamera(powerOff) + connectionStatus = ICameraConnectionStatus.CameraConnectionStatus.DISCONNECTED + statusReceiver.onCameraDisconnected() + } + + fun connect() + { + Log.v(TAG, "connect()") + connectToCamera() + } + + override fun alertConnectingFailed(message: String?) + { + Log.v(TAG, "alertConnectingFailed() : $message") + try + { + val builder: AlertDialog.Builder = AlertDialog.Builder(context) + .setTitle(context.getString(ICameraConstantConvert.ID_STRING_DIALOG_TITLE_CONNECT_FAILED)) + .setMessage(message) + .setPositiveButton(context.getString(ICameraConstantConvert.ID_STRING_DIALOG_BUTTON_RETRY)) { _, _ -> connect() } + .setNeutralButton(ICameraConstantConvert.ID_STRING_DIALOG_BUTTON_NETWORK_SETTINGS) { _, _ -> + try + { + // Wifi 設定画面を表示する + context.startActivity(Intent(Settings.ACTION_WIFI_SETTINGS)) + } + catch (ex: ActivityNotFoundException) + { + // Activity が存在しなかった...設定画面が起動できなかった + Log.v(TAG, "android.content.ActivityNotFoundException...") + + // この場合は、再試行と等価な動きとする + connect() + } + catch (e: Exception) + { + e.printStackTrace() + } + } + context.runOnUiThread { builder.show() } + } + catch (e : Exception) + { + e.printStackTrace() + } + } + + fun getConnectionStatus(): ICameraConnectionStatus.CameraConnectionStatus + { + Log.v(TAG, "getConnectionStatus()") + return connectionStatus + } + + override fun forceUpdateConnectionStatus(status: ICameraConnectionStatus.CameraConnectionStatus) + { + Log.v(TAG, "forceUpdateConnectionStatus()") + connectionStatus = status + } + + private fun disconnectFromCamera(powerOff: Boolean) + { + Log.v(TAG, "disconnectFromCamera()") + try + { + cameraExecutor.execute(PixproCameraDisconnectSequence(context, powerOff, interfaceProvider, statusChecker)) + } + catch (e: Exception) + { + e.printStackTrace() + } + } + + private fun connectToCamera() + { + Log.v(TAG, "connectToCamera()") + connectionStatus = ICameraConnectionStatus.CameraConnectionStatus.CONNECTING + try + { + cameraExecutor.execute(PixproCameraConnectSequence(context, statusReceiver, this, interfaceProvider, statusChecker)) + } + catch (e: Exception) + { + Log.v(TAG, "connectToCamera() EXCEPTION : " + e.message) + e.printStackTrace() + } + } + +} diff --git a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/pixpro/wrapper/connection/PixproConnectionClient.kt b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/pixpro/wrapper/connection/PixproConnectionClient.kt new file mode 100644 index 0000000..2a9fd2d --- /dev/null +++ b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/pixpro/wrapper/connection/PixproConnectionClient.kt @@ -0,0 +1,313 @@ +package jp.osdn.gokigen.gokigenassets.camera.vendor.pixpro.wrapper.connection + +import android.content.Context +import android.util.Log +import jp.osdn.gokigen.gokigenassets.camera.interfaces.ICameraStatusReceiver +import jp.osdn.gokigen.gokigenassets.camera.vendor.sony.wrapper.ISonyCamera +import jp.osdn.gokigen.gokigenassets.camera.vendor.sony.wrapper.SonyCameraDeviceProvider +import jp.osdn.gokigen.gokigenassets.constants.ICameraConstantConvert +import jp.osdn.gokigen.gokigenassets.utils.communication.SimpleHttpClient +import jp.osdn.gokigen.gokigenassets.utils.communication.XmlElement +import java.net.DatagramPacket +import java.net.DatagramSocket +import java.net.InetSocketAddress +import java.nio.charset.Charset +import android.net.DhcpInfo +import androidx.core.content.ContextCompat.getSystemService +import android.net.wifi.WifiManager +import androidx.core.content.ContextCompat +import jp.osdn.gokigen.gokigenassets.camera.vendor.sony.wrapper.connection.SonySsdpClient +import java.net.InetAddress + + +class PixproConnectionClient(private val context: Context, private val callback: ISearchResultCallback, private val cameraStatusReceiver: ICameraStatusReceiver, private var sendRepeatCount: Int = 0) +{ + companion object + { + private val TAG = PixproConnectionClient::class.java.simpleName + private const val SEND_TIMES_DEFAULT = 1 + private const val SEND_WAIT_DURATION_MS = 300 + private const val SSDP_RECEIVE_TIMEOUT = 4 * 1000 // msec + private const val PACKET_BUFFER_SIZE = 4096 + + private const val QUERY_STRING = "AOFQUERY:GOKIGEN01Family,1" + private const val TARGET_UDP_PORT = 5175 + } + + init + { + this.sendRepeatCount = if (sendRepeatCount > 0) sendRepeatCount else SEND_TIMES_DEFAULT + } + + private fun getBroadcastAddress(): InetAddress + { +/* + try + { + val wifi = context.getSystemService(Context.WIFI_SERVICE) as WifiManager? + val dhcp = wifi!!.dhcpInfo + // handle null somehow + val broadcast = dhcp.ipAddress and dhcp.netmask or dhcp.netmask.inv() + val quads = ByteArray(4) + for (k in 0..3) quads[k] = (broadcast shr k * 8).toByte() + return InetAddress.getByAddress(quads) + } + catch (e : Exception) + { + e.printStackTrace() + } +*/ + return (InetAddress.getByName("255.255.255.255")) + } + + fun search() + { + val sendData = QUERY_STRING.toByteArray() + val detailString = "" + var socket: DatagramSocket? = null + var receivePacket: DatagramPacket + val packet: DatagramPacket + + // 要求の送信 + try + { + socket = DatagramSocket() + socket.reuseAddress = true + val iAddress = InetSocketAddress(getBroadcastAddress(), TARGET_UDP_PORT) + packet = DatagramPacket(sendData, sendData.size, iAddress) + + // 要求を繰り返し送信する + for (loop in 1..sendRepeatCount) + { + cameraStatusReceiver.onStatusNotify(context.getString(ICameraConstantConvert.ID_STRING_CONNECT_CAMERA_SEARCH_REQUEST) + " " + loop) + socket.send(packet) + Thread.sleep(SEND_WAIT_DURATION_MS.toLong()) + } + Log.v(TAG, " UDP QUERY : SEND $QUERY_STRING") + } + catch (e: Exception) + { + if (socket != null && !socket.isClosed) + { + socket.close() + } + e.printStackTrace() + + // エラー応答する + callback.onErrorFinished(detailString + " : " + e.localizedMessage) + return + } + + // 応答の受信 + val startTime = System.currentTimeMillis() + var currentTime = System.currentTimeMillis() + val foundDevices: MutableList = ArrayList() + val array = ByteArray(PACKET_BUFFER_SIZE) + + try + { + cameraStatusReceiver.onStatusNotify(context.getString(ICameraConstantConvert.ID_STRING_CONNECT_WAIT_REPLY_CAMERA)) + while (currentTime - startTime < SSDP_RECEIVE_TIMEOUT) + { + receivePacket = DatagramPacket(array, array.size) + socket.soTimeout = SSDP_RECEIVE_TIMEOUT + socket.receive(receivePacket) + val ssdpReplyMessage = String(receivePacket.getData(), 0, receivePacket.length, Charset.forName("UTF-8")) + var ddUsn: String? + if (ssdpReplyMessage.contains("HTTP/1.1 200")) + { + ddUsn = findParameterValue(ssdpReplyMessage, "USN") + cameraStatusReceiver.onStatusNotify(context.getString(ICameraConstantConvert.ID_STRING_CONNECT_CAMERA_RECEIVED_REPLY)) + if (!foundDevices.contains(ddUsn)) + { + val ddLocation = findParameterValue(ssdpReplyMessage, "LOCATION") + foundDevices.add(ddUsn) + + //// Fetch Device Description XML and parse it. + if (ddLocation != null) + { + cameraStatusReceiver.onStatusNotify("LOCATION : $ddLocation") + val device: ISonyCamera? = searchSonyCameraDevice(ddLocation) + if ((device != null)&&(device.hasApiService("camera"))) + { + cameraStatusReceiver.onStatusNotify(context.getString( + ICameraConstantConvert.ID_STRING_CONNECT_CAMERA_FOUND) + " " + device.getFriendlyName()) + callback.onDeviceFound(device) + // カメラが見つかった場合は breakする + break + } + else + { + // カメラが見つからない... + cameraStatusReceiver.onStatusNotify(context.getString( + ICameraConstantConvert.ID_STRING_CAMERA_NOT_FOUND)) + } + } + } + else + { + Log.v(TAG, "Already received. : $ddUsn") + } + } + else + { + Log.v(TAG, " SSDP REPLY MESSAGE (ignored) : $ssdpReplyMessage") + } + currentTime = System.currentTimeMillis() + } + } + catch (e: Exception) + { + e.printStackTrace() + + // エラー応答する + callback.onErrorFinished(detailString + " : " + e.localizedMessage) + return + } + finally + { + try + { + if (!socket.isClosed()) + { + socket.close() + } + } + catch (ee: Exception) + { + ee.printStackTrace() + } + } + callback.onFinished() + } + + private fun findParameterValue(ssdpMessage: String, paramName: String): String? + { + var name = paramName + if (!name.endsWith(":")) + { + name = "$name:" + } + var start = ssdpMessage.indexOf(name) + val end = ssdpMessage.indexOf("\r\n", start) + if (start != -1 && end != -1) + { + start += name.length + try + { + return ssdpMessage.substring(start, end).trim { it <= ' ' } + } + catch (e: Exception) + { + e.printStackTrace() + } + } + return null + } + + private fun searchSonyCameraDevice(ddUrl: String): ISonyCamera? + { + val httpClient = SimpleHttpClient() + var device: SonyCameraDeviceProvider? = null + val ddXml: String + try + { + ddXml = httpClient.httpGet(ddUrl, -1) + Log.d(TAG, "fetch () httpGet done. : " + ddXml.length) + if (ddXml.length < 2) + { + // 内容がないときは...終了する + Log.v(TAG, "NO BODY") + return (null) + } + } + catch (e: java.lang.Exception) + { + e.printStackTrace() + return (null) + } + try + { + //Log.v(TAG, "ddXml : " + ddXml); + val rootElement = XmlElement.parse(ddXml) + + // "root" + if ("root" == rootElement.tagName) + { + // "device" + val deviceElement = rootElement.findChild("device") + val friendlyName = deviceElement.findChild("friendlyName").value + val modelName = deviceElement.findChild("modelName").value + val udn = deviceElement.findChild("UDN").value + + // "iconList" + var iconUrl = "" + val iconListElement = deviceElement.findChild("iconList") + val iconElements = iconListElement.findChildren("icon") + for (iconElement in iconElements) { + // Choose png icon to show Android UI. + if ("image/png" == iconElement.findChild("mimetype").value) { + val uri = iconElement.findChild("url").value + val hostUrl = toSchemeAndHost(ddUrl) + iconUrl = hostUrl + uri + } + } + device = SonyCameraDeviceProvider(ddUrl, friendlyName, modelName, udn, iconUrl) + + // "av:X_ScalarWebAPI_DeviceInfo" + val wApiElement = deviceElement.findChild("X_ScalarWebAPI_DeviceInfo") + val wApiServiceListElement = wApiElement.findChild("X_ScalarWebAPI_ServiceList") + val wApiServiceElements = + wApiServiceListElement.findChildren("X_ScalarWebAPI_Service") + for (wApiServiceElement in wApiServiceElements) { + val serviceName = + wApiServiceElement.findChild("X_ScalarWebAPI_ServiceType").value + val actionUrl = + wApiServiceElement.findChild("X_ScalarWebAPI_ActionList_URL").value + device.addApiService(serviceName, actionUrl) + } + } + } catch (e: java.lang.Exception) { + e.printStackTrace() + } + Log.d(TAG, "fetch () parsing XML done.") + if (device == null) { + Log.v(TAG, "device is null.") + } + return device + } + + private fun toSchemeAndHost(url: String): String { + val i = url.indexOf("://") // http:// or https:// + if (i == -1) { + return "" + } + val j = url.indexOf("/", i + 3) + return if (j == -1) { + "" + } else url.substring(0, j) + } + + private fun toHost(url: String): String + { + val i = url.indexOf("://") // http:// or https:// + if (i == -1) { + return "" + } + val j = url.indexOf(":", i + 3) + return if (j == -1) { + "" + } else url.substring(i + 3, j) + } + + /** + * 検索結果のコールバック + * + */ + interface ISearchResultCallback + { + fun onDeviceFound(cameraDevice: ISonyCamera) // デバイスが見つかった！ + fun onFinished() // 通常の終了をしたとき + fun onErrorFinished(reason: String?) // エラーが発生して応答したとき + } +} diff --git a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/pixpro/wrapper/liveview/PixproLiveViewControl.kt b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/pixpro/wrapper/liveview/PixproLiveViewControl.kt new file mode 100644 index 0000000..5374593 --- /dev/null +++ b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/pixpro/wrapper/liveview/PixproLiveViewControl.kt @@ -0,0 +1,121 @@ +package jp.osdn.gokigen.gokigenassets.camera.vendor.pixpro.wrapper.liveview + +import android.content.Context +import android.util.Log +import jp.osdn.gokigen.gokigenassets.camera.interfaces.ILiveViewController +import java.lang.Exception +import jp.osdn.gokigen.gokigenassets.liveview.image.CameraLiveViewListenerImpl +import jp.osdn.gokigen.gokigenassets.scene.IInformationReceiver +import jp.osdn.gokigen.gokigenassets.utils.communication.SimpleLiveViewSlicer + + +class PixproLiveViewControl(context: Context, private val informationReceiver: IInformationReceiver, camera_ip : String, liveview_port : Int) : ILiveViewController +{ + private val liveViewListener = CameraLiveViewListenerImpl(context, informationReceiver) + private val liveViewUrl: String = "http://$camera_ip:$liveview_port/"; // "http://172.16.0.254:9176"; + private var whileFetching = false + + companion object + { + private val TAG = PixproLiveViewControl::class.java.simpleName + private const val FETCH_ERROR_MAX = 30 + } + + override fun startLiveView(isCameraScreen: Boolean) + { + Log.v(TAG, "startLiveView() : $isCameraScreen") + try + { + val thread = Thread { + try + { + start(liveViewUrl) + } + catch (e: Exception) + { + e.printStackTrace() + } + } + thread.start() + } + catch (e: Exception) + { + e.printStackTrace() + } + } + + override fun stopLiveView() + { + Log.v(TAG, " stopLiveView()") + } + + + private fun start(streamUrl: String) + { + if (whileFetching) + { + Log.v(TAG, "start() already starting.") + return // すでにスタートしているので、LVの再スタートはしない。 + } + whileFetching = true + + // A thread for retrieving liveview data from server. + try + { + val thread = Thread { + Log.d(TAG, "Starting retrieving streaming data from server.") + // var slicer: SimpleLiveviewSlicer? = null + var continuousNullDataReceived = 0 + val startMarker = intArrayOf(0x0a, 0x0a, 0xff, 0xd8) + try { + // Create Slicer to open the stream and parse it. + val slicer = SimpleLiveViewSlicer() + slicer.setMJpegStartMarker(startMarker) + slicer.open(streamUrl) + while (whileFetching) + { + val payload: SimpleLiveViewSlicer.Payload? = slicer.nextPayloadForMotionJpeg() + if (payload == null) + { + //Log.v(TAG, "Liveview Payload is null."); + continuousNullDataReceived++ + if (continuousNullDataReceived > FETCH_ERROR_MAX) { + Log.d(TAG, " FETCH ERROR MAX OVER ") + break + } + continue + } + //if (mJpegQueue.size() == 2) + //{ + // mJpegQueue.remove(); + //} + //mJpegQueue.add(payload.getJpegData()); + liveViewListener.onUpdateLiveView(payload.getJpegData() ?: ByteArray(0), null) + continuousNullDataReceived = 0 + } + } + catch (e: Exception) + { + e.printStackTrace() + } + finally + { + //mJpegQueue.clear(); + if (!whileFetching && continuousNullDataReceived > FETCH_ERROR_MAX) + { + // 再度ライブビューのスタートをやってみる。 + //whileFetching = false; + //continuousNullDataReceived = 0; + start(streamUrl) + } + } + } + thread.start() + } + catch (e: Exception) + { + e.printStackTrace() + } + } + +} \ No newline at end of file diff --git a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/pixpro/wrapper/status/PixproStatusChecker.kt b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/pixpro/wrapper/status/PixproStatusChecker.kt new file mode 100644 index 0000000..84fa71d --- /dev/null +++ b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/pixpro/wrapper/status/PixproStatusChecker.kt @@ -0,0 +1,82 @@ +package jp.osdn.gokigen.gokigenassets.camera.vendor.pixpro.wrapper.status + +import android.util.Log +import jp.osdn.gokigen.gokigenassets.camera.interfaces.ICameraStatusUpdateNotify +import jp.osdn.gokigen.gokigenassets.camera.interfaces.ICameraStatus +import jp.osdn.gokigen.gokigenassets.camera.interfaces.ICameraStatusWatcher +import jp.osdn.gokigen.gokigenassets.camera.vendor.pixpro.wrapper.command.messages.IPixproCommandCallback +import jp.osdn.gokigen.gokigenassets.liveview.message.IMessageDrawer +import java.lang.Exception + + +class PixproStatusChecker : IPixproCommandCallback, ICameraStatusWatcher, ICameraStatus +{ + private val statusHolder = PixproStatusHolder() + private var whileFetching = false + private var notifier: ICameraStatusUpdateNotify? = null + + companion object + { + private val TAG = PixproStatusChecker::class.java.simpleName + } + + override fun getStatusList(key: String): List { + try { + return if (statusHolder == null) { + ArrayList() + } else statusHolder.getAvailableItemList(key) + } catch (e: Exception) { + e.printStackTrace() + } + return ArrayList() + } + + override fun getStatus(key: String): String { + try { + return if (statusHolder == null) { + "" + } else statusHolder.getItemStatus(key) + } catch (e: Exception) { + e.printStackTrace() + } + return "" + } + + override fun getStatusColor(key: String): Int { + TODO("Not yet implemented") + } + + override fun setStatus(key: String, value: String) { + Log.v(TAG, "setStatus($key, $value)") + } + + fun startStatusWatch(notifier: ICameraStatusUpdateNotify) { + if (whileFetching) { + Log.v(TAG, "startStatusWatch() already starting.") + return + } + try { + this.notifier = notifier + whileFetching = true + } catch (e: Exception) { + e.printStackTrace() + } + } + + override fun startStatusWatch( + indicator: IMessageDrawer?, + notifier: ICameraStatusUpdateNotify? + ) { + TODO("Not yet implemented") + } + + override fun stopStatusWatch() { + Log.v(TAG, "stoptStatusWatch()") + whileFetching = false + notifier = null + } + + override fun receivedMessage(id: Int, rx_body: ByteArray?) {} + + +} diff --git a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/pixpro/wrapper/status/PixproStatusHolder.kt b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/pixpro/wrapper/status/PixproStatusHolder.kt new file mode 100644 index 0000000..fbcdf13 --- /dev/null +++ b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/pixpro/wrapper/status/PixproStatusHolder.kt @@ -0,0 +1,200 @@ +package jp.osdn.gokigen.gokigenassets.camera.vendor.pixpro.wrapper.status + +import android.util.Log +import jp.osdn.gokigen.gokigenassets.camera.interfaces.ICameraStatusUpdateNotify +import androidx.collection.SparseArrayCompat + +import android.util.SparseIntArray +import java.lang.Exception +import java.util.* +import kotlin.collections.ArrayList + + +class PixproStatusHolder +{ + + companion object + { + private val TAG = PixproStatusHolder::class.java.simpleName + } + + private val statusHolder: SparseIntArray = SparseIntArray() + private val statusNameArray: SparseArrayCompat = SparseArrayCompat() + private fun prepareStatusNameArray() { +/* + statusNameArray.clear(); + statusNameArray.append(BATTERY_LEVEL, BATTERY_LEVEL_STR); + statusNameArray.append(WHITE_BALANCE, WHITE_BALANCE_STR); + statusNameArray.append(APERTURE, APERTURE_STR); + statusNameArray.append(FOCUS_MODE, FOCUS_MODE_STR); + statusNameArray.append(SHOOTING_MODE, SHOOTING_MODE_STR); + statusNameArray.append(FLASH, FLASH_STR); + statusNameArray.append(EXPOSURE_COMPENSATION, EXPOSURE_COMPENSATION_STR); + statusNameArray.append(SELF_TIMER, SELF_TIMER_STR); + statusNameArray.append(FILM_SIMULATION, FILM_SIMULATION_STR); + statusNameArray.append(IMAGE_FORMAT, IMAGE_FORMAT_STR); + statusNameArray.append(RECMODE_ENABLE, RECMODE_ENABLE_STR); + statusNameArray.append(F_SS_CONTROL, F_SS_CONTROL_STR); + statusNameArray.append(ISO, ISO_STR); + statusNameArray.append(MOVIE_ISO, MOVIE_ISO_STR); + statusNameArray.append(FOCUS_POINT, FOCUS_POINT_STR); + statusNameArray.append(DEVICE_ERROR, DEVICE_ERROR_STR); + statusNameArray.append(IMAGE_FILE_COUNT, IMAGE_FILE_COUNT_STR); + statusNameArray.append(SDCARD_REMAIN_SIZE, SDCARD_REMAIN_SIZE_STR); + statusNameArray.append(FOCUS_LOCK, FOCUS_LOCK_STR); + statusNameArray.append(MOVIE_REMAINING_TIME, MOVIE_REMAINING_TIME_STR); + statusNameArray.append(SHUTTER_SPEED, SHUTTER_SPEED_STR); + statusNameArray.append(IMAGE_ASPECT,IMAGE_ASPECT_STR); + statusNameArray.append(BATTERY_LEVEL_2, BATTERY_LEVEL_2_STR); + + statusNameArray.append(UNKNOWN_DF00, UNKNOWN_DF00_STR); + statusNameArray.append(PICTURE_JPEG_COUNT, PICTURE_JPEG_COUNT_STR); + statusNameArray.append(UNKNOWN_D400, UNKNOWN_D400_STR); + statusNameArray.append(UNKNOWN_D401, UNKNOWN_D401_STR); + statusNameArray.append(UNKNOWN_D52F, UNKNOWN_D52F_STR); +*/ + } + + fun updateValue( + notifier: ICameraStatusUpdateNotify?, + id: Int, + data0: Byte, + data1: Byte, + data2: Byte, + data3: Byte + ) { + try { + val value = + (data3.toInt() and 0xff shl 24) + (data2.toInt() and 0xff shl 16) + (data1.toInt() and 0xff shl 8) + (data0.toInt() and 0xff) + val currentValue = statusHolder[id, -1] + Log.v(TAG, "STATUS ID: $id value : $value ($currentValue)") + statusHolder.put(id, value) + if (currentValue != value) { + //Log.v(TAG, "STATUS ID: " + id + " value : " + currentValue + " -> " + value); + notifier?.let { updateDetected(it, id, currentValue, value) } + } + } catch (e: Exception) { + e.printStackTrace() + } + } + + private fun updateDetected( + notifier: ICameraStatusUpdateNotify, + id: Int, + previous: Int, + current: Int + ) { + try { + val idName = statusNameArray[id, "Unknown"] + Log.v( + TAG, + java.lang.String.format( + Locale.US, + "<< UPDATE STATUS >> id: 0x%04x[%s] 0x%08x(%d) -> 0x%08x(%d)", + id, + idName, + previous, + previous, + current, + current + ) + ) + //Log.v(TAG, "updateDetected(ID: " + id + " [" + idName + "] " + previous + " -> " + current + " )"); +/* + if (id == FOCUS_LOCK) + { + if (current == 1) + { + // focus Lock + notifier.updateFocusedStatus(true, true); + } + else + { + // focus unlock + notifier.updateFocusedStatus(false, false); + } + } +*/ + } catch (e: Exception) { + e.printStackTrace() + } + } + + /** + * 認識したカメラのステータス名称のリストを応答する + * + */ + private val availableStatusNameList: List + private get() { + val selection: ArrayList = ArrayList() + try { + for (index in 0 until statusHolder.size()) { + val key = statusHolder.keyAt(index) + selection.add( + statusNameArray[key, java.lang.String.format( + Locale.US, + "0x%04x", + key + )] + ) + } + } catch (e: Exception) { + e.printStackTrace() + } + return selection + } + + fun getAvailableItemList(listKey: String?): List { + if (listKey == null) { + // アイテム名の一覧を応答する + return availableStatusNameList + } + + ///// 選択可能なステータスの一覧を取得する : でも以下はアイテム名の一覧... ///// + val selection: ArrayList = ArrayList() + try { + for (index in 0 until statusHolder.size()) { + val key = statusHolder.keyAt(index) + selection.add(statusNameArray[key]) + } + } catch (e: Exception) { + e.printStackTrace() + } + return selection + } + + fun getItemStatus(key: String): String { + var key = key + try { + val strIndex = key.indexOf("x") + Log.v(TAG, "getItemStatus() : $key [$strIndex]") + if (strIndex >= 1) { + key = key.substring(strIndex + 1) + try { + val id = key.toInt(16) + val value = statusHolder[id] + Log.v(TAG, "getItemStatus() value : $value") + return value.toString() + "" + } catch (e: Exception) { + e.printStackTrace() + } + } + for (index in 0 until statusNameArray.size()) { + val id = statusNameArray.keyAt(index) + val strKey = statusNameArray.valueAt(index) + if (key.contentEquals(strKey)) { + val value = statusHolder[id] + return value.toString() + "" + } + } + } catch (e: Exception) { + e.printStackTrace() + } + return "? [$key]" + } + + init { + statusHolder.clear() + prepareStatusNameArray() + } +} diff --git a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/ricohpentax/RicohPentaxCameraControl.kt b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/ricohpentax/RicohPentaxCameraControl.kt similarity index 92% rename from app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/ricohpentax/RicohPentaxCameraControl.kt rename to app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/ricohpentax/RicohPentaxCameraControl.kt index 524f113..61ec7bc 100644 --- a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/ricohpentax/RicohPentaxCameraControl.kt +++ b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/ricohpentax/RicohPentaxCameraControl.kt @@ -1,21 +1,21 @@ -package jp.osdn.gokigen.gokigenassets.camera.ricohpentax +package jp.osdn.gokigen.gokigenassets.camera.vendor.ricohpentax import android.util.Log import android.view.KeyEvent import android.view.View import androidx.appcompat.app.AppCompatActivity -import jp.osdn.gokigen.gokigenassets.camera.ICameraPreferenceProvider +import jp.osdn.gokigen.gokigenassets.camera.preference.ICameraPreferenceProvider import jp.osdn.gokigen.gokigenassets.camera.interfaces.* -import jp.osdn.gokigen.gokigenassets.camera.theta.status.ICaptureModeReceiver +import jp.osdn.gokigen.gokigenassets.camera.vendor.theta.status.ICaptureModeReceiver import jp.osdn.gokigen.gokigenassets.liveview.ILiveView import jp.osdn.gokigen.gokigenassets.liveview.ILiveViewRefresher -import jp.osdn.gokigen.gokigenassets.camera.ricohpentax.connection.IUseGR2CommandNotify -import jp.osdn.gokigen.gokigenassets.camera.ricohpentax.connection.RicohGr2Connection -import jp.osdn.gokigen.gokigenassets.camera.ricohpentax.liveview.RicohGr2LiveViewControl -import jp.osdn.gokigen.gokigenassets.camera.ricohpentax.operation.* -import jp.osdn.gokigen.gokigenassets.camera.ricohpentax.status.RicohGr2StatusChecker -import jp.osdn.gokigen.gokigenassets.camera.ricohpentax.wrapper.RicohGr2RunMode -import jp.osdn.gokigen.gokigenassets.camera.ricohpentax.wrapper.playback.RicohGr2PlaybackControl +import jp.osdn.gokigen.gokigenassets.camera.vendor.ricohpentax.connection.IUseGR2CommandNotify +import jp.osdn.gokigen.gokigenassets.camera.vendor.ricohpentax.connection.RicohGr2Connection +import jp.osdn.gokigen.gokigenassets.camera.vendor.ricohpentax.liveview.RicohGr2LiveViewControl +import jp.osdn.gokigen.gokigenassets.camera.vendor.ricohpentax.operation.* +import jp.osdn.gokigen.gokigenassets.camera.vendor.ricohpentax.status.RicohGr2StatusChecker +import jp.osdn.gokigen.gokigenassets.camera.vendor.ricohpentax.wrapper.RicohGr2RunMode +import jp.osdn.gokigen.gokigenassets.camera.vendor.ricohpentax.wrapper.playback.RicohGr2PlaybackControl import jp.osdn.gokigen.gokigenassets.constants.IApplicationConstantConvert import jp.osdn.gokigen.gokigenassets.liveview.ICachePositionProvider import jp.osdn.gokigen.gokigenassets.liveview.IIndicatorControl diff --git a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/ricohpentax/connection/IUseGR2CommandNotify.kt b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/ricohpentax/connection/IUseGR2CommandNotify.kt similarity index 59% rename from app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/ricohpentax/connection/IUseGR2CommandNotify.kt rename to app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/ricohpentax/connection/IUseGR2CommandNotify.kt index 26d2641..9ec773b 100644 --- a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/ricohpentax/connection/IUseGR2CommandNotify.kt +++ b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/ricohpentax/connection/IUseGR2CommandNotify.kt @@ -1,4 +1,4 @@ -package jp.osdn.gokigen.gokigenassets.camera.ricohpentax.connection +package jp.osdn.gokigen.gokigenassets.camera.vendor.ricohpentax.connection interface IUseGR2CommandNotify { diff --git a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/ricohpentax/connection/RicohGr2CameraConnectSequence.kt b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/ricohpentax/connection/RicohGr2CameraConnectSequence.kt similarity index 98% rename from app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/ricohpentax/connection/RicohGr2CameraConnectSequence.kt rename to app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/ricohpentax/connection/RicohGr2CameraConnectSequence.kt index cde38ff..f7cd492 100644 --- a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/ricohpentax/connection/RicohGr2CameraConnectSequence.kt +++ b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/ricohpentax/connection/RicohGr2CameraConnectSequence.kt @@ -1,4 +1,4 @@ -package jp.osdn.gokigen.gokigenassets.camera.ricohpentax.connection +package jp.osdn.gokigen.gokigenassets.camera.vendor.ricohpentax.connection import android.app.Activity import android.util.Log diff --git a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/ricohpentax/connection/RicohGr2CameraDisconnectSequence.kt b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/ricohpentax/connection/RicohGr2CameraDisconnectSequence.kt similarity index 95% rename from app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/ricohpentax/connection/RicohGr2CameraDisconnectSequence.kt rename to app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/ricohpentax/connection/RicohGr2CameraDisconnectSequence.kt index e8705fa..440ba42 100644 --- a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/ricohpentax/connection/RicohGr2CameraDisconnectSequence.kt +++ b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/ricohpentax/connection/RicohGr2CameraDisconnectSequence.kt @@ -1,4 +1,4 @@ -package jp.osdn.gokigen.gokigenassets.camera.ricohpentax.connection +package jp.osdn.gokigen.gokigenassets.camera.vendor.ricohpentax.connection import android.app.Activity import android.util.Log diff --git a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/ricohpentax/connection/RicohGr2Connection.kt b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/ricohpentax/connection/RicohGr2Connection.kt similarity index 99% rename from app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/ricohpentax/connection/RicohGr2Connection.kt rename to app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/ricohpentax/connection/RicohGr2Connection.kt index 0d52831..ebb352a 100644 --- a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/ricohpentax/connection/RicohGr2Connection.kt +++ b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/ricohpentax/connection/RicohGr2Connection.kt @@ -1,4 +1,4 @@ -package jp.osdn.gokigen.gokigenassets.camera.ricohpentax.connection +package jp.osdn.gokigen.gokigenassets.camera.vendor.ricohpentax.connection import android.content.* import android.net.ConnectivityManager diff --git a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/ricohpentax/liveview/RicohGr2LiveViewControl.kt b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/ricohpentax/liveview/RicohGr2LiveViewControl.kt similarity index 97% rename from app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/ricohpentax/liveview/RicohGr2LiveViewControl.kt rename to app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/ricohpentax/liveview/RicohGr2LiveViewControl.kt index 4395b3c..f5d970a 100644 --- a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/ricohpentax/liveview/RicohGr2LiveViewControl.kt +++ b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/ricohpentax/liveview/RicohGr2LiveViewControl.kt @@ -1,9 +1,9 @@ -package jp.osdn.gokigen.gokigenassets.camera.ricohpentax.liveview +package jp.osdn.gokigen.gokigenassets.camera.vendor.ricohpentax.liveview import android.content.Context import android.util.Log import jp.osdn.gokigen.gokigenassets.camera.interfaces.ILiveViewController -import jp.osdn.gokigen.gokigenassets.camera.ricohpentax.connection.IUseGR2CommandNotify +import jp.osdn.gokigen.gokigenassets.camera.vendor.ricohpentax.connection.IUseGR2CommandNotify import jp.osdn.gokigen.gokigenassets.liveview.image.CameraLiveViewListenerImpl import jp.osdn.gokigen.gokigenassets.utils.communication.SimpleLiveViewSlicer diff --git a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/ricohpentax/operation/IRicohGr2ButtonControl.kt b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/ricohpentax/operation/IRicohGr2ButtonControl.kt similarity index 96% rename from app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/ricohpentax/operation/IRicohGr2ButtonControl.kt rename to app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/ricohpentax/operation/IRicohGr2ButtonControl.kt index ebff45e..aca24e6 100644 --- a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/ricohpentax/operation/IRicohGr2ButtonControl.kt +++ b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/ricohpentax/operation/IRicohGr2ButtonControl.kt @@ -1,4 +1,4 @@ -package jp.osdn.gokigen.gokigenassets.camera.ricohpentax.operation +package jp.osdn.gokigen.gokigenassets.camera.vendor.ricohpentax.operation interface IRicohGr2ButtonControl { diff --git a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/ricohpentax/operation/IRicohGr2CameraStatus.kt b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/ricohpentax/operation/IRicohGr2CameraStatus.kt similarity index 93% rename from app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/ricohpentax/operation/IRicohGr2CameraStatus.kt rename to app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/ricohpentax/operation/IRicohGr2CameraStatus.kt index d74eb46..7a91ec4 100644 --- a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/ricohpentax/operation/IRicohGr2CameraStatus.kt +++ b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/ricohpentax/operation/IRicohGr2CameraStatus.kt @@ -1,4 +1,4 @@ -package jp.osdn.gokigen.gokigenassets.camera.ricohpentax.operation +package jp.osdn.gokigen.gokigenassets.camera.vendor.ricohpentax.operation interface IRicohGr2CameraStatus diff --git a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/ricohpentax/operation/RicohGr2CameraButtonControl.kt b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/ricohpentax/operation/RicohGr2CameraButtonControl.kt similarity index 93% rename from app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/ricohpentax/operation/RicohGr2CameraButtonControl.kt rename to app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/ricohpentax/operation/RicohGr2CameraButtonControl.kt index 626c8b1..79777f0 100644 --- a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/ricohpentax/operation/RicohGr2CameraButtonControl.kt +++ b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/ricohpentax/operation/RicohGr2CameraButtonControl.kt @@ -1,7 +1,7 @@ -package jp.osdn.gokigen.gokigenassets.camera.ricohpentax.operation +package jp.osdn.gokigen.gokigenassets.camera.vendor.ricohpentax.operation import android.util.Log -import jp.osdn.gokigen.gokigenassets.camera.ricohpentax.operation.IRicohGr2ButtonControl.Companion.SPECIAL_GREEN_BUTTON +import jp.osdn.gokigen.gokigenassets.camera.vendor.ricohpentax.operation.IRicohGr2ButtonControl.Companion.SPECIAL_GREEN_BUTTON import jp.osdn.gokigen.gokigenassets.utils.communication.SimpleHttpClient diff --git a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/ricohpentax/operation/RicohGr2CameraCaptureControl.kt b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/ricohpentax/operation/RicohGr2CameraCaptureControl.kt similarity index 83% rename from app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/ricohpentax/operation/RicohGr2CameraCaptureControl.kt rename to app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/ricohpentax/operation/RicohGr2CameraCaptureControl.kt index cba55ca..b3307c6 100644 --- a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/ricohpentax/operation/RicohGr2CameraCaptureControl.kt +++ b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/ricohpentax/operation/RicohGr2CameraCaptureControl.kt @@ -1,10 +1,10 @@ -package jp.osdn.gokigen.gokigenassets.camera.ricohpentax.operation +package jp.osdn.gokigen.gokigenassets.camera.vendor.ricohpentax.operation import android.util.Log import jp.osdn.gokigen.gokigenassets.camera.interfaces.ICameraStatus import jp.osdn.gokigen.gokigenassets.camera.interfaces.ICaptureControl -import jp.osdn.gokigen.gokigenassets.camera.ricohpentax.operation.takepicture.RicohGr2MovieShotControl -import jp.osdn.gokigen.gokigenassets.camera.ricohpentax.operation.takepicture.RicohGr2SingleShotControl +import jp.osdn.gokigen.gokigenassets.camera.vendor.ricohpentax.operation.takepicture.RicohGr2MovieShotControl +import jp.osdn.gokigen.gokigenassets.camera.vendor.ricohpentax.operation.takepicture.RicohGr2SingleShotControl import jp.osdn.gokigen.gokigenassets.liveview.focusframe.IAutoFocusFrameDisplay /** diff --git a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/ricohpentax/operation/RicohGr2CameraFocusControl.kt b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/ricohpentax/operation/RicohGr2CameraFocusControl.kt similarity index 89% rename from app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/ricohpentax/operation/RicohGr2CameraFocusControl.kt rename to app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/ricohpentax/operation/RicohGr2CameraFocusControl.kt index 78b6674..ec5467a 100644 --- a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/ricohpentax/operation/RicohGr2CameraFocusControl.kt +++ b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/ricohpentax/operation/RicohGr2CameraFocusControl.kt @@ -1,9 +1,9 @@ -package jp.osdn.gokigen.gokigenassets.camera.ricohpentax.operation +package jp.osdn.gokigen.gokigenassets.camera.vendor.ricohpentax.operation import android.graphics.PointF import android.view.MotionEvent import jp.osdn.gokigen.gokigenassets.camera.interfaces.IFocusingControl -import jp.osdn.gokigen.gokigenassets.camera.ricohpentax.operation.takepicture.RicohGr2AutoFocusControl +import jp.osdn.gokigen.gokigenassets.camera.vendor.ricohpentax.operation.takepicture.RicohGr2AutoFocusControl import jp.osdn.gokigen.gokigenassets.liveview.IIndicatorControl import jp.osdn.gokigen.gokigenassets.liveview.focusframe.IAutoFocusFrameDisplay diff --git a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/ricohpentax/operation/RicohGr2CameraPowerOff.kt b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/ricohpentax/operation/RicohGr2CameraPowerOff.kt similarity index 96% rename from app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/ricohpentax/operation/RicohGr2CameraPowerOff.kt rename to app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/ricohpentax/operation/RicohGr2CameraPowerOff.kt index 2515dfa..44c93f5 100644 --- a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/ricohpentax/operation/RicohGr2CameraPowerOff.kt +++ b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/ricohpentax/operation/RicohGr2CameraPowerOff.kt @@ -1,4 +1,4 @@ -package jp.osdn.gokigen.gokigenassets.camera.ricohpentax.operation +package jp.osdn.gokigen.gokigenassets.camera.vendor.ricohpentax.operation import android.content.Context import androidx.preference.Preference diff --git a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/ricohpentax/operation/RicohGr2CameraZoomLensControl.kt b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/ricohpentax/operation/RicohGr2CameraZoomLensControl.kt similarity index 93% rename from app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/ricohpentax/operation/RicohGr2CameraZoomLensControl.kt rename to app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/ricohpentax/operation/RicohGr2CameraZoomLensControl.kt index 82fc22d..ed935f4 100644 --- a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/ricohpentax/operation/RicohGr2CameraZoomLensControl.kt +++ b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/ricohpentax/operation/RicohGr2CameraZoomLensControl.kt @@ -1,4 +1,4 @@ -package jp.osdn.gokigen.gokigenassets.camera.ricohpentax.operation +package jp.osdn.gokigen.gokigenassets.camera.vendor.ricohpentax.operation import jp.osdn.gokigen.gokigenassets.camera.interfaces.IZoomLensControl diff --git a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/ricohpentax/operation/RicohGr2HardwareStatus.kt b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/ricohpentax/operation/RicohGr2HardwareStatus.kt similarity index 89% rename from app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/ricohpentax/operation/RicohGr2HardwareStatus.kt rename to app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/ricohpentax/operation/RicohGr2HardwareStatus.kt index 23fb9c4..bb79700 100644 --- a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/ricohpentax/operation/RicohGr2HardwareStatus.kt +++ b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/ricohpentax/operation/RicohGr2HardwareStatus.kt @@ -1,4 +1,4 @@ -package jp.osdn.gokigen.gokigenassets.camera.ricohpentax.operation +package jp.osdn.gokigen.gokigenassets.camera.vendor.ricohpentax.operation import jp.osdn.gokigen.gokigenassets.camera.interfaces.ICameraHardwareStatus diff --git a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/ricohpentax/operation/takepicture/RicohGr2AutoFocusControl.kt b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/ricohpentax/operation/takepicture/RicohGr2AutoFocusControl.kt similarity index 98% rename from app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/ricohpentax/operation/takepicture/RicohGr2AutoFocusControl.kt rename to app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/ricohpentax/operation/takepicture/RicohGr2AutoFocusControl.kt index ee5fc69..55c575b 100644 --- a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/ricohpentax/operation/takepicture/RicohGr2AutoFocusControl.kt +++ b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/ricohpentax/operation/takepicture/RicohGr2AutoFocusControl.kt @@ -1,4 +1,4 @@ -package jp.osdn.gokigen.gokigenassets.camera.ricohpentax.operation.takepicture +package jp.osdn.gokigen.gokigenassets.camera.vendor.ricohpentax.operation.takepicture import android.graphics.PointF import android.graphics.RectF diff --git a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/ricohpentax/operation/takepicture/RicohGr2MovieShotControl.kt b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/ricohpentax/operation/takepicture/RicohGr2MovieShotControl.kt similarity index 94% rename from app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/ricohpentax/operation/takepicture/RicohGr2MovieShotControl.kt rename to app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/ricohpentax/operation/takepicture/RicohGr2MovieShotControl.kt index 017fbee..dcfe1a4 100644 --- a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/ricohpentax/operation/takepicture/RicohGr2MovieShotControl.kt +++ b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/ricohpentax/operation/takepicture/RicohGr2MovieShotControl.kt @@ -1,4 +1,4 @@ -package jp.osdn.gokigen.gokigenassets.camera.ricohpentax.operation.takepicture +package jp.osdn.gokigen.gokigenassets.camera.vendor.ricohpentax.operation.takepicture import android.util.Log import jp.osdn.gokigen.gokigenassets.liveview.focusframe.IAutoFocusFrameDisplay diff --git a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/ricohpentax/operation/takepicture/RicohGr2SingleShotControl.kt b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/ricohpentax/operation/takepicture/RicohGr2SingleShotControl.kt similarity index 95% rename from app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/ricohpentax/operation/takepicture/RicohGr2SingleShotControl.kt rename to app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/ricohpentax/operation/takepicture/RicohGr2SingleShotControl.kt index 8244e9d..b8f537f 100644 --- a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/ricohpentax/operation/takepicture/RicohGr2SingleShotControl.kt +++ b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/ricohpentax/operation/takepicture/RicohGr2SingleShotControl.kt @@ -1,4 +1,4 @@ -package jp.osdn.gokigen.gokigenassets.camera.ricohpentax.operation.takepicture +package jp.osdn.gokigen.gokigenassets.camera.vendor.ricohpentax.operation.takepicture import android.util.Log import jp.osdn.gokigen.gokigenassets.liveview.focusframe.IAutoFocusFrameDisplay diff --git a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/ricohpentax/status/RicohGr2StatusChecker.kt b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/ricohpentax/status/RicohGr2StatusChecker.kt similarity index 98% rename from app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/ricohpentax/status/RicohGr2StatusChecker.kt rename to app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/ricohpentax/status/RicohGr2StatusChecker.kt index b7a34df..9da2917 100644 --- a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/ricohpentax/status/RicohGr2StatusChecker.kt +++ b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/ricohpentax/status/RicohGr2StatusChecker.kt @@ -1,4 +1,4 @@ -package jp.osdn.gokigen.gokigenassets.camera.ricohpentax.status +package jp.osdn.gokigen.gokigenassets.camera.vendor.ricohpentax.status import android.graphics.Color import android.util.Log diff --git a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/ricohpentax/status/RicohGr2StatusHolder.kt b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/ricohpentax/status/RicohGr2StatusHolder.kt similarity index 99% rename from app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/ricohpentax/status/RicohGr2StatusHolder.kt rename to app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/ricohpentax/status/RicohGr2StatusHolder.kt index 7fd393f..19a64ca 100644 --- a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/ricohpentax/status/RicohGr2StatusHolder.kt +++ b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/ricohpentax/status/RicohGr2StatusHolder.kt @@ -1,4 +1,4 @@ -package jp.osdn.gokigen.gokigenassets.camera.ricohpentax.status +package jp.osdn.gokigen.gokigenassets.camera.vendor.ricohpentax.status import android.graphics.Color import android.util.Log diff --git a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/ricohpentax/wrapper/RicohGr2RunMode.kt b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/ricohpentax/wrapper/RicohGr2RunMode.kt similarity index 88% rename from app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/ricohpentax/wrapper/RicohGr2RunMode.kt rename to app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/ricohpentax/wrapper/RicohGr2RunMode.kt index f1ac1bf..46014ce 100644 --- a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/ricohpentax/wrapper/RicohGr2RunMode.kt +++ b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/ricohpentax/wrapper/RicohGr2RunMode.kt @@ -1,4 +1,4 @@ -package jp.osdn.gokigen.gokigenassets.camera.ricohpentax.wrapper +package jp.osdn.gokigen.gokigenassets.camera.vendor.ricohpentax.wrapper import jp.osdn.gokigen.gokigenassets.camera.interfaces.ICameraRunMode import jp.osdn.gokigen.gokigenassets.camera.interfaces.ICameraRunModeCallback diff --git a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/ricohpentax/wrapper/playback/CameraFileInfo.kt b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/ricohpentax/wrapper/playback/CameraFileInfo.kt similarity index 97% rename from app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/ricohpentax/wrapper/playback/CameraFileInfo.kt rename to app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/ricohpentax/wrapper/playback/CameraFileInfo.kt index ad48874..efe6b36 100644 --- a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/ricohpentax/wrapper/playback/CameraFileInfo.kt +++ b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/ricohpentax/wrapper/playback/CameraFileInfo.kt @@ -1,4 +1,4 @@ -package jp.osdn.gokigen.gokigenassets.camera.ricohpentax.wrapper.playback +package jp.osdn.gokigen.gokigenassets.camera.vendor.ricohpentax.wrapper.playback import jp.osdn.gokigen.gokigenassets.camera.interfaces.playback.ICameraFileInfo import jp.osdn.gokigen.gokigenassets.camera.interfaces.playback.ICameraFileInfoSetter diff --git a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/ricohpentax/wrapper/playback/ProgressEvent.kt b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/ricohpentax/wrapper/playback/ProgressEvent.kt similarity index 85% rename from app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/ricohpentax/wrapper/playback/ProgressEvent.kt rename to app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/ricohpentax/wrapper/playback/ProgressEvent.kt index e884db6..2689755 100644 --- a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/ricohpentax/wrapper/playback/ProgressEvent.kt +++ b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/ricohpentax/wrapper/playback/ProgressEvent.kt @@ -1,4 +1,4 @@ -package jp.osdn.gokigen.gokigenassets.camera.ricohpentax.wrapper.playback +package jp.osdn.gokigen.gokigenassets.camera.vendor.ricohpentax.wrapper.playback import jp.osdn.gokigen.gokigenassets.camera.interfaces.playback.IProgressEvent diff --git a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/ricohpentax/wrapper/playback/RicohGr2PlaybackControl.kt b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/ricohpentax/wrapper/playback/RicohGr2PlaybackControl.kt similarity index 99% rename from app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/ricohpentax/wrapper/playback/RicohGr2PlaybackControl.kt rename to app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/ricohpentax/wrapper/playback/RicohGr2PlaybackControl.kt index cae95f5..2bca64a 100644 --- a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/ricohpentax/wrapper/playback/RicohGr2PlaybackControl.kt +++ b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/ricohpentax/wrapper/playback/RicohGr2PlaybackControl.kt @@ -1,4 +1,4 @@ -package jp.osdn.gokigen.gokigenassets.camera.ricohpentax.wrapper.playback +package jp.osdn.gokigen.gokigenassets.camera.vendor.ricohpentax.wrapper.playback import android.graphics.Bitmap import android.util.Log diff --git a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/sony/SonyCameraControl.kt b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/sony/SonyCameraControl.kt similarity index 91% rename from app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/sony/SonyCameraControl.kt rename to app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/sony/SonyCameraControl.kt index 1a753ff..fc074d8 100644 --- a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/sony/SonyCameraControl.kt +++ b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/sony/SonyCameraControl.kt @@ -1,10 +1,10 @@ -package jp.osdn.gokigen.gokigenassets.camera.sony +package jp.osdn.gokigen.gokigenassets.camera.vendor.sony import android.util.Log import android.view.KeyEvent import android.view.View import androidx.appcompat.app.AppCompatActivity -import jp.osdn.gokigen.gokigenassets.camera.ICameraPreferenceProvider +import jp.osdn.gokigen.gokigenassets.camera.preference.ICameraPreferenceProvider import jp.osdn.gokigen.gokigenassets.camera.interfaces.* import jp.osdn.gokigen.gokigenassets.constants.IApplicationConstantConvert import jp.osdn.gokigen.gokigenassets.liveview.ICachePositionProvider @@ -17,18 +17,18 @@ import jp.osdn.gokigen.gokigenassets.liveview.storeimage.StoreImage import jp.osdn.gokigen.gokigenassets.preference.PreferenceAccessWrapper import jp.osdn.gokigen.gokigenassets.scene.IInformationReceiver import jp.osdn.gokigen.gokigenassets.scene.IVibrator -import jp.osdn.gokigen.gokigenassets.camera.sony.liveview.SonyLiveViewControl -import jp.osdn.gokigen.gokigenassets.camera.sony.operation.SonyCameraCaptureControl -import jp.osdn.gokigen.gokigenassets.camera.sony.operation.SonyCameraFocusControl -import jp.osdn.gokigen.gokigenassets.camera.sony.operation.SonyCameraZoomLensControl -import jp.osdn.gokigen.gokigenassets.camera.sony.wrapper.ISonyCameraApi -import jp.osdn.gokigen.gokigenassets.camera.sony.wrapper.ISonyCameraHolder -import jp.osdn.gokigen.gokigenassets.camera.sony.wrapper.connection.SonyCameraConnection -import jp.osdn.gokigen.gokigenassets.camera.sony.wrapper.eventlistener.SonyCameraEventObserver -import jp.osdn.gokigen.gokigenassets.camera.sony.wrapper.ISonyCamera -import jp.osdn.gokigen.gokigenassets.camera.sony.wrapper.SonyCameraApi -import jp.osdn.gokigen.gokigenassets.camera.sony.wrapper.eventlistener.ISonyCameraEventObserver -import jp.osdn.gokigen.gokigenassets.camera.sony.wrapper.eventlistener.SonyStatus +import jp.osdn.gokigen.gokigenassets.camera.vendor.sony.liveview.SonyLiveViewControl +import jp.osdn.gokigen.gokigenassets.camera.vendor.sony.operation.SonyCameraCaptureControl +import jp.osdn.gokigen.gokigenassets.camera.vendor.sony.operation.SonyCameraFocusControl +import jp.osdn.gokigen.gokigenassets.camera.vendor.sony.operation.SonyCameraZoomLensControl +import jp.osdn.gokigen.gokigenassets.camera.vendor.sony.wrapper.ISonyCameraApi +import jp.osdn.gokigen.gokigenassets.camera.vendor.sony.wrapper.ISonyCameraHolder +import jp.osdn.gokigen.gokigenassets.camera.vendor.sony.wrapper.connection.SonyCameraConnection +import jp.osdn.gokigen.gokigenassets.camera.vendor.sony.wrapper.eventlistener.SonyCameraEventObserver +import jp.osdn.gokigen.gokigenassets.camera.vendor.sony.wrapper.ISonyCamera +import jp.osdn.gokigen.gokigenassets.camera.vendor.sony.wrapper.SonyCameraApi +import jp.osdn.gokigen.gokigenassets.camera.vendor.sony.wrapper.eventlistener.ISonyCameraEventObserver +import jp.osdn.gokigen.gokigenassets.camera.vendor.sony.wrapper.eventlistener.SonyStatus import org.json.JSONObject import kotlin.collections.ArrayList diff --git a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/sony/liveview/SonyLiveViewControl.kt b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/sony/liveview/SonyLiveViewControl.kt similarity index 96% rename from app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/sony/liveview/SonyLiveViewControl.kt rename to app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/sony/liveview/SonyLiveViewControl.kt index 6ecf7d3..9fafce1 100644 --- a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/sony/liveview/SonyLiveViewControl.kt +++ b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/sony/liveview/SonyLiveViewControl.kt @@ -1,11 +1,10 @@ -package jp.osdn.gokigen.gokigenassets.camera.sony.liveview +package jp.osdn.gokigen.gokigenassets.camera.vendor.sony.liveview import android.content.Context import android.util.Log import jp.osdn.gokigen.gokigenassets.camera.interfaces.ILiveViewController import org.json.JSONObject -import jp.osdn.gokigen.gokigenassets.liveview.image.CameraLiveViewListenerImpl -import jp.osdn.gokigen.gokigenassets.camera.sony.wrapper.ISonyCameraApi +import jp.osdn.gokigen.gokigenassets.camera.vendor.sony.wrapper.ISonyCameraApi import jp.osdn.gokigen.gokigenassets.liveview.image.IImageDataReceiver import jp.osdn.gokigen.gokigenassets.scene.IInformationReceiver import jp.osdn.gokigen.gokigenassets.utils.communication.SimpleLiveViewSlicer diff --git a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/sony/operation/CameraPowerOffSony.kt b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/sony/operation/CameraPowerOffSony.kt similarity index 96% rename from app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/sony/operation/CameraPowerOffSony.kt rename to app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/sony/operation/CameraPowerOffSony.kt index e33cb14..1e3d0d1 100644 --- a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/sony/operation/CameraPowerOffSony.kt +++ b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/sony/operation/CameraPowerOffSony.kt @@ -1,4 +1,4 @@ -package jp.osdn.gokigen.gokigenassets.camera.sony.operation +package jp.osdn.gokigen.gokigenassets.camera.vendor.sony.operation import android.content.Context import androidx.preference.Preference diff --git a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/sony/operation/SonyCameraCaptureControl.kt b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/sony/operation/SonyCameraCaptureControl.kt similarity index 79% rename from app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/sony/operation/SonyCameraCaptureControl.kt rename to app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/sony/operation/SonyCameraCaptureControl.kt index d730ae9..2fe9730 100644 --- a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/sony/operation/SonyCameraCaptureControl.kt +++ b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/sony/operation/SonyCameraCaptureControl.kt @@ -1,11 +1,11 @@ -package jp.osdn.gokigen.gokigenassets.camera.sony.operation +package jp.osdn.gokigen.gokigenassets.camera.vendor.sony.operation import android.util.Log -import jp.osdn.gokigen.gokigenassets.camera.sony.wrapper.ISonyCameraApi +import jp.osdn.gokigen.gokigenassets.camera.vendor.sony.wrapper.ISonyCameraApi import jp.osdn.gokigen.gokigenassets.liveview.IIndicatorControl import jp.osdn.gokigen.gokigenassets.liveview.focusframe.IAutoFocusFrameDisplay import jp.osdn.gokigen.gokigenassets.camera.interfaces.ICaptureControl -import jp.osdn.gokigen.gokigenassets.camera.sony.operation.takepicture.SingleShotControl +import jp.osdn.gokigen.gokigenassets.camera.vendor.sony.operation.takepicture.SingleShotControl import java.lang.Exception diff --git a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/sony/operation/SonyCameraFocusControl.kt b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/sony/operation/SonyCameraFocusControl.kt similarity index 89% rename from app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/sony/operation/SonyCameraFocusControl.kt rename to app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/sony/operation/SonyCameraFocusControl.kt index 7b15c02..971552c 100644 --- a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/sony/operation/SonyCameraFocusControl.kt +++ b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/sony/operation/SonyCameraFocusControl.kt @@ -1,12 +1,12 @@ -package jp.osdn.gokigen.gokigenassets.camera.sony.operation +package jp.osdn.gokigen.gokigenassets.camera.vendor.sony.operation import android.util.Log import android.view.MotionEvent -import jp.osdn.gokigen.gokigenassets.camera.sony.wrapper.ISonyCameraApi +import jp.osdn.gokigen.gokigenassets.camera.vendor.sony.wrapper.ISonyCameraApi import jp.osdn.gokigen.gokigenassets.liveview.IIndicatorControl import jp.osdn.gokigen.gokigenassets.liveview.focusframe.IAutoFocusFrameDisplay import jp.osdn.gokigen.gokigenassets.camera.interfaces.IFocusingControl -import jp.osdn.gokigen.gokigenassets.camera.sony.operation.takepicture.AutoFocusControl +import jp.osdn.gokigen.gokigenassets.camera.vendor.sony.operation.takepicture.AutoFocusControl import java.lang.Exception class SonyCameraFocusControl(private val frameDisplay: IAutoFocusFrameDisplay, indicator: IIndicatorControl) : IFocusingControl diff --git a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/sony/operation/SonyCameraZoomLensControl.kt b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/sony/operation/SonyCameraZoomLensControl.kt similarity index 94% rename from app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/sony/operation/SonyCameraZoomLensControl.kt rename to app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/sony/operation/SonyCameraZoomLensControl.kt index 47a5825..df57937 100644 --- a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/sony/operation/SonyCameraZoomLensControl.kt +++ b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/sony/operation/SonyCameraZoomLensControl.kt @@ -1,7 +1,7 @@ -package jp.osdn.gokigen.gokigenassets.camera.sony.operation +package jp.osdn.gokigen.gokigenassets.camera.vendor.sony.operation import android.util.Log -import jp.osdn.gokigen.gokigenassets.camera.sony.wrapper.ISonyCameraApi +import jp.osdn.gokigen.gokigenassets.camera.vendor.sony.wrapper.ISonyCameraApi import jp.osdn.gokigen.gokigenassets.camera.interfaces.IZoomLensControl import java.lang.Exception diff --git a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/sony/operation/takepicture/AutoFocusControl.kt b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/sony/operation/takepicture/AutoFocusControl.kt similarity index 97% rename from app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/sony/operation/takepicture/AutoFocusControl.kt rename to app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/sony/operation/takepicture/AutoFocusControl.kt index df2ae26..b25e3dd 100644 --- a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/sony/operation/takepicture/AutoFocusControl.kt +++ b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/sony/operation/takepicture/AutoFocusControl.kt @@ -1,11 +1,11 @@ -package jp.osdn.gokigen.gokigenassets.camera.sony.operation.takepicture +package jp.osdn.gokigen.gokigenassets.camera.vendor.sony.operation.takepicture import org.json.JSONObject import android.graphics.RectF import android.graphics.PointF import android.util.Log import jp.osdn.gokigen.gokigenassets.liveview.focusframe.IAutoFocusFrameDisplay -import jp.osdn.gokigen.gokigenassets.camera.sony.wrapper.ISonyCameraApi +import jp.osdn.gokigen.gokigenassets.camera.vendor.sony.wrapper.ISonyCameraApi import jp.osdn.gokigen.gokigenassets.liveview.IIndicatorControl import jp.osdn.gokigen.gokigenassets.liveview.focusframe.IAutoFocusFrameDisplay.FocusFrameStatus import java.lang.Exception diff --git a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/sony/operation/takepicture/SingleShotControl.kt b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/sony/operation/takepicture/SingleShotControl.kt similarity index 91% rename from app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/sony/operation/takepicture/SingleShotControl.kt rename to app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/sony/operation/takepicture/SingleShotControl.kt index 5512f80..7c7861b 100644 --- a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/sony/operation/takepicture/SingleShotControl.kt +++ b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/sony/operation/takepicture/SingleShotControl.kt @@ -1,7 +1,7 @@ -package jp.osdn.gokigen.gokigenassets.camera.sony.operation.takepicture +package jp.osdn.gokigen.gokigenassets.camera.vendor.sony.operation.takepicture import android.util.Log -import jp.osdn.gokigen.gokigenassets.camera.sony.wrapper.ISonyCameraApi +import jp.osdn.gokigen.gokigenassets.camera.vendor.sony.wrapper.ISonyCameraApi import jp.osdn.gokigen.gokigenassets.liveview.IIndicatorControl import jp.osdn.gokigen.gokigenassets.liveview.focusframe.IAutoFocusFrameDisplay import java.lang.Exception diff --git a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/sony/wrapper/ISonyApiService.kt b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/sony/wrapper/ISonyApiService.kt similarity index 58% rename from app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/sony/wrapper/ISonyApiService.kt rename to app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/sony/wrapper/ISonyApiService.kt index d3699f4..41eb070 100644 --- a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/sony/wrapper/ISonyApiService.kt +++ b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/sony/wrapper/ISonyApiService.kt @@ -1,4 +1,4 @@ -package jp.osdn.gokigen.gokigenassets.camera.sony.wrapper +package jp.osdn.gokigen.gokigenassets.camera.vendor.sony.wrapper interface ISonyApiService { diff --git a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/sony/wrapper/ISonyCamera.kt b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/sony/wrapper/ISonyCamera.kt similarity index 77% rename from app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/sony/wrapper/ISonyCamera.kt rename to app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/sony/wrapper/ISonyCamera.kt index dd6c64f..e72040f 100644 --- a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/sony/wrapper/ISonyCamera.kt +++ b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/sony/wrapper/ISonyCamera.kt @@ -1,4 +1,4 @@ -package jp.osdn.gokigen.gokigenassets.camera.sony.wrapper +package jp.osdn.gokigen.gokigenassets.camera.vendor.sony.wrapper interface ISonyCamera { diff --git a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/sony/wrapper/ISonyCameraApi.kt b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/sony/wrapper/ISonyCameraApi.kt similarity index 97% rename from app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/sony/wrapper/ISonyCameraApi.kt rename to app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/sony/wrapper/ISonyCameraApi.kt index 79d42bb..4a7cc48 100644 --- a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/sony/wrapper/ISonyCameraApi.kt +++ b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/sony/wrapper/ISonyCameraApi.kt @@ -1,4 +1,4 @@ -package jp.osdn.gokigen.gokigenassets.camera.sony.wrapper +package jp.osdn.gokigen.gokigenassets.camera.vendor.sony.wrapper import org.json.JSONArray import org.json.JSONObject diff --git a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/sony/wrapper/ISonyCameraHolder.kt b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/sony/wrapper/ISonyCameraHolder.kt similarity index 68% rename from app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/sony/wrapper/ISonyCameraHolder.kt rename to app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/sony/wrapper/ISonyCameraHolder.kt index 185706d..18e28de 100644 --- a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/sony/wrapper/ISonyCameraHolder.kt +++ b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/sony/wrapper/ISonyCameraHolder.kt @@ -1,4 +1,4 @@ -package jp.osdn.gokigen.gokigenassets.camera.sony.wrapper +package jp.osdn.gokigen.gokigenassets.camera.vendor.sony.wrapper interface ISonyCameraHolder { diff --git a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/sony/wrapper/SonyApiService.kt b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/sony/wrapper/SonyApiService.kt similarity index 79% rename from app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/sony/wrapper/SonyApiService.kt rename to app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/sony/wrapper/SonyApiService.kt index c931248..4565ec3 100644 --- a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/sony/wrapper/SonyApiService.kt +++ b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/sony/wrapper/SonyApiService.kt @@ -1,4 +1,4 @@ -package jp.osdn.gokigen.gokigenassets.camera.sony.wrapper +package jp.osdn.gokigen.gokigenassets.camera.vendor.sony.wrapper internal class SonyApiService(private val name: String, private val actionUrl: String) : ISonyApiService { diff --git a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/sony/wrapper/SonyCameraApi.kt b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/sony/wrapper/SonyCameraApi.kt similarity index 99% rename from app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/sony/wrapper/SonyCameraApi.kt rename to app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/sony/wrapper/SonyCameraApi.kt index a3e60b3..62b3516 100644 --- a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/sony/wrapper/SonyCameraApi.kt +++ b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/sony/wrapper/SonyCameraApi.kt @@ -1,4 +1,4 @@ -package jp.osdn.gokigen.gokigenassets.camera.sony.wrapper +package jp.osdn.gokigen.gokigenassets.camera.vendor.sony.wrapper import android.util.Log import org.json.JSONObject diff --git a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/sony/wrapper/SonyCameraDeviceProvider.kt b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/sony/wrapper/SonyCameraDeviceProvider.kt similarity index 95% rename from app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/sony/wrapper/SonyCameraDeviceProvider.kt rename to app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/sony/wrapper/SonyCameraDeviceProvider.kt index 1aedcba..53d08c9 100644 --- a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/sony/wrapper/SonyCameraDeviceProvider.kt +++ b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/sony/wrapper/SonyCameraDeviceProvider.kt @@ -1,4 +1,4 @@ -package jp.osdn.gokigen.gokigenassets.camera.sony.wrapper +package jp.osdn.gokigen.gokigenassets.camera.vendor.sony.wrapper import android.util.Log diff --git a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/sony/wrapper/connection/SonyCameraConnectSequence.kt b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/sony/wrapper/connection/SonyCameraConnectSequence.kt similarity index 93% rename from app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/sony/wrapper/connection/SonyCameraConnectSequence.kt rename to app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/sony/wrapper/connection/SonyCameraConnectSequence.kt index 0546ec6..9f38c78 100644 --- a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/sony/wrapper/connection/SonyCameraConnectSequence.kt +++ b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/sony/wrapper/connection/SonyCameraConnectSequence.kt @@ -1,9 +1,9 @@ -package jp.osdn.gokigen.gokigenassets.camera.sony.wrapper.connection +package jp.osdn.gokigen.gokigenassets.camera.vendor.sony.wrapper.connection import android.util.Log import androidx.appcompat.app.AppCompatActivity -import jp.osdn.gokigen.gokigenassets.camera.sony.wrapper.ISonyCamera -import jp.osdn.gokigen.gokigenassets.camera.sony.wrapper.ISonyCameraHolder +import jp.osdn.gokigen.gokigenassets.camera.vendor.sony.wrapper.ISonyCamera +import jp.osdn.gokigen.gokigenassets.camera.vendor.sony.wrapper.ISonyCameraHolder import jp.osdn.gokigen.gokigenassets.camera.interfaces.ICameraConnection import jp.osdn.gokigen.gokigenassets.camera.interfaces.ICameraStatusReceiver import jp.osdn.gokigen.gokigenassets.constants.ICameraConstantConvert.Companion.ID_STRING_CONNECT_CAMERA_FOUND diff --git a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/sony/wrapper/connection/SonyCameraConnection.kt b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/sony/wrapper/connection/SonyCameraConnection.kt similarity index 97% rename from app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/sony/wrapper/connection/SonyCameraConnection.kt rename to app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/sony/wrapper/connection/SonyCameraConnection.kt index 86357d4..0b09dc5 100644 --- a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/sony/wrapper/connection/SonyCameraConnection.kt +++ b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/sony/wrapper/connection/SonyCameraConnection.kt @@ -1,9 +1,9 @@ -package jp.osdn.gokigen.gokigenassets.camera.sony.wrapper.connection +package jp.osdn.gokigen.gokigenassets.camera.vendor.sony.wrapper.connection import jp.osdn.gokigen.gokigenassets.camera.interfaces.ICameraConnectionStatus.CameraConnectionStatus import android.net.ConnectivityManager import android.net.wifi.WifiManager -import jp.osdn.gokigen.gokigenassets.camera.sony.wrapper.ISonyCameraHolder +import jp.osdn.gokigen.gokigenassets.camera.vendor.sony.wrapper.ISonyCameraHolder import jp.osdn.gokigen.gokigenassets.camera.interfaces.ICameraStatusReceiver import android.content.* import android.provider.Settings diff --git a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/sony/wrapper/connection/SonyCameraDisconnectSequence.kt b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/sony/wrapper/connection/SonyCameraDisconnectSequence.kt similarity index 83% rename from app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/sony/wrapper/connection/SonyCameraDisconnectSequence.kt rename to app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/sony/wrapper/connection/SonyCameraDisconnectSequence.kt index 0418761..b0d92d3 100644 --- a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/sony/wrapper/connection/SonyCameraDisconnectSequence.kt +++ b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/sony/wrapper/connection/SonyCameraDisconnectSequence.kt @@ -1,4 +1,4 @@ -package jp.osdn.gokigen.gokigenassets.camera.sony.wrapper.connection +package jp.osdn.gokigen.gokigenassets.camera.vendor.sony.wrapper.connection import android.util.Log import androidx.appcompat.app.AppCompatActivity diff --git a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/sony/wrapper/connection/SonySsdpClient.kt b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/sony/wrapper/connection/SonySsdpClient.kt similarity index 97% rename from app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/sony/wrapper/connection/SonySsdpClient.kt rename to app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/sony/wrapper/connection/SonySsdpClient.kt index 7abe807..51fce3a 100644 --- a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/sony/wrapper/connection/SonySsdpClient.kt +++ b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/sony/wrapper/connection/SonySsdpClient.kt @@ -1,10 +1,10 @@ -package jp.osdn.gokigen.gokigenassets.camera.sony.wrapper.connection +package jp.osdn.gokigen.gokigenassets.camera.vendor.sony.wrapper.connection import android.content.Context import android.util.Log import jp.osdn.gokigen.gokigenassets.camera.interfaces.ICameraStatusReceiver -import jp.osdn.gokigen.gokigenassets.camera.sony.wrapper.ISonyCamera -import jp.osdn.gokigen.gokigenassets.camera.sony.wrapper.SonyCameraDeviceProvider +import jp.osdn.gokigen.gokigenassets.camera.vendor.sony.wrapper.ISonyCamera +import jp.osdn.gokigen.gokigenassets.camera.vendor.sony.wrapper.SonyCameraDeviceProvider import jp.osdn.gokigen.gokigenassets.constants.ICameraConstantConvert import jp.osdn.gokigen.gokigenassets.utils.communication.SimpleHttpClient import jp.osdn.gokigen.gokigenassets.utils.communication.XmlElement diff --git a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/sony/wrapper/eventlistener/ISonyCameraEventObserver.kt b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/sony/wrapper/eventlistener/ISonyCameraEventObserver.kt similarity index 83% rename from app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/sony/wrapper/eventlistener/ISonyCameraEventObserver.kt rename to app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/sony/wrapper/eventlistener/ISonyCameraEventObserver.kt index cfd713a..bcb1340 100644 --- a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/sony/wrapper/eventlistener/ISonyCameraEventObserver.kt +++ b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/sony/wrapper/eventlistener/ISonyCameraEventObserver.kt @@ -1,4 +1,4 @@ -package jp.osdn.gokigen.gokigenassets.camera.sony.wrapper.eventlistener +package jp.osdn.gokigen.gokigenassets.camera.vendor.sony.wrapper.eventlistener import jp.osdn.gokigen.gokigenassets.camera.interfaces.ICameraChangeListener import jp.osdn.gokigen.gokigenassets.camera.interfaces.ICameraStatusHolder diff --git a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/sony/wrapper/eventlistener/ISonyStatusReceiver.kt b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/sony/wrapper/eventlistener/ISonyStatusReceiver.kt similarity index 56% rename from app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/sony/wrapper/eventlistener/ISonyStatusReceiver.kt rename to app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/sony/wrapper/eventlistener/ISonyStatusReceiver.kt index 97cd9e3..e6a620a 100644 --- a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/sony/wrapper/eventlistener/ISonyStatusReceiver.kt +++ b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/sony/wrapper/eventlistener/ISonyStatusReceiver.kt @@ -1,4 +1,4 @@ -package jp.osdn.gokigen.gokigenassets.camera.sony.wrapper.eventlistener +package jp.osdn.gokigen.gokigenassets.camera.vendor.sony.wrapper.eventlistener import org.json.JSONObject diff --git a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/sony/wrapper/eventlistener/ReplyJsonParser.kt b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/sony/wrapper/eventlistener/ReplyJsonParser.kt similarity index 99% rename from app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/sony/wrapper/eventlistener/ReplyJsonParser.kt rename to app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/sony/wrapper/eventlistener/ReplyJsonParser.kt index d7416bc..3d6720e 100644 --- a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/sony/wrapper/eventlistener/ReplyJsonParser.kt +++ b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/sony/wrapper/eventlistener/ReplyJsonParser.kt @@ -1,4 +1,4 @@ -package jp.osdn.gokigen.gokigenassets.camera.sony.wrapper.eventlistener +package jp.osdn.gokigen.gokigenassets.camera.vendor.sony.wrapper.eventlistener import android.os.Handler import android.util.Log diff --git a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/sony/wrapper/eventlistener/SonyCameraEventObserver.kt b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/sony/wrapper/eventlistener/SonyCameraEventObserver.kt similarity index 97% rename from app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/sony/wrapper/eventlistener/SonyCameraEventObserver.kt rename to app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/sony/wrapper/eventlistener/SonyCameraEventObserver.kt index 0272848..b4a9264 100644 --- a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/sony/wrapper/eventlistener/SonyCameraEventObserver.kt +++ b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/sony/wrapper/eventlistener/SonyCameraEventObserver.kt @@ -1,4 +1,4 @@ -package jp.osdn.gokigen.gokigenassets.camera.sony.wrapper.eventlistener +package jp.osdn.gokigen.gokigenassets.camera.vendor.sony.wrapper.eventlistener import android.content.Context import android.os.Handler @@ -6,7 +6,7 @@ import android.util.Log import org.json.JSONObject import jp.osdn.gokigen.gokigenassets.camera.interfaces.ICameraStatusHolder import jp.osdn.gokigen.gokigenassets.camera.interfaces.ICameraChangeListener -import jp.osdn.gokigen.gokigenassets.camera.sony.wrapper.ISonyCameraApi +import jp.osdn.gokigen.gokigenassets.camera.vendor.sony.wrapper.ISonyCameraApi import java.lang.Exception import java.lang.Thread.sleep diff --git a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/sony/wrapper/eventlistener/SonyStatus.kt b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/sony/wrapper/eventlistener/SonyStatus.kt similarity index 98% rename from app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/sony/wrapper/eventlistener/SonyStatus.kt rename to app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/sony/wrapper/eventlistener/SonyStatus.kt index f743d2f..418ff47 100644 --- a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/sony/wrapper/eventlistener/SonyStatus.kt +++ b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/sony/wrapper/eventlistener/SonyStatus.kt @@ -1,10 +1,9 @@ -package jp.osdn.gokigen.gokigenassets.camera.sony.wrapper.eventlistener +package jp.osdn.gokigen.gokigenassets.camera.vendor.sony.wrapper.eventlistener import android.graphics.Color import android.util.Log import jp.osdn.gokigen.gokigenassets.camera.interfaces.* -import jp.osdn.gokigen.gokigenassets.camera.sony.operation.SonyCameraFocusControl -import jp.osdn.gokigen.gokigenassets.camera.sony.wrapper.ISonyCameraApi +import jp.osdn.gokigen.gokigenassets.camera.vendor.sony.wrapper.ISonyCameraApi import org.json.JSONObject import java.lang.Exception diff --git a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/sony/wrapper/eventlistener/SonyStatusCandidates.kt b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/sony/wrapper/eventlistener/SonyStatusCandidates.kt similarity index 98% rename from app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/sony/wrapper/eventlistener/SonyStatusCandidates.kt rename to app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/sony/wrapper/eventlistener/SonyStatusCandidates.kt index 7a18bd1..b213386 100644 --- a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/sony/wrapper/eventlistener/SonyStatusCandidates.kt +++ b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/sony/wrapper/eventlistener/SonyStatusCandidates.kt @@ -1,7 +1,7 @@ -package jp.osdn.gokigen.gokigenassets.camera.sony.wrapper.eventlistener +package jp.osdn.gokigen.gokigenassets.camera.vendor.sony.wrapper.eventlistener import android.util.Log -import jp.osdn.gokigen.gokigenassets.camera.sony.wrapper.ISonyCameraApi +import jp.osdn.gokigen.gokigenassets.camera.vendor.sony.wrapper.ISonyCameraApi import org.json.JSONArray import kotlin.math.abs diff --git a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/theta/ThetaCameraControl.kt b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/theta/ThetaCameraControl.kt similarity index 92% rename from app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/theta/ThetaCameraControl.kt rename to app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/theta/ThetaCameraControl.kt index 5ffbe07..728d1e2 100644 --- a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/theta/ThetaCameraControl.kt +++ b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/theta/ThetaCameraControl.kt @@ -1,19 +1,19 @@ -package jp.osdn.gokigen.gokigenassets.camera.theta +package jp.osdn.gokigen.gokigenassets.camera.vendor.theta import android.util.Log import android.view.KeyEvent import android.view.View import androidx.appcompat.app.AppCompatActivity -import jp.osdn.gokigen.gokigenassets.camera.ICameraPreferenceProvider +import jp.osdn.gokigen.gokigenassets.camera.preference.ICameraPreferenceProvider import jp.osdn.gokigen.gokigenassets.camera.interfaces.* -import jp.osdn.gokigen.gokigenassets.camera.theta.connection.ThetaCameraConnection -import jp.osdn.gokigen.gokigenassets.camera.theta.liveview.ThetaLiveViewControl -import jp.osdn.gokigen.gokigenassets.camera.theta.operation.ThetaMovieRecordingControl -import jp.osdn.gokigen.gokigenassets.camera.theta.operation.ThetaOptionSetControl -import jp.osdn.gokigen.gokigenassets.camera.theta.operation.ThetaSingleShotControl -import jp.osdn.gokigen.gokigenassets.camera.theta.status.ICaptureModeReceiver -import jp.osdn.gokigen.gokigenassets.camera.theta.status.ThetaCameraStatusWatcher -import jp.osdn.gokigen.gokigenassets.camera.theta.status.ThetaSessionHolder +import jp.osdn.gokigen.gokigenassets.camera.vendor.theta.connection.ThetaCameraConnection +import jp.osdn.gokigen.gokigenassets.camera.vendor.theta.liveview.ThetaLiveViewControl +import jp.osdn.gokigen.gokigenassets.camera.vendor.theta.operation.ThetaMovieRecordingControl +import jp.osdn.gokigen.gokigenassets.camera.vendor.theta.operation.ThetaOptionSetControl +import jp.osdn.gokigen.gokigenassets.camera.vendor.theta.operation.ThetaSingleShotControl +import jp.osdn.gokigen.gokigenassets.camera.vendor.theta.status.ICaptureModeReceiver +import jp.osdn.gokigen.gokigenassets.camera.vendor.theta.status.ThetaCameraStatusWatcher +import jp.osdn.gokigen.gokigenassets.camera.vendor.theta.status.ThetaSessionHolder import jp.osdn.gokigen.gokigenassets.constants.IApplicationConstantConvert.Companion.ID_BUTTON_SHUTTER import jp.osdn.gokigen.gokigenassets.constants.IApplicationConstantConvert.Companion.ID_PREFERENCE_CAPTURE_BOTH_CAMERA_AND_LIVE_VIEW import jp.osdn.gokigen.gokigenassets.constants.IApplicationConstantConvert.Companion.ID_PREFERENCE_CAPTURE_BOTH_CAMERA_AND_LIVE_VIEW_DEFAULT_VALUE diff --git a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/theta/connection/ThetaCameraConnectSequence.kt b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/theta/connection/ThetaCameraConnectSequence.kt similarity index 98% rename from app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/theta/connection/ThetaCameraConnectSequence.kt rename to app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/theta/connection/ThetaCameraConnectSequence.kt index 2e8281e..3502946 100644 --- a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/theta/connection/ThetaCameraConnectSequence.kt +++ b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/theta/connection/ThetaCameraConnectSequence.kt @@ -1,11 +1,11 @@ -package jp.osdn.gokigen.gokigenassets.camera.theta.connection +package jp.osdn.gokigen.gokigenassets.camera.vendor.theta.connection import android.util.Log import androidx.appcompat.app.AppCompatActivity import jp.osdn.gokigen.gokigenassets.camera.interfaces.ICameraConnection import jp.osdn.gokigen.gokigenassets.camera.interfaces.ICameraConnectionStatus import jp.osdn.gokigen.gokigenassets.camera.interfaces.ICameraStatusReceiver -import jp.osdn.gokigen.gokigenassets.camera.theta.status.IThetaSessionIdNotifier +import jp.osdn.gokigen.gokigenassets.camera.vendor.theta.status.IThetaSessionIdNotifier import jp.osdn.gokigen.gokigenassets.constants.ICameraConstantConvert.Companion.ID_STRING_CAMERA_CONNECT_RESPONSE_NG import jp.osdn.gokigen.gokigenassets.constants.ICameraConstantConvert.Companion.ID_STRING_CAMERA_NOT_FOUND import jp.osdn.gokigen.gokigenassets.constants.ICameraConstantConvert.Companion.ID_STRING_CONNECT_CONNECTED diff --git a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/theta/connection/ThetaCameraConnection.kt b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/theta/connection/ThetaCameraConnection.kt similarity index 96% rename from app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/theta/connection/ThetaCameraConnection.kt rename to app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/theta/connection/ThetaCameraConnection.kt index 34eeeb4..b75d36f 100644 --- a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/theta/connection/ThetaCameraConnection.kt +++ b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/theta/connection/ThetaCameraConnection.kt @@ -1,4 +1,4 @@ -package jp.osdn.gokigen.gokigenassets.camera.theta.connection +package jp.osdn.gokigen.gokigenassets.camera.vendor.theta.connection import android.content.* import android.net.ConnectivityManager @@ -12,10 +12,10 @@ import jp.osdn.gokigen.gokigenassets.camera.interfaces.ICameraConnection import jp.osdn.gokigen.gokigenassets.camera.interfaces.ICameraConnectionStatus import jp.osdn.gokigen.gokigenassets.camera.interfaces.ICameraStatusReceiver import jp.osdn.gokigen.gokigenassets.camera.interfaces.ILiveViewController -import jp.osdn.gokigen.gokigenassets.camera.theta.operation.IOperationCallback -import jp.osdn.gokigen.gokigenassets.camera.theta.operation.ThetaOptionSetControl -import jp.osdn.gokigen.gokigenassets.camera.theta.status.IThetaSessionIdNotifier -import jp.osdn.gokigen.gokigenassets.camera.theta.status.IThetaSessionIdProvider +import jp.osdn.gokigen.gokigenassets.camera.vendor.theta.operation.IOperationCallback +import jp.osdn.gokigen.gokigenassets.camera.vendor.theta.operation.ThetaOptionSetControl +import jp.osdn.gokigen.gokigenassets.camera.vendor.theta.status.IThetaSessionIdNotifier +import jp.osdn.gokigen.gokigenassets.camera.vendor.theta.status.IThetaSessionIdProvider import jp.osdn.gokigen.gokigenassets.constants.ICameraConstantConvert.Companion.ID_PREFERENCE_THETA_LIVEVIEW_RESOLUTION import jp.osdn.gokigen.gokigenassets.constants.ICameraConstantConvert.Companion.ID_PREFERENCE_THETA_LIVEVIEW_RESOLUTION_DEFAULT_VALUE import jp.osdn.gokigen.gokigenassets.constants.ICameraConstantConvert.Companion.ID_STRING_CONNECT_CHECK_WIFI diff --git a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/theta/connection/ThetaCameraDisconnectSequence.kt b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/theta/connection/ThetaCameraDisconnectSequence.kt similarity index 79% rename from app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/theta/connection/ThetaCameraDisconnectSequence.kt rename to app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/theta/connection/ThetaCameraDisconnectSequence.kt index 1e5aeff..988604a 100644 --- a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/theta/connection/ThetaCameraDisconnectSequence.kt +++ b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/theta/connection/ThetaCameraDisconnectSequence.kt @@ -1,4 +1,4 @@ -package jp.osdn.gokigen.gokigenassets.camera.theta.connection +package jp.osdn.gokigen.gokigenassets.camera.vendor.theta.connection import android.util.Log diff --git a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/theta/liveview/ThetaLiveViewControl.kt b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/theta/liveview/ThetaLiveViewControl.kt similarity index 96% rename from app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/theta/liveview/ThetaLiveViewControl.kt rename to app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/theta/liveview/ThetaLiveViewControl.kt index d21632e..c18b7be 100644 --- a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/theta/liveview/ThetaLiveViewControl.kt +++ b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/theta/liveview/ThetaLiveViewControl.kt @@ -1,8 +1,8 @@ -package jp.osdn.gokigen.gokigenassets.camera.theta.liveview +package jp.osdn.gokigen.gokigenassets.camera.vendor.theta.liveview import android.util.Log import jp.osdn.gokigen.gokigenassets.camera.interfaces.ILiveViewController -import jp.osdn.gokigen.gokigenassets.camera.theta.status.IThetaSessionIdProvider +import jp.osdn.gokigen.gokigenassets.camera.vendor.theta.status.IThetaSessionIdProvider import jp.osdn.gokigen.gokigenassets.liveview.image.CameraLiveViewListenerImpl import jp.osdn.gokigen.gokigenassets.utils.communication.SimpleLiveViewSlicer diff --git a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/theta/operation/IOperationCallback.kt b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/theta/operation/IOperationCallback.kt similarity index 57% rename from app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/theta/operation/IOperationCallback.kt rename to app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/theta/operation/IOperationCallback.kt index 3b0d486..89d0428 100644 --- a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/theta/operation/IOperationCallback.kt +++ b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/theta/operation/IOperationCallback.kt @@ -1,4 +1,4 @@ -package jp.osdn.gokigen.gokigenassets.camera.theta.operation +package jp.osdn.gokigen.gokigenassets.camera.vendor.theta.operation interface IOperationCallback { diff --git a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/theta/operation/ThetaMovieRecordingControl.kt b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/theta/operation/ThetaMovieRecordingControl.kt similarity index 95% rename from app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/theta/operation/ThetaMovieRecordingControl.kt rename to app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/theta/operation/ThetaMovieRecordingControl.kt index 3f481ae..8e6c689 100644 --- a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/theta/operation/ThetaMovieRecordingControl.kt +++ b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/theta/operation/ThetaMovieRecordingControl.kt @@ -1,9 +1,9 @@ -package jp.osdn.gokigen.gokigenassets.camera.theta.operation +package jp.osdn.gokigen.gokigenassets.camera.vendor.theta.operation import android.util.Log import jp.osdn.gokigen.gokigenassets.camera.interfaces.ILiveViewController -import jp.osdn.gokigen.gokigenassets.camera.theta.status.IThetaSessionIdProvider -import jp.osdn.gokigen.gokigenassets.camera.theta.status.IThetaStatusHolder +import jp.osdn.gokigen.gokigenassets.camera.vendor.theta.status.IThetaSessionIdProvider +import jp.osdn.gokigen.gokigenassets.camera.vendor.theta.status.IThetaStatusHolder import jp.osdn.gokigen.gokigenassets.scene.IVibrator import jp.osdn.gokigen.gokigenassets.utils.communication.SimpleHttpClient diff --git a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/theta/operation/ThetaOptionGetControl.kt b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/theta/operation/ThetaOptionGetControl.kt similarity index 93% rename from app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/theta/operation/ThetaOptionGetControl.kt rename to app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/theta/operation/ThetaOptionGetControl.kt index 4d5f2e4..944b174 100644 --- a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/theta/operation/ThetaOptionGetControl.kt +++ b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/theta/operation/ThetaOptionGetControl.kt @@ -1,7 +1,7 @@ -package jp.osdn.gokigen.gokigenassets.camera.theta.operation +package jp.osdn.gokigen.gokigenassets.camera.vendor.theta.operation import android.util.Log -import jp.osdn.gokigen.gokigenassets.camera.theta.status.IThetaSessionIdProvider +import jp.osdn.gokigen.gokigenassets.camera.vendor.theta.status.IThetaSessionIdProvider import jp.osdn.gokigen.gokigenassets.utils.communication.SimpleHttpClient class ThetaOptionGetControl(private val sessionIdProvider: IThetaSessionIdProvider, private val executeUrl : String = "http://192.168.1.1") diff --git a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/theta/operation/ThetaOptionSetControl.kt b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/theta/operation/ThetaOptionSetControl.kt similarity index 93% rename from app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/theta/operation/ThetaOptionSetControl.kt rename to app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/theta/operation/ThetaOptionSetControl.kt index 9301e8e..6af0d06 100644 --- a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/theta/operation/ThetaOptionSetControl.kt +++ b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/theta/operation/ThetaOptionSetControl.kt @@ -1,7 +1,7 @@ -package jp.osdn.gokigen.gokigenassets.camera.theta.operation +package jp.osdn.gokigen.gokigenassets.camera.vendor.theta.operation import android.util.Log -import jp.osdn.gokigen.gokigenassets.camera.theta.status.IThetaSessionIdProvider +import jp.osdn.gokigen.gokigenassets.camera.vendor.theta.status.IThetaSessionIdProvider import jp.osdn.gokigen.gokigenassets.utils.communication.SimpleHttpClient diff --git a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/theta/operation/ThetaSingleShotControl.kt b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/theta/operation/ThetaSingleShotControl.kt similarity index 95% rename from app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/theta/operation/ThetaSingleShotControl.kt rename to app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/theta/operation/ThetaSingleShotControl.kt index da457b1..c902179 100644 --- a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/theta/operation/ThetaSingleShotControl.kt +++ b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/theta/operation/ThetaSingleShotControl.kt @@ -1,9 +1,9 @@ -package jp.osdn.gokigen.gokigenassets.camera.theta.operation +package jp.osdn.gokigen.gokigenassets.camera.vendor.theta.operation import android.util.Log import jp.osdn.gokigen.gokigenassets.camera.interfaces.ILiveViewController -import jp.osdn.gokigen.gokigenassets.camera.theta.status.IThetaSessionIdProvider -import jp.osdn.gokigen.gokigenassets.camera.theta.status.IThetaStatusHolder +import jp.osdn.gokigen.gokigenassets.camera.vendor.theta.status.IThetaSessionIdProvider +import jp.osdn.gokigen.gokigenassets.camera.vendor.theta.status.IThetaStatusHolder import jp.osdn.gokigen.gokigenassets.scene.IVibrator import jp.osdn.gokigen.gokigenassets.utils.communication.SimpleHttpClient import org.json.JSONObject diff --git a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/theta/status/ICaptureModeReceiver.kt b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/theta/status/ICaptureModeReceiver.kt similarity index 56% rename from app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/theta/status/ICaptureModeReceiver.kt rename to app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/theta/status/ICaptureModeReceiver.kt index 86bf98e..1b1acc8 100644 --- a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/theta/status/ICaptureModeReceiver.kt +++ b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/theta/status/ICaptureModeReceiver.kt @@ -1,4 +1,4 @@ -package jp.osdn.gokigen.gokigenassets.camera.theta.status +package jp.osdn.gokigen.gokigenassets.camera.vendor.theta.status interface ICaptureModeReceiver diff --git a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/theta/status/IThetaSessionIdNotifier.kt b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/theta/status/IThetaSessionIdNotifier.kt similarity index 56% rename from app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/theta/status/IThetaSessionIdNotifier.kt rename to app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/theta/status/IThetaSessionIdNotifier.kt index c0b9fc3..f5d3974 100644 --- a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/theta/status/IThetaSessionIdNotifier.kt +++ b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/theta/status/IThetaSessionIdNotifier.kt @@ -1,4 +1,4 @@ -package jp.osdn.gokigen.gokigenassets.camera.theta.status +package jp.osdn.gokigen.gokigenassets.camera.vendor.theta.status interface IThetaSessionIdNotifier diff --git a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/theta/status/IThetaSessionIdProvider.kt b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/theta/status/IThetaSessionIdProvider.kt similarity index 50% rename from app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/theta/status/IThetaSessionIdProvider.kt rename to app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/theta/status/IThetaSessionIdProvider.kt index 445e12c..48e1ea1 100644 --- a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/theta/status/IThetaSessionIdProvider.kt +++ b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/theta/status/IThetaSessionIdProvider.kt @@ -1,4 +1,4 @@ -package jp.osdn.gokigen.gokigenassets.camera.theta.status +package jp.osdn.gokigen.gokigenassets.camera.vendor.theta.status interface IThetaSessionIdProvider diff --git a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/theta/status/IThetaStatusHolder.kt b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/theta/status/IThetaStatusHolder.kt similarity index 64% rename from app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/theta/status/IThetaStatusHolder.kt rename to app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/theta/status/IThetaStatusHolder.kt index e56edd1..b9fdeff 100644 --- a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/theta/status/IThetaStatusHolder.kt +++ b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/theta/status/IThetaStatusHolder.kt @@ -1,4 +1,4 @@ -package jp.osdn.gokigen.gokigenassets.camera.theta.status +package jp.osdn.gokigen.gokigenassets.camera.vendor.theta.status interface IThetaStatusHolder diff --git a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/theta/status/ThetaCameraStatusListHolder.kt b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/theta/status/ThetaCameraStatusListHolder.kt similarity index 98% rename from app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/theta/status/ThetaCameraStatusListHolder.kt rename to app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/theta/status/ThetaCameraStatusListHolder.kt index f673bbb..0b570b4 100644 --- a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/theta/status/ThetaCameraStatusListHolder.kt +++ b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/theta/status/ThetaCameraStatusListHolder.kt @@ -1,7 +1,7 @@ -package jp.osdn.gokigen.gokigenassets.camera.theta.status +package jp.osdn.gokigen.gokigenassets.camera.vendor.theta.status import android.util.Log -import jp.osdn.gokigen.gokigenassets.camera.theta.operation.ThetaOptionSetControl +import jp.osdn.gokigen.gokigenassets.camera.vendor.theta.operation.ThetaOptionSetControl class ThetaCameraStatusListHolder(private val sessionIdProvider: IThetaSessionIdProvider, executeUrl : String = "http://192.168.1.1") { diff --git a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/theta/status/ThetaCameraStatusWatcher.kt b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/theta/status/ThetaCameraStatusWatcher.kt similarity index 99% rename from app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/theta/status/ThetaCameraStatusWatcher.kt rename to app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/theta/status/ThetaCameraStatusWatcher.kt index b3517c2..8bc6c42 100644 --- a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/theta/status/ThetaCameraStatusWatcher.kt +++ b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/theta/status/ThetaCameraStatusWatcher.kt @@ -1,4 +1,4 @@ -package jp.osdn.gokigen.gokigenassets.camera.theta.status +package jp.osdn.gokigen.gokigenassets.camera.vendor.theta.status import android.graphics.Color import android.util.Log diff --git a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/theta/status/ThetaSessionHolder.kt b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/theta/status/ThetaSessionHolder.kt similarity index 89% rename from app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/theta/status/ThetaSessionHolder.kt rename to app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/theta/status/ThetaSessionHolder.kt index ccb3ccf..09e3de5 100644 --- a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/theta/status/ThetaSessionHolder.kt +++ b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/theta/status/ThetaSessionHolder.kt @@ -1,4 +1,4 @@ -package jp.osdn.gokigen.gokigenassets.camera.theta.status +package jp.osdn.gokigen.gokigenassets.camera.vendor.theta.status import android.util.Log diff --git a/app/src/main/java/jp/osdn/gokigen/gokigenassets/constants/ICameraConstantConvert.kt b/app/src/main/java/jp/osdn/gokigen/gokigenassets/constants/ICameraConstantConvert.kt index 81588b4..8337b90 100644 --- a/app/src/main/java/jp/osdn/gokigen/gokigenassets/constants/ICameraConstantConvert.kt +++ b/app/src/main/java/jp/osdn/gokigen/gokigenassets/constants/ICameraConstantConvert.kt @@ -20,6 +20,7 @@ interface ICameraConstantConvert const val ID_STRING_CONNECT_CONNECT = R.string.connect_connect const val ID_STRING_CONNECT_CONNECTING = R.string.connect_connecting const val ID_STRING_CONNECT_CONNECTED = R.string.connect_connected + const val ID_STRING_CONNECT_CONNECT_FINISHED = R.string.connect_connect_finished const val ID_STRING_CONNECT_CHANGE_RUN_MODE = R.string.connect_change_run_mode const val ID_STRING_CONNECT_CAMERA_DETECTED = R.string.connect_camera_detected const val ID_STRING_CONNECT_CAMERA_SEARCH_REQUEST = R.string.connect_camera_search_request @@ -27,6 +28,7 @@ interface ICameraConstantConvert const val ID_STRING_CONNECT_WAIT_REPLY_CAMERA = R.string.connect_camera_wait_reply const val ID_STRING_CONNECT_CAMERA_RECEIVED_REPLY = R.string.connect_camera_received_reply const val ID_STRING_CONNECT_CAMERA_REJECTED = R.string.connect_camera_rejected + const val ID_STRING_CONNECT_UNKNOWN_MESSAGE = R.string.connect_receive_unknown_message const val ID_PREFERENCE_THETA_LIVEVIEW_RESOLUTION = IPreferencePropertyAccessor.THETA_LIVEVIEW_RESOLUTION diff --git a/app/src/main/java/jp/osdn/gokigen/mangle/scene/CameraProvider.kt b/app/src/main/java/jp/osdn/gokigen/mangle/scene/CameraProvider.kt index a5696f2..af3dfff 100644 --- a/app/src/main/java/jp/osdn/gokigen/mangle/scene/CameraProvider.kt +++ b/app/src/main/java/jp/osdn/gokigen/mangle/scene/CameraProvider.kt @@ -1,18 +1,18 @@ package jp.osdn.gokigen.mangle.scene import androidx.appcompat.app.AppCompatActivity -import jp.osdn.gokigen.gokigenassets.camera.CameraPreference -import jp.osdn.gokigen.gokigenassets.camera.CameraPreferenceKeySet +import jp.osdn.gokigen.gokigenassets.camera.preference.CameraPreference +import jp.osdn.gokigen.gokigenassets.camera.preference.CameraPreferenceKeySet import jp.osdn.gokigen.gokigenassets.camera.DummyCameraControl -import jp.osdn.gokigen.gokigenassets.camera.ICameraPreferenceProvider -import jp.osdn.gokigen.gokigenassets.camera.camerax.operation.CameraControl +import jp.osdn.gokigen.gokigenassets.camera.preference.ICameraPreferenceProvider +import jp.osdn.gokigen.gokigenassets.camera.vendor.camerax.operation.CameraControl import jp.osdn.gokigen.gokigenassets.camera.console.ConsolePanelControl import jp.osdn.gokigen.gokigenassets.camera.example.ExamplePictureControl import jp.osdn.gokigen.gokigenassets.camera.interfaces.* -import jp.osdn.gokigen.gokigenassets.camera.panasonic.wrapper.PanasonicCameraControl -import jp.osdn.gokigen.gokigenassets.camera.ricohpentax.RicohPentaxCameraControl -import jp.osdn.gokigen.gokigenassets.camera.sony.SonyCameraControl -import jp.osdn.gokigen.gokigenassets.camera.theta.ThetaCameraControl +import jp.osdn.gokigen.gokigenassets.camera.vendor.panasonic.wrapper.PanasonicCameraControl +import jp.osdn.gokigen.gokigenassets.camera.vendor.ricohpentax.RicohPentaxCameraControl +import jp.osdn.gokigen.gokigenassets.camera.vendor.sony.SonyCameraControl +import jp.osdn.gokigen.gokigenassets.camera.vendor.theta.ThetaCameraControl import jp.osdn.gokigen.gokigenassets.constants.ICameraConnectionMethods.Companion.PREFERENCE_CAMERA_METHOD_CAMERAX import jp.osdn.gokigen.gokigenassets.constants.ICameraConnectionMethods.Companion.PREFERENCE_CAMERA_METHOD_CONSOLE import jp.osdn.gokigen.gokigenassets.constants.ICameraConnectionMethods.Companion.PREFERENCE_CAMERA_METHOD_EXAMPLE 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 6c2b423..d3a33d1 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 @@ -10,7 +10,7 @@ import jp.osdn.gokigen.gokigenassets.camera.interfaces.ICameraStatusReceiver import jp.osdn.gokigen.gokigenassets.liveview.LiveImageViewFragment import jp.osdn.gokigen.gokigenassets.preference.MainPreferenceFragment import jp.osdn.gokigen.gokigenassets.preference.PreferenceAccessWrapper -import jp.osdn.gokigen.gokigenassets.camera.camerax.preview.PreviewFragment +import jp.osdn.gokigen.gokigenassets.camera.vendor.camerax.preview.PreviewFragment import jp.osdn.gokigen.gokigenassets.camera.interfaces.ICameraControl import jp.osdn.gokigen.gokigenassets.scene.IChangeSceneBasic import jp.osdn.gokigen.gokigenassets.scene.IInformationReceiver diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index b21ffec..5b3c40a 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -123,6 +123,7 @@ 接続 接続中… 接続完了 + 接続完了. モード変更 カメラ設定調整 カメラ発見 @@ -131,6 +132,7 @@ カメラ応答待ち カメラ応答受信 カメラ接続拒否 + 未定義メッセージを受信 カメラが見つかりませんでした… カメラに接続できませんでした。 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index b7687af..1530834 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -123,6 +123,7 @@ connecting connecting… connected + connect finished. changeRunMode restoreCameraSettings Detected a camera @@ -130,6 +131,7 @@ Found a camera Wait reply from a camera Received reply from a camera + Received a unknown message. Not Found… Camera replies NG. -- 2.11.0