--- /dev/null
+<component name="ProjectCodeStyleConfiguration">
+ <code_scheme name="Project" version="173">
+ <codeStyleSettings language="XML">
+ <indentOptions>
+ <option name="CONTINUATION_INDENT_SIZE" value="4" />
+ </indentOptions>
+ <arrangement>
+ <rules>
+ <section>
+ <rule>
+ <match>
+ <AND>
+ <NAME>xmlns:android</NAME>
+ <XML_ATTRIBUTE />
+ <XML_NAMESPACE>^$</XML_NAMESPACE>
+ </AND>
+ </match>
+ </rule>
+ </section>
+ <section>
+ <rule>
+ <match>
+ <AND>
+ <NAME>xmlns:.*</NAME>
+ <XML_ATTRIBUTE />
+ <XML_NAMESPACE>^$</XML_NAMESPACE>
+ </AND>
+ </match>
+ <order>BY_NAME</order>
+ </rule>
+ </section>
+ <section>
+ <rule>
+ <match>
+ <AND>
+ <NAME>.*:id</NAME>
+ <XML_ATTRIBUTE />
+ <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
+ </AND>
+ </match>
+ </rule>
+ </section>
+ <section>
+ <rule>
+ <match>
+ <AND>
+ <NAME>.*:name</NAME>
+ <XML_ATTRIBUTE />
+ <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
+ </AND>
+ </match>
+ </rule>
+ </section>
+ <section>
+ <rule>
+ <match>
+ <AND>
+ <NAME>name</NAME>
+ <XML_ATTRIBUTE />
+ <XML_NAMESPACE>^$</XML_NAMESPACE>
+ </AND>
+ </match>
+ </rule>
+ </section>
+ <section>
+ <rule>
+ <match>
+ <AND>
+ <NAME>style</NAME>
+ <XML_ATTRIBUTE />
+ <XML_NAMESPACE>^$</XML_NAMESPACE>
+ </AND>
+ </match>
+ </rule>
+ </section>
+ <section>
+ <rule>
+ <match>
+ <AND>
+ <NAME>.*</NAME>
+ <XML_ATTRIBUTE />
+ <XML_NAMESPACE>^$</XML_NAMESPACE>
+ </AND>
+ </match>
+ <order>BY_NAME</order>
+ </rule>
+ </section>
+ <section>
+ <rule>
+ <match>
+ <AND>
+ <NAME>.*</NAME>
+ <XML_ATTRIBUTE />
+ <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
+ </AND>
+ </match>
+ <order>ANDROID_ATTRIBUTE_ORDER</order>
+ </rule>
+ </section>
+ <section>
+ <rule>
+ <match>
+ <AND>
+ <NAME>.*</NAME>
+ <XML_ATTRIBUTE />
+ <XML_NAMESPACE>.*</XML_NAMESPACE>
+ </AND>
+ </match>
+ <order>BY_NAME</order>
+ </rule>
+ </section>
+ </rules>
+ </arrangement>
+ </codeStyleSettings>
+ </code_scheme>
+</component>
\ No newline at end of file
<textMaps />
</LinkMapSettings>
</component>
- <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+ <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" project-jdk-name="JDK" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/build/classes" />
</component>
<component name="ProjectType">
applicationId "net.osdn.gokigen.pkremote"
minSdkVersion 14
targetSdkVersion 29
- versionCode 10302
- versionName "1.3.2"
+ versionCode 10303
+ versionName "1.3.3"
}
buildTypes {
release {
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;
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<String> getApiCommands();
ISonyCameraApi getCameraApi();
}
--- /dev/null
+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);
+ }
+}
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;
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;
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;
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
{
e.printStackTrace();
}
-
-
}
@Override
}
@Override
- public ILiveViewControl getSonyLiveViewControl()
+ public ILiveViewControl getLiveViewControl()
{
return (liveViewControl);
}
}
@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<String> getApiCommands()
{
List<String> availableApis = new ArrayList<>();
--- /dev/null
+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<String, Object> inquireHardwareInformation()
+ {
+ return (null);
+ }
+}
--- /dev/null
+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);
+ }
+}
//this.powerOff = isOff;
}
-
@Override
public void run()
{
package net.osdn.gokigen.pkremote.camera.vendor.sony.wrapper.eventlistener;
-
import android.os.Handler;
import android.util.Log;
--- /dev/null
+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<String> 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() {
+
+ }
+}
--- /dev/null
+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) {
+
+ }
+}
}
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
-#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
OSDN Git Service
