Dev/1.5.0

build.gradle.kts

@@ -5,7 +5,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.20")
+        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.20")
         classpath("com.android.tools.build:gradle:7.2.2")
         classpath("org.jetbrains.dokka:dokka-gradle-plugin:1.8.20")
         classpath("org.jetbrains.dokka:versioning-plugin:1.8.20")

config/detekt.yml

@@ -94,9 +94,9 @@ complexity:
   #    threshold: 10
   #    includeStaticDeclarations: false
   #    includePrivateDeclarations: false
-  #  ComplexMethod:
-  #    active: true
-  #    threshold: 15
+  ComplexMethod:
+    active: true
+    threshold: 20
   #    ignoreSingleWhenExpression: false
   #    ignoreSimpleWhenEntries: false
   #    ignoreNestingFunctions: false
@@ -237,13 +237,13 @@ exceptions:
   #    active: false
   #  PrintStackTrace:
   #    active: true
-  #  RethrowCaughtException:
-  #    active: true
+  RethrowCaughtException:
+    active: false
   #  ReturnFromFinally:
   #    active: true
   #    ignoreLabeled: false
-  #  SwallowedException:
-  #    active: true
+  SwallowedException:
+    active: false
   #    ignoredExceptionTypes:
   #      - 'InterruptedException'
   #      - 'MalformedURLException'
@@ -282,8 +282,8 @@ exceptions:
     #   - 'RuntimeException'
     #   - 'Throwable'
     # allowedExceptionNameRegex: '_|(ignore|expected).*'
-#  TooGenericExceptionThrown:
-#    active: true
+  TooGenericExceptionThrown:
+    active: false
 #    exceptionNames:
 #      - 'Error'
 #      - 'Exception'
@@ -546,9 +546,9 @@ style:
   #  LibraryEntitiesShouldNotBePublic:
   #    active: true
   #    excludes: [ '**' ]
-  #  LoopWithTooManyJumpStatements:
-  #    active: true
-  #    maxJumpCount: 1
+  LoopWithTooManyJumpStatements:
+    active: true
+    maxJumpCount: 3
   MagicNumber:
     active: true
     excludes: [ '**/test/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/jsTest/**', '**/iosTest/**' ]
@@ -620,10 +620,10 @@ style:
   #    active: true
   #  SpacingBetweenPackageAndImports:
   #    active: false
-  #  ThrowsCount:
-  #    active: true
-  #    max: 2
-  #    excludeGuardClauses: false
+  ThrowsCount:
+    active: true
+    max: 8
+    excludeGuardClauses: false
   #  TrailingWhitespace:
   #    active: false
   #  UnderscoresInNumericLiterals:

demos/demo-android/app/src/main/java/com/ricoh360/thetaclient/thetaClientDemo/PreviewScreen.kt

@@ -28,11 +28,19 @@ import timber.log.Timber
 fun PreviewScreen(toPhoto: (photoUrl: String) -> Unit, viewModel: ThetaViewModel = androidx.lifecycle.viewmodel.compose.viewModel()) {
 
     class TakenCallback : PhotoCapture.TakePictureCallback {
-        override fun onSuccess(fileUrl: String) {
+        override fun onSuccess(fileUrl: String?) {
             Timber.i("takePicture onSuccess: $fileUrl")
             val scope = CoroutineScope(Job() + Dispatchers.Main)
-            scope.launch {
-                toPhoto(fileUrl) // need to execute on the main thread.
+            when (fileUrl) {
+                null -> {   // Cancel shooting.
+                    viewModel.startPreview()
+                }
+
+                else -> {
+                    scope.launch {
+                        toPhoto(fileUrl) // need to execute on the main thread.
+                    }
+                }
             }
         }
 

demos/demo-flutter/android/build.gradle

@@ -1,5 +1,5 @@
 buildscript {
-    ext.kotlin_version = '1.6.10'
+    ext.kotlin_version = '1.8.20'
     repositories {
         google()
         mavenCentral()

demos/demo-flutter/lib/main.dart

@@ -25,6 +25,7 @@ class _MyAppState extends State<MyApp> with WidgetsBindingObserver {
   final _thetaClientFlutter = ThetaClientFlutter();
   bool _isInitTheta = false;
   bool _initializing = false;
+  ThetaModel? _thetaModel;
 
   final String endpoint = 'http://192.168.1.1:80/';
 
@@ -76,20 +77,20 @@ class _MyAppState extends State<MyApp> with WidgetsBindingObserver {
       return;
     }
     bool isInitTheta;
+    ThetaModel? thetaModel;
     try {
+      _initializing = true;
       isInitTheta = await _thetaClientFlutter.isInitialized();
-      if (!isInitTheta) {
-        _initializing = true;
-        debugPrint('start initialize');
-        await _thetaClientFlutter.initialize(endpoint);
-
-        // // Client mode authentication settings
-        // final config = ThetaConfig();
-        // config.clientMode = DigestAuth('THETAXX12345678', '12345678');
-        // await _thetaClientFlutter.initialize(endpoint, config);
-
-        isInitTheta = true;
-      }
+      debugPrint('start initialize');
+      await _thetaClientFlutter.initialize(endpoint);
+      thetaModel = await _thetaClientFlutter.getThetaModel();
+
+      // // Client mode authentication settings
+      // final config = ThetaConfig();
+      // config.clientMode = DigestAuth('THETAXX12345678', '12345678');
+      // await _thetaClientFlutter.initialize(endpoint, config);
+
+      isInitTheta = true;
     } on PlatformException {
       if (!mounted) return;
       debugPrint('Error. init');
@@ -103,6 +104,7 @@ class _MyAppState extends State<MyApp> with WidgetsBindingObserver {
 
     setState(() {
       _isInitTheta = isInitTheta;
+      _thetaModel = thetaModel;
     });
   }
 
@@ -114,6 +116,7 @@ class _MyAppState extends State<MyApp> with WidgetsBindingObserver {
         platformVersion: _platformVersion,
         isInitialized: _isInitTheta,
         connectTheta: initTheta,
+        thetaModel: _thetaModel,
       ),
     );
   }
@@ -123,16 +126,18 @@ class Home extends StatelessWidget {
   final String platformVersion;
   final bool isInitialized;
   final Function connectTheta;
+  final ThetaModel? thetaModel;
   const Home({Key? key,
     required this.platformVersion,
     required this.isInitialized,
     required this.connectTheta,
+    required this.thetaModel,
     }) : super(key: key);
 
 
   @override
   Widget build(BuildContext context) {
-    String camera = isInitialized ? 'connected!': 'disconnected';
+    String camera = isInitialized ? 'connected! $thetaModel': 'disconnected';
     return Scaffold(
         appBar: AppBar(
           title: const Text('Plugin example app'),

demos/demo-flutter/lib/take_picture_screen.dart

@@ -198,13 +198,20 @@ class _TakePictureScreen extends State<TakePictureScreen> with WidgetsBindingObs
       });
       debugPrint('take picture: $fileUrl');
       if (!mounted) return;
-      Navigator.of(context).push(
-        MaterialPageRoute(builder: (_) => PhotoScreen(
-          name: 'Take Picture',
-          fileUrl: fileUrl,
+      if (fileUrl != null) {
+        Navigator.of(context).push(
+          MaterialPageRoute(builder: (_) => PhotoScreen(
+            name: 'Take Picture',
+            fileUrl: fileUrl,
+            )
           )
-        )
-      ).then((value) => startLivePreview());
+        ).then((value) => startLivePreview());
+      } else {
+        setState(() {
+          shooting = true;
+        });
+        debugPrint('takePicture canceled.');
+      }
     }, (exception) {
       setState(() {
         shooting = false;

demos/demo-ios/SdkSample/TakePhotoView.swift

@@ -107,12 +107,15 @@ struct TakePhotoView: View {
         DispatchQueue.main.asyncAfter(deadline: .now() + 0.1) {
             Task {
                 do {
-                    try await theta.takePicture {photoUrl in
-                        let parts = photoUrl.components(separatedBy: "/")
-                        item = FileItem(
-                            name: parts[parts.count - 1],
-                            url: photoUrl
-                        )
+                    try await theta.takePicture { photoUrl in
+                        // When nil, it is canceled.
+                        if let photoUrl {
+                            let parts = photoUrl.components(separatedBy: "/")
+                            item = FileItem(
+                                name: parts[parts.count - 1],
+                                url: photoUrl
+                            )
+                        }
                         isActive = true
                     }
                 } catch {

demos/demo-ios/SdkSample/ThetaSdk.swift

@@ -126,7 +126,7 @@ class Theta {
         completionHandler(response)
     }
 
-    func takePicture(_ callback: @escaping (_ url: String) -> Void) async throws {
+    func takePicture(_ callback: @escaping (_ url: String?) -> Void) async throws {
         try await initialize()
         let photoCapture: PhotoCapture = try await withCheckedThrowingContinuation {continuation in
             thetaRepository!.getPhotoCaptureBuilder()
@@ -144,23 +144,22 @@ class Theta {
             init(_ callback: @escaping (_ url: String?, _ error: Error?) -> Void) {
                 self.callback = callback
             }
-            func onSuccess(fileUrl: String) {
+            func onSuccess(fileUrl: String?) {
                 callback(fileUrl, nil)
             }
             func onProgress(completion: Float) {
             }
             func onError(exception: ThetaException) {
-                callback(nil, exception as? Error)
+                callback(nil, exception.asError())
             }
         }
-        let photoUrl: String = try await withCheckedThrowingContinuation {continuation in
+        let photoUrl: String? = try await withCheckedThrowingContinuation {continuation in
             photoCapture.takePicture(
               callback: Callback {fileUrl, error in
-                  if let photoUrl = fileUrl {
-                      continuation.resume(returning: photoUrl)
-                  }
                   if let thetaError = error {
                       continuation.resume(throwing: thetaError)
+                  } else {
+                      continuation.resume(returning: fileUrl)
                   }
               }
             )

flutter/android/build.gradle

@@ -2,7 +2,7 @@ group 'com.ricoh360.thetaclient.theta_client_flutter'
 version '1.0.0'
 
 buildscript {
-    ext.kotlin_version = '1.6.10'
+    ext.kotlin_version = '1.8.20'
     repositories {
         google()
         mavenCentral()

flutter/android/src/main/kotlin/com/ricoh360/thetaclient/theta_client_flutter/ConvertUtil.kt

@@ -6,6 +6,8 @@ import com.ricoh360.thetaclient.capture.Capture
 import com.ricoh360.thetaclient.capture.PhotoCapture
 import com.ricoh360.thetaclient.capture.TimeShiftCapture
 import com.ricoh360.thetaclient.capture.VideoCapture
+import com.ricoh360.thetaclient.capture.LimitlessIntervalCapture
+import com.ricoh360.thetaclient.capture.ShotCountSpecifiedIntervalCapture
 import io.flutter.plugin.common.MethodCall
 
 const val KEY_CLIENT_MODE = "clientMode"
@@ -160,6 +162,14 @@ fun toTimeShift(map: Map<String, Any>): TimeShiftSetting {
     return timeShift
 }
 
+fun toTopBottomCorrectionRotation(map: Map<String, Any>): TopBottomCorrectionRotation {
+    return TopBottomCorrectionRotation(
+        pitch = (map["pitch"] as Double).toFloat(),
+        roll = (map["roll"] as Double).toFloat(),
+        yaw = (map["yaw"] as Double).toFloat()
+    )
+}
+
 fun <T> setCaptureBuilderParams(call: MethodCall, builder: Capture.Builder<T>) {
     call.argument<String>(OptionNameEnum.Aperture.name)?.also { enumName ->
         ApertureEnum.values().find { it.name == enumName }?.let {
@@ -169,6 +179,11 @@ fun <T> setCaptureBuilderParams(call: MethodCall, builder: Capture.Builder<T>) {
     call.argument<Int>(OptionNameEnum.ColorTemperature.name)?.also {
         builder.setColorTemperature(it)
     }
+    call.argument<String>(OptionNameEnum.ExposureCompensation.name)?.also { enumName ->
+        ExposureCompensationEnum.values().find { it.name == enumName }?.let {
+            builder.setExposureCompensation(it)
+        }
+    }
     call.argument<String>(OptionNameEnum.ExposureDelay.name)?.also { enumName ->
         ExposureDelayEnum.values().find { it.name == enumName }?.let {
             builder.setExposureDelay(it)
@@ -255,6 +270,23 @@ fun setVideoCaptureBuilderParams(call: MethodCall, builder: VideoCapture.Builder
     }
 }
 
+fun setLimitlessIntervalCaptureBuilderParams(call: MethodCall, builder: LimitlessIntervalCapture.Builder) {
+    call.argument<Int>(OptionNameEnum.CaptureInterval.name)?.also {
+        builder.setCaptureInterval(it)
+    }
+}
+
+fun setShotCountSpecifiedIntervalCaptureBuilderParams(call: MethodCall, builder: ShotCountSpecifiedIntervalCapture.Builder) {
+    call.argument<Int>("_capture_interval")?.let {
+        if (it >= 0) {
+            builder.setCheckStatusCommandInterval(it.toLong())
+        }
+    }
+    call.argument<Int>(OptionNameEnum.CaptureInterval.name)?.also {
+        builder.setCaptureInterval(it)
+    }
+}
+
 fun toGetOptionsParam(data: List<String>): List<OptionNameEnum> {
     val optionNames = mutableListOf<OptionNameEnum>()
     data.forEach { name ->
@@ -298,6 +330,14 @@ fun toResult(timeShift: TimeShiftSetting): Map<String, Any> {
     return result
 }
 
+fun toResult(rotation: TopBottomCorrectionRotation): Map<String, Any> {
+    return mapOf(
+        "pitch" to rotation.pitch,
+        "roll" to rotation.roll,
+        "yaw" to rotation.yaw
+    )
+}
+
 fun toResult(options: Options): Map<String, Any> {
     val result = mutableMapOf<String, Any>()
 
@@ -342,6 +382,10 @@ fun toResult(options: Options): Map<String, Any> {
             options.getValue<TimeShiftSetting>(OptionNameEnum.TimeShift)?.let { timeShift ->
                 result[OptionNameEnum.TimeShift.name] = toResult(timeShift)
             }
+        } else if (name == OptionNameEnum.TopBottomCorrectionRotation) {
+            options.getValue<TopBottomCorrectionRotation>(OptionNameEnum.TopBottomCorrectionRotation)?.let { rotation ->
+                result[OptionNameEnum.TopBottomCorrectionRotation.name] = toResult(rotation)
+            }
         } else if (valueOptions.contains(name)) {
             addOptionsValueToMap<Any>(options, name, result)
         } else {
@@ -415,6 +459,9 @@ fun setOptionValue(options: Options, name: OptionNameEnum, value: Any) {
     } else if (name == OptionNameEnum.TimeShift) {
         @Suppress("UNCHECKED_CAST")
         options.setValue(name, toTimeShift(value as Map<String, Any>))
+    } else if (name == OptionNameEnum.TopBottomCorrectionRotation) {
+        @Suppress("UNCHECKED_CAST")
+        options.setValue(name, toTopBottomCorrectionRotation(value as Map<String, Any>))
     } else {
         getOptionValueEnum(name, value as String)?.let {
             options.setValue(name, it)
@@ -442,8 +489,9 @@ fun getOptionValueEnum(name: OptionNameEnum, valueName: String): Any? {
         OptionNameEnum.Gain -> GainEnum.values().find { it.name == valueName }
         OptionNameEnum.ImageStitching -> ImageStitchingEnum.values().find { it.name == valueName }
         OptionNameEnum.Iso -> IsoEnum.values().find { it.name == valueName }
-        OptionNameEnum.IsoAutoHighLimit -> ApertureEnum.values().find { it.name == valueName }
+        OptionNameEnum.IsoAutoHighLimit -> IsoAutoHighLimitEnum.values().find { it.name == valueName }
         OptionNameEnum.Language -> LanguageEnum.values().find { it.name == valueName }
+        OptionNameEnum.LatestEnabledExposureDelayTime -> ExposureDelayEnum.values().find { it.name == valueName }
         OptionNameEnum.MaxRecordableTime -> MaxRecordableTimeEnum.values().find { it.name == valueName }
         OptionNameEnum.NetworkType -> NetworkTypeEnum.values().find { it.name == valueName }
         OptionNameEnum.OffDelay -> OffDelayEnum.values().find { it.name == valueName }
@@ -453,6 +501,9 @@ fun getOptionValueEnum(name: OptionNameEnum, valueName: String): Any? {
         OptionNameEnum.ShootingMethod -> ShootingMethodEnum.values().find { it.name == valueName }
         OptionNameEnum.ShutterSpeed -> ShutterSpeedEnum.values().find { it.name == valueName }
         OptionNameEnum.SleepDelay -> SleepDelayEnum.values().find { it.name == valueName }
+        OptionNameEnum.TopBottomCorrection -> TopBottomCorrectionOptionEnum.values().find { it.name == valueName }
+        OptionNameEnum.VideoStitching -> VideoStitchingEnum.values().find { it.name == valueName }
+        OptionNameEnum.VisibilityReduction -> VisibilityReductionEnum.values().find { it.name == valueName }
         OptionNameEnum.WhiteBalance -> WhiteBalanceEnum.values().find { it.name == valueName }
         OptionNameEnum.WhiteBalanceAutoStrength -> WhiteBalanceAutoStrengthEnum.values().find { it.name == valueName }
         OptionNameEnum.WlanFrequency -> WlanFrequencyEnum.values().find { it.name == valueName }