Update to IoT samples

Author: minbi

IoT-Sample/Swift/IoTSampleSwift/AppDelegate.swift

@@ -23,13 +23,10 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
 
     func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]?) -> Bool {
         // Override point for customization after application launch.
-        let credentialProvider = AWSCognitoCredentialsProvider(regionType: AwsRegion, identityPoolId: CognitoIdentityPoolId)
 
-        let configuration = AWSServiceConfiguration(
-            region: AwsRegion,
-            credentialsProvider: credentialProvider)
-
-        AWSServiceManager.default().defaultServiceConfiguration = configuration
+        //Setting up logging to xcode console.
+        AWSDDLog.sharedInstance.logLevel = .debug
+        AWSDDLog.add(AWSDDTTYLogger.sharedInstance)
 
         return true
     }

IoT-Sample/Swift/IoTSampleSwift/ConnectionViewController.swift

@@ -231,7 +231,6 @@ class ConnectionViewController: UIViewController, UITextViewDelegate {
     override func viewDidLoad() {
         super.viewDidLoad()
         // Do any additional setup after loading the view, typically from a nib.
-
         let tabBarViewController = tabBarController as! IoTSampleTabBarController
         publishViewController = tabBarViewController.viewControllers![1]
         subscribeViewController = tabBarViewController.viewControllers![2]
@@ -245,16 +244,25 @@ class ConnectionViewController: UIViewController, UITextViewDelegate {
         // Set up Cognito
         //
         let credentialsProvider = AWSCognitoCredentialsProvider(regionType: AwsRegion, identityPoolId: CognitoIdentityPoolId)
-        let configuration = AWSServiceConfiguration(region: AwsRegion, credentialsProvider: credentialsProvider)
-
-        AWSServiceManager.default().defaultServiceConfiguration = configuration
+        let iotEndPoint = AWSEndpoint(urlString: IOT_ENDPOINT)
+        //configuration for AWSIoT control plane APIs
+        let iotConfiguration = AWSServiceConfiguration(region: AwsRegion,
+                                       credentialsProvider: credentialsProvider)
+        //configuration for AWSIoT Data plane APIs
+        let iotDataConfiguration = AWSServiceConfiguration(region: AwsRegion,
+                                                  endpoint: iotEndPoint,
+                                       credentialsProvider: credentialsProvider)
+        AWSServiceManager.default().defaultServiceConfiguration = iotConfiguration
 
         iotManager = AWSIoTManager.default()
         iot = AWSIoT.default()
-        
-        iotDataManager = AWSIoTDataManager.default()
-        iotData = AWSIoTData.default()
-        
+
+        AWSIoTDataManager.register(with: iotDataConfiguration!, forKey: "MyIotDataManager")
+        iotDataManager = AWSIoTDataManager(forKey: "MyIotDataManager")
+
+        AWSIoTData.register(with: iotDataConfiguration!, forKey: "MyIotData")
+        iotData = AWSIoTData(forKey: "MyIotData")
+
     }
 
     override func didReceiveMemoryWarning() {

IoT-Sample/Swift/IoTSampleSwift/Constants.swift

@@ -24,3 +24,5 @@ let CertificateSigningRequestCountryName = "Your Country"
 let CertificateSigningRequestOrganizationName = "Your Organization"
 let CertificateSigningRequestOrganizationalUnitName = "Your Organizational Unit"
 let PolicyName = "YourPolicyName"
+//This is the endpoint in your AWS IoT console. eg: https://xxxxxxxxxx.iot.<region>.amazonaws.com
+let IOT_ENDPOINT = "https://xxxxxxxxxx.iot.<region>.amazonaws.com"

IoT-Sample/Swift/README.md

@@ -36,6 +36,7 @@ This sample demonstrates use of the AWS IoT APIs to securely publish to and subs
 	let CertificateSigningRequestOrganizationName = "Your Organization"
 	let CertificateSigningRequestOrganizationalUnitName = "Your Organizational Unit"
 	let PolicyName = "YourPolicyName"
+        let IOT_ENDPOINT = "https://xxxxxxxxxx.iot.<region>.amazonaws.com"
 	```
 
 1. Build and run the sample app.

IoTTemperatureControl-Sample/Swift/IoTTemperatureControlSample/AppDelegate.swift

@@ -23,16 +23,9 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
 
 
     func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]?) -> Bool {
-        //
-        // Use Cognito authentication
-        //
-        let credentialProvider = AWSCognitoCredentialsProvider(regionType: AwsRegion, identityPoolId: CognitoIdentityPoolId)
-        
-        let configuration = AWSServiceConfiguration(
-            region: AwsRegion,
-            credentialsProvider: credentialProvider)
-        
-        AWSServiceManager.default().defaultServiceConfiguration = configuration
+        //Setup logging to xcode console.
+        AWSDDLog.sharedInstance.logLevel = .debug
+        AWSDDLog.add(AWSDDTTYLogger.sharedInstance)
 
         return true
     }

IoTTemperatureControl-Sample/Swift/IoTTemperatureControlSample/Constants.swift

@@ -21,3 +21,5 @@ import AWSCore
 //
 let AwsRegion = AWSRegionType.Unknown // e.g. AWSRegionType.USEast1
 let CognitoIdentityPoolId = "YourCognitoIdentityPoolId"
+//This is the endpoint in your AWS IoT console. eg: https://xxxxxxxxxx.iot.<region>.amazonaws.com
+let IOT_ENDPOINT = "https://xxxxxxxxxx.iot.<region>.amazonaws.com"

IoTTemperatureControl-Sample/Swift/IoTTemperatureControlSample/ViewController.swift

@@ -117,6 +117,16 @@ class ViewController: UIViewController {
             currentlyEnabled = enabled;
         }
     }
+    func thingShadowTimeoutCallback( _ thingName: String, json: JSON, payloadString: String ) -> Void {
+        if (thingName == controlThingName)
+        {
+            controlThingOperationInProgress = false;
+        }
+        else   // thingName == statusThingName
+        {
+            statusThingOperationInProgress = false;
+        }
+    }
     func thingShadowDeltaCallback( _ thingName: String, json: JSON, payloadString: String ) -> Void {
         if (thingName == controlThingName)
         {
@@ -180,6 +190,7 @@ class ViewController: UIViewController {
                 self.thingShadowDeltaCallback( name, json: json, payloadString: stringValue as! String)
             case .timeout:
                 print("timeout on \(name)")
+                self.thingShadowTimeoutCallback( name, json: json, payloadString: stringValue as! String)
 
             default:
                 print("unknown operation status: \(operationStatus.rawValue)")
@@ -249,12 +260,25 @@ class ViewController: UIViewController {
         // Initialize the status switch
         //
         statusSwitch.isOn=true
-        
+
+        //
+        // Use Cognito authentication
+        //
+        let credentialProvider = AWSCognitoCredentialsProvider(regionType: AwsRegion, identityPoolId: CognitoIdentityPoolId)
+        let iotEndPoint = AWSEndpoint(urlString: IOT_ENDPOINT)
+        let iotDataConfiguration = AWSServiceConfiguration(
+            region: AwsRegion,
+            endpoint: iotEndPoint,
+            credentialsProvider: credentialProvider)
+
         //
         // Init IOT
         //
-        iotDataManager = AWSIoTDataManager.default()
-        
+
+        AWSIoTDataManager.register(with: iotDataConfiguration!, forKey: "MyIotDataManager")
+        iotDataManager = AWSIoTDataManager(forKey: "MyIotDataManager")
+
+
         #if DEMONSTRATE_LAST_WILL_AND_TESTAMENT
         //
         // Set a Last Will and Testament message in the MQTT configuration; other

IoTTemperatureControl-Sample/Swift/Podfile

@@ -4,6 +4,6 @@ platform :ios, '8.0'
 use_frameworks!
 
 target 'IoTTemperatureControlSample' do
-    pod 'AWSIoT', ''~>2.5.0'
+    pod 'AWSIoT', '~>2.5.0'
     pod 'SwiftyJSON'
 end

IoTTemperatureControl-Sample/Swift/README.md

@@ -31,6 +31,7 @@ This sample demonstrates use of the AWS IoT MQTT device shadow APIs over a WebSo
 	```c
 	let AwsRegion = AWSRegionType.Unknown // e.g. AWSRegionType.USEast1
 	let CognitoIdentityPoolId = "YourCognitoIdentityPoolId"
+        let IOT_ENDPOINT = "https://xxxxxxxxxx.iot.<region>.amazonaws.com"
 	```
 1. Install the [AWS IoT JavaScript SDK for Embedded Devices](https://github.com/aws/aws-iot-device-sdk-js).