仮想デバイス削除時にServiceDiscoveryの一覧からも削除するように修正。

Author: TakayukiHoshi1984

dConnectDevicePlugin/dConnectDeviceIRKit/dConnectDeviceIRKit/Classes/DPIRKitDevicePlugin.m

@@ -373,14 +373,14 @@ - (void)didSelectService:(DConnectService *)service {
     }
     UINavigationController *top = [storyBoard instantiateViewControllerWithIdentifier:@"virtualDeviceList"];
 
-    
     UIViewController *rootView;
     DCPutPresentedViewController(rootView);
     DPIRKitVirtualDeviceViewController *view = (DPIRKitVirtualDeviceViewController*) top.viewControllers[0];
     DPIRKitDevice *irkit = _devices[service.serviceId];
 
     if (irkit) {
         [view setDetailItem:irkit];
+        [view setProvider:super.serviceProvider];
         [rootView presentViewController:top animated:YES completion:nil];
     } else {
         NSString *title = nil;
@@ -441,6 +441,7 @@ - (UIViewController *)settingViewController {
                                                bundle:bundle];
     }
     UINavigationController *top = [storyBoard instantiateViewControllerWithIdentifier:@"setting"];
+
     return top;
 }
 

dConnectDevicePlugin/dConnectDeviceIRKit/dConnectDeviceIRKit/Classes/setting/viewcontroller/DPIRKitVirtualDeviceViewController.h

@@ -11,5 +11,6 @@
 
 @interface DPIRKitVirtualDeviceViewController : UIViewController<UITableViewDelegate,UITableViewDataSource>
 
+@property (strong, nonatomic) id provider;
 @property (strong, nonatomic) id detailItem;
 @end

dConnectDevicePlugin/dConnectDeviceIRKit/dConnectDeviceIRKit/Classes/setting/viewcontroller/DPIRKitVirtualDeviceViewController.m

@@ -6,14 +6,17 @@
 //  Released under the MIT license
 //  http://opensource.org/licenses/mit-license.php
 //
+#import <DConnectSDK/DConnectSDK.h>
 #import "DPIRKitVirtualDeviceViewController.h"
 #import "DPIRKitManager.h"
 #import "DPIRKitConst.h"
 #import "DPIRKitCategorySelectDialog.h"
 #import "DPIRKitDBManager.h"
 #import "DPIRKitVirtualProfileViewController.h"
 
+
 @interface DPIRKitVirtualDeviceViewController () {
+    DConnectServiceProvider *_serviceProvider;
     NSBundle *bundle;
     NSMutableDictionary *_virtuals;
     DPIRKitDevice *_virtual;
@@ -157,7 +160,10 @@ - (void)setDetailItem:(id)newDetailItem
     _virtual = newDetailItem;
 }
 
-
+- (void)setProvider:(id)provider
+{
+    _serviceProvider = provider;
+}
 
 - (void)mergeChanges:(NSNotification*)notification
 {
@@ -243,6 +249,8 @@ - (void)executeDeleteVirtualDevice {
     BOOL isDelete = NO;
     for (NSIndexPath *c in cells) {
         DPIRKitVirtualDevice *device = _devices[c.row];
+        DConnectService *service = [_serviceProvider service:device.serviceId];
+        [_serviceProvider removeService:service];
         BOOL isDeleteVirtualDevice = [mgr deleteVirtualDevice:device.serviceId];
         BOOL isDeleteVirtualProfile = [mgr deleteRESTfulRequestForServiceId:device.serviceId];
         if (isDeleteVirtualDevice || isDeleteVirtualProfile) {