Merge pull request #255 from TakayukiHoshi1984/modify_sonycamera_management_device

Modify sonycamera management device

Author: TakayukiHoshi1984

dConnectDevicePlugin/dConnectDeviceIRKit/dConnectDeviceIRKit/Classes/DPIRKitDevicePlugin.m

@@ -349,12 +349,16 @@ - (UIViewController *) profile:(DConnectSystemProfile *)sender
     serviceListViewController.delegate = self;
     return top;
 }
-- (void)didRemoveService:(DConnectService *)service
+- (void)didRemovedService:(DConnectService *)service
 {
-    //サービス一覧画面で仮想デバイスが削除されたら、DBからも仮想デバイスを削除する。
-    DPIRKitDBManager *mgr = [DPIRKitDBManager sharedInstance];
-    [mgr deleteVirtualDevice:service.serviceId];
-    [mgr deleteRESTfulRequestForServiceId:service.serviceId];
+    // IRKitのServiceIdに.がある場合は仮想デバイスとみなす
+    NSRange range = [service.serviceId rangeOfString:@"."];
+    if (range.location != NSNotFound) {
+        //サービス一覧画面で仮想デバイスが削除されたら、DBからも仮想デバイスを削除する。
+        DPIRKitDBManager *mgr = [DPIRKitDBManager sharedInstance];
+        [mgr deleteVirtualDevice:service.serviceId];
+        [mgr deleteRESTfulRequestForServiceId:service.serviceId];
+    }
 }
 - (void)didSelectService:(DConnectService *)service
 {

dConnectDevicePlugin/dConnectDeviceSonyCamera/dConnectDeviceSonyCamera.xcodeproj/project.pbxproj

@@ -52,6 +52,8 @@
 		BE75D3181994A54A00F1BFC9 /* settings_iphone.png in Resources */ = {isa = PBXBuildFile; fileRef = BE75D3171994A54A00F1BFC9 /* settings_iphone.png */; };
 		BEAFFE4519C94FFA00A98079 /* DConnectSDK.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BEAFFE4419C94FFA00A98079 /* DConnectSDK.framework */; };
 		BEAFFE5C19C96FE100A98079 /* sonycamera01@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = BEAFFE5B19C96FE100A98079 /* sonycamera01@2x.png */; };
+		BEC39A151E8BAEEE00F13F40 /* SonyCameraPreview.m in Sources */ = {isa = PBXBuildFile; fileRef = BEC39A141E8BAEEE00F13F40 /* SonyCameraPreview.m */; };
+		BEC39A181E8C9E6900F13F40 /* SonyCameraSimpleHttpServer.m in Sources */ = {isa = PBXBuildFile; fileRef = BEC39A171E8C9E6900F13F40 /* SonyCameraSimpleHttpServer.m */; };
 		BED92A3E1991C11400B61B2F /* SonyCameraDevicePlugin_iPad.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = BED92A3D1991C11400B61B2F /* SonyCameraDevicePlugin_iPad.storyboard */; };
 		BED92A401991D78400B61B2F /* SonyCameraDevicePlugin_iPhone.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = BED92A3F1991D78400B61B2F /* SonyCameraDevicePlugin_iPhone.storyboard */; };
 		C2540BB2195A7FA000AE012C /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C2540BB1195A7FA000AE012C /* Foundation.framework */; };
@@ -133,6 +135,10 @@
 		BE75D3171994A54A00F1BFC9 /* settings_iphone.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = settings_iphone.png; sourceTree = "<group>"; };
 		BEAFFE4419C94FFA00A98079 /* DConnectSDK.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = DConnectSDK.framework; path = ../../dConnectSDK/dConnectSDKForIOS/bin/DConnectSDK.framework; sourceTree = "<group>"; };
 		BEAFFE5B19C96FE100A98079 /* sonycamera01@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "sonycamera01@2x.png"; sourceTree = "<group>"; };
+		BEC39A131E8BAEEE00F13F40 /* SonyCameraPreview.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SonyCameraPreview.h; sourceTree = "<group>"; };
+		BEC39A141E8BAEEE00F13F40 /* SonyCameraPreview.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SonyCameraPreview.m; sourceTree = "<group>"; };
+		BEC39A161E8C9E6900F13F40 /* SonyCameraSimpleHttpServer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SonyCameraSimpleHttpServer.h; sourceTree = "<group>"; };
+		BEC39A171E8C9E6900F13F40 /* SonyCameraSimpleHttpServer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SonyCameraSimpleHttpServer.m; sourceTree = "<group>"; };
 		BED92A3D1991C11400B61B2F /* SonyCameraDevicePlugin_iPad.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = SonyCameraDevicePlugin_iPad.storyboard; sourceTree = "<group>"; };
 		BED92A3F1991D78400B61B2F /* SonyCameraDevicePlugin_iPhone.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = SonyCameraDevicePlugin_iPhone.storyboard; sourceTree = "<group>"; };
 		C2540BAE195A7FA000AE012C /* libdConnectDeviceSonyCamera.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libdConnectDeviceSonyCamera.a; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -316,8 +322,8 @@
 			children = (
 				C2540C50195A853600AE012C /* sony_camera_remote_sdk */,
 				BE4FDFC9198765B5001A3C86 /* profile */,
-				C2540C0F195A83D500AE012C /* SonyCameraDevicePlugin.m */,
 				ABB1839019F626B30059E7F8 /* SonyCameraDevicePlugin.h */,
+				C2540C0F195A83D500AE012C /* SonyCameraDevicePlugin.m */,
 				C2540C71195AAFB400AE012C /* SonyCameraRemoteApiUtil.h */,
 				C2540C72195AAFB400AE012C /* SonyCameraRemoteApiUtil.m */,
 				BE75D3021994884200F1BFC9 /* SonyCameraViewController.h */,
@@ -336,6 +342,10 @@
 				BE75D3151994A44500F1BFC9 /* SonyCameraSettingView04Controller.m */,
 				D6C860461D3B436400232EEF /* SonyCameraService.h */,
 				D6C860471D3B436400232EEF /* SonyCameraService.m */,
+				BEC39A161E8C9E6900F13F40 /* SonyCameraSimpleHttpServer.h */,
+				BEC39A171E8C9E6900F13F40 /* SonyCameraSimpleHttpServer.m */,
+				BEC39A131E8BAEEE00F13F40 /* SonyCameraPreview.h */,
+				BEC39A141E8BAEEE00F13F40 /* SonyCameraPreview.m */,
 				D662E9A31D4A16B300919C69 /* SonyCameraManager.h */,
 				D662E9A41D4A16B300919C69 /* SonyCameraManager.m */,
 				D6D172721D62E7CD00444337 /* SonyCameraReachability.h */,
@@ -589,6 +599,7 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				BEC39A151E8BAEEE00F13F40 /* SonyCameraPreview.m in Sources */,
 				D6D172741D62E7CD00444337 /* SonyCameraReachability.m in Sources */,
 				D662E99F1D49F61600919C69 /* SonyCameraMediaStreamRecordingProfile.m in Sources */,
 				BE75D30D199495BF00F1BFC9 /* SonyCameraSettingView02Controller.m in Sources */,
@@ -613,6 +624,7 @@
 				BE75D31319949D4F00F1BFC9 /* SonyCameraSettingView03Controller.m in Sources */,
 				BE24CF04197F7BC4007BBC69 /* SampleLiveviewManager.m in Sources */,
 				C2540C68195A853600AE012C /* UdpRequest.m in Sources */,
+				BEC39A181E8C9E6900F13F40 /* SonyCameraSimpleHttpServer.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -754,6 +766,7 @@
 				);
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "dConnectDeviceSonyCamera/dConnectDeviceSonyCamera-Prefix.pch";
+				HEADER_SEARCH_PATHS = "$(PROJECT_DIR)/../../dConnectSDK/dConnectSDKForIOS/DConnectSDK/Dependencies/CocoaAsyncSocket";
 				ONLY_ACTIVE_ARCH = NO;
 				OTHER_LDFLAGS = "-ObjC";
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -771,6 +784,7 @@
 				);
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "dConnectDeviceSonyCamera/dConnectDeviceSonyCamera-Prefix.pch";
+				HEADER_SEARCH_PATHS = "$(PROJECT_DIR)/../../dConnectSDK/dConnectSDKForIOS/DConnectSDK/Dependencies/CocoaAsyncSocket";
 				OTHER_LDFLAGS = "-ObjC";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;

dConnectDevicePlugin/dConnectDeviceSonyCamera/dConnectDeviceSonyCamera/Classes/SonyCameraDataViewController.h

@@ -19,7 +19,7 @@
 /*!
  @brief メインのView。
  */
-@property (strong, nonatomic) IBOutlet UIView *mainView;
+@property (strong, nonatomic) IBOutlet UIScrollView *mainView;
 
 /*!
  @brief ViewControllerのページ数。

dConnectDevicePlugin/dConnectDeviceSonyCamera/dConnectDeviceSonyCamera/Classes/SonyCameraDataViewController.m

@@ -20,7 +20,7 @@ - (void)viewDidLoad
 	// Do any additional setup after loading the view, typically from a nib.
 
     UIScrollView *scrollView = (UIScrollView *)self.mainView;
-    scrollView.contentInset = UIEdgeInsetsMake(64, 0.0, 0.0, 0);
+    scrollView.contentInset = UIEdgeInsetsMake(0, 0.0, 0.0, 0);
 }
 
 - (void)didReceiveMemoryWarning

dConnectDevicePlugin/dConnectDeviceSonyCamera/dConnectDeviceSonyCamera/Classes/SonyCameraDevicePlugin.h

@@ -9,6 +9,11 @@
 
 #import <DConnectSDK/DConnectSDK.h>
 
+
+@class SonyCameraManager;
+@class SonyCameraService;
+
+
 /*!
  @brief SonyCameraデバイスプラグインのデリゲート。
  */
@@ -21,6 +26,11 @@
  */
 - (void) didReceiveDeviceList:(BOOL)discover;
 
+/*!
+ @brief WiFiの状態が更新されたことを通知.
+ */
+- (void) didReceiveUpdateDevice;
+
 @end
 
 /**
@@ -34,22 +44,23 @@
 @property (weak, nonatomic) id<SonyCameraDevicePluginDelegate> delegate;
 
 /*!
- @biref Sony Camera Remote APIに対応したデバイスを探索する。
- 
- 発見通知は、delegateに設定されたSonyCameraDevicePluginDelegateに通知される。
+ @brief SonyCamera制御クラス.
  */
-- (void) searchSonyCameraDevice;
+@property (strong, nonatomic) SonyCameraManager *sonyCameraManager;
 
 /*!
- @brief デバイスプラグインを停止する。
+ @brief Sonyカメラに接続されているか確認を行う.
+ 
+ @retval YES Sonyカメラに接続されている
+ @retval NO Sonyカメラに接続されていない
  */
-- (void) stop;
+- (BOOL) isConnectedSonyCamera;
 
 /*!
- @brief デバイスプラグインが起動中かチェックする。
- @retval YES 起動中
- @retval NO 停止中
+ @brief 指定されたサービスを削除します.
+ 
+ @param[in] servie 削除するサービス
  */
-- (BOOL) isStarted;
+- (void) removeSonyCamera:(SonyCameraService *)service;
 
 @end