Merge pull request #16 from ricohapi/v3.0.4

3.0.4
ricohapi · Jun 23, 2022 · f839b9a · f839b9a
2 parents 984b596 + 59cec50
commit f839b9a
Show file tree

Hide file tree

Showing 16 changed files with 64 additions and 16 deletions.
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml
diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 # RICOH THETA Plug-in Library
 
-Version: 3.0.3
+Version: 3.0.4
 
 ## Contents
 
@@ -103,7 +103,7 @@ allprojects {
 
 ```
 dependencies {
-    implementation 'com.theta360:pluginlibrary:3.0.3'
+    implementation 'com.theta360:pluginlibrary:3.0.4'
 }
 ```
 

diff --git a/library/build.gradle b/library/build.gradle
@@ -1,15 +1,15 @@
 apply plugin: 'com.android.library'
 apply plugin: 'maven'
 
-def version = '3.0.3'
+def version = '3.0.4'
 def repo = new File(rootDir, "repository")
 
 android {
     compileSdkVersion 29
     defaultConfig {
         minSdkVersion 25
         targetSdkVersion 29
-        versionCode 11
+        versionCode 12
         versionName "${version}"
 
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"

diff --git a/library/src/main/java/com/theta360/pluginlibrary/factory/VMediaRecorder.java b/library/src/main/java/com/theta360/pluginlibrary/factory/VMediaRecorder.java
@@ -52,11 +52,9 @@ public void newMediaRecorder() {
 
     @Override
     public void setCamera(Camera camera) {
-        if(mMediaRecorder == null) {
-            mMediaRecorder = new android.media.MediaRecorder();
-            mCamera = camera.getVCamera();
-            mMediaRecorder.setCamera(mCamera);
-        }
+        newMediaRecorder();
+        mCamera = camera.getVCamera();
+        mMediaRecorder.setCamera(mCamera);
     }
 
     @Override

diff --git a/library/src/main/java/com/theta360/pluginlibrary/factory/XMediaRecorder.java b/library/src/main/java/com/theta360/pluginlibrary/factory/XMediaRecorder.java
@@ -36,6 +36,7 @@ public void newMediaRecorder() {
 
     @Override
     public void setCamera(Camera camera) {
+        newMediaRecorder();
         mCamera = camera.getXCamera();
         mMediaRecorder.setCamera(mCamera);
     }

diff --git a/library/src/main/java/com/theta360/pluginlibrary/values/ThetaModel.java b/library/src/main/java/com/theta360/pluginlibrary/values/ThetaModel.java
@@ -41,6 +41,15 @@ public static Boolean isZ1Model() {
         }
     }
 
+    public static Boolean isVModel() {
+        ThetaModel model =ThetaModel.getValue(ThetaInfo.getThetaModelName());
+        if (model == ThetaModel.THETA_V) {
+            return true;
+        } else {
+            return false;
+        }
+    }
+
     public static Boolean isVCameraModel() {
         ThetaModel model =ThetaModel.getValue(ThetaInfo.getThetaModelName());
         if (model == ThetaModel.THETA_Z1 || model == ThetaModel.THETA_V) {

diff --git a/repository/com/theta360/pluginlibrary/3.0.4/pluginlibrary-3.0.4.aar b/repository/com/theta360/pluginlibrary/3.0.4/pluginlibrary-3.0.4.aar
diff --git a/repository/com/theta360/pluginlibrary/3.0.4/pluginlibrary-3.0.4.aar.md5 b/repository/com/theta360/pluginlibrary/3.0.4/pluginlibrary-3.0.4.aar.md5
@@ -0,0 +1 @@
+196cde8ffd9fa83bef2f73a079dc0bae
diff --git a/repository/com/theta360/pluginlibrary/3.0.4/pluginlibrary-3.0.4.aar.sha1 b/repository/com/theta360/pluginlibrary/3.0.4/pluginlibrary-3.0.4.aar.sha1
@@ -0,0 +1 @@
+b6d1106afc929568ad1dadc1a998e224bd74bea1
diff --git a/repository/com/theta360/pluginlibrary/3.0.4/pluginlibrary-3.0.4.pom b/repository/com/theta360/pluginlibrary/3.0.4/pluginlibrary-3.0.4.pom
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>com.theta360</groupId>
+  <artifactId>pluginlibrary</artifactId>
+  <version>3.0.4</version>
+  <packaging>aar</packaging>
+  <dependencies>
+    <dependency>
+      <groupId>com.android.support</groupId>
+      <artifactId>appcompat-v7</artifactId>
+      <version>25.4.0</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.sanselan</groupId>
+      <artifactId>sanselan</artifactId>
+      <version>0.97-incubator</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>net.danlew</groupId>
+      <artifactId>android.joda</artifactId>
+      <version>2.9.9.4</version>
+      <scope>compile</scope>
+    </dependency>
+  </dependencies>
+</project>
diff --git a/repository/com/theta360/pluginlibrary/3.0.4/pluginlibrary-3.0.4.pom.md5 b/repository/com/theta360/pluginlibrary/3.0.4/pluginlibrary-3.0.4.pom.md5
@@ -0,0 +1 @@
+793d720bb6ff5210ab201c772aa1a52e
diff --git a/repository/com/theta360/pluginlibrary/3.0.4/pluginlibrary-3.0.4.pom.sha1 b/repository/com/theta360/pluginlibrary/3.0.4/pluginlibrary-3.0.4.pom.sha1
@@ -0,0 +1 @@
+5ff4e2ee5bcc0f34e416d115e7c28d7800e4ffaa
diff --git a/repository/com/theta360/pluginlibrary/maven-metadata.xml b/repository/com/theta360/pluginlibrary/maven-metadata.xml
@@ -3,15 +3,16 @@
   <groupId>com.theta360</groupId>
   <artifactId>pluginlibrary</artifactId>
   <versioning>
-    <release>3.0.3</release>
+    <release>3.0.4</release>
     <versions>
       <version>2.0.0</version>
       <version>2.1.0</version>
       <version>3.0.0</version>
       <version>3.0.1</version>
       <version>3.0.2</version>
       <version>3.0.3</version>
+      <version>3.0.4</version>
     </versions>
-    <lastUpdated>20220611232952</lastUpdated>
+    <lastUpdated>20220623070909</lastUpdated>
   </versioning>
 </metadata>
diff --git a/repository/com/theta360/pluginlibrary/maven-metadata.xml.md5 b/repository/com/theta360/pluginlibrary/maven-metadata.xml.md5
@@ -1 +1 @@
-913c1b763b6f13145d998e4591b18da7
+aaa7050f20251396cd983c067b43879a
diff --git a/repository/com/theta360/pluginlibrary/maven-metadata.xml.sha1 b/repository/com/theta360/pluginlibrary/maven-metadata.xml.sha1
@@ -1 +1 @@
-23e4d6f110d06712e13cbf1b211a1f8568fca417
+915b7fe59dd441dec36cceed95e332c4c588e0c9
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		913c1b763b6f13145d998e4591b18da7
		aaa7050f20251396cd983c067b43879a
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		23e4d6f110d06712e13cbf1b211a1f8568fca417
		915b7fe59dd441dec36cceed95e332c4c588e0c9