Merge pull request #269 from TakayukiHoshi1984/modify_instance_management

インスタンス生成ロジックの見直し

Author: TakayukiHoshi1984

dConnectDevicePlugin/dConnectDeviceHost/dConnectDeviceHost/Classes/DPHostDevicePlugin.m

@@ -9,7 +9,6 @@
 
 #import <DConnectSDK/DConnectFileManager.h>
 #import <DConnectSDK/DConnectEventManager.h>
-#import <DConnectSDK/DConnectMemoryCacheController.h>
 #import <DConnectSDK/DConnectServiceManager.h>
 
 #import "DPHostDevicePlugin.h"
@@ -22,11 +21,6 @@
 @implementation DPHostDevicePlugin
 
 + (void) initialize {
-    // イベントマネージャの準備
-    Class clazz = [DPHostDevicePlugin class];
-    DConnectEventManager *eventMgr =
-    [DConnectEventManager sharedManagerForClass:clazz];
-    [eventMgr setController:[DConnectMemoryCacheController new]];
 }
 
 - (id) init {

dConnectSDK/dConnectSDKForIOS/DConnectSDK/Classes/DConnectDevicePlugin.m

@@ -50,10 +50,15 @@ - (id) initWithObject: (id) object {
         self.pluginVersionName = @"1.0.0";
         self.pluginId = [md5Proc generateSignature: self.pluginName];
 
+        // DeviceConnectサービス管理クラスの初期化
         DConnectServiceManager *serviceManager = [DConnectServiceManager sharedForClass: [object class]];
         [serviceManager setPlugin: self];
         [self setServiceProvider: serviceManager];
 
+        // イベント管理クラスの初期化
+        id<DConnectEventCacheController> ctrl = [self eventCacheController];
+        [[DConnectEventManager sharedManagerForClass:[self class]] setController:ctrl];
+
         // プロファイル追加
         [self addProfile:[[DConnectAuthorizationProfile alloc] initWithObject:self]];
         [self addProfile:[[DConnectServiceDiscoveryProfile alloc] initWithServiceProvider: self.serviceProvider]];
@@ -228,6 +233,11 @@ - (NSArray *) serviceProfilesWithServiceId: (NSString *) serviceId {
     return nil;
 }
 
+- (id<DConnectEventCacheController>) eventCacheController
+{
+    return [[DConnectMemoryCacheController alloc] init];
+}
+
 
 - (NSString*)iconFilePath:(BOOL)isOnline
 {

dConnectSDK/dConnectSDKForIOS/DConnectSDK/DConnectSDK/DConnectDevicePlugin.h

@@ -16,6 +16,7 @@
 #import <DConnectSDK/DConnectRequestMessage.h>
 #import <DConnectSDK/DConnectResponseMessage.h>
 #import <DConnectSDK/DConnectServiceProvider.h>
+#import <DConnectSDK/DConnectEventCacheController.h>
 
 
 /*! 
@@ -115,6 +116,8 @@
  */
 - (void)applicationWillEnterForeground;
 
+- (id<DConnectEventCacheController>) eventCacheController;
+
 - (NSArray *) serviceProfilesWithServiceId: (NSString *) serviceId;
 
 - (NSString*)iconFilePath:(BOOL)isOnline;