From 2d8425495e5696fd45ce5e6c356d991354a50472 Mon Sep 17 00:00:00 2001 From: MRSa Date: Wed, 21 Aug 2019 23:19:37 +0900 Subject: [PATCH] =?utf8?q?SONY=E7=94=A8=E3=81=AE=E3=82=AF=E3=83=A9?= =?utf8?q?=E3=82=B9=E3=82=92=E8=BF=BD=E5=8A=A0=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- .idea/codeStyles/Project.xml | 116 +++++++++++++++++++++ .idea/misc.xml | 2 +- app/build.gradle | 4 +- .../camera/vendor/sony/ISonyInterfaceProvider.java | 15 ++- .../vendor/sony/wrapper/SonyButtonControl.java | 12 +++ .../vendor/sony/wrapper/SonyCameraWrapper.java | 58 ++++++++++- .../vendor/sony/wrapper/SonyHardwareStatus.java | 50 +++++++++ .../camera/vendor/sony/wrapper/SonyRunMode.java | 18 ++++ .../connection/SonyCameraDisconnectSequence.java | 1 - .../wrapper/eventlistener/ReplyJsonParser.java | 1 - .../sony/wrapper/eventlistener/SonyStatus.java | 90 ++++++++++++++++ .../sony/wrapper/playback/SonyPlaybackControl.java | 58 +++++++++++ build.gradle | 2 +- gradle/wrapper/gradle-wrapper.properties | 4 +- 14 files changed, 419 insertions(+), 12 deletions(-) create mode 100644 .idea/codeStyles/Project.xml create mode 100644 app/src/main/java/net/osdn/gokigen/pkremote/camera/vendor/sony/wrapper/SonyButtonControl.java create mode 100644 app/src/main/java/net/osdn/gokigen/pkremote/camera/vendor/sony/wrapper/SonyHardwareStatus.java create mode 100644 app/src/main/java/net/osdn/gokigen/pkremote/camera/vendor/sony/wrapper/SonyRunMode.java create mode 100644 app/src/main/java/net/osdn/gokigen/pkremote/camera/vendor/sony/wrapper/eventlistener/SonyStatus.java create mode 100644 app/src/main/java/net/osdn/gokigen/pkremote/camera/vendor/sony/wrapper/playback/SonyPlaybackControl.java diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml new file mode 100644 index 0000000..681f41a --- /dev/null +++ b/.idea/codeStyles/Project.xml @@ -0,0 +1,116 @@ + + + + + + + +
+ + + + xmlns:android + + ^$ + + + +
+
+ + + + xmlns:.* + + ^$ + + + BY_NAME + +
+
+ + + + .*:id + + http://schemas.android.com/apk/res/android + + + +
+
+ + + + .*:name + + http://schemas.android.com/apk/res/android + + + +
+
+ + + + name + + ^$ + + + +
+
+ + + + style + + ^$ + + + +
+
+ + + + .* + + ^$ + + + BY_NAME + +
+
+ + + + .* + + http://schemas.android.com/apk/res/android + + + ANDROID_ATTRIBUTE_ORDER + +
+
+ + + + .* + + .* + + + BY_NAME + +
+ + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index d35aa09..4bb39d7 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -74,7 +74,7 @@ - + diff --git a/app/build.gradle b/app/build.gradle index 4bcde05..1b1942f 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -6,8 +6,8 @@ android { applicationId "net.osdn.gokigen.pkremote" minSdkVersion 14 targetSdkVersion 29 - versionCode 10302 - versionName "1.3.2" + versionCode 10303 + versionName "1.3.3" } buildTypes { release { diff --git a/app/src/main/java/net/osdn/gokigen/pkremote/camera/vendor/sony/ISonyInterfaceProvider.java b/app/src/main/java/net/osdn/gokigen/pkremote/camera/vendor/sony/ISonyInterfaceProvider.java index 4e1bc5a..c2a25f3 100644 --- a/app/src/main/java/net/osdn/gokigen/pkremote/camera/vendor/sony/ISonyInterfaceProvider.java +++ b/app/src/main/java/net/osdn/gokigen/pkremote/camera/vendor/sony/ISonyInterfaceProvider.java @@ -1,13 +1,19 @@ package net.osdn.gokigen.pkremote.camera.vendor.sony; +import net.osdn.gokigen.pkremote.camera.interfaces.control.ICameraButtonControl; import net.osdn.gokigen.pkremote.camera.interfaces.control.ICameraConnection; +import net.osdn.gokigen.pkremote.camera.interfaces.control.ICameraRunMode; import net.osdn.gokigen.pkremote.camera.interfaces.control.ICaptureControl; import net.osdn.gokigen.pkremote.camera.interfaces.control.IFocusingControl; import net.osdn.gokigen.pkremote.camera.interfaces.control.IZoomLensControl; import net.osdn.gokigen.pkremote.camera.interfaces.liveview.IDisplayInjector; import net.osdn.gokigen.pkremote.camera.interfaces.liveview.ILiveViewControl; import net.osdn.gokigen.pkremote.camera.interfaces.liveview.ILiveViewListener; +import net.osdn.gokigen.pkremote.camera.interfaces.playback.IPlaybackControl; +import net.osdn.gokigen.pkremote.camera.interfaces.status.ICameraHardwareStatus; import net.osdn.gokigen.pkremote.camera.interfaces.status.ICameraInformation; +import net.osdn.gokigen.pkremote.camera.interfaces.status.ICameraStatus; +import net.osdn.gokigen.pkremote.camera.interfaces.status.ICameraStatusWatcher; import net.osdn.gokigen.pkremote.camera.vendor.sony.wrapper.ISonyCameraApi; import java.util.List; @@ -15,13 +21,20 @@ import java.util.List; public interface ISonyInterfaceProvider { ICameraConnection getSonyCameraConnection(); - ILiveViewControl getSonyLiveViewControl(); + ILiveViewControl getLiveViewControl(); ILiveViewListener getLiveViewListener(); IFocusingControl getFocusingControl(); ICameraInformation getCameraInformation(); IZoomLensControl getZoomLensControl(); ICaptureControl getCaptureControl(); IDisplayInjector getDisplayInjector(); + ICameraStatus getCameraStatusListHolder(); + ICameraButtonControl getButtonControl(); + ICameraStatusWatcher getCameraStatusWatcher(); + IPlaybackControl getPlaybackControl(); + ICameraHardwareStatus getHardwareStatus(); + ICameraRunMode getCameraRunMode(); + List getApiCommands(); ISonyCameraApi getCameraApi(); } diff --git a/app/src/main/java/net/osdn/gokigen/pkremote/camera/vendor/sony/wrapper/SonyButtonControl.java b/app/src/main/java/net/osdn/gokigen/pkremote/camera/vendor/sony/wrapper/SonyButtonControl.java new file mode 100644 index 0000000..32445e0 --- /dev/null +++ b/app/src/main/java/net/osdn/gokigen/pkremote/camera/vendor/sony/wrapper/SonyButtonControl.java @@ -0,0 +1,12 @@ +package net.osdn.gokigen.pkremote.camera.vendor.sony.wrapper; + +import net.osdn.gokigen.pkremote.camera.interfaces.control.ICameraButtonControl; + +public class SonyButtonControl implements ICameraButtonControl +{ + @Override + public boolean pushedButton(String code, boolean isLongPress) + { + return (false); + } +} diff --git a/app/src/main/java/net/osdn/gokigen/pkremote/camera/vendor/sony/wrapper/SonyCameraWrapper.java b/app/src/main/java/net/osdn/gokigen/pkremote/camera/vendor/sony/wrapper/SonyCameraWrapper.java index f31a7c3..9d73a93 100644 --- a/app/src/main/java/net/osdn/gokigen/pkremote/camera/vendor/sony/wrapper/SonyCameraWrapper.java +++ b/app/src/main/java/net/osdn/gokigen/pkremote/camera/vendor/sony/wrapper/SonyCameraWrapper.java @@ -6,7 +6,9 @@ import android.util.Log; import androidx.annotation.NonNull; import androidx.annotation.Nullable; +import net.osdn.gokigen.pkremote.camera.interfaces.control.ICameraButtonControl; import net.osdn.gokigen.pkremote.camera.interfaces.control.ICameraConnection; +import net.osdn.gokigen.pkremote.camera.interfaces.control.ICameraRunMode; import net.osdn.gokigen.pkremote.camera.interfaces.control.ICaptureControl; import net.osdn.gokigen.pkremote.camera.interfaces.control.IFocusingControl; import net.osdn.gokigen.pkremote.camera.interfaces.control.IFocusingModeNotify; @@ -16,9 +18,13 @@ import net.osdn.gokigen.pkremote.camera.interfaces.liveview.IDisplayInjector; import net.osdn.gokigen.pkremote.camera.interfaces.liveview.IIndicatorControl; import net.osdn.gokigen.pkremote.camera.interfaces.liveview.ILiveViewControl; import net.osdn.gokigen.pkremote.camera.interfaces.liveview.ILiveViewListener; +import net.osdn.gokigen.pkremote.camera.interfaces.playback.IPlaybackControl; import net.osdn.gokigen.pkremote.camera.interfaces.status.ICameraChangeListener; +import net.osdn.gokigen.pkremote.camera.interfaces.status.ICameraHardwareStatus; import net.osdn.gokigen.pkremote.camera.interfaces.status.ICameraInformation; +import net.osdn.gokigen.pkremote.camera.interfaces.status.ICameraStatus; import net.osdn.gokigen.pkremote.camera.interfaces.status.ICameraStatusReceiver; +import net.osdn.gokigen.pkremote.camera.interfaces.status.ICameraStatusWatcher; import net.osdn.gokigen.pkremote.camera.vendor.sony.ISonyInterfaceProvider; import net.osdn.gokigen.pkremote.camera.vendor.sony.operation.SonyCameraCaptureControl; import net.osdn.gokigen.pkremote.camera.vendor.sony.operation.SonyCameraFocusControl; @@ -27,6 +33,8 @@ import net.osdn.gokigen.pkremote.camera.vendor.sony.wrapper.connection.SonyCamer import net.osdn.gokigen.pkremote.camera.vendor.sony.wrapper.eventlistener.CameraEventObserver; import net.osdn.gokigen.pkremote.camera.vendor.sony.wrapper.eventlistener.ICameraEventObserver; import net.osdn.gokigen.pkremote.camera.vendor.sony.wrapper.eventlistener.ICameraStatusHolder; +import net.osdn.gokigen.pkremote.camera.vendor.sony.wrapper.eventlistener.SonyStatus; +import net.osdn.gokigen.pkremote.camera.vendor.sony.wrapper.playback.SonyPlaybackControl; import java.util.ArrayList; import java.util.Arrays; @@ -45,12 +53,22 @@ public class SonyCameraWrapper implements ISonyCameraHolder, ISonyInterfaceProvi private SonyCameraFocusControl focusControl = null; private SonyCameraCaptureControl captureControl = null; private SonyCameraZoomLensControl zoomControl = null; + private SonyButtonControl buttonControl; + private SonyHardwareStatus hardwareStatus; + private SonyRunMode runMode; + private SonyStatus statusHolder; + private SonyPlaybackControl playbackControl; public SonyCameraWrapper(final Activity context, final ICameraStatusReceiver statusReceiver , final @NonNull ICameraChangeListener listener) { this.context = context; this.provider = statusReceiver; this.listener = listener; + this.buttonControl = new SonyButtonControl(); + this.hardwareStatus = new SonyHardwareStatus(); + this.runMode = new SonyRunMode(); + this.statusHolder = new SonyStatus(); + this.playbackControl = new SonyPlaybackControl(); } @Override @@ -90,8 +108,6 @@ public class SonyCameraWrapper implements ISonyCameraHolder, ISonyInterfaceProvi { e.printStackTrace(); } - - } @Override @@ -130,7 +146,7 @@ public class SonyCameraWrapper implements ISonyCameraHolder, ISonyInterfaceProvi } @Override - public ILiveViewControl getSonyLiveViewControl() + public ILiveViewControl getLiveViewControl() { return (liveViewControl); } @@ -172,6 +188,42 @@ public class SonyCameraWrapper implements ISonyCameraHolder, ISonyInterfaceProvi } @Override + public ICameraStatus getCameraStatusListHolder() + { + return (statusHolder); + } + + @Override + public ICameraButtonControl getButtonControl() + { + return (buttonControl); + } + + @Override + public ICameraStatusWatcher getCameraStatusWatcher() + { + return (statusHolder); + } + + @Override + public IPlaybackControl getPlaybackControl() + { + return (playbackControl); + } + + @Override + public ICameraHardwareStatus getHardwareStatus() + { + return (hardwareStatus); + } + + @Override + public ICameraRunMode getCameraRunMode() + { + return (runMode); + } + + @Override public List getApiCommands() { List availableApis = new ArrayList<>(); diff --git a/app/src/main/java/net/osdn/gokigen/pkremote/camera/vendor/sony/wrapper/SonyHardwareStatus.java b/app/src/main/java/net/osdn/gokigen/pkremote/camera/vendor/sony/wrapper/SonyHardwareStatus.java new file mode 100644 index 0000000..9822129 --- /dev/null +++ b/app/src/main/java/net/osdn/gokigen/pkremote/camera/vendor/sony/wrapper/SonyHardwareStatus.java @@ -0,0 +1,50 @@ +package net.osdn.gokigen.pkremote.camera.vendor.sony.wrapper; + +import net.osdn.gokigen.pkremote.camera.interfaces.status.ICameraHardwareStatus; + +import java.util.Map; + +public class SonyHardwareStatus implements ICameraHardwareStatus +{ + @Override + public boolean isAvailableHardwareStatus() + { + return (false); + } + + @Override + public String getLensMountStatus() + { + return (null); + } + + @Override + public String getMediaMountStatus() + { + return (null); + } + + @Override + public float getMinimumFocalLength() + { + return (0); + } + + @Override + public float getMaximumFocalLength() + { + return (0); + } + + @Override + public float getActualFocalLength() + { + return (0); + } + + @Override + public Map inquireHardwareInformation() + { + return (null); + } +} diff --git a/app/src/main/java/net/osdn/gokigen/pkremote/camera/vendor/sony/wrapper/SonyRunMode.java b/app/src/main/java/net/osdn/gokigen/pkremote/camera/vendor/sony/wrapper/SonyRunMode.java new file mode 100644 index 0000000..754d08f --- /dev/null +++ b/app/src/main/java/net/osdn/gokigen/pkremote/camera/vendor/sony/wrapper/SonyRunMode.java @@ -0,0 +1,18 @@ +package net.osdn.gokigen.pkremote.camera.vendor.sony.wrapper; + +import net.osdn.gokigen.pkremote.camera.interfaces.control.ICameraRunMode; + +public class SonyRunMode implements ICameraRunMode +{ + @Override + public void changeRunMode(boolean isRecording) + { + + } + + @Override + public boolean isRecordingMode() + { + return (false); + } +} diff --git a/app/src/main/java/net/osdn/gokigen/pkremote/camera/vendor/sony/wrapper/connection/SonyCameraDisconnectSequence.java b/app/src/main/java/net/osdn/gokigen/pkremote/camera/vendor/sony/wrapper/connection/SonyCameraDisconnectSequence.java index 43fe033..911a677 100644 --- a/app/src/main/java/net/osdn/gokigen/pkremote/camera/vendor/sony/wrapper/connection/SonyCameraDisconnectSequence.java +++ b/app/src/main/java/net/osdn/gokigen/pkremote/camera/vendor/sony/wrapper/connection/SonyCameraDisconnectSequence.java @@ -11,7 +11,6 @@ public class SonyCameraDisconnectSequence implements Runnable //this.powerOff = isOff; } - @Override public void run() { diff --git a/app/src/main/java/net/osdn/gokigen/pkremote/camera/vendor/sony/wrapper/eventlistener/ReplyJsonParser.java b/app/src/main/java/net/osdn/gokigen/pkremote/camera/vendor/sony/wrapper/eventlistener/ReplyJsonParser.java index 825c34e..c0d7f99 100644 --- a/app/src/main/java/net/osdn/gokigen/pkremote/camera/vendor/sony/wrapper/eventlistener/ReplyJsonParser.java +++ b/app/src/main/java/net/osdn/gokigen/pkremote/camera/vendor/sony/wrapper/eventlistener/ReplyJsonParser.java @@ -1,6 +1,5 @@ package net.osdn.gokigen.pkremote.camera.vendor.sony.wrapper.eventlistener; - import android.os.Handler; import android.util.Log; diff --git a/app/src/main/java/net/osdn/gokigen/pkremote/camera/vendor/sony/wrapper/eventlistener/SonyStatus.java b/app/src/main/java/net/osdn/gokigen/pkremote/camera/vendor/sony/wrapper/eventlistener/SonyStatus.java new file mode 100644 index 0000000..b5609fe --- /dev/null +++ b/app/src/main/java/net/osdn/gokigen/pkremote/camera/vendor/sony/wrapper/eventlistener/SonyStatus.java @@ -0,0 +1,90 @@ +package net.osdn.gokigen.pkremote.camera.vendor.sony.wrapper.eventlistener; + +import net.osdn.gokigen.pkremote.camera.interfaces.liveview.ICameraStatusUpdateNotify; +import net.osdn.gokigen.pkremote.camera.interfaces.status.ICameraStatus; +import net.osdn.gokigen.pkremote.camera.interfaces.status.ICameraStatusWatcher; + +import java.util.List; + +public class SonyStatus implements ICameraStatusUpdateNotify, ICameraStatusWatcher, ICameraStatus +{ + @Override + public void updatedTakeMode(String mode) { + + } + + @Override + public void updatedShutterSpeed(String tv) { + + } + + @Override + public void updatedAperture(String av) { + + } + + @Override + public void updatedExposureCompensation(String xv) { + + } + + @Override + public void updatedMeteringMode(String meteringMode) { + + } + + @Override + public void updatedWBMode(String wbMode) { + + } + + @Override + public void updateRemainBattery(int percentage) { + + } + + @Override + public void updateFocusedStatus(boolean focused, boolean focusLocked) { + + } + + @Override + public void updateIsoSensitivity(String sv) { + + } + + @Override + public void updateWarning(String warning) { + + } + + @Override + public void updateStorageStatus(String status) { + + } + + @Override + public List getStatusList(String key) { + return null; + } + + @Override + public String getStatus(String key) { + return null; + } + + @Override + public void setStatus(String key, String value) { + + } + + @Override + public void startStatusWatch(ICameraStatusUpdateNotify notifier) { + + } + + @Override + public void stopStatusWatch() { + + } +} diff --git a/app/src/main/java/net/osdn/gokigen/pkremote/camera/vendor/sony/wrapper/playback/SonyPlaybackControl.java b/app/src/main/java/net/osdn/gokigen/pkremote/camera/vendor/sony/wrapper/playback/SonyPlaybackControl.java new file mode 100644 index 0000000..37d2c1f --- /dev/null +++ b/app/src/main/java/net/osdn/gokigen/pkremote/camera/vendor/sony/wrapper/playback/SonyPlaybackControl.java @@ -0,0 +1,58 @@ +package net.osdn.gokigen.pkremote.camera.vendor.sony.wrapper.playback; + +import net.osdn.gokigen.pkremote.camera.interfaces.playback.ICameraContentListCallback; +import net.osdn.gokigen.pkremote.camera.interfaces.playback.ICameraFileInfo; +import net.osdn.gokigen.pkremote.camera.interfaces.playback.IContentInfoCallback; +import net.osdn.gokigen.pkremote.camera.interfaces.playback.IDownloadContentCallback; +import net.osdn.gokigen.pkremote.camera.interfaces.playback.IDownloadContentListCallback; +import net.osdn.gokigen.pkremote.camera.interfaces.playback.IDownloadThumbnailImageCallback; +import net.osdn.gokigen.pkremote.camera.interfaces.playback.IPlaybackControl; + +public class SonyPlaybackControl implements IPlaybackControl +{ + public SonyPlaybackControl() + { + + } + + + @Override + public String getRawFileSuffix() { + return null; + } + + @Override + public void downloadContentList(IDownloadContentListCallback callback) { + + } + + @Override + public void getContentInfo(String path, String name, IContentInfoCallback callback) { + + } + + @Override + public void updateCameraFileInfo(ICameraFileInfo info) { + + } + + @Override + public void downloadContentScreennail(String path, IDownloadThumbnailImageCallback callback) { + + } + + @Override + public void downloadContentThumbnail(String path, IDownloadThumbnailImageCallback callback) { + + } + + @Override + public void downloadContent(String path, boolean isSmallSize, IDownloadContentCallback callback) { + + } + + @Override + public void getCameraContentList(ICameraContentListCallback callback) { + + } +} diff --git a/build.gradle b/build.gradle index 458d06a..f5fb2cc 100644 --- a/build.gradle +++ b/build.gradle @@ -7,7 +7,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:3.4.2' + classpath 'com.android.tools.build:gradle:3.5.0' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 2794fc0..b2eb87a 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Sat Apr 27 21:47:32 JST 2019 +#Wed Aug 21 22:32:48 JST 2019 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip -- 2.11.0