From 5115c7ff53449a716d8d0c300911c27472e7b51d Mon Sep 17 00:00:00 2001 From: hojo <51944765+DaisukeHohjoh@users.noreply.github.com> Date: Mon, 15 Jan 2024 18:26:06 +0900 Subject: [PATCH] Add RicStillCaptureMultiYuvHhHdr mode (#18) --- README.md | 4 ++-- app/build.gradle | 4 ++-- .../main/java/com/theta360/sample/camera/MainActivity.kt | 5 ++++- app/src/main/res/layout/activity_main.xml | 1 - app/src/main/res/values/strings.xml | 6 ++++++ build.gradle | 3 +-- 6 files changed, 15 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index 2e45fcf..fb9407e 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # THETA X Plug-in : Camera API Sample -Version: 1.4.0 +Version: 1.5.0 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. @@ -43,7 +43,7 @@ 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, 1.40.0, 1.41.0, 2.00.0, 2.10.1, 2.20.1) +* RICOH THETA X (Version 1.00.2, 1.10.1, 1.20.0, 1.30.0, 1.40.0, 1.41.0, 2.00.0, 2.10.1, 2.20.1, 2.21.0, 2.30.0, 2.40.0) * RICOH THETA V and Z1 are NOT supported. ### Development Environment diff --git a/app/build.gradle b/app/build.gradle index 71f7c56..358f0fa 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -10,8 +10,8 @@ android { applicationId "com.theta360.sample.camera" minSdkVersion 26 targetSdkVersion 29 - versionCode 9 - versionName "1.4.0" + versionCode 10 + versionName "1.5.0" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" } diff --git a/app/src/main/java/com/theta360/sample/camera/MainActivity.kt b/app/src/main/java/com/theta360/sample/camera/MainActivity.kt index 3433130..be3fdb2 100644 --- a/app/src/main/java/com/theta360/sample/camera/MainActivity.kt +++ b/app/src/main/java/com/theta360/sample/camera/MainActivity.kt @@ -165,6 +165,9 @@ class MainActivity : PluginActivity(), MediaRecorder.OnInfoListener { setSpinner(spinner_ric_shooting_mode_preview, getResources().getStringArray( if (version >= 1200) R.array.RIC_SHOOTING_MODE_PREVIEW_ARRAY else R.array.RIC_SHOOTING_MODE_PREVIEW_OLD_ARRAY)) + setSpinner(spinner_ric_shooting_mode_image, getResources().getStringArray( + if (version >= 2400) R.array.RIC_SHOOTING_MODE_IMAGE_ARRAY + else R.array.RIC_SHOOTING_MODE_IMAGE_OLD_ARRAY)) spinner_ric_shooting_mode_preview.setSelection(0) //RicPreview1024 spinner_ric_shooting_mode_image.setSelection(0) //RicStillCaptureStd spinner_ric_shooting_mode_video.setSelection(1) //RicMovieRecording3840 @@ -220,7 +223,7 @@ class MainActivity : PluginActivity(), MediaRecorder.OnInfoListener { private fun setSpinner(spinner: Spinner, arr: Array){ val adapter = ArrayAdapter(this, android.R.layout.simple_spinner_item, arr) - //adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item) + adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item) spinner.setAdapter(adapter) } diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 96e61b0..e322cf4 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -75,7 +75,6 @@ android:layout_marginStart="16dp" android:layout_marginTop="24dp" android:layout_marginEnd="16dp" - android:entries="@array/RIC_SHOOTING_MODE_IMAGE_ARRAY" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintHorizontal_bias="0.0" app:layout_constraintStart_toStartOf="parent" diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index caa7484..95d72bd 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -17,10 +17,16 @@ RicPreview5760 RicPreview7680 + + RicStillCaptureStd + RicStillCaptureMultiRawNR + RicStillCaptureMultiYuvHdr + RicStillCaptureStd RicStillCaptureMultiRawNR RicStillCaptureMultiYuvHdr + RicStillCaptureMultiYuvHhHdr RicMovieRecording1920 diff --git a/build.gradle b/build.gradle index e968625..580d9d0 100644 --- a/build.gradle +++ b/build.gradle @@ -1,6 +1,6 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { - ext.kotlin_version = "1.5.10" + ext.kotlin_version = "1.7.10" repositories { google() mavenCentral() @@ -18,7 +18,6 @@ allprojects { repositories { google() mavenCentral() - jcenter() // Warning: this repository is going to shut down soon maven { url 'https://github.com/ricohapi/theta-plugin-library/raw/master/repository' } } }