Sonyカメラにターゲットを追加

Author: nobuo-kobayashi

dConnectDevicePlugin/dConnectDeviceSonyCamera/dConnectDeviceSonyCamera/Classes/SonyCameraManager.m

@@ -32,7 +32,6 @@
  */
 #define SONY_CAMERA_NAME @"sony_came_name"
 
-
 @interface SonyCameraDevice : NSObject
 
 @property (nonatomic) NSString *serviceId;
@@ -216,6 +215,8 @@ - (void) getCameraState:(SonyCameraStateBlock)block {
                    [cameraStatus isEqualToString:@"IntervalWaitRecStart"] ||
                    [cameraStatus isEqualToString:@"IntervalWaitRecStop"]) {
             status = DConnectMediaStreamRecordingProfileRecorderStatePaused;
+        } else {
+            status = DConnectMediaStreamRecordingProfileRecorderStateUnknown;
         }
 
         NSDictionary *dic = [weakSelf.remoteApi getStillSize];
@@ -301,9 +302,9 @@ - (void) takePicture:(SonyCameraTakePictureBlock)block {
                 block(nil);
             } else {
                 NSArray *arr = resultArray[0];
-                NSString *uri = arr[0];
-                if (uri) {
-                    block(uri);
+                NSString *postImageUrl = arr[0];
+                if (postImageUrl) {
+                    block([weakSelf saveFileFromURL:postImageUrl]);
                 } else {
                     block(nil);
                 }
@@ -472,17 +473,24 @@ - (NSData *) download:(NSString *)requestURL {
 
 - (NSString *) saveFile:(NSData *)data
 {
+    if (!data) {
+        return nil;
+    }
+
     // ファイル名作成
     NSDateFormatter *formatter = [[NSDateFormatter alloc] init];
     [formatter setTimeZone:[NSTimeZone timeZoneWithAbbreviation:@"JST"]];
     [formatter setDateFormat:@"yyyyMMdd_HHmmss"];
     NSString *dateStr = [formatter stringFromDate:[NSDate date]];
-    NSString *fileName = [NSString stringWithFormat:@"%@_%@.png", SonyFilePrefix, dateStr];
-    
+    NSString *fileName = [NSString stringWithFormat:@"%@_%@.jpg", SonyFilePrefix, dateStr];
     // ファイルを保存
     return [self.mFileManager createFileForPath:fileName contents:data];
 }
 
+- (NSString *) saveFileFromURL:(NSString *)requestURL {
+    return [self saveFile:[self download:requestURL]];
+}
+
 - (void) saveSonyCameraDevices
 {
     NSMutableArray *array = [NSMutableArray array];

dConnectDevicePlugin/dConnectDeviceSonyCamera/dConnectDeviceSonyCamera/Classes/profile/SonyCameraMediaStreamRecordingProfile.m

@@ -12,6 +12,16 @@
 #import "SonyCameraManager.h"
 #import "RemoteApiList.h"
 
+/*!
+ @brief ターゲットIDを定義.
+ */
+#define SONY_TARGET_ID @"sonycamera"
+
+/*!
+ @brief ターゲット名を定義.
+ */
+#define SONY_TARGET_NAME @"Sony Camera"
+
 @implementation SonyCameraMediaStreamRecordingProfile
 
 - (instancetype) init {
@@ -96,10 +106,10 @@ - (BOOL) didReceivedGetMediaRecorderRequest:(DConnectRequestMessage *)request re
     [manager getCameraState:^(NSString *state, int width, int height) {
         if (state) {
             DConnectMessage *recorder = [DConnectMessage message];
-            [DConnectMediaStreamRecordingProfile setRecorderId:@"SonyCamera" target:recorder];
-            [DConnectMediaStreamRecordingProfile setRecorderName:@"SonyCamera" target:recorder];
+            [DConnectMediaStreamRecordingProfile setRecorderId:SONY_TARGET_ID target:recorder];
+            [DConnectMediaStreamRecordingProfile setRecorderName:SONY_TARGET_NAME target:recorder];
             [DConnectMediaStreamRecordingProfile setRecorderState:state target:recorder];
-            [DConnectMediaStreamRecordingProfile setRecorderMIMEType:@"image/png" target:recorder];
+            [DConnectMediaStreamRecordingProfile setRecorderMIMEType:@"image/jpg" target:recorder];
             if (width > 0 && height > 0) {
                 [DConnectMediaStreamRecordingProfile setRecorderImageWidth:width target:recorder];
                 [DConnectMediaStreamRecordingProfile setRecorderImageHeight:height target:recorder];
@@ -133,7 +143,7 @@ - (BOOL) didReceivePostTakePhotoRequest:(DConnectRequestMessage *)request respon
     }
 
     // ターゲットチェック
-    if (target && ![target isEqualToString:@"SonyCamera"]) {
+    if (target && ![target isEqualToString:SONY_TARGET_ID]) {
         [response setErrorToInvalidRequestParameterWithMessage:@"target is invalid."];
         return YES;
     }
@@ -178,7 +188,7 @@ - (BOOL) didReceivePostRecordRequest:(DConnectRequestMessage *)request response:
     }
 
     // ターゲットチェック
-    if (target && ![target isEqualToString:@"SonyCamera"]) {
+    if (target && ![target isEqualToString:SONY_TARGET_ID]) {
         [response setErrorToInvalidRequestParameterWithMessage:@"target is invalid."];
         return YES;
     }
@@ -222,7 +232,7 @@ - (BOOL) didReceivePutStopRequest:(DConnectRequestMessage *)request response:(DC
     }
 
     // ターゲットチェック
-    if (target && ![target isEqualToString:@"SonyCamera"]) {
+    if (target && ![target isEqualToString:SONY_TARGET_ID]) {
         [response setErrorToInvalidRequestParameterWithMessage:@"target is invalid."];
         return YES;
     }
@@ -265,7 +275,7 @@ - (BOOL) didReceivePutOnPhotoRequest:(DConnectRequestMessage *)request response:
     }
 
     // ターゲットチェック
-    if (target && ![target isEqualToString:@"SonyCamera"]) {
+    if (target && ![target isEqualToString:SONY_TARGET_ID]) {
         [response setErrorToInvalidRequestParameterWithMessage:@"target is invalid."];
         return YES;
     }
@@ -296,7 +306,7 @@ - (BOOL) didReceiveDeleteOnPhotoRequest:(DConnectRequestMessage *)request respon
     }
 
     // ターゲットチェック
-    if (target && ![target isEqualToString:@"SonyCamera"]) {
+    if (target && ![target isEqualToString:SONY_TARGET_ID]) {
         [response setErrorToInvalidRequestParameterWithMessage:@"target is invalid."];
         return YES;
     }
@@ -329,7 +339,7 @@ - (BOOL) didReceivePutPreviewRequest:(DConnectRequestMessage *)request response:
     }
 
     // ターゲットチェック
-    if (target && ![target isEqualToString:@"SonyCamera"]) {
+    if (target && ![target isEqualToString:SONY_TARGET_ID]) {
         [response setErrorToInvalidRequestParameterWithMessage:@"target is invalid."];
         return YES;
     }
@@ -361,7 +371,7 @@ - (BOOL) didReceiveDeletePreviewRequest:(DConnectRequestMessage *)request respon
     }
 
     // ターゲットチェック
-    if (target && ![target isEqualToString:@"SonyCamera"]) {
+    if (target && ![target isEqualToString:SONY_TARGET_ID]) {
         [response setErrorToInvalidRequestParameterWithMessage:@"target is invalid."];
         return YES;
     }

dConnectSDK/dConnectSDKForIOS/DConnectSDK/Classes/profile/DConnectMediaStreamRecordingProfile.m

@@ -10,7 +10,7 @@
 #import "DConnectMediaStreamRecordingProfile.h"
 
 NSString *const DConnectMediaStreamRecordingProfileName = @"mediastreamRecording";
-NSString *const DConnectMediaStreamRecordingProfileAttrMediaRecorder = @"mediarecorder";
+NSString *const DConnectMediaStreamRecordingProfileAttrMediaRecorder = @"recorder";
 NSString *const DConnectMediaStreamRecordingProfileAttrTakePhoto = @"takephoto";
 NSString *const DConnectMediaStreamRecordingProfileAttrRecord = @"record";
 NSString *const DConnectMediaStreamRecordingProfileAttrPause = @"pause";