feature/#28

ricohapi · Oct 28, 2019 · 856cc38 · 856cc38
1 parent 636aeec
commit 856cc38
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 4 deletions.
diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 # RICOH THETA Plug-in SDK
 
-Version: 2.0.0
+Version: 2.1.0
 
 ## Contents
 

diff --git a/app/build.gradle b/app/build.gradle
@@ -8,7 +8,7 @@ android {
         minSdkVersion 25
         targetSdkVersion 25
         versionCode 7
-        versionName "2.0.0"
+        versionName "2.1.0"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
     buildTypes {
@@ -30,5 +30,5 @@ dependencies {
     testImplementation 'junit:junit:4.12'
     androidTestImplementation 'com.android.support.test:runner:1.0.1'
     androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.1'
-    implementation 'com.theta360:pluginlibrary:2.0.0'
+    implementation 'com.theta360:pluginlibrary:2.1.0'
 }
diff --git a/app/src/main/java/com/theta360/pluginapplication/model/ImageSize.java b/app/src/main/java/com/theta360/pluginapplication/model/ImageSize.java
@@ -24,5 +24,8 @@ public enum ImageSize {
     IMAGE_SIZE_2048x1024,
 
     /** 5376x2688 */
-    IMAGE_SIZE_5376x2688
+    IMAGE_SIZE_5376x2688,
+
+    /** 6720x3360 THETA Z1 Only */
+    IMAGE_SIZE_6720x3360
 }
diff --git a/app/src/main/java/com/theta360/pluginapplication/network/HttpConnector.java b/app/src/main/java/com/theta360/pluginapplication/network/HttpConnector.java
@@ -676,6 +676,8 @@ public ImageSize getImageSize() {
 
                 if (width == 2048) {
                     imageSize = ImageSize.IMAGE_SIZE_2048x1024;
+                } else if (width == 6720) {
+                    imageSize = ImageSize.IMAGE_SIZE_6720x3360;
                 } else {
                     imageSize = ImageSize.IMAGE_SIZE_5376x2688;
                 }
@@ -710,6 +712,10 @@ public void setImageSize(ImageSize imageSize) {
                 width = 2048;
                 height = 1024;
                 break;
+            case IMAGE_SIZE_6720x3360:
+                width = 6720;
+                height = 3360;
+                break;
             default:
             case IMAGE_SIZE_5376x2688:
                 width = 5376;