Merge pull request #289 from TakayukiHoshi1984/bugfix_irkit_resource_bundle

不具合修正: APIキーをリソースバンドルから取得できない。

Author: TakayukiHoshi1984

dConnectDevicePlugin/dConnectDeviceIRKit/dConnectDeviceIRKit.xcodeproj/project.pbxproj

@@ -59,6 +59,7 @@
 		30A0A33919A5952D00822B73 /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 30A0A33819A5952D00822B73 /* CoreFoundation.framework */; };
 		30A1EBDF19A8D16600E6CCE9 /* DPIRKitWiFiFormViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 30A1EBDE19A8D16600E6CCE9 /* DPIRKitWiFiFormViewController.m */; };
 		6682B8D719CA81E40039DCAA /* irkit09.png in Resources */ = {isa = PBXBuildFile; fileRef = 6682B8D619CA81E40039DCAA /* irkit09.png */; };
+		6BCBFE1F2053F84000E5541E /* dConnectDeviceIRKit-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 30A0A33219A5932700822B73 /* dConnectDeviceIRKit-Info.plist */; };
 		8EB8544C1D42403E0035C0DC /* dconnect_icon_off.png in Resources */ = {isa = PBXBuildFile; fileRef = 8EB8544A1D42403E0035C0DC /* dconnect_icon_off.png */; };
 		8EB8544D1D42403E0035C0DC /* dconnect_icon.png in Resources */ = {isa = PBXBuildFile; fileRef = 8EB8544B1D42403E0035C0DC /* dconnect_icon.png */; };
 		AB03424519BD790A00B1967E /* Storyboard_iPad.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = AB03424719BD790A00B1967E /* Storyboard_iPad.storyboard */; };
@@ -658,6 +659,7 @@
 				AB4B690819B46FC9009939C9 /* irkit05.png in Resources */,
 				8EB8544C1D42403E0035C0DC /* dconnect_icon_off.png in Resources */,
 				AB4B690919B46FC9009939C9 /* irkit06.png in Resources */,
+				6BCBFE1F2053F84000E5541E /* dConnectDeviceIRKit-Info.plist in Resources */,
 				D63BB8C31DA2068000892E5E /* remotecontroller.json in Resources */,
 				AB4B690A19B46FC9009939C9 /* irkit07.png in Resources */,
 				AB4B690B19B46FC9009939C9 /* irkit08.png in Resources */,

dConnectDevicePlugin/dConnectDeviceIRKit/dConnectDeviceIRKit/Classes/setting/DPIRKitModelController.h

@@ -10,9 +10,11 @@
 #import <Foundation/Foundation.h>
 #import <UIKit/UIKit.h>
 
+@class DPIRKitSettingViewController;
+
 @interface DPIRKitModelController : NSObject<UIPageViewControllerDataSource>
 
-- (id) initWithRootViewController:(UIViewController *)root;
+- (id) initWithRootViewController:(DPIRKitSettingViewController *)root;
 
 - (UIViewController *)viewControllerAtIndex:(NSUInteger)index storyboard:(UIStoryboard *)storyboard;
 - (NSUInteger)indexOfViewController:(UIViewController *)viewController;

dConnectDevicePlugin/dConnectDeviceIRKit/dConnectDeviceIRKit/Classes/setting/DPIRKitModelController.m

@@ -9,6 +9,7 @@
 
 #import "DPIRKitModelController.h"
 #import "DPIRKitPageViewController.h"
+#import "DPIRKitSettingViewController.h"
 
 @interface DPIRKitModelController()
 {
@@ -21,7 +22,7 @@ @interface DPIRKitModelController()
 
 @implementation DPIRKitModelController
 
-- (id) initWithRootViewController:(UIViewController *)root {
+- (id) initWithRootViewController:(DPIRKitSettingViewController *)root {
     self = [super init];
 
     if (self) {

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

@@ -167,7 +167,6 @@ - (void) showAlertWithTileKey:(NSString *)titleKey
                                  message:DPIRLocalizedString(_bundle, messageKey)
                                  preferredStyle:UIAlertControllerStyleAlert];
 
-    
     __weak typeof(self) _self = self;
     UIAlertAction* closeButton = [UIAlertAction
                                 actionWithTitle:DPIRLocalizedString(_bundle, closeButtonKey)
@@ -189,7 +188,6 @@ - (void) showAlertWithTileKey:(NSString *)titleKey
 
     [alert addAction:closeButton];
 
-    [self presentViewController:alert animated:YES completion:nil];
     dispatch_async(dispatch_get_main_queue(), ^{
         [_self stopLoading];
         [_self presentViewController:alert animated:YES completion:nil];

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

@@ -9,12 +9,16 @@
 
 #import <UIKit/UIKit.h>
 
+@class DPIRKitSettingViewController;
+
 @interface DPIRKitPageViewController : UIViewController
 
 @property (nonatomic) NSUInteger index;
-@property (nonatomic, weak) UIViewController *root;
+@property (nonatomic, weak) DPIRKitSettingViewController *root;
 
 - (void) setScrollEnable:(BOOL)enable;
 - (void) setScrollEnable:(BOOL)enable closeBtn:(BOOL)closeEnable;
 
+- (void) transitToNext;
+
 @end

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

@@ -9,6 +9,7 @@
 
 #import "DPIRKitPageViewController.h"
 #import "DPIRKitConst.h"
+#import "DPIRKitSettingViewController.h"
 
 @interface DPIRKitPageViewController (){
     NSLayoutConstraint *_space;
@@ -108,4 +109,8 @@ - (void) setScrollEnable:(BOOL)enable closeBtn:(BOOL)closeEnable {
     self.root.navigationItem.leftBarButtonItem.enabled = closeEnable;
 }
 
+- (void) transitToNext {
+    [self.root transitToNextFromViewController:self];
+}
+
 @end

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

@@ -11,4 +11,6 @@
 
 @interface DPIRKitSettingViewController : UIViewController
 
+- (void) transitToNextFromViewController:(UIViewController *)viewController;
+
 @end

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

@@ -25,6 +25,16 @@ - (void) removeUserDefaults;
 
 @implementation DPIRKitSettingViewController
 
+- (void) transitToNextFromViewController:(UIViewController *)viewController
+{
+    UIViewController *nextPage = [_modelController pageViewController:_pageViewController
+                                    viewControllerAfterViewController:viewController];
+    NSArray *viewControllers = @[nextPage];
+    
+    [_pageViewController setViewControllers:viewControllers direction:UIPageViewControllerNavigationDirectionForward
+                                   animated:YES completion:nil];
+}
+
 - (void)viewDidLoad
 {
     [super viewDidLoad];

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

@@ -17,6 +17,7 @@ typedef NS_ENUM(NSUInteger, DPIRKitSelectionState) {
     DPIRKitSelectionStateGotDeviceKey,
     DPIRKitSelectionStateWaitingIRKitSSID,
     DPIRKitSelectionStateCheckingIRKit,
+    DPIRKitSelectionStatePrepared,
 };
 
 @interface DPIRKitWiFiSelectionGuideViewController ()
@@ -66,6 +67,8 @@ - (void) showAlertWithTileKey:(NSString *)titleKey
                                           } else if (_state == DPIRKitSelectionStateCheckingIRKit) {
                                               _state = DPIRKitSelectionStateWaitingIRKitSSID;
                                               [self setScrollEnable:NO closeBtn:YES];
+                                          } else if (_state == DPIRKitSelectionStatePrepared) {
+                                              [self transitToNext];
                                           } else {
                                               [self dismissViewControllerAnimated:YES completion:nil];
                                           }
@@ -204,7 +207,7 @@ - (void) enterForground {
                  if (isIRKit) {
 
                      @synchronized (_self) {
-                         _state = DPIRKitSelectionStateIdling;
+                         _state = DPIRKitSelectionStatePrepared;
                      }
                      [_self showAlertWithTileKey:@"AlertTitlePrepared"
                                      messsageKey:@"AlertMessageIsIRKit"