仮想デバイス削除時に管理しているDBからも情報を削除する。

Author: TakayukiHoshi1984

dConnectDevicePlugin/dConnectDeviceIRKit/dConnectDeviceIRKit/Classes/DPIRKitDevicePlugin.m

@@ -248,29 +248,37 @@ - (void) sendDeviceDetectionEventWithDevice:(DPIRKitDevice *)device online:(BOOL
             if (virtuals.count > 0) {
                 for (DPIRKitVirtualDevice *virtual in virtuals) {
                     NSRange range = [virtual.serviceId rangeOfString:device.name];
-                    if (range.location != NSNotFound
-                        && [self existIRForServiceId:virtual.serviceId]) {
-                        if (online) {
+                    if (range.location != NSNotFound) {
+                        
+                        if ([self existIRForServiceId:virtual.serviceId]) {
                             // オンライン遷移の場合、デバイスが未登録なら登録し、登録済ならフラグをオンラインにする
                             NSString *serviceId = virtual.serviceId;
                             if ([self.serviceProvider service: serviceId]) {
                                 DConnectService *service = [self.serviceProvider service: serviceId];
-                                [service setOnline: YES];
+                                [service setOnline: online];
                             } else {
-                                NSString *profileName = virtual.categoryName;
                                 DPIRKitVirtualService *service = [[DPIRKitVirtualService alloc] initWithServiceId: serviceId
                                                                                                              name:virtual.deviceName
                                                                                                            plugin:self
-                                                                                                      profileName:profileName];
+                                                                                                      profileName:virtual.categoryName];
+                                [service setOnline: online];
                                 [self.serviceProvider addService: service bundle: DPIRBundle()];
-                                [service setOnline: YES];
+
                             }
                         } else {
                             // オフライン遷移の場合、デバイスが登録済ならフラグをオフラインにする
                             NSString *serviceId = virtual.serviceId;
                             DConnectService *service = [self.serviceProvider service: serviceId];
                             if (service) {
                                 [service setOnline: NO];
+                                [self.serviceProvider addService: service bundle: DPIRBundle()];
+                            } else {
+                                service = [[DPIRKitVirtualService alloc] initWithServiceId: serviceId
+                                                                                      name:virtual.deviceName
+                                                                                    plugin:self
+                                                                               profileName:virtual.categoryName];
+                                [service setOnline: NO];
+                                [self.serviceProvider addService: service bundle: DPIRBundle()];
                             }
                         }
 
@@ -341,8 +349,15 @@ - (UIViewController *) profile:(DConnectSystemProfile *)sender
     serviceListViewController.delegate = self;
     return top;
 }
-
-- (void)didSelectService:(DConnectService *)service {
+- (void)didRemoveService:(DConnectService *)service
+{
+    //サービス一覧画面で仮想デバイスが削除されたら、DBからも仮想デバイスを削除する。
+    DPIRKitDBManager *mgr = [DPIRKitDBManager sharedInstance];
+    [mgr deleteVirtualDevice:service.serviceId];
+    [mgr deleteRESTfulRequestForServiceId:service.serviceId];
+}
+- (void)didSelectService:(DConnectService *)service
+{
 
     // サービスが選択されたら、仮想デバイス一覧画面を表示する
 

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

@@ -165,7 +165,8 @@ - (void)setProvider:(id)provider
     _serviceProvider = provider;
 }
 
-- (void)mergeChanges:(NSNotification*)notification
+// 仮想デバイスのリストを更新する
+- (void)updateChanges:(NSNotification*)notification
 {
     _devices = [[DPIRKitDBManager sharedInstance] queryVirtualDevice:nil];
     [_virtualDeviceList reloadData];
@@ -174,10 +175,11 @@ - (void)mergeChanges:(NSNotification*)notification
 
 - (IBAction)addVirtualDevice:(id)sender {
     if (!_isRemoved) {
+        // ダイアログでの操作を受け取るNotification
         NSNotificationCenter *nc = [NSNotificationCenter defaultCenter];
 
         [nc addObserver:self
-               selector:@selector(mergeChanges:)
+               selector:@selector(updateChanges:)
                    name:DPIRKitVirtualDeviceCreateNotification
                  object:nil];
         [DPIRKitCategorySelectDialog showWithServiceId:_irkitName];

dConnectSDK/dConnectSDKForIOS/DConnectSDK/Classes/viewcontroller/DConnectServiceListViewController.m

@@ -171,6 +171,9 @@ - (void)tableView:(UITableView *)tableView commitEditingStyle:(UITableViewCellEd
                 [tableView beginUpdates];
                 [self.delegate.serviceProvider removeService: service];
                 [tableView deleteRowsAtIndexPaths:@[indexPath] withRowAnimation:UITableViewRowAnimationFade];
+                if ([self.delegate respondsToSelector:@selector(didRemoveService:)]) {
+                    [self.delegate didRemoveService: service];
+                }
                 [tableView endUpdates];
 
                 // 削除後にオフラインのサービスが1件以上あればRemoveボタンを有効にする

dConnectSDK/dConnectSDKForIOS/DConnectSDK/DConnectSDK/DConnectSystemProfile.h

@@ -88,6 +88,8 @@ extern NSString *const DConnectSystemProfileParamVersion;
 
 @optional
 
+- (void) didRemoveService: (DConnectService *) service;
+
 - (void) didSelectService: (DConnectService *) service;
 
 - (void) serviceListViewControllerDidWillAppear;