-
Notifications
You must be signed in to change notification settings - Fork 2.1k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Addressing review comments, adding Discover button to Commissioner Di…
…scovery UI, using optional Bools to denote the state of the CommissioningView
- Loading branch information
1 parent
ceea1a8
commit b84bab9
Showing
11 changed files
with
299 additions
and
112 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
32 changes: 32 additions & 0 deletions
32
examples/tv-casting-app/darwin/TvCasting/MatterBridge/DiscoveredNodeDataConverter.hpp
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,32 @@ | ||
| /** | ||
| * | ||
| * Copyright (c) 2020-2022 Project CHIP Authors | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| #import <Foundation/Foundation.h> | ||
|
|
||
| #import "DiscoveredNodeData.h" | ||
| #include <lib/dnssd/Resolver.h> | ||
|
|
||
| #ifndef DiscoveredNodeDataConverter_h | ||
| #define DiscoveredNodeDataConverter_h | ||
|
|
||
| @interface DiscoveredNodeDataConverter : NSObject | ||
|
|
||
| + (DiscoveredNodeData *)convertToObjC:(const chip::Dnssd::DiscoveredNodeData *)chipDiscoveredNodedata; | ||
|
|
||
| @end | ||
|
|
||
| #endif /* DiscoveredNodeDataConverter_h */ |
58 changes: 58 additions & 0 deletions
58
examples/tv-casting-app/darwin/TvCasting/MatterBridge/DiscoveredNodeDataConverter.mm
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,58 @@ | ||
| /** | ||
| * | ||
| * Copyright (c) 2020-2022 Project CHIP Authors | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| #import <Foundation/Foundation.h> | ||
|
|
||
| #import "DiscoveredNodeDataConverter.hpp" | ||
|
|
||
| @implementation DiscoveredNodeDataConverter | ||
|
|
||
| + (DiscoveredNodeData *)convertToObjC:(const chip::Dnssd::DiscoveredNodeData *)chipDiscoveredNodeData | ||
| { | ||
| DiscoveredNodeData * objCDiscoveredNodeData = [DiscoveredNodeData new]; | ||
|
|
||
| // from CommissionNodeData | ||
| objCDiscoveredNodeData.deviceType = chipDiscoveredNodeData->commissionData.deviceType; | ||
| objCDiscoveredNodeData.vendorId = chipDiscoveredNodeData->commissionData.vendorId; | ||
| objCDiscoveredNodeData.productId = chipDiscoveredNodeData->commissionData.productId; | ||
| objCDiscoveredNodeData.longDiscriminator = chipDiscoveredNodeData->commissionData.longDiscriminator; | ||
| objCDiscoveredNodeData.commissioningMode = chipDiscoveredNodeData->commissionData.commissioningMode; | ||
| objCDiscoveredNodeData.pairingHint = chipDiscoveredNodeData->commissionData.pairingHint; | ||
| objCDiscoveredNodeData.deviceName = [NSString stringWithCString:chipDiscoveredNodeData->commissionData.deviceName | ||
| encoding:NSASCIIStringEncoding]; | ||
| objCDiscoveredNodeData.rotatingIdLen = chipDiscoveredNodeData->commissionData.rotatingIdLen; | ||
| objCDiscoveredNodeData.rotatingId = chipDiscoveredNodeData->commissionData.rotatingId; | ||
| objCDiscoveredNodeData.instanceName = [NSString stringWithCString:chipDiscoveredNodeData->commissionData.instanceName | ||
| encoding:NSASCIIStringEncoding]; | ||
|
|
||
| // from CommonResolutionData | ||
| objCDiscoveredNodeData.port = chipDiscoveredNodeData->resolutionData.port; | ||
| objCDiscoveredNodeData.hostName = [NSString stringWithCString:chipDiscoveredNodeData->resolutionData.hostName | ||
| encoding:NSASCIIStringEncoding]; | ||
| objCDiscoveredNodeData.platformInterface = chipDiscoveredNodeData->resolutionData.interfaceId.GetPlatformInterface(); | ||
| objCDiscoveredNodeData.numIPs = chipDiscoveredNodeData->resolutionData.numIPs; | ||
| if (chipDiscoveredNodeData->resolutionData.numIPs > 0) { | ||
| objCDiscoveredNodeData.ipAddresses = [NSMutableArray new]; | ||
| } | ||
| for (int i = 0; i < chipDiscoveredNodeData->resolutionData.numIPs; i++) { | ||
| char addrCString[chip::Inet::IPAddress::kMaxStringLength]; | ||
| chipDiscoveredNodeData->resolutionData.ipAddress->ToString(addrCString, chip::Inet::IPAddress::kMaxStringLength); | ||
| objCDiscoveredNodeData.ipAddresses[i] = [NSString stringWithCString:addrCString encoding:NSASCIIStringEncoding]; | ||
| } | ||
| return objCDiscoveredNodeData; | ||
| } | ||
|
|
||
| @end |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.