Skip to content

Commit

Permalink
Merge pull request #9 from ricohapi/bugfix/v1.2.2
Browse files Browse the repository at this point in the history
add RIC_WATER_HOUSING parameter
  • Loading branch information
KATSUYA2 authored Mar 29, 2023
2 parents e659a9d + a9f7b49 commit 2a46899
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 11 deletions.
17 changes: 9 additions & 8 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# THETA X Plug-in : Camera API Sample

Version: 1.2.1
Version: 1.2.2

This sample project shows how to implement a plug-in using Camera API for RICOH THETA X.
The program language is Kotlin, please checkout [java branch](https://github.com/ricohapi/theta-plugin-camera-api-sample-x/tree/java) to see Java code.
Expand Down Expand Up @@ -42,20 +42,21 @@ The program language is Kotlin, please checkout [java branch](https://github.com

### Supported Device

* RICOH THETA X (Version 1.00.2, 1.10.1, 1.20.0, 1.30.0)
* RICOH THETA X (Version 1.00.2, 1.10.1, 1.20.0, 1.30.0, 1.40.0, 1.41.0)
* RICOH THETA V and Z1 are NOT supported.

### Development Environment

* Android™ Studio 4.2.2
* Windows 10 Version 21H1
* macOS Monterey Version 12.2
* gradle 4.2.2
* Android Studio Chipmunk | 2021.2.1 Patch 2
* Windows 10 Version 21H2
* macOS Version 13.2.1 Ventura
* Gradle Plugin Version 4.2.2
* Gradle Version 6.7.1
* Android™ SDK (API Level 29)
* compileSdkVersion 29
* minSdkVersion 26
* targetSdkVersion 29
* [RICOH THETA Plug-in Library](https://github.com/ricohapi/theta-plugin-library) (Version 3.0.4) is being imported.
* [RICOH THETA Plug-in Library](https://github.com/ricohapi/theta-plugin-library) (Version 3.0.5) is being imported.


<a name="how_to_use"></a>
Expand All @@ -77,7 +78,7 @@ The program language is Kotlin, please checkout [java branch](https://github.com
```gradle
dependencies {
...
implementation 'com.theta360:pluginlibrary:3.0.4'
implementation 'com.theta360:pluginlibrary:3.0.5'
...
}
```
Expand Down
6 changes: 3 additions & 3 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ android {
applicationId "com.theta360.sample.camera"
minSdkVersion 26
targetSdkVersion 29
versionCode 5
versionName "1.2.1"
versionCode 6
versionName "1.2.2"

testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
}
Expand All @@ -35,7 +35,7 @@ dependencies {
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
implementation 'com.android.support:appcompat-v7:28.0.0'
implementation 'com.android.support.constraint:constraint-layout:2.0.4'
implementation 'com.theta360:pluginlibrary:3.0.4'
implementation 'com.theta360:pluginlibrary:3.0.5'
//testImplementation 'junit:junit:4.+'
//androidTestImplementation 'com.android.support.test:runner:1.0.2'
//androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
Expand Down
2 changes: 2 additions & 0 deletions app/src/main/java/com/theta360/sample/camera/MainActivity.kt
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ class MainActivity : PluginActivity(), MediaRecorder.OnInfoListener {
private val RIC_PROC_STITCHING = "RIC_PROC_STITCHING"
private val RIC_PROC_ZENITH_CORRECTION = "RIC_PROC_ZENITH_CORRECTION"
private val RIC_EXPOSURE_MODE = "RIC_EXPOSURE_MODE"
private val RIC_WATER_HOUSING = "RIC_WATER_HOUSING"

private val TAG = "Camera_API_Sample"
private val DCIM = "/DCIM/"
Expand Down Expand Up @@ -502,6 +503,7 @@ class MainActivity : PluginActivity(), MediaRecorder.OnInfoListener {
p.set(RIC_PROC_STITCHING, ric_proc_stitching)
p.set(RIC_PROC_ZENITH_CORRECTION, ric_proc_zenith_correction)
p.set(RIC_EXPOSURE_MODE, "RicAutoExposureP")
p.set(RIC_WATER_HOUSING, 0)

when (mode) {
MODE.PREVIEW -> {
Expand Down

0 comments on commit 2a46899

Please sign in to comment.