Develop

IoTConnect/IoTConnect.xcodeproj/xcuserdata/kirtan.vaghela.xcuserdatad/xcschemes/xcschememanagement.plist

@@ -7,7 +7,7 @@
 		<key>IoTConnect.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>5</integer>
+			<integer>3</integer>
 		</dict>
 	</dict>
 </dict>

IoTConnect2/IoTConnect2.xcodeproj/project.pbxproj

@@ -700,6 +700,7 @@
 				DEFINES_MODULE = YES;
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 1;
+				"DYLIB_CURRENT_VERSION[arch=*]" = 1;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
 				ENABLE_MODULE_VERIFIER = YES;
 				GENERATE_INFOPLIST_FILE = YES;

IoTConnect2/IoTConnect2.xcodeproj/xcuserdata/kirtan.vaghela.xcuserdatad/xcschemes/xcschememanagement.plist

@@ -7,7 +7,7 @@
 		<key>IoTConnect2.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>5</integer>
+			<integer>2</integer>
 		</dict>
 		<key>IoTConnect2_AWS.xcscheme_^#shared#^_</key>
 		<dict>

IoTConnect2/IoTConnect2/IoTConnect_2.0/Config.swift

@@ -36,7 +36,8 @@ public enum CommandType:Int{
 }
 
 struct SDKURL {
-    static let discoveryHost = "https://discovery.iotconnect.io"
+    static let discoveryHostAZ = "https://discovery.iotconnect.io"
+    static let discoveryHostAZEMEA = "https://eudiscovery.iotconnect.io"
     static let discoveryHostAWS = "https://jzbybwq654.execute-api.us-east-1.amazonaws.com/Prod"
     static let discoveryHostAWSPOC = "https://awsdiscovery.iotconnect.io"//"https://awspoc.iotconnect.io"
     static let discoveryHostAWSPROD = "https://discoveryconsole.iotconnect.io"
@@ -60,18 +61,18 @@ struct SDKURL {
 
     static func discovery(_ strDiscoveryURL:String, _ cpId:String, _ lang:String, _ ver:String, _ env:String, _ pf:String) -> String {
         //kirtan
-
-        #if IOTAWS
-        if env == IOTCEnvironment.PREQA.rawValue{
-            return String(format: "\(SDKURL.discoveryHostAWS)/api/v\(ver)/dsdk/cpid/\(cpId)/env/\(env)/\(endPointAWS)\(pf)")
-        }else if env == IOTCEnvironment.POC.rawValue{
-            return String(format: "\(SDKURL.discoveryHostAWSPOC)/api/v\(ver)/dsdk/cpid/\(cpId)/env/\(env)/\(endPointAWS)\(pf)")
-        }else{
-            return String(format: "\(SDKURL.discoveryHostAWSPROD)/api/v\(ver)/dsdk/cpid/\(cpId)/env/\(env)/\(endPointAWS)\(pf)")
-        }
-        #else
-            return String(format: "\(strDiscoveryURL)/api/v\(ver)/dsdk/cpid/\(cpId)/env/\(env)")
-        #endif
+        return String(format: "\(strDiscoveryURL)/api/v\(ver)/dsdk/cpid/\(cpId)/env/\(env)/\(endPointAWS)\(pf)")
+//        #if IOTAWS
+//        if env == IOTCEnvironment.PREQA.rawValue{
+//            return String(format: "\(SDKURL.discoveryHostAWS)/api/v\(ver)/dsdk/cpid/\(cpId)/env/\(env)/\(endPointAWS)\(pf)")
+//        }else if env == IOTCEnvironment.POC.rawValue{
+//            return String(format: "\(SDKURL.discoveryHostAWSPOC)/api/v\(ver)/dsdk/cpid/\(cpId)/env/\(env)/\(endPointAWS)\(pf)")
+//        }else{
+//            return String(format: "\(SDKURL.discoveryHostAWSPROD)/api/v\(ver)/dsdk/cpid/\(cpId)/env/\(env)/\(endPointAWS)\(pf)")
+//        }
+//        #else
+//            return String(format: "\(strDiscoveryURL)/api/v\(ver)/dsdk/cpid/\(cpId)/env/\(env)")
+//        #endif
     }
 }
 
@@ -232,5 +233,6 @@ struct Dictkeys{
     static let medsageTypekey      = "mt"
     static let displayNamekey      = "dn"
     static let protocolkey         = "p"
+    static let message             = "message"
 
 }

IoTConnect2/IoTConnect2/IoTConnect_2.0/ErrosLog.swift

@@ -27,6 +27,8 @@ struct Log {//class
         case ERR_IN13 = "Please give uniqueID value"
         case ERR_IN14 = "Client connection closed"
         case ERR_IN15 = "Please give env value"
+        case ERR_IN16 = "Please enter valid CPID"
+        case ERR_IN17 = "Please enter valid UniqueID"
         case ERR_SD02 = "It does not matched with payload's 'uniqueId'"
         case ERR_SD06 = "Missing required parameter 'data'"
         case ERR_SD10 = "Publish data failed : MQTT connection not found"

IoTConnect2/IoTConnect2/IoTConnect_2.0/IoTConnectManager/IoTConnectManager.swift

@@ -38,7 +38,7 @@ class IoTConnectManager {
     var strCPId: String!
     var strUniqueId: String!
     var strEnv: IOTCEnvironment = .PROD
-    var strDiscoveryURL: String = SDKURL.discoveryHost
+    var strDiscoveryURL: String = SDKURL.discoveryHostAZ
     var strDiscoveryURLAWS: String = SDKURL.discoveryHostAWS
     var dictReference: [String:Any]!
     var dictSyncResponse: [String:Any]!
@@ -69,6 +69,9 @@ class IoTConnectManager {
     var twinResponsePubTopic = "$iothub/twin/GET/?$rid=0"
     var twinResponseSubTopic = "$iothub/twin/res/#"
 
+
+    var arrAttForValidation:AttributesData?
+
     init() {}
 
     //MARK: - Method - SDK-Initialiase
@@ -238,11 +241,14 @@ class IoTConnectManager {
                 print("df \(df) diff\(diff) \(time) \(Date())")
                 if diff >= df{
                     validateData(data: data, skipValidation: dataSDKOptions.skipValidation)
+                }else{
+                    print("Please try to send data after DF value.")
                 }
             }else{
                 validateData(data: data, skipValidation: dataSDKOptions.skipValidation)
             }
         }else {
+            print("sync count is 0")
             self.objCommon.manageDebugLog(code: Log.Errors.ERR_SD06.rawValue, uniqueId: strUniqueId, cpId: strCPId, message: "", logFlag: false, isDebugEnabled: boolDebugYN)
         }
     }
@@ -372,7 +378,9 @@ class IoTConnectManager {
                         dictD?.append(anotherDict: ["\(key)":["\(value)","\(value)","\(value)","\(value)",totalCount,"\(value)"]])
                     }
                     dataDevice[Dictkeys.dKey] = dictD
+
                     arrCalcDictEdgeDevice[firstIndex] = dataDevice
+                    arrCalcDictEdgeDevice[firstIndex][Dictkeys.datekey] = dt
                 }else{
                     if let val = dictD?[key], let firstIndexData = arrData.firstIndex(where: {$0[key] != nil}){
                         if let valDict = val as? [String:Any]{
@@ -387,19 +395,25 @@ class IoTConnectManager {
                                         var val = dictD?[key] as? [String:Any]
                                         val?[dictValueKey] = arrValues
                                         dictD?[key] = val
+
                                         arrCalcDictEdgeDevice[firstIndex]["d"] = dictD ?? [:]
+                                        arrCalcDictEdgeDevice[firstIndex][Dictkeys.datekey] = dt
                                     }else{
                                         var val = dictD?[key] as? [String:Any]
                                         val?.append(anotherDict: [dictValueKey:arrValues ?? []])
                                         dictD?[key] = val
+
                                         arrCalcDictEdgeDevice[firstIndex]["d"] = dictD ?? [:]
+                                        arrCalcDictEdgeDevice[firstIndex][Dictkeys.datekey] = dt
                                     }
                                 }
                             }
                         }else{
                             let arr = arrData[firstIndexData][key] as? [String]
                             dictD?[key] = calcEdgeData(arrValues: arr ?? [], latestVal: "\(value)")
+
                             arrCalcDictEdgeDevice[firstIndex][Dictkeys.dKey] = dictD ?? [:]
+                            arrCalcDictEdgeDevice[firstIndex][Dictkeys.datekey] = dt
                         }
                     }else{
                         if let valDict = value as? [String:Any]{
@@ -410,7 +424,9 @@ class IoTConnectManager {
                         }else{
                             dictD?.append(anotherDict: ["\(key)":["\(value)","\(value)","\(value)","\(value)",totalCount,"\(value)"]])
                         }
+
                         arrCalcDictEdgeDevice[firstIndex][Dictkeys.dKey] = dictD ?? [:]
+                        arrCalcDictEdgeDevice[firstIndex][Dictkeys.datekey] = dt
                     }
                 }
             }else{