Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add THETA Z1 #29

Merged
merged 1 commit into from
Oct 28, 2019
Merged

Add THETA Z1 #29

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# RICOH THETA Plug-in SDK

Version: 2.0.0
Version: 2.1.0

## Contents

Expand Down
4 changes: 2 additions & 2 deletions app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -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'
}
5 changes: 4 additions & 1 deletion app/src/main/java/com/theta360/pluginapplication/model/ImageSize.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,5 +24,8 @@ public enum ImageSize {
IMAGE_SIZE_2048x1024,

/** 5376x2688 */
IMAGE_SIZE_5376x2688
IMAGE_SIZE_5376x2688,

/** 6720x3360 THETA Z1 Only */
IMAGE_SIZE_6720x3360
}
6 changes: 6 additions & 0 deletions app/src/main/java/com/theta360/pluginapplication/network/HttpConnector.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down Expand Up @@ -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;
Expand Down