diff --git a/.idea/gradle.xml b/.idea/gradle.xml index 2c56889..0bd91d9 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -4,16 +4,16 @@ diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml deleted file mode 100644 index e497da9..0000000 --- a/.idea/runConfigurations.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/README.md b/README.md index e9a8293..fd1bd1e 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # RICOH THETA Plug-in Library -Version: 3.0.4 +Version: 3.0.5 ## Contents @@ -57,13 +57,14 @@ This Library has been confirmed to operate under the following conditions. #### Operating System -* Windows 10 Version 21H1 +* Windows 10 Version 21H2 * macOS Monterey Version 12.2 #### Development environment -* Android™ Studio 4.2.2 -* gradle 3.5.3 +* Android™ Studio Chipmunk | 2021.2.1 Patch 2 +* Android Gradle Plugin Version 3.6.4 +* Gradle Version 5.6.4 * Android™ SDK (API Level 29) * compileSdkVersion 29 * minSdkVersion 25 @@ -103,7 +104,7 @@ allprojects { ``` dependencies { - implementation 'com.theta360:pluginlibrary:3.0.4' + implementation 'com.theta360:pluginlibrary:3.0.5' } ``` diff --git a/build.gradle b/build.gradle index 4955753..c4bffb6 100644 --- a/build.gradle +++ b/build.gradle @@ -7,7 +7,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:3.3.1' + classpath 'com.android.tools.build:gradle:3.6.4' // 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 9585401..0f09bb0 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Tue Jan 22 15:04:31 JST 2019 +#Fri Mar 10 22:50:24 JST 2023 distributionBase=GRADLE_USER_HOME +distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-bin.zip distributionPath=wrapper/dists -zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip +zipStoreBase=GRADLE_USER_HOME diff --git a/library/build.gradle b/library/build.gradle index a34ba75..9b270b5 100644 --- a/library/build.gradle +++ b/library/build.gradle @@ -1,7 +1,7 @@ apply plugin: 'com.android.library' apply plugin: 'maven' -def version = '3.0.4' +def version = '3.0.5' def repo = new File(rootDir, "repository") android { @@ -9,7 +9,7 @@ android { defaultConfig { minSdkVersion 25 targetSdkVersion 29 - versionCode 12 + versionCode 13 versionName "${version}" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" diff --git a/library/src/main/java/com/theta360/pluginlibrary/factory/VCamera.java b/library/src/main/java/com/theta360/pluginlibrary/factory/VCamera.java index 17b6b4b..a9452e2 100644 --- a/library/src/main/java/com/theta360/pluginlibrary/factory/VCamera.java +++ b/library/src/main/java/com/theta360/pluginlibrary/factory/VCamera.java @@ -246,7 +246,9 @@ public void onPictureTaken(byte[] data, android.hardware.Camera camera) { private android.hardware.Camera.PreviewCallback previewCallback = new android.hardware.Camera.PreviewCallback() { @Override public void onPreviewFrame(byte[] data, android.hardware.Camera camera) { - prCallback.onPreviewFrame(data, camera); + if (prCallback != null) { + prCallback.onPreviewFrame(data, camera); + } } }; @@ -326,11 +328,13 @@ public void setPreviewTexture(SurfaceTexture var1) throws IOException { @Override public void setOneShotPreviewCallback(PreviewCallback cb) { + prCallback = cb; mCamera.setOneShotPreviewCallback(previewCallback); } @Override public void setPreviewCallbackWithBuffer(PreviewCallback cb) { + prCallback = cb; mCamera.setPreviewCallbackWithBuffer(previewCallback); } @@ -438,7 +442,8 @@ public void stopPreview() { @Override public void setPreviewCallback(PreviewCallback cb) { - mCamera.setPreviewCallback(null); + prCallback = cb; + mCamera.setPreviewCallback(previewCallback); } @Override diff --git a/library/src/main/java/com/theta360/pluginlibrary/factory/XCamera.java b/library/src/main/java/com/theta360/pluginlibrary/factory/XCamera.java index 87e541e..b5ab55e 100644 --- a/library/src/main/java/com/theta360/pluginlibrary/factory/XCamera.java +++ b/library/src/main/java/com/theta360/pluginlibrary/factory/XCamera.java @@ -235,7 +235,9 @@ public void onPictureTaken(byte[] data, theta360.hardware.Camera camera) { private theta360.hardware.Camera.PreviewCallback previewCallback = new theta360.hardware.Camera.PreviewCallback() { @Override public void onPreviewFrame(byte[] data, theta360.hardware.Camera camera) { - prCallback.onPreviewFrame(data, camera); + if (prCallback != null) { + prCallback.onPreviewFrame(data, camera); + } } }; @@ -316,11 +318,13 @@ public void setPreviewTexture(SurfaceTexture var1) throws IOException { @Override public void setOneShotPreviewCallback(PreviewCallback cb) { + prCallback = cb; mCamera.setOneShotPreviewCallback(previewCallback); } @Override public void setPreviewCallbackWithBuffer(PreviewCallback cb) { + prCallback = cb; mCamera.setPreviewCallbackWithBuffer(previewCallback); } @@ -404,7 +408,8 @@ public void stopPreview() { @Override public void setPreviewCallback(PreviewCallback cb) { - mCamera.setPreviewCallback(null); + prCallback = cb; + mCamera.setPreviewCallback(previewCallback); } @Override diff --git a/repository/com/theta360/pluginlibrary/3.0.5/pluginlibrary-3.0.5.aar b/repository/com/theta360/pluginlibrary/3.0.5/pluginlibrary-3.0.5.aar new file mode 100644 index 0000000..76d77f5 Binary files /dev/null and b/repository/com/theta360/pluginlibrary/3.0.5/pluginlibrary-3.0.5.aar differ diff --git a/repository/com/theta360/pluginlibrary/3.0.5/pluginlibrary-3.0.5.aar.md5 b/repository/com/theta360/pluginlibrary/3.0.5/pluginlibrary-3.0.5.aar.md5 new file mode 100644 index 0000000..df12497 --- /dev/null +++ b/repository/com/theta360/pluginlibrary/3.0.5/pluginlibrary-3.0.5.aar.md5 @@ -0,0 +1 @@ +f44791a9c549087edf5b08270dfcfacf \ No newline at end of file diff --git a/repository/com/theta360/pluginlibrary/3.0.5/pluginlibrary-3.0.5.aar.sha1 b/repository/com/theta360/pluginlibrary/3.0.5/pluginlibrary-3.0.5.aar.sha1 new file mode 100644 index 0000000..dedc8f4 --- /dev/null +++ b/repository/com/theta360/pluginlibrary/3.0.5/pluginlibrary-3.0.5.aar.sha1 @@ -0,0 +1 @@ +c7ddd2d26bbf0cb9304e34edad0566f7f499a124 \ No newline at end of file diff --git a/repository/com/theta360/pluginlibrary/3.0.5/pluginlibrary-3.0.5.pom b/repository/com/theta360/pluginlibrary/3.0.5/pluginlibrary-3.0.5.pom new file mode 100644 index 0000000..3158ed5 --- /dev/null +++ b/repository/com/theta360/pluginlibrary/3.0.5/pluginlibrary-3.0.5.pom @@ -0,0 +1,29 @@ + + + 4.0.0 + com.theta360 + pluginlibrary + 3.0.5 + aar + + + com.android.support + appcompat-v7 + 25.4.0 + compile + + + org.apache.sanselan + sanselan + 0.97-incubator + compile + + + net.danlew + android.joda + 2.9.9.4 + compile + + + diff --git a/repository/com/theta360/pluginlibrary/3.0.5/pluginlibrary-3.0.5.pom.md5 b/repository/com/theta360/pluginlibrary/3.0.5/pluginlibrary-3.0.5.pom.md5 new file mode 100644 index 0000000..2f570ef --- /dev/null +++ b/repository/com/theta360/pluginlibrary/3.0.5/pluginlibrary-3.0.5.pom.md5 @@ -0,0 +1 @@ +8aae43e056f1809ad78bc406e718fccd \ No newline at end of file diff --git a/repository/com/theta360/pluginlibrary/3.0.5/pluginlibrary-3.0.5.pom.sha1 b/repository/com/theta360/pluginlibrary/3.0.5/pluginlibrary-3.0.5.pom.sha1 new file mode 100644 index 0000000..bbfc9eb --- /dev/null +++ b/repository/com/theta360/pluginlibrary/3.0.5/pluginlibrary-3.0.5.pom.sha1 @@ -0,0 +1 @@ +63ece3d93197a7f8489ec5cdea02ba0e1b8f8ae9 \ No newline at end of file diff --git a/repository/com/theta360/pluginlibrary/maven-metadata.xml b/repository/com/theta360/pluginlibrary/maven-metadata.xml index 0fcf432..135c8b4 100644 --- a/repository/com/theta360/pluginlibrary/maven-metadata.xml +++ b/repository/com/theta360/pluginlibrary/maven-metadata.xml @@ -3,7 +3,7 @@ com.theta360 pluginlibrary - 3.0.4 + 3.0.5 2.0.0 2.1.0 @@ -12,7 +12,8 @@ 3.0.2 3.0.3 3.0.4 + 3.0.5 - 20220623070909 + 20230313165727 diff --git a/repository/com/theta360/pluginlibrary/maven-metadata.xml.md5 b/repository/com/theta360/pluginlibrary/maven-metadata.xml.md5 index c821106..fbb0e39 100644 --- a/repository/com/theta360/pluginlibrary/maven-metadata.xml.md5 +++ b/repository/com/theta360/pluginlibrary/maven-metadata.xml.md5 @@ -1 +1 @@ -aaa7050f20251396cd983c067b43879a \ No newline at end of file +3f704763ca195e114507c63d05691bab \ No newline at end of file diff --git a/repository/com/theta360/pluginlibrary/maven-metadata.xml.sha1 b/repository/com/theta360/pluginlibrary/maven-metadata.xml.sha1 index 4772a94..e0374e6 100644 --- a/repository/com/theta360/pluginlibrary/maven-metadata.xml.sha1 +++ b/repository/com/theta360/pluginlibrary/maven-metadata.xml.sha1 @@ -1 +1 @@ -915b7fe59dd441dec36cceed95e332c4c588e0c9 \ No newline at end of file +ea5aec5178e0aee0742e2b19fdb812170817815f \ No newline at end of file