アプリ再開時に再度スキャンして、再接続するように修正

Author: nobuo-kobayashi

dConnectDevicePlugin/dConnectDeviceLinking/dConnectDeviceLinking/Classes/DPLinkingDevicePlugin.m

@@ -10,6 +10,7 @@
 #import "DPLinkingDevicePlugin.h"
 #import "DPLinkingServiceDiscoveryProfile.h"
 #import "DPLinkingSystemProfile.h"
+#import "DPLinkingDeviceManager.h"
 
 @implementation DPLinkingDevicePlugin
 
@@ -24,9 +25,25 @@ - (id) init
 
         [self addProfile:[[DPLinkingServiceDiscoveryProfile alloc] initWithServiceProvider: self.serviceProvider]];
         [self addProfile:[DPLinkingSystemProfile systemProfileWithVersion:@"1.0"]];
+
+        __weak typeof(self) weakSelf = self;
+        
+        dispatch_async(dispatch_get_main_queue(), ^{
+            NSNotificationCenter *notificationCenter = [NSNotificationCenter defaultCenter];
+            UIApplication *application = [UIApplication sharedApplication];
+            [notificationCenter addObserver:weakSelf
+                                   selector:@selector(enterForeground)
+                                       name:UIApplicationWillEnterForegroundNotification
+                                     object:application];
+        });
     }
     return self;
 }
+
+- (void) enterForeground {
+    [[DPLinkingDeviceManager sharedInstance] restart];
+}
+
 #pragma mark - DevicePlugin's icon image
 
 - (NSString*)iconFilePath:(BOOL)isOnline

dConnectDevicePlugin/dConnectDeviceLinking/dConnectDeviceLinking/Classes/linking/DPLinkingDevice.m

@@ -34,6 +34,7 @@ - (id) initWithCoder:(NSCoder *)coder {
         self.vibrationOffPatternId = [[coder decodeObjectForKey:kVibrationOffPatternId] intValue];
         self.connectFlag = [[coder decodeObjectForKey:kConnectFlag] boolValue];
         self.temperatureType = DCMTemperatureProfileEnumCelsius;
+        self.online = NO;
 
         DCLogInfo(@"LDPDevice");
         DCLogInfo(@"    name: %@", self.name);

dConnectDevicePlugin/dConnectDeviceLinking/dConnectDeviceLinking/Classes/linking/DPLinkingDeviceManager.h

@@ -72,6 +72,8 @@
 - (void) stopScan;
 - (BOOL) isStartScan;
 
+- (void) restart;
+
 - (NSArray *) getDPLinkingDevices;
 
 - (DPLinkingDevice *) createDPLinkingDevice:(CBPeripheral *)peripheral;

dConnectDevicePlugin/dConnectDeviceLinking/dConnectDeviceLinking/Classes/linking/DPLinkingDeviceManager.m

@@ -102,6 +102,10 @@ - (BOOL) isStartScan {
     return [[BLEConnecter sharedInstance] isScanning];
 }
 
+- (void) restart {
+    [self startScanWithTimeout:20];
+}
+
 - (DPLinkingDevice *) findDPLinkingDeviceByPeripheral:(CBPeripheral *)peripheral {
     __block DPLinkingDevice *result = nil;
     [self.devices enumerateObjectsUsingBlock:^(DPLinkingDevice *obj, NSUInteger idx, BOOL *stop) {
@@ -635,6 +639,7 @@ - (void) removeConnectDelegate:(id<DPLinkingDeviceConnectDelegate>)delegate {
 
 - (void) startScanWithTimeout:(NSTimeInterval)timeout {
     if ([BLEConnecter sharedInstance].canDiscovery) {
+        DCLogInfo(@"DPLinkingDeviceManager::startScanWithTimeout");
         [DPLinkingUtil asyncAfterDelay:timeout block:^{
             DCLogWarn(@"Timeout.");
             _initFlag = NO;
@@ -836,7 +841,7 @@ - (void) didDiscoverPeripheral:(CBPeripheral *)peripheral advertisementData:(NSD
             [self stopScan];
             [self connectDPLinkingDevice:device];
         } else if (_initFlag) {
-            if (device.connectFlag) {
+            if (device.connectFlag && !device.online) {
                 [self connectDPLinkingDevice:device];
             }
         }

dConnectSDK/dConnectSDKForIOS/DConnectSDK/Classes/DConnectManager.m

@@ -231,9 +231,6 @@ - (BOOL) start {
 
     _requestQueue = dispatch_queue_create("org.deviceconnect.manager.queue.request", DISPATCH_QUEUE_SERIAL);
 
-    // デバイスプラグインの検索
-    [self.mDeviceManager searchDevicePlugin];
-    
     _webServer = [DConnectServerManager new];
     _webServer.settings = self.settings;
 
@@ -249,7 +246,6 @@ - (void) stop {
         return;
     }
     self.mStartFlag = NO;
-
     [_webServer stopServer];
 }
 
@@ -451,6 +447,9 @@ - (id) init {
         self.mEventSessionTable = [DConnectEventSessionTable new];
         self.mEventBroker = [[DConnectEventBroker alloc] initWithContext:self table:self.mEventSessionTable localOAuth:self.mLocalOAuth pluginManager:self.mDeviceManager delegate:self.delegate];
 
+        // デバイスプラグインの検索
+        [self.mDeviceManager searchDevicePlugin];
+
         // プロファイルの追加
         [self addProfile:[DConnectManagerServiceDiscoveryProfile new]];
         [self addProfile:[DConnectManagerSystemProfile new]];